X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Ftint.c;h=c23f115aa6c6333ba63436d2da2e5848d49addaa;hb=501a421b337b6e08b58904b1c008bd05dbbf954b;hp=f4b6498666e2f176a1d38cff2cab4eb88f42d63a;hpb=9cb781048d0a1cf55f0044e2f9f65ac9a5a241e9;p=chaz%2Ftint2

diff --git a/src/tint.c b/src/tint.c
index f4b6498..c23f115 100644
--- a/src/tint.c
+++ b/src/tint.c
@@ -37,6 +37,7 @@
 #include "taskbar.h"
 #include "systraybar.h"
 #include "panel.h"
+#include "tooltip.h"
 
 
 void signal_handler(int sig)
@@ -51,12 +52,19 @@ void init (int argc, char *argv[])
 	int c;
 
 	// read options
-	c = getopt (argc, argv, "c:");
-	if (c != -1) {
-		config_path = strdup (optarg);
-		c = getopt (argc, argv, "j:");
-		if (c != -1)
+	while ((c = getopt(argc , argv, "c:j:v")) != -1) {
+		switch (c) {
+			case 'c':
+			config_path = strdup (optarg);
+			break;
+			case 'j':
 			thumbnail_path = strdup (optarg);
+			break;
+			case 'v':
+			printf("tint2 version 0.7-svn\n");
+			exit(0);
+			break;
+		}
 	}
 
 	// Set signal handler
@@ -65,6 +73,7 @@ void init (int argc, char *argv[])
 	signal(SIGTERM, signal_handler);
 	signal(SIGHUP, signal_handler);
 	signal(SIGCHLD, SIG_IGN);		// don't have to wait() after fork()
+	signal(SIGALRM, tooltip_sighandler);
 
 	// set global data
 	memset(&server, 0, sizeof(Server_global));
@@ -125,40 +134,38 @@ void cleanup()
 }
 
 
-Taskbar *click_taskbar (Panel *panel, XEvent *e)
+Taskbar *click_taskbar (Panel *panel, int x, int y)
 {
-	GSList *l0;
-	Taskbar *tskbar = NULL;
+	Taskbar *tskbar;
+	int i;
+
 	if (panel_horizontal) {
-		int x = e->xbutton.x;
-		for (l0 = panel->area.list; l0 ; l0 = l0->next) {
-			tskbar = l0->data;
+		for (i=0; i < panel->nb_desktop ; i++) {
+			tskbar = &panel->taskbar[i];
 			if (!tskbar->area.on_screen) continue;
 			if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
-				break;
+				return tskbar;
 		}
 	}
 	else {
-		int y = e->xbutton.y;
-		for (l0 = panel->area.list; l0 ; l0 = l0->next) {
-			tskbar = l0->data;
+		for (i=0; i < panel->nb_desktop ; i++) {
+			tskbar = &panel->taskbar[i];
 			if (!tskbar->area.on_screen) continue;
 			if (y >= tskbar->area.posy && y <= (tskbar->area.posy + tskbar->area.height))
-				break;
+				return tskbar;
 		}
 	}
-	return tskbar;
+	return NULL;
 }
 
 
-Task *click_task (Panel *panel, XEvent *e)
+Task *click_task (Panel *panel, int x, int y)
 {
 	GSList *l0;
 	Taskbar *tskbar;
 
-	if ( (tskbar = click_taskbar(panel, e)) ) {
+	if ( (tskbar = click_taskbar(panel, x, y)) ) {
 		if (panel_horizontal) {
-			int x = e->xbutton.x;
 			Task *tsk;
 			for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
 				tsk = l0->data;
@@ -168,7 +175,6 @@ Task *click_task (Panel *panel, XEvent *e)
 			}
 		}
 		else {
-			int y = e->xbutton.y;
 			Task *tsk;
 			for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
 				tsk = l0->data;
@@ -182,28 +188,28 @@ Task *click_task (Panel *panel, XEvent *e)
 }
 
 
-int click_padding(Panel *panel, XEvent *e)
+int click_padding(Panel *panel, int x, int y)
 {
 	if (panel_horizontal) {
-		if (e->xbutton.x < panel->area.paddingxlr || e->xbutton.x > panel->area.width-panel->area.paddingxlr)
+		if (x < panel->area.paddingxlr || x > panel->area.width-panel->area.paddingxlr)
 		return 1;
 	}
 	else {
-		if (e->xbutton.y < panel->area.paddingxlr || e->xbutton.y > panel->area.height-panel->area.paddingxlr)
+		if (y < panel->area.paddingxlr || y > panel->area.height-panel->area.paddingxlr)
 		return 1;
 	}
 	return 0;
 }
 
 
-int click_clock(Panel *panel, XEvent *e)
+int click_clock(Panel *panel, int x, int y)
 {
 	Clock clk = panel->clock;
 	if (panel_horizontal) {
-		if (clk.area.on_screen && e->xbutton.x >= clk.area.posx && e->xbutton.x <= (clk.area.posx + clk.area.width))
+		if (clk.area.on_screen && x >= clk.area.posx && x <= (clk.area.posx + clk.area.width))
 			return TRUE;
 	} else {
-		if (clk.area.on_screen && e->xbutton.y >= clk.area.posy && e->xbutton.y <= (clk.area.posy + clk.area.height))
+		if (clk.area.on_screen && y >= clk.area.posy && y <= (clk.area.posy + clk.area.height))
 			return TRUE;
 	}
 	return FALSE;
@@ -263,9 +269,9 @@ void event_button_press (XEvent *e)
 	if (!panel) return;
 
 	if (panel_mode == MULTI_DESKTOP)
-		task_drag = click_task(panel, e);
+		task_drag = click_task(panel, e->xbutton.x, e->xbutton.y);
 
-	if (wm_menu && !task_drag && !click_clock(panel, e) && (e->xbutton.button != 1) ) {
+	if (wm_menu && !task_drag && !click_clock(panel, e->xbutton.x, e->xbutton.y) && (e->xbutton.button != 1) ) {
 		// forward the click to the desktop window (thanks conky)
 		XUngrabPointer(server.dsp, e->xbutton.time);
 		e->xbutton.window = server.root_win;
@@ -288,7 +294,7 @@ void event_button_release (XEvent *e)
 	Panel *panel = get_panel(e->xany.window);
 	if (!panel) return;
 
-	if (wm_menu && click_padding(panel, e)) {
+	if (wm_menu && click_padding(panel, e->xbutton.x, e->xbutton.y)) {
 			// forward the click to the desktop window (thanks conky)
 			e->xbutton.window = server.root_win;
 			XSendEvent(server.dsp, e->xbutton.window, False, ButtonReleaseMask, e);
@@ -317,7 +323,7 @@ void event_button_release (XEvent *e)
 			break;
 	}
 
-	if ( click_clock(panel, e)) {
+	if ( click_clock(panel, e->xbutton.x, e->xbutton.y)) {
 		clock_action(e->xbutton.button);
 		XLowerWindow (server.dsp, panel->main_win);
 		task_drag = 0;
@@ -325,7 +331,7 @@ void event_button_release (XEvent *e)
 	}
 
 	Taskbar *tskbar;
-	if ( !(tskbar = click_taskbar(panel, e)) ) {
+	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);
 		task_drag = 0;
@@ -353,7 +359,7 @@ void event_button_release (XEvent *e)
 	}
 
 	// action on task
-	window_action( click_task(panel, e), action);
+	window_action( click_task(panel, e->xbutton.x, e->xbutton.y), action);
 
 	// to keep window below
 	XLowerWindow (server.dsp, panel->main_win);
@@ -514,6 +520,7 @@ void event_property_notify (XEvent *e)
 			}
 			if (window_is_skip_taskbar(win)) {
 				remove_task( tsk );
+				panel_refresh = 1;
 			}
 		}
 		else if (at == server.atom.WM_STATE) {
@@ -582,12 +589,15 @@ void event_property_notify (XEvent *e)
 
 void event_expose (XEvent *e)
 {
-	Panel *panel;
-
-	panel = get_panel(e->xany.window);
-	if (!panel) return;
-	// TODO : one panel_refresh per panel ?
-	panel_refresh = 1;
+	if (e->xany.window == g_tooltip.window)
+		tooltip_update();
+	else {
+		Panel *panel;
+		panel = get_panel(e->xany.window);
+		if (!panel) return;
+		// TODO : one panel_refresh per panel ?
+		panel_refresh = 1;
+	}
 }
 
 
@@ -664,6 +674,36 @@ void event_timer()
 }
 
 
+void dnd_message(XClientMessageEvent *e)
+{
+	Panel *panel = get_panel(e->window);
+	int x, y, mapX, mapY;
+	Window child;
+	x = (e->data.l[2] >> 16) & 0xFFFF;
+	y = e->data.l[2] & 0xFFFF;
+	XTranslateCoordinates(server.dsp, server.root_win, e->window, x, y, &mapX, &mapY, &child);
+	Task* task = click_task(panel, mapX, mapY);
+	if (task) {
+		if (task->desktop != server.desktop )
+			set_desktop (task->desktop);
+		window_action(task, TOGGLE);
+	}
+
+	// send XdndStatus event to get more XdndPosition events
+	XClientMessageEvent se;
+	se.type = ClientMessage;
+	se.window = e->data.l[0];
+	se.message_type = server.atom.XdndStatus;
+	se.format = 32;
+	se.data.l[0] = e->window;  // XID of the target window
+	se.data.l[1] = 0;          // bit 0: accept drop    bit 1: send XdndPosition events if inside rectangle
+	se.data.l[2] = 0;          // Rectangle x,y for which no more XdndPosition events
+	se.data.l[3] = (1 << 16) | 1;  // Rectangle w,h for which no more XdndPosition events
+	se.data.l[4] = None;       // None = drop will not be accepted
+	XSendEvent(server.dsp, e->data.l[0], False, NoEventMask, (XEvent*)&se);
+}
+
+
 int main (int argc, char *argv[])
 {
 	XEvent e;
@@ -674,7 +714,6 @@ int main (int argc, char *argv[])
 	GSList *it;
 
 	init (argc, argv);
-
 load_config:
 	i = 0;
 	init_config();
@@ -714,6 +753,7 @@ load_config:
 
 				switch (e.type) {
 					case ButtonPress:
+						tooltip_hide();
 						event_button_press (&e);
 						break;
 
@@ -721,6 +761,20 @@ load_config:
 						event_button_release(&e);
 						break;
 
+					case MotionNotify: {
+						Panel* panel = get_panel(e.xmotion.window);
+						Task* task = click_task(panel, e.xmotion.x, e.xmotion.y);
+						if (task)
+							tooltip_trigger_show(task, e.xmotion.x_root, e.xmotion.y_root);
+						else
+							tooltip_trigger_hide();
+						break;
+					}
+
+					case LeaveNotify:
+						tooltip_trigger_hide();
+						break;
+
 					case Expose:
 						event_expose(&e);
 						break;
@@ -761,6 +815,9 @@ load_config:
 						if (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) {
+							dnd_message(&e.xclient);
+						}
 						break;
 				}
 			}