From 19cba77f5bb4b4002b53ba2efbb2dff13691313d Mon Sep 17 00:00:00 2001
From: sebastid <sebastid>
Date: Sun, 24 Apr 2005 19:56:42 +0000
Subject: [PATCH] Dragging windows between desks work now.

SVN revision: 14326
---
 src/bin/e_border.c                  | 15 +++++++++++----
 src/bin/e_int_menus.c               |  2 +-
 src/bin/e_intl.c                    |  2 --
 src/bin/e_ipc.c                     |  2 +-
 src/modules/cpufreq/e_mod_main.c    |  7 ++++---
 src/modules/dropshadow/e_mod_main.c |  2 --
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index e639ad920..aaf0ea48d 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -93,6 +93,7 @@ static void _e_border_event_border_stick_free(void *data, void *ev);
 static void _e_border_event_border_unstick_free(void *data, void *ev);
 
 static void _e_border_zone_update(E_Border *bd);
+static void _e_border_desk_update(E_Border *bd);
 
 static void _e_border_resize_begin(E_Border *bd);
 static void _e_border_resize_end(E_Border *bd);
@@ -437,6 +438,7 @@ e_border_hide(E_Border *bd, int manage)
    E_OBJECT_CHECK(bd);
    E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
    if (!bd->visible) return;
+   if (bd->moving) return;
 
    ecore_x_window_hide(bd->client.win);
    e_container_shape_hide(bd->shape);
@@ -487,6 +489,7 @@ e_border_move(E_Border *bd, int x, int y)
 				  bd->client.h);
    _e_border_move_update(bd);
    _e_border_zone_update(bd);
+   _e_border_desk_update(bd);
    ev = calloc(1, sizeof(E_Event_Border_Move));
    ev->border = bd;
    e_object_ref(E_OBJECT(bd));
@@ -1749,6 +1752,7 @@ _e_border_cb_signal_move_stop(void *data, Evas_Object *obj, const char *emission
    bd = data;
    bd->moving = 0;
    _e_border_move_end(bd);
+   e_zone_flip_coords_handle(bd->zone, -1, -1);
 }
 
 static void
@@ -2254,6 +2258,7 @@ _e_border_cb_mouse_up(void *data, int type, void *event)
 			  {
 			     bd->moving = 0;
 			     _e_border_move_end(bd);
+			     e_zone_flip_coords_handle(bd->zone, -1, -1);
 			  }
 			break;
 		     case E_BINDING_ACTION_RESIZE:
@@ -2329,9 +2334,7 @@ _e_border_cb_mouse_move(void *data, int type, void *event)
 					   &new_x, &new_y, &new_w, &new_h);
 	evas_list_free(skiplist);
 	e_border_move(bd, new_x, new_y);
-#if 0
 	e_zone_flip_coords_handle(bd->zone, ev->root.x, ev->root.y);
-#endif
      }
    else if (bd->resize_mode != RESIZE_NONE)
      {
@@ -2635,7 +2638,6 @@ _e_border_eval(E_Border *bd)
    if (bd->client.border.changed)
      {
 	Evas_Object *o;
-	const char *path;
 	char buf[4096];
 	Evas_Coord cx, cy, cw, ch;
 	int l, r, t, b;
@@ -3858,7 +3860,6 @@ _e_border_event_border_icon_change_free(void *data, void *ev)
    free(e);
 }
 
-
 static void
 _e_border_zone_update(E_Border *bd)
 {
@@ -3885,6 +3886,12 @@ _e_border_zone_update(E_Border *bd)
      }
 }
 
+static void
+_e_border_desk_update(E_Border *bd)
+{
+   e_border_desk_set(bd, e_desk_current_get(bd->zone));
+}
+
 static void
 _e_border_resize_begin(E_Border *bd)
 {
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index 8cb652d94..f742f5a31 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -429,7 +429,7 @@ _e_int_menus_clients_pre_cb(void *data, E_Menu *m)
    E_Menu_Item *mi;
    Evas_List *l, *borders = NULL;
    E_Menu *root;
-   E_Zone *zone;
+   E_Zone *zone = NULL;
 
    e_menu_pre_activate_callback_set(m, NULL, NULL);
    root = e_menu_root_get(m);
diff --git a/src/bin/e_intl.c b/src/bin/e_intl.c
index 5797c5985..77e914c80 100644
--- a/src/bin/e_intl.c
+++ b/src/bin/e_intl.c
@@ -67,8 +67,6 @@ e_intl_shutdown(void)
 void
 e_intl_language_set(const char *lang)
 {
-   char buf[4096];
-   
    if (_e_intl_language) free(_e_intl_language);
    if (!lang) lang = getenv("LANG");
    if (lang)
diff --git a/src/bin/e_ipc.c b/src/bin/e_ipc.c
index d0b11803e..0073aa82f 100644
--- a/src/bin/e_ipc.c
+++ b/src/bin/e_ipc.c
@@ -308,7 +308,7 @@ _e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event)
       case E_IPC_OP_FONT_DEFAULT_SET:
 	  {
 	     char ** argv;
-	     int i, argc;
+	     int argc;
 	     
 	     argc = 3;
 	     
diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c
index fafa3307c..f061021a6 100644
--- a/src/modules/cpufreq/e_mod_main.c
+++ b/src/modules/cpufreq/e_mod_main.c
@@ -1,5 +1,6 @@
 #include <Ecore.h>
 #include <errno.h>
+#include <ctype.h>
 #include "e_mod_main.h"
 
 /* FIXME: check permissions (can execute) setfreq before trying
@@ -852,6 +853,9 @@ _cpufreq_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change ch
 	 evas_object_raise(ef->freq_object);
 	 evas_object_raise(ef->event_object);
 	 break;
+      case E_GADMAN_CHANGE_EDGE:
+      case E_GADMAN_CHANGE_ZONE:
+	 break;
      }
 }
 
@@ -984,11 +988,9 @@ _cpufreq_face_update_current(Cpufreq_Face *face)
 static void
 _cpufreq_face_cb_set_frequency(void *data, Evas_Object *obj, const char *emission, const char *src)
 {
-   int pid;
    Cpufreq *e;
    Evas_List *l;
    int next_frequency = 0;
-   char buf[128];
 
    e = data;
    
@@ -1020,7 +1022,6 @@ _cpufreq_face_cb_set_frequency(void *data, Evas_Object *obj, const char *emissio
 static void
 _cpufreq_face_cb_set_governor(void *data, Evas_Object *obj, const char *emission, const char *src)
 {
-   int pid;
    Cpufreq *e;
    Evas_List *l;
    char *next_governor = NULL;
diff --git a/src/modules/dropshadow/e_mod_main.c b/src/modules/dropshadow/e_mod_main.c
index 1e0eabc3d..e5a00324e 100644
--- a/src/modules/dropshadow/e_mod_main.c
+++ b/src/modules/dropshadow/e_mod_main.c
@@ -655,7 +655,6 @@ _ds_shadow_obj_init_rects(Shadow *sh, Evas_List *rects)
 {
    E_Container *con;
    Evas_List *l;
-   int i;
    
    if (sh->initted) return;
    sh->initted = 1;
@@ -1142,7 +1141,6 @@ _ds_shadow_recalc(Shadow *sh)
 		    {
 		       Shadow_Object *so;
 		       E_Rect *r;
-		       int x, y, w, h;
 		       
 		       r = l->data;
 		       so = ll->data;