X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Ftint.c;h=23970f087b32a91208cd67881bdc0cf48922f07b;hb=1aa4f37b38e07a8b08b17cfbcf5259e287d421a3;hp=0b9a7197a0e19239a3fc2cd599293ad33d5227a0;hpb=193dc2326844bd0c11c6188f634b79546a235557;p=chaz%2Ftint2

diff --git a/src/tint.c b/src/tint.c
index 0b9a719..23970f0 100644
--- a/src/tint.c
+++ b/src/tint.c
@@ -303,6 +303,60 @@ void event_button_press (XEvent *e)
 	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)
 {
@@ -354,17 +408,10 @@ void event_button_release (XEvent *e)
 	}
 
 	// 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
@@ -677,13 +724,6 @@ int main (int argc, char *argv[])
 		if (panel_refresh) {
 			panel_refresh = 0;
 
-			// QUESTION: do we need this first refresh_systray, because we check refresh_systray once again later...
-			// ANSWER: yes, panel->temp_pmap is freeded in the loop.
-			// we change background to None to avoid tray icon using freeded pixmap.
-			if (refresh_systray) {
-				panel = (Panel*)systray.area.panel;
-				XSetWindowBackgroundPixmap (server.dsp, panel->main_win, None);
-			}
 			for (i=0 ; i < nb_panel ; i++) {
 				panel = &panel1[i];
 
@@ -701,7 +741,7 @@ int main (int argc, char *argv[])
 			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);
@@ -746,6 +786,10 @@ 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);
@@ -799,7 +843,7 @@ int main (int argc, char *argv[])
 					break;
 
 					case ClientMessage:
-						ev = &e;
+						ev = &e.xclient;
 						if (ev->data.l[1] == server.atom._NET_WM_CM_S0) {
 							if (ev->data.l[2] == None)
 								// TODO: Stop real_transparency
@@ -828,7 +872,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;
 								}