Dragging windows between desks work now.

SVN revision: 14326
This commit is contained in:
sebastid 2005-04-24 19:56:42 +00:00 committed by sebastid
parent 15996823aa
commit 19cba77f5b
6 changed files with 17 additions and 13 deletions

View File

@ -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_event_border_unstick_free(void *data, void *ev);
static void _e_border_zone_update(E_Border *bd); 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_begin(E_Border *bd);
static void _e_border_resize_end(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_CHECK(bd);
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE); E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
if (!bd->visible) return; if (!bd->visible) return;
if (bd->moving) return;
ecore_x_window_hide(bd->client.win); ecore_x_window_hide(bd->client.win);
e_container_shape_hide(bd->shape); e_container_shape_hide(bd->shape);
@ -487,6 +489,7 @@ e_border_move(E_Border *bd, int x, int y)
bd->client.h); bd->client.h);
_e_border_move_update(bd); _e_border_move_update(bd);
_e_border_zone_update(bd); _e_border_zone_update(bd);
_e_border_desk_update(bd);
ev = calloc(1, sizeof(E_Event_Border_Move)); ev = calloc(1, sizeof(E_Event_Border_Move));
ev->border = bd; ev->border = bd;
e_object_ref(E_OBJECT(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 = data;
bd->moving = 0; bd->moving = 0;
_e_border_move_end(bd); _e_border_move_end(bd);
e_zone_flip_coords_handle(bd->zone, -1, -1);
} }
static void static void
@ -2254,6 +2258,7 @@ _e_border_cb_mouse_up(void *data, int type, void *event)
{ {
bd->moving = 0; bd->moving = 0;
_e_border_move_end(bd); _e_border_move_end(bd);
e_zone_flip_coords_handle(bd->zone, -1, -1);
} }
break; break;
case E_BINDING_ACTION_RESIZE: 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); &new_x, &new_y, &new_w, &new_h);
evas_list_free(skiplist); evas_list_free(skiplist);
e_border_move(bd, new_x, new_y); e_border_move(bd, new_x, new_y);
#if 0
e_zone_flip_coords_handle(bd->zone, ev->root.x, ev->root.y); e_zone_flip_coords_handle(bd->zone, ev->root.x, ev->root.y);
#endif
} }
else if (bd->resize_mode != RESIZE_NONE) else if (bd->resize_mode != RESIZE_NONE)
{ {
@ -2635,7 +2638,6 @@ _e_border_eval(E_Border *bd)
if (bd->client.border.changed) if (bd->client.border.changed)
{ {
Evas_Object *o; Evas_Object *o;
const char *path;
char buf[4096]; char buf[4096];
Evas_Coord cx, cy, cw, ch; Evas_Coord cx, cy, cw, ch;
int l, r, t, b; int l, r, t, b;
@ -3858,7 +3860,6 @@ _e_border_event_border_icon_change_free(void *data, void *ev)
free(e); free(e);
} }
static void static void
_e_border_zone_update(E_Border *bd) _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 static void
_e_border_resize_begin(E_Border *bd) _e_border_resize_begin(E_Border *bd)
{ {

View File

@ -429,7 +429,7 @@ _e_int_menus_clients_pre_cb(void *data, E_Menu *m)
E_Menu_Item *mi; E_Menu_Item *mi;
Evas_List *l, *borders = NULL; Evas_List *l, *borders = NULL;
E_Menu *root; E_Menu *root;
E_Zone *zone; E_Zone *zone = NULL;
e_menu_pre_activate_callback_set(m, NULL, NULL); e_menu_pre_activate_callback_set(m, NULL, NULL);
root = e_menu_root_get(m); root = e_menu_root_get(m);

View File

@ -67,8 +67,6 @@ e_intl_shutdown(void)
void void
e_intl_language_set(const char *lang) e_intl_language_set(const char *lang)
{ {
char buf[4096];
if (_e_intl_language) free(_e_intl_language); if (_e_intl_language) free(_e_intl_language);
if (!lang) lang = getenv("LANG"); if (!lang) lang = getenv("LANG");
if (lang) if (lang)

View File

@ -308,7 +308,7 @@ _e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event)
case E_IPC_OP_FONT_DEFAULT_SET: case E_IPC_OP_FONT_DEFAULT_SET:
{ {
char ** argv; char ** argv;
int i, argc; int argc;
argc = 3; argc = 3;

View File

@ -1,5 +1,6 @@
#include <Ecore.h> #include <Ecore.h>
#include <errno.h> #include <errno.h>
#include <ctype.h>
#include "e_mod_main.h" #include "e_mod_main.h"
/* FIXME: check permissions (can execute) setfreq before trying /* 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->freq_object);
evas_object_raise(ef->event_object); evas_object_raise(ef->event_object);
break; 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 static void
_cpufreq_face_cb_set_frequency(void *data, Evas_Object *obj, const char *emission, const char *src) _cpufreq_face_cb_set_frequency(void *data, Evas_Object *obj, const char *emission, const char *src)
{ {
int pid;
Cpufreq *e; Cpufreq *e;
Evas_List *l; Evas_List *l;
int next_frequency = 0; int next_frequency = 0;
char buf[128];
e = data; e = data;
@ -1020,7 +1022,6 @@ _cpufreq_face_cb_set_frequency(void *data, Evas_Object *obj, const char *emissio
static void static void
_cpufreq_face_cb_set_governor(void *data, Evas_Object *obj, const char *emission, const char *src) _cpufreq_face_cb_set_governor(void *data, Evas_Object *obj, const char *emission, const char *src)
{ {
int pid;
Cpufreq *e; Cpufreq *e;
Evas_List *l; Evas_List *l;
char *next_governor = NULL; char *next_governor = NULL;

View File

@ -655,7 +655,6 @@ _ds_shadow_obj_init_rects(Shadow *sh, Evas_List *rects)
{ {
E_Container *con; E_Container *con;
Evas_List *l; Evas_List *l;
int i;
if (sh->initted) return; if (sh->initted) return;
sh->initted = 1; sh->initted = 1;
@ -1142,7 +1141,6 @@ _ds_shadow_recalc(Shadow *sh)
{ {
Shadow_Object *so; Shadow_Object *so;
E_Rect *r; E_Rect *r;
int x, y, w, h;
r = l->data; r = l->data;
so = ll->data; so = ll->data;