X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Ftint2;a=blobdiff_plain;f=src%2Ftint.c;h=22f67da01d76b7ea5cc4aff2914d976ed646fa06;hp=502c7b1812670159cb688471b6e8f06481c21582;hb=1aa4d290a90cfc14416f43b205523a6bf401d973;hpb=14bb7c359cd5d07fb27cd36f6dae19991bb6836f

diff --git a/src/tint.c b/src/tint.c
index 502c7b1..22f67da 100644
--- a/src/tint.c
+++ b/src/tint.c
@@ -31,17 +31,19 @@
 #include <Imlib2.h>
 #include <signal.h>
 
-#include "version.h"
+#include <version.h>
 #include "server.h"
 #include "window.h"
 #include "config.h"
 #include "task.h"
 #include "taskbar.h"
 #include "systraybar.h"
+#include "launcher.h"
 #include "panel.h"
 #include "tooltip.h"
 #include "timer.h"
 
+
 void signal_handler(int sig)
 {
 	// signal handler is light as it should be
@@ -53,6 +55,20 @@ void init (int argc, char *argv[])
 {
 	int i;
 
+	// set global data
+	default_config();
+	default_timeout();
+	default_systray();
+	memset(&server, 0, sizeof(Server_global));
+#ifdef ENABLE_BATTERY
+	default_battery();
+#endif
+	default_clock();
+	default_launcher();
+	default_taskbar();
+	default_tooltip();
+	default_panel();
+
 	// read options
 	for (i = 1; i < argc; ++i) {
 		if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help"))	{
@@ -75,15 +91,17 @@ void init (int argc, char *argv[])
 		}
 	}
 	// Set signal handler
+	signal_pending = 0;
 	struct sigaction sa = { .sa_handler = signal_handler };
+	struct sigaction sa_chld = { .sa_handler = SIG_DFL, .sa_flags = SA_NOCLDWAIT };
 	sigaction(SIGUSR1, &sa, 0);
 	sigaction(SIGINT, &sa, 0);
 	sigaction(SIGTERM, &sa, 0);
 	sigaction(SIGHUP, &sa, 0);
-	signal(SIGCHLD, SIG_IGN);		// don't have to wait() after fork()
+	sigaction(SIGCHLD, &sa_chld, 0);
 
-	// BSD is too stupid to support pselect(), therefore we have to use select and hope that we do not
-	// end up in a race condition there
+	// BSD does not support pselect(), therefore we have to use select and hope that we do not
+	// end up in a race condition there (see 'man select()' on a linux machine for more information)
 	// block all signals, such that no race conditions occur before pselect in our main loop
 //	sigset_t block_mask;
 //	sigaddset(&block_mask, SIGINT);
@@ -91,10 +109,6 @@ void init (int argc, char *argv[])
 //	sigaddset(&block_mask, SIGHUP);
 //	sigaddset(&block_mask, SIGUSR1);
 //	sigprocmask(SIG_BLOCK, &block_mask, 0);
-
-	// set global data
-	memset(&server, 0, sizeof(Server_global));
-	memset(&systray, 0, sizeof(Systraybar));
 }
 
 void init_X11()
@@ -119,6 +133,8 @@ void init_X11()
 	XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask);
 
 	setlocale (LC_ALL, "");
+	// config file use '.' as decimal separator
+	setlocale(LC_NUMERIC, "POSIX");
 
 	// load default icon
 	gchar *path;
@@ -140,22 +156,22 @@ void init_X11()
 
 void cleanup()
 {
-	stop_all_timeouts();
+	cleanup_timeout();
 	cleanup_systray();
-	stop_net();
-	cleanup_panel();
 	cleanup_tooltip();
 	cleanup_clock();
+	cleanup_launcher();
 #ifdef ENABLE_BATTERY
 	cleanup_battery();
 #endif
+	cleanup_panel();
+	cleanup_config();
 
 	if (default_icon) {
 		imlib_context_set_image(default_icon);
 		imlib_free_image();
 	}
-	if (config_path) g_free(config_path);
-	if (snapshot_path) g_free(snapshot_path);
+	imlib_context_disconnect_display();
 
 	cleanup_server();
 	if (server.dsp) XCloseDisplay(server.dsp);
@@ -166,16 +182,22 @@ void get_snapshot(const char *path)
 {
 	Panel *panel = &panel1[0];
 
-	if (panel->temp_pmap) XFreePixmap(server.dsp, panel->temp_pmap);
-	panel->temp_pmap = XCreatePixmap(server.dsp, server.root_win, panel->area.width, panel->area.height, server.depth);
+	if (panel->area.width > server.monitor[0].width)
+		panel->area.width = server.monitor[0].width;
 
-	refresh(&panel->area);
+	panel->temp_pmap = XCreatePixmap(server.dsp, server.root_win, panel->area.width, panel->area.height, server.depth);
+	rendering(panel);
 
 	Imlib_Image img = NULL;
 	imlib_context_set_drawable(panel->temp_pmap);
 	img = imlib_create_image_from_drawable(0, 0, 0, panel->area.width, panel->area.height, 0);
 
 	imlib_context_set_image(img);
+	if (!panel_horizontal) {
+		// rotate 90° vertical panel
+		imlib_image_flip_horizontal();
+		imlib_image_flip_diagonal();
+	}
 	imlib_save_image(path);
 	imlib_free_image();
 }
@@ -259,7 +281,15 @@ int tint2_handles_click(Panel* panel, XButtonEvent* e)
 		else
 			return 0;
 	}
-	// no task clicked --> check if taskbar clicked
+	LauncherIcon *icon = click_launcher_icon(panel, e->x, e->y);
+	if (icon) {
+		if (e->button == 1) {
+			return 1;
+		} else {
+			return 0;
+		}
+	}
+	// no launcher/task clicked --> check if taskbar clicked
 	Taskbar *tskbar = click_taskbar(panel, e->x, e->y);
 	if (tskbar && e->button == 1 && panel_mode == MULTI_DESKTOP)
 		return 1;
@@ -300,9 +330,64 @@ void event_button_press (XEvent *e)
 	}
 	task_drag = click_task(panel, e->xbutton.x, e->xbutton.y);
 
-	XLowerWindow (server.dsp, panel->main_win);
+	if (panel_layer == BOTTOM_LAYER)
+		XLowerWindow (server.dsp, panel->main_win);
 }
 
+void event_button_motion_notify (XEvent *e)
+{
+	Panel * panel = get_panel(e->xany.window);
+	if(!panel || !task_drag)
+		return;
+
+	// Find the taskbar on the event's location
+	Taskbar * event_taskbar = click_taskbar(panel, e->xbutton.x, e->xbutton.y);
+	if(event_taskbar == NULL)
+		return;
+
+	// Find the task on the event's location
+	Task * event_task = click_task(panel, e->xbutton.x, e->xbutton.y);
+
+	// If the event takes place on the same taskbar as the task being dragged
+	if(event_taskbar == task_drag->area.parent)	{
+		// Swap the task_drag with the task on the event's location (if they differ)
+		if(event_task && event_task != task_drag) {
+			GSList * drag_iter = g_slist_find(event_taskbar->area.list, task_drag);
+			GSList * task_iter = g_slist_find(event_taskbar->area.list, event_task);
+			if(drag_iter && task_iter) {
+				gpointer temp = task_iter->data;
+				task_iter->data = drag_iter->data;
+				drag_iter->data = temp;
+				event_taskbar->area.resize = 1;
+				panel_refresh = 1;
+				task_dragged = 1;
+			}
+		}
+	}
+	else { // The event is on another taskbar than the task being dragged
+		if(task_drag->desktop == ALLDESKTOP || panel_mode != MULTI_DESKTOP)
+			return;
+
+		Taskbar * drag_taskbar = (Taskbar*)task_drag->area.parent;
+		drag_taskbar->area.list = g_slist_remove(drag_taskbar->area.list, task_drag);
+
+		if(event_taskbar->area.posx > drag_taskbar->area.posx || event_taskbar->area.posy > drag_taskbar->area.posy)
+			event_taskbar->area.list = g_slist_prepend(event_taskbar->area.list, task_drag);
+		else
+			event_taskbar->area.list = g_slist_append(event_taskbar->area.list, task_drag);
+
+		// Move task to other desktop (but avoid the 'Window desktop changed' code in 'event_property_notify')
+		task_drag->area.parent = event_taskbar;
+		task_drag->desktop = event_taskbar->desktop;
+
+		windows_set_desktop(task_drag->win, event_taskbar->desktop);
+
+		event_taskbar->area.resize = 1;
+		drag_taskbar->area.resize = 1;
+		task_dragged = 1;
+		panel_refresh = 1;
+	}
+}
 
 void event_button_release (XEvent *e)
 {
@@ -311,7 +396,8 @@ void event_button_release (XEvent *e)
 
 	if (wm_menu && !tint2_handles_click(panel, &e->xbutton)) {
 		forward_click(e);
-		XLowerWindow (server.dsp, panel->main_win);
+		if (panel_layer == BOTTOM_LAYER)
+			XLowerWindow (server.dsp, panel->main_win);
 		task_drag = 0;
 		return;
 	}
@@ -340,7 +426,17 @@ void event_button_release (XEvent *e)
 
 	if ( click_clock(panel, e->xbutton.x, e->xbutton.y)) {
 		clock_action(e->xbutton.button);
-		XLowerWindow (server.dsp, panel->main_win);
+		if (panel_layer == BOTTOM_LAYER)
+			XLowerWindow (server.dsp, panel->main_win);
+		task_drag = 0;
+		return;
+	}
+
+	if ( click_launcher(panel, e->xbutton.x, e->xbutton.y)) {
+		LauncherIcon *icon = click_launcher_icon(panel, e->xbutton.x, e->xbutton.y);
+		if (icon) {
+			launcher_action(icon);
+		}
 		task_drag = 0;
 		return;
 	}
@@ -348,23 +444,17 @@ void event_button_release (XEvent *e)
 	Taskbar *tskbar;
 	if ( !(tskbar = click_taskbar(panel, e->xbutton.x, e->xbutton.y)) ) {
 		// TODO: check better solution to keep window below
-		XLowerWindow (server.dsp, panel->main_win);
+		if (panel_layer == BOTTOM_LAYER)
+			XLowerWindow (server.dsp, panel->main_win);
 		task_drag = 0;
 		return;
 	}
 
 	// drag and drop task
-	if (task_drag) {
-		if (tskbar != task_drag->area.parent && action == TOGGLE_ICONIFY) {
-			if (task_drag->desktop != ALLDESKTOP && panel_mode == MULTI_DESKTOP) {
-				windows_set_desktop(task_drag->win, tskbar->desktop);
-				if (tskbar->desktop == server.desktop)
-					set_active(task_drag->win);
-				task_drag = 0;
-			}
-			return;
-		}
-		else task_drag = 0;
+	if (task_dragged) {
+		task_drag = 0;
+		task_dragged = 0;
+		return;
 	}
 
 	// switch desktop
@@ -377,7 +467,8 @@ void event_button_release (XEvent *e)
 	window_action( click_task(panel, e->xbutton.x, e->xbutton.y), action);
 
 	// to keep window below
-	XLowerWindow (server.dsp, panel->main_win);
+	if (panel_layer == BOTTOM_LAYER)
+		XLowerWindow (server.dsp, panel->main_win);
 }
 
 
@@ -394,13 +485,21 @@ void event_property_notify (XEvent *e)
 			server.got_root_win = 1;
 		}
 
+		// Change name of desktops
+		else if (at == server.atom._NET_DESKTOP_NAMES) {
+			printf("_NET_DESKTOP_NAMES\n");
+			panel_refresh = 1;
+		}
 		// Change number of desktops
 		else if (at == server.atom._NET_NUMBER_OF_DESKTOPS) {
+			if (!taskbar_enabled) return;
 			server.nb_desktop = server_get_number_of_desktop ();
 			cleanup_taskbar();
 			init_taskbar();
-			visible_object();
 			for (i=0 ; i < nb_panel ; i++) {
+				init_taskbar_panel(&panel1[i]);
+				set_panel_items_order(&panel1[i]);
+				visible_taskbar(&panel1[i]);
 				panel1[i].area.resize = 1;
 			}
 			task_refresh_tasklist();
@@ -409,11 +508,12 @@ void event_property_notify (XEvent *e)
 		}
 		// Change desktop
 		else if (at == server.atom._NET_CURRENT_DESKTOP) {
+			if (!taskbar_enabled) return;
 			int old_desktop = server.desktop;
 			server.desktop = server_get_current_desktop ();
 			for (i=0 ; i < nb_panel ; i++) {
 				Panel *panel = &panel1[i];
-				if (panel_mode == MULTI_DESKTOP && panel->g_taskbar.use_active) {
+				if (panel_mode == MULTI_DESKTOP && panel->g_taskbar.bg != panel->g_taskbar.bg_active) {
 					// redraw both taskbar
 					if (server.nb_desktop > old_desktop) {
 						// can happen if last desktop is deleted and we've been on the last desktop
@@ -447,9 +547,8 @@ void event_property_notify (XEvent *e)
 						tskbar->area.resize = 1;
 					}
 				}
-			}
-			if (panel_mode != MULTI_DESKTOP) {
-				visible_object();
+				if (panel_mode != MULTI_DESKTOP) 
+					visible_taskbar(panel);
 			}
 		}
 		// Window list
@@ -563,11 +662,7 @@ void event_configure_notify (Window win)
 {
 	// change in root window (xrandr)
 	if (win == server.root_win) {
-		get_monitors();
-		init_config();
-		config_read_file (config_path);
-		init_panel();
-		cleanup_config();
+		signal_pending = SIGUSR1;
 		return;
 	}
 
@@ -642,9 +737,12 @@ int main (int argc, char *argv[])
 	Panel *panel;
 	GSList *it;
 	struct timeval* timeout;
+	int hidden_dnd = 0;
 
+start:
 	init (argc, argv);
-	init_config();
+	init_X11();
+
 	i = 0;
 	if (config_path)
 		i = config_read_file (config_path);
@@ -656,9 +754,7 @@ int main (int argc, char *argv[])
 		exit(1);
 	}
 
-	init_X11();
 	init_panel();
-	cleanup_config();
 	if (snapshot_path) {
 		get_snapshot(snapshot_path);
 		cleanup();
@@ -687,14 +783,14 @@ int main (int argc, char *argv[])
 				else {
 					if (panel->temp_pmap) XFreePixmap(server.dsp, panel->temp_pmap);
 					panel->temp_pmap = XCreatePixmap(server.dsp, server.root_win, panel->area.width, panel->area.height, server.depth);
-					refresh(&panel->area);
+					rendering(panel);
 					XCopyArea(server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0);
 				}
 			}
 			XFlush (server.dsp);
 
 			panel = (Panel*)systray.area.panel;
-			if (refresh_systray && !panel->is_hidden) {
+			if (refresh_systray && panel && !panel->is_hidden) {
 				refresh_systray = 0;
 				// tint2 doen't draw systray icons. it just redraw background.
 				XSetWindowBackgroundPixmap (server.dsp, panel->main_win, panel->temp_pmap);
@@ -724,8 +820,18 @@ int main (int argc, char *argv[])
 						autohide_trigger_show(panel);
 					else if (e.type == LeaveNotify)
 						autohide_trigger_hide(panel);
-					if (panel->is_hidden)
-						continue;   // discard further processing of this event because the panel is not visible yet
+					if (panel->is_hidden) {
+						if (e.type == ClientMessage && e.xclient.message_type == server.atom.XdndPosition) {
+							hidden_dnd = 1;
+							autohide_show(panel);
+						}
+						else
+							continue;   // discard further processing of this event because the panel is not visible yet
+					}
+					else if (hidden_dnd && e.type == ClientMessage && e.xclient.message_type == server.atom.XdndLeave) {
+						hidden_dnd = 0;
+						autohide_hide(panel);
+					}
 				}
 
 				switch (e.type) {
@@ -739,11 +845,15 @@ int main (int argc, char *argv[])
 						break;
 
 					case MotionNotify: {
+						unsigned int button_mask = Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask;
+						if (e.xmotion.state & button_mask)
+							event_button_motion_notify (&e);
+
 						if (!g_tooltip.enabled) break;
 						Panel* panel = get_panel(e.xmotion.window);
 						Area* area = click_area(panel, e.xmotion.x, e.xmotion.y);
 						if (area->_get_tooltip_text)
-							tooltip_trigger_show(area, panel, e.xmotion.x_root, e.xmotion.y_root);
+							tooltip_trigger_show(area, panel, &e);
 						else
 							tooltip_trigger_hide();
 						break;
@@ -777,11 +887,11 @@ int main (int argc, char *argv[])
 					case UnmapNotify:
 					case DestroyNotify:
 						if (e.xany.window == server.composite_manager) {
-							// TODO: Stop real_transparency
-							//signal_pending = SIGUSR2;
+							// Stop real_transparency
+							signal_pending = SIGUSR1;
 							break;
 						}
-						if (e.xany.window == g_tooltip.window || !systray.area.on_screen)
+						if (e.xany.window == g_tooltip.window || !systray_enabled)
 							break;
 						for (it = systray.list_icons; it; it = g_slist_next(it)) {
 							if (((TrayWindow*)it->data)->tray_id == e.xany.window) {
@@ -795,16 +905,13 @@ int main (int argc, char *argv[])
 						ev = &e.xclient;
 						if (ev->data.l[1] == server.atom._NET_WM_CM_S0) {
 							if (ev->data.l[2] == None)
-								// TODO: Stop real_transparency
-								//signal_pending = SIGUSR2;
-								;
+								// Stop real_transparency
+								signal_pending = SIGUSR1;
 							else
-								// TODO: Start real_transparency
-								//signal_pending = SIGUSR2;
-								;
+								// Start real_transparency
+								signal_pending = SIGUSR1;
 						}
-						if (!systray.area.on_screen) break;
-						if (e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) {
+						if (systray_enabled && e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) {
 							net_message(&e.xclient);
 						}
 						else if (e.xclient.message_type == server.atom.XdndPosition) {
@@ -821,7 +928,7 @@ int main (int argc, char *argv[])
 							XDamageNotifyEvent* de = &event_union.de;
 							for (l = systray.list_icons; l ; l = l->next) {
 								traywin = (TrayWindow*)l->data;
-								if ( traywin->id == de->drawable && !de->more ) {
+								if ( traywin->id == de->drawable ) {
 									systray_render_icon(traywin);
 									break;
 								}
@@ -833,19 +940,18 @@ int main (int argc, char *argv[])
 
 		callback_timeout_expired();
 
-		switch (signal_pending) {
-		case SIGUSR1: // reload config file
-			signal_pending = 0;
-			init_config();
-			config_read_file (config_path);
-			init_panel();
-			cleanup_config();
-			break;
-		case SIGINT:
-		case SIGTERM:
-		case SIGHUP:
-			cleanup ();
-			return 0;
+		if (signal_pending) {
+			cleanup();
+			if (signal_pending == SIGUSR1) {
+				// restart tint2
+				// SIGUSR1 used when : user's signal, composite manager stop/start or xrandr
+				FD_CLR (x11_fd, &fdset); // not sure if needed
+				goto start;
+			}
+			else {
+				// SIGINT, SIGTERM, SIGHUP
+				return 0;
+			}
 		}
 	}
 }