Enlightenment CVS committal Author : sebastid Project : e17 Module : apps/e
Dir : e17/apps/e/src/bin Modified Files: e_border.c e_border.h e_ipc_handlers.h e_ipc_handlers_list.h Log Message: IPC for maximize policy. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v retrieving revision 1.267 retrieving revision 1.268 diff -u -3 -r1.267 -r1.268 --- e_border.c 18 Jun 2005 05:08:17 -0000 1.267 +++ e_border.c 18 Jun 2005 12:51:00 -0000 1.268 @@ -1173,7 +1173,7 @@ /* FIXME */ break; } - bd->maximized = 1; + bd->maximized = e_config->maximize_policy; bd->changes.pos = 1; bd->changes.size = 1; bd->changed = 1; @@ -1192,9 +1192,8 @@ { // printf("UNMAXIMIZE!!\n"); e_hints_window_maximized_set(bd, 0); - bd->maximized = 0; - switch (e_config->maximize_policy) + switch (bd->maximized) { case E_MAXIMIZE_ZOOM: /* FIXME */ @@ -1233,6 +1232,7 @@ /* FIXME */ break; } + bd->maximized = 0; e_border_move_resize(bd, bd->saved.x, bd->saved.y, bd->saved.w, bd->saved.h); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.h,v retrieving revision 1.75 retrieving revision 1.76 diff -u -3 -r1.75 -r1.76 --- e_border.h 18 Jun 2005 04:29:42 -0000 1.75 +++ e_border.h 18 Jun 2005 12:51:00 -0000 1.76 @@ -35,12 +35,13 @@ typedef enum _E_Maximize_Policy { + E_MAXIMIZE_NONE, E_MAXIMIZE_ZOOM, E_MAXIMIZE_FULLSCREEN, E_MAXIMIZE_SMART, E_MAXIMIZE_EXPAND, E_MAXIMIZE_FILL -} E_Maximise_Policy; +} E_Maximize_Policy; @@ -254,7 +255,7 @@ unsigned char re_manage : 1; unsigned char shading : 1; unsigned char shaded : 1; - unsigned char maximized : 1; + E_Maximize_Policy maximized; unsigned char iconic : 1; unsigned char sticky : 1; unsigned char shaped : 1; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_ipc_handlers.h,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- e_ipc_handlers.h 13 Jun 2005 19:56:28 -0000 1.36 +++ e_ipc_handlers.h 18 Jun 2005 12:51:00 -0000 1.37 @@ -929,7 +929,7 @@ /****************************************************************************/ #define HDL E_IPC_OP_FOCUS_POLICY_SET #if (TYPE == E_REMOTE_OPTIONS) - OP("-focus-policy-set", 1, "Set the focus policy. OPT1 = CLICK or MOUSE or SLOPPY", 0, HDL) + OP("-focus-policy-set", 1, "Set the focus policy. OPT1 = CLICK, MOUSE or SLOPPY", 0, HDL) #elif (TYPE == E_REMOTE_OUT) REQ_INT_START(HDL) int value = 0; @@ -1410,6 +1410,46 @@ #endif #undef HDL +/****************************************************************************/ +#define HDL E_IPC_OP_MAXIMIZE_POLICY_SET +#if (TYPE == E_REMOTE_OPTIONS) + OP("-maximize-policy-set", 1, "Set the maximize policy. OPT1 = ZOOM, FULLSCREEN, SMART, EXPAND or FILL", 0, HDL) +#elif (TYPE == E_REMOTE_OUT) + REQ_INT_START(HDL) + int value = 0; + if (!strcmp(params[0], "ZOOM")) value = E_MAXIMIZE_ZOOM; + else if (!strcmp(params[0], "FULLSCREEN")) value = E_MAXIMIZE_FULLSCREEN; + else if (!strcmp(params[0], "SMART")) value = E_MAXIMIZE_SMART; + else if (!strcmp(params[0], "EXPAND")) value = E_MAXIMIZE_EXPAND; + else if (!strcmp(params[0], "FILL")) value = E_MAXIMIZE_FILL; + else + { + printf("maximize must be ZOOM, FULLSCREEN, SMART, EXPAND or FILL\n"); + exit(-1); + } + REQ_INT_END(value, HDL); +#elif (TYPE == E_WM_IN) + START_INT(value, HDL); + e_config->maximize_policy = value; + E_CONFIG_LIMIT(e_config->maximize_policy, E_MAXIMIZE_ZOOM, E_MAXIMIZE_FILL); + SAVE; + END_INT +#elif (TYPE == E_REMOTE_IN) +#endif +#undef HDL + +/****************************************************************************/ +#define HDL E_IPC_OP_MAXIMIZE_POLICY_GET +#if (TYPE == E_REMOTE_OPTIONS) + OP("-maximize-policy-get", 0, "Get maximize policy", 1, HDL) +#elif (TYPE == E_REMOTE_OUT) + REQ_NULL(HDL); +#elif (TYPE == E_WM_IN) + SEND_INT(e_config->maximize_policy, E_IPC_OP_MAXIMIZE_POLICY_GET_REPLY, HDL); +#elif (TYPE == E_REMOTE_IN) +#endif +#undef HDL + #if 0 } #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_ipc_handlers_list.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_ipc_handlers_list.h 5 Jun 2005 19:51:56 -0000 1.3 +++ e_ipc_handlers_list.h 18 Jun 2005 12:51:00 -0000 1.4 @@ -81,3 +81,6 @@ #define E_IPC_OP_FOCUS_POLICY_SET 81 #define E_IPC_OP_FOCUS_POLICY_GET 82 #define E_IPC_OP_FOCUS_POLICY_GET_REPLY 83 +#define E_IPC_OP_MAXIMIZE_POLICY_SET 84 +#define E_IPC_OP_MAXIMIZE_POLICY_GET 85 +#define E_IPC_OP_MAXIMIZE_POLICY_GET_REPLY 86 ------------------------------------------------------- SF.Net email is sponsored by: Discover Easy Linux Migration Strategies from IBM. Find simple to follow Roadmaps, straightforward articles, informative Webcasts and more! Get everything you need to get up to speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs