Merge pull request #1 from rivanfebrian123/nomurrine

Deprecate Murrine deps

README.md

@@ -8,11 +8,6 @@
 # Installation is easy!
 <details> <summary> Required dependencies info for nerds </summary>
 
-### GTK2 theme deps
-- gtk-murrine-engine     `Fedora/RedHat`
-- gtk2-engines-murrine   `Ubuntu/Mint/Debian`
-- gtk-engine-murrine     `Arch/Manjaro`
-
 ### "Install from source" deps
 - sassc
 - libglib2.0-dev-bin     `ubuntu 20.04`

lib-core.sh

@@ -666,6 +666,21 @@ full_sudo() {
   fi
 }
 
+get_http_response() {
+  exec 3<> "/dev/tcp/${1}/80"
+  echo -e "GET / HTTP/1.1\nHost: ${1}\n\n" >&3
+
+  (
+    IFS=""
+
+    while read -r -t 1 line 0<&3; do
+      echo "${line//$"\r"}"
+    done
+  )
+
+  exec 3<&-
+}
+
 usage() {
   prompt -e "Usage function is not implemented"; exit 1
 }

lib-install.sh

@@ -61,7 +61,7 @@ prepare_deps() {
 
   prompt -i "DEPS: Checking your internet connection..."
 
-  if ! head="$(curl -Is -o - 'time.cloudflare.com' || wget -Sq -o - --max-redirect=0 'time.cloudflare.com')"; then
+  if ! head="$(get_http_response 'time.cloudflare.com')"; then
     prompt -e "DEPS ERROR: You have an internet connection issue\n"; exit 1
   fi
 
@@ -148,32 +148,31 @@ prepare_xbps() {
 #-----------------Deps-----------------#
 
 install_theme_deps() {
-  if ! has_command glib-compile-resources || ! has_command sassc || ! has_command xmllint ||
+  if ! has_command glib-compile-resources || ! has_command sassc || ! has_command xmllint; then
-  (! is_my_distro "clear-linux" && [[ ! -r "/usr/share/gtk-engines/murrine.xml" ]]); then
+    prompt -w "DEPS: 'glib2.0', 'sassc', and 'xmllint' are required for theme installation."
-    prompt -w "DEPS: 'glib2.0', 'sassc', 'xmllint', and 'libmurrine' are required for theme installation."
     prepare_deps
 
     if has_command zypper; then
-      sudo zypper in -y sassc glib2-devel gtk2-engine-murrine libxml2-tools
+      sudo zypper in -y sassc glib2-devel libxml2-tools
     elif has_command swupd; then
       # Rolling release
       prepare_swupd && sudo swupd bundle-add libglib libxml2 && install_swupd_packages sassc libsass
     elif has_command apt; then
-      prepare_install_apt_packages sassc libglib2.0-dev-bin gtk2-engines-murrine libxml2-utils
+      prepare_install_apt_packages sassc libglib2.0-dev-bin libxml2-utils
     elif has_command dnf; then
-      sudo dnf install -y sassc glib2-devel gtk-murrine-engine libxml2
+      sudo dnf install -y sassc glib2-devel libxml2
     elif has_command yum; then
-      sudo yum install -y sassc glib2-devel gtk-murrine-engine libxml2
+      sudo yum install -y sassc glib2-devel libxml2
     elif has_command pacman; then
       # Rolling release
       # 'Syu' (with a single y) may causes "could not open ... decompression failed"
       # and "target not found <package>". We got to force 'pacman' to update the repos
-      sudo pacman -Syyu --noconfirm --needed sassc glib2 gtk-engine-murrine libxml2
+      sudo pacman -Syyu --noconfirm --needed sassc glib2 libxml2
     elif has_command xbps-install; then
       # Rolling release
       # 'libxml2' is already included here, and it's gonna broke the installation
       # if you add it
-      prepare_xbps && sudo xbps-install -Sy sassc glib-devel gtk-engine-murrine
+      prepare_xbps && sudo xbps-install -Sy sassc glib-devel
     else
       installation_sorry
     fi

src/main/gtk-2.0/common/main.rc

@@ -962,12 +962,9 @@ style "menu_item" {
 }
 
 style "button" {
-
   xthickness = 4
   ythickness = 4
 
-  engine "murrine" { textstyle = 0 }
-
   engine "pixmap" {
 
     image {
@@ -1047,8 +1044,6 @@ style "button_label" {
   fg[INSENSITIVE] = @insensitive_button_fg_color
   fg[ACTIVE] = @fg_color
 
-  engine "murrine" { textstyle = 0 }
-
 }
 
 style "checkbutton" {
@@ -2341,15 +2336,6 @@ style "xfwm-tabwin" {
   bg[SELECTED] = @bg_color
 
   fg[NORMAL] = @fg_color
-
-  engine "murrine" {
-    contrast = 0.7
-    glazestyle = 0
-    glowstyle = 0
-    highlight_shade = 1.0
-    gradient_shades = {1.0,1.0,1.0,1.0}
-    border_shades = { 0.8, 0.8 }
-  }
 }
 
 style "xfwm-tabwin-button" {
@@ -2367,12 +2353,6 @@ style "chrome_menu_item" {
 # Text Style
 style "text" = "default" {
   fg[NORMAL] = @fg_color # FIXME: VMWare needs this?
-
-  engine "murrine" { textstyle = 0 }
-}
-
-style "menu_text" = "menu_item" {
-  engine "murrine" { textstyle = 0 }
 }
 
 style "null" {
@@ -2479,7 +2459,6 @@ widget "xfwm4-tabwin*GtkButton*"                                    style "xfwm-
 
 # Fixes ugly text shadows for insensitive text
 widget_class "*<GtkLabel>"                                          style "text"
-widget_class "*<GtkMenu>*<GtkLabel>"                                style "menu_text"
 widget_class "*<GtkComboBox>*<GtkCellLayout>"                       style "text"
 widget_class "*<GtkNotebook>*<GtkLabel>"                            style "text"
 widget_class "*<GtkNotebook>*<GtkCellLayout>"                       style "text"

src/main/gtk-2.0/common/panel.rc

@@ -89,7 +89,6 @@ style "regular-label" {
 }
 
 style "theme-panel-text" {
-
   fg[NORMAL] = shade(1.0, @tooltip_fg_color)
   fg[PRELIGHT] = @tooltip_fg_color
   fg[ACTIVE] = shade(1.0, @tooltip_fg_color)
@@ -97,15 +96,9 @@ style "theme-panel-text" {
   text[NORMAL] = shade(1.0, @tooltip_fg_color)
   text[PRELIGHT] = @tooltip_fg_color
   text[ACTIVE] = shade(1.0, @tooltip_fg_color)
-
-  engine "murrine" {
-    textstyle = 0
-    text_shade = 0.2
-  }
 }
 
 style "panel-entry" {
-
   fg[NORMAL] = @text_color
   fg[PRELIGHT] = @text_color
   fg[ACTIVE] = @text_color
@@ -117,7 +110,6 @@ style "panel-entry" {
   text[ACTIVE] = @text_color
   text[SELECTED] = @text_color
   text[INSENSITIVE] = @text_color
-
 }
 
 style "theme-main-menu-text" = "theme-panel-text" {

src/main/gtk-2.0/common/xfce-notify.rc

@@ -18,13 +18,6 @@ style "notify-button" {
   fg[NORMAL] = @tooltip_fg_color
   fg[PRELIGHT] = shade(1.1, @tooltip_fg_color)
   fg[ACTIVE] = @selected_fg_color
-
-  engine "murrine" {
-    gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
-    border_shades = { 1.0, 1.0 }
-    roundness = 2
-    textstyle = 0
-  }
 }
 
 style "notify-text" {
@@ -33,10 +26,6 @@ style "notify-text" {
   fg[NORMAL] = shade(1.0, @tooltip_fg_color)
   fg[PRELIGHT] = shade(1.1, @tooltip_fg_color)
   fg[ACTIVE] = shade(1.0, @tooltip_fg_color)
-
-  engine "murrine" {
-    textstyle = 0
-  }
 }
 
 style "notify-summary" {
@@ -53,16 +42,6 @@ style "notify-progressbar" {
   bg[NORMAL]   = @selected_bg_color
   bg[ACTIVE] = shade(0.8, @tooltip_bg_color)
   bg[SELECTED] = @selected_bg_color
-
-  engine "murrine" {
-    gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
-    border_shades = { 1.0, 1.0 }
-    trough_shades = { 1.0, 1.0 }
-    trough_border_shades = { 1.0, 1.0 }
-    progressbarstyle = 0
-    roundness = 2
-    textstyle = 0
-  }
 }
 
 class "XfceNotifyWindow" style "notify-window"

src/main/gtk-2.0/menubar-toolbar-dark.rc

@@ -61,16 +61,6 @@ style "menubar_item" {
   }
 }
 
-# Text Style Menubar
-style "menubar-text" {
-
-  engine "murrine" {
-    text_shade = 0.0
-    textstyle = 0
-  }
-}
-
-
 style "toolbar_text" {
   fg[NORMAL] = @tooltip_fg_color
   fg[PRELIGHT] = shade(1.15, @tooltip_fg_color)
@@ -211,14 +201,11 @@ widget_class "*ThunarWindow*<GtkToolbar>"                           style "menub
 
 class "ChromeGtkFrame"                                              style "chrome-gtk-frame"
 
-widget_class "*<GtkMenuBar>*<GtkMenuItem>*<GtkAccelLabel>"          style "menubar-text"
-
 # Whitelist for dark toolbars
 widget_class "*ThunarWindow*<GtkMenuBar>"                                   style "menubar-borderless"
 widget_class "*ThunarWindow*<GtkToolbar>*<GtkEntry>"                        style "toolbar_entry"
 widget_class "*ThunarWindow*<GtkToolbar>*<GtkButton>"                       style "toolbar_button"
 widget_class "*ThunarWindow*<GtkToolbar>*<GtkWidget>"                       style "toolbar_text"
-widget_class "*ThunarWindow*<GtkToolbar>*<GtkButton>*<GtkLabel>"            style "menubar-text"
 
 # GtkCheckButton
 widget_class "*<GtkCheckButton>"                                    style "button"

src/main/gtk-2.0/menubar-toolbar-light.rc

@@ -61,15 +61,6 @@ style "menubar_item" {
   }
 }
 
-# Text Style Menubar
-style "menubar-text" {
-
-  engine "murrine" {
-    text_shade = 0.0
-    textstyle = 0
-  }
-}
-
 style "toolbar_entry" {
 
   text[NORMAL] = @text_color
@@ -153,8 +144,6 @@ widget_class "*CajaNavigationWindow*<GtkToolbar>"                   style "menub
 
 class "ChromeGtkFrame"                                              style "chrome-gtk-frame"
 
-widget_class "*<GtkMenuBar>*<GtkMenuItem>*<GtkAccelLabel>"          style "menubar-text"
-
 # Whitelist for dark toolbars
 widget_class "*ThunarWindow*<GtkMenuBar>"                           style "menubar"
 widget_class "*CajaNavigationWindow*<GtkMenuBar>"                   style "menubar"
@@ -163,5 +152,3 @@ widget_class "*CajaNavigationWindow*<GtkToolbar>*<GtkEntry>"        style "toolb
 
 # GtkCheckButton
 widget_class "*<GtkNotebook>*<GtkCheckButton>"                      style "toolbar_button"
-widget_class "*<GtkNotebook>*<GtkCheckButton>*<GtkLabel>"           style "misc_button_label"
-