X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftint.c;h=ba79855190a3b512f9148eed3b44758a4e5e3124;hb=ed39165e7908dda7b2c7581075ef71a6de669a59;hp=ffd1c5cd8fabf8b0c1b6bb051d97da93815a2a41;hpb=a36e39c7c2fedd87847514d561dc7d7bded2a3fa;p=chaz%2Ftint2

diff --git a/src/tint.c b/src/tint.c
index ffd1c5c..ba79855 100644
--- a/src/tint.c
+++ b/src/tint.c
@@ -112,8 +112,95 @@ void cleanup()
 }
 
 
+Taskbar *click_taskbar (Panel *panel, XEvent *e)
+{
+	GSList *l0;
+	Taskbar *tskbar = NULL;
+	if (panel_horizontal) {
+		int x = e->xbutton.x;
+		for (l0 = panel->area.list; l0 ; l0 = l0->next) {
+			tskbar = l0->data;
+			if (!tskbar->area.on_screen) continue;
+			if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
+				break;
+		}
+	}
+	else {
+		int y = e->xbutton.y;
+		for (l0 = panel->area.list; l0 ; l0 = l0->next) {
+			tskbar = l0->data;
+			if (!tskbar->area.on_screen) continue;
+			if (y >= tskbar->area.posy && y <= (tskbar->area.posy + tskbar->area.height))
+				break;
+		}
+	}
+	return tskbar;
+}
+
+
+Task *click_task (Panel *panel, XEvent *e)
+{
+	GSList *l0;
+	Taskbar *tskbar;
+
+	if ( (tskbar = click_taskbar(panel, e)) ) {
+		if (panel_horizontal) {
+			int x = e->xbutton.x;
+			Task *tsk;
+			for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
+				tsk = l0->data;
+				if (x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) {
+					return tsk;
+				}
+			}
+		}
+		else {
+			int y = e->xbutton.y;
+			Task *tsk;
+			for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
+				tsk = l0->data;
+				if (y >= tsk->area.posy && y <= (tsk->area.posy + tsk->area.height)) {
+					return tsk;
+				}
+			}
+		}
+	}
+	return NULL;
+}
+
+
+int click_padding(Panel *panel, XEvent *e)
+{
+	if (panel_horizontal) {
+		if (e->xbutton.x < panel->area.paddingxlr || e->xbutton.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)
+		return 1;
+	}
+	return 0;
+}
+
+
+int click_clock(Panel *panel, XEvent *e)
+{
+	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))
+			return TRUE;
+	} else {
+		if (clk.area.on_screen && e->xbutton.y >= clk.area.posy && e->xbutton.y <= (clk.area.posy + clk.area.height))
+			return TRUE;
+	}
+	return FALSE;
+}
+
+
 void window_action (Task *tsk, int action)
 {
+   if (!tsk) return;
+	int desk;
 	switch (action) {
 		case CLOSE:
 			set_close (tsk->win);
@@ -140,6 +227,19 @@ void window_action (Task *tsk, int action)
 		case RESTORE:
 			window_maximize_restore (tsk->win);
 			break;
+		case DESKTOP_LEFT:
+			if ( tsk->desktop == 0 ) break;
+			desk = tsk->desktop - 1;
+			windows_set_desktop(tsk->win, desk);
+			if (desk == server.desktop)
+				set_active(tsk->win);
+			break;
+		case DESKTOP_RIGHT:
+			if (tsk->desktop == server.nb_desktop ) break;
+			desk = tsk->desktop + 1;
+			windows_set_desktop(tsk->win, desk);
+			if (desk == server.desktop)
+				set_active(tsk->win);
 	}
 }
 
@@ -149,71 +249,23 @@ void event_button_press (XEvent *e)
    Panel *panel = get_panel(e->xany.window);
 	if (!panel) return;
 
-	if (wm_menu) {
-		if ((panel_horizontal && (e->xbutton.x < panel->area.paddingxlr || e->xbutton.x > panel->area.width-panel->area.paddingxlr || e->xbutton.y < panel->area.paddingy || e->xbutton.y > panel->area.paddingy+panel->g_taskbar.height)) || (!panel_horizontal && (e->xbutton.y < panel->area.paddingxlr || e->xbutton.y > panel->area.height-panel->area.paddingxlr || e->xbutton.x < panel->area.paddingy || e->xbutton.x > panel->area.paddingy+panel->g_taskbar.width))) {
-			// forward the click to the desktop window (thanks conky)
-			XUngrabPointer(server.dsp, e->xbutton.time);
-			e->xbutton.window = server.root_win;
-			// icewm doesn't open under the mouse.
-			// and xfce doesn't open at all.
-			//e->xbutton.x = e->xbutton.x_root;
-			//e->xbutton.y = e->xbutton.y_root;
-			//printf("**** %d, %d\n", e->xbutton.x, e->xbutton.y);
-			XSetInputFocus(server.dsp, e->xbutton.window, RevertToParent, e->xbutton.time);
-			XSendEvent(server.dsp, e->xbutton.window, False, ButtonPressMask, e);
-			return;
-		}
-	}
-
-	if (e->xbutton.button != 1) return;
-
-   if (panel_mode != MULTI_DESKTOP) {
-      // drag and drop disabled
-      XLowerWindow (server.dsp, panel->main_win);
-      return;
+	if (panel_mode == MULTI_DESKTOP)
+		task_drag = click_task(panel, e);
+
+   if (wm_menu && !task_drag && !click_clock(panel, e) && (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;
+		// icewm doesn't open under the mouse.
+		// and xfce doesn't open at all.
+		//e->xbutton.x = e->xbutton.x_root;
+		//e->xbutton.y = e->xbutton.y_root;
+		//printf("**** %d, %d\n", e->xbutton.x, e->xbutton.y);
+		XSetInputFocus(server.dsp, e->xbutton.window, RevertToParent, e->xbutton.time);
+		XSendEvent(server.dsp, e->xbutton.window, False, ButtonPressMask, e);
+		return;
    }
 
-   GSList *l0;
-   Taskbar *tskbar;
-	if (panel_horizontal) {
-		int x = e->xbutton.x;
-		for (l0 = panel->area.list; l0 ; l0 = l0->next) {
-			tskbar = l0->data;
-			if (!tskbar->area.on_screen) continue;
-			if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
-				break;
-		}
-		if (l0) {
-			Task *tsk;
-			for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
-				tsk = l0->data;
-				if (x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) {
-					task_drag = tsk;
-					break;
-				}
-			}
-		}
-	}
-	else {
-		int y = e->xbutton.y;
-		for (l0 = panel->area.list; l0 ; l0 = l0->next) {
-			tskbar = l0->data;
-			if (!tskbar->area.on_screen) continue;
-			if (y >= tskbar->area.posy && y <= (tskbar->area.posy + tskbar->area.height))
-				break;
-		}
-		if (l0) {
-			Task *tsk;
-			for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
-				tsk = l0->data;
-				if (y >= tsk->area.posy && y <= (tsk->area.posy + tsk->area.height)) {
-					task_drag = tsk;
-					break;
-				}
-			}
-		}
-	}
-
    XLowerWindow (server.dsp, panel->main_win);
 }
 
@@ -223,18 +275,14 @@ void event_button_release (XEvent *e)
    Panel *panel = get_panel(e->xany.window);
 	if (!panel) return;
 
-	if (wm_menu) {
-		if ((panel_horizontal && (e->xbutton.x < panel->area.paddingxlr || e->xbutton.x > panel->area.width-panel->area.paddingxlr || e->xbutton.y < panel->area.paddingy || e->xbutton.y > panel->area.paddingy+panel->g_taskbar.height)) || (!panel_horizontal && (e->xbutton.y < panel->area.paddingxlr || e->xbutton.y > panel->area.height-panel->area.paddingxlr || e->xbutton.x < panel->area.paddingy || e->xbutton.x > panel->area.paddingy+panel->g_taskbar.width))) {
+	if (wm_menu && click_padding(panel, e)) {
 			// forward the click to the desktop window (thanks conky)
 			e->xbutton.window = server.root_win;
 			XSendEvent(server.dsp, e->xbutton.window, False, ButtonReleaseMask, e);
 			return;
-		}
 	}
 
    int action = TOGGLE_ICONIFY;
-   int x = e->xbutton.x;
-   int y = e->xbutton.y;
    switch (e->xbutton.button) {
       case 2:
          action = mouse_middle;
@@ -248,43 +296,29 @@ void event_button_release (XEvent *e)
       case 5:
          action = mouse_scroll_down;
          break;
+      case 6:
+         action = mouse_tilt_left;
+         break;
+      case 7:
+         action = mouse_tilt_right;
+         break;
    }
 
-   // search taskbar
-   Taskbar *tskbar;
-   GSList *l0;
-	Clock clk = panel->clock;
-	if (panel_horizontal) {
-		if (clk.area.on_screen && x >= clk.area.posx && x <= (clk.area.posx + clk.area.width))
-			clock_action(e->xbutton.button);
-		else {
-			for (l0 = panel->area.list; l0 ; l0 = l0->next) {
-				tskbar = l0->data;
-				if (!tskbar->area.on_screen) continue;
-				if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
-					goto suite;
-			}
-		}
-	}
-	else {
-		if (clk.area.on_screen && y >= clk.area.posy && y <= (clk.area.posy + clk.area.height))
-			clock_action(e->xbutton.button);
-		else {
-			for (l0 = panel->area.list; l0 ; l0 = l0->next) {
-				tskbar = l0->data;
-				if (!tskbar->area.on_screen) continue;
-				if (y >= tskbar->area.posy && y <= (tskbar->area.posy + tskbar->area.height))
-					goto suite;
-			}
-		}
+	if ( click_clock(panel, e)) {
+		clock_action(e->xbutton.button);
+		XLowerWindow (server.dsp, panel->main_win);
+		task_drag = 0;
+		return;
 	}
 
-   // TODO: check better solution to keep window below
-   XLowerWindow (server.dsp, panel->main_win);
-   task_drag = 0;
-   return;
+	Taskbar *tskbar;
+	if ( !(tskbar = click_taskbar(panel, e)) ) {
+		// TODO: check better solution to keep window below
+		XLowerWindow (server.dsp, panel->main_win);
+		task_drag = 0;
+		return;
+	}
 
-suite:
    // drag and drop task
    if (task_drag) {
       if (tskbar != task_drag->area.parent && action == TOGGLE_ICONIFY) {
@@ -301,28 +335,12 @@ suite:
 
    // switch desktop
    if (panel_mode == MULTI_DESKTOP) {
-      if (tskbar->desktop != server.desktop && action != CLOSE)
+      if (tskbar->desktop != server.desktop && action != CLOSE && action != DESKTOP_LEFT && action != DESKTOP_RIGHT)
          set_desktop (tskbar->desktop);
 	}
 
    // action on task
-   Task *tsk;
-   GSList *l;
-   for (l = tskbar->area.list ; l ; l = l->next) {
-      tsk = l->data;
-		if (panel_horizontal) {
-			if (x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) {
-				window_action (tsk, action);
-				break;
-			}
-		}
-		else {
-			if (y >= tsk->area.posy && y <= (tsk->area.posy + tsk->area.height)) {
-				window_action (tsk, action);
-				break;
-			}
-		}
-   }
+   window_action( click_task(panel, e), action);
 
    // to keep window below
    XLowerWindow (server.dsp, panel->main_win);
@@ -482,6 +500,7 @@ void event_property_notify (XEvent *e)
 							tsk2->icon_width = tsk->icon_width;
 							tsk2->icon_height = tsk->icon_height;
 							tsk2->icon_data = tsk->icon_data;
+							tsk2->icon_data_active = tsk->icon_data_active;
 							tsk2->area.redraw = 1;
 						}
 					}