enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

formatting 

SVN revision: 72541
This commit is contained in:
Mike Blumenkrantz 2012-06-20 12:55:44 +00:00
parent 1a7c41f86a
commit 7a38549bd4
2 changed files with 272 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/modules/systray/e_mod_main.c
View File

@ -269,34 +269,49 @@ _systray_gravity(const Instance *inst)
{
case E_GADCON_ORIENT_FLOAT:
return ECORE_X_GRAVITY_STATIC;
case E_GADCON_ORIENT_HORIZ:
return ECORE_X_GRAVITY_CENTER;
case E_GADCON_ORIENT_VERT:
return ECORE_X_GRAVITY_CENTER;
case E_GADCON_ORIENT_LEFT:
return ECORE_X_GRAVITY_CENTER;
case E_GADCON_ORIENT_RIGHT:
return ECORE_X_GRAVITY_CENTER;
case E_GADCON_ORIENT_TOP:
return ECORE_X_GRAVITY_CENTER;
case E_GADCON_ORIENT_BOTTOM:
return ECORE_X_GRAVITY_CENTER;
case E_GADCON_ORIENT_CORNER_TL:
return ECORE_X_GRAVITY_S;
case E_GADCON_ORIENT_CORNER_TR:
return ECORE_X_GRAVITY_S;
case E_GADCON_ORIENT_CORNER_BL:
return ECORE_X_GRAVITY_N;
case E_GADCON_ORIENT_CORNER_BR:
return ECORE_X_GRAVITY_N;
case E_GADCON_ORIENT_CORNER_LT:
return ECORE_X_GRAVITY_E;
case E_GADCON_ORIENT_CORNER_RT:
return ECORE_X_GRAVITY_W;
case E_GADCON_ORIENT_CORNER_LB:
return ECORE_X_GRAVITY_E;
case E_GADCON_ORIENT_CORNER_RB:
return ECORE_X_GRAVITY_W;
default:
return ECORE_X_GRAVITY_STATIC;
}
@ -653,10 +668,12 @@ _systray_handle_op_code(Instance *inst, Ecore_X_Event_Client_Message *ev)
case SYSTEM_TRAY_REQUEST_DOCK:
_systray_handle_request_dock(inst, ev);
break;
case SYSTEM_TRAY_BEGIN_MESSAGE:
case SYSTEM_TRAY_CANCEL_MESSAGE:
fputs("SYSTRAY TODO: handle messages (anyone uses this?)\n", stderr);
break;
default:
fprintf(stderr,
"SYSTRAY: error, unknown message op code: %ld, win: %#lx\n",
@ -876,11 +893,10 @@ _systray_theme(Evas_Object *o, const char *shelf_style, const char *gc_style)
return;
}
fallback:
fallback:
edje_object_file_set(o, path, _group_gadget);
}
static E_Gadcon_Client *
_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
{
@ -921,7 +937,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
if ((gc->shelf) && (gc->shelf->popup))
inst->win.parent = gc->shelf->popup->evas_win;
else
inst->win.parent = (Ecore_X_Window) ecore_evas_window_get(gc->ecore_evas);
inst->win.parent = (Ecore_X_Window)ecore_evas_window_get(gc->ecore_evas);
inst->win.base = 0;
inst->win.selection = 0;
@ -1033,62 +1049,77 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
sig = "e,action,orient,float";
systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
break;
case E_GADCON_ORIENT_HORIZ:
sig = "e,action,orient,horiz";
systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
break;
case E_GADCON_ORIENT_VERT:
sig = "e,action,orient,vert";
systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_VERT;
break;
case E_GADCON_ORIENT_LEFT:
sig = "e,action,orient,left";
systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_VERT;
break;
case E_GADCON_ORIENT_RIGHT:
sig = "e,action,orient,right";
systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_VERT;
break;
case E_GADCON_ORIENT_TOP:
sig = "e,action,orient,top";
systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
break;
case E_GADCON_ORIENT_BOTTOM:
sig = "e,action,orient,bottom";
systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
break;
case E_GADCON_ORIENT_CORNER_TL:
sig = "e,action,orient,corner_tl";
systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
break;
case E_GADCON_ORIENT_CORNER_TR:
sig = "e,action,orient,corner_tr";
systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
break;
case E_GADCON_ORIENT_CORNER_BL:
sig = "e,action,orient,corner_bl";
systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
break;
case E_GADCON_ORIENT_CORNER_BR:
sig = "e,action,orient,corner_br";
systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
break;
case E_GADCON_ORIENT_CORNER_LT:
sig = "e,action,orient,corner_lt";
systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_VERT;
break;
case E_GADCON_ORIENT_CORNER_RT:
sig = "e,action,orient,corner_rt";
systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_VERT;
break;
case E_GADCON_ORIENT_CORNER_LB:
sig = "e,action,orient,corner_lb";
systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_VERT;
break;
case E_GADCON_ORIENT_CORNER_RB:
sig = "e,action,orient,corner_rb";
systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_VERT;
break;
default:
sig = "e,action,orient,horiz";
systray_orient = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
@ -1177,3 +1208,4 @@ e_modapi_save(E_Module *m __UNUSED__)
{
return 1;
}