parent
06c0c4d5f3
commit
c3b0637802
|
@ -8,6 +8,6 @@ typedef struct _E_Obj_Dialog E_About;
|
|||
|
||||
EAPI E_About *e_about_new (E_Container *con);
|
||||
EAPI void e_about_show (E_About *about);
|
||||
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -1,21 +1,21 @@
|
|||
#include "e.h"
|
||||
|
||||
/* TODO:
|
||||
*
|
||||
*
|
||||
* Sanatize data received from acpi for message status into something
|
||||
* meaningful (ie: 00000002 == LID_CLOSED, etc, etc).
|
||||
*
|
||||
* Find someone with a WIFI that actually emits ACPI events and add/debug the
|
||||
*
|
||||
* Find someone with a WIFI that actually emits ACPI events and add/debug the
|
||||
* E_EVENT_ACPI for wifi.
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
/* local structures */
|
||||
/* for simple acpi device mapping */
|
||||
typedef struct _E_ACPI_Device_Simple E_ACPI_Device_Simple;
|
||||
typedef struct _E_ACPI_Device_Simple E_ACPI_Device_Simple;
|
||||
typedef struct _E_ACPI_Device_Multiplexed E_ACPI_Device_Multiplexed;
|
||||
|
||||
struct _E_ACPI_Device_Simple
|
||||
|
||||
struct _E_ACPI_Device_Simple
|
||||
{
|
||||
const char *name;
|
||||
// ->
|
||||
|
@ -56,7 +56,7 @@ static E_ACPI_Device_Simple _devices_simple[] =
|
|||
{"processor", E_ACPI_TYPE_PROCESSOR},
|
||||
{"thermal_zone", E_ACPI_TYPE_THERMAL},
|
||||
{"video", E_ACPI_TYPE_VIDEO},
|
||||
|
||||
|
||||
{NULL, E_ACPI_TYPE_UNKNOWN}
|
||||
};
|
||||
|
||||
|
@ -79,7 +79,7 @@ static E_ACPI_Device_Multiplexed _devices_multiplexed[] =
|
|||
{"sony/hotkey", NULL, 0x0f, E_ACPI_TYPE_VOLUME},
|
||||
{"sony/hotkey", NULL, 0x10, E_ACPI_TYPE_BRIGHTNESS},
|
||||
{"sony/hotkey", NULL, 0x12, E_ACPI_TYPE_VIDEO},
|
||||
|
||||
|
||||
/* HP Compaq Presario - CQ61 - intel gfx */
|
||||
/** interesting these get auto-mapped to keys in x11. here for documentation
|
||||
** but not enabled as we can use regular keybinds for these
|
||||
|
@ -87,7 +87,7 @@ static E_ACPI_Device_Multiplexed _devices_multiplexed[] =
|
|||
{"video", "DD03", 0x86, E_ACPI_TYPE_BRIGHTNESS_UP},
|
||||
{"video", "OVGA", 0x80, E_ACPI_TYPE_VIDEO},
|
||||
*/
|
||||
/* END */
|
||||
/* END */
|
||||
{NULL, NULL, 0x00, E_ACPI_TYPE_UNKNOWN}
|
||||
};
|
||||
|
||||
|
@ -96,7 +96,7 @@ EAPI int E_EVENT_ACPI = 0;
|
|||
|
||||
/* public functions */
|
||||
EINTERN int
|
||||
e_acpi_init(void)
|
||||
e_acpi_init(void)
|
||||
{
|
||||
E_EVENT_ACPI = ecore_event_type_new();
|
||||
|
||||
|
@ -104,30 +104,30 @@ e_acpi_init(void)
|
|||
if (!ecore_file_exists("/var/run/acpid.socket")) return 1;
|
||||
|
||||
/* try to connect to acpid socket */
|
||||
_e_acpid = ecore_con_server_connect(ECORE_CON_LOCAL_SYSTEM,
|
||||
_e_acpid = ecore_con_server_connect(ECORE_CON_LOCAL_SYSTEM,
|
||||
"/var/run/acpid.socket", -1, NULL);
|
||||
if (!_e_acpid) return 1;
|
||||
|
||||
/* setup handlers */
|
||||
_e_acpid_hdls =
|
||||
eina_list_append(_e_acpid_hdls,
|
||||
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DEL,
|
||||
_e_acpid_hdls =
|
||||
eina_list_append(_e_acpid_hdls,
|
||||
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DEL,
|
||||
_e_acpi_cb_server_del, NULL));
|
||||
_e_acpid_hdls =
|
||||
eina_list_append(_e_acpid_hdls,
|
||||
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DATA,
|
||||
_e_acpid_hdls =
|
||||
eina_list_append(_e_acpid_hdls,
|
||||
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DATA,
|
||||
_e_acpi_cb_server_data, NULL));
|
||||
|
||||
|
||||
/* Add handlers for standard acpi events */
|
||||
_e_acpid_hdls =
|
||||
eina_list_append(_e_acpid_hdls,
|
||||
_e_acpid_hdls =
|
||||
eina_list_append(_e_acpid_hdls,
|
||||
ecore_event_handler_add(E_EVENT_ACPI,
|
||||
_e_acpi_cb_event, NULL));
|
||||
return 1;
|
||||
}
|
||||
|
||||
EINTERN int
|
||||
e_acpi_shutdown(void)
|
||||
e_acpi_shutdown(void)
|
||||
{
|
||||
Ecore_Event_Handler *hdl;
|
||||
|
||||
|
@ -143,14 +143,14 @@ e_acpi_shutdown(void)
|
|||
return 1;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_acpi_events_freeze(void)
|
||||
EAPI void
|
||||
e_acpi_events_freeze(void)
|
||||
{
|
||||
_e_acpi_events_frozen++;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_acpi_events_thaw(void)
|
||||
EAPI void
|
||||
e_acpi_events_thaw(void)
|
||||
{
|
||||
_e_acpi_events_frozen--;
|
||||
if (_e_acpi_events_frozen < 0) _e_acpi_events_frozen = 0;
|
||||
|
@ -186,7 +186,7 @@ _e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event)
|
|||
int sig, status, i, done = 0;
|
||||
char device[1024], bus[1024], *sdata;
|
||||
const char *str, *p;
|
||||
|
||||
|
||||
ev = event;
|
||||
|
||||
if ((!ev->data) || (ev->size < 1)) return ECORE_CALLBACK_PASS_ON;
|
||||
|
@ -208,7 +208,7 @@ _e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event)
|
|||
strncpy(sdata, str, (int)(p - str));
|
||||
sdata[p - str] = 0;
|
||||
/* parse out this acpi string into separate pieces */
|
||||
if (sscanf(sdata, "%1023s %1023s %x %x",
|
||||
if (sscanf(sdata, "%1023s %1023s %x %x",
|
||||
device, bus, &sig, &status) != 4)
|
||||
{
|
||||
sig = -1;
|
||||
|
@ -216,13 +216,13 @@ _e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event)
|
|||
if (sscanf(sdata, "%1023s %1023s", device, bus) != 2)
|
||||
goto done_event;
|
||||
}
|
||||
|
||||
|
||||
/* create new event structure to raise */
|
||||
acpi_event = E_NEW(E_Event_Acpi, 1);
|
||||
acpi_event->bus_id = eina_stringshare_add(bus);
|
||||
acpi_event->signal = sig;
|
||||
acpi_event->status = status;
|
||||
|
||||
|
||||
/* FIXME: add in a key faking layer */
|
||||
if ((!done) && (sig >= 0) && (status >= 0))
|
||||
{
|
||||
|
@ -266,14 +266,14 @@ _e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event)
|
|||
switch (acpi_event->type)
|
||||
{
|
||||
case E_ACPI_TYPE_LID:
|
||||
acpi_event->status =
|
||||
acpi_event->status =
|
||||
_e_acpi_lid_status_get(device, bus);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
/* actually raise the event */
|
||||
ecore_event_add(E_EVENT_ACPI, acpi_event,
|
||||
ecore_event_add(E_EVENT_ACPI, acpi_event,
|
||||
_e_acpi_cb_event_free, NULL);
|
||||
}
|
||||
done_event:
|
||||
|
@ -288,7 +288,7 @@ done_event:
|
|||
else
|
||||
{
|
||||
Eina_Strbuf *newbuf;
|
||||
|
||||
|
||||
newbuf = eina_strbuf_new();
|
||||
eina_strbuf_append(newbuf, str);
|
||||
eina_strbuf_free(acpibuf);
|
||||
|
@ -297,8 +297,8 @@ done_event:
|
|||
return ECORE_CALLBACK_PASS_ON;
|
||||
}
|
||||
|
||||
static void
|
||||
_e_acpi_cb_event_free(void *data __UNUSED__, void *event)
|
||||
static void
|
||||
_e_acpi_cb_event_free(void *data __UNUSED__, void *event)
|
||||
{
|
||||
E_Event_Acpi *ev;
|
||||
|
||||
|
@ -308,8 +308,8 @@ _e_acpi_cb_event_free(void *data __UNUSED__, void *event)
|
|||
E_FREE(ev);
|
||||
}
|
||||
|
||||
static int
|
||||
_e_acpi_lid_status_get(const char *device, const char *bus)
|
||||
static int
|
||||
_e_acpi_lid_status_get(const char *device, const char *bus)
|
||||
{
|
||||
FILE *f;
|
||||
int i = 0;
|
||||
|
@ -329,7 +329,7 @@ _e_acpi_lid_status_get(const char *device, const char *bus)
|
|||
/* hack around ppurka's Thinkpad (G460 + Linux) that reports lid
|
||||
* state as "/proc/acpi/button/lid/LID0/state" but where the lid
|
||||
* event says "button/lid LID close".
|
||||
*
|
||||
*
|
||||
* so let's take the base device name "LID" and add a numeric like
|
||||
* 0, 1, 2, 3 so we have LID0, LID1, LID2 etc. - try up to LID9
|
||||
* and then give up.
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
#ifdef E_TYPEDEFS
|
||||
|
||||
/* enum for various event types */
|
||||
typedef enum _E_Acpi_Type
|
||||
typedef enum _E_Acpi_Type
|
||||
{
|
||||
E_ACPI_TYPE_UNKNOWN = 0,
|
||||
|
||||
|
||||
E_ACPI_TYPE_AC_ADAPTER, // 1
|
||||
E_ACPI_TYPE_BATTERY, // 2
|
||||
E_ACPI_TYPE_BUTTON, // 3
|
||||
|
@ -30,7 +30,7 @@ typedef enum _E_Acpi_Type
|
|||
} E_Acpi_Type;
|
||||
|
||||
/* enum for acpi signals */
|
||||
typedef enum _E_Acpi_Device_Signal
|
||||
typedef enum _E_Acpi_Device_Signal
|
||||
{
|
||||
E_ACPI_DEVICE_SIGNAL_UNKNOWN, // 0
|
||||
E_ACPI_DEVICE_SIGNAL_NOTIFY = 80,
|
||||
|
@ -40,7 +40,7 @@ typedef enum _E_Acpi_Device_Signal
|
|||
} E_Acpi_Device_Signal;
|
||||
|
||||
/* enum for lid status */
|
||||
typedef enum _E_Acpi_Lid_Status
|
||||
typedef enum _E_Acpi_Lid_Status
|
||||
{
|
||||
E_ACPI_LID_UNKNOWN, // 0
|
||||
E_ACPI_LID_CLOSED, // 1
|
||||
|
@ -54,7 +54,7 @@ typedef struct _E_Event_Acpi E_Event_Acpi;
|
|||
# ifndef E_ACPI_H
|
||||
# define E_ACPI_H
|
||||
|
||||
struct _E_Event_Acpi
|
||||
struct _E_Event_Acpi
|
||||
{
|
||||
const char *device, *bus_id;
|
||||
int type, signal, status;
|
||||
|
|
|
@ -3457,4 +3457,3 @@ _action_groups_sort_cb(const void *d1, const void *d2)
|
|||
if (!(g2 = d2)) return -1;
|
||||
return strcmp(g1->act_grp, g2->act_grp);
|
||||
}
|
||||
|
||||
|
|
|
@ -16,8 +16,8 @@ e_alert_shutdown(void)
|
|||
return 1;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_alert_show(int sig)
|
||||
EAPI void
|
||||
e_alert_show(int sig)
|
||||
{
|
||||
char *args[4];
|
||||
pid_t pid;
|
||||
|
@ -77,4 +77,3 @@ e_alert_show(int sig)
|
|||
e_util_env_set("MTRACK", "track");
|
||||
ecore_app_restart();
|
||||
}
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#ifdef E_TYPEDEFS
|
||||
|
||||
typedef enum _E_Alert_Op_Type
|
||||
typedef enum _E_Alert_Op_Type
|
||||
{
|
||||
E_ALERT_OP_RESTART = 0,
|
||||
E_ALERT_OP_RESTART = 0,
|
||||
E_ALERT_OP_EXIT
|
||||
} E_Alert_Op_Type;
|
||||
|
||||
|
|
|
@ -121,8 +121,8 @@ _e_alert_connect(void)
|
|||
return 1;
|
||||
}
|
||||
|
||||
static void
|
||||
_e_alert_create(void)
|
||||
static void
|
||||
_e_alert_create(void)
|
||||
{
|
||||
uint32_t mask, mask_list[4];
|
||||
int wx = 0, wy = 0;
|
||||
|
@ -134,36 +134,36 @@ _e_alert_create(void)
|
|||
xcb_open_font(conn, font, strlen("fixed"), "fixed");
|
||||
|
||||
/* create main window */
|
||||
mask = (XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL |
|
||||
mask = (XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL |
|
||||
XCB_CW_OVERRIDE_REDIRECT | XCB_CW_EVENT_MASK);
|
||||
mask_list[0] = screen->white_pixel;
|
||||
mask_list[1] = screen->black_pixel;
|
||||
mask_list[2] = 1;
|
||||
mask_list[3] = (XCB_EVENT_MASK_KEY_PRESS | XCB_EVENT_MASK_KEY_RELEASE |
|
||||
mask_list[3] = (XCB_EVENT_MASK_KEY_PRESS | XCB_EVENT_MASK_KEY_RELEASE |
|
||||
XCB_EVENT_MASK_EXPOSURE);
|
||||
|
||||
win = xcb_generate_id(conn);
|
||||
xcb_create_window(conn, XCB_COPY_FROM_PARENT, win, screen->root,
|
||||
wx, wy, WINDOW_WIDTH, WINDOW_HEIGHT, 0,
|
||||
XCB_WINDOW_CLASS_INPUT_OUTPUT,
|
||||
xcb_create_window(conn, XCB_COPY_FROM_PARENT, win, screen->root,
|
||||
wx, wy, WINDOW_WIDTH, WINDOW_HEIGHT, 0,
|
||||
XCB_WINDOW_CLASS_INPUT_OUTPUT,
|
||||
XCB_COPY_FROM_PARENT, mask, mask_list);
|
||||
|
||||
/* create button 1 */
|
||||
mask_list[3] = (XCB_EVENT_MASK_BUTTON_PRESS |
|
||||
mask_list[3] = (XCB_EVENT_MASK_BUTTON_PRESS |
|
||||
XCB_EVENT_MASK_BUTTON_RELEASE | XCB_EVENT_MASK_EXPOSURE);
|
||||
|
||||
btn1 = xcb_generate_id(conn);
|
||||
xcb_create_window(conn, XCB_COPY_FROM_PARENT, btn1, win,
|
||||
-100, -100, 1, 1, 0,
|
||||
XCB_WINDOW_CLASS_INPUT_OUTPUT,
|
||||
xcb_create_window(conn, XCB_COPY_FROM_PARENT, btn1, win,
|
||||
-100, -100, 1, 1, 0,
|
||||
XCB_WINDOW_CLASS_INPUT_OUTPUT,
|
||||
XCB_COPY_FROM_PARENT, mask, mask_list);
|
||||
xcb_map_window(conn, btn1);
|
||||
|
||||
/* create button 2 */
|
||||
btn2 = xcb_generate_id(conn);
|
||||
xcb_create_window(conn, XCB_COPY_FROM_PARENT, btn2, win,
|
||||
-100, -100, 1, 1, 0,
|
||||
XCB_WINDOW_CLASS_INPUT_OUTPUT,
|
||||
xcb_create_window(conn, XCB_COPY_FROM_PARENT, btn2, win,
|
||||
-100, -100, 1, 1, 0,
|
||||
XCB_WINDOW_CLASS_INPUT_OUTPUT,
|
||||
XCB_COPY_FROM_PARENT, mask, mask_list);
|
||||
xcb_map_window(conn, btn2);
|
||||
|
||||
|
@ -177,8 +177,8 @@ _e_alert_create(void)
|
|||
xcb_create_gc(conn, gc, win, mask, mask_list);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_alert_display(void)
|
||||
static void
|
||||
_e_alert_display(void)
|
||||
{
|
||||
xcb_char2b_t *str = NULL;
|
||||
xcb_query_text_extents_cookie_t cookie;
|
||||
|
@ -187,10 +187,10 @@ _e_alert_display(void)
|
|||
|
||||
str = _e_alert_build_string(title);
|
||||
|
||||
cookie =
|
||||
cookie =
|
||||
xcb_query_text_extents_unchecked(conn, font, strlen(title), str);
|
||||
reply = xcb_query_text_extents_reply(conn, cookie, NULL);
|
||||
if (reply)
|
||||
if (reply)
|
||||
{
|
||||
fa = reply->font_ascent;
|
||||
fh = (fa + reply->font_descent);
|
||||
|
@ -202,11 +202,11 @@ _e_alert_display(void)
|
|||
/* move buttons */
|
||||
x = 20;
|
||||
w = (WINDOW_WIDTH / 2) - 40;
|
||||
_e_alert_button_move_resize(btn1, x, WINDOW_HEIGHT - 20 - (fh + 20),
|
||||
_e_alert_button_move_resize(btn1, x, WINDOW_HEIGHT - 20 - (fh + 20),
|
||||
w, (fh + 20));
|
||||
|
||||
x = ((WINDOW_WIDTH / 2) + 20);
|
||||
_e_alert_button_move_resize(btn2, x, WINDOW_HEIGHT - 20 - (fh + 20),
|
||||
_e_alert_button_move_resize(btn2, x, WINDOW_HEIGHT - 20 - (fh + 20),
|
||||
w, (fh + 20));
|
||||
|
||||
if (comp_win)
|
||||
|
@ -222,8 +222,8 @@ _e_alert_display(void)
|
|||
rect.width = WINDOW_WIDTH;
|
||||
rect.height = WINDOW_HEIGHT;
|
||||
|
||||
xcb_shape_rectangles(conn, XCB_SHAPE_SO_SET,
|
||||
XCB_SHAPE_SK_INPUT, XCB_CLIP_ORDERING_UNSORTED,
|
||||
xcb_shape_rectangles(conn, XCB_SHAPE_SO_SET,
|
||||
XCB_SHAPE_SK_INPUT, XCB_CLIP_ORDERING_UNSORTED,
|
||||
comp_win, 0, 0, 1, &rect);
|
||||
|
||||
xcb_reparent_window(conn, win, comp_win, wx, wy);
|
||||
|
@ -234,14 +234,14 @@ _e_alert_display(void)
|
|||
_e_alert_window_raise(win);
|
||||
|
||||
/* grab pointer & keyboard */
|
||||
xcb_grab_pointer_unchecked(conn, 0, win,
|
||||
(XCB_EVENT_MASK_BUTTON_PRESS |
|
||||
XCB_EVENT_MASK_BUTTON_RELEASE),
|
||||
XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC,
|
||||
xcb_grab_pointer_unchecked(conn, 0, win,
|
||||
(XCB_EVENT_MASK_BUTTON_PRESS |
|
||||
XCB_EVENT_MASK_BUTTON_RELEASE),
|
||||
XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC,
|
||||
XCB_NONE, XCB_NONE, XCB_CURRENT_TIME);
|
||||
xcb_grab_keyboard_unchecked(conn, 0, win, XCB_CURRENT_TIME,
|
||||
xcb_grab_keyboard_unchecked(conn, 0, win, XCB_CURRENT_TIME,
|
||||
XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC);
|
||||
xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT,
|
||||
xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT,
|
||||
win, XCB_CURRENT_TIME);
|
||||
|
||||
/* flush screen */
|
||||
|
@ -251,14 +251,14 @@ _e_alert_display(void)
|
|||
_e_alert_sync();
|
||||
}
|
||||
|
||||
static void
|
||||
_e_alert_button_move_resize(xcb_window_t btn, int x, int y, int w, int h)
|
||||
static void
|
||||
_e_alert_button_move_resize(xcb_window_t btn, int x, int y, int w, int h)
|
||||
{
|
||||
uint32_t list[4], mask;
|
||||
|
||||
if (!btn) return;
|
||||
|
||||
mask = (XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y |
|
||||
mask = (XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y |
|
||||
XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT);
|
||||
list[0] = x;
|
||||
list[1] = y;
|
||||
|
@ -277,17 +277,17 @@ _e_alert_window_raise(xcb_window_t window)
|
|||
xcb_configure_window(conn, window, XCB_CONFIG_WINDOW_STACK_MODE, list);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_alert_sync(void)
|
||||
static void
|
||||
_e_alert_sync(void)
|
||||
{
|
||||
free(xcb_get_input_focus_reply(conn,
|
||||
free(xcb_get_input_focus_reply(conn,
|
||||
xcb_get_input_focus(conn), NULL));
|
||||
}
|
||||
|
||||
static void
|
||||
_e_alert_shutdown(void)
|
||||
static void
|
||||
_e_alert_shutdown(void)
|
||||
{
|
||||
if (!xcb_connection_has_error(conn))
|
||||
if (!xcb_connection_has_error(conn))
|
||||
{
|
||||
xcb_close_font(conn, font);
|
||||
xcb_destroy_window(conn, btn1);
|
||||
|
@ -299,23 +299,23 @@ _e_alert_shutdown(void)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
_e_alert_run(void)
|
||||
static void
|
||||
_e_alert_run(void)
|
||||
{
|
||||
xcb_generic_event_t *event = NULL;
|
||||
|
||||
xcb_flush(conn);
|
||||
while ((event = xcb_wait_for_event(conn)))
|
||||
while ((event = xcb_wait_for_event(conn)))
|
||||
{
|
||||
switch (event->response_type & ~0x80)
|
||||
switch (event->response_type & ~0x80)
|
||||
{
|
||||
case XCB_BUTTON_PRESS:
|
||||
ret = _e_alert_handle_button_press(event);
|
||||
break;
|
||||
case XCB_KEY_PRESS:
|
||||
case XCB_KEY_PRESS:
|
||||
ret = _e_alert_handle_key_press(event);
|
||||
break;
|
||||
case XCB_EXPOSE:
|
||||
case XCB_EXPOSE:
|
||||
{
|
||||
xcb_expose_event_t *ev;
|
||||
|
||||
|
@ -335,8 +335,8 @@ _e_alert_run(void)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
_e_alert_draw(void)
|
||||
static void
|
||||
_e_alert_draw(void)
|
||||
{
|
||||
_e_alert_draw_outline();
|
||||
_e_alert_draw_title_outline();
|
||||
|
@ -348,8 +348,8 @@ _e_alert_draw(void)
|
|||
xcb_flush(conn);
|
||||
}
|
||||
|
||||
static int
|
||||
_e_alert_handle_key_press(xcb_generic_event_t *event)
|
||||
static int
|
||||
_e_alert_handle_key_press(xcb_generic_event_t *event)
|
||||
{
|
||||
xcb_key_press_event_t *ev;
|
||||
|
||||
|
@ -362,13 +362,13 @@ _e_alert_handle_key_press(xcb_generic_event_t *event)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
_e_alert_handle_button_press(xcb_generic_event_t *event)
|
||||
static int
|
||||
_e_alert_handle_button_press(xcb_generic_event_t *event)
|
||||
{
|
||||
xcb_button_press_event_t *ev;
|
||||
|
||||
ev = (xcb_button_press_event_t *)event;
|
||||
if (ev->child == btn1)
|
||||
if (ev->child == btn1)
|
||||
return 1;
|
||||
else if (ev->child == btn2)
|
||||
return 2;
|
||||
|
@ -394,8 +394,8 @@ _e_alert_build_string(const char *str)
|
|||
return r;
|
||||
}
|
||||
|
||||
static void
|
||||
_e_alert_draw_outline(void)
|
||||
static void
|
||||
_e_alert_draw_outline(void)
|
||||
{
|
||||
xcb_rectangle_t rect;
|
||||
|
||||
|
@ -407,8 +407,8 @@ _e_alert_draw_outline(void)
|
|||
xcb_poly_rectangle(conn, win, gc, 1, &rect);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_alert_draw_title_outline(void)
|
||||
static void
|
||||
_e_alert_draw_title_outline(void)
|
||||
{
|
||||
xcb_rectangle_t rect;
|
||||
|
||||
|
@ -420,8 +420,8 @@ _e_alert_draw_title_outline(void)
|
|||
xcb_poly_rectangle(conn, win, gc, 1, &rect);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_alert_draw_title(void)
|
||||
static void
|
||||
_e_alert_draw_title(void)
|
||||
{
|
||||
xcb_void_cookie_t cookie;
|
||||
int x = 0, y = 0;
|
||||
|
@ -430,7 +430,7 @@ _e_alert_draw_title(void)
|
|||
x = (2 + 2 + ((WINDOW_WIDTH - 4 - 4 - fw) / 2));
|
||||
y = (2 + 2 + fh);
|
||||
|
||||
cookie =
|
||||
cookie =
|
||||
xcb_image_text_8(conn, strlen(title), win, gc, x, y, title);
|
||||
}
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@ e_atoms_init(void)
|
|||
"__E_ATOM_DESKTOP_FILE"
|
||||
};
|
||||
Ecore_X_Atom atoms[11];
|
||||
|
||||
|
||||
ecore_x_atoms_get(atom_names, 11, atoms);
|
||||
E_ATOM_MANAGED = atoms[0];
|
||||
E_ATOM_CONTAINER = atoms[1];
|
||||
|
|
|
@ -54,7 +54,7 @@ e_backlight_init(void)
|
|||
eeze_init();
|
||||
#endif
|
||||
// why did someone do this? this makes it ONLY work if xrandr has bl support.
|
||||
// WRONG!
|
||||
// WRONG!
|
||||
// bl_avail = ecore_x_randr_output_backlight_available();
|
||||
bl_avail = EINA_TRUE;
|
||||
|
||||
|
@ -330,7 +330,7 @@ _e_backlight_set(E_Zone *zone, double val)
|
|||
Ecore_X_Window root;
|
||||
Ecore_X_Randr_Output *out;
|
||||
int num = 0;
|
||||
|
||||
|
||||
root = zone->container->manager->root;
|
||||
out = ecore_x_randr_window_outputs_get(root, &num);
|
||||
if ((out) && (num > 0))
|
||||
|
@ -355,7 +355,7 @@ _bl_anim(void *data, double pos)
|
|||
{
|
||||
E_Zone *zone = data;
|
||||
double v;
|
||||
|
||||
|
||||
// FIXME: if zone is deleted while anim going... bad things.
|
||||
pos = ecore_animator_pos_map(pos, ECORE_POS_MAP_DECELERATE, 0.0, 0.0);
|
||||
v = (bl_animval * (1.0 - pos)) + (bl_val *pos);
|
||||
|
@ -448,7 +448,7 @@ static Eina_Bool
|
|||
_e_bl_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event)
|
||||
{
|
||||
Ecore_Exe_Event_Del *ev;
|
||||
|
||||
|
||||
ev = event;
|
||||
if (ev->exe == bl_sys_set_exe)
|
||||
{
|
||||
|
@ -463,7 +463,7 @@ static void
|
|||
_bl_sys_level_set(double val)
|
||||
{
|
||||
char buf[PATH_MAX];
|
||||
|
||||
|
||||
if (!bl_sys_exit_handler)
|
||||
bl_sys_exit_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
|
||||
_e_bl_cb_exit, NULL);
|
||||
|
@ -473,8 +473,8 @@ _bl_sys_level_set(double val)
|
|||
return;
|
||||
}
|
||||
// printf("SET: %1.3f\n", val);
|
||||
snprintf(buf, sizeof(buf),
|
||||
"%s/enlightenment/utils/enlightenment_backlight %i",
|
||||
snprintf(buf, sizeof(buf),
|
||||
"%s/enlightenment/utils/enlightenment_backlight %i",
|
||||
e_prefix_lib_get(), (int)(val * 1000.0));
|
||||
bl_sys_set_exe = ecore_exe_run(buf, NULL);
|
||||
}
|
||||
|
|
|
@ -44,7 +44,7 @@ main(int argc, char **argv)
|
|||
int maxlevel = 0, curlevel = -1;
|
||||
Eina_List *devs;
|
||||
char buf[4096] = "";
|
||||
|
||||
|
||||
for (i = 1; i < argc; i++)
|
||||
{
|
||||
if ((!strcmp(argv[i], "-h")) ||
|
||||
|
|
|
@ -102,7 +102,7 @@ e_bg_config_get(int container_num, int zone_num, int desk_x, int desk_y)
|
|||
EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cfbg)
|
||||
{
|
||||
int spec;
|
||||
|
||||
|
||||
if (!cfbg) continue;
|
||||
spec = 0;
|
||||
if (cfbg->container == container_num) spec++;
|
||||
|
|
|
@ -17,7 +17,7 @@ typedef struct _E_Bg_Image_Import_Handle E_Bg_Image_Import_Handle;
|
|||
|
||||
extern EAPI int E_EVENT_BG_UPDATE;
|
||||
|
||||
struct _E_Event_Bg_Update
|
||||
struct _E_Event_Bg_Update
|
||||
{
|
||||
int container;
|
||||
int zone;
|
||||
|
|
|
@ -89,7 +89,7 @@ e_bindings_init(void)
|
|||
ebw->any_mod, ebw->action, ebw->params);
|
||||
|
||||
EINA_LIST_FOREACH(e_config->acpi_bindings, l, eba)
|
||||
e_bindings_acpi_add(eba->context, eba->type, eba->status,
|
||||
e_bindings_acpi_add(eba->context, eba->type, eba->status,
|
||||
eba->action, eba->params);
|
||||
|
||||
return 1;
|
||||
|
@ -104,13 +104,13 @@ e_bindings_shutdown(void)
|
|||
E_FREE_LIST(signal_bindings, _e_bindings_signal_free);
|
||||
E_FREE_LIST(wheel_bindings, _e_bindings_wheel_free);
|
||||
E_FREE_LIST(acpi_bindings, _e_bindings_acpi_free);
|
||||
|
||||
|
||||
if (mapping_handler)
|
||||
{
|
||||
ecore_event_handler_del(mapping_handler);
|
||||
mapping_handler = NULL;
|
||||
}
|
||||
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
@ -429,7 +429,7 @@ e_bindings_key_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Even
|
|||
if (_e_bindings_context_match(binding->ctxt, ctxt))
|
||||
{
|
||||
E_Action *act;
|
||||
|
||||
|
||||
act = e_action_find(binding->action);
|
||||
if (act)
|
||||
{
|
||||
|
@ -994,8 +994,8 @@ e_bindings_wheel_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_Event
|
|||
return act;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_bindings_acpi_add(E_Binding_Context ctxt, int type, int status, const char *action, const char *params)
|
||||
EAPI void
|
||||
e_bindings_acpi_add(E_Binding_Context ctxt, int type, int status, const char *action, const char *params)
|
||||
{
|
||||
E_Binding_Acpi *binding;
|
||||
|
||||
|
@ -1008,8 +1008,8 @@ e_bindings_acpi_add(E_Binding_Context ctxt, int type, int status, const char *ac
|
|||
acpi_bindings = eina_list_append(acpi_bindings, binding);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_bindings_acpi_del(E_Binding_Context ctxt, int type, int status, const char *action, const char *params)
|
||||
EAPI void
|
||||
e_bindings_acpi_del(E_Binding_Context ctxt, int type, int status, const char *action, const char *params)
|
||||
{
|
||||
E_Binding_Acpi *binding;
|
||||
Eina_List *l;
|
||||
|
@ -1017,7 +1017,7 @@ e_bindings_acpi_del(E_Binding_Context ctxt, int type, int status, const char *ac
|
|||
EINA_LIST_FOREACH(acpi_bindings, l, binding)
|
||||
{
|
||||
if ((binding->ctxt == ctxt) &&
|
||||
(binding->type == type) && (binding->status == status) &&
|
||||
(binding->type == type) && (binding->status == status) &&
|
||||
(((binding->action) && (action) && (!strcmp(binding->action, action))) ||
|
||||
((!binding->action) && (!action))) &&
|
||||
(((binding->params) && (params) && (!strcmp(binding->params, params))) ||
|
||||
|
@ -1031,7 +1031,7 @@ e_bindings_acpi_del(E_Binding_Context ctxt, int type, int status, const char *ac
|
|||
}
|
||||
|
||||
EAPI E_Action *
|
||||
e_bindings_acpi_find(E_Binding_Context ctxt, E_Object *obj __UNUSED__, E_Event_Acpi *ev, E_Binding_Acpi **bind_ret)
|
||||
e_bindings_acpi_find(E_Binding_Context ctxt, E_Object *obj __UNUSED__, E_Event_Acpi *ev, E_Binding_Acpi **bind_ret)
|
||||
{
|
||||
E_Binding_Acpi *binding;
|
||||
Eina_List *l;
|
||||
|
@ -1041,7 +1041,7 @@ e_bindings_acpi_find(E_Binding_Context ctxt, E_Object *obj __UNUSED__, E_Event_A
|
|||
if (binding->type == ev->type)
|
||||
{
|
||||
/* if binding status is -1, then we don't compare event status */
|
||||
if (binding->status != -1)
|
||||
if (binding->status != -1)
|
||||
{
|
||||
/* binding status is set to something, compare event status */
|
||||
if (binding->status != ev->status) continue;
|
||||
|
@ -1060,7 +1060,7 @@ e_bindings_acpi_find(E_Binding_Context ctxt, E_Object *obj __UNUSED__, E_Event_A
|
|||
}
|
||||
|
||||
EAPI E_Action *
|
||||
e_bindings_acpi_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Acpi *ev)
|
||||
e_bindings_acpi_event_handle(E_Binding_Context ctxt, E_Object *obj, E_Event_Acpi *ev)
|
||||
{
|
||||
E_Action *act;
|
||||
E_Binding_Acpi *binding;
|
||||
|
@ -1139,8 +1139,8 @@ _e_bindings_wheel_free(E_Binding_Wheel *binding)
|
|||
free(binding);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_bindings_acpi_free(E_Binding_Acpi *binding)
|
||||
static void
|
||||
_e_bindings_acpi_free(E_Binding_Acpi *binding)
|
||||
{
|
||||
if (binding->action) eina_stringshare_del(binding->action);
|
||||
if (binding->params) eina_stringshare_del(binding->params);
|
||||
|
@ -1170,16 +1170,16 @@ _e_bindings_modifiers(unsigned int modifiers)
|
|||
* have it on, sometimes they don't, and often they have no idea. waaaay
|
||||
* back in E 0.1->0.13 or so days this caused issues thus numlock,
|
||||
* scrollock and capslock are not usable modifiers.
|
||||
*
|
||||
*
|
||||
* if we REALLY want to be able to use numlock we need to add more binding
|
||||
* flags and config that says "REALLY pay attention to numlock for this
|
||||
* binding" field in the binding (like there is a "any_mod" flag - we need a
|
||||
* "num_lock_respect" field)
|
||||
*
|
||||
*
|
||||
* also it should be an E_BINDING_MODIFIER_LOCK_NUM as the ecore lock flag
|
||||
* may vary from system to system as different xservers may have differing
|
||||
* modifier masks for numlock (it is queried at startup).
|
||||
*
|
||||
*
|
||||
if (ev->modifiers & ECORE_X_LOCK_NUM) mod |= ECORE_X_LOCK_NUM;
|
||||
*/
|
||||
|
||||
|
@ -1231,4 +1231,3 @@ _e_bindings_edge_cb_timer(void *data)
|
|||
|
||||
return ECORE_CALLBACK_CANCEL;
|
||||
}
|
||||
|
||||
|
|
|
@ -93,7 +93,7 @@ struct _E_Binding_Wheel
|
|||
const char *params;
|
||||
};
|
||||
|
||||
struct _E_Binding_Acpi
|
||||
struct _E_Binding_Acpi
|
||||
{
|
||||
E_Binding_Context ctxt;
|
||||
int type, status;
|
||||
|
@ -137,7 +137,7 @@ EAPI void e_bindings_signal_add(E_Binding_Context ctxt, const char *sig,
|
|||
EAPI void e_bindings_signal_del(E_Binding_Context ctxt, const char *sig, const char *src, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
|
||||
EAPI E_Action *e_bindings_signal_find(E_Binding_Context ctxt, E_Object *obj, const char *sig, const char *src, E_Binding_Signal **bind_ret);
|
||||
EAPI E_Action *e_bindings_signal_handle(E_Binding_Context ctxt, E_Object *obj, const char *sig, const char *src);
|
||||
|
||||
|
||||
EAPI void e_bindings_wheel_add(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
|
||||
EAPI void e_bindings_wheel_del(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, const char *action, const char *params);
|
||||
EAPI void e_bindings_wheel_grab(E_Binding_Context ctxt, Ecore_X_Window win);
|
||||
|
|
|
@ -269,7 +269,7 @@ _e_border_sub_borders_new(E_Border *bd)
|
|||
Eina_List *list = NULL, *l;
|
||||
E_Border *child;
|
||||
E_Border_List *bl;
|
||||
|
||||
|
||||
EINA_LIST_FOREACH(bd->transients, l, child)
|
||||
{
|
||||
if (!eina_list_data_find(list, child))
|
||||
|
@ -280,7 +280,7 @@ _e_border_sub_borders_new(E_Border *bd)
|
|||
{
|
||||
if (e_object_is_del(E_OBJECT(child))) continue;
|
||||
if (child == bd) continue;
|
||||
/*
|
||||
/*
|
||||
if ((bd->client.icccm.client_leader) &&
|
||||
(child->client.icccm.client_leader ==
|
||||
bd->client.icccm.client_leader))
|
||||
|
@ -912,7 +912,7 @@ e_border_desk_set(E_Border *bd,
|
|||
Eina_List *l;
|
||||
E_Border *child;
|
||||
Eina_List *list = _e_border_sub_borders_new(bd);
|
||||
|
||||
|
||||
EINA_LIST_FOREACH(list, l, child)
|
||||
{
|
||||
e_border_desk_set(child, bd->desk);
|
||||
|
@ -1022,7 +1022,7 @@ e_border_hide(E_Border *bd,
|
|||
ecore_x_window_hide(bd->client.win);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
visible = 0;
|
||||
ecore_x_window_prop_card32_set(bd->client.win, E_ATOM_MAPPED, &visible, 1);
|
||||
if (!manage)
|
||||
|
@ -1708,7 +1708,7 @@ e_border_raise(E_Border *bd)
|
|||
if (e_config->transient.raise)
|
||||
{
|
||||
Eina_List *list = _e_border_sub_borders_new(bd);
|
||||
|
||||
|
||||
EINA_LIST_REVERSE_FOREACH(list, l, child)
|
||||
{
|
||||
/* Don't stack iconic transients. If the user wants these shown,
|
||||
|
@ -1721,10 +1721,10 @@ e_border_raise(E_Border *bd)
|
|||
else
|
||||
{
|
||||
E_Border *above;
|
||||
|
||||
|
||||
/* First raise the border to find out which border we will end up above */
|
||||
above = e_container_border_raise(child);
|
||||
|
||||
|
||||
if (above)
|
||||
{
|
||||
/* We ended up above a border, now we must stack this border to
|
||||
|
@ -1797,7 +1797,7 @@ e_border_lower(E_Border *bd)
|
|||
if (e_config->transient.lower)
|
||||
{
|
||||
Eina_List *list = _e_border_sub_borders_new(bd);
|
||||
|
||||
|
||||
EINA_LIST_REVERSE_FOREACH(list, l, child)
|
||||
{
|
||||
/* Don't stack iconic transients. If the user wants these shown,
|
||||
|
@ -1810,10 +1810,10 @@ e_border_lower(E_Border *bd)
|
|||
else
|
||||
{
|
||||
E_Border *below;
|
||||
|
||||
|
||||
/* First lower the border to find out which border we will end up below */
|
||||
below = e_container_border_lower(child);
|
||||
|
||||
|
||||
if (below)
|
||||
{
|
||||
/* We ended up below a border, now we must stack this border to
|
||||
|
@ -1887,7 +1887,7 @@ e_border_stack_above(E_Border *bd,
|
|||
if (e_config->transient.raise)
|
||||
{
|
||||
Eina_List *list = _e_border_sub_borders_new(bd);
|
||||
|
||||
|
||||
EINA_LIST_REVERSE_FOREACH(list, l, child)
|
||||
{
|
||||
/* Don't stack iconic transients. If the user wants these shown,
|
||||
|
@ -1945,7 +1945,7 @@ e_border_stack_below(E_Border *bd,
|
|||
if (e_config->transient.lower)
|
||||
{
|
||||
Eina_List *list = _e_border_sub_borders_new(bd);
|
||||
|
||||
|
||||
EINA_LIST_REVERSE_FOREACH(bd->transients, l, child)
|
||||
{
|
||||
/* Don't stack iconic transients. If the user wants these shown,
|
||||
|
@ -2108,7 +2108,7 @@ e_border_focus_set(E_Border *bd,
|
|||
bd->want_focus = 1;
|
||||
bd->changed = 1;
|
||||
}
|
||||
else if ((!bd->focused) ||
|
||||
else if ((!bd->focused) ||
|
||||
(focus_next && (bd != eina_list_data_get(focus_next))))
|
||||
{
|
||||
Eina_List *l;
|
||||
|
@ -2183,7 +2183,7 @@ e_border_focus_set(E_Border *bd,
|
|||
{
|
||||
Eina_Bool unfocus_is_parent = EINA_FALSE;
|
||||
E_Border *bd_parent;
|
||||
|
||||
|
||||
bd_parent = bd->parent;
|
||||
while (bd_parent)
|
||||
{
|
||||
|
@ -2905,7 +2905,7 @@ e_border_iconify(E_Border *bd)
|
|||
Eina_List *l;
|
||||
E_Border *child;
|
||||
Eina_List *list = _e_border_sub_borders_new(bd);
|
||||
|
||||
|
||||
EINA_LIST_FOREACH(list, l, child)
|
||||
{
|
||||
e_border_iconify(child);
|
||||
|
@ -2977,7 +2977,7 @@ e_border_stick(E_Border *bd)
|
|||
Eina_List *l;
|
||||
E_Border *child;
|
||||
Eina_List *list = _e_border_sub_borders_new(bd);
|
||||
|
||||
|
||||
EINA_LIST_FOREACH(list, l, child)
|
||||
{
|
||||
child->sticky = 1;
|
||||
|
@ -3013,7 +3013,7 @@ e_border_unstick(E_Border *bd)
|
|||
Eina_List *l;
|
||||
E_Border *child;
|
||||
Eina_List *list = _e_border_sub_borders_new(bd);
|
||||
|
||||
|
||||
EINA_LIST_FOREACH(list, l, child)
|
||||
{
|
||||
child->sticky = 0;
|
||||
|
@ -4421,7 +4421,7 @@ _e_border_free(E_Border *bd)
|
|||
}
|
||||
if (bd->client.e.state.video_parent)
|
||||
{
|
||||
bd->client.e.state.video_parent_border->client.e.state.video_child =
|
||||
bd->client.e.state.video_parent_border->client.e.state.video_child =
|
||||
eina_list_remove
|
||||
(bd->client.e.state.video_parent_border->client.e.state.video_child,
|
||||
bd);
|
||||
|
@ -6601,7 +6601,7 @@ _e_border_eval0(E_Border *bd)
|
|||
char *title = ecore_x_icccm_title_get(bd->client.win);
|
||||
eina_stringshare_replace(&bd->client.icccm.title, title);
|
||||
if (title) free(title);
|
||||
|
||||
|
||||
if (bd->bg_object)
|
||||
edje_object_part_text_set(bd->bg_object, "e.text.title",
|
||||
bd->client.icccm.title);
|
||||
|
@ -6637,7 +6637,7 @@ _e_border_eval0(E_Border *bd)
|
|||
if (!((bd->client.icccm.name == pname) &&
|
||||
(bd->client.icccm.class == pclass)))
|
||||
bd->changes.icon = 1;
|
||||
|
||||
|
||||
if (pname) eina_stringshare_del(pname);
|
||||
if (pclass) eina_stringshare_del(pclass);
|
||||
bd->client.icccm.fetch.name_class = 0;
|
||||
|
@ -6683,10 +6683,10 @@ _e_border_eval0(E_Border *bd)
|
|||
|
||||
if ((!machine) && (bd->client.icccm.client_leader))
|
||||
machine = ecore_x_icccm_client_machine_get(bd->client.icccm.client_leader);
|
||||
|
||||
|
||||
eina_stringshare_replace(&bd->client.icccm.machine, machine);
|
||||
if (machine) free(machine);
|
||||
|
||||
|
||||
bd->client.icccm.fetch.machine = 0;
|
||||
rem_change = 1;
|
||||
}
|
||||
|
@ -6885,9 +6885,9 @@ _e_border_eval0(E_Border *bd)
|
|||
if (bd->client.icccm.fetch.icon_name)
|
||||
{
|
||||
char *icon_name = ecore_x_icccm_icon_name_get(bd->client.win);
|
||||
eina_stringshare_replace(&bd->client.icccm.icon_name, icon_name);
|
||||
eina_stringshare_replace(&bd->client.icccm.icon_name, icon_name);
|
||||
if (icon_name) free(icon_name);
|
||||
|
||||
|
||||
bd->client.icccm.fetch.icon_name = 0;
|
||||
rem_change = 1;
|
||||
}
|
||||
|
@ -6895,9 +6895,9 @@ _e_border_eval0(E_Border *bd)
|
|||
{
|
||||
char *icon_name;
|
||||
ecore_x_netwm_icon_name_get(bd->client.win, &icon_name);
|
||||
eina_stringshare_replace(&bd->client.netwm.icon_name, icon_name);
|
||||
eina_stringshare_replace(&bd->client.netwm.icon_name, icon_name);
|
||||
if (icon_name) free(icon_name);
|
||||
|
||||
|
||||
bd->client.netwm.fetch.icon_name = 0;
|
||||
rem_change = 1;
|
||||
}
|
||||
|
@ -7171,7 +7171,7 @@ _e_border_eval0(E_Border *bd)
|
|||
/* unlinking child/parent */
|
||||
if (bd->client.e.state.video_parent_border != NULL)
|
||||
{
|
||||
bd->client.e.state.video_parent_border->client.e.state.video_child =
|
||||
bd->client.e.state.video_parent_border->client.e.state.video_child =
|
||||
eina_list_remove
|
||||
(bd->client.e.state.video_parent_border->client.e.state.video_child,
|
||||
bd);
|
||||
|
@ -7278,9 +7278,9 @@ _e_border_eval0(E_Border *bd)
|
|||
if ((!bd->lock_border) || (!bd->client.border.name))
|
||||
bd->client.border.changed = 1;
|
||||
|
||||
{
|
||||
{
|
||||
char *str = NULL;
|
||||
|
||||
|
||||
if ((ecore_x_netwm_startup_id_get(bd->client.win, &str) && (str)) ||
|
||||
((bd->client.icccm.client_leader > 0) &&
|
||||
ecore_x_netwm_startup_id_get(bd->client.icccm.client_leader, &str) && (str))
|
||||
|
@ -7289,7 +7289,7 @@ _e_border_eval0(E_Border *bd)
|
|||
if (!strncmp(str, "E_START|", 8))
|
||||
{
|
||||
int id;
|
||||
|
||||
|
||||
id = atoi(str + 8);
|
||||
if (id > 0) bd->client.netwm.startup_id = id;
|
||||
}
|
||||
|
@ -7308,14 +7308,14 @@ _e_border_eval0(E_Border *bd)
|
|||
else
|
||||
bd->client.netwm.pid = -1;
|
||||
}
|
||||
|
||||
|
||||
inst = e_exec_startup_id_pid_instance_find(bd->client.netwm.startup_id,
|
||||
bd->client.netwm.pid);
|
||||
if ((inst) && (inst->used == 0))
|
||||
{
|
||||
E_Zone *zone;
|
||||
E_Desk *desk;
|
||||
|
||||
|
||||
inst->used++;
|
||||
zone = e_container_zone_number_get(bd->zone->container,
|
||||
inst->screen);
|
||||
|
@ -7323,11 +7323,11 @@ _e_border_eval0(E_Border *bd)
|
|||
desk = e_desk_at_xy_get(bd->zone, inst->desk_x, inst->desk_y);
|
||||
if (desk) e_border_desk_set(bd, desk);
|
||||
}
|
||||
|
||||
|
||||
if (0) // keep all windows of one app/group on the same screen/desk
|
||||
{
|
||||
E_Border *bdl = NULL;
|
||||
|
||||
|
||||
bdl = bd->parent;
|
||||
if (!bdl)
|
||||
{
|
||||
|
@ -7337,7 +7337,7 @@ _e_border_eval0(E_Border *bd)
|
|||
{
|
||||
E_Border *child;
|
||||
E_Border_List *bl;
|
||||
|
||||
|
||||
bl = e_container_border_list_first(bd->zone->container);
|
||||
while ((child = e_container_border_list_next(bl)))
|
||||
{
|
||||
|
@ -8243,7 +8243,7 @@ _e_border_eval(E_Border *bd)
|
|||
char buf[128];
|
||||
snprintf(buf, sizeof(buf), "%s.desktop", bd->client.icccm.class);
|
||||
bd->desktop = efreet_util_desktop_file_id_find(buf);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!bd->desktop)
|
||||
{
|
||||
|
@ -8295,7 +8295,7 @@ _e_border_eval(E_Border *bd)
|
|||
}
|
||||
bd->changes.icon = 0;
|
||||
}
|
||||
|
||||
|
||||
bd->new_client = 0;
|
||||
bd->changed = 0;
|
||||
bd->changes.stack = 0;
|
||||
|
@ -9044,8 +9044,8 @@ _e_border_cb_ping_poller(void *data)
|
|||
{
|
||||
/* if time between last ping and now is greater
|
||||
* than half the ping interval... */
|
||||
if ((ecore_loop_time_get() - bd->ping) >
|
||||
((e_config->ping_clients_interval *
|
||||
if ((ecore_loop_time_get() - bd->ping) >
|
||||
((e_config->ping_clients_interval *
|
||||
ecore_poller_poll_interval_get(ECORE_POLLER_CORE)) / 2.0))
|
||||
{
|
||||
if (!bd->hung)
|
||||
|
|
|
@ -141,7 +141,7 @@ struct _E_Border
|
|||
int mx, my;
|
||||
} current, last_down[3], last_up[3];
|
||||
} mouse;
|
||||
|
||||
|
||||
struct {
|
||||
struct {
|
||||
int x, y, w, h;
|
||||
|
@ -164,7 +164,7 @@ struct _E_Border
|
|||
double t;
|
||||
} start;
|
||||
} fx;
|
||||
|
||||
|
||||
struct {
|
||||
int l, r, t, b;
|
||||
} client_inset;
|
||||
|
@ -182,18 +182,18 @@ struct _E_Border
|
|||
struct {
|
||||
Ecore_X_Window shell_win;
|
||||
Ecore_X_Window win;
|
||||
|
||||
|
||||
int x, y, w, h;
|
||||
|
||||
|
||||
struct {
|
||||
unsigned char changed : 1;
|
||||
unsigned char user_selected : 1;
|
||||
const char *name;
|
||||
} border;
|
||||
|
||||
|
||||
unsigned char shaped : 1;
|
||||
unsigned char argb : 1;
|
||||
|
||||
|
||||
/* ICCCM */
|
||||
struct {
|
||||
const char *title;
|
||||
|
@ -314,7 +314,7 @@ struct _E_Border
|
|||
unsigned char change_desktop : 1;
|
||||
unsigned char close : 1;
|
||||
} action;
|
||||
|
||||
|
||||
Ecore_X_Window_Type type;
|
||||
Ecore_X_Window_Type *extra_types;
|
||||
int extra_types_num;
|
||||
|
@ -363,17 +363,17 @@ struct _E_Border
|
|||
unsigned char video_position : 1;
|
||||
} fetch;
|
||||
} e;
|
||||
|
||||
|
||||
struct {
|
||||
struct {
|
||||
unsigned char soft_menu : 1;
|
||||
unsigned char soft_menus : 1;
|
||||
} fetch;
|
||||
|
||||
|
||||
unsigned char soft_menu : 1;
|
||||
unsigned char soft_menus : 1;
|
||||
} qtopia;
|
||||
|
||||
|
||||
struct {
|
||||
struct {
|
||||
unsigned char state : 1;
|
||||
|
@ -383,22 +383,22 @@ struct _E_Border
|
|||
unsigned char vkbd : 1;
|
||||
} vkbd;
|
||||
|
||||
struct
|
||||
struct
|
||||
{
|
||||
struct
|
||||
struct
|
||||
{
|
||||
struct
|
||||
struct
|
||||
{
|
||||
unsigned char conformant : 1;
|
||||
} fetch;
|
||||
unsigned char conformant : 1;
|
||||
} conformant;
|
||||
struct
|
||||
struct
|
||||
{
|
||||
struct
|
||||
struct
|
||||
{
|
||||
unsigned char state : 1;
|
||||
struct
|
||||
struct
|
||||
{
|
||||
unsigned int major : 1;
|
||||
unsigned int minor : 1;
|
||||
|
@ -407,7 +407,7 @@ struct _E_Border
|
|||
unsigned char zone : 1;
|
||||
} fetch;
|
||||
Ecore_X_Illume_Quickpanel_State state;
|
||||
struct
|
||||
struct
|
||||
{
|
||||
unsigned int major : 1;
|
||||
unsigned int minor : 1;
|
||||
|
@ -415,9 +415,9 @@ struct _E_Border
|
|||
unsigned char quickpanel : 1;
|
||||
int zone;
|
||||
} quickpanel;
|
||||
struct
|
||||
struct
|
||||
{
|
||||
struct
|
||||
struct
|
||||
{
|
||||
unsigned char drag : 1;
|
||||
unsigned char locked : 1;
|
||||
|
@ -429,9 +429,9 @@ struct _E_Border
|
|||
|
||||
Ecore_X_Window_Attributes initial_attributes;
|
||||
} client;
|
||||
|
||||
|
||||
E_Container_Shape *shape;
|
||||
|
||||
|
||||
unsigned int visible : 1;
|
||||
unsigned int await_hide_event;
|
||||
unsigned int moving : 1;
|
||||
|
@ -492,17 +492,17 @@ struct _E_Border
|
|||
unsigned int internal : 1;
|
||||
unsigned int internal_no_remember : 1;
|
||||
unsigned int stolen : 1;
|
||||
|
||||
|
||||
Ecore_Evas *internal_ecore_evas;
|
||||
|
||||
|
||||
double ping;
|
||||
|
||||
|
||||
unsigned char changed : 1;
|
||||
|
||||
unsigned char icon_preference;
|
||||
|
||||
unsigned char icon_preference;
|
||||
unsigned char ignore_first_unmap;
|
||||
unsigned char resize_mode;
|
||||
|
||||
|
||||
struct {
|
||||
int x, y, w, h;
|
||||
unsigned int layer;
|
||||
|
@ -517,7 +517,7 @@ struct _E_Border
|
|||
int x, y, w, h;
|
||||
} saved;
|
||||
} pre_res_change;
|
||||
|
||||
|
||||
struct {
|
||||
double start;
|
||||
double val;
|
||||
|
@ -525,7 +525,7 @@ struct _E_Border
|
|||
E_Direction dir;
|
||||
Ecore_Animator *anim;
|
||||
} shade;
|
||||
|
||||
|
||||
struct {
|
||||
int x, y;
|
||||
int modified;
|
||||
|
@ -538,7 +538,7 @@ struct _E_Border
|
|||
E_Config_Dialog *border_border_dialog;
|
||||
E_Dialog *border_prop_dialog;
|
||||
Eina_List *pending_move_resize;
|
||||
|
||||
|
||||
struct {
|
||||
unsigned char visible : 1;
|
||||
unsigned char pos : 1;
|
||||
|
@ -580,19 +580,19 @@ struct _E_Border
|
|||
E_Pointer *pointer;
|
||||
|
||||
unsigned char comp_hidden : 1;
|
||||
|
||||
|
||||
unsigned char post_move : 1;
|
||||
unsigned char post_resize : 1;
|
||||
unsigned char post_show : 1;
|
||||
|
||||
|
||||
Ecore_Idle_Enterer *post_job;
|
||||
|
||||
Eina_Bool argb;
|
||||
|
||||
|
||||
int tmp_input_hidden;
|
||||
};
|
||||
|
||||
struct _E_Border_Pending_Move_Resize
|
||||
struct _E_Border_Pending_Move_Resize
|
||||
{
|
||||
int x, y, w, h;
|
||||
unsigned char move : 1;
|
||||
|
@ -641,7 +641,7 @@ EAPI void e_border_ref(E_Border *bd);
|
|||
EAPI void e_border_unref(E_Border *bd);
|
||||
EAPI void e_border_res_change_geometry_save(E_Border *bd);
|
||||
EAPI void e_border_res_change_geometry_restore(E_Border *bd);
|
||||
|
||||
|
||||
EAPI void e_border_zone_set(E_Border *bd, E_Zone *zone);
|
||||
EAPI void e_border_desk_set(E_Border *bd, E_Desk *desk);
|
||||
EAPI void e_border_show(E_Border *bd);
|
||||
|
|
114
src/bin/e_box.c
114
src/bin/e_box.c
|
@ -4,7 +4,7 @@ typedef struct _E_Smart_Data E_Smart_Data;
|
|||
typedef struct _E_Box_Item E_Box_Item;
|
||||
|
||||
struct _E_Smart_Data
|
||||
{
|
||||
{
|
||||
Evas_Coord x, y, w, h;
|
||||
Evas_Object *obj;
|
||||
Evas_Object *clip;
|
||||
|
@ -19,7 +19,7 @@ struct _E_Smart_Data
|
|||
struct {
|
||||
double x, y;
|
||||
} align;
|
||||
};
|
||||
};
|
||||
|
||||
struct _E_Box_Item
|
||||
{
|
||||
|
@ -70,7 +70,7 @@ EAPI int
|
|||
e_box_freeze(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(0);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return 0;
|
||||
|
@ -82,7 +82,7 @@ EAPI int
|
|||
e_box_thaw(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(0);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return 0;
|
||||
|
@ -95,7 +95,7 @@ EAPI void
|
|||
e_box_orientation_set(Evas_Object *obj, int horizontal)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERRNR();
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
|
@ -109,7 +109,7 @@ EAPI int
|
|||
e_box_orientation_get(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(0);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return 0;
|
||||
|
@ -120,7 +120,7 @@ EAPI void
|
|||
e_box_homogenous_set(Evas_Object *obj, int homogenous)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERRNR();
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
|
@ -134,7 +134,7 @@ EAPI int
|
|||
e_box_pack_start(Evas_Object *obj, Evas_Object *child)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (!child) return 0;
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(0);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
|
@ -150,7 +150,7 @@ EAPI int
|
|||
e_box_pack_end(Evas_Object *obj, Evas_Object *child)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (!child) return 0;
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(0);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
|
@ -169,7 +169,7 @@ e_box_pack_before(Evas_Object *obj, Evas_Object *child, Evas_Object *before)
|
|||
int i = 0;
|
||||
Eina_List *l;
|
||||
Evas_Object *item;
|
||||
|
||||
|
||||
if (!child) return 0;
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(0);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
|
@ -193,7 +193,7 @@ e_box_pack_after(Evas_Object *obj, Evas_Object *child, Evas_Object *after)
|
|||
int i = 0;
|
||||
Eina_List *l;
|
||||
Evas_Object *item;
|
||||
|
||||
|
||||
if (!child) return 0;
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(0);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
|
@ -214,7 +214,7 @@ EAPI int
|
|||
e_box_pack_count_get(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(0);
|
||||
if (!sd) return 0;
|
||||
|
@ -225,7 +225,7 @@ EAPI Evas_Object *
|
|||
e_box_pack_object_nth(Evas_Object *obj, int n)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(NULL);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return NULL;
|
||||
|
@ -236,7 +236,7 @@ EAPI Evas_Object *
|
|||
e_box_pack_object_first(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(NULL);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return NULL;
|
||||
|
@ -247,7 +247,7 @@ EAPI Evas_Object *
|
|||
e_box_pack_object_last(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(NULL);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return NULL;
|
||||
|
@ -258,7 +258,7 @@ EAPI void
|
|||
e_box_pack_options_set(Evas_Object *obj, int fill_w, int fill_h, int expand_w, int expand_h, double align_x, double align_y, Evas_Coord min_w, Evas_Coord min_h, Evas_Coord max_w, Evas_Coord max_h)
|
||||
{
|
||||
E_Box_Item *bi;
|
||||
|
||||
|
||||
bi = evas_object_data_get(obj, "e_box_data");
|
||||
if (!bi) return;
|
||||
bi->fill_w = fill_w;
|
||||
|
@ -280,7 +280,7 @@ e_box_unpack(Evas_Object *obj)
|
|||
{
|
||||
E_Box_Item *bi;
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (!obj) return;
|
||||
bi = evas_object_data_get(obj, "e_box_data");
|
||||
if (!bi) return;
|
||||
|
@ -296,7 +296,7 @@ EAPI void
|
|||
e_box_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERRNR();
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
|
@ -309,7 +309,7 @@ EAPI void
|
|||
e_box_size_max_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERRNR();
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
|
@ -322,7 +322,7 @@ EAPI void
|
|||
e_box_align_get(Evas_Object *obj, double *ax, double *ay)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERRNR();
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
|
@ -334,7 +334,7 @@ EAPI void
|
|||
e_box_align_set(Evas_Object *obj, double ax, double ay)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERRNR();
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
|
@ -352,7 +352,7 @@ EAPI void
|
|||
e_box_align_pixel_offset_get(Evas_Object *obj, int *x, int *y)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERRNR();
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
|
@ -365,7 +365,7 @@ static E_Box_Item *
|
|||
_e_box_smart_adopt(E_Smart_Data *sd, Evas_Object *obj)
|
||||
{
|
||||
E_Box_Item *bi;
|
||||
|
||||
|
||||
bi = calloc(1, sizeof(E_Box_Item));
|
||||
if (!bi) return NULL;
|
||||
bi->sd = sd;
|
||||
|
@ -396,7 +396,7 @@ static void
|
|||
_e_box_smart_disown(Evas_Object *obj)
|
||||
{
|
||||
E_Box_Item *bi;
|
||||
|
||||
|
||||
bi = evas_object_data_get(obj, "e_box_data");
|
||||
if (!bi) return;
|
||||
if (!bi->sd->items)
|
||||
|
@ -429,7 +429,7 @@ _e_box_smart_reconfigure(E_Smart_Data *sd)
|
|||
int count, expand;
|
||||
|
||||
if (!sd->changed) return;
|
||||
|
||||
|
||||
x = sd->x;
|
||||
y = sd->y;
|
||||
w = sd->w;
|
||||
|
@ -486,7 +486,7 @@ _e_box_smart_reconfigure(E_Smart_Data *sd)
|
|||
EINA_LIST_FOREACH(sd->items, l, obj)
|
||||
{
|
||||
E_Box_Item *bi;
|
||||
|
||||
|
||||
bi = evas_object_data_get(obj, "e_box_data");
|
||||
if (bi)
|
||||
{
|
||||
|
@ -495,18 +495,18 @@ _e_box_smart_reconfigure(E_Smart_Data *sd)
|
|||
if (sd->homogenous)
|
||||
{
|
||||
Evas_Coord ww, hh, ow, oh;
|
||||
|
||||
|
||||
ww = (w / (Evas_Coord)count);
|
||||
hh = h;
|
||||
ow = bi->min.w;
|
||||
if (bi->fill_w) ow = ww;
|
||||
if ((bi->max.w >= 0) && (bi->max.w < ow))
|
||||
if ((bi->max.w >= 0) && (bi->max.w < ow))
|
||||
ow = bi->max.w;
|
||||
oh = bi->min.h;
|
||||
if (bi->fill_h) oh = hh;
|
||||
if ((bi->max.h >= 0) && (bi->max.h < oh))
|
||||
if ((bi->max.h >= 0) && (bi->max.h < oh))
|
||||
oh = bi->max.h;
|
||||
evas_object_move(obj,
|
||||
evas_object_move(obj,
|
||||
xx + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),
|
||||
yy + (Evas_Coord)(((double)(hh - oh)) * bi->align.y));
|
||||
evas_object_resize(obj, ow, oh);
|
||||
|
@ -515,7 +515,7 @@ _e_box_smart_reconfigure(E_Smart_Data *sd)
|
|||
else
|
||||
{
|
||||
Evas_Coord ww, hh, ow, oh;
|
||||
|
||||
|
||||
ww = bi->min.w;
|
||||
if ((expand > 0) && (bi->expand_w))
|
||||
{
|
||||
|
@ -531,7 +531,7 @@ _e_box_smart_reconfigure(E_Smart_Data *sd)
|
|||
oh = bi->min.h;
|
||||
if (bi->fill_h) oh = hh;
|
||||
if ((bi->max.h >= 0) && (bi->max.h < oh)) oh = bi->max.h;
|
||||
evas_object_move(obj,
|
||||
evas_object_move(obj,
|
||||
xx + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),
|
||||
yy + (Evas_Coord)(((double)(hh - oh)) * bi->align.y));
|
||||
evas_object_resize(obj, ow, oh);
|
||||
|
@ -543,7 +543,7 @@ _e_box_smart_reconfigure(E_Smart_Data *sd)
|
|||
if (sd->homogenous)
|
||||
{
|
||||
Evas_Coord ww, hh, ow, oh;
|
||||
|
||||
|
||||
ww = w;
|
||||
hh = (h / (Evas_Coord)count);
|
||||
ow = bi->min.w;
|
||||
|
@ -552,7 +552,7 @@ _e_box_smart_reconfigure(E_Smart_Data *sd)
|
|||
oh = bi->min.h;
|
||||
if (bi->fill_h) oh = hh;
|
||||
if ((bi->max.h >= 0) && (bi->max.h < oh)) oh = bi->max.h;
|
||||
evas_object_move(obj,
|
||||
evas_object_move(obj,
|
||||
xx + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),
|
||||
yy + (Evas_Coord)(((double)(hh - oh)) * bi->align.y));
|
||||
evas_object_resize(obj, ow, oh);
|
||||
|
@ -561,7 +561,7 @@ _e_box_smart_reconfigure(E_Smart_Data *sd)
|
|||
else
|
||||
{
|
||||
Evas_Coord ww, hh, ow, oh;
|
||||
|
||||
|
||||
ww = w;
|
||||
hh = bi->min.h;
|
||||
if ((expand > 0) && (bi->expand_h))
|
||||
|
@ -577,7 +577,7 @@ _e_box_smart_reconfigure(E_Smart_Data *sd)
|
|||
oh = bi->min.h;
|
||||
if (bi->fill_h) oh = hh;
|
||||
if ((bi->max.h >= 0) && (bi->max.h < oh)) oh = bi->max.h;
|
||||
evas_object_move(obj,
|
||||
evas_object_move(obj,
|
||||
xx + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),
|
||||
yy + (Evas_Coord)(((double)(hh - oh)) * bi->align.y));
|
||||
evas_object_resize(obj, ow, oh);
|
||||
|
@ -599,7 +599,7 @@ _e_box_smart_extents_calculate(E_Smart_Data *sd)
|
|||
/* FIXME: need to calc max */
|
||||
sd->max.w = -1; /* max < 0 == unlimited */
|
||||
sd->max.h = -1;
|
||||
|
||||
|
||||
minw = 0;
|
||||
minh = 0;
|
||||
if (sd->homogenous)
|
||||
|
@ -607,8 +607,8 @@ _e_box_smart_extents_calculate(E_Smart_Data *sd)
|
|||
EINA_LIST_FOREACH(sd->items, l, obj)
|
||||
{
|
||||
E_Box_Item *bi;
|
||||
|
||||
bi = evas_object_data_get(obj, "e_box_data");
|
||||
|
||||
bi = evas_object_data_get(obj, "e_box_data");
|
||||
if (bi)
|
||||
{
|
||||
if (minh < bi->min.h) minh = bi->min.h;
|
||||
|
@ -616,16 +616,16 @@ _e_box_smart_extents_calculate(E_Smart_Data *sd)
|
|||
}
|
||||
}
|
||||
if (sd->horizontal)
|
||||
minw *= eina_list_count(sd->items);
|
||||
minw *= eina_list_count(sd->items);
|
||||
else
|
||||
minh *= eina_list_count(sd->items);
|
||||
minh *= eina_list_count(sd->items);
|
||||
}
|
||||
else
|
||||
{
|
||||
EINA_LIST_FOREACH(sd->items, l, obj)
|
||||
{
|
||||
E_Box_Item *bi;
|
||||
|
||||
|
||||
bi = evas_object_data_get(obj, "e_box_data");
|
||||
if (bi)
|
||||
{
|
||||
|
@ -680,7 +680,7 @@ static void
|
|||
_e_box_smart_add(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = calloc(1, sizeof(E_Smart_Data));
|
||||
if (!sd) return;
|
||||
sd->obj = obj;
|
||||
|
@ -697,12 +697,12 @@ _e_box_smart_add(Evas_Object *obj)
|
|||
evas_object_color_set(sd->clip, 255, 255, 255, 255);
|
||||
evas_object_smart_data_set(obj, sd);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
_e_box_smart_del(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
/* FIXME: this gets into an infinite loop when changin basic->advanced on
|
||||
|
@ -712,7 +712,7 @@ _e_box_smart_del(Evas_Object *obj)
|
|||
while (sd->items)
|
||||
{
|
||||
Evas_Object *child;
|
||||
|
||||
|
||||
child = eina_list_data_get(sd->items);
|
||||
e_box_unpack(child);
|
||||
}
|
||||
|
@ -727,7 +727,7 @@ static void
|
|||
_e_box_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
if ((x == sd->x) && (y == sd->y)) return;
|
||||
|
@ -735,13 +735,13 @@ _e_box_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
|
|||
Eina_List *l;
|
||||
Evas_Object *item;
|
||||
Evas_Coord dx, dy;
|
||||
|
||||
|
||||
dx = x - sd->x;
|
||||
dy = y - sd->y;
|
||||
EINA_LIST_FOREACH(sd->items, l, item)
|
||||
{
|
||||
Evas_Coord ox, oy;
|
||||
|
||||
|
||||
evas_object_geometry_get(item, &ox, &oy, NULL, NULL);
|
||||
evas_object_move(item, ox + dx, oy + dy);
|
||||
}
|
||||
|
@ -754,7 +754,7 @@ static void
|
|||
_e_box_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
if ((w == sd->w) && (h == sd->h)) return;
|
||||
|
@ -768,7 +768,7 @@ static void
|
|||
_e_box_smart_show(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
if (sd->items) evas_object_show(sd->clip);
|
||||
|
@ -778,7 +778,7 @@ static void
|
|||
_e_box_smart_hide(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
evas_object_hide(sd->clip);
|
||||
|
@ -788,9 +788,9 @@ static void
|
|||
_e_box_smart_color_set(Evas_Object *obj, int r, int g, int b, int a)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
if (!sd) return;
|
||||
evas_object_color_set(sd->clip, r, g, b, a);
|
||||
}
|
||||
|
||||
|
@ -798,7 +798,7 @@ static void
|
|||
_e_box_smart_clip_set(Evas_Object *obj, Evas_Object *clip)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
evas_object_clip_set(sd->clip, clip);
|
||||
|
@ -808,8 +808,8 @@ static void
|
|||
_e_box_smart_clip_unset(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
evas_object_clip_unset(sd->clip);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -12,7 +12,7 @@ EAPI void
|
|||
e_canvas_add(Ecore_Evas *ee)
|
||||
{
|
||||
Evas *e;
|
||||
|
||||
|
||||
_e_canvases = eina_list_prepend(_e_canvases, ee);
|
||||
e = ecore_evas_get(ee);
|
||||
evas_image_cache_set(e, e_config->image_cache * 1024);
|
||||
|
@ -50,10 +50,10 @@ e_canvas_recache(void)
|
|||
Eina_List *l;
|
||||
Ecore_Evas *ee;
|
||||
|
||||
EINA_LIST_FOREACH(_e_canvases, l, ee)
|
||||
EINA_LIST_FOREACH(_e_canvases, l, ee)
|
||||
{
|
||||
Evas *e;
|
||||
|
||||
|
||||
e = ecore_evas_get(ee);
|
||||
evas_image_cache_set(e, e_config->image_cache * 1024);
|
||||
evas_font_cache_set(e, e_config->font_cache * 1024);
|
||||
|
@ -67,7 +67,7 @@ e_canvas_recache(void)
|
|||
}
|
||||
if (e_config->cache_flush_poll_interval > 0)
|
||||
{
|
||||
_e_canvas_cache_flush_poller =
|
||||
_e_canvas_cache_flush_poller =
|
||||
ecore_poller_add(ECORE_POLLER_CORE,
|
||||
e_config->cache_flush_poll_interval,
|
||||
_e_canvas_cb_flush, NULL);
|
||||
|
@ -80,10 +80,10 @@ e_canvas_cache_flush(void)
|
|||
Eina_List *l;
|
||||
Ecore_Evas *ee;
|
||||
|
||||
EINA_LIST_FOREACH(_e_canvases, l, ee)
|
||||
EINA_LIST_FOREACH(_e_canvases, l, ee)
|
||||
{
|
||||
Evas *e;
|
||||
|
||||
|
||||
e = ecore_evas_get(ee);
|
||||
evas_image_cache_flush(e);
|
||||
evas_font_cache_flush(e);
|
||||
|
@ -98,10 +98,10 @@ e_canvas_cache_reload(void)
|
|||
Eina_List *l;
|
||||
Ecore_Evas *ee;
|
||||
|
||||
EINA_LIST_FOREACH(_e_canvases, l, ee)
|
||||
EINA_LIST_FOREACH(_e_canvases, l, ee)
|
||||
{
|
||||
Evas *e;
|
||||
|
||||
|
||||
e = ecore_evas_get(ee);
|
||||
evas_image_cache_reload(e);
|
||||
}
|
||||
|
@ -113,10 +113,10 @@ e_canvas_idle_flush(void)
|
|||
Eina_List *l;
|
||||
Ecore_Evas *ee;
|
||||
|
||||
EINA_LIST_FOREACH(_e_canvases, l, ee)
|
||||
EINA_LIST_FOREACH(_e_canvases, l, ee)
|
||||
{
|
||||
Evas *e;
|
||||
|
||||
|
||||
e = ecore_evas_get(ee);
|
||||
evas_render_idle_flush(e);
|
||||
}
|
||||
|
@ -128,10 +128,10 @@ e_canvas_rehint(void)
|
|||
Eina_List *l;
|
||||
Ecore_Evas *ee;
|
||||
|
||||
EINA_LIST_FOREACH(_e_canvases, l, ee)
|
||||
EINA_LIST_FOREACH(_e_canvases, l, ee)
|
||||
{
|
||||
Evas *e;
|
||||
|
||||
|
||||
e = ecore_evas_get(ee);
|
||||
if (e_config->font_hinting == 0)
|
||||
evas_font_hinting_set(e, EVAS_FONT_HINTING_BYTECODE);
|
||||
|
@ -147,7 +147,7 @@ e_canvas_new(Ecore_X_Window win, int x, int y, int w, int h,
|
|||
int direct_resize, int override, Ecore_X_Window *win_ret)
|
||||
{
|
||||
Ecore_Evas *ee;
|
||||
|
||||
|
||||
ee = ecore_evas_software_x11_new(NULL, win, x, y, w, h);
|
||||
if (ee)
|
||||
{
|
||||
|
@ -167,4 +167,3 @@ _e_canvas_cb_flush(void *data __UNUSED__)
|
|||
e_canvas_cache_flush();
|
||||
return ECORE_CALLBACK_RENEW;
|
||||
}
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@ e_color_dialog_new(E_Container *con, const E_Color *color, Eina_Bool alpha_enabl
|
|||
if (!dia) return NULL;
|
||||
dia->dia = e_dialog_new(con, "E", "_color_dialog");
|
||||
e_dialog_title_set(dia->dia, _("Color Selector"));
|
||||
|
||||
|
||||
dia->color = calloc(1, sizeof(E_Color));
|
||||
dia->initial = calloc(1, sizeof(E_Color));
|
||||
|
||||
|
@ -102,7 +102,7 @@ static void
|
|||
_e_color_dialog_button1_click(void *data, E_Dialog *edia __UNUSED__)
|
||||
{
|
||||
E_Color_Dialog *dia;
|
||||
|
||||
|
||||
dia = data;
|
||||
if (dia->select_func && dia->color)
|
||||
dia->select_func(dia, dia->color, dia->select_data);
|
||||
|
@ -117,7 +117,7 @@ _e_color_dialog_button2_click(void *data, E_Dialog *edia __UNUSED__)
|
|||
dia = data;
|
||||
if (dia->cancel_func && dia->initial)
|
||||
dia->cancel_func(dia, dia->initial, dia->cancel_data);
|
||||
_e_color_dialog_free(data);
|
||||
_e_color_dialog_free(data);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -11,12 +11,12 @@ typedef struct _E_Color_Dialog E_Color_Dialog;
|
|||
struct _E_Color_Dialog
|
||||
{
|
||||
E_Object e_obj_inherit;
|
||||
|
||||
|
||||
E_Container *con;
|
||||
E_Dialog *dia;
|
||||
|
||||
|
||||
E_Color *color, *initial;
|
||||
|
||||
|
||||
void (*select_func)(E_Color_Dialog *dia, E_Color *color, void *data);
|
||||
void *select_data;
|
||||
void (*cancel_func)(E_Color_Dialog *dia, E_Color *color, void *data);
|
||||
|
|
|
@ -624,7 +624,7 @@ e_config_init(void)
|
|||
#define T E_Config_XKB_Option
|
||||
#define D _e_config_xkb_option_edd
|
||||
E_CONFIG_VAL(D, T, name, STR);
|
||||
|
||||
|
||||
_e_config_edd = E_CONFIG_DD_NEW("E_Config", E_Config);
|
||||
#undef T
|
||||
#undef D
|
||||
|
@ -787,7 +787,7 @@ e_config_init(void)
|
|||
E_CONFIG_VAL(D, T, screensaver_suspend, UCHAR);
|
||||
E_CONFIG_VAL(D, T, screensaver_suspend_on_ac, UCHAR);
|
||||
E_CONFIG_VAL(D, T, screensaver_suspend_delay, DOUBLE);
|
||||
|
||||
|
||||
E_CONFIG_VAL(D, T, dpms_enable, INT);
|
||||
E_CONFIG_VAL(D, T, dpms_standby_enable, INT);
|
||||
E_CONFIG_VAL(D, T, dpms_suspend_enable, INT);
|
||||
|
@ -836,7 +836,7 @@ e_config_init(void)
|
|||
E_CONFIG_VAL(D, T, menu_favorites_show, INT);
|
||||
E_CONFIG_VAL(D, T, menu_apps_show, INT);
|
||||
E_CONFIG_VAL(D, T, menu_gadcon_client_toplevel, INT);
|
||||
|
||||
|
||||
E_CONFIG_VAL(D, T, ping_clients_interval, INT);
|
||||
E_CONFIG_VAL(D, T, cache_flush_poll_interval, INT);
|
||||
|
||||
|
@ -923,8 +923,8 @@ e_config_init(void)
|
|||
E_CONFIG_LIST(D, T, xkb.used_layouts, _e_config_xkb_layout_edd);
|
||||
E_CONFIG_LIST(D, T, xkb.used_options, _e_config_xkb_option_edd);
|
||||
E_CONFIG_VAL(D, T, xkb.only_label, INT);
|
||||
E_CONFIG_VAL(D, T, xkb.default_model, STR);
|
||||
|
||||
E_CONFIG_VAL(D, T, xkb.default_model, STR);
|
||||
|
||||
e_config_load();
|
||||
|
||||
e_config_save_queue();
|
||||
|
@ -1601,16 +1601,16 @@ _e_config_mv_error(const char *from, const char *to)
|
|||
if (!_e_config_error_dialog)
|
||||
{
|
||||
E_Dialog *dia;
|
||||
|
||||
dia = e_dialog_new(e_container_current_get(e_manager_current_get()),
|
||||
|
||||
dia = e_dialog_new(e_container_current_get(e_manager_current_get()),
|
||||
"E", "_sys_error_logout_slow");
|
||||
if (dia)
|
||||
{
|
||||
char buf[8192];
|
||||
|
||||
|
||||
e_dialog_title_set(dia, _("Enlightenment Settings Write Problems"));
|
||||
e_dialog_icon_set(dia, "dialog-error", 64);
|
||||
snprintf(buf, sizeof(buf),
|
||||
snprintf(buf, sizeof(buf),
|
||||
_("Enlightenment has had an error while moving config files<br>"
|
||||
"from:<br>"
|
||||
"%s<br>"
|
||||
|
@ -1927,7 +1927,7 @@ _e_config_free(E_Config *ecf)
|
|||
|
||||
if (e_config->xkb.default_model)
|
||||
eina_stringshare_del(e_config->xkb.default_model);
|
||||
|
||||
|
||||
EINA_LIST_FREE(e_config->xkb.used_layouts, cl)
|
||||
{
|
||||
eina_stringshare_del(cl->name);
|
||||
|
@ -1935,13 +1935,13 @@ _e_config_free(E_Config *ecf)
|
|||
eina_stringshare_del(cl->variant);
|
||||
E_FREE(cl);
|
||||
}
|
||||
|
||||
|
||||
EINA_LIST_FREE(e_config->xkb.used_options, op)
|
||||
{
|
||||
eina_stringshare_del(op->name);
|
||||
E_FREE(op);
|
||||
}
|
||||
|
||||
|
||||
EINA_LIST_FREE(ecf->modules, em)
|
||||
{
|
||||
if (em->name) eina_stringshare_del(em->name);
|
||||
|
@ -2194,7 +2194,7 @@ _e_config_eet_close_handle(Eet_File *ef, char *file)
|
|||
{
|
||||
E_Dialog *dia;
|
||||
|
||||
dia = e_dialog_new(e_container_current_get(e_manager_current_get()),
|
||||
dia = e_dialog_new(e_container_current_get(e_manager_current_get()),
|
||||
"E", "_sys_error_logout_slow");
|
||||
if (dia)
|
||||
{
|
||||
|
@ -2202,7 +2202,7 @@ _e_config_eet_close_handle(Eet_File *ef, char *file)
|
|||
|
||||
e_dialog_title_set(dia, _("Enlightenment Settings Write Problems"));
|
||||
e_dialog_icon_set(dia, "dialog-error", 64);
|
||||
snprintf(buf, sizeof(buf),
|
||||
snprintf(buf, sizeof(buf),
|
||||
_("Enlightenment has had an error while writing<br>"
|
||||
"its config file.<br>"
|
||||
"%s<br>"
|
||||
|
|
|
@ -196,7 +196,7 @@ struct _E_Config
|
|||
int screensaver_expose; // GUI
|
||||
unsigned char screensaver_ask_presentation; // GUI
|
||||
double screensaver_ask_presentation_timeout; // GUI
|
||||
|
||||
|
||||
unsigned char screensaver_suspend; // GUI
|
||||
unsigned char screensaver_suspend_on_ac; // GUI
|
||||
double screensaver_suspend_delay; // GUI
|
||||
|
@ -306,11 +306,11 @@ struct _E_Config
|
|||
unsigned char show_run_dialog;
|
||||
unsigned char show_exit_dialog;
|
||||
} exec;
|
||||
|
||||
|
||||
unsigned char null_container_win; // HYPER-ADVANCED-ONLY - TURNING ON KILLS DESKTOP BG
|
||||
|
||||
|
||||
Eina_List *env_vars; // GUI
|
||||
|
||||
|
||||
struct {
|
||||
double normal; // GUI
|
||||
double dim; // GUI
|
||||
|
@ -348,12 +348,12 @@ struct _E_Config
|
|||
const char *net_icon_theme_name; // GUI
|
||||
const char *gtk_font_name;
|
||||
} xsettings;
|
||||
|
||||
|
||||
struct {
|
||||
unsigned char check; // INTERNAL
|
||||
unsigned char later; // INTERNAL
|
||||
} update;
|
||||
|
||||
|
||||
struct {
|
||||
Eina_List *used_layouts;
|
||||
Eina_List *used_options;
|
||||
|
|
|
@ -14,4 +14,3 @@ e_config_descriptor_new(const char *name, int size)
|
|||
|
||||
return (E_Config_DD *) eet_data_descriptor_stream_new(&eddc);
|
||||
}
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ e_config_dialog_new(E_Container *con, const char *title, const char *name, const
|
|||
{
|
||||
E_Config_Dialog *cfd;
|
||||
|
||||
cfd = E_OBJECT_ALLOC(E_Config_Dialog, E_CONFIG_DIALOG_TYPE,
|
||||
cfd = E_OBJECT_ALLOC(E_Config_Dialog, E_CONFIG_DIALOG_TYPE,
|
||||
_e_config_dialog_free);
|
||||
cfd->view = view;
|
||||
cfd->con = con;
|
||||
|
@ -43,7 +43,7 @@ e_config_dialog_new(E_Container *con, const char *title, const char *name, const
|
|||
if (cfd->view->override_auto_apply)
|
||||
{
|
||||
/* Dialog Requested To Not Auto-Apply */
|
||||
if ((cfd->view->basic.apply_cfdata) ||
|
||||
if ((cfd->view->basic.apply_cfdata) ||
|
||||
(cfd->view->advanced.apply_cfdata))
|
||||
cfd->hide_buttons = 0;
|
||||
}
|
||||
|
@ -54,7 +54,7 @@ e_config_dialog_new(E_Container *con, const char *title, const char *name, const
|
|||
cfd->hide_buttons = 1;
|
||||
else
|
||||
{
|
||||
if ((cfd->view->basic.apply_cfdata) ||
|
||||
if ((cfd->view->basic.apply_cfdata) ||
|
||||
(cfd->view->advanced.apply_cfdata))
|
||||
cfd->hide_buttons = 0;
|
||||
}
|
||||
|
@ -70,7 +70,7 @@ e_config_dialog_new(E_Container *con, const char *title, const char *name, const
|
|||
if (cfd->view->advanced.create_widgets)
|
||||
_e_config_dialog_go(cfd, E_CONFIG_DIALOG_CFDATA_TYPE_ADVANCED);
|
||||
else if (cfd->view->basic.create_widgets)
|
||||
_e_config_dialog_go(cfd, E_CONFIG_DIALOG_CFDATA_TYPE_BASIC);
|
||||
_e_config_dialog_go(cfd, E_CONFIG_DIALOG_CFDATA_TYPE_BASIC);
|
||||
break;
|
||||
}
|
||||
_e_config_dialog_list = eina_list_append(_e_config_dialog_list, cfd);
|
||||
|
@ -93,7 +93,7 @@ e_config_dialog_find(const char *name, const char *class)
|
|||
|
||||
z = e_util_zone_current_get(e_manager_current_get());
|
||||
e_border_uniconify(cfd->dia->win->border);
|
||||
e_win_raise(cfd->dia->win);
|
||||
e_win_raise(cfd->dia->win);
|
||||
if (z->container == cfd->dia->win->border->zone->container)
|
||||
e_border_desk_set(cfd->dia->win->border, e_desk_current_get(z));
|
||||
else
|
||||
|
@ -115,7 +115,7 @@ e_config_dialog_find(const char *name, const char *class)
|
|||
}
|
||||
|
||||
EAPI E_Config_Dialog *
|
||||
e_config_dialog_get(const char *name, const char *class)
|
||||
e_config_dialog_get(const char *name, const char *class)
|
||||
{
|
||||
Eina_List *l;
|
||||
E_Config_Dialog *cfd;
|
||||
|
@ -173,14 +173,14 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type)
|
|||
* else
|
||||
* snprintf(buf, sizeof(buf), "%s...%s", cfd->class, "ADVANCED"); */
|
||||
snprintf(buf, sizeof(buf), "_config::%s", cfd->class);
|
||||
|
||||
|
||||
if (!pdia) /* creating window for the first time */
|
||||
{
|
||||
if ((cfd->view->normal_win) || (e_config->cfgdlg_normal_wins))
|
||||
cfd->dia = e_dialog_normal_win_new(cfd->con, cfd->name, buf);
|
||||
else
|
||||
cfd->dia = e_dialog_new(cfd->con, cfd->name, buf);
|
||||
e_object_del_attach_func_set(E_OBJECT(cfd->dia),
|
||||
e_object_del_attach_func_set(E_OBJECT(cfd->dia),
|
||||
_e_config_dialog_cb_dialog_del);
|
||||
} /* window was created before - deleting content only */
|
||||
else if (cfd->dia->content_object)
|
||||
|
@ -235,7 +235,7 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type)
|
|||
}
|
||||
else
|
||||
e_widget_list_object_append(o, ob, 1, 1, 0.0);
|
||||
ob = e_widget_button_add(evas,
|
||||
ob = e_widget_button_add(evas,
|
||||
_("Basic"), "go-next",
|
||||
_e_config_dialog_cb_basic, cfd, NULL);
|
||||
e_widget_list_object_append(o, ob, 0, 0, 1.0);
|
||||
|
@ -338,7 +338,7 @@ _e_config_dialog_cb_ok(void *data __UNUSED__, E_Dialog *dia)
|
|||
if (cfd->view->advanced.apply_cfdata)
|
||||
ok = cfd->view->advanced.apply_cfdata(cfd, cfd->cfdata);
|
||||
}
|
||||
if (ok)
|
||||
if (ok)
|
||||
e_util_defer_object_del(E_OBJECT(cfd));
|
||||
}
|
||||
|
||||
|
@ -400,7 +400,7 @@ _e_config_dialog_changed(E_Config_Dialog *cfd)
|
|||
{
|
||||
if (cfd->auto_apply_timer) ecore_timer_del(cfd->auto_apply_timer);
|
||||
cfd->auto_apply_timer = NULL;
|
||||
cfd->auto_apply_timer =
|
||||
cfd->auto_apply_timer =
|
||||
ecore_timer_add(0.5, _e_config_dialog_cb_auto_apply_timer, cfd);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -23,7 +23,7 @@ struct _E_Config_Dialog_View
|
|||
unsigned char basic_only : 1;
|
||||
unsigned char normal_win : 1;
|
||||
unsigned char scroll : 1;
|
||||
|
||||
|
||||
void *(*create_cfdata) (E_Config_Dialog *cfd);
|
||||
void (*free_cfdata) (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||
int (*close_cfdata) (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||
|
@ -31,13 +31,13 @@ struct _E_Config_Dialog_View
|
|||
int (*apply_cfdata) (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||
Evas_Object *(*create_widgets) (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
|
||||
int (*check_changed) (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||
} basic, advanced;
|
||||
} basic, advanced;
|
||||
};
|
||||
|
||||
struct _E_Config_Dialog
|
||||
{
|
||||
E_Object e_obj_inherit;
|
||||
|
||||
|
||||
E_Config_Dialog_CFData_Type view_type;
|
||||
E_Config_Dialog_View *view;
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
|
|
@ -61,7 +61,7 @@ e_configure_registry_call(const char *path, E_Container *con, const char *params
|
|||
if (!strcmp(item, eci->item))
|
||||
{
|
||||
if (!params) params = eci->params;
|
||||
|
||||
|
||||
if (eci->func) eci->func(con, params);
|
||||
else if (eci->generic_func) eci->generic_func(con, params);
|
||||
else if (eci->desktop)
|
||||
|
@ -152,7 +152,7 @@ e_configure_registry_category_add(const char *path, int pri, const char *label,
|
|||
EINA_LIST_FOREACH(e_configure_registry, l, ecat2)
|
||||
if (ecat2->pri > ecat->pri)
|
||||
{
|
||||
e_configure_registry =
|
||||
e_configure_registry =
|
||||
eina_list_prepend_relative_list(e_configure_registry, ecat, l);
|
||||
return;
|
||||
}
|
||||
|
@ -316,7 +316,7 @@ _e_configure_efreet_desktop_update(void)
|
|||
char *label;
|
||||
int cfg_pri;
|
||||
int dopref;
|
||||
|
||||
|
||||
dopref = 0;
|
||||
cfg_cat = NULL;
|
||||
cfg_icon = NULL;
|
||||
|
@ -355,7 +355,7 @@ _e_configure_efreet_desktop_update(void)
|
|||
if (!cfg_cat_cfg)
|
||||
{
|
||||
const char *ic = cfg_cat_icon;
|
||||
|
||||
|
||||
if (dopref)
|
||||
{
|
||||
snprintf(buf, sizeof(buf), "preferences/%s", label);
|
||||
|
@ -368,7 +368,7 @@ _e_configure_efreet_desktop_update(void)
|
|||
{
|
||||
snprintf(buf, sizeof(buf), "system/%s", label);
|
||||
if (!ic) ic = "preferences-system";
|
||||
e_configure_registry_category_add("system", 1000,
|
||||
e_configure_registry_category_add("system", 1000,
|
||||
_("System"),
|
||||
NULL, ic);
|
||||
}
|
||||
|
|
|
@ -15,7 +15,7 @@ e_confirm_dialog_show(const char *title, const char *icon, const char *text,
|
|||
void *data, void *data2,
|
||||
void (*del_func)(void *data), void *del_data)
|
||||
{
|
||||
E_Confirm_Dialog *cd;
|
||||
E_Confirm_Dialog *cd;
|
||||
E_Dialog *dia;
|
||||
|
||||
cd = E_OBJECT_ALLOC(E_Confirm_Dialog, E_CONFIRM_DIALOG_TYPE, _e_confirm_dialog_free);
|
||||
|
|
|
@ -11,10 +11,10 @@ typedef struct _E_Confirm_Dialog E_Confirm_Dialog;
|
|||
struct _E_Confirm_Dialog
|
||||
{
|
||||
E_Object e_obj_inherit;
|
||||
|
||||
|
||||
E_Dialog *dia;
|
||||
|
||||
struct
|
||||
struct
|
||||
{
|
||||
void *data;
|
||||
void (*func)(void *data);
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include "e.h"
|
||||
|
||||
/* TODO List:
|
||||
*
|
||||
*
|
||||
* * fix shape callbacks to be able to be safely deleted
|
||||
* * remove duplicate bd->layer -> layers code
|
||||
*
|
||||
|
@ -88,7 +88,7 @@ e_container_new(E_Manager *man)
|
|||
int have_comp = 0;
|
||||
Eina_List *ll;
|
||||
E_Config_Module *em;
|
||||
|
||||
|
||||
// FIXME: major hack. checking in advance for comp. eventully comp
|
||||
// will be rolled into e17 core and this won't be needed
|
||||
EINA_LIST_FOREACH(e_config->modules, ll, em)
|
||||
|
@ -126,7 +126,7 @@ e_container_new(E_Manager *man)
|
|||
|
||||
/* create a scratch window for putting stuff into */
|
||||
con->scratch_win = ecore_x_window_override_new(con->win, 0, 0, 7, 7);
|
||||
|
||||
|
||||
/* init layers */
|
||||
for (i = 0; i < 10; i++)
|
||||
{
|
||||
|
@ -816,7 +816,7 @@ _e_container_border_list_new(E_Container *con)
|
|||
E_Border *bd;
|
||||
int i;
|
||||
Eina_List *l;
|
||||
|
||||
|
||||
if (!(list = E_NEW(E_Border_List, 1))) return NULL;
|
||||
list->container = con;
|
||||
e_object_ref(E_OBJECT(list->container));
|
||||
|
@ -833,8 +833,8 @@ static E_Border *
|
|||
_e_container_border_list_jump(E_Border_List *list, int dir)
|
||||
{
|
||||
E_Border *bd;
|
||||
|
||||
if ((list->pos < 0) ||
|
||||
|
||||
if ((list->pos < 0) ||
|
||||
(list->pos >= (int)eina_array_count(&(list->client_array))))
|
||||
return NULL;
|
||||
bd = eina_array_data_get(&(list->client_array), list->pos);
|
||||
|
@ -846,7 +846,7 @@ EAPI E_Border_List *
|
|||
e_container_border_list_first(E_Container *con)
|
||||
{
|
||||
E_Border_List *list = NULL;
|
||||
|
||||
|
||||
list = _e_container_border_list_new(con);
|
||||
list->pos = 0;
|
||||
return list;
|
||||
|
@ -936,7 +936,7 @@ _e_container_free(E_Container *con)
|
|||
{
|
||||
e_object_free(E_OBJECT(tmp));
|
||||
}
|
||||
*/
|
||||
*/
|
||||
}
|
||||
l = con->zones;
|
||||
con->zones = NULL;
|
||||
|
@ -1145,8 +1145,8 @@ _e_container_resize_handle(E_Container *con)
|
|||
EINA_LIST_FOREACH(screens, l, scr)
|
||||
{
|
||||
zone = NULL;
|
||||
|
||||
printf("@@@ SCREENS: %i %i | %i %i %ix%i\n",
|
||||
|
||||
printf("@@@ SCREENS: %i %i | %i %i %ix%i\n",
|
||||
scr->screen, scr->escreen, scr->x, scr->y, scr->w, scr->h);
|
||||
EINA_LIST_FOREACH(zones, ll, zone)
|
||||
{
|
||||
|
@ -1160,19 +1160,19 @@ _e_container_resize_handle(E_Container *con)
|
|||
zones = eina_list_remove(zones, zone);
|
||||
con->zones = eina_list_append(con->zones, zone);
|
||||
zone->num = scr->screen;
|
||||
e_shelf_zone_move_resize_handle(zone);
|
||||
e_shelf_zone_move_resize_handle(zone);
|
||||
}
|
||||
else
|
||||
{
|
||||
E_Config_Shelf *cf_es;
|
||||
E_Config_Shelf *cf_es;
|
||||
|
||||
zone = e_zone_new(con, scr->screen, scr->escreen,
|
||||
zone = e_zone_new(con, scr->screen, scr->escreen,
|
||||
scr->x, scr->y, scr->w, scr->h);
|
||||
printf("@@@ NEW ZONE = %p\n", zone);
|
||||
/* find any shelves configured for this zone and add them in */
|
||||
EINA_LIST_FOREACH(e_config->shelves, ll, cf_es)
|
||||
{
|
||||
if (e_util_container_zone_id_get(cf_es->container,
|
||||
if (e_util_container_zone_id_get(cf_es->container,
|
||||
cf_es->zone) == zone)
|
||||
e_shelf_config_new(zone, cf_es);
|
||||
}
|
||||
|
@ -1185,7 +1185,7 @@ _e_container_resize_handle(E_Container *con)
|
|||
E_Zone *spare_zone = NULL;
|
||||
|
||||
if (con->zones) spare_zone = con->zones->data;
|
||||
|
||||
|
||||
EINA_LIST_FREE(zones, zone)
|
||||
{
|
||||
Eina_List *shelves, *ll2, *del_shelves;
|
||||
|
|
|
@ -27,21 +27,21 @@ typedef struct _E_Event_Container_Resize E_Event_Container_Resize;
|
|||
struct _E_Container
|
||||
{
|
||||
E_Object e_obj_inherit;
|
||||
|
||||
|
||||
Ecore_X_Window win;
|
||||
int x, y, w, h;
|
||||
char visible : 1;
|
||||
E_Manager *manager;
|
||||
|
||||
|
||||
unsigned int num;
|
||||
const char *name;
|
||||
|
||||
|
||||
Ecore_Evas *bg_ecore_evas;
|
||||
Evas *bg_evas;
|
||||
Evas_Object *bg_blank_object;
|
||||
Ecore_X_Window bg_win;
|
||||
Ecore_X_Window event_win;
|
||||
|
||||
|
||||
Eina_List *shapes;
|
||||
Eina_List *shape_change_cb;
|
||||
Eina_List *zones;
|
||||
|
@ -51,7 +51,7 @@ struct _E_Container
|
|||
Ecore_X_Window win;
|
||||
Eina_List *clients;
|
||||
} layers[10];
|
||||
|
||||
|
||||
Ecore_X_Window scratch_win;
|
||||
};
|
||||
|
||||
|
@ -65,7 +65,7 @@ struct _E_Border_List
|
|||
struct _E_Container_Shape
|
||||
{
|
||||
E_Object e_obj_inherit;
|
||||
|
||||
|
||||
E_Container *con;
|
||||
int x, y, w, h;
|
||||
unsigned char visible : 1;
|
||||
|
|
|
@ -905,4 +905,3 @@ _e_desk_hide_animator(void *data)
|
|||
|
||||
return ECORE_CALLBACK_RENEW;
|
||||
}
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@ struct _E_Desk
|
|||
int fullscreen_borders;
|
||||
|
||||
Evas_Object *bg_object;
|
||||
|
||||
|
||||
Ecore_Animator *animator;
|
||||
Eina_Bool animating;
|
||||
};
|
||||
|
|
|
@ -4,7 +4,7 @@ EINTERN int
|
|||
e_deskenv_init(void)
|
||||
{
|
||||
char buf[PATH_MAX], buf2[PATH_MAX];
|
||||
|
||||
|
||||
// run xdrb -load .Xdefaults & .Xresources
|
||||
// NOTE: one day we should replace this with an e based config + service
|
||||
if (e_config->deskenv.load_xrdb)
|
||||
|
|
|
@ -1144,4 +1144,3 @@ _e_desklock_ask_presentation_mode(void)
|
|||
|
||||
_e_desklock_ask_presentation_dia = dia;
|
||||
}
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ _e_dialog_internal_new(E_Container *con, const char *name, const char *class, in
|
|||
Evas_Object *o;
|
||||
Evas_Modifier_Mask mask;
|
||||
Eina_Bool kg;
|
||||
|
||||
|
||||
if (!con)
|
||||
{
|
||||
man = e_manager_current_get();
|
||||
|
@ -105,7 +105,7 @@ EAPI int
|
|||
e_dialog_button_focus_num(E_Dialog *dia, int button)
|
||||
{
|
||||
Evas_Object *o;
|
||||
|
||||
|
||||
o = eina_list_nth(dia->buttons, button);
|
||||
if (o) e_widget_focus_steal(o);
|
||||
return 1;
|
||||
|
@ -115,7 +115,7 @@ EAPI int
|
|||
e_dialog_button_disable_num_set(E_Dialog *dia, int button, int disabled)
|
||||
{
|
||||
Evas_Object *o;
|
||||
|
||||
|
||||
o = eina_list_nth(dia->buttons, button);
|
||||
if (o) e_widget_disabled_set(o, disabled);
|
||||
return 1;
|
||||
|
@ -126,7 +126,7 @@ e_dialog_button_disable_num_get(E_Dialog *dia, int button)
|
|||
{
|
||||
Evas_Object *o;
|
||||
int ret = 0;
|
||||
|
||||
|
||||
o = eina_list_nth(dia->buttons, button);
|
||||
if (o) ret = e_widget_disabled_get(o);
|
||||
return ret;
|
||||
|
@ -144,7 +144,7 @@ e_dialog_text_set(E_Dialog *dia, const char *text)
|
|||
if (!dia->text_object)
|
||||
{
|
||||
Evas_Object *o;
|
||||
|
||||
|
||||
o = edje_object_add(e_win_evas_get(dia->win));
|
||||
dia->text_object = o;
|
||||
e_theme_edje_object_set(o, "base/theme/dialog",
|
||||
|
@ -168,11 +168,11 @@ e_dialog_icon_set(E_Dialog *dia, const char *icon, Evas_Coord size)
|
|||
evas_object_show(dia->icon_object);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_dialog_border_icon_set(E_Dialog *dia, const char *icon)
|
||||
EAPI void
|
||||
e_dialog_border_icon_set(E_Dialog *dia, const char *icon)
|
||||
{
|
||||
E_Border *border;
|
||||
|
||||
|
||||
border = dia->win->border;
|
||||
if (!border) return;
|
||||
if (border->internal_icon)
|
||||
|
@ -220,7 +220,7 @@ e_dialog_show(E_Dialog *dia)
|
|||
{
|
||||
Evas_Coord mw, mh;
|
||||
Evas_Object *o;
|
||||
|
||||
|
||||
o = dia->text_object;
|
||||
if (o)
|
||||
{
|
||||
|
@ -233,7 +233,7 @@ e_dialog_show(E_Dialog *dia)
|
|||
e_widget_size_min_get(o, &mw, &mh);
|
||||
edje_extern_object_min_size_set(o, mw, mh);
|
||||
edje_object_part_swallow(dia->bg_object, "e.swallow.buttons", o);
|
||||
|
||||
|
||||
edje_object_size_min_calc(dia->bg_object, &mw, &mh);
|
||||
e_win_resize(dia->win, mw, mh);
|
||||
e_win_size_min_set(dia->win, mw, mh);
|
||||
|
@ -246,7 +246,7 @@ e_dialog_show(E_Dialog *dia)
|
|||
e_util_win_auto_resize_fill(dia->win);
|
||||
}
|
||||
e_win_show(dia->win);
|
||||
|
||||
|
||||
if (!e_widget_focus_get(dia->box_object))
|
||||
e_widget_focus_set(dia->box_object, 1);
|
||||
}
|
||||
|
@ -327,11 +327,11 @@ _e_dialog_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED_
|
|||
}
|
||||
}
|
||||
}
|
||||
else if (((!strcmp(ev->keyname, "Return")) ||
|
||||
else if (((!strcmp(ev->keyname, "Return")) ||
|
||||
(!strcmp(ev->keyname, "KP_Enter"))))
|
||||
{
|
||||
Evas_Object *o = NULL;
|
||||
|
||||
|
||||
if ((dia->content_object) && (e_widget_focus_get(dia->content_object)))
|
||||
o = e_widget_focused_object_get(dia->content_object);
|
||||
else
|
||||
|
@ -344,7 +344,7 @@ static void
|
|||
_e_dialog_cb_delete(E_Win *win)
|
||||
{
|
||||
E_Dialog *dia;
|
||||
|
||||
|
||||
dia = win->data;
|
||||
e_object_del(E_OBJECT(dia));
|
||||
}
|
||||
|
@ -353,7 +353,7 @@ static void
|
|||
_e_dialog_cb_resize(E_Win *win)
|
||||
{
|
||||
E_Dialog *dia;
|
||||
|
||||
|
||||
dia = win->data;
|
||||
evas_object_resize(dia->bg_object, dia->win->w, dia->win->h);
|
||||
}
|
||||
|
@ -362,11 +362,10 @@ static void
|
|||
_e_dialog_cb_wid_on_focus(void *data, Evas_Object *obj)
|
||||
{
|
||||
E_Dialog *dia;
|
||||
|
||||
|
||||
dia = data;
|
||||
if (obj == dia->content_object)
|
||||
e_widget_focused_object_clear(dia->box_object);
|
||||
else if (dia->content_object)
|
||||
e_widget_focused_object_clear(dia->content_object);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "e.h"
|
||||
|
||||
/* FIXME: broken when drop areas intersect
|
||||
/* FIXME: broken when drop areas intersect
|
||||
* (sub window has drop area on top of lower window or desktop)
|
||||
*/
|
||||
/*
|
||||
|
@ -181,7 +181,7 @@ e_drag_new(E_Container *container, int x, int y,
|
|||
ecore_evas_shaped_set(drag->ecore_evas, 1);
|
||||
ecore_x_window_shape_events_select(drag->evas_win, 1);
|
||||
}
|
||||
|
||||
|
||||
e_canvas_add(drag->ecore_evas);
|
||||
drag->shape = e_container_shape_add(drag->container);
|
||||
e_container_shape_move(drag->shape, drag->x, drag->y);
|
||||
|
@ -215,12 +215,12 @@ e_drag_new(E_Container *container, int x, int y,
|
|||
_drag_list = eina_list_append(_drag_list, drag);
|
||||
|
||||
ecore_x_window_shadow_tree_flush();
|
||||
|
||||
|
||||
_drag_win_root = drag->container->manager->root;
|
||||
|
||||
drag->cb.key_down = NULL;
|
||||
drag->cb.key_up = NULL;
|
||||
|
||||
|
||||
return drag;
|
||||
}
|
||||
|
||||
|
@ -271,7 +271,7 @@ e_drag_start(E_Drag *drag, int x, int y)
|
|||
E_Drop_Handler *h;
|
||||
|
||||
if (_drag_win) return 0;
|
||||
_drag_win = ecore_x_window_input_new(drag->container->win,
|
||||
_drag_win = ecore_x_window_input_new(drag->container->win,
|
||||
drag->container->x, drag->container->y,
|
||||
drag->container->w, drag->container->h);
|
||||
_drag_win_root = drag->container->manager->root;
|
||||
|
@ -317,11 +317,11 @@ e_drag_start(E_Drag *drag, int x, int y)
|
|||
EAPI int
|
||||
e_drag_xdnd_start(E_Drag *drag, int x, int y)
|
||||
{
|
||||
Ecore_X_Atom actions[] = {ECORE_X_DND_ACTION_MOVE, ECORE_X_DND_ACTION_PRIVATE,
|
||||
Ecore_X_Atom actions[] = {ECORE_X_DND_ACTION_MOVE, ECORE_X_DND_ACTION_PRIVATE,
|
||||
ECORE_X_DND_ACTION_COPY, ECORE_X_DND_ACTION_ASK,
|
||||
ECORE_X_DND_ACTION_LINK};
|
||||
if (_drag_win) return 0;
|
||||
_drag_win = ecore_x_window_input_new(drag->container->win,
|
||||
_drag_win = ecore_x_window_input_new(drag->container->win,
|
||||
drag->container->x, drag->container->y,
|
||||
drag->container->w, drag->container->h);
|
||||
|
||||
|
@ -337,7 +337,7 @@ e_drag_xdnd_start(E_Drag *drag, int x, int y)
|
|||
|
||||
drag->dx = x - drag->x;
|
||||
drag->dy = y - drag->y;
|
||||
|
||||
|
||||
ecore_x_dnd_aware_set(_drag_win, 1);
|
||||
ecore_x_dnd_types_set(_drag_win, drag->types, drag->num_types);
|
||||
ecore_x_dnd_actions_set(_drag_win, actions, 5);
|
||||
|
@ -377,7 +377,7 @@ e_drop_handler_add(E_Object *obj,
|
|||
|
||||
handler->obj = obj;
|
||||
handler->entered = 0;
|
||||
|
||||
|
||||
_drop_handlers = eina_list_append(_drop_handlers, handler);
|
||||
|
||||
return handler;
|
||||
|
@ -449,17 +449,17 @@ e_drag_idler_before(void)
|
|||
{
|
||||
Ecore_X_Rectangle *rects, *orects;
|
||||
int num;
|
||||
|
||||
|
||||
rects = ecore_x_window_shape_rectangles_get(drag->evas_win, &num);
|
||||
if (rects)
|
||||
{
|
||||
int changed;
|
||||
|
||||
|
||||
changed = 1;
|
||||
if ((num == drag->shape_rects_num) && (drag->shape_rects))
|
||||
{
|
||||
int i;
|
||||
|
||||
|
||||
orects = drag->shape_rects;
|
||||
for (i = 0; i < num; i++)
|
||||
{
|
||||
|
@ -573,12 +573,12 @@ static void
|
|||
_e_drag_move(E_Drag *drag, int x, int y)
|
||||
{
|
||||
E_Zone *zone;
|
||||
|
||||
|
||||
if (((drag->x + drag->dx) == x) && ((drag->y + drag->dy) == y)) return;
|
||||
|
||||
zone = e_container_zone_at_point_get(drag->container, x, y);
|
||||
if (zone) e_zone_flip_coords_handle(zone, x, y);
|
||||
|
||||
|
||||
drag->x = x - drag->dx;
|
||||
drag->y = y - drag->dy;
|
||||
drag->xy_update = 1;
|
||||
|
@ -588,7 +588,7 @@ static void
|
|||
_e_drag_coords_update(const E_Drop_Handler *h, int *dx, int *dy)
|
||||
{
|
||||
int px = 0, py = 0;
|
||||
|
||||
|
||||
*dx = 0;
|
||||
*dy = 0;
|
||||
if (h->obj)
|
||||
|
@ -632,7 +632,7 @@ static Ecore_X_Window
|
|||
_e_drag_win_get(const E_Drop_Handler *h, int xdnd)
|
||||
{
|
||||
Ecore_X_Window hwin = 0;
|
||||
|
||||
|
||||
if (h->obj)
|
||||
{
|
||||
switch (h->obj->type)
|
||||
|
@ -649,7 +649,7 @@ _e_drag_win_get(const E_Drop_Handler *h, int xdnd)
|
|||
hwin = ((E_Win *)(h->obj))->evas_win;
|
||||
break;
|
||||
case E_ZONE_TYPE:
|
||||
/* Not quite sure about this, probably need to set up
|
||||
/* Not quite sure about this, probably need to set up
|
||||
* E_Container to pass DND events from event_win to bg_win. */
|
||||
// hwin = ((E_Zone *)(h->obj))->container->event_win;
|
||||
hwin = ((E_Zone *)(h->obj))->container->event_win;
|
||||
|
@ -774,8 +774,8 @@ _e_drag_update(Ecore_X_Window root, int x, int y, Ecore_X_Atom action)
|
|||
move_ev.action = action;
|
||||
leave_ev.x = x - dx;
|
||||
leave_ev.y = y - dy;
|
||||
|
||||
if (E_INSIDE(enter_ev.x, enter_ev.y, h->x, h->y, h->w, h->h) &&
|
||||
|
||||
if (E_INSIDE(enter_ev.x, enter_ev.y, h->x, h->y, h->w, h->h) &&
|
||||
_e_drag_win_matches(h, win, 0))
|
||||
{
|
||||
if (e_drop_handler_responsive_get(h)) responsive = 1;
|
||||
|
@ -984,7 +984,7 @@ _e_drag_xdnd_end(Ecore_X_Window win, int x, int y)
|
|||
_e_drag_coords_update(h, &dx, &dy);
|
||||
ev.x = x - dx;
|
||||
ev.y = y - dy;
|
||||
if (_e_drag_win_matches(h, win, 1) && h->cb.drop
|
||||
if (_e_drag_win_matches(h, win, 1) && h->cb.drop
|
||||
&& E_INSIDE(ev.x, ev.y, h->x, h->y, h->w, h->h))
|
||||
{
|
||||
h->cb.drop(h->cb.data, h->active_type, &ev);
|
||||
|
@ -1133,8 +1133,8 @@ _e_dnd_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event)
|
|||
ev = event;
|
||||
if (ev->window != _drag_win) return ECORE_CALLBACK_PASS_ON;
|
||||
|
||||
if (!_xdnd)
|
||||
_e_drag_update(_drag_win_root, ev->x, ev->y,
|
||||
if (!_xdnd)
|
||||
_e_drag_update(_drag_win_root, ev->x, ev->y,
|
||||
ECORE_X_ATOM_XDND_ACTION_PRIVATE);
|
||||
|
||||
return ECORE_CALLBACK_PASS_ON;
|
||||
|
|
|
@ -29,7 +29,7 @@ struct _E_Drag
|
|||
|
||||
E_Drag_Type type;
|
||||
|
||||
struct
|
||||
struct
|
||||
{
|
||||
void *(*convert)(E_Drag *drag, const char *type);
|
||||
void (*finished)(E_Drag *drag, int dropped);
|
||||
|
@ -49,7 +49,7 @@ struct _E_Drag
|
|||
|
||||
int shape_rects_num;
|
||||
Ecore_X_Rectangle *shape_rects;
|
||||
|
||||
|
||||
unsigned int layer;
|
||||
unsigned char visible : 1;
|
||||
unsigned char need_shape_export : 1;
|
||||
|
@ -61,7 +61,7 @@ struct _E_Drag
|
|||
|
||||
struct _E_Drop_Handler
|
||||
{
|
||||
struct
|
||||
struct
|
||||
{
|
||||
void (*enter)(void *data, const char *type, void *event);
|
||||
void (*move)(void *data, const char *type, void *event);
|
||||
|
@ -133,7 +133,7 @@ EAPI E_Drop_Handler *e_drop_handler_add(E_Object *obj,
|
|||
void (*move_cb)(void *data, const char *type, void *event),
|
||||
void (*leave_cb)(void *data, const char *type, void *event),
|
||||
void (*drop_cb)(void *data, const char *type, void *event),
|
||||
const char **types, unsigned int num_types,
|
||||
const char **types, unsigned int num_types,
|
||||
int x, int y, int w, int h);
|
||||
EAPI void e_drop_handler_geometry_set(E_Drop_Handler *handler, int x, int y, int w, int h);
|
||||
EAPI int e_drop_inside(const E_Drop_Handler *handler, int x, int y);
|
||||
|
@ -150,4 +150,3 @@ EAPI Ecore_X_Atom e_drop_handler_action_get(void);
|
|||
#ifndef MIN
|
||||
# define MIN(x, y) (((x) > (y)) ? (y) : (x))
|
||||
#endif
|
||||
|
||||
|
|
|
@ -76,7 +76,7 @@ e_desktop_border_create(E_Border *bd)
|
|||
bclass = bd->client.icccm.class;
|
||||
if ((bclass) && (bclass[0] == 0)) bclass = NULL;
|
||||
btitle = e_border_name_get(bd);
|
||||
|
||||
|
||||
desktop_dir = e_user_desktop_dir_get();
|
||||
|
||||
if ((!desktop_dir) || (!e_util_dir_check(desktop_dir))) return NULL;
|
||||
|
@ -84,7 +84,7 @@ e_desktop_border_create(E_Border *bd)
|
|||
icon_dir = e_user_icon_dir_get();
|
||||
if ((!icon_dir) || (!e_util_dir_check(icon_dir))) return NULL;
|
||||
|
||||
if (bname)
|
||||
if (bname)
|
||||
{
|
||||
snprintf(path, sizeof(path), "%s/%s.desktop", desktop_dir, bname);
|
||||
desktop = efreet_desktop_empty_new(path);
|
||||
|
@ -92,7 +92,7 @@ e_desktop_border_create(E_Border *bd)
|
|||
else
|
||||
{
|
||||
int i;
|
||||
|
||||
|
||||
for (i = 1; i < 65536; i++)
|
||||
{
|
||||
snprintf(path, sizeof(path), "%s/_new_app-%i.desktop",
|
||||
|
@ -119,17 +119,17 @@ e_desktop_border_create(E_Border *bd)
|
|||
if (bclass) desktop->name = strdup(bclass);
|
||||
else if (bname) desktop->name = strdup(bname);
|
||||
else if (btitle) desktop->name = strdup(btitle);
|
||||
|
||||
|
||||
if (btitle) desktop->comment = strdup(btitle);
|
||||
|
||||
|
||||
if (bclass) desktop->startup_wm_class = strdup(bclass);
|
||||
if (bd->client.icccm.command.argc > 0)
|
||||
// FIXME this should concat the entire argv array together
|
||||
desktop->exec = strdup(bd->client.icccm.command.argv[0]);
|
||||
else if (bname)
|
||||
desktop->exec = strdup(bname);
|
||||
desktop->exec = strdup(bname);
|
||||
|
||||
// disable this
|
||||
// disable this
|
||||
// if (bd->client.netwm.startup_id > 0) desktop->startup_notify = 1;
|
||||
if (bd->client.netwm.icons)
|
||||
{
|
||||
|
@ -182,13 +182,13 @@ e_desktop_border_edit(E_Container *con, E_Border *bd)
|
|||
"the time the window starts up, and does not<br>"
|
||||
"change."));
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
if (!_e_desktop_edit_view_create(editor, con))
|
||||
{
|
||||
e_object_del(E_OBJECT(editor));
|
||||
editor = NULL;
|
||||
}
|
||||
else
|
||||
else
|
||||
e_config_dialog_changed_set(editor->cfd, new_desktop);
|
||||
|
||||
return editor;
|
||||
|
@ -226,17 +226,17 @@ _e_desktop_edit_view_create(E_Desktop_Edit *editor, E_Container *con)
|
|||
v->basic.create_widgets = _e_desktop_edit_basic_create_widgets;
|
||||
v->basic.check_changed = _e_desktop_edit_basic_check_changed;
|
||||
|
||||
editor->cfd =
|
||||
e_config_dialog_new(con, _("Desktop Entry Editor"), "E",
|
||||
editor->cfd =
|
||||
e_config_dialog_new(con, _("Desktop Entry Editor"), "E",
|
||||
"applications/new_application",
|
||||
"preferences-applications", 0, v, editor);
|
||||
|
||||
|
||||
if (!editor->cfd)
|
||||
{
|
||||
E_FREE(v);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
@ -253,31 +253,31 @@ _e_desktop_edit_free(E_Desktop_Edit *editor)
|
|||
}
|
||||
|
||||
/**
|
||||
* Populates the config dialog's data from the .desktop file passed in
|
||||
* Populates the config dialog's data from the .desktop file passed in
|
||||
*/
|
||||
static void *
|
||||
_e_desktop_edit_create_data(E_Config_Dialog *cfd)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
Efreet_Desktop *desktop = NULL;
|
||||
Efreet_Desktop *desktop = NULL;
|
||||
char path[PATH_MAX];
|
||||
|
||||
cfdata = E_NEW(E_Config_Dialog_Data, 1);
|
||||
if (!cfdata) return NULL;
|
||||
cfdata->editor = cfd->data;
|
||||
|
||||
/*
|
||||
/*
|
||||
* If we can't write to the file on it's current location,
|
||||
* we always save to the user's applications dir.
|
||||
* If the file is already there, then edit it directly. Otherwise, create
|
||||
* a new empty desktop entry there.
|
||||
* a new empty desktop entry there.
|
||||
*
|
||||
* cfdata->editor->desktop is the the desktop passed in
|
||||
* cfdata->desktop is the desktop to save
|
||||
* desktop is the desktop to load
|
||||
*/
|
||||
path[0] = '\0';
|
||||
if (cfdata->editor->desktop)
|
||||
if (cfdata->editor->desktop)
|
||||
{
|
||||
char dir[PATH_MAX];
|
||||
const char *file;
|
||||
|
@ -299,7 +299,7 @@ _e_desktop_edit_create_data(E_Config_Dialog *cfd)
|
|||
* if a file already exists in the user dir with this name, we
|
||||
* fetch the pointer to it, so the caches stay consistent (this
|
||||
* probably will never return non null, since the ui shouldn't
|
||||
* provide a means to edit a file in a system dir when one
|
||||
* provide a means to edit a file in a system dir when one
|
||||
* exists in the user's
|
||||
*/
|
||||
cfdata->desktop = efreet_desktop_uncached_new(path);
|
||||
|
@ -326,7 +326,7 @@ _e_desktop_edit_create_data(E_Config_Dialog *cfd)
|
|||
cfdata->categories = efreet_desktop_string_list_join(desktop->categories);
|
||||
if (desktop->mime_types)
|
||||
cfdata->mimes = efreet_desktop_string_list_join(desktop->mime_types);
|
||||
|
||||
|
||||
IFDUP(desktop->icon, cfdata->icon);
|
||||
|
||||
cfdata->startup_notify = desktop->startup_notify;
|
||||
|
@ -347,9 +347,9 @@ _e_desktop_edit_create_data(E_Config_Dialog *cfd)
|
|||
static void
|
||||
_e_desktop_edit_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
if (cfdata->editor->tmp_image_path)
|
||||
if (cfdata->editor->tmp_image_path)
|
||||
{
|
||||
if ((!cfdata->desktop) || (!cfdata->editor->saved) ||
|
||||
if ((!cfdata->desktop) || (!cfdata->editor->saved) ||
|
||||
(!cfdata->desktop->icon) ||
|
||||
(strcmp(cfdata->editor->tmp_image_path, cfdata->desktop->icon)))
|
||||
{
|
||||
|
@ -370,7 +370,7 @@ _e_desktop_edit_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data
|
|||
IFFREE(cfdata->mimes);
|
||||
IFFREE(cfdata->orig_path);
|
||||
|
||||
if (cfdata->editor->icon_fsel_dia)
|
||||
if (cfdata->editor->icon_fsel_dia)
|
||||
e_object_del(E_OBJECT(cfdata->editor->icon_fsel_dia));
|
||||
|
||||
e_object_del(E_OBJECT(cfdata->editor));
|
||||
|
@ -715,7 +715,7 @@ _e_desktop_edit_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas
|
|||
/* e_widget_size_min_get(ol, &mw, &mh); */
|
||||
|
||||
ot = e_widget_table_add(evas, 0);
|
||||
|
||||
|
||||
editor->img_widget = e_widget_button_add
|
||||
(evas, "", NULL, _e_desktop_editor_cb_icon_select, cfdata, editor);
|
||||
_e_desktop_editor_icon_update(cfdata);
|
||||
|
@ -733,7 +733,7 @@ _e_desktop_edit_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas
|
|||
|
||||
e_widget_toolbook_page_append
|
||||
(otb, NULL, _("Icon"), ot, 0, 0, 0, 0, 0.5, 0.5);
|
||||
|
||||
|
||||
ot = e_widget_table_add(evas, 0);
|
||||
|
||||
o = e_widget_label_add(evas, _("Generic Name"));
|
||||
|
@ -812,7 +812,7 @@ _e_desktop_editor_cb_icon_select(void *data1, void *data2)
|
|||
|
||||
dia = e_dialog_new(cfdata->editor->cfd->con, "E", "_eap_icon_select_dialog");
|
||||
if (!dia) return;
|
||||
e_object_del_attach_func_set(E_OBJECT(dia),
|
||||
e_object_del_attach_func_set(E_OBJECT(dia),
|
||||
_e_desktop_edit_cb_icon_select_destroy);
|
||||
e_dialog_title_set(dia, _("Select an Icon"));
|
||||
dia->data = cfdata;
|
||||
|
@ -820,7 +820,7 @@ _e_desktop_editor_cb_icon_select(void *data1, void *data2)
|
|||
/* absolute path to icon */
|
||||
/* XXX change this to a generic icon selector (that can do either
|
||||
* files from a dir, or icons in the current theme */
|
||||
if (cfdata->icon)
|
||||
if (cfdata->icon)
|
||||
{
|
||||
if (ecore_file_exists(cfdata->icon))
|
||||
icon_path = cfdata->icon;
|
||||
|
@ -834,7 +834,7 @@ _e_desktop_editor_cb_icon_select(void *data1, void *data2)
|
|||
if (path)
|
||||
{
|
||||
o = e_widget_fsel_add(dia->win->evas, "/", path, NULL, NULL,
|
||||
_e_desktop_edit_select_cb, cfdata,
|
||||
_e_desktop_edit_select_cb, cfdata,
|
||||
NULL, cfdata, 1);
|
||||
free(path);
|
||||
}
|
||||
|
@ -844,16 +844,16 @@ _e_desktop_editor_cb_icon_select(void *data1, void *data2)
|
|||
_e_desktop_edit_select_cb, cfdata,
|
||||
NULL, cfdata, 1);
|
||||
}
|
||||
|
||||
|
||||
evas_object_show(o);
|
||||
editor->icon_fsel = o;
|
||||
e_widget_size_min_get(o, &mw, &mh);
|
||||
e_dialog_content_set(dia, o, mw, mh);
|
||||
|
||||
/* buttons at the bottom */
|
||||
e_dialog_button_add(dia, _("OK"), NULL,
|
||||
e_dialog_button_add(dia, _("OK"), NULL,
|
||||
_e_desktop_edit_cb_icon_select_ok, cfdata);
|
||||
e_dialog_button_add(dia, _("Cancel"), NULL,
|
||||
e_dialog_button_add(dia, _("Cancel"), NULL,
|
||||
_e_desktop_edit_cb_icon_select_cancel, cfdata);
|
||||
e_dialog_resizable_set(dia, 1);
|
||||
e_win_centered_set(dia->win, 1);
|
||||
|
@ -878,13 +878,13 @@ _e_desktop_editor_cb_exec_select(void *data1, void *data2)
|
|||
|
||||
dia = e_dialog_new(cfdata->editor->cfd->con, "E", "_eap_exec_select_dialog");
|
||||
if (!dia) return;
|
||||
e_object_del_attach_func_set(E_OBJECT(dia),
|
||||
e_object_del_attach_func_set(E_OBJECT(dia),
|
||||
_e_desktop_edit_cb_exec_select_destroy);
|
||||
e_dialog_title_set(dia, _("Select an Executable"));
|
||||
dia->data = cfdata;
|
||||
|
||||
/* absolute path to exe */
|
||||
if (cfdata->exec)
|
||||
if (cfdata->exec)
|
||||
{
|
||||
path = ecore_file_dir_get(cfdata->exec);
|
||||
if (path && !ecore_file_exists(path))
|
||||
|
@ -908,16 +908,16 @@ _e_desktop_editor_cb_exec_select(void *data1, void *data2)
|
|||
_e_desktop_edit_select_cb, cfdata,
|
||||
NULL, cfdata, 1);
|
||||
}
|
||||
|
||||
|
||||
evas_object_show(o);
|
||||
editor->exec_fsel = o;
|
||||
e_widget_size_min_get(o, &mw, &mh);
|
||||
e_dialog_content_set(dia, o, mw, mh);
|
||||
|
||||
/* buttons at the bottom */
|
||||
e_dialog_button_add(dia, _("OK"), NULL,
|
||||
e_dialog_button_add(dia, _("OK"), NULL,
|
||||
_e_desktop_edit_cb_exec_select_ok, cfdata);
|
||||
e_dialog_button_add(dia, _("Cancel"), NULL,
|
||||
e_dialog_button_add(dia, _("Cancel"), NULL,
|
||||
_e_desktop_edit_cb_exec_select_cancel, cfdata);
|
||||
e_dialog_resizable_set(dia, 1);
|
||||
e_win_centered_set(dia->win, 1);
|
||||
|
@ -936,7 +936,7 @@ _e_desktop_edit_cb_icon_select_destroy(void *obj)
|
|||
E_Dialog *dia = obj;
|
||||
E_Config_Dialog_Data *cfdata = dia->data;
|
||||
|
||||
/* extra unref isn't needed - there is no extra ref() anywhere i saw */
|
||||
/* extra unref isn't needed - there is no extra ref() anywhere i saw */
|
||||
/* e_object_unref(E_OBJECT(dia));*/
|
||||
_e_desktop_edit_cb_icon_select_cancel(cfdata, NULL);
|
||||
}
|
||||
|
|
|
@ -12,10 +12,10 @@ typedef struct _E_Desktop_Edit E_Desktop_Edit;
|
|||
struct _E_Desktop_Edit
|
||||
{
|
||||
E_Object e_obj_inherit;
|
||||
|
||||
|
||||
Efreet_Desktop *desktop;
|
||||
Evas *evas;
|
||||
|
||||
|
||||
Evas_Object *img;
|
||||
Evas_Object *img_widget;
|
||||
Evas_Object *icon_fsel;
|
||||
|
@ -28,7 +28,7 @@ struct _E_Desktop_Edit
|
|||
|
||||
char *tmp_image_path;
|
||||
int saved; /* whether desktop has been saved or not */
|
||||
|
||||
|
||||
E_Config_Dialog *cfd;
|
||||
};
|
||||
|
||||
|
|
|
@ -1062,7 +1062,7 @@ _e_editable_selection_update(Evas_Object *editable)
|
|||
}
|
||||
}
|
||||
|
||||
/* Updates the text of the text object of the editable object
|
||||
/* Updates the text of the text object of the editable object
|
||||
* (it fills it with '*' if the editable is in password mode)
|
||||
* It does not update the position of the text */
|
||||
static void
|
||||
|
|
|
@ -734,7 +734,7 @@ _e_entry_key_down_windows(Evas_Object *entry, Evas_Event_Key_Down *event)
|
|||
if ((!strcmp(event->key, "Escape")) ||
|
||||
(!strcmp(event->key, "Return")) || (!strcmp(event->key, "KP_Enter")))
|
||||
_e_entry_imf_context_reset(entry);
|
||||
|
||||
|
||||
/* Move the cursor/selection to the left */
|
||||
if (strcmp(event->key, "Left") == 0 ||
|
||||
((strcmp(event->key, "KP_Left") == 0) && (!event->string)))
|
||||
|
@ -1107,7 +1107,7 @@ _e_entry_smart_add(Evas_Object *object)
|
|||
_e_entry_mouse_up_cb, NULL);
|
||||
evas_object_event_callback_add(object, EVAS_CALLBACK_MOUSE_MOVE,
|
||||
_e_entry_mouse_move_cb, NULL);
|
||||
sd->selection_handler =
|
||||
sd->selection_handler =
|
||||
ecore_event_handler_add(ECORE_X_EVENT_SELECTION_NOTIFY,
|
||||
_e_entry_x_selection_notify_handler, object);
|
||||
}
|
||||
|
|
|
@ -12,8 +12,8 @@ EAPI E_Entry_Dialog *
|
|||
e_entry_dialog_show(const char *title, const char *icon, const char *text,
|
||||
const char *initial_text,
|
||||
const char *button_text, const char *button2_text,
|
||||
void (*ok_func)(char *text, void *data),
|
||||
void (*cancel_func)(void *data), void *data)
|
||||
void (*ok_func)(char *text, void *data),
|
||||
void (*cancel_func)(void *data), void *data)
|
||||
{
|
||||
E_Entry_Dialog *ed;
|
||||
E_Dialog *dia;
|
||||
|
@ -28,40 +28,40 @@ e_entry_dialog_show(const char *title, const char *icon, const char *text,
|
|||
ed->cancel.data = data;
|
||||
if (initial_text)
|
||||
ed->text = strdup(initial_text);
|
||||
|
||||
|
||||
dia = e_dialog_new(e_container_current_get(e_manager_current_get()), "E", "_entry_dialog");
|
||||
if (!dia)
|
||||
if (!dia)
|
||||
{
|
||||
e_object_del(E_OBJECT(ed));
|
||||
return NULL;
|
||||
}
|
||||
dia->data = ed;
|
||||
ed->dia = dia;
|
||||
|
||||
|
||||
mask = 0;
|
||||
evas_object_key_ungrab(dia->event_object, "space", mask, ~mask);
|
||||
|
||||
|
||||
e_win_delete_callback_set(dia->win, _e_entry_dialog_delete);
|
||||
|
||||
|
||||
if (title) e_dialog_title_set(dia, title);
|
||||
if (icon) e_dialog_icon_set(dia, icon, 64);
|
||||
|
||||
|
||||
o = e_widget_list_add(dia->win->evas, 0, 0);
|
||||
if (text)
|
||||
if (text)
|
||||
{
|
||||
ob = e_widget_label_add(dia->win->evas, text);
|
||||
e_widget_list_object_append(o, ob, 1, 0, 0.5);
|
||||
}
|
||||
|
||||
|
||||
ed->entry = e_widget_entry_add(dia->win->evas, &(ed->text), NULL, NULL, NULL);
|
||||
evas_object_smart_callback_add(ed->entry, "key_down", _e_entry_cb_key_down, ed);
|
||||
e_widget_list_object_append(o, ed->entry, 1, 1, 0.5);
|
||||
e_widget_size_min_get(o, &w, &h);
|
||||
e_dialog_content_set(dia, o, w, h);
|
||||
|
||||
|
||||
e_dialog_button_add(dia, !button_text ? _("OK") : button_text, NULL, _e_entry_dialog_ok, ed);
|
||||
e_dialog_button_add(dia, !button2_text ? _("Cancel") : button2_text, NULL, _e_entry_dialog_cancel, ed);
|
||||
|
||||
|
||||
e_win_centered_set(dia->win, 1);
|
||||
e_dialog_show(dia);
|
||||
e_widget_focus_set(ed->entry, 1);
|
||||
|
@ -77,12 +77,12 @@ _e_entry_dialog_free(E_Entry_Dialog *ed)
|
|||
E_FREE(ed->text);
|
||||
free(ed);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
_e_entry_dialog_ok(void *data, E_Dialog *dia __UNUSED__)
|
||||
_e_entry_dialog_ok(void *data, E_Dialog *dia __UNUSED__)
|
||||
{
|
||||
E_Entry_Dialog *ed;
|
||||
|
||||
|
||||
ed = data;
|
||||
e_object_ref(E_OBJECT(ed));
|
||||
if (ed->ok.func) ed->ok.func(ed->text, ed->ok.data);
|
||||
|
@ -91,10 +91,10 @@ _e_entry_dialog_ok(void *data, E_Dialog *dia __UNUSED__)
|
|||
}
|
||||
|
||||
static void
|
||||
_e_entry_dialog_cancel(void *data, E_Dialog *dia __UNUSED__)
|
||||
_e_entry_dialog_cancel(void *data, E_Dialog *dia __UNUSED__)
|
||||
{
|
||||
E_Entry_Dialog *ed;
|
||||
|
||||
|
||||
ed = data;
|
||||
e_object_ref(E_OBJECT(ed));
|
||||
if (ed->cancel.func) ed->cancel.func(ed->cancel.data);
|
||||
|
@ -103,25 +103,25 @@ _e_entry_dialog_cancel(void *data, E_Dialog *dia __UNUSED__)
|
|||
}
|
||||
|
||||
static void
|
||||
_e_entry_dialog_delete(E_Win *win)
|
||||
_e_entry_dialog_delete(E_Win *win)
|
||||
{
|
||||
E_Dialog *dia;
|
||||
E_Entry_Dialog *ed;
|
||||
|
||||
|
||||
dia = win->data;
|
||||
ed = dia->data;
|
||||
e_object_del(E_OBJECT(ed));
|
||||
}
|
||||
|
||||
static void
|
||||
_e_entry_cb_key_down(void *data, Evas_Object *obj __UNUSED__, void *event_info)
|
||||
static void
|
||||
_e_entry_cb_key_down(void *data, Evas_Object *obj __UNUSED__, void *event_info)
|
||||
{
|
||||
Evas_Event_Key_Down *ev;
|
||||
E_Entry_Dialog *ed;
|
||||
|
||||
|
||||
ev = event_info;
|
||||
if (!(ed = data)) return;
|
||||
if (!strcmp(ev->keyname, "Return"))
|
||||
if (!strcmp(ev->keyname, "Return"))
|
||||
_e_entry_dialog_ok(data, ed->dia);
|
||||
else
|
||||
if (!strcmp(ev->keyname, "Escape"))
|
||||
|
|
|
@ -11,7 +11,7 @@ typedef struct _E_Entry_Dialog E_Entry_Dialog;
|
|||
struct _E_Entry_Dialog
|
||||
{
|
||||
E_Object e_obj_inherit;
|
||||
|
||||
|
||||
E_Dialog *dia;
|
||||
Evas_Object *entry;
|
||||
char *text;
|
||||
|
@ -30,8 +30,8 @@ EAPI E_Entry_Dialog *e_entry_dialog_show(const char *title,
|
|||
const char *text,
|
||||
const char *initial_text,
|
||||
const char *button_text,
|
||||
const char *button2_text,
|
||||
void (*ok_func) (char *text, void *data),
|
||||
const char *button2_text,
|
||||
void (*ok_func) (char *text, void *data),
|
||||
void (*cancel_func) (void *data),
|
||||
void *data);
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ e_env_init(void)
|
|||
{
|
||||
Eina_List *l;
|
||||
E_Config_Env_Var *evr;
|
||||
|
||||
|
||||
EINA_LIST_FOREACH(e_config->env_vars, l, evr)
|
||||
{
|
||||
if (evr->unset)
|
||||
|
@ -24,7 +24,7 @@ e_env_shutdown(void)
|
|||
{
|
||||
Eina_List *l;
|
||||
E_Config_Env_Var *evr;
|
||||
|
||||
|
||||
EINA_LIST_FOREACH(e_config->env_vars, l, evr)
|
||||
{
|
||||
e_env_unset(evr->var);
|
||||
|
|
|
@ -13,6 +13,6 @@
|
|||
#define E_ERROR_H
|
||||
|
||||
EAPI void e_error_message_show_internal(char *txt);
|
||||
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -867,4 +867,3 @@ _dialog_save_cb(void *data __UNUSED__, void *data2)
|
|||
|
||||
fclose(f);
|
||||
}
|
||||
|
||||
|
|
|
@ -52,7 +52,7 @@ e_exehist_init(void)
|
|||
E_CONFIG_VAL(D, T, normalized_exe, STR);
|
||||
E_CONFIG_VAL(D, T, launch_method, STR);
|
||||
E_CONFIG_VAL(D, T, exetime, DOUBLE);
|
||||
|
||||
|
||||
_e_exehist_config_edd = E_CONFIG_DD_NEW("E_Exehist", E_Exehist);
|
||||
#undef T
|
||||
#undef D
|
||||
|
@ -150,7 +150,7 @@ e_exehist_popularity_get(const char *exe)
|
|||
E_Exehist_Item *ei;
|
||||
const char *normal;
|
||||
int count = 0;
|
||||
|
||||
|
||||
_e_exehist_load();
|
||||
if (!_e_exehist) return 0;
|
||||
normal = _e_exehist_normalize_exe(exe);
|
||||
|
@ -171,7 +171,7 @@ e_exehist_newest_run_get(const char *exe)
|
|||
Eina_List *l;
|
||||
E_Exehist_Item *ei;
|
||||
const char *normal;
|
||||
|
||||
|
||||
_e_exehist_load();
|
||||
if (!_e_exehist) return 0.0;
|
||||
normal = _e_exehist_normalize_exe(exe);
|
||||
|
@ -222,7 +222,7 @@ e_exehist_sorted_list_get(E_Exehist_Sort sort_type, int max)
|
|||
EINA_ITERATOR_FOREACH(iter, ei)
|
||||
{
|
||||
int bad = 0;
|
||||
|
||||
|
||||
if (!(ei->normalized_exe)) continue;
|
||||
if (sort_type == E_EXEHIST_SORT_BY_POPULARITY)
|
||||
{
|
||||
|
@ -278,12 +278,12 @@ e_exehist_mime_desktop_add(const char *mime, Efreet_Desktop *desktop)
|
|||
const char *f;
|
||||
E_Exehist_Item *ei;
|
||||
Eina_List *l;
|
||||
|
||||
|
||||
if ((!mime) || (!desktop)) return;
|
||||
if (!desktop->orig_path) return;
|
||||
_e_exehist_load();
|
||||
if (!_e_exehist) return;
|
||||
|
||||
|
||||
f = efreet_util_path_to_file_id(desktop->orig_path);
|
||||
if (!f) return;
|
||||
EINA_LIST_FOREACH(_e_exehist->mimes, l, ei)
|
||||
|
@ -324,7 +324,7 @@ e_exehist_mime_desktop_get(const char *mime)
|
|||
Efreet_Desktop *desktop;
|
||||
E_Exehist_Item *ei;
|
||||
Eina_List *l;
|
||||
|
||||
|
||||
if (!mime) return NULL;
|
||||
_e_exehist_load();
|
||||
if (!_e_exehist) return NULL;
|
||||
|
@ -351,7 +351,7 @@ _e_exehist_unload_queue(void)
|
|||
{
|
||||
if (_e_exehist_unload_defer)
|
||||
e_powersave_deferred_action_del(_e_exehist_unload_defer);
|
||||
_e_exehist_unload_defer =
|
||||
_e_exehist_unload_defer =
|
||||
e_powersave_deferred_action_add(_e_exehist_cb_unload, NULL);
|
||||
}
|
||||
|
||||
|
@ -398,7 +398,7 @@ _e_exehist_limit(void)
|
|||
{
|
||||
/* go from first item in hist on and either delete all items before a
|
||||
* specific timestamp, or if the list count > limit then delete items
|
||||
*
|
||||
*
|
||||
* for now - limit to 500
|
||||
*/
|
||||
if (_e_exehist)
|
||||
|
@ -406,7 +406,7 @@ _e_exehist_limit(void)
|
|||
while (eina_list_count(_e_exehist->history) > 500)
|
||||
{
|
||||
E_Exehist_Item *ei;
|
||||
|
||||
|
||||
ei = eina_list_data_get(_e_exehist->history);
|
||||
eina_stringshare_del(ei->exe);
|
||||
eina_stringshare_del(ei->normalized_exe);
|
||||
|
@ -417,7 +417,7 @@ _e_exehist_limit(void)
|
|||
while (eina_list_count(_e_exehist->mimes) > 500)
|
||||
{
|
||||
E_Exehist_Item *ei;
|
||||
|
||||
|
||||
ei = eina_list_data_get(_e_exehist->mimes);
|
||||
eina_stringshare_del(ei->exe);
|
||||
eina_stringshare_del(ei->launch_method);
|
||||
|
|
|
@ -13,5 +13,3 @@ EAPI Eina_Bool e_filereg_file_protected(const char * path);
|
|||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ typedef struct _E_Smart_Data E_Smart_Data;
|
|||
typedef struct _E_Flowlayout_Item E_Flowlayout_Item;
|
||||
|
||||
struct _E_Smart_Data
|
||||
{
|
||||
{
|
||||
Evas_Coord x, y, w, h;
|
||||
Evas_Object *obj;
|
||||
Evas_Object *clip;
|
||||
|
@ -24,7 +24,7 @@ struct _E_Smart_Data
|
|||
} align;
|
||||
int rows;
|
||||
int cols;
|
||||
};
|
||||
};
|
||||
|
||||
struct _E_Flowlayout_Item
|
||||
{
|
||||
|
@ -75,7 +75,7 @@ EAPI int
|
|||
e_flowlayout_freeze(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(0);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return 0;
|
||||
|
@ -87,7 +87,7 @@ EAPI int
|
|||
e_flowlayout_thaw(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(0);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return 0;
|
||||
|
@ -100,7 +100,7 @@ EAPI void
|
|||
e_flowlayout_orientation_set(Evas_Object *obj, int horizontal)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERRNR();
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
|
@ -115,7 +115,7 @@ EAPI int
|
|||
e_flowlayout_orientation_get(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(0);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return 0;
|
||||
|
@ -126,7 +126,7 @@ EAPI void
|
|||
e_flowlayout_flowdirection_set(Evas_Object *obj, int right, int bottom)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERRNR();
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
|
@ -144,19 +144,19 @@ EAPI void
|
|||
e_flowlayout_flowdirection_get(Evas_Object *obj, int *right, int *bottom)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERRNR();
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
if (right) *right = sd->flowright;
|
||||
if (bottom) *bottom = sd->flowright;
|
||||
if (bottom) *bottom = sd->flowright;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_flowlayout_homogenous_set(Evas_Object *obj, int homogenous)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERRNR();
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
|
@ -170,7 +170,7 @@ EAPI int
|
|||
e_flowlayout_homogenous_get(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(0);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return 0;
|
||||
|
@ -181,7 +181,7 @@ EAPI void
|
|||
e_flowlayout_fill_set(Evas_Object *obj, int fill)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERRNR();
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
|
@ -195,7 +195,7 @@ EAPI int
|
|||
e_flowlayout_fill_get(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(0);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return 0;
|
||||
|
@ -207,7 +207,7 @@ EAPI int
|
|||
e_flowlayout_pack_start(Evas_Object *obj, Evas_Object *child)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(0);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return 0;
|
||||
|
@ -222,12 +222,12 @@ EAPI int
|
|||
e_flowlayout_pack_end(Evas_Object *obj, Evas_Object *child)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(0);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return 0;
|
||||
_e_flowlayout_smart_adopt(sd, child);
|
||||
sd->items = eina_list_append(sd->items, child);
|
||||
sd->items = eina_list_append(sd->items, child);
|
||||
sd->changed = 1;
|
||||
if (sd->frozen <= 0) _e_flowlayout_smart_reconfigure(sd);
|
||||
return eina_list_count(sd->items) - 1;
|
||||
|
@ -240,7 +240,7 @@ e_flowlayout_pack_before(Evas_Object *obj, Evas_Object *child, Evas_Object *befo
|
|||
int i = 0;
|
||||
Eina_List *l;
|
||||
Evas_Object *item;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(0);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return 0;
|
||||
|
@ -263,7 +263,7 @@ e_flowlayout_pack_after(Evas_Object *obj, Evas_Object *child, Evas_Object *after
|
|||
int i = 0;
|
||||
Eina_List *l;
|
||||
Evas_Object *item;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(0);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return 0;
|
||||
|
@ -283,7 +283,7 @@ EAPI int
|
|||
e_flowlayout_pack_count_get(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(0);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return 0;
|
||||
|
@ -294,7 +294,7 @@ EAPI Evas_Object *
|
|||
e_flowlayout_pack_object_nth(Evas_Object *obj, int n)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(NULL);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return NULL;
|
||||
|
@ -305,7 +305,7 @@ EAPI Evas_Object *
|
|||
e_flowlayout_pack_object_first(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(NULL);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return NULL;
|
||||
|
@ -316,7 +316,7 @@ EAPI Evas_Object *
|
|||
e_flowlayout_pack_object_last(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(NULL);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return NULL;
|
||||
|
@ -327,7 +327,7 @@ EAPI void
|
|||
e_flowlayout_pack_options_set(Evas_Object *obj, int fill_w, int fill_h, int expand_w, int expand_h, double align_x, double align_y, Evas_Coord min_w, Evas_Coord min_h, Evas_Coord max_w, Evas_Coord max_h)
|
||||
{
|
||||
E_Flowlayout_Item *bi;
|
||||
|
||||
|
||||
bi = evas_object_data_get(obj, "e_flowlayout_data");
|
||||
if (!bi) return;
|
||||
bi->fill_w = fill_w;
|
||||
|
@ -349,7 +349,7 @@ e_flowlayout_unpack(Evas_Object *obj)
|
|||
{
|
||||
E_Flowlayout_Item *bi;
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
bi = evas_object_data_get(obj, "e_flowlayout_data");
|
||||
if (!bi) return;
|
||||
sd = bi->sd;
|
||||
|
@ -364,7 +364,7 @@ EAPI void
|
|||
e_flowlayout_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERRNR();
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
|
@ -377,7 +377,7 @@ EAPI void
|
|||
e_flowlayout_size_max_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERRNR();
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
|
@ -390,7 +390,7 @@ EAPI int
|
|||
e_flowlayout_max_children(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(0);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return -1;
|
||||
|
@ -401,7 +401,7 @@ EAPI void
|
|||
e_flowlayout_align_get(Evas_Object *obj, double *ax, double *ay)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERRNR();
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
|
@ -413,7 +413,7 @@ EAPI void
|
|||
e_flowlayout_align_set(Evas_Object *obj, double ax, double ay)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERRNR();
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
|
@ -429,7 +429,7 @@ static E_Flowlayout_Item *
|
|||
_e_flowlayout_smart_adopt(E_Smart_Data *sd, Evas_Object *obj)
|
||||
{
|
||||
E_Flowlayout_Item *bi;
|
||||
|
||||
|
||||
bi = calloc(1, sizeof(E_Flowlayout_Item));
|
||||
if (!bi) return NULL;
|
||||
bi->sd = sd;
|
||||
|
@ -460,7 +460,7 @@ static void
|
|||
_e_flowlayout_smart_disown(Evas_Object *obj)
|
||||
{
|
||||
E_Flowlayout_Item *bi;
|
||||
|
||||
|
||||
bi = evas_object_data_get(obj, "e_flowlayout_data");
|
||||
if (!bi) return;
|
||||
if (!bi->sd->items)
|
||||
|
@ -494,7 +494,7 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
|
|||
|
||||
|
||||
if (!sd->changed) return;
|
||||
|
||||
|
||||
/* local variables */
|
||||
x = sd->x;
|
||||
y = sd->y;
|
||||
|
@ -524,7 +524,7 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
|
|||
EINA_LIST_FOREACH(sd->items, l, obj)
|
||||
{
|
||||
E_Flowlayout_Item *bi;
|
||||
|
||||
|
||||
bi = evas_object_data_get(obj, "e_flowlayout_data");
|
||||
if (bi)
|
||||
{
|
||||
|
@ -553,7 +553,7 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
|
|||
h = minh;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Some calculations */
|
||||
if (sd->flowright)
|
||||
xx = x;
|
||||
|
@ -570,7 +570,7 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
|
|||
EINA_LIST_FOREACH(sd->items, l, obj)
|
||||
{
|
||||
E_Flowlayout_Item *bi;
|
||||
|
||||
|
||||
bi = evas_object_data_get(obj, "e_flowlayout_data");
|
||||
if (bi)
|
||||
{
|
||||
|
@ -588,7 +588,7 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
|
|||
int num = count - (cr)*(sd->cols);
|
||||
if (num < sd->cols)
|
||||
{
|
||||
ww = w / num;
|
||||
ww = w / num;
|
||||
}
|
||||
}
|
||||
ow = bi->min.w;
|
||||
|
@ -601,13 +601,13 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
|
|||
{
|
||||
if (sd->flowbottom)
|
||||
{
|
||||
evas_object_move(obj,
|
||||
evas_object_move(obj,
|
||||
xx + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),
|
||||
yy + (Evas_Coord)(((double)(hh - oh)) * bi->align.y));
|
||||
}
|
||||
else
|
||||
{
|
||||
evas_object_move(obj,
|
||||
evas_object_move(obj,
|
||||
xx + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),
|
||||
yy - hh + (Evas_Coord)(((double)(hh - oh)) * bi->align.y));
|
||||
}
|
||||
|
@ -618,19 +618,19 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
|
|||
{
|
||||
if (sd->flowbottom)
|
||||
{
|
||||
evas_object_move(obj,
|
||||
evas_object_move(obj,
|
||||
xx - ww + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),
|
||||
yy + (Evas_Coord)(((double)(hh - oh)) * bi->align.y));
|
||||
}
|
||||
else
|
||||
{
|
||||
evas_object_move(obj,
|
||||
evas_object_move(obj,
|
||||
xx - ww + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),
|
||||
yy - hh + (Evas_Coord)(((double)(hh - oh)) * bi->align.y));
|
||||
|
||||
}
|
||||
evas_object_resize(obj, ow, oh);
|
||||
xx -= ww;
|
||||
evas_object_resize(obj, ow, oh);
|
||||
xx -= ww;
|
||||
}
|
||||
cc++;
|
||||
if (cc >= sd->cols)
|
||||
|
@ -642,7 +642,7 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
|
|||
else
|
||||
xx = x + w;
|
||||
if (sd->flowbottom)
|
||||
yy += hh;
|
||||
yy += hh;
|
||||
else
|
||||
yy -= hh;
|
||||
}
|
||||
|
@ -665,7 +665,7 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
|
|||
int num = count - (cc)*(sd->rows);
|
||||
if (num < sd->rows)
|
||||
{
|
||||
hh = h / num;
|
||||
hh = h / num;
|
||||
}
|
||||
}
|
||||
oh = bi->min.h;
|
||||
|
@ -678,13 +678,13 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
|
|||
{
|
||||
if (sd->flowright)
|
||||
{
|
||||
evas_object_move(obj,
|
||||
evas_object_move(obj,
|
||||
xx + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),
|
||||
yy + (Evas_Coord)(((double)(hh - oh)) * bi->align.y));
|
||||
}
|
||||
else
|
||||
{
|
||||
evas_object_move(obj,
|
||||
evas_object_move(obj,
|
||||
xx - ww + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),
|
||||
yy + (Evas_Coord)(((double)(hh - oh)) * bi->align.y));
|
||||
}
|
||||
|
@ -695,19 +695,19 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
|
|||
{
|
||||
if (sd->flowright)
|
||||
{
|
||||
evas_object_move(obj,
|
||||
evas_object_move(obj,
|
||||
xx + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),
|
||||
yy - hh + (Evas_Coord)(((double)(hh - oh)) * bi->align.y));
|
||||
}
|
||||
else
|
||||
{
|
||||
evas_object_move(obj,
|
||||
evas_object_move(obj,
|
||||
xx - ww + (Evas_Coord)(((double)(ww - ow)) * bi->align.x),
|
||||
yy - hh + (Evas_Coord)(((double)(hh - oh)) * bi->align.y));
|
||||
|
||||
}
|
||||
evas_object_resize(obj, ow, oh);
|
||||
yy -= hh;
|
||||
evas_object_resize(obj, ow, oh);
|
||||
yy -= hh;
|
||||
}
|
||||
cr++;
|
||||
if (cr >= sd->rows)
|
||||
|
@ -719,7 +719,7 @@ _e_flowlayout_smart_reconfigure(E_Smart_Data *sd)
|
|||
else
|
||||
yy = y + h;
|
||||
if (sd->flowright)
|
||||
xx += ww;
|
||||
xx += ww;
|
||||
else
|
||||
xx -= ww;
|
||||
}
|
||||
|
@ -745,7 +745,7 @@ _e_flowlayout_smart_extents_calcuate(E_Smart_Data *sd)
|
|||
/* FIXME: need to calc max */
|
||||
sd->max.w = -1; /* max < 0 == unlimited */
|
||||
sd->max.h = -1;
|
||||
|
||||
|
||||
minw = 1;
|
||||
minh = 1;
|
||||
if (sd->homogenous)
|
||||
|
@ -753,8 +753,8 @@ _e_flowlayout_smart_extents_calcuate(E_Smart_Data *sd)
|
|||
EINA_LIST_FOREACH(sd->items, l, obj)
|
||||
{
|
||||
E_Flowlayout_Item *bi;
|
||||
|
||||
bi = evas_object_data_get(obj, "e_flowlayout_data");
|
||||
|
||||
bi = evas_object_data_get(obj, "e_flowlayout_data");
|
||||
if (bi)
|
||||
{
|
||||
if (sd->horizontal)
|
||||
|
@ -815,7 +815,7 @@ _e_flowlayout_smart_extents_calcuate(E_Smart_Data *sd)
|
|||
EINA_LIST_FOREACH(sd->items, l, obj)
|
||||
{
|
||||
E_Flowlayout_Item *bi;
|
||||
|
||||
|
||||
bi = evas_object_data_get(obj, "e_flowlayout_data");
|
||||
if (bi)
|
||||
{
|
||||
|
@ -875,10 +875,10 @@ _e_flowlayout_smart_init(void)
|
|||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL
|
||||
};
|
||||
_e_smart = evas_smart_class_new(&sc);
|
||||
}
|
||||
|
@ -888,7 +888,7 @@ static void
|
|||
_e_flowlayout_smart_add(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = calloc(1, sizeof(E_Smart_Data));
|
||||
if (!sd) return;
|
||||
sd->obj = obj;
|
||||
|
@ -905,12 +905,12 @@ _e_flowlayout_smart_add(Evas_Object *obj)
|
|||
evas_object_color_set(sd->clip, 255, 255, 255, 255);
|
||||
evas_object_smart_data_set(obj, sd);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
_e_flowlayout_smart_del(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
/* FIXME: this gets into an infinite loop when changin basic->advanced on
|
||||
|
@ -919,7 +919,7 @@ _e_flowlayout_smart_del(Evas_Object *obj)
|
|||
while (sd->items)
|
||||
{
|
||||
Evas_Object *child;
|
||||
|
||||
|
||||
child = eina_list_data_get(sd->items);
|
||||
e_flowlayout_unpack(child);
|
||||
}
|
||||
|
@ -931,7 +931,7 @@ static void
|
|||
_e_flowlayout_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
if ((x == sd->x) && (y == sd->y)) return;
|
||||
|
@ -939,13 +939,13 @@ _e_flowlayout_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
|
|||
Eina_List *l;
|
||||
Evas_Object *item;
|
||||
Evas_Coord dx, dy;
|
||||
|
||||
|
||||
dx = x - sd->x;
|
||||
dy = y - sd->y;
|
||||
EINA_LIST_FOREACH(sd->items, l, item)
|
||||
{
|
||||
Evas_Coord ox, oy;
|
||||
|
||||
|
||||
evas_object_geometry_get(item, &ox, &oy, NULL, NULL);
|
||||
evas_object_move(item, ox + dx, oy + dy);
|
||||
}
|
||||
|
@ -958,7 +958,7 @@ static void
|
|||
_e_flowlayout_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
if ((w == sd->w) && (h == sd->h)) return;
|
||||
|
@ -972,7 +972,7 @@ static void
|
|||
_e_flowlayout_smart_show(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
if (sd->items) evas_object_show(sd->clip);
|
||||
|
@ -982,7 +982,7 @@ static void
|
|||
_e_flowlayout_smart_hide(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
evas_object_hide(sd->clip);
|
||||
|
@ -992,9 +992,9 @@ static void
|
|||
_e_flowlayout_smart_color_set(Evas_Object *obj, int r, int g, int b, int a)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
if (!sd) return;
|
||||
evas_object_color_set(sd->clip, r, g, b, a);
|
||||
}
|
||||
|
||||
|
@ -1002,7 +1002,7 @@ static void
|
|||
_e_flowlayout_smart_clip_set(Evas_Object *obj, Evas_Object *clip)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
evas_object_clip_set(sd->clip, clip);
|
||||
|
@ -1012,8 +1012,8 @@ static void
|
|||
_e_flowlayout_smart_clip_unset(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
evas_object_clip_unset(sd->clip);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -9878,4 +9878,3 @@ e_fm2_operation_abort(int id)
|
|||
e_fm2_op_registry_entry_abort(ere);
|
||||
e_fm2_op_registry_entry_unref(ere);
|
||||
}
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ typedef enum _E_Fm2_View_Mode
|
|||
E_FM2_VIEW_MODE_ICONS, /* regular layout row by row like text */
|
||||
E_FM2_VIEW_MODE_GRID_ICONS, /* regular grid layout */
|
||||
E_FM2_VIEW_MODE_CUSTOM_ICONS, /* icons go anywhere u drop them (desktop) */
|
||||
|
||||
|
||||
/* FIXME: not going to implement this at this stage */
|
||||
E_FM2_VIEW_MODE_CUSTOM_GRID_ICONS, /* icons go anywhere u drop them but align to a grid */
|
||||
/* FIXME: not going to implement this at this stage */
|
||||
|
@ -180,6 +180,6 @@ EAPI void e_fm2_client_del(Ecore_Ipc_Event_Client_Del *e);
|
|||
EAPI int _e_fm2_client_mount(const char *udi, const char *mountpoint);
|
||||
EAPI int _e_fm2_client_unmount(const char *udi);
|
||||
EAPI void _e_fm2_file_force_update(const char *path);
|
||||
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -1439,4 +1439,3 @@ _e_fm_ipc_prepare_command(E_Fm_Op_Type type, const char *args)
|
|||
|
||||
return buffer;
|
||||
}
|
||||
|
||||
|
|
|
@ -208,7 +208,7 @@ _e_fm_main_udisks_cb_dev_verify(const char *udi,
|
|||
_e_fm_main_udisks_storage_add(udi);
|
||||
else if (!strcmp(ret->val.s, "filesystem"))
|
||||
{
|
||||
INF("DB VOL+: %s", udi);
|
||||
INF("DB VOL+: %s", udi);
|
||||
_e_fm_main_udisks_volume_add(udi, EINA_TRUE);
|
||||
}
|
||||
else
|
||||
|
|
|
@ -66,11 +66,11 @@ e_fm2_custom_file_init(void)
|
|||
DAT("g.rh", geom.res_h, EET_T_INT);
|
||||
DAT("g.s", geom.scale, EET_T_DOUBLE);
|
||||
DAT("g.v", geom.valid, EET_T_UCHAR);
|
||||
|
||||
|
||||
DAT("i.t", icon.type, EET_T_INT);
|
||||
DAT("i.i", icon.icon, EET_T_STRING);
|
||||
DAT("i.v", icon.valid, EET_T_UCHAR);
|
||||
|
||||
|
||||
DAT("l", label, EET_T_STRING);
|
||||
|
||||
#undef DAT
|
||||
|
@ -258,10 +258,10 @@ EAPI void
|
|||
e_fm2_custom_file_flush(void)
|
||||
{
|
||||
if (!_e_fm2_custom_file) return;
|
||||
|
||||
|
||||
if (_e_fm2_flush_defer)
|
||||
e_powersave_deferred_action_del(_e_fm2_flush_defer);
|
||||
_e_fm2_flush_defer =
|
||||
_e_fm2_flush_defer =
|
||||
e_powersave_deferred_action_add(_e_fm2_custom_file_cb_defer_save, NULL);
|
||||
}
|
||||
|
||||
|
@ -347,7 +347,7 @@ static void
|
|||
_e_fm2_custom_file_info_load(void)
|
||||
{
|
||||
char buf[PATH_MAX];
|
||||
|
||||
|
||||
if (_e_fm2_custom_file) return;
|
||||
_e_fm2_custom_writes = 0;
|
||||
e_user_dir_concat_static(buf, "fileman/custom.cfg");
|
||||
|
@ -359,7 +359,7 @@ _e_fm2_custom_file_info_load(void)
|
|||
E_Fm2_Custom_File *cf;
|
||||
char **list;
|
||||
int i, num;
|
||||
|
||||
|
||||
list = eet_list(_e_fm2_custom_file, "*", &num);
|
||||
if (list)
|
||||
{
|
||||
|
|
|
@ -109,13 +109,13 @@ _e_fm2_device_volume_setup(E_Volume *v)
|
|||
strcmp(v->mount_point, "/tmp")))
|
||||
_e_fm2_volume_write(v);
|
||||
}
|
||||
|
||||
|
||||
EAPI void
|
||||
e_fm2_device_storage_add(E_Storage *s)
|
||||
{
|
||||
Eina_List *l;
|
||||
E_Volume *v;
|
||||
|
||||
|
||||
if (e_fm2_device_storage_find(s->udi)) return;
|
||||
|
||||
s->validated = EINA_TRUE;
|
||||
|
@ -165,7 +165,7 @@ e_fm2_device_storage_add(E_Storage *s)
|
|||
{
|
||||
s->trackable = EINA_TRUE;
|
||||
}
|
||||
|
||||
|
||||
EINA_LIST_FOREACH(_e_vols, l, v) /* catch volumes which were added before their storage */
|
||||
{
|
||||
if ((!v->storage) && (s->udi == v->parent))
|
||||
|
@ -270,7 +270,7 @@ e_fm2_device_volume_add(E_Volume *v)
|
|||
}
|
||||
|
||||
if (v->storage) _e_fm2_device_volume_setup(v);
|
||||
|
||||
|
||||
}
|
||||
|
||||
EAPI void
|
||||
|
@ -680,4 +680,3 @@ e_fm2_device_volume_list_get(void)
|
|||
{
|
||||
return _e_vols;
|
||||
}
|
||||
|
||||
|
|
|
@ -17,8 +17,8 @@ EAPI void e_fm2_device_mount_add(E_Volume *v, const char *mountpoint);
|
|||
EAPI void e_fm2_device_mount_del(E_Volume *v);
|
||||
EAPI E_Fm2_Mount *e_fm2_device_mount_find(const char *path);
|
||||
EAPI E_Fm2_Mount *e_fm2_device_mount(E_Volume *v,
|
||||
Ecore_Cb mount_ok, Ecore_Cb mount_fail,
|
||||
Ecore_Cb unmount_ok, Ecore_Cb unmount_fail,
|
||||
Ecore_Cb mount_ok, Ecore_Cb mount_fail,
|
||||
Ecore_Cb unmount_ok, Ecore_Cb unmount_fail,
|
||||
void *data);
|
||||
EAPI void e_fm2_device_mount_fail(E_Volume *v);
|
||||
EAPI void e_fm2_device_unmount(E_Fm2_Mount *m);
|
||||
|
|
|
@ -58,7 +58,7 @@ e_fm_mime_icon_get(const char *mime)
|
|||
goto ok;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* 2. look up in ~/.e/e/icons */
|
||||
len = e_user_dir_snprintf(buf, sizeof(buf), "icons/%s.edj", mime);
|
||||
if (len >= sizeof(buf))
|
||||
|
@ -339,7 +339,7 @@ e_fm2_mime_handler_mime_handlers_call_all(Evas_Object *obj, const char *path, co
|
|||
EINA_LIST_FOREACH(handlers, l, handler)
|
||||
{
|
||||
if (!handler) continue;
|
||||
|
||||
|
||||
e_fm2_mime_handler_call(handler, obj, path);
|
||||
}
|
||||
}
|
||||
|
@ -360,7 +360,7 @@ e_fm2_mime_handler_glob_handlers_call_all(Evas_Object *obj, const char *path, co
|
|||
EINA_LIST_FOREACH(handlers, l, handler)
|
||||
{
|
||||
if (!handler) continue;
|
||||
|
||||
|
||||
e_fm2_mime_handler_call(handler, obj, path);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
typedef struct _E_Fm2_Mime_Handler E_Fm2_Mime_Handler;
|
||||
|
||||
struct _E_Fm2_Mime_Handler
|
||||
struct _E_Fm2_Mime_Handler
|
||||
{
|
||||
const char *label, *icon_group;
|
||||
void (*action_func) (Evas_Object *obj, const char *path, void *data);
|
||||
|
|
|
@ -1537,4 +1537,3 @@ _e_fm_op_remove_atom(E_Fm_Op_Task *task)
|
|||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
@ -492,6 +492,6 @@ e_fm2_op_registry_entry_abort(E_Fm2_Op_Registry_Entry *entry)
|
|||
{
|
||||
if (!entry) return;
|
||||
|
||||
if (entry->func.abort)
|
||||
if (entry->func.abort)
|
||||
entry->func.abort(entry);
|
||||
}
|
||||
|
|
|
@ -33,9 +33,9 @@ struct _E_Fm2_Op_Registry_Entry
|
|||
Eina_Bool needs_attention:1;
|
||||
E_Dialog *dialog;
|
||||
Eina_Bool finished:1;
|
||||
|
||||
|
||||
// service callbacks
|
||||
struct
|
||||
struct
|
||||
{
|
||||
E_Fm2_Op_Registry_Abort_Func abort;
|
||||
} func;
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
#include "e.h"
|
||||
|
||||
/* FIXME:
|
||||
*
|
||||
*
|
||||
* basic -
|
||||
* + show file
|
||||
* + show file
|
||||
* + show size
|
||||
* + show modified date
|
||||
* + show mimetype
|
||||
|
@ -16,7 +16,7 @@
|
|||
* + change icon for mime type
|
||||
* * change icon for just this file
|
||||
* + change permissions (others read, others write)
|
||||
*
|
||||
*
|
||||
* advanced (extra) -
|
||||
* * show access date
|
||||
* * show change date
|
||||
|
@ -28,7 +28,7 @@
|
|||
* * show group
|
||||
* * change link destination
|
||||
* * change app to open THIS file with (or dir)
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
/* PROTOTYPES - same all the time */
|
||||
|
@ -88,18 +88,18 @@ e_fm_prop_file(E_Container *con, E_Fm2_Icon *ic)
|
|||
{
|
||||
E_Config_Dialog *cfd;
|
||||
E_Config_Dialog_View *v;
|
||||
|
||||
|
||||
v = E_NEW(E_Config_Dialog_View, 1);
|
||||
|
||||
|
||||
/* methods */
|
||||
v->create_cfdata = _create_data;
|
||||
v->free_cfdata = _free_data;
|
||||
v->basic.apply_cfdata = _basic_apply_data;
|
||||
v->basic.create_widgets = _basic_create_widgets;
|
||||
#if 0
|
||||
#if 0
|
||||
v->advanced.apply_cfdata = _advanced_apply_data;
|
||||
v->advanced.create_widgets = _advanced_create_widgets;
|
||||
#endif
|
||||
#endif
|
||||
/* create config diaolg for NULL object/data */
|
||||
cfd = e_config_dialog_new(con,
|
||||
_("File Properties"),
|
||||
|
@ -113,7 +113,7 @@ static void
|
|||
_fill_data(E_Config_Dialog_Data *cfdata, E_Fm2_Icon *ic)
|
||||
{
|
||||
struct passwd *pw;
|
||||
|
||||
|
||||
cfdata->ic = ic;
|
||||
cfdata->fi = e_fm2_icon_file_info_get(ic);
|
||||
if (cfdata->fi->file) cfdata->file = strdup(cfdata->fi->file);
|
||||
|
@ -138,7 +138,7 @@ _create_data(E_Config_Dialog *cfd)
|
|||
* the running systems/config in the apply methods
|
||||
*/
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
|
||||
cfdata = E_NEW(E_Config_Dialog_Data, 1);
|
||||
_fill_data(cfdata, cfd->data);
|
||||
return cfdata;
|
||||
|
@ -166,8 +166,8 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
|||
{
|
||||
char buf[PATH_MAX];
|
||||
int fperm = 0;
|
||||
|
||||
snprintf(buf, sizeof(buf), "%s/%s",
|
||||
|
||||
snprintf(buf, sizeof(buf), "%s/%s",
|
||||
e_fm2_real_path_get(cfdata->fi->fm), cfdata->fi->file);
|
||||
if (((cfdata->fi->statinfo.st_mode & S_IRUSR) && (cfdata->owner_read)) ||
|
||||
((!(cfdata->fi->statinfo.st_mode & S_IRUSR)) && (!cfdata->owner_read)))
|
||||
|
@ -184,7 +184,7 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
|||
if (fperm)
|
||||
{
|
||||
mode_t pmode;
|
||||
|
||||
|
||||
pmode = cfdata->fi->statinfo.st_mode;
|
||||
if (cfdata->owner_read) cfdata->fi->statinfo.st_mode |= S_IRUSR;
|
||||
else cfdata->fi->statinfo.st_mode &= ~S_IRUSR;
|
||||
|
@ -210,7 +210,7 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
|||
cfdata->plink = strdup(cfdata->link);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if ((cfdata->picon_type != cfdata->icon_type) ||
|
||||
(cfdata->picon_mime != cfdata->icon_mime) ||
|
||||
(cfdata->picon_changed))
|
||||
|
@ -220,7 +220,7 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
|||
Eina_List *l;
|
||||
E_Config_Mime_Icon *mi = NULL;
|
||||
int found = 0;
|
||||
|
||||
|
||||
if (!cfdata->picon_mime) /* remove previous custom icon info */
|
||||
e_fm2_custom_file_del(buf);
|
||||
EINA_LIST_FOREACH(e_config->mime_icons, l, mi)
|
||||
|
@ -266,7 +266,7 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
|||
else /* custom for this file */
|
||||
{
|
||||
E_Fm2_Custom_File *cf, cf0;
|
||||
|
||||
|
||||
cf = e_fm2_custom_file_get(buf);
|
||||
if (cf)
|
||||
{
|
||||
|
@ -298,10 +298,10 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
|||
}
|
||||
cfdata->picon_type = cfdata->icon_type;
|
||||
cfdata->picon_mime = cfdata->icon_mime;
|
||||
|
||||
|
||||
e_fm2_all_icons_update();
|
||||
}
|
||||
|
||||
|
||||
return 1; /* Apply was OK */
|
||||
}
|
||||
|
||||
|
@ -322,20 +322,20 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
|||
E_Radio_Group *rg;
|
||||
char buf[4096];
|
||||
const char *itype = NULL;
|
||||
|
||||
snprintf(buf, sizeof(buf), "%s/%s",
|
||||
|
||||
snprintf(buf, sizeof(buf), "%s/%s",
|
||||
e_fm2_real_path_get(cfdata->fi->fm), cfdata->fi->file);
|
||||
o = e_widget_table_add(evas, 0);
|
||||
|
||||
ot = e_widget_table_add(evas, 0);
|
||||
|
||||
|
||||
ob = e_widget_label_add(evas, _("File:"));
|
||||
e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 0, 1, 0);
|
||||
ob = e_widget_entry_add(evas, &(cfdata->file), NULL, NULL, NULL);
|
||||
e_widget_size_min_set(ob, 140, -1);
|
||||
e_widget_entry_readonly_set(ob, 1);
|
||||
e_widget_table_object_append(ot, ob, 1, 0, 1, 1, 1, 0, 1, 0);
|
||||
|
||||
|
||||
ob = e_widget_label_add(evas, _("Size:"));
|
||||
e_widget_table_object_append(ot, ob, 0, 1, 1, 1, 1, 0, 1, 0);
|
||||
ob = e_widget_entry_add(evas, &(cfdata->size), NULL, NULL, NULL);
|
||||
|
@ -373,11 +373,11 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
|||
ob = e_widget_check_add(evas, _("Owner can write"), &(cfdata->owner_write));
|
||||
e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 1);
|
||||
e_widget_table_object_append(ot, of, 0, 4, 2, 1, 1, 0, 1, 0);
|
||||
|
||||
|
||||
e_widget_table_object_append(o, ot, 0, 0, 1, 1, 1, 1, 1, 1);
|
||||
|
||||
|
||||
of = e_widget_frametable_add(evas, _("Preview"), 0);
|
||||
|
||||
|
||||
ot = e_widget_table_add(evas, 0);
|
||||
ob = e_widget_preview_add(evas, 128, 128);
|
||||
cfdata->gui.preview = ob;
|
||||
|
@ -388,12 +388,12 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
|||
e_widget_preview_thumb_set(ob, buf,
|
||||
"e/desktop/background", 128, 128);
|
||||
e_widget_frametable_object_append(of, ot, 0, 0, 1, 1, 1, 1, 1, 1);
|
||||
|
||||
|
||||
e_widget_table_object_append(o, of, 1, 0, 1, 1, 1, 1, 1, 1);
|
||||
|
||||
|
||||
ot = e_widget_frametable_add(evas, _("Icon"), 0);
|
||||
|
||||
ob = e_widget_button_add(evas, "", NULL, _cb_icon_sel, cfdata, cfd);
|
||||
|
||||
ob = e_widget_button_add(evas, "", NULL, _cb_icon_sel, cfdata, cfd);
|
||||
cfdata->gui.icon_wid = ob;
|
||||
oi = e_fm2_icon_get(evas,
|
||||
cfdata->ic,
|
||||
|
@ -421,7 +421,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
|||
else
|
||||
cfdata->icon_type = 0;
|
||||
cfdata->picon_type = cfdata->icon_type;
|
||||
|
||||
|
||||
rg = e_widget_radio_group_new(&cfdata->icon_type);
|
||||
ob = e_widget_radio_add(evas, _("Default"), 0, rg);
|
||||
evas_object_smart_callback_add(ob, "changed", _cb_type, cfdata);
|
||||
|
@ -442,16 +442,16 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
|
|||
ob = e_widget_check_add(evas, _("Use this icon for all files of this type"), &(cfdata->icon_mime));
|
||||
e_widget_frametable_object_append(ot, ob, 0, 3, 2, 1, 1, 1, 1, 1);
|
||||
}
|
||||
|
||||
|
||||
e_widget_table_object_append(o, ot, 0, 1, 1, 1, 1, 1, 1, 1);
|
||||
|
||||
if ((cfdata->link) && ((cfdata->fi->real_link) || (cfdata->fi->broken_link)))
|
||||
{
|
||||
ot = e_widget_frametable_add(evas, _("Link Information"), 0);
|
||||
|
||||
|
||||
ob = e_widget_entry_add(evas, &(cfdata->link), NULL, NULL, NULL);
|
||||
e_widget_frametable_object_append(ot, ob, 0, 0, 1, 1, 1, 0, 1, 0);
|
||||
|
||||
|
||||
e_widget_table_object_append(o, ot, 1, 1, 1, 1, 1, 1, 1, 1);
|
||||
}
|
||||
return o;
|
||||
|
@ -463,7 +463,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
|
|||
{
|
||||
/* generate the core widget layout for an advanced dialog */
|
||||
Evas_Object *o;
|
||||
|
||||
|
||||
o = e_widget_table_add(evas, 0);
|
||||
return o;
|
||||
}
|
||||
|
@ -494,16 +494,16 @@ _cb_icon_sel(void *data, void *data2)
|
|||
// e_dialog_title_set(dia, _("Select an Edj File"));
|
||||
// else if (cfdata->type == IMG)
|
||||
e_dialog_title_set(dia, _("Select an Image"));
|
||||
|
||||
|
||||
dia->data = cfdata;
|
||||
o = e_widget_fsel_add(dia->win->evas, "~/", "/", NULL, NULL,
|
||||
_cb_fsel_sel, cfdata, NULL, cfdata, 1);
|
||||
|
||||
|
||||
cfdata->gui.fsel_wid = o;
|
||||
evas_object_show(o);
|
||||
e_widget_size_min_get(o, &w, &h);
|
||||
e_dialog_content_set(dia, o, w, h);
|
||||
|
||||
|
||||
e_dialog_button_add(dia, _("OK"), NULL, _cb_fsel_ok, cfdata);
|
||||
e_dialog_button_add(dia, _("Cancel"), NULL, _cb_fsel_cancel, cfdata);
|
||||
e_dialog_resizable_set(dia, 1);
|
||||
|
@ -518,7 +518,7 @@ static void
|
|||
_cb_type(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
|
||||
cfdata = data;
|
||||
if (cfdata->icon_type == 2)
|
||||
e_widget_disabled_set(cfdata->gui.icon_wid, 0);
|
||||
|
@ -530,7 +530,7 @@ static void
|
|||
_cb_preview_update(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
|
||||
cfdata = data;
|
||||
e_widget_table_object_repack(cfdata->gui.preview_table,
|
||||
cfdata->gui.preview,
|
||||
|
@ -552,10 +552,10 @@ _cb_fsel_ok(void *data, E_Dialog *dia)
|
|||
E_Config_Dialog_Data *cfdata;
|
||||
const char *file, *ext;
|
||||
Evas_Object *icon = NULL;
|
||||
|
||||
|
||||
cfdata = data;
|
||||
if (!cfdata) return;
|
||||
|
||||
|
||||
file = e_widget_fsel_selection_path_get(cfdata->gui.fsel_wid);
|
||||
E_FREE(cfdata->icon);
|
||||
if (file) cfdata->icon = strdup(file);
|
||||
|
@ -584,7 +584,7 @@ static void
|
|||
_cb_fsel_cancel(void *data, E_Dialog *dia)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
|
||||
cfdata = data;
|
||||
e_object_del(E_OBJECT(dia));
|
||||
cfdata->gui.fsel = NULL;
|
||||
|
|
|
@ -51,7 +51,7 @@ struct _E_Storage
|
|||
Eina_Bool hotpluggable;
|
||||
Eina_Bool media_check_enabled;
|
||||
|
||||
struct
|
||||
struct
|
||||
{
|
||||
const char *drive, *volume;
|
||||
} icon;
|
||||
|
@ -93,7 +93,7 @@ struct _E_Volume
|
|||
|
||||
Eina_Bool encrypted;
|
||||
Eina_Bool unlocked;
|
||||
|
||||
|
||||
#if @DBUS_MOUNT_CONFIG@
|
||||
DBusPendingCall *op; // d-bus call handle
|
||||
void *prop_handler;
|
||||
|
|
|
@ -15,6 +15,6 @@ EAPI void e_focus_event_focus_in(E_Border *bd);
|
|||
EAPI void e_focus_event_focus_out(E_Border *bd);
|
||||
EAPI void e_focus_setup(E_Border *bd);
|
||||
EAPI void e_focus_setdown(E_Border *bd);
|
||||
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -100,7 +100,7 @@ e_font_available_list(void)
|
|||
EINA_LIST_FOREACH(evas_fonts, l, evas_font)
|
||||
{
|
||||
E_Font_Available *efa;
|
||||
|
||||
|
||||
efa = E_NEW(E_Font_Available, 1);
|
||||
efa->name = eina_stringshare_add(evas_font);
|
||||
e_fonts = eina_list_append(e_fonts, efa);
|
||||
|
@ -117,7 +117,7 @@ e_font_available_list_free(Eina_List *available)
|
|||
E_Font_Available *efa;
|
||||
|
||||
EINA_LIST_FREE(available, efa)
|
||||
{
|
||||
{
|
||||
if (efa->name) eina_stringshare_del(efa->name);
|
||||
E_FREE(efa);
|
||||
}
|
||||
|
@ -194,7 +194,7 @@ _e_font_fontconfig_name_parse(Eina_Hash **font_hash, E_Font_Properties *efp, con
|
|||
{
|
||||
efp = calloc(1, sizeof(E_Font_Properties));
|
||||
efp->name = eina_stringshare_add(name);
|
||||
if (font_hash)
|
||||
if (font_hash)
|
||||
{
|
||||
if (!*font_hash) *font_hash = eina_hash_string_superfast_new(NULL);
|
||||
eina_hash_add(*font_hash, name, efp);
|
||||
|
@ -217,7 +217,7 @@ _e_font_fontconfig_name_parse(Eina_Hash **font_hash, E_Font_Properties *efp, con
|
|||
}
|
||||
free(name);
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
if (font_hash) efp = eina_hash_find(*font_hash, font);
|
||||
if (!efp)
|
||||
|
@ -291,7 +291,7 @@ e_font_fallback_clear(void)
|
|||
E_Font_Fallback *eff;
|
||||
|
||||
EINA_LIST_FREE(e_config->font_fallbacks, eff)
|
||||
{
|
||||
{
|
||||
if (eff->name) eina_stringshare_del(eff->name);
|
||||
E_FREE(eff);
|
||||
}
|
||||
|
@ -331,7 +331,7 @@ e_font_fallback_remove(const char *font)
|
|||
{
|
||||
if (!strcmp(eff->name, font))
|
||||
{
|
||||
e_config->font_fallbacks =
|
||||
e_config->font_fallbacks =
|
||||
eina_list_remove_list(e_config->font_fallbacks, next);
|
||||
if (eff->name) eina_stringshare_del(eff->name);
|
||||
E_FREE(eff);
|
||||
|
@ -361,9 +361,9 @@ e_font_default_set(const char *text_class, const char *font, Evas_Font_Size size
|
|||
efd->font = eina_stringshare_add(font);
|
||||
efd->size = size;
|
||||
/* move to the front of the list */
|
||||
e_config->font_defaults =
|
||||
e_config->font_defaults =
|
||||
eina_list_remove_list(e_config->font_defaults, next);
|
||||
e_config->font_defaults =
|
||||
e_config->font_defaults =
|
||||
eina_list_prepend(e_config->font_defaults, efd);
|
||||
return;
|
||||
}
|
||||
|
@ -393,9 +393,9 @@ e_font_default_get(const char *text_class)
|
|||
if (!strcmp(efd->text_class, text_class))
|
||||
{
|
||||
/* move to the front of the list */
|
||||
e_config->font_defaults =
|
||||
e_config->font_defaults =
|
||||
eina_list_remove_list(e_config->font_defaults, next);
|
||||
e_config->font_defaults =
|
||||
e_config->font_defaults =
|
||||
eina_list_prepend(e_config->font_defaults, efd);
|
||||
return efd;
|
||||
}
|
||||
|
@ -416,7 +416,7 @@ e_font_default_remove(const char *text_class)
|
|||
{
|
||||
if (!strcmp(efd->text_class, text_class))
|
||||
{
|
||||
e_config->font_defaults =
|
||||
e_config->font_defaults =
|
||||
eina_list_remove_list(e_config->font_defaults, next);
|
||||
if (efd->text_class) eina_stringshare_del(efd->text_class);
|
||||
if (efd->font) eina_stringshare_del(efd->font);
|
||||
|
|
|
@ -26,7 +26,7 @@ struct _E_Font_Available
|
|||
const char *name;
|
||||
};
|
||||
|
||||
struct _E_Font_Properties
|
||||
struct _E_Font_Properties
|
||||
{
|
||||
const char *name;
|
||||
Eina_List *styles;
|
||||
|
@ -56,6 +56,6 @@ EAPI E_Font_Default *e_font_default_get(const char *text_class);
|
|||
EAPI void e_font_default_remove(const char *text_class);
|
||||
EAPI Eina_List *e_font_default_list(void);
|
||||
EAPI const char *e_font_default_string_get(const char *text_class, Evas_Font_Size *size_ret);
|
||||
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -5160,4 +5160,3 @@ _e_gadcon_location_change(E_Gadcon_Client *gcc, E_Gadcon_Location *src, E_Gadcon
|
|||
src->gadget_remove.func(src->gadget_remove.data, gcc);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
@ -134,4 +134,3 @@ _e_grabinput_focus(Ecore_X_Window win, E_Focus_Method method)
|
|||
}
|
||||
last_focus_time = ecore_loop_time_get();
|
||||
}
|
||||
|
||||
|
|
|
@ -18,6 +18,6 @@ EAPI int e_grabinput_get(Ecore_X_Window mouse_win, int confine_mouse,
|
|||
EAPI void e_grabinput_release(Ecore_X_Window mouse_win, Ecore_X_Window key_win);
|
||||
EAPI void e_grabinput_focus(Ecore_X_Window win, E_Focus_Method method);
|
||||
EAPI double e_grabinput_last_focus_time_get(void);
|
||||
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -1405,7 +1405,7 @@ e_hints_window_e_state_get(E_Border *bd)
|
|||
/* ugly, but avoids possible future overflow if more states are added */
|
||||
size = (sizeof(state) / sizeof(state[0]));
|
||||
|
||||
num =
|
||||
num =
|
||||
ecore_x_window_prop_card32_get(bd->client.win, E_ATOM_WINDOW_STATE,
|
||||
state, size);
|
||||
if (!num) return;
|
||||
|
@ -1491,4 +1491,3 @@ e_hints_scale_update(void)
|
|||
free(roots);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#define INTERNAL_ENTRY E_Smart_Data *sd; sd = evas_object_smart_data_get(obj); if (!sd) return;
|
||||
|
||||
typedef struct _E_Smart_Data E_Smart_Data;
|
||||
struct _E_Smart_Data
|
||||
struct _E_Smart_Data
|
||||
{
|
||||
Evas_Coord x, y, w, h, iw, ih;
|
||||
Evas_Object *o_smart, *o_box;
|
||||
|
@ -52,13 +52,13 @@ static void _item_unselect (E_Ilist_Item *si);
|
|||
static Evas_Smart *_e_smart = NULL;
|
||||
|
||||
EAPI Evas_Object *
|
||||
e_ilist_add(Evas *evas)
|
||||
e_ilist_add(Evas *evas)
|
||||
{
|
||||
_e_smart_init();
|
||||
return evas_object_smart_add(evas, _e_smart);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
EAPI void
|
||||
e_ilist_append(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2)
|
||||
{
|
||||
E_Ilist_Item *si;
|
||||
|
@ -72,17 +72,17 @@ e_ilist_append(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char
|
|||
si->o_base = edje_object_add(evas_object_evas_get(sd->o_smart));
|
||||
|
||||
isodd = eina_list_count(sd->items) & 0x1;
|
||||
if (header)
|
||||
if (header)
|
||||
{
|
||||
if (isodd)
|
||||
{
|
||||
if (!e_theme_edje_object_set(si->o_base, "base/theme/widgets",
|
||||
if (!e_theme_edje_object_set(si->o_base, "base/theme/widgets",
|
||||
"e/widgets/ilist_header_odd"))
|
||||
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
|
||||
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
|
||||
"e/widgets/ilist_header");
|
||||
}
|
||||
else
|
||||
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
|
||||
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
|
||||
"e/widgets/ilist_header");
|
||||
}
|
||||
else
|
||||
|
@ -95,14 +95,14 @@ e_ilist_append(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char
|
|||
"e/widgets/ilist");
|
||||
}
|
||||
|
||||
if (label)
|
||||
if (label)
|
||||
{
|
||||
si->label = eina_stringshare_add(label);
|
||||
edje_object_part_text_set(si->o_base, "e.text.label", label);
|
||||
}
|
||||
|
||||
si->o_icon = icon;
|
||||
if (si->o_icon)
|
||||
if (si->o_icon)
|
||||
{
|
||||
edje_extern_object_min_size_set(si->o_icon, sd->iw, sd->ih);
|
||||
edje_object_part_swallow(si->o_base, "e.swallow.icon", si->o_icon);
|
||||
|
@ -133,7 +133,7 @@ e_ilist_append(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char
|
|||
edje_object_size_min_calc(si->o_base, &mw, &mh);
|
||||
e_box_freeze(sd->o_box);
|
||||
e_box_pack_end(sd->o_box, si->o_base);
|
||||
e_box_pack_options_set(si->o_base, 1, 1, 1, 1, 0.5, 0.5,
|
||||
e_box_pack_options_set(si->o_base, 1, 1, 1, 1, 0.5, 0.5,
|
||||
mw, mh, 99999, 99999);
|
||||
stacking = edje_object_data_get(si->o_base, "stacking");
|
||||
if (stacking)
|
||||
|
@ -151,8 +151,8 @@ e_ilist_append(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char
|
|||
evas_object_show(si->o_base);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_ilist_append_relative(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2, int relative)
|
||||
EAPI void
|
||||
e_ilist_append_relative(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2, int relative)
|
||||
{
|
||||
E_Ilist_Item *si, *ri;
|
||||
Evas_Coord mw = 0, mh = 0;
|
||||
|
@ -165,17 +165,17 @@ e_ilist_append_relative(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, c
|
|||
si->o_base = edje_object_add(evas_object_evas_get(sd->o_smart));
|
||||
|
||||
isodd = eina_list_count(sd->items) & 0x1;
|
||||
if (header)
|
||||
if (header)
|
||||
{
|
||||
if (isodd)
|
||||
{
|
||||
if (!e_theme_edje_object_set(si->o_base, "base/theme/widgets",
|
||||
if (!e_theme_edje_object_set(si->o_base, "base/theme/widgets",
|
||||
"e/widgets/ilist_header_odd"))
|
||||
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
|
||||
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
|
||||
"e/widgets/ilist_header");
|
||||
}
|
||||
else
|
||||
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
|
||||
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
|
||||
"e/widgets/ilist_header");
|
||||
}
|
||||
else
|
||||
|
@ -187,14 +187,14 @@ e_ilist_append_relative(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, c
|
|||
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
|
||||
"e/widgets/ilist");
|
||||
}
|
||||
if (label)
|
||||
if (label)
|
||||
{
|
||||
si->label = eina_stringshare_add(label);
|
||||
edje_object_part_text_set(si->o_base, "e.text.label", label);
|
||||
}
|
||||
|
||||
si->o_icon = icon;
|
||||
if (si->o_icon)
|
||||
if (si->o_icon)
|
||||
{
|
||||
edje_extern_object_min_size_set(si->o_icon, sd->iw, sd->ih);
|
||||
edje_object_part_swallow(si->o_base, "e.swallow.icon", si->o_icon);
|
||||
|
@ -232,7 +232,7 @@ e_ilist_append_relative(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, c
|
|||
e_box_pack_after(sd->o_box, si->o_base, ri->o_base);
|
||||
else
|
||||
e_box_pack_end(sd->o_box, si->o_base);
|
||||
e_box_pack_options_set(si->o_base, 1, 1, 1, 1, 0.5, 0.5,
|
||||
e_box_pack_options_set(si->o_base, 1, 1, 1, 1, 0.5, 0.5,
|
||||
mw, mh, 99999, 99999);
|
||||
stacking = edje_object_data_get(si->o_base, "stacking");
|
||||
if (stacking)
|
||||
|
@ -250,8 +250,8 @@ e_ilist_append_relative(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, c
|
|||
evas_object_show(si->o_base);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_ilist_prepend(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2)
|
||||
EAPI void
|
||||
e_ilist_prepend(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2)
|
||||
{
|
||||
E_Ilist_Item *si;
|
||||
Evas_Coord mw = 0, mh = 0;
|
||||
|
@ -261,8 +261,8 @@ e_ilist_prepend(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const cha
|
|||
si->sd = sd;
|
||||
si->o_base = edje_object_add(evas_object_evas_get(sd->o_smart));
|
||||
|
||||
if (header)
|
||||
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
|
||||
if (header)
|
||||
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
|
||||
"e/widgets/ilist_header");
|
||||
else if (eina_list_count(sd->items) & 0x1)
|
||||
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
|
||||
|
@ -270,14 +270,14 @@ e_ilist_prepend(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const cha
|
|||
else
|
||||
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
|
||||
"e/widgets/ilist");
|
||||
if (label)
|
||||
if (label)
|
||||
{
|
||||
si->label = eina_stringshare_add(label);
|
||||
edje_object_part_text_set(si->o_base, "e.text.label", label);
|
||||
}
|
||||
|
||||
si->o_icon = icon;
|
||||
if (si->o_icon)
|
||||
if (si->o_icon)
|
||||
{
|
||||
edje_extern_object_min_size_set(si->o_icon, sd->iw, sd->ih);
|
||||
edje_object_part_swallow(si->o_base, "e.swallow.icon", si->o_icon);
|
||||
|
@ -307,7 +307,7 @@ e_ilist_prepend(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const cha
|
|||
edje_object_size_min_calc(si->o_base, &mw, &mh);
|
||||
e_box_freeze(sd->o_box);
|
||||
e_box_pack_start(sd->o_box, si->o_base);
|
||||
e_box_pack_options_set(si->o_base, 1, 1, 1, 1, 0.5, 0.5,
|
||||
e_box_pack_options_set(si->o_base, 1, 1, 1, 1, 0.5, 0.5,
|
||||
mw, mh, 99999, 99999);
|
||||
e_box_thaw(sd->o_box);
|
||||
|
||||
|
@ -319,8 +319,8 @@ e_ilist_prepend(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const cha
|
|||
evas_object_show(si->o_base);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2, int relative)
|
||||
EAPI void
|
||||
e_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data, void *data2), void (*func_hilight) (void *data, void *data2), void *data, void *data2, int relative)
|
||||
{
|
||||
E_Ilist_Item *si, *ri;
|
||||
Evas_Coord mw = 0, mh = 0;
|
||||
|
@ -330,8 +330,8 @@ e_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, Evas_Object *end,
|
|||
si->sd = sd;
|
||||
si->o_base = edje_object_add(evas_object_evas_get(sd->o_smart));
|
||||
|
||||
if (header)
|
||||
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
|
||||
if (header)
|
||||
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
|
||||
"e/widgets/ilist_header");
|
||||
else if (eina_list_count(sd->items) & 0x1)
|
||||
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
|
||||
|
@ -339,14 +339,14 @@ e_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, Evas_Object *end,
|
|||
else
|
||||
e_theme_edje_object_set(si->o_base, "base/theme/widgets",
|
||||
"e/widgets/ilist");
|
||||
if (label)
|
||||
if (label)
|
||||
{
|
||||
si->label = eina_stringshare_add(label);
|
||||
edje_object_part_text_set(si->o_base, "e.text.label", label);
|
||||
}
|
||||
|
||||
si->o_icon = icon;
|
||||
if (si->o_icon)
|
||||
if (si->o_icon)
|
||||
{
|
||||
edje_extern_object_min_size_set(si->o_icon, sd->iw, sd->ih);
|
||||
edje_object_part_swallow(si->o_base, "e.swallow.icon", si->o_icon);
|
||||
|
@ -374,9 +374,9 @@ e_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, Evas_Object *end,
|
|||
si->header = header;
|
||||
|
||||
ri = eina_list_nth(sd->items, relative);
|
||||
if (ri)
|
||||
if (ri)
|
||||
sd->items = eina_list_prepend_relative(sd->items, si, ri);
|
||||
else
|
||||
else
|
||||
sd->items = eina_list_prepend(sd->items, si);
|
||||
|
||||
edje_object_size_min_calc(si->o_base, &mw, &mh);
|
||||
|
@ -385,7 +385,7 @@ e_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, Evas_Object *end,
|
|||
e_box_pack_before(sd->o_box, si->o_base, ri->o_base);
|
||||
else
|
||||
e_box_pack_end(sd->o_box, si->o_base);
|
||||
e_box_pack_options_set(si->o_base, 1, 1, 1, 1, 0.5, 0.5,
|
||||
e_box_pack_options_set(si->o_base, 1, 1, 1, 1, 0.5, 0.5,
|
||||
mw, mh, 99999, 99999);
|
||||
e_box_thaw(sd->o_box);
|
||||
|
||||
|
@ -397,8 +397,8 @@ e_ilist_prepend_relative(Evas_Object *obj, Evas_Object *icon, Evas_Object *end,
|
|||
evas_object_show(si->o_base);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_ilist_clear(Evas_Object *obj)
|
||||
EAPI void
|
||||
e_ilist_clear(Evas_Object *obj)
|
||||
{
|
||||
E_Ilist_Item *si = NULL;
|
||||
|
||||
|
@ -418,64 +418,64 @@ e_ilist_clear(Evas_Object *obj)
|
|||
sd->selected = -1;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_ilist_freeze(Evas_Object *obj)
|
||||
EAPI void
|
||||
e_ilist_freeze(Evas_Object *obj)
|
||||
{
|
||||
API_ENTRY return;
|
||||
e_box_freeze(sd->o_box);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_ilist_thaw(Evas_Object *obj)
|
||||
EAPI void
|
||||
e_ilist_thaw(Evas_Object *obj)
|
||||
{
|
||||
API_ENTRY return;
|
||||
e_box_thaw(sd->o_box);
|
||||
}
|
||||
|
||||
EAPI int
|
||||
e_ilist_count(Evas_Object *obj)
|
||||
EAPI int
|
||||
e_ilist_count(Evas_Object *obj)
|
||||
{
|
||||
API_ENTRY return 0;
|
||||
return eina_list_count(sd->items);
|
||||
}
|
||||
|
||||
EAPI int
|
||||
e_ilist_selector_get(Evas_Object *obj)
|
||||
EAPI int
|
||||
e_ilist_selector_get(Evas_Object *obj)
|
||||
{
|
||||
API_ENTRY return 0;
|
||||
return sd->selector;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_ilist_selector_set(Evas_Object *obj, int selector)
|
||||
EAPI void
|
||||
e_ilist_selector_set(Evas_Object *obj, int selector)
|
||||
{
|
||||
API_ENTRY return;
|
||||
sd->selector = selector;
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
e_ilist_multi_select_get(Evas_Object *obj)
|
||||
EAPI Eina_Bool
|
||||
e_ilist_multi_select_get(Evas_Object *obj)
|
||||
{
|
||||
API_ENTRY return 0;
|
||||
return sd->multi_select;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_ilist_multi_select_set(Evas_Object *obj, Eina_Bool multi)
|
||||
EAPI void
|
||||
e_ilist_multi_select_set(Evas_Object *obj, Eina_Bool multi)
|
||||
{
|
||||
API_ENTRY return;
|
||||
sd->multi_select = multi;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_ilist_size_min_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
|
||||
EAPI void
|
||||
e_ilist_size_min_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
|
||||
{
|
||||
API_ENTRY return;
|
||||
e_box_size_min_get(sd->o_box, w, h);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_ilist_unselect(Evas_Object *obj)
|
||||
EAPI void
|
||||
e_ilist_unselect(Evas_Object *obj)
|
||||
{
|
||||
Eina_List *l = NULL;
|
||||
E_Ilist_Item *si = NULL;
|
||||
|
@ -493,8 +493,8 @@ e_ilist_unselect(Evas_Object *obj)
|
|||
sd->selected = -1;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_ilist_selected_set(Evas_Object *obj, int n)
|
||||
EAPI void
|
||||
e_ilist_selected_set(Evas_Object *obj, int n)
|
||||
{
|
||||
E_Ilist_Item *si = NULL;
|
||||
Eina_List *l = NULL;
|
||||
|
@ -533,8 +533,8 @@ e_ilist_selected_set(Evas_Object *obj, int n)
|
|||
}
|
||||
}
|
||||
|
||||
EAPI int
|
||||
e_ilist_selected_get(Evas_Object *obj)
|
||||
EAPI int
|
||||
e_ilist_selected_get(Evas_Object *obj)
|
||||
{
|
||||
Eina_List *l = NULL;
|
||||
E_Ilist_Item *li = NULL;
|
||||
|
@ -558,7 +558,7 @@ e_ilist_selected_get(Evas_Object *obj)
|
|||
}
|
||||
|
||||
EAPI const char *
|
||||
e_ilist_selected_label_get(Evas_Object *obj)
|
||||
e_ilist_selected_label_get(Evas_Object *obj)
|
||||
{
|
||||
E_Ilist_Item *si = NULL;
|
||||
|
||||
|
@ -567,12 +567,12 @@ e_ilist_selected_label_get(Evas_Object *obj)
|
|||
if (sd->multi_select) return NULL;
|
||||
if (sd->selected < 0) return NULL;
|
||||
si = eina_list_nth(sd->items, sd->selected);
|
||||
if (si)
|
||||
if (si)
|
||||
{
|
||||
if (!si->label)
|
||||
if (!si->label)
|
||||
{
|
||||
si->label =
|
||||
eina_stringshare_add(edje_object_part_text_get(si->o_base,
|
||||
si->label =
|
||||
eina_stringshare_add(edje_object_part_text_get(si->o_base,
|
||||
"e.text.label"));
|
||||
}
|
||||
if (si->label) return si->label;
|
||||
|
@ -581,7 +581,7 @@ e_ilist_selected_label_get(Evas_Object *obj)
|
|||
}
|
||||
|
||||
EAPI void *
|
||||
e_ilist_selected_data_get(Evas_Object *obj)
|
||||
e_ilist_selected_data_get(Evas_Object *obj)
|
||||
{
|
||||
E_Ilist_Item *si = NULL;
|
||||
|
||||
|
@ -595,7 +595,7 @@ e_ilist_selected_data_get(Evas_Object *obj)
|
|||
}
|
||||
|
||||
EAPI void *
|
||||
e_ilist_selected_data2_get(Evas_Object *obj)
|
||||
e_ilist_selected_data2_get(Evas_Object *obj)
|
||||
{
|
||||
E_Ilist_Item *si = NULL;
|
||||
|
||||
|
@ -609,7 +609,7 @@ e_ilist_selected_data2_get(Evas_Object *obj)
|
|||
}
|
||||
|
||||
EAPI Evas_Object *
|
||||
e_ilist_selected_icon_get(Evas_Object *obj)
|
||||
e_ilist_selected_icon_get(Evas_Object *obj)
|
||||
{
|
||||
E_Ilist_Item *si = NULL;
|
||||
|
||||
|
@ -636,8 +636,8 @@ e_ilist_selected_end_get(Evas_Object *obj)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_ilist_selected_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
|
||||
EAPI void
|
||||
e_ilist_selected_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
|
||||
{
|
||||
E_Ilist_Item *si = NULL;
|
||||
|
||||
|
@ -650,8 +650,8 @@ e_ilist_selected_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Ev
|
|||
*y -= sd->y;
|
||||
}
|
||||
|
||||
EAPI int
|
||||
e_ilist_selected_count_get(Evas_Object *obj)
|
||||
EAPI int
|
||||
e_ilist_selected_count_get(Evas_Object *obj)
|
||||
{
|
||||
Eina_List *l = NULL;
|
||||
E_Ilist_Item *si = NULL;
|
||||
|
@ -667,8 +667,8 @@ e_ilist_selected_count_get(Evas_Object *obj)
|
|||
return count;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_ilist_remove_num(Evas_Object *obj, int n)
|
||||
EAPI void
|
||||
e_ilist_remove_num(Evas_Object *obj, int n)
|
||||
{
|
||||
E_Ilist_Item *si = NULL;
|
||||
Eina_List *item;
|
||||
|
@ -690,19 +690,19 @@ e_ilist_remove_num(Evas_Object *obj, int n)
|
|||
}
|
||||
|
||||
EAPI const char *
|
||||
e_ilist_nth_label_get(Evas_Object *obj, int n)
|
||||
e_ilist_nth_label_get(Evas_Object *obj, int n)
|
||||
{
|
||||
E_Ilist_Item *si = NULL;
|
||||
|
||||
API_ENTRY return NULL;
|
||||
if (!sd->items) return NULL;
|
||||
si = eina_list_nth(sd->items, n);
|
||||
if (si)
|
||||
if (si)
|
||||
{
|
||||
if (!si->label)
|
||||
if (!si->label)
|
||||
{
|
||||
si->label =
|
||||
eina_stringshare_add(edje_object_part_text_get(si->o_base,
|
||||
si->label =
|
||||
eina_stringshare_add(edje_object_part_text_get(si->o_base,
|
||||
"e.text.label"));
|
||||
}
|
||||
if (si->label) return si->label;
|
||||
|
@ -710,8 +710,8 @@ e_ilist_nth_label_get(Evas_Object *obj, int n)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_ilist_nth_label_set(Evas_Object *obj, int n, const char *label)
|
||||
EAPI void
|
||||
e_ilist_nth_label_set(Evas_Object *obj, int n, const char *label)
|
||||
{
|
||||
E_Ilist_Item *si = NULL;
|
||||
|
||||
|
@ -721,7 +721,7 @@ e_ilist_nth_label_set(Evas_Object *obj, int n, const char *label)
|
|||
API_ENTRY return;
|
||||
if (!sd->items) return;
|
||||
si = eina_list_nth(sd->items, n);
|
||||
if (si)
|
||||
if (si)
|
||||
{
|
||||
if (eina_stringshare_replace(&si->label, label))
|
||||
edje_object_part_text_set(si->o_base, "e.text.label", label);
|
||||
|
@ -729,7 +729,7 @@ e_ilist_nth_label_set(Evas_Object *obj, int n, const char *label)
|
|||
}
|
||||
|
||||
EAPI Evas_Object *
|
||||
e_ilist_nth_icon_get(Evas_Object *obj, int n)
|
||||
e_ilist_nth_icon_get(Evas_Object *obj, int n)
|
||||
{
|
||||
E_Ilist_Item *si = NULL;
|
||||
|
||||
|
@ -740,21 +740,21 @@ e_ilist_nth_icon_get(Evas_Object *obj, int n)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_ilist_nth_icon_set(Evas_Object *obj, int n, Evas_Object *icon)
|
||||
EAPI void
|
||||
e_ilist_nth_icon_set(Evas_Object *obj, int n, Evas_Object *icon)
|
||||
{
|
||||
E_Ilist_Item *si = NULL;
|
||||
|
||||
API_ENTRY return;
|
||||
if (!sd->items) return;
|
||||
if (!(si = eina_list_nth(sd->items, n))) return;
|
||||
if (si->o_icon)
|
||||
if (si->o_icon)
|
||||
{
|
||||
edje_object_part_unswallow(si->o_base, si->o_icon);
|
||||
evas_object_del(si->o_icon);
|
||||
}
|
||||
si->o_icon = icon;
|
||||
if (si->o_icon)
|
||||
if (si->o_icon)
|
||||
{
|
||||
edje_extern_object_min_size_set(si->o_icon, sd->iw, sd->ih);
|
||||
edje_object_part_swallow(si->o_base, "e.swallow.icon", si->o_icon);
|
||||
|
@ -797,7 +797,7 @@ e_ilist_nth_end_set(Evas_Object *obj, int n, Evas_Object *end)
|
|||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
e_ilist_nth_is_header(Evas_Object *obj, int n)
|
||||
e_ilist_nth_is_header(Evas_Object *obj, int n)
|
||||
{
|
||||
E_Ilist_Item *si = NULL;
|
||||
|
||||
|
@ -821,8 +821,8 @@ e_ilist_nth_geometry_get(Evas_Object *obj, int n, Evas_Coord *x, Evas_Coord *y,
|
|||
*y -= sd->y;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_ilist_icon_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
|
||||
EAPI void
|
||||
e_ilist_icon_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
|
||||
{
|
||||
Eina_List *l = NULL;
|
||||
E_Ilist_Item *si = NULL;
|
||||
|
@ -854,20 +854,20 @@ e_ilist_icon_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
|
|||
}
|
||||
|
||||
edje_object_size_min_calc(si->o_base, &mw, &mh);
|
||||
e_box_pack_options_set(si->o_icon, 1, 1, 1, 0, 0.5, 0.5,
|
||||
e_box_pack_options_set(si->o_icon, 1, 1, 1, 0, 0.5, 0.5,
|
||||
mw, mh, 99999, 99999);
|
||||
}
|
||||
}
|
||||
|
||||
EAPI Eina_List *
|
||||
e_ilist_items_get(Evas_Object *obj)
|
||||
e_ilist_items_get(Evas_Object *obj)
|
||||
{
|
||||
API_ENTRY return NULL;
|
||||
return sd->items;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_ilist_multi_select(Evas_Object *obj, int n)
|
||||
EAPI void
|
||||
e_ilist_multi_select(Evas_Object *obj, int n)
|
||||
{
|
||||
E_Ilist_Item *si = NULL;
|
||||
int i;
|
||||
|
@ -882,7 +882,7 @@ e_ilist_multi_select(Evas_Object *obj, int n)
|
|||
if (!(si = eina_list_nth(sd->items, n))) return;
|
||||
if (si->header) return;
|
||||
sd->selected = n;
|
||||
if (si->selected)
|
||||
if (si->selected)
|
||||
{
|
||||
_item_unselect(si);
|
||||
if (si->func_hilight) si->func_hilight(si->data, si->data2);
|
||||
|
@ -902,8 +902,8 @@ e_ilist_multi_select(Evas_Object *obj, int n)
|
|||
}
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_ilist_range_select(Evas_Object *obj, int n)
|
||||
EAPI void
|
||||
e_ilist_range_select(Evas_Object *obj, int n)
|
||||
{
|
||||
int i, j, dir;
|
||||
|
||||
|
@ -918,21 +918,21 @@ e_ilist_range_select(Evas_Object *obj, int n)
|
|||
else dir = 1;
|
||||
|
||||
if (!eina_list_nth(sd->items, n)) return;
|
||||
if (dir == 1)
|
||||
if (dir == 1)
|
||||
{
|
||||
for (j = (sd->selected + 1); ((j < i) && (j <= n)); j++)
|
||||
for (j = (sd->selected + 1); ((j < i) && (j <= n)); j++)
|
||||
e_ilist_multi_select(sd->o_smart, j);
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
for (j = (sd->selected - 1); ((j >= 0) && (j >= n)); j--)
|
||||
for (j = (sd->selected - 1); ((j >= 0) && (j >= n)); j--)
|
||||
e_ilist_multi_select(sd->o_smart, j);
|
||||
}
|
||||
}
|
||||
|
||||
/* SMART FUNCTIONS */
|
||||
static void
|
||||
_e_smart_init(void)
|
||||
static void
|
||||
_e_smart_init(void)
|
||||
{
|
||||
if (_e_smart) return;
|
||||
{
|
||||
|
@ -953,8 +953,8 @@ _e_smart_init(void)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
_e_smart_add(Evas_Object *obj)
|
||||
static void
|
||||
_e_smart_add(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
@ -976,13 +976,13 @@ _e_smart_add(Evas_Object *obj)
|
|||
e_box_align_set(sd->o_box, 0.0, 0.0);
|
||||
e_box_homogenous_set(sd->o_box, 0);
|
||||
evas_object_smart_member_add(sd->o_box, obj);
|
||||
evas_object_event_callback_add(obj, EVAS_CALLBACK_KEY_DOWN,
|
||||
evas_object_event_callback_add(obj, EVAS_CALLBACK_KEY_DOWN,
|
||||
_e_smart_event_key_down, sd);
|
||||
evas_object_propagate_events_set(obj, 0);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_smart_del(Evas_Object *obj)
|
||||
static void
|
||||
_e_smart_del(Evas_Object *obj)
|
||||
{
|
||||
INTERNAL_ENTRY;
|
||||
|
||||
|
@ -993,22 +993,22 @@ _e_smart_del(Evas_Object *obj)
|
|||
free(sd);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_smart_show(Evas_Object *obj)
|
||||
static void
|
||||
_e_smart_show(Evas_Object *obj)
|
||||
{
|
||||
INTERNAL_ENTRY;
|
||||
evas_object_show(sd->o_box);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_smart_hide(Evas_Object *obj)
|
||||
static void
|
||||
_e_smart_hide(Evas_Object *obj)
|
||||
{
|
||||
INTERNAL_ENTRY;
|
||||
evas_object_hide(sd->o_box);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
|
||||
static void
|
||||
_e_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
|
||||
{
|
||||
INTERNAL_ENTRY;
|
||||
if ((sd->x == x) && (sd->y == y)) return;
|
||||
|
@ -1017,8 +1017,8 @@ _e_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
|
|||
_e_smart_reconfigure(sd);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
|
||||
static void
|
||||
_e_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
|
||||
{
|
||||
INTERNAL_ENTRY;
|
||||
if ((sd->w == w) && (sd->h == h)) return;
|
||||
|
@ -1027,29 +1027,29 @@ _e_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
|
|||
_e_smart_reconfigure(sd);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_smart_color_set(Evas_Object *obj, int r, int g, int b, int a)
|
||||
static void
|
||||
_e_smart_color_set(Evas_Object *obj, int r, int g, int b, int a)
|
||||
{
|
||||
INTERNAL_ENTRY;
|
||||
evas_object_color_set(sd->o_box, r, g, b, a);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_smart_clip_set(Evas_Object *obj, Evas_Object *clip)
|
||||
static void
|
||||
_e_smart_clip_set(Evas_Object *obj, Evas_Object *clip)
|
||||
{
|
||||
INTERNAL_ENTRY;
|
||||
evas_object_clip_set(sd->o_box, clip);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_smart_clip_unset(Evas_Object *obj)
|
||||
static void
|
||||
_e_smart_clip_unset(Evas_Object *obj)
|
||||
{
|
||||
INTERNAL_ENTRY;
|
||||
evas_object_clip_unset(sd->o_box);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_smart_reconfigure(E_Smart_Data *sd)
|
||||
static void
|
||||
_e_smart_reconfigure(E_Smart_Data *sd)
|
||||
{
|
||||
evas_object_move(sd->o_box, sd->x, sd->y);
|
||||
evas_object_resize(sd->o_box, sd->w, sd->h);
|
||||
|
@ -1106,17 +1106,17 @@ _e_smart_event_mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UN
|
|||
i = 0;
|
||||
EINA_LIST_FOREACH(sd->items, l, item)
|
||||
{
|
||||
if (item == si)
|
||||
if (item == si)
|
||||
{
|
||||
if (!sd->multi_select)
|
||||
e_ilist_selected_set(sd->o_smart, i);
|
||||
else
|
||||
else
|
||||
{
|
||||
if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
|
||||
e_ilist_range_select(sd->o_smart, i);
|
||||
else if (evas_key_modifier_is_set(ev->modifiers, "Control"))
|
||||
e_ilist_multi_select(sd->o_smart, i);
|
||||
else
|
||||
else
|
||||
e_ilist_selected_set(sd->o_smart, i);
|
||||
}
|
||||
break;
|
||||
|
@ -1125,12 +1125,12 @@ _e_smart_event_mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UN
|
|||
}
|
||||
|
||||
if(!sd->selector) return;
|
||||
if (!(si = eina_list_nth(sd->items, sd->selected))) return;
|
||||
if (!(si = eina_list_nth(sd->items, sd->selected))) return;
|
||||
if (si->func) si->func(si->data, si->data2);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info)
|
||||
static void
|
||||
_e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info)
|
||||
{
|
||||
Evas_Event_Key_Down *ev;
|
||||
E_Smart_Data *sd;
|
||||
|
@ -1158,7 +1158,7 @@ _e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, voi
|
|||
si = eina_list_nth(sd->items, n);
|
||||
}
|
||||
while ((si) && (si->header));
|
||||
if (n != ns)
|
||||
if (n != ns)
|
||||
{
|
||||
if (!sd->multi_select)
|
||||
e_ilist_selected_set(sd->o_smart, n);
|
||||
|
@ -1166,7 +1166,7 @@ _e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, voi
|
|||
e_ilist_multi_select(sd->o_smart, n);
|
||||
else if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
|
||||
e_ilist_range_select(sd->o_smart, n);
|
||||
else
|
||||
else
|
||||
e_ilist_selected_set(sd->o_smart, n);
|
||||
}
|
||||
}
|
||||
|
@ -1184,7 +1184,7 @@ _e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, voi
|
|||
si = eina_list_nth(sd->items, n);
|
||||
}
|
||||
while ((si) && (si->header));
|
||||
if (n != ns)
|
||||
if (n != ns)
|
||||
{
|
||||
if (!sd->multi_select)
|
||||
e_ilist_selected_set(sd->o_smart, n);
|
||||
|
@ -1192,7 +1192,7 @@ _e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, voi
|
|||
e_ilist_multi_select(sd->o_smart, n);
|
||||
else if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
|
||||
e_ilist_range_select(sd->o_smart, n);
|
||||
else
|
||||
else
|
||||
e_ilist_selected_set(sd->o_smart, n);
|
||||
}
|
||||
}
|
||||
|
@ -1210,7 +1210,7 @@ _e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, voi
|
|||
si = eina_list_nth(sd->items, n);
|
||||
}
|
||||
while ((si) && (si->header));
|
||||
if (n != ns)
|
||||
if (n != ns)
|
||||
{
|
||||
if (!sd->multi_select)
|
||||
e_ilist_selected_set(sd->o_smart, n);
|
||||
|
@ -1218,7 +1218,7 @@ _e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, voi
|
|||
e_ilist_multi_select(sd->o_smart, n);
|
||||
else if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
|
||||
e_ilist_range_select(sd->o_smart, n);
|
||||
else
|
||||
else
|
||||
e_ilist_selected_set(sd->o_smart, n);
|
||||
}
|
||||
}
|
||||
|
@ -1236,7 +1236,7 @@ _e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, voi
|
|||
si = eina_list_nth(sd->items, n);
|
||||
}
|
||||
while ((si) && (si->header));
|
||||
if (n != ns)
|
||||
if (n != ns)
|
||||
{
|
||||
if (!sd->multi_select)
|
||||
e_ilist_selected_set(sd->o_smart, n);
|
||||
|
@ -1244,7 +1244,7 @@ _e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, voi
|
|||
e_ilist_multi_select(sd->o_smart, n);
|
||||
else if (evas_key_modifier_is_set(ev->modifiers, "Shift"))
|
||||
e_ilist_range_select(sd->o_smart, n);
|
||||
else
|
||||
else
|
||||
e_ilist_selected_set(sd->o_smart, n);
|
||||
}
|
||||
}
|
||||
|
@ -1260,7 +1260,7 @@ _e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, voi
|
|||
if (si->func) si->func(si->data, si->data2);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (!strcmp(ev->keyname, "Escape"))
|
||||
_e_typebuf_clean(obj);
|
||||
else if (strcmp(ev->keyname, "BackSpace") && strcmp(ev->keyname, "Tab") && ev->string)
|
||||
|
@ -1269,7 +1269,7 @@ _e_smart_event_key_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj, voi
|
|||
sd->on_hold = 0;
|
||||
}
|
||||
|
||||
static void
|
||||
static void
|
||||
_e_typebuf_add(Evas_Object *obj, const char *s)
|
||||
{
|
||||
int len;
|
||||
|
@ -1332,11 +1332,11 @@ _e_typebuf_match(Evas_Object *obj)
|
|||
{
|
||||
const char *label = NULL;
|
||||
|
||||
if (si)
|
||||
if (si)
|
||||
{
|
||||
if (si->label)
|
||||
if (si->label)
|
||||
label = si->label;
|
||||
else
|
||||
else
|
||||
label = edje_object_part_text_get(si->o_base, "e.text.label");
|
||||
|
||||
if (e_util_glob_case_match(label, match))
|
||||
|
@ -1364,7 +1364,7 @@ static void
|
|||
_e_typebuf_timer_update(Evas_Object *obj)
|
||||
{
|
||||
INTERNAL_ENTRY;
|
||||
|
||||
|
||||
if (sd->typebuf.timer)
|
||||
ecore_timer_del(sd->typebuf.timer);
|
||||
|
||||
|
@ -1383,7 +1383,7 @@ _e_typebuf_timer_delete(Evas_Object *obj)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
static void
|
||||
_e_typebuf_clean(Evas_Object *obj)
|
||||
{
|
||||
INTERNAL_ENTRY;
|
||||
|
|
|
@ -6,7 +6,7 @@ typedef struct _E_Ilist_Item E_Ilist_Item;
|
|||
#ifndef E_ILIST_H
|
||||
#define E_ILIST_H
|
||||
|
||||
struct _E_Ilist_Item
|
||||
struct _E_Ilist_Item
|
||||
{
|
||||
void *sd;
|
||||
const char *label;
|
||||
|
|
|
@ -13,7 +13,7 @@ main(int argc, char **argv)
|
|||
Eet_File *ef = NULL;
|
||||
E_Input_Method_Config *write_imc = NULL;
|
||||
E_Input_Method_Config *read_imc = NULL;
|
||||
|
||||
|
||||
char *file = NULL;
|
||||
char *set_name = NULL;
|
||||
char *set_exe = NULL;
|
||||
|
@ -107,7 +107,7 @@ main(int argc, char **argv)
|
|||
|
||||
eet_init();
|
||||
e_intl_data_init();
|
||||
|
||||
|
||||
if (write_ops != 0 && ecore_file_exists(file))
|
||||
{
|
||||
ef = eet_open(file, EET_FILE_MODE_READ_WRITE);
|
||||
|
@ -120,17 +120,17 @@ main(int argc, char **argv)
|
|||
{
|
||||
ef = eet_open(file, EET_FILE_MODE_READ);
|
||||
}
|
||||
|
||||
|
||||
if (!ef)
|
||||
{
|
||||
printf("ERROR: cannot open file %s for READ/WRITE (%i:%s)\n",
|
||||
printf("ERROR: cannot open file %s for READ/WRITE (%i:%s)\n",
|
||||
file, errno, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* If File Exists, Try to read imc */
|
||||
read_imc = e_intl_input_method_config_read(ef);
|
||||
|
||||
|
||||
/* else create new imc */
|
||||
if (write_ops != 0)
|
||||
{
|
||||
|
@ -146,23 +146,23 @@ main(int argc, char **argv)
|
|||
write_imc->e_im_exec = read_imc->e_im_exec;
|
||||
write_imc->e_im_setup_exec = read_imc->e_im_setup_exec;
|
||||
}
|
||||
|
||||
if (set_name)
|
||||
write_imc->e_im_name = set_name;
|
||||
if (set_gtk_im_module)
|
||||
write_imc->gtk_im_module = set_gtk_im_module;
|
||||
if (set_qt_im_module)
|
||||
|
||||
if (set_name)
|
||||
write_imc->e_im_name = set_name;
|
||||
if (set_gtk_im_module)
|
||||
write_imc->gtk_im_module = set_gtk_im_module;
|
||||
if (set_qt_im_module)
|
||||
write_imc->qt_im_module = set_qt_im_module;
|
||||
if (set_xmodifiers)
|
||||
if (set_xmodifiers)
|
||||
write_imc->xmodifiers = set_xmodifiers;
|
||||
if (set_ecore_imf_module)
|
||||
if (set_ecore_imf_module)
|
||||
write_imc->ecore_imf_module = set_ecore_imf_module;
|
||||
if (set_exe)
|
||||
write_imc->e_im_exec = set_exe;
|
||||
if (set_setup)
|
||||
write_imc->e_im_setup_exec = set_setup;
|
||||
|
||||
|
||||
|
||||
/* write imc to file */
|
||||
e_intl_input_method_config_write(ef, write_imc);
|
||||
}
|
||||
|
@ -180,9 +180,9 @@ main(int argc, char **argv)
|
|||
printf("xmodifiers: %s\n", read_imc->xmodifiers);
|
||||
printf("ecore_imf_module: %s\n", read_imc->ecore_imf_module);
|
||||
}
|
||||
|
||||
|
||||
e_intl_input_method_config_free(read_imc);
|
||||
E_FREE(write_imc);
|
||||
E_FREE(write_imc);
|
||||
eet_close(ef);
|
||||
e_intl_data_shutdown();
|
||||
eet_shutdown();
|
||||
|
|
|
@ -20,7 +20,7 @@ EINTERN int
|
|||
e_init_init(void)
|
||||
{
|
||||
E_EVENT_INIT_DONE = ecore_event_type_new();
|
||||
exe_del_handler =
|
||||
exe_del_handler =
|
||||
ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
|
||||
_e_init_cb_exe_event_del, NULL);
|
||||
client = NULL;
|
||||
|
@ -67,7 +67,7 @@ e_init_show(void)
|
|||
if (version) ver = strdup(e_util_filename_escape(version));
|
||||
else ver = strdup("XvX");
|
||||
|
||||
snprintf(buf, sizeof(buf),
|
||||
snprintf(buf, sizeof(buf),
|
||||
"%s/enlightenment/utils/enlightenment_init \'%s\' \'%i\' \'%s\' \'%s\'",
|
||||
e_prefix_lib_get(), theme,
|
||||
e_config->font_hinting, tit, ver);
|
||||
|
|
|
@ -95,7 +95,7 @@ main(int argc, char **argv)
|
|||
|
||||
for (i = 1; i < argc; i++)
|
||||
{
|
||||
if ((i == 1) &&
|
||||
if ((i == 1) &&
|
||||
((!strcmp(argv[i], "-h")) ||
|
||||
(!strcmp(argv[i], "-help")) ||
|
||||
(!strcmp(argv[i], "--help"))))
|
||||
|
@ -252,8 +252,8 @@ e_init_init(void)
|
|||
|
||||
e_xinerama_init();
|
||||
|
||||
_e_init_configure_handler =
|
||||
ecore_event_handler_add(ECORE_X_EVENT_WINDOW_CONFIGURE,
|
||||
_e_init_configure_handler =
|
||||
ecore_event_handler_add(ECORE_X_EVENT_WINDOW_CONFIGURE,
|
||||
_e_init_cb_window_configure, NULL);
|
||||
|
||||
num = 0;
|
||||
|
@ -320,7 +320,7 @@ e_init_init(void)
|
|||
evas_object_show(o);
|
||||
}
|
||||
|
||||
edje_object_part_text_set(_e_init_object, "e.text.disable_text",
|
||||
edje_object_part_text_set(_e_init_object, "e.text.disable_text",
|
||||
"Disable splash screen");
|
||||
edje_object_signal_callback_add(_e_init_object, "e,action,init,disable", "e",
|
||||
_e_init_cb_signal_disable, NULL);
|
||||
|
@ -337,7 +337,7 @@ e_init_init(void)
|
|||
EINTERN int
|
||||
e_init_shutdown(void)
|
||||
{
|
||||
if (_e_init_configure_handler)
|
||||
if (_e_init_configure_handler)
|
||||
ecore_event_handler_del(_e_init_configure_handler);
|
||||
_e_init_configure_handler = NULL;
|
||||
e_init_hide();
|
||||
|
@ -473,7 +473,7 @@ _e_init_evas_new(Ecore_X_Window root, int w, int h, Ecore_X_Window *winret)
|
|||
evas_image_cache_set(e, 4096 * 1024);
|
||||
evas_font_cache_set(e, 512 * 1024);
|
||||
|
||||
EINA_LIST_FOREACH(fpath, l, path)
|
||||
EINA_LIST_FOREACH(fpath, l, path)
|
||||
evas_font_path_append(e, path);
|
||||
|
||||
if (font_hinting == 0)
|
||||
|
|
|
@ -36,7 +36,7 @@ struct _E_Config_Dialog_Data
|
|||
int focus_in; /* unused atm */
|
||||
int focus_out; /* unused atm */
|
||||
int life;
|
||||
|
||||
|
||||
int remember;
|
||||
} lock;
|
||||
};
|
||||
|
@ -47,7 +47,7 @@ e_int_border_locks(E_Border *bd)
|
|||
{
|
||||
E_Config_Dialog *cfd;
|
||||
E_Config_Dialog_View *v;
|
||||
|
||||
|
||||
v = E_NEW(E_Config_Dialog_View, 1);
|
||||
if (v)
|
||||
{
|
||||
|
@ -98,7 +98,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
|
|||
if ((cfdata->border->remember) &&
|
||||
(cfdata->border->remember->apply & E_REMEMBER_APPLY_LOCKS))
|
||||
cfdata->lock.remember = 1;
|
||||
|
||||
|
||||
/* figure out basic config from the current locks */
|
||||
if (cfdata->lock.user.location || cfdata->lock.user.size ||
|
||||
cfdata->lock.user.stacking || cfdata->lock.user.iconify ||
|
||||
|
@ -127,7 +127,7 @@ _create_data(E_Config_Dialog *cfd)
|
|||
* the running systems/config in the apply methods
|
||||
*/
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
|
||||
cfdata = E_NEW(E_Config_Dialog_Data, 1);
|
||||
cfdata->border = cfd->data;
|
||||
_fill_data(cfdata);
|
||||
|
@ -148,7 +148,7 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
|||
{
|
||||
int flag;
|
||||
/* Actually take our cfdata settings and apply them in real life */
|
||||
|
||||
|
||||
flag = cfdata->do_what_i_say;
|
||||
cfdata->border->lock_client_location = flag;
|
||||
cfdata->border->lock_client_size = flag;
|
||||
|
@ -174,10 +174,10 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
|||
flag = cfdata->important_window;
|
||||
cfdata->border->lock_close = flag;
|
||||
cfdata->border->lock_life = flag;
|
||||
|
||||
|
||||
flag = cfdata->keep_my_border;
|
||||
cfdata->border->lock_border = flag;
|
||||
|
||||
|
||||
if (cfdata->remember_locks)
|
||||
{
|
||||
if (!cfdata->border->remember)
|
||||
|
@ -276,9 +276,9 @@ _basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dial
|
|||
{
|
||||
/* generate the core widget layout for a basic dialog */
|
||||
Evas_Object *o, *ob, *of;
|
||||
|
||||
|
||||
o = e_widget_list_add(evas, 0, 0);
|
||||
|
||||
|
||||
of = e_widget_framelist_add(evas, _("Generic Locks"), 0);
|
||||
ob = e_widget_check_add(evas, _("Lock the Window so it does only what I tell it to"), &(cfdata->do_what_i_say));
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
|
@ -299,9 +299,9 @@ _advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_D
|
|||
{
|
||||
/* generate the core widget layout for an advanced dialog */
|
||||
Evas_Object *o, *ob, *of;
|
||||
|
||||
|
||||
o = e_widget_list_add(evas, 0, 0);
|
||||
|
||||
|
||||
of = e_widget_frametable_add(evas, _("Lock program changing:"), 0);
|
||||
ob = e_widget_check_add(evas, _("Position"), &(cfdata->lock.client.location));
|
||||
e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
|
||||
|
@ -341,16 +341,16 @@ _advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_D
|
|||
ob = e_widget_check_add(evas, _("Border style"), &(cfdata->lock.border));
|
||||
e_widget_frametable_object_append(of, ob, 1, 3, 1, 1, 1, 1, 1, 1);
|
||||
e_widget_list_object_append(o, of, 1, 1, 0.5);
|
||||
|
||||
|
||||
of = e_widget_framelist_add(evas, _("Stop me from:"), 0);
|
||||
ob = e_widget_check_add(evas, _("Closing the window"), &(cfdata->lock.close));
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
ob = e_widget_check_add(evas, _("Exiting my login with this window open"), &(cfdata->lock.life));
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
e_widget_list_object_append(o, of, 1, 1, 0.5);
|
||||
|
||||
|
||||
ob = e_widget_check_add(evas, _("Remember these Locks"), &(cfdata->lock.remember));
|
||||
e_widget_list_object_append(o, ob, 1, 1, 0.5);
|
||||
|
||||
|
||||
return o;
|
||||
}
|
||||
|
|
|
@ -89,7 +89,7 @@ e_int_border_menu_create(E_Border *bd)
|
|||
mi = e_menu_item_new(m);
|
||||
e_menu_item_separator_set(mi, 1);
|
||||
|
||||
if ((!bd->sticky) && ((bd->zone->desk_x_count > 1) || (bd->zone->desk_y_count > 1)))
|
||||
if ((!bd->sticky) && ((bd->zone->desk_x_count > 1) || (bd->zone->desk_y_count > 1)))
|
||||
{
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_label_set(mi, _("Move to"));
|
||||
|
@ -146,7 +146,7 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_
|
|||
{
|
||||
e_int_border_menu_create(bd);
|
||||
if (key)
|
||||
e_menu_activate_key(bd->border_menu, bd->zone, x, y, 1, 1,
|
||||
e_menu_activate_key(bd->border_menu, bd->zone, x, y, 1, 1,
|
||||
E_MENU_POP_DIRECTION_DOWN);
|
||||
else
|
||||
e_menu_activate_mouse(bd->border_menu, bd->zone, x, y, 1, 1,
|
||||
|
@ -449,7 +449,7 @@ _e_border_menu_cb_application_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item
|
|||
e_menu_item_callback_set(submi, _e_border_menu_cb_icon_edit, bd);
|
||||
e_util_desktop_menu_item_icon_add(bd->desktop, 16, submi);
|
||||
}
|
||||
else if (bd->client.icccm.class)
|
||||
else if (bd->client.icccm.class)
|
||||
{
|
||||
/* icons with no class useless to borders */
|
||||
submi = e_menu_item_new(subm);
|
||||
|
@ -467,7 +467,7 @@ _e_border_menu_cb_application_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item
|
|||
|
||||
submi = e_menu_item_new(subm);
|
||||
e_menu_item_label_set(submi, _("Add to IBar"));
|
||||
e_menu_item_submenu_pre_callback_set(submi,
|
||||
e_menu_item_submenu_pre_callback_set(submi,
|
||||
_e_border_menu_cb_ibar_add_pre, bd);
|
||||
e_util_menu_item_theme_icon_set(submi, "preferences-applications-ibar");
|
||||
|
||||
|
@ -589,7 +589,7 @@ _e_border_menu_cb_placement_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *m
|
|||
e_object_data_set(E_OBJECT(subm), bd);
|
||||
e_menu_item_submenu_set(mi, subm);
|
||||
|
||||
if ((!bd->sticky) && ((bd->zone->desk_x_count > 1) || (bd->zone->desk_y_count > 1)))
|
||||
if ((!bd->sticky) && ((bd->zone->desk_x_count > 1) || (bd->zone->desk_y_count > 1)))
|
||||
{
|
||||
submi = e_menu_item_new(subm);
|
||||
e_menu_item_label_set(submi, _("Move to"));
|
||||
|
@ -815,8 +815,8 @@ _e_border_menu_cb_skip_taskbar(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi
|
|||
e_remember_update(bd);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_border_menu_cb_sendto_icon_pre(void *data, E_Menu *m, E_Menu_Item *mi)
|
||||
static void
|
||||
_e_border_menu_cb_sendto_icon_pre(void *data, E_Menu *m, E_Menu_Item *mi)
|
||||
{
|
||||
E_Desk *desk = NULL;
|
||||
Evas_Object *o = NULL;
|
||||
|
@ -828,7 +828,7 @@ _e_border_menu_cb_sendto_icon_pre(void *data, E_Menu *m, E_Menu_Item *mi)
|
|||
|
||||
tw = 50;
|
||||
th = (tw * desk->zone->h) / desk->zone->w;
|
||||
bgfile = e_bg_file_get(desk->zone->container->num, desk->zone->num,
|
||||
bgfile = e_bg_file_get(desk->zone->container->num, desk->zone->num,
|
||||
desk->x, desk->y);
|
||||
o = e_thumb_icon_add(m->evas);
|
||||
e_thumb_icon_file_set(o, bgfile, "e/desktop/background");
|
||||
|
@ -866,7 +866,7 @@ _e_border_menu_cb_sendto_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
|
|||
e_menu_item_label_set(submi, buf);
|
||||
e_menu_item_disabled_set(submi, EINA_TRUE);
|
||||
}
|
||||
|
||||
|
||||
// FIXME: Remove labels and add deskpreview to menu.
|
||||
// Evas_Object *o = e_widget_deskpreview_add(m->evas, 4, 2);
|
||||
|
||||
|
@ -883,7 +883,7 @@ _e_border_menu_cb_sendto_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi)
|
|||
e_menu_item_toggle_set(submi, 1);
|
||||
else
|
||||
e_menu_item_callback_set(submi, _e_border_menu_cb_sendto, desk);
|
||||
e_menu_item_realize_callback_set(submi, _e_border_menu_cb_sendto_icon_pre,
|
||||
e_menu_item_realize_callback_set(submi, _e_border_menu_cb_sendto_icon_pre,
|
||||
desk);
|
||||
}
|
||||
}
|
||||
|
@ -975,7 +975,7 @@ _e_border_menu_cb_stacking_pre(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi
|
|||
submi = e_menu_item_new(subm);
|
||||
e_menu_item_separator_set(submi, 1);
|
||||
|
||||
// Only allow to change layer for windows in "normal" layers
|
||||
// Only allow to change layer for windows in "normal" layers
|
||||
if ((!bd->lock_user_stacking) &&
|
||||
((bd->layer == 50) || (bd->layer == 100) || (bd->layer == 150)))
|
||||
{
|
||||
|
|
|
@ -25,7 +25,7 @@ struct _E_Config_Dialog_Data
|
|||
char *icon_name;
|
||||
char *machine;
|
||||
char *role;
|
||||
|
||||
|
||||
char *min;
|
||||
char *max;
|
||||
char *base;
|
||||
|
@ -40,15 +40,15 @@ struct _E_Config_Dialog_Data
|
|||
char *client_leader;
|
||||
char *gravity;
|
||||
char *command;
|
||||
|
||||
|
||||
int take_focus;
|
||||
int accepts_focus;
|
||||
int urgent;
|
||||
int delete_request;
|
||||
int request_pos;
|
||||
} icccm;
|
||||
|
||||
struct
|
||||
|
||||
struct
|
||||
{
|
||||
char *name;
|
||||
char *icon_name;
|
||||
|
@ -64,12 +64,12 @@ struct _E_Config_Dialog_Data
|
|||
};
|
||||
|
||||
EAPI void
|
||||
e_int_border_prop(E_Border *bd)
|
||||
e_int_border_prop(E_Border *bd)
|
||||
{
|
||||
E_Dialog *dia;
|
||||
|
||||
if (bd->border_prop_dialog) return;
|
||||
|
||||
|
||||
dia = e_dialog_new(bd->zone->container, "E", "_window_props");
|
||||
e_object_del_attach_func_set(E_OBJECT(dia), _bd_cb_dialog_del);
|
||||
e_dialog_title_set(dia, _("Window Properties"));
|
||||
|
@ -77,7 +77,7 @@ e_int_border_prop(E_Border *bd)
|
|||
_create_data(dia, bd);
|
||||
|
||||
_bd_go(dia, (void *)0);
|
||||
|
||||
|
||||
e_dialog_button_add(dia, _("Close"), NULL, _bd_cb_dialog_close, dia);
|
||||
e_win_centered_set(dia->win, 1);
|
||||
e_dialog_show(dia);
|
||||
|
@ -90,11 +90,11 @@ _create_data(E_Dialog *cfd, E_Border *bd)
|
|||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
char buf[4096];
|
||||
|
||||
|
||||
cfdata = E_NEW(E_Config_Dialog_Data, 1);
|
||||
cfdata->border = bd;
|
||||
bd->border_prop_dialog = cfd;
|
||||
|
||||
|
||||
#define IFDUP(prop, dest) \
|
||||
if (cfdata->border->prop) cfdata->dest = strdup(cfdata->border->prop)
|
||||
|
||||
|
@ -243,11 +243,11 @@ _create_data(E_Dialog *cfd, E_Border *bd)
|
|||
if (cfdata->border->client.icccm.command.argv)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
||||
buf[0] = 0;
|
||||
for (i = 0; i < cfdata->border->client.icccm.command.argc; i++)
|
||||
{
|
||||
if ((sizeof(buf) - strlen(buf)) <
|
||||
if ((sizeof(buf) - strlen(buf)) <
|
||||
(strlen(cfdata->border->client.icccm.command.argv[i]) - 2))
|
||||
break;
|
||||
strcat(buf, cfdata->border->client.icccm.command.argv[i]);
|
||||
|
@ -255,7 +255,7 @@ _create_data(E_Dialog *cfd, E_Border *bd)
|
|||
}
|
||||
cfdata->icccm.command = strdup(buf);
|
||||
}
|
||||
|
||||
|
||||
cfdata->icccm.take_focus = cfdata->border->client.icccm.take_focus;
|
||||
cfdata->icccm.accepts_focus = cfdata->border->client.icccm.accepts_focus;
|
||||
cfdata->icccm.urgent = cfdata->border->client.icccm.urgent;
|
||||
|
@ -271,19 +271,19 @@ _create_data(E_Dialog *cfd, E_Border *bd)
|
|||
cfdata->netwm.skip_pager = cfdata->border->client.netwm.state.skip_pager;
|
||||
cfdata->netwm.hidden = cfdata->border->client.netwm.state.hidden;
|
||||
cfdata->netwm.fullscreen = cfdata->border->client.netwm.state.fullscreen;
|
||||
switch (cfdata->border->client.netwm.state.stacking)
|
||||
switch (cfdata->border->client.netwm.state.stacking)
|
||||
{
|
||||
case 0:
|
||||
cfdata->netwm.stacking = strdup("None");
|
||||
break;
|
||||
case 1:
|
||||
cfdata->netwm.stacking = strdup("Above");
|
||||
cfdata->netwm.stacking = strdup("Above");
|
||||
break;
|
||||
case 2:
|
||||
cfdata->netwm.stacking = strdup("Below");
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
cfd->data = cfdata;
|
||||
}
|
||||
|
||||
|
@ -292,7 +292,7 @@ _free_data(E_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
{
|
||||
if (cfdata->border)
|
||||
cfdata->border->border_prop_dialog = NULL;
|
||||
|
||||
|
||||
/* Free the cfdata */
|
||||
#define IFREE(x) E_FREE(cfdata->x)
|
||||
IFREE(icccm.title);
|
||||
|
@ -314,65 +314,65 @@ _free_data(E_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
IFREE(icccm.client_leader);
|
||||
IFREE(icccm.gravity);
|
||||
IFREE(icccm.command);
|
||||
|
||||
|
||||
IFREE(netwm.name);
|
||||
IFREE(netwm.icon_name);
|
||||
IFREE(netwm.stacking);
|
||||
|
||||
|
||||
free(cfdata);
|
||||
cfd->data = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
_bd_cb_dialog_del(void *obj)
|
||||
static void
|
||||
_bd_cb_dialog_del(void *obj)
|
||||
{
|
||||
E_Dialog *dia;
|
||||
|
||||
|
||||
dia = obj;
|
||||
if (dia->data)
|
||||
_free_data(dia, dia->data);
|
||||
}
|
||||
|
||||
static void
|
||||
_bd_cb_dialog_close(void *data __UNUSED__, E_Dialog *dia)
|
||||
static void
|
||||
_bd_cb_dialog_close(void *data __UNUSED__, E_Dialog *dia)
|
||||
{
|
||||
if (dia->data)
|
||||
_free_data(dia, dia->data);
|
||||
e_object_del(E_OBJECT(dia));
|
||||
}
|
||||
|
||||
static void
|
||||
_bd_go(void *data, void *data2)
|
||||
static void
|
||||
_bd_go(void *data, void *data2)
|
||||
{
|
||||
E_Dialog *dia;
|
||||
Evas_Object *c, *o, *ob;
|
||||
Evas_Coord w, h;
|
||||
|
||||
|
||||
dia = data;
|
||||
if (!dia) return;
|
||||
|
||||
if (dia->content_object)
|
||||
evas_object_del(dia->content_object);
|
||||
|
||||
|
||||
c = e_widget_list_add(e_win_evas_get(dia->win), 0, 0);
|
||||
|
||||
if (!data2)
|
||||
|
||||
if (!data2)
|
||||
{
|
||||
o = _bd_icccm_create(dia, NULL);
|
||||
e_widget_list_object_append(c, o, 1, 1, 0.0);
|
||||
ob = e_widget_button_add(e_win_evas_get(dia->win), _("NetWM"), "go-next",
|
||||
_bd_go, dia, (void *)1);
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
o = _bd_netwm_create(dia, NULL);
|
||||
e_widget_list_object_append(c, o, 1, 1, 0.0);
|
||||
ob = e_widget_button_add(e_win_evas_get(dia->win), _("ICCCM"), "go-next",
|
||||
_bd_go, dia, (void *)0);
|
||||
}
|
||||
|
||||
|
||||
e_widget_list_object_append(c, ob, 0, 0, 1.0);
|
||||
|
||||
|
||||
e_widget_size_min_get(c, &w, &h);
|
||||
e_dialog_content_set(dia, c, w, h);
|
||||
e_dialog_show(dia);
|
||||
|
@ -401,7 +401,7 @@ _bd_go(void *data, void *data2)
|
|||
}
|
||||
|
||||
static Evas_Object *
|
||||
_bd_icccm_create(E_Dialog *dia, void *data __UNUSED__)
|
||||
_bd_icccm_create(E_Dialog *dia, void *data __UNUSED__)
|
||||
{
|
||||
Evas *evas;
|
||||
Evas_Object *o, *ob, *of;
|
||||
|
@ -409,10 +409,10 @@ _bd_icccm_create(E_Dialog *dia, void *data __UNUSED__)
|
|||
|
||||
if (!dia) return NULL;
|
||||
cfdata = dia->data;
|
||||
|
||||
|
||||
if (dia->content_object)
|
||||
evas_object_del(dia->content_object);
|
||||
|
||||
|
||||
evas = e_win_evas_get(dia->win);
|
||||
o = e_widget_list_add(evas, 0, 0);
|
||||
of = e_widget_frametable_add(evas, _("ICCCM Properties"), 0);
|
||||
|
@ -422,7 +422,7 @@ _bd_icccm_create(E_Dialog *dia, void *data __UNUSED__)
|
|||
STR_ENTRY(_("Icon Name"), 0, 3, icccm.icon_name);
|
||||
STR_ENTRY(_("Machine"), 0, 4, icccm.machine);
|
||||
STR_ENTRY(_("Role"), 0, 5, icccm.role);
|
||||
|
||||
|
||||
STR_ENTRY(_("Minimum Size"), 0, 6, icccm.min);
|
||||
STR_ENTRY(_("Maximum Size"), 0, 7, icccm.max);
|
||||
STR_ENTRY(_("Base Size"), 0, 8, icccm.base);
|
||||
|
@ -443,24 +443,24 @@ _bd_icccm_create(E_Dialog *dia, void *data __UNUSED__)
|
|||
CHK_ENTRY(_("Urgent"), 0, 13, icccm.urgent);
|
||||
CHK_ENTRY(_("Request Delete"), 2, 11, icccm.delete_request);
|
||||
CHK_ENTRY(_("Request Position"), 2, 12, icccm.request_pos);
|
||||
|
||||
|
||||
e_widget_list_object_append(o, of, 1, 1, 0.0);
|
||||
return o;
|
||||
}
|
||||
|
||||
static Evas_Object *
|
||||
_bd_netwm_create(E_Dialog *dia, void *data __UNUSED__)
|
||||
_bd_netwm_create(E_Dialog *dia, void *data __UNUSED__)
|
||||
{
|
||||
Evas *evas;
|
||||
Evas_Object *o, *of, *ob;
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
|
||||
if (!dia) return NULL;
|
||||
cfdata = dia->data;
|
||||
|
||||
if (dia->content_object)
|
||||
evas_object_del(dia->content_object);
|
||||
|
||||
|
||||
evas = e_win_evas_get(dia->win);
|
||||
o = e_widget_list_add(evas, 0, 0);
|
||||
of = e_widget_frametable_add(evas, _("NetWM Properties"), 0);
|
||||
|
@ -475,7 +475,7 @@ _bd_netwm_create(E_Dialog *dia, void *data __UNUSED__)
|
|||
CHK_ENTRY(_("Skip Pager"), 0, 8, netwm.skip_pager);
|
||||
CHK_ENTRY(_("Hidden"), 0, 9, netwm.hidden);
|
||||
CHK_ENTRY(_("Fullscreen"), 0, 10, netwm.fullscreen);
|
||||
|
||||
|
||||
e_widget_list_object_append(o, of, 1, 1, 0.0);
|
||||
return o;
|
||||
}
|
||||
|
|
|
@ -131,7 +131,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
|
|||
{
|
||||
const char *title = e_border_name_get(bd);
|
||||
if (title && title[0])
|
||||
cfdata->title = strdup(title);
|
||||
cfdata->title = strdup(title);
|
||||
}
|
||||
if (!cfdata->desktop && bd->desktop)
|
||||
cfdata->desktop = strdup(bd->desktop->name);
|
||||
|
@ -183,7 +183,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
|
|||
{
|
||||
if (rem->apply_first_only) cfdata->remember.apply_first_only = 1;
|
||||
if (rem->keep_settings) cfdata->remember.keep_settings = 1;
|
||||
|
||||
|
||||
if (rem->match & E_REMEMBER_MATCH_NAME)
|
||||
cfdata->remember.match_name = 1;
|
||||
if (rem->match & E_REMEMBER_MATCH_CLASS)
|
||||
|
@ -383,7 +383,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
/* Actually take our cfdata settings and apply them in real life */
|
||||
E_Border *bd = cfdata->border;
|
||||
E_Remember *rem = bd->remember;;
|
||||
|
||||
|
||||
if (cfdata->mode == MODE_NOTHING)
|
||||
{
|
||||
if (rem)
|
||||
|
@ -406,7 +406,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
e_remember_default_match_set(rem, cfdata->border);
|
||||
|
||||
if ((!cfdata->warned) && (_check_matches(rem, 0) > 1))
|
||||
|
@ -415,7 +415,7 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
cfdata->warned = 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
if (cfdata->mode == MODE_GEOMETRY)
|
||||
rem->apply = E_REMEMBER_APPLY_POS | E_REMEMBER_APPLY_SIZE;
|
||||
else if (cfdata->mode == MODE_LOCKS)
|
||||
|
@ -469,7 +469,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
rem->prop.command = NULL;
|
||||
rem->prop.desktop_file = NULL;
|
||||
}
|
||||
|
||||
|
||||
rem->match = 0;
|
||||
rem->apply_first_only = cfdata->remember.apply_first_only;
|
||||
|
||||
|
@ -498,7 +498,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
rem->match |= E_REMEMBER_MATCH_TYPE;
|
||||
rem->type = bd->client.netwm.type;
|
||||
}
|
||||
|
||||
|
||||
if (cfdata->remember.match_transient)
|
||||
{
|
||||
rem->match |= E_REMEMBER_MATCH_TRANSIENT;
|
||||
|
@ -542,7 +542,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (cfdata->command && cfdata->command[0])
|
||||
rem->prop.command = eina_stringshare_add(cfdata->command);
|
||||
if (cfdata->remember.apply_desktop_file && cfdata->desktop)
|
||||
|
@ -583,14 +583,14 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
rem->apply |= E_REMEMBER_SET_FOCUS_ON_START;
|
||||
if (cfdata->remember.offer_resistance)
|
||||
rem->apply |= E_REMEMBER_APPLY_OFFER_RESISTANCE;
|
||||
|
||||
|
||||
if (!rem->apply && !rem->prop.desktop_file)
|
||||
{
|
||||
e_remember_unuse(rem);
|
||||
e_remember_del(rem);
|
||||
if (cfdata->border->remember)
|
||||
e_config_save_queue();
|
||||
return 1;
|
||||
return 1;
|
||||
}
|
||||
|
||||
_check_matches(rem, 1);
|
||||
|
|
|
@ -31,7 +31,7 @@ struct _E_Config_Dialog_Data
|
|||
Evas_Object *b_load, *b_unload;
|
||||
Evas_Object *o_desc;
|
||||
Eina_List *types;
|
||||
struct
|
||||
struct
|
||||
{
|
||||
Eina_List *loaded, *unloaded;
|
||||
Ecore_Idler *idler;
|
||||
|
@ -95,8 +95,8 @@ e_int_config_modules(E_Container *con, const char *params __UNUSED__)
|
|||
v->free_cfdata = _free_data;
|
||||
v->basic.create_widgets = _basic_create;
|
||||
|
||||
cfd = e_config_dialog_new(con, _("Module Settings"),
|
||||
"E", "_config_modules_dialog",
|
||||
cfd = e_config_dialog_new(con, _("Module Settings"),
|
||||
"E", "_config_modules_dialog",
|
||||
"preferences-plugin", 0, v, NULL);
|
||||
return cfd;
|
||||
}
|
||||
|
@ -169,7 +169,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
|||
if (mw < (200 * e_scale)) mw = 200 * e_scale;
|
||||
if (mh < (100 * e_scale)) mh = 100 * e_scale;
|
||||
e_widget_size_min_set(cfdata->l_modules, mw, mh);
|
||||
e_widget_on_change_hook_set(cfdata->l_modules,
|
||||
e_widget_on_change_hook_set(cfdata->l_modules,
|
||||
_widget_list_selection_changed, cfdata);
|
||||
e_widget_table_object_append(of, cfdata->l_modules, 0, 1, 2, 1, 1, 1, 1, 1);
|
||||
|
||||
|
@ -283,7 +283,7 @@ _list_item_append(E_Config_Dialog_Data *cfdata, CFModule *cfm)
|
|||
}
|
||||
}
|
||||
|
||||
e_widget_ilist_append_full(cfdata->l_modules, icon, end,
|
||||
e_widget_ilist_append_full(cfdata->l_modules, icon, end,
|
||||
cfm->name, NULL, cfm, NULL);
|
||||
}
|
||||
|
||||
|
@ -568,13 +568,13 @@ _widget_list_item_selected_postponed(void *data)
|
|||
|
||||
if (cfm->enabled)
|
||||
{
|
||||
cfdata->selected.loaded =
|
||||
cfdata->selected.loaded =
|
||||
eina_list_append(cfdata->selected.loaded, cfm);
|
||||
loaded++;
|
||||
}
|
||||
else
|
||||
{
|
||||
cfdata->selected.unloaded =
|
||||
cfdata->selected.unloaded =
|
||||
eina_list_append(cfdata->selected.unloaded, cfm);
|
||||
unloaded++;
|
||||
}
|
||||
|
@ -603,7 +603,7 @@ _widget_list_selection_changed(void *data, Evas_Object *obj __UNUSED__)
|
|||
|
||||
if (cfdata->selected.idler)
|
||||
ecore_idler_del(cfdata->selected.idler);
|
||||
cfdata->selected.idler =
|
||||
cfdata->selected.idler =
|
||||
ecore_idler_add(_widget_list_item_selected_postponed, cfdata);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
#include "e.h"
|
||||
|
||||
typedef struct _CFGadget CFGadget;
|
||||
struct _CFGadget
|
||||
struct _CFGadget
|
||||
{
|
||||
const char *name, *id;
|
||||
};
|
||||
|
||||
struct _E_Config_Dialog_Data
|
||||
struct _E_Config_Dialog_Data
|
||||
{
|
||||
E_Gadcon *gc;
|
||||
E_Gadcon_Site site;
|
||||
|
@ -32,21 +32,21 @@ static void _cb_del(void *data, void *data2 __UNUSED__);
|
|||
static CFGadget *_search_hash(E_Config_Dialog_Data *cfdata, const char *name);
|
||||
static Eina_Bool _cb_mod_update(void *data, int type, void *event __UNUSED__);
|
||||
|
||||
EAPI void
|
||||
e_int_gadcon_config_shelf(E_Gadcon *gc)
|
||||
EAPI void
|
||||
e_int_gadcon_config_shelf(E_Gadcon *gc)
|
||||
{
|
||||
_create_dialog(gc, _("Shelf Contents"));
|
||||
}
|
||||
|
||||
EAPI void
|
||||
e_int_gadcon_config_toolbar(E_Gadcon *gc)
|
||||
EAPI void
|
||||
e_int_gadcon_config_toolbar(E_Gadcon *gc)
|
||||
{
|
||||
_create_dialog(gc, _("Toolbar Contents"));
|
||||
}
|
||||
|
||||
/* local function prototypes */
|
||||
static void
|
||||
_create_dialog(E_Gadcon *gc, const char *title)
|
||||
static void
|
||||
_create_dialog(E_Gadcon *gc, const char *title)
|
||||
{
|
||||
E_Config_Dialog_View *v;
|
||||
E_Container *con;
|
||||
|
@ -58,15 +58,15 @@ _create_dialog(E_Gadcon *gc, const char *title)
|
|||
v->basic.create_widgets = _basic_create;
|
||||
|
||||
con = e_container_current_get(e_manager_current_get());
|
||||
gc->config_dialog =
|
||||
e_config_dialog_new(con, title, "E", "_gadcon_config_dialog",
|
||||
gc->config_dialog =
|
||||
e_config_dialog_new(con, title, "E", "_gadcon_config_dialog",
|
||||
"preferences-desktop-shelf", 0, v, gc);
|
||||
e_dialog_resizable_set(gc->config_dialog->dia, EINA_TRUE);
|
||||
e_win_centered_set(gc->config_dialog->dia->win, EINA_TRUE);
|
||||
}
|
||||
|
||||
static void *
|
||||
_create_data(E_Config_Dialog *cfd)
|
||||
_create_data(E_Config_Dialog *cfd)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
|
@ -83,13 +83,13 @@ _create_data(E_Config_Dialog *cfd)
|
|||
return cfdata;
|
||||
}
|
||||
|
||||
static void
|
||||
_fill_data(E_Config_Dialog_Data *cfdata)
|
||||
static void
|
||||
_fill_data(E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
Eina_List *l;
|
||||
E_Config_Gadcon_Client *cgc;
|
||||
|
||||
EINA_LIST_FOREACH(cfdata->gc->cf->clients, l, cgc)
|
||||
EINA_LIST_FOREACH(cfdata->gc->cf->clients, l, cgc)
|
||||
{
|
||||
CFGadget *gad;
|
||||
|
||||
|
@ -101,8 +101,8 @@ _fill_data(E_Config_Dialog_Data *cfdata)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
static void
|
||||
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
E_Gadcon *gc;
|
||||
|
||||
|
@ -112,7 +112,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
if (cfdata->load_timer) ecore_timer_del(cfdata->load_timer);
|
||||
cfdata->load_timer = NULL;
|
||||
|
||||
if (cfdata->gadget_hash)
|
||||
if (cfdata->gadget_hash)
|
||||
{
|
||||
eina_hash_foreach(cfdata->gadget_hash, _free_gadgets, NULL);
|
||||
eina_hash_free(cfdata->gadget_hash);
|
||||
|
@ -123,8 +123,8 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
gc->config_dialog = NULL;
|
||||
}
|
||||
|
||||
static Eina_Bool
|
||||
_free_gadgets(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__)
|
||||
static Eina_Bool
|
||||
_free_gadgets(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__)
|
||||
{
|
||||
CFGadget *gadget;
|
||||
|
||||
|
@ -137,7 +137,7 @@ _free_gadgets(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void
|
|||
}
|
||||
|
||||
static Evas_Object *
|
||||
_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
Evas_Object *ot;
|
||||
int mw;
|
||||
|
@ -151,18 +151,18 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
|||
e_widget_size_min_set(cfdata->o_list, mw, (160 * e_scale));
|
||||
e_widget_table_object_append(ot, cfdata->o_list, 0, 0, 2, 1, 1, 1, 1, 1);
|
||||
|
||||
cfdata->o_add =
|
||||
cfdata->o_add =
|
||||
e_widget_button_add(evas, _("Add Gadget"), NULL, _cb_add, cfdata, NULL);
|
||||
e_widget_disabled_set(cfdata->o_add, EINA_TRUE);
|
||||
e_widget_table_object_append(ot, cfdata->o_add, 0, 1, 1, 1, 1, 1, 1, 0);
|
||||
|
||||
cfdata->o_del =
|
||||
cfdata->o_del =
|
||||
e_widget_button_add(evas, _("Remove Gadget"), NULL, _cb_del, cfdata, NULL);
|
||||
e_widget_disabled_set(cfdata->o_del, EINA_TRUE);
|
||||
e_widget_table_object_append(ot, cfdata->o_del, 1, 1, 1, 1, 1, 1, 1, 0);
|
||||
|
||||
if (cfdata->hdl) ecore_event_handler_del(cfdata->hdl);
|
||||
cfdata->hdl = ecore_event_handler_add(E_EVENT_MODULE_UPDATE,
|
||||
cfdata->hdl = ecore_event_handler_add(E_EVENT_MODULE_UPDATE,
|
||||
_cb_mod_update, cfdata);
|
||||
|
||||
if (cfdata->load_timer) ecore_timer_del(cfdata->load_timer);
|
||||
|
@ -185,8 +185,8 @@ _cb_load_timer(void *data)
|
|||
return ECORE_CALLBACK_CANCEL;
|
||||
}
|
||||
|
||||
static void
|
||||
_fill_list(E_Config_Dialog_Data *cfdata)
|
||||
static void
|
||||
_fill_list(E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
Eina_List *l;
|
||||
E_Gadcon_Client_Class *gcc;
|
||||
|
@ -199,7 +199,7 @@ _fill_list(E_Config_Dialog_Data *cfdata)
|
|||
e_widget_ilist_freeze(cfdata->o_list);
|
||||
e_widget_ilist_clear(cfdata->o_list);
|
||||
|
||||
EINA_LIST_FOREACH(e_gadcon_provider_list(), l, gcc)
|
||||
EINA_LIST_FOREACH(e_gadcon_provider_list(), l, gcc)
|
||||
{
|
||||
Evas_Object *icon = NULL, *end;
|
||||
const char *lbl = NULL;
|
||||
|
@ -211,8 +211,8 @@ _fill_list(E_Config_Dialog_Data *cfdata)
|
|||
if (gcc->func.icon) icon = gcc->func.icon(gcc, evas);
|
||||
|
||||
end = edje_object_add(evas);
|
||||
if (!e_theme_edje_object_set(end, "base/theme/widgets",
|
||||
"e/widgets/ilist/toggle_end"))
|
||||
if (!e_theme_edje_object_set(end, "base/theme/widgets",
|
||||
"e/widgets/ilist/toggle_end"))
|
||||
{
|
||||
evas_object_del(end);
|
||||
end = NULL;
|
||||
|
@ -222,12 +222,12 @@ _fill_list(E_Config_Dialog_Data *cfdata)
|
|||
{
|
||||
if (end) edje_object_signal_emit(end, "e,state,checked", "e");
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
if (end) edje_object_signal_emit(end, "e,state,unchecked", "e");
|
||||
}
|
||||
|
||||
e_widget_ilist_append_full(cfdata->o_list, icon, end, lbl,
|
||||
e_widget_ilist_append_full(cfdata->o_list, icon, end, lbl,
|
||||
_cb_list_selected, cfdata, gcc->name);
|
||||
}
|
||||
|
||||
|
@ -240,8 +240,8 @@ _fill_list(E_Config_Dialog_Data *cfdata)
|
|||
evas_event_thaw(evas);
|
||||
}
|
||||
|
||||
static void
|
||||
_cb_list_selected(void *data)
|
||||
static void
|
||||
_cb_list_selected(void *data)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
const E_Ilist_Item *it;
|
||||
|
@ -249,7 +249,7 @@ _cb_list_selected(void *data)
|
|||
unsigned int loaded = 0;
|
||||
|
||||
if (!(cfdata = data)) return;
|
||||
EINA_LIST_FOREACH(e_widget_ilist_items_get(cfdata->o_list), l, it)
|
||||
EINA_LIST_FOREACH(e_widget_ilist_items_get(cfdata->o_list), l, it)
|
||||
{
|
||||
const char *name;
|
||||
|
||||
|
@ -261,8 +261,8 @@ _cb_list_selected(void *data)
|
|||
e_widget_disabled_set(cfdata->o_del, !loaded);
|
||||
}
|
||||
|
||||
static void
|
||||
_cb_add(void *data, void *data2 __UNUSED__)
|
||||
static void
|
||||
_cb_add(void *data, void *data2 __UNUSED__)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
const E_Ilist_Item *it;
|
||||
|
@ -270,7 +270,7 @@ _cb_add(void *data, void *data2 __UNUSED__)
|
|||
int update = 0;
|
||||
|
||||
if (!(cfdata = data)) return;
|
||||
EINA_LIST_FOREACH(e_widget_ilist_items_get(cfdata->o_list), l, it)
|
||||
EINA_LIST_FOREACH(e_widget_ilist_items_get(cfdata->o_list), l, it)
|
||||
{
|
||||
E_Config_Gadcon_Client *cgc;
|
||||
CFGadget *gad;
|
||||
|
@ -290,7 +290,7 @@ _cb_add(void *data, void *data2 __UNUSED__)
|
|||
|
||||
update = 1;
|
||||
}
|
||||
if (update)
|
||||
if (update)
|
||||
{
|
||||
e_gadcon_unpopulate(cfdata->gc);
|
||||
e_gadcon_populate(cfdata->gc);
|
||||
|
@ -301,8 +301,8 @@ _cb_add(void *data, void *data2 __UNUSED__)
|
|||
e_widget_disabled_set(cfdata->o_del, EINA_TRUE);
|
||||
}
|
||||
|
||||
static void
|
||||
_cb_del(void *data, void *data2 __UNUSED__)
|
||||
static void
|
||||
_cb_del(void *data, void *data2 __UNUSED__)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
const E_Ilist_Item *it;
|
||||
|
@ -310,7 +310,7 @@ _cb_del(void *data, void *data2 __UNUSED__)
|
|||
int update = 0;
|
||||
|
||||
if (!(cfdata = data)) return;
|
||||
EINA_LIST_FOREACH(e_widget_ilist_items_get(cfdata->o_list), l, it)
|
||||
EINA_LIST_FOREACH(e_widget_ilist_items_get(cfdata->o_list), l, it)
|
||||
{
|
||||
E_Config_Gadcon_Client *cgc;
|
||||
Eina_List *cl;
|
||||
|
@ -321,7 +321,7 @@ _cb_del(void *data, void *data2 __UNUSED__)
|
|||
if (!(name = e_widget_ilist_item_value_get(it))) continue;
|
||||
|
||||
/* remove from actual gadget container */
|
||||
EINA_LIST_FOREACH(cfdata->gc->cf->clients, cl, cgc)
|
||||
EINA_LIST_FOREACH(cfdata->gc->cf->clients, cl, cgc)
|
||||
{
|
||||
CFGadget *gad;
|
||||
|
||||
|
@ -350,7 +350,7 @@ _cb_del(void *data, void *data2 __UNUSED__)
|
|||
break;
|
||||
}
|
||||
}
|
||||
if (update)
|
||||
if (update)
|
||||
{
|
||||
e_gadcon_unpopulate(cfdata->gc);
|
||||
e_gadcon_populate(cfdata->gc);
|
||||
|
@ -361,16 +361,16 @@ _cb_del(void *data, void *data2 __UNUSED__)
|
|||
e_widget_disabled_set(cfdata->o_del, EINA_TRUE);
|
||||
}
|
||||
|
||||
static CFGadget *
|
||||
_search_hash(E_Config_Dialog_Data *cfdata, const char *name)
|
||||
static CFGadget *
|
||||
_search_hash(E_Config_Dialog_Data *cfdata, const char *name)
|
||||
{
|
||||
Eina_Iterator *it;
|
||||
CFGadget *gad, *ret = NULL;
|
||||
|
||||
if (!name) return NULL;
|
||||
if (!(it = eina_hash_iterator_data_new(cfdata->gadget_hash)))
|
||||
if (!(it = eina_hash_iterator_data_new(cfdata->gadget_hash)))
|
||||
return NULL;
|
||||
EINA_ITERATOR_FOREACH(it, gad)
|
||||
EINA_ITERATOR_FOREACH(it, gad)
|
||||
{
|
||||
if ((gad->name) && (!strcmp(gad->name, name)))
|
||||
{
|
||||
|
|
|
@ -119,7 +119,7 @@ e_int_menus_main_new(void)
|
|||
}
|
||||
}
|
||||
|
||||
if (e_config->menu_apps_show)
|
||||
if (e_config->menu_apps_show)
|
||||
{
|
||||
subm = e_int_menus_all_apps_new();
|
||||
dat->all_apps = subm;
|
||||
|
@ -155,7 +155,7 @@ e_int_menus_main_new(void)
|
|||
|
||||
#if 0 // lost windows already handled inside "Windows" from main menu.
|
||||
subm = e_int_menus_lost_clients_new();
|
||||
e_object_data_set(E_OBJECT(subm), dat);
|
||||
e_object_data_set(E_OBJECT(subm), dat);
|
||||
dat->lost_clients = subm;
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_label_set(mi, _("Lost Windows"));
|
||||
|
@ -174,10 +174,10 @@ e_int_menus_main_new(void)
|
|||
|
||||
subm = e_menu_new();
|
||||
dat->enlightenment = subm;
|
||||
|
||||
|
||||
l = _e_int_menus_augmentation_find("enlightenment/0");
|
||||
if (l) _e_int_menus_augmentation_add(subm, l);
|
||||
|
||||
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_label_set(mi, _("Enlightenment"));
|
||||
e_util_menu_item_theme_icon_set(mi, "enlightenment");
|
||||
|
@ -214,7 +214,7 @@ e_int_menus_main_new(void)
|
|||
|
||||
l = _e_int_menus_augmentation_find("enlightenment/3");
|
||||
if (l) _e_int_menus_augmentation_add(subm, l);
|
||||
|
||||
|
||||
l = _e_int_menus_augmentation_find("main/5");
|
||||
if (l) _e_int_menus_augmentation_add(m, l);
|
||||
|
||||
|
@ -235,7 +235,7 @@ e_int_menus_main_new(void)
|
|||
if (l) _e_int_menus_augmentation_add(m, l);
|
||||
|
||||
l = eina_hash_find(_e_int_menus_augmentation, "main/8");
|
||||
if (l)
|
||||
if (l)
|
||||
{
|
||||
separator = 1;
|
||||
mi = e_menu_item_new(m);
|
||||
|
@ -244,9 +244,9 @@ e_int_menus_main_new(void)
|
|||
}
|
||||
|
||||
l = eina_hash_find(_e_int_menus_augmentation, "main/9");
|
||||
if (l)
|
||||
if (l)
|
||||
{
|
||||
if (!separator)
|
||||
if (!separator)
|
||||
{
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_separator_set(mi, 1);
|
||||
|
@ -459,14 +459,14 @@ EAPI void
|
|||
e_int_menus_menu_augmentation_point_disabled_set(const char *menu, Eina_Bool disabled)
|
||||
{
|
||||
if (!menu) return;
|
||||
if (disabled)
|
||||
if (disabled)
|
||||
{
|
||||
_e_int_menus_augmentation_disabled =
|
||||
_e_int_menus_augmentation_disabled =
|
||||
eina_list_append(_e_int_menus_augmentation_disabled, menu);
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
_e_int_menus_augmentation_disabled =
|
||||
_e_int_menus_augmentation_disabled =
|
||||
eina_list_remove(_e_int_menus_augmentation_disabled, menu);
|
||||
}
|
||||
}
|
||||
|
@ -583,9 +583,9 @@ _e_int_menus_apps_scan(E_Menu *m, Efreet_Menu *menu)
|
|||
e_menu_item_separator_set(mi, 1);
|
||||
else if (entry->type == EFREET_MENU_ENTRY_DESKTOP)
|
||||
{
|
||||
e_menu_item_callback_set(mi, _e_int_menus_apps_run,
|
||||
e_menu_item_callback_set(mi, _e_int_menus_apps_run,
|
||||
entry->desktop);
|
||||
e_menu_item_drag_callback_set(mi, _e_int_menus_apps_drag,
|
||||
e_menu_item_drag_callback_set(mi, _e_int_menus_apps_drag,
|
||||
entry->desktop);
|
||||
}
|
||||
else if (entry->type == EFREET_MENU_ENTRY_MENU)
|
||||
|
@ -593,11 +593,11 @@ _e_int_menus_apps_scan(E_Menu *m, Efreet_Menu *menu)
|
|||
E_Menu *subm;
|
||||
|
||||
subm = e_menu_new();
|
||||
e_menu_pre_activate_callback_set(subm,
|
||||
_e_int_menus_apps_start,
|
||||
e_menu_pre_activate_callback_set(subm,
|
||||
_e_int_menus_apps_start,
|
||||
entry);
|
||||
e_menu_item_submenu_set(mi, subm);
|
||||
e_object_free_attach_func_set(E_OBJECT(subm),
|
||||
e_object_free_attach_func_set(E_OBJECT(subm),
|
||||
_e_int_menus_apps_free_hook2);
|
||||
}
|
||||
/* TODO: Highlight header
|
||||
|
@ -630,7 +630,7 @@ _e_int_menus_apps_start(void *data, E_Menu *m)
|
|||
}
|
||||
else menu = efreet_menu_get();
|
||||
e_object_data_set(E_OBJECT(m), menu);
|
||||
e_object_free_attach_func_set(E_OBJECT(m),
|
||||
e_object_free_attach_func_set(E_OBJECT(m),
|
||||
_e_int_menus_apps_free_hook2);
|
||||
}
|
||||
if (menu) _e_int_menus_apps_scan(m, menu);
|
||||
|
@ -741,8 +741,8 @@ _e_int_menus_virtuals_pre_cb(void *data __UNUSED__, E_Menu *m)
|
|||
e_menu_item_radio_group_set(mi, 1);
|
||||
e_menu_item_radio_set(mi, 1);
|
||||
e_menu_item_label_set(mi, desk->name);
|
||||
if (desk == e_desk_current_get(zone))
|
||||
e_menu_item_toggle_set(mi, 1);
|
||||
if (desk == e_desk_current_get(zone))
|
||||
e_menu_item_toggle_set(mi, 1);
|
||||
e_menu_item_callback_set(mi, _e_int_menus_virtuals_item_cb, desk);
|
||||
e_menu_item_realize_callback_set(mi, _e_int_menus_virtuals_icon_cb, desk);
|
||||
}
|
||||
|
@ -930,20 +930,20 @@ _e_int_menus_clients_sort_z_order_cb(const void *d1, const void *d2)
|
|||
|
||||
if (bd1->layer < bd2->layer) return 1;
|
||||
if (bd1->layer > bd2->layer) return -1;
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
_e_int_menus_clients_menu_add_iconified(Eina_List *borders, E_Menu *m)
|
||||
{
|
||||
if (eina_list_count(borders) > 0)
|
||||
{
|
||||
{
|
||||
Eina_List *l = NULL;
|
||||
E_Border *bd = NULL;
|
||||
E_Menu_Item *mi = NULL;
|
||||
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_separator_set(mi, 1);
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_separator_set(mi, 1);
|
||||
|
||||
EINA_LIST_FOREACH(borders, l, bd)
|
||||
_e_int_menus_clients_item_create(bd, m);
|
||||
|
@ -954,7 +954,7 @@ static void
|
|||
_e_int_menus_clients_add_by_class(Eina_List *borders, E_Menu *m)
|
||||
{
|
||||
Eina_List *l = NULL, *ico = NULL;
|
||||
E_Border *bd;
|
||||
E_Border *bd;
|
||||
E_Menu *subm = NULL;
|
||||
E_Menu_Item *mi = NULL;
|
||||
char *class = NULL;
|
||||
|
@ -962,39 +962,39 @@ _e_int_menus_clients_add_by_class(Eina_List *borders, E_Menu *m)
|
|||
class = strdup("");
|
||||
EINA_LIST_FOREACH(borders, l, bd)
|
||||
{
|
||||
if ((bd->iconic) &&
|
||||
if ((bd->iconic) &&
|
||||
(e_config->clientlist_separate_iconified_apps == E_CLIENTLIST_GROUPICONS_SEP))
|
||||
{
|
||||
ico = eina_list_append(ico, bd);
|
||||
ico = eina_list_append(ico, bd);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (((strcmp(class, bd->client.icccm.class) != 0) &&
|
||||
if (((strcmp(class, bd->client.icccm.class) != 0) &&
|
||||
e_config->clientlist_separate_with != E_CLIENTLIST_GROUP_SEP_NONE))
|
||||
{
|
||||
if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU)
|
||||
if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU)
|
||||
{
|
||||
if ((subm) && (mi)) e_menu_item_submenu_set(mi, subm);
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_label_set(mi, bd->client.icccm.class);
|
||||
e_util_menu_item_theme_icon_set(mi, "preferences-system-windows");
|
||||
subm = e_menu_new();
|
||||
if ((subm) && (mi)) e_menu_item_submenu_set(mi, subm);
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_label_set(mi, bd->client.icccm.class);
|
||||
e_util_menu_item_theme_icon_set(mi, "preferences-system-windows");
|
||||
subm = e_menu_new();
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_separator_set(mi, 1);
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_separator_set(mi, 1);
|
||||
}
|
||||
class = strdup(bd->client.icccm.class);
|
||||
class = strdup(bd->client.icccm.class);
|
||||
}
|
||||
if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU)
|
||||
_e_int_menus_clients_item_create(bd, subm);
|
||||
else
|
||||
_e_int_menus_clients_item_create(bd, m);
|
||||
if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU)
|
||||
_e_int_menus_clients_item_create(bd, subm);
|
||||
else
|
||||
_e_int_menus_clients_item_create(bd, m);
|
||||
}
|
||||
|
||||
if ((e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU)
|
||||
&& (subm) && (mi))
|
||||
if ((e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU)
|
||||
&& (subm) && (mi))
|
||||
e_menu_item_submenu_set(mi, subm);
|
||||
|
||||
_e_int_menus_clients_menu_add_iconified(ico, m);
|
||||
|
@ -1012,19 +1012,19 @@ _e_int_menus_clients_add_by_desk(E_Desk *curr_desk, Eina_List *borders, E_Menu *
|
|||
/* Deal with present desk first */
|
||||
EINA_LIST_FOREACH(borders, l, bd)
|
||||
{
|
||||
if (bd->iconic && e_config->clientlist_separate_iconified_apps && E_CLIENTLIST_GROUPICONS_SEP)
|
||||
if (bd->iconic && e_config->clientlist_separate_iconified_apps && E_CLIENTLIST_GROUPICONS_SEP)
|
||||
{
|
||||
ico = eina_list_append(ico, bd);
|
||||
continue;
|
||||
ico = eina_list_append(ico, bd);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (bd->desk != curr_desk)
|
||||
{
|
||||
if ((!bd->iconic) ||
|
||||
(bd->iconic && e_config->clientlist_separate_iconified_apps ==
|
||||
if ((!bd->iconic) ||
|
||||
(bd->iconic && e_config->clientlist_separate_iconified_apps ==
|
||||
E_CLIENTLIST_GROUPICONS_OWNER))
|
||||
{
|
||||
alt = eina_list_append(alt, bd);
|
||||
alt = eina_list_append(alt, bd);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
@ -1034,7 +1034,7 @@ _e_int_menus_clients_add_by_desk(E_Desk *curr_desk, Eina_List *borders, E_Menu *
|
|||
|
||||
desk = NULL;
|
||||
subm = NULL;
|
||||
if (eina_list_count(alt) > 0)
|
||||
if (eina_list_count(alt) > 0)
|
||||
{
|
||||
if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU)
|
||||
{
|
||||
|
@ -1044,31 +1044,31 @@ _e_int_menus_clients_add_by_desk(E_Desk *curr_desk, Eina_List *borders, E_Menu *
|
|||
|
||||
EINA_LIST_FOREACH(alt, l, bd)
|
||||
{
|
||||
if ((bd->desk != desk) &&
|
||||
if ((bd->desk != desk) &&
|
||||
(e_config->clientlist_separate_with != E_CLIENTLIST_GROUP_SEP_NONE))
|
||||
{
|
||||
if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU)
|
||||
{
|
||||
if (subm && mi) e_menu_item_submenu_set(mi, subm);
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_label_set(mi, bd->desk->name);
|
||||
if (subm && mi) e_menu_item_submenu_set(mi, subm);
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_label_set(mi, bd->desk->name);
|
||||
e_util_menu_item_theme_icon_set(mi, "preferences-desktop");
|
||||
subm = e_menu_new();
|
||||
subm = e_menu_new();
|
||||
}
|
||||
else
|
||||
{
|
||||
mi = e_menu_item_new(m);
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_separator_set(mi, 1);
|
||||
}
|
||||
desk = bd->desk;
|
||||
}
|
||||
if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU)
|
||||
_e_int_menus_clients_item_create(bd, subm);
|
||||
else
|
||||
if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU)
|
||||
_e_int_menus_clients_item_create(bd, subm);
|
||||
else
|
||||
_e_int_menus_clients_item_create(bd, m);
|
||||
}
|
||||
if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU
|
||||
&& (subm) && (mi))
|
||||
if (e_config->clientlist_separate_with == E_CLIENTLIST_GROUP_SEP_MENU
|
||||
&& (subm) && (mi))
|
||||
e_menu_item_submenu_set(mi, subm);
|
||||
}
|
||||
|
||||
|
@ -1083,11 +1083,11 @@ _e_int_menus_clients_add_by_none(Eina_List *borders, E_Menu *m)
|
|||
|
||||
EINA_LIST_FOREACH(borders, l, bd)
|
||||
{
|
||||
if ((bd->iconic) && (e_config->clientlist_separate_iconified_apps) &&
|
||||
(E_CLIENTLIST_GROUPICONS_SEP))
|
||||
if ((bd->iconic) && (e_config->clientlist_separate_iconified_apps) &&
|
||||
(E_CLIENTLIST_GROUPICONS_SEP))
|
||||
{
|
||||
ico = eina_list_append(ico, bd);
|
||||
continue;
|
||||
ico = eina_list_append(ico, bd);
|
||||
continue;
|
||||
}
|
||||
_e_int_menus_clients_item_create(bd, m);
|
||||
}
|
||||
|
@ -1110,8 +1110,8 @@ _e_int_menus_clients_pre_cb(void *data __UNUSED__, E_Menu *m)
|
|||
zone = e_zone_current_get(e_container_current_get(e_manager_current_get()));
|
||||
desk = e_desk_current_get(zone);
|
||||
|
||||
if (e_config->clientlist_sort_by == E_CLIENTLIST_SORT_MOST_RECENT)
|
||||
l = e_border_focus_stack_get();
|
||||
if (e_config->clientlist_sort_by == E_CLIENTLIST_SORT_MOST_RECENT)
|
||||
l = e_border_focus_stack_get();
|
||||
else
|
||||
l = e_border_client_list();
|
||||
EINA_LIST_FOREACH(l, l, border)
|
||||
|
@ -1132,11 +1132,11 @@ _e_int_menus_clients_pre_cb(void *data __UNUSED__, E_Menu *m)
|
|||
e_menu_item_label_set(mi, _("(No Windows)"));
|
||||
}
|
||||
|
||||
if (borders)
|
||||
if (borders)
|
||||
{
|
||||
/* Sort the borders */
|
||||
if (e_config->clientlist_sort_by == E_CLIENTLIST_SORT_ALPHA)
|
||||
borders = eina_list_sort(borders, eina_list_count(borders),
|
||||
borders = eina_list_sort(borders, eina_list_count(borders),
|
||||
_e_int_menus_clients_sort_alpha_cb);
|
||||
|
||||
if (e_config->clientlist_sort_by == E_CLIENTLIST_SORT_ZORDER)
|
||||
|
@ -1146,14 +1146,14 @@ _e_int_menus_clients_pre_cb(void *data __UNUSED__, E_Menu *m)
|
|||
/* Group the borders */
|
||||
if (e_config->clientlist_group_by == E_CLIENTLIST_GROUP_DESK)
|
||||
{
|
||||
borders = eina_list_sort(borders, eina_list_count(borders),
|
||||
borders = eina_list_sort(borders, eina_list_count(borders),
|
||||
_e_int_menus_clients_group_desk_cb);
|
||||
_e_int_menus_clients_add_by_desk(desk, borders, m);
|
||||
}
|
||||
if (e_config->clientlist_group_by == E_CLIENTLIST_GROUP_CLASS)
|
||||
if (e_config->clientlist_group_by == E_CLIENTLIST_GROUP_CLASS)
|
||||
{
|
||||
borders = eina_list_sort(borders, eina_list_count(borders),
|
||||
_e_int_menus_clients_group_class_cb);
|
||||
borders = eina_list_sort(borders, eina_list_count(borders),
|
||||
_e_int_menus_clients_group_class_cb);
|
||||
_e_int_menus_clients_add_by_class(borders, m);
|
||||
}
|
||||
if (e_config->clientlist_group_by == E_CLIENTLIST_GROUP_NONE)
|
||||
|
@ -1174,7 +1174,7 @@ _e_int_menus_clients_pre_cb(void *data __UNUSED__, E_Menu *m)
|
|||
e_menu_item_separator_set(mi, 1);
|
||||
|
||||
subm = e_int_menus_lost_clients_new();
|
||||
e_object_data_set(E_OBJECT(subm), e_object_data_get(E_OBJECT(m)));
|
||||
e_object_data_set(E_OBJECT(subm), e_object_data_get(E_OBJECT(m)));
|
||||
dat->lost_clients = subm;
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_label_set(mi, _("Lost Windows"));
|
||||
|
@ -1245,7 +1245,7 @@ _e_int_menus_clients_free_hook(void *obj)
|
|||
e_object_unref(E_OBJECT(bd));
|
||||
}
|
||||
|
||||
static void
|
||||
static void
|
||||
_e_int_menus_clients_item_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
|
||||
{
|
||||
E_Border *bd;
|
||||
|
@ -1272,7 +1272,7 @@ _e_int_menus_clients_item_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi _
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
static void
|
||||
_e_int_menus_clients_icon_cb(void *data, E_Menu *m, E_Menu_Item *mi)
|
||||
{
|
||||
E_Border *bd;
|
||||
|
@ -1282,7 +1282,7 @@ _e_int_menus_clients_icon_cb(void *data, E_Menu *m, E_Menu_Item *mi)
|
|||
mi->icon_object = e_border_icon_add(bd, m->evas);
|
||||
}
|
||||
|
||||
static void
|
||||
static void
|
||||
_e_int_menus_clients_cleanup_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__)
|
||||
{
|
||||
E_Action *act;
|
||||
|
@ -1296,7 +1296,7 @@ _e_int_menus_lost_clients_pre_cb(void *data __UNUSED__, E_Menu *m)
|
|||
{
|
||||
E_Menu_Item *mi;
|
||||
Eina_List *l, *borders = NULL;
|
||||
E_Border *bd;
|
||||
E_Border *bd;
|
||||
E_Menu *root;
|
||||
E_Zone *zone = NULL;
|
||||
|
||||
|
@ -1326,10 +1326,10 @@ _e_int_menus_lost_clients_pre_cb(void *data __UNUSED__, E_Menu *m)
|
|||
/* ref the border as we implicitly unref it in the callback */
|
||||
e_object_ref(E_OBJECT(bd));
|
||||
e_menu_item_callback_set(mi, _e_int_menus_lost_clients_item_cb, bd);
|
||||
if (bd->desktop)
|
||||
if (bd->desktop)
|
||||
e_util_desktop_menu_item_icon_add(bd->desktop, 24, mi);
|
||||
}
|
||||
e_object_free_attach_func_set(E_OBJECT(m),
|
||||
e_object_free_attach_func_set(E_OBJECT(m),
|
||||
_e_int_menus_lost_clients_free_hook);
|
||||
e_object_data_set(E_OBJECT(m), borders);
|
||||
}
|
||||
|
@ -1347,7 +1347,7 @@ _e_int_menus_lost_clients_free_hook(void *obj)
|
|||
e_object_unref(E_OBJECT(bd));
|
||||
}
|
||||
|
||||
static void
|
||||
static void
|
||||
_e_int_menus_lost_clients_item_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
|
||||
{
|
||||
E_Border *bd = data;
|
||||
|
@ -1393,8 +1393,8 @@ _e_int_menus_augmentation_del(E_Menu *m, Eina_List *augmentation)
|
|||
if (aug->del.func) aug->del.func(aug->del.data, m);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_int_menus_shelves_pre_cb(void *data __UNUSED__, E_Menu *m)
|
||||
static void
|
||||
_e_int_menus_shelves_pre_cb(void *data __UNUSED__, E_Menu *m)
|
||||
{
|
||||
E_Menu_Item *mi;
|
||||
Eina_List *l, *shelves = NULL;
|
||||
|
@ -1430,7 +1430,7 @@ _e_int_menus_shelves_pre_cb(void *data __UNUSED__, E_Menu *m)
|
|||
mi = e_menu_item_new(m);
|
||||
e_menu_item_label_set(mi, buf);
|
||||
e_menu_item_callback_set(mi, _e_int_menus_shelves_item_cb, s);
|
||||
switch (s->cfg->orient)
|
||||
switch (s->cfg->orient)
|
||||
{
|
||||
case E_GADCON_ORIENT_LEFT:
|
||||
e_util_menu_item_theme_icon_set(mi, "preferences-position-left");
|
||||
|
@ -1490,8 +1490,8 @@ _e_int_menus_shelves_pre_cb(void *data __UNUSED__, E_Menu *m)
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
_e_int_menus_shelves_item_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
|
||||
static void
|
||||
_e_int_menus_shelves_item_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
|
||||
{
|
||||
E_Shelf *s = data;
|
||||
|
||||
|
@ -1499,8 +1499,8 @@ _e_int_menus_shelves_item_cb(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi _
|
|||
e_int_shelf_config(s);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_int_menus_shelves_add_cb(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
|
||||
static void
|
||||
_e_int_menus_shelves_add_cb(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__)
|
||||
{
|
||||
E_Container *con;
|
||||
E_Zone *zone;
|
||||
|
@ -1526,14 +1526,14 @@ _e_int_menus_shelves_add_cb(void *data __UNUSED__, E_Menu *m __UNUSED__, E_Menu_
|
|||
e_shelf_config_update();
|
||||
}
|
||||
|
||||
static void
|
||||
_e_int_menus_shelves_del_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__)
|
||||
static void
|
||||
_e_int_menus_shelves_del_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__)
|
||||
{
|
||||
e_configure_registry_call("extensions/shelves", m->zone->container, NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_int_menus_item_label_set(Efreet_Menu *entry, E_Menu_Item *mi)
|
||||
static void
|
||||
_e_int_menus_item_label_set(Efreet_Menu *entry, E_Menu_Item *mi)
|
||||
{
|
||||
Efreet_Desktop *desktop;
|
||||
char label[4096];
|
||||
|
@ -1543,7 +1543,7 @@ _e_int_menus_item_label_set(Efreet_Menu *entry, E_Menu_Item *mi)
|
|||
|
||||
desktop = entry->desktop;
|
||||
if ((e_config->menu_eap_name_show) && (entry->name)) opt |= 0x4;
|
||||
if (desktop)
|
||||
if (desktop)
|
||||
{
|
||||
if ((e_config->menu_eap_generic_show) && (desktop->generic_name) &&
|
||||
(desktop->generic_name[0] != 0))
|
||||
|
@ -1553,22 +1553,22 @@ _e_int_menus_item_label_set(Efreet_Menu *entry, E_Menu_Item *mi)
|
|||
opt |= 0x1;
|
||||
}
|
||||
|
||||
if (opt == 0x7)
|
||||
snprintf(label, sizeof(label), "%s (%s) [%s]", entry->name,
|
||||
if (opt == 0x7)
|
||||
snprintf(label, sizeof(label), "%s (%s) [%s]", entry->name,
|
||||
desktop->generic_name, desktop->comment);
|
||||
else if (opt == 0x6)
|
||||
snprintf(label, sizeof(label), "%s (%s)", entry->name,
|
||||
else if (opt == 0x6)
|
||||
snprintf(label, sizeof(label), "%s (%s)", entry->name,
|
||||
desktop->generic_name);
|
||||
else if (opt == 0x5)
|
||||
else if (opt == 0x5)
|
||||
snprintf(label, sizeof(label), "%s [%s]", entry->name, desktop->comment);
|
||||
else if (opt == 0x4)
|
||||
else if (opt == 0x4)
|
||||
snprintf(label, sizeof(label), "%s", entry->name);
|
||||
else if (opt == 0x3)
|
||||
snprintf(label, sizeof(label), "%s [%s]", desktop->generic_name,
|
||||
else if (opt == 0x3)
|
||||
snprintf(label, sizeof(label), "%s [%s]", desktop->generic_name,
|
||||
desktop->comment);
|
||||
else if (opt == 0x2)
|
||||
else if (opt == 0x2)
|
||||
snprintf(label, sizeof(label), "%s", desktop->generic_name);
|
||||
else if (opt == 0x1)
|
||||
else if (opt == 0x1)
|
||||
snprintf(label, sizeof(label), "%s", desktop->comment);
|
||||
else
|
||||
snprintf(label, sizeof(label), "%s", entry->name);
|
||||
|
|
|
@ -28,14 +28,14 @@ typedef struct _E_Int_Menu_Augmentation E_Int_Menu_Augmentation;
|
|||
struct _E_Int_Menu_Augmentation
|
||||
{
|
||||
const char *sort_key;
|
||||
struct
|
||||
struct
|
||||
{
|
||||
void (*func) (void *data, E_Menu *m);
|
||||
void *data;
|
||||
} add, del;
|
||||
};
|
||||
|
||||
EAPI E_Menu *e_int_menus_main_new(void);
|
||||
EAPI E_Menu *e_int_menus_main_new(void);
|
||||
EAPI E_Menu *e_int_menus_desktops_new(void);
|
||||
EAPI E_Menu *e_int_menus_clients_new(void);
|
||||
EAPI E_Menu *e_int_menus_apps_new(const char *dir);
|
||||
|
@ -61,6 +61,6 @@ EAPI void e_int_menus_menu_augmentation_del(const char *menu
|
|||
|
||||
EAPI void e_int_menus_menu_augmentation_point_disabled_set(const char *menu,
|
||||
Eina_Bool disabled);
|
||||
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "e.h"
|
||||
|
||||
struct _E_Config_Dialog_Data
|
||||
struct _E_Config_Dialog_Data
|
||||
{
|
||||
E_Shelf *es;
|
||||
E_Config_Shelf *escfg;
|
||||
|
@ -27,8 +27,8 @@ static void _fill_styles(E_Config_Dialog_Data *cfdata, Evas_Object *obj);
|
|||
static void _cb_autohide_change(void *data, Evas_Object *obj __UNUSED__);
|
||||
static void _fill_desks(E_Config_Dialog_Data *cfdata);
|
||||
|
||||
EAPI void
|
||||
e_int_shelf_config(E_Shelf *es)
|
||||
EAPI void
|
||||
e_int_shelf_config(E_Shelf *es)
|
||||
{
|
||||
E_Config_Dialog_View *v;
|
||||
|
||||
|
@ -39,16 +39,16 @@ e_int_shelf_config(E_Shelf *es)
|
|||
v->basic.create_widgets = _basic_create;
|
||||
v->basic.apply_cfdata = _basic_apply;
|
||||
|
||||
es->config_dialog =
|
||||
e_config_dialog_new(es->zone->container, _("Shelf Settings"),
|
||||
"E", "_shelf_config_dialog",
|
||||
es->config_dialog =
|
||||
e_config_dialog_new(es->zone->container, _("Shelf Settings"),
|
||||
"E", "_shelf_config_dialog",
|
||||
"preferences-desktop-shelf", 0, v, es);
|
||||
e_win_centered_set(es->config_dialog->dia->win, EINA_TRUE);
|
||||
}
|
||||
|
||||
/* local functions */
|
||||
static void *
|
||||
_create_data(E_Config_Dialog *cfd)
|
||||
_create_data(E_Config_Dialog *cfd)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
|
@ -59,8 +59,8 @@ _create_data(E_Config_Dialog *cfd)
|
|||
return cfdata;
|
||||
}
|
||||
|
||||
static void
|
||||
_fill_data(E_Config_Dialog_Data *cfdata)
|
||||
static void
|
||||
_fill_data(E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
/* stacking */
|
||||
if ((!cfdata->escfg->popup) && (cfdata->escfg->layer == 1))
|
||||
|
@ -81,7 +81,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
|
|||
cfdata->size = cfdata->escfg->size;
|
||||
|
||||
/* style */
|
||||
if (cfdata->escfg->style)
|
||||
if (cfdata->escfg->style)
|
||||
cfdata->style = eina_stringshare_ref(cfdata->escfg->style);
|
||||
else
|
||||
cfdata->style = eina_stringshare_add("");
|
||||
|
@ -97,8 +97,8 @@ _fill_data(E_Config_Dialog_Data *cfdata)
|
|||
cfdata->desk_list = cfdata->escfg->desk_list;
|
||||
}
|
||||
|
||||
static void
|
||||
_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
||||
static void
|
||||
_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
eina_list_free(cfdata->autohide_list);
|
||||
|
||||
|
@ -110,7 +110,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
|||
}
|
||||
|
||||
static Evas_Object *
|
||||
_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
Evas_Object *otb, *ol, *ow;
|
||||
E_Radio_Group *rg;
|
||||
|
@ -126,63 +126,63 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
|
|||
e_widget_list_object_append(ol, ow, 1, 1, 0.5);
|
||||
ow = e_widget_radio_add(evas, _("Below Everything"), 0, rg);
|
||||
e_widget_list_object_append(ol, ow, 1, 1, 0.5);
|
||||
ow = e_widget_check_add(evas, _("Allow windows to overlap the shelf"),
|
||||
ow = e_widget_check_add(evas, _("Allow windows to overlap the shelf"),
|
||||
&(cfdata->overlap));
|
||||
e_widget_list_object_append(ol, ow, 1, 1, 0.5);
|
||||
e_widget_toolbook_page_append(otb, NULL, _("Stacking"), ol,
|
||||
e_widget_toolbook_page_append(otb, NULL, _("Stacking"), ol,
|
||||
1, 0, 1, 0, 0.5, 0.0);
|
||||
|
||||
/* position */
|
||||
ol = e_widget_table_add(evas, 1);
|
||||
rg = e_widget_radio_group_new(&(cfdata->orient));
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-left",
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-left",
|
||||
24, 24, E_GADCON_ORIENT_LEFT, rg);
|
||||
e_widget_table_object_append(ol, ow, 0, 2, 1, 1, 1, 1, 1, 1);
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-right",
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-right",
|
||||
24, 24, E_GADCON_ORIENT_RIGHT, rg);
|
||||
e_widget_table_object_append(ol, ow, 2, 2, 1, 1, 1, 1, 1, 1);
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-top",
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-top",
|
||||
24, 24, E_GADCON_ORIENT_TOP, rg);
|
||||
e_widget_table_object_append(ol, ow, 1, 0, 1, 1, 1, 1, 1, 1);
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-bottom",
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-bottom",
|
||||
24, 24, E_GADCON_ORIENT_BOTTOM, rg);
|
||||
e_widget_table_object_append(ol, ow, 1, 4, 1, 1, 1, 1, 1, 1);
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-top-left",
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-top-left",
|
||||
24, 24, E_GADCON_ORIENT_CORNER_TL, rg);
|
||||
e_widget_table_object_append(ol, ow, 0, 0, 1, 1, 1, 1, 1, 1);
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-top-right",
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-top-right",
|
||||
24, 24, E_GADCON_ORIENT_CORNER_TR, rg);
|
||||
e_widget_table_object_append(ol, ow, 2, 0, 1, 1, 1, 1, 1, 1);
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-bottom-left",
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-bottom-left",
|
||||
24, 24, E_GADCON_ORIENT_CORNER_BL, rg);
|
||||
e_widget_table_object_append(ol, ow, 0, 4, 1, 1, 1, 1, 1, 1);
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-bottom-right",
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-bottom-right",
|
||||
24, 24, E_GADCON_ORIENT_CORNER_BR, rg);
|
||||
e_widget_table_object_append(ol, ow, 2, 4, 1, 1, 1, 1, 1, 1);
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-left-top",
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-left-top",
|
||||
24, 24, E_GADCON_ORIENT_CORNER_LT, rg);
|
||||
e_widget_table_object_append(ol, ow, 0, 1, 1, 1, 1, 1, 1, 1);
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-right-top",
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-right-top",
|
||||
24, 24, E_GADCON_ORIENT_CORNER_RT, rg);
|
||||
e_widget_table_object_append(ol, ow, 2, 1, 1, 1, 1, 1, 1, 1);
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-left-bottom",
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-left-bottom",
|
||||
24, 24, E_GADCON_ORIENT_CORNER_LB, rg);
|
||||
e_widget_table_object_append(ol, ow, 0, 3, 1, 1, 1, 1, 1, 1);
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-right-bottom",
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-right-bottom",
|
||||
24, 24, E_GADCON_ORIENT_CORNER_RB, rg);
|
||||
e_widget_table_object_append(ol, ow, 2, 3, 1, 1, 1, 1, 1, 1);
|
||||
e_widget_toolbook_page_append(otb, NULL, _("Position"), ol,
|
||||
e_widget_toolbook_page_append(otb, NULL, _("Position"), ol,
|
||||
1, 0, 1, 0, 0.5, 0.0);
|
||||
|
||||
/* size */
|
||||
ol = e_widget_list_add(evas, 0, 0);
|
||||
ow = e_widget_slider_add(evas, 1, 0, _("Height (%3.0f pixels)"), 4, 256, 4, 0,
|
||||
ow = e_widget_slider_add(evas, 1, 0, _("Height (%3.0f pixels)"), 4, 256, 4, 0,
|
||||
NULL, &(cfdata->size), 100);
|
||||
e_widget_list_object_append(ol, ow, 1, 1, 0.5);
|
||||
ow = e_widget_check_add(evas, _("Shrink to Content Width"),
|
||||
ow = e_widget_check_add(evas, _("Shrink to Content Width"),
|
||||
&(cfdata->fit_along));
|
||||
e_widget_list_object_append(ol, ow, 1, 1, 0.5);
|
||||
e_widget_toolbook_page_append(otb, NULL, _("Size"), ol,
|
||||
e_widget_toolbook_page_append(otb, NULL, _("Size"), ol,
|
||||
1, 0, 1, 0, 0.5, 0.0);
|
||||
|
||||
/* style */
|
||||
|
@ -190,12 +190,12 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
|
|||
ow = e_widget_ilist_add(evas, 60, 20, &(cfdata->style));
|
||||
_fill_styles(cfdata, ow);
|
||||
e_widget_list_object_append(ol, ow, 1, 1, 0.5);
|
||||
e_widget_toolbook_page_append(otb, NULL, _("Style"), ol,
|
||||
e_widget_toolbook_page_append(otb, NULL, _("Style"), ol,
|
||||
1, 0, 1, 0, 0.5, 0.0);
|
||||
|
||||
/* autohide */
|
||||
ol = e_widget_list_add(evas, 0, 0);
|
||||
cfdata->o_autohide =
|
||||
cfdata->o_autohide =
|
||||
e_widget_check_add(evas, _("Auto-hide the shelf"), &(cfdata->autohide));
|
||||
e_widget_on_change_hook_set(cfdata->o_autohide, _cb_autohide_change, cfdata);
|
||||
e_widget_list_object_append(ol, cfdata->o_autohide, 1, 1, 0.5);
|
||||
|
@ -214,7 +214,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
|
|||
cfdata->autohide_list = eina_list_append(cfdata->autohide_list, ow);
|
||||
e_widget_disabled_set(ow, !cfdata->autohide);
|
||||
e_widget_list_object_append(ol, ow, 1, 1, 0.5);
|
||||
ow = e_widget_slider_add(evas, 1, 0, _("%.1f seconds"), 0.2, 6.0, 0.2, 0,
|
||||
ow = e_widget_slider_add(evas, 1, 0, _("%.1f seconds"), 0.2, 6.0, 0.2, 0,
|
||||
&(cfdata->hide_timeout), NULL, 100);
|
||||
cfdata->autohide_list = eina_list_append(cfdata->autohide_list, ow);
|
||||
e_widget_disabled_set(ow, !cfdata->autohide);
|
||||
|
@ -224,12 +224,12 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
|
|||
cfdata->autohide_list = eina_list_append(cfdata->autohide_list, ow);
|
||||
e_widget_disabled_set(ow, !cfdata->autohide);
|
||||
e_widget_list_object_append(ol, ow, 1, 1, 0.5);
|
||||
ow = e_widget_slider_add(evas, 1, 0, _("%.2f seconds"), 0.05, 6.0, 0.05, 0,
|
||||
ow = e_widget_slider_add(evas, 1, 0, _("%.2f seconds"), 0.05, 6.0, 0.05, 0,
|
||||
&(cfdata->hide_duration), NULL, 100);
|
||||
cfdata->autohide_list = eina_list_append(cfdata->autohide_list, ow);
|
||||
e_widget_disabled_set(ow, !cfdata->autohide);
|
||||
e_widget_list_object_append(ol, ow, 1, 1, 0.5);
|
||||
e_widget_toolbook_page_append(otb, NULL, _("Auto Hide"), ol,
|
||||
e_widget_toolbook_page_append(otb, NULL, _("Auto Hide"), ol,
|
||||
1, 0, 1, 0, 0.5, 0.0);
|
||||
|
||||
/* Desktop */
|
||||
|
@ -244,25 +244,25 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
|
|||
e_widget_ilist_multi_select_set(cfdata->o_desk_list, EINA_TRUE);
|
||||
_fill_desks(cfdata);
|
||||
e_widget_list_object_append(ol, cfdata->o_desk_list, 1, 1, 0.5);
|
||||
e_widget_toolbook_page_append(otb, NULL, _("Desktop"), ol,
|
||||
e_widget_toolbook_page_append(otb, NULL, _("Desktop"), ol,
|
||||
1, 0, 1, 0, 0.5, 0.0);
|
||||
|
||||
e_widget_toolbook_page_show(otb, 0);
|
||||
return otb;
|
||||
}
|
||||
|
||||
static int
|
||||
_basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
static int
|
||||
_basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
E_Config_Shelf_Desk *sd;
|
||||
int recreate = 0;
|
||||
|
||||
if (!cfdata->escfg->style)
|
||||
if (!cfdata->escfg->style)
|
||||
{
|
||||
cfdata->escfg->style = eina_stringshare_ref(cfdata->style);
|
||||
e_shelf_style_set(cfdata->es, cfdata->style);
|
||||
}
|
||||
else if ((cfdata->escfg->style) &&
|
||||
else if ((cfdata->escfg->style) &&
|
||||
(strcmp(cfdata->escfg->style, cfdata->style)))
|
||||
{
|
||||
if (cfdata->escfg->style) eina_stringshare_del(cfdata->escfg->style);
|
||||
|
@ -270,7 +270,7 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
e_shelf_style_set(cfdata->es, cfdata->style);
|
||||
}
|
||||
|
||||
if (cfdata->escfg->orient != cfdata->orient)
|
||||
if (cfdata->escfg->orient != cfdata->orient)
|
||||
{
|
||||
cfdata->escfg->orient = cfdata->orient;
|
||||
e_shelf_orient(cfdata->es, cfdata->orient);
|
||||
|
@ -278,41 +278,41 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
recreate = 1;
|
||||
}
|
||||
|
||||
if (cfdata->escfg->fit_along != cfdata->fit_along)
|
||||
if (cfdata->escfg->fit_along != cfdata->fit_along)
|
||||
{
|
||||
cfdata->escfg->fit_along = cfdata->fit_along;
|
||||
cfdata->es->fit_along = cfdata->fit_along;
|
||||
recreate = 1;
|
||||
}
|
||||
|
||||
if (cfdata->escfg->size != cfdata->size)
|
||||
if (cfdata->escfg->size != cfdata->size)
|
||||
{
|
||||
cfdata->escfg->size = cfdata->size;
|
||||
cfdata->es->size = cfdata->size;
|
||||
recreate = 1;
|
||||
}
|
||||
|
||||
if (cfdata->layer == 0)
|
||||
if (cfdata->layer == 0)
|
||||
{
|
||||
if ((cfdata->escfg->popup != 0) || (cfdata->escfg->layer != 1))
|
||||
if ((cfdata->escfg->popup != 0) || (cfdata->escfg->layer != 1))
|
||||
{
|
||||
cfdata->escfg->popup = 0;
|
||||
cfdata->escfg->layer = 1;
|
||||
recreate = 1;
|
||||
}
|
||||
}
|
||||
else if (cfdata->layer == 1)
|
||||
else if (cfdata->layer == 1)
|
||||
{
|
||||
if ((cfdata->escfg->popup != 1) || (cfdata->escfg->layer != 0))
|
||||
if ((cfdata->escfg->popup != 1) || (cfdata->escfg->layer != 0))
|
||||
{
|
||||
cfdata->escfg->popup = 1;
|
||||
cfdata->escfg->layer = 0;
|
||||
recreate = 1;
|
||||
}
|
||||
}
|
||||
else if (cfdata->layer == 2)
|
||||
else if (cfdata->layer == 2)
|
||||
{
|
||||
if ((cfdata->escfg->popup != 1) || (cfdata->escfg->layer != 200))
|
||||
if ((cfdata->escfg->popup != 1) || (cfdata->escfg->layer != 200))
|
||||
{
|
||||
cfdata->escfg->popup = 1;
|
||||
cfdata->escfg->layer = 200;
|
||||
|
@ -331,13 +331,13 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
E_FREE(sd);
|
||||
cfdata->escfg->desk_list = NULL;
|
||||
|
||||
if (cfdata->desk_show_mode)
|
||||
if (cfdata->desk_show_mode)
|
||||
{
|
||||
Eina_List *l;
|
||||
const E_Ilist_Item *it;
|
||||
int idx = -1;
|
||||
|
||||
EINA_LIST_FOREACH(e_widget_ilist_items_get(cfdata->o_desk_list), l, it)
|
||||
EINA_LIST_FOREACH(e_widget_ilist_items_get(cfdata->o_desk_list), l, it)
|
||||
{
|
||||
E_Desk *desk;
|
||||
|
||||
|
@ -347,12 +347,12 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
sd = E_NEW(E_Config_Shelf_Desk, 1);
|
||||
sd->x = desk->x;
|
||||
sd->y = desk->y;
|
||||
cfdata->escfg->desk_list =
|
||||
cfdata->escfg->desk_list =
|
||||
eina_list_append(cfdata->escfg->desk_list, sd);
|
||||
}
|
||||
}
|
||||
|
||||
if (recreate)
|
||||
if (recreate)
|
||||
{
|
||||
E_Zone *zone;
|
||||
|
||||
|
@ -360,9 +360,9 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
cfdata->es->config_dialog = NULL;
|
||||
e_object_del(E_OBJECT(cfdata->es));
|
||||
|
||||
cfdata->es =
|
||||
e_shelf_zone_new(zone, cfdata->escfg->name,
|
||||
cfdata->escfg->style, cfdata->escfg->popup,
|
||||
cfdata->es =
|
||||
e_shelf_zone_new(zone, cfdata->escfg->name,
|
||||
cfdata->escfg->style, cfdata->escfg->popup,
|
||||
cfdata->escfg->layer, cfdata->escfg->id);
|
||||
cfdata->es->cfg = cfdata->escfg;
|
||||
cfdata->es->fit_along = cfdata->escfg->fit_along;
|
||||
|
@ -371,16 +371,16 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
e_shelf_populate(cfdata->es);
|
||||
}
|
||||
|
||||
if (cfdata->escfg->desk_show_mode)
|
||||
if (cfdata->escfg->desk_show_mode)
|
||||
{
|
||||
E_Desk *desk;
|
||||
Eina_List *l;
|
||||
int show = 0;
|
||||
|
||||
desk = e_desk_current_get(cfdata->es->zone);
|
||||
EINA_LIST_FOREACH(cfdata->escfg->desk_list, l, sd)
|
||||
EINA_LIST_FOREACH(cfdata->escfg->desk_list, l, sd)
|
||||
{
|
||||
if ((desk->x == sd->x) && (desk->y == sd->y))
|
||||
if ((desk->x == sd->x) && (desk->y == sd->y))
|
||||
{
|
||||
show = 1;
|
||||
break;
|
||||
|
@ -403,8 +403,8 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
return 1;
|
||||
}
|
||||
|
||||
static void
|
||||
_fill_styles(E_Config_Dialog_Data *cfdata, Evas_Object *obj)
|
||||
static void
|
||||
_fill_styles(E_Config_Dialog_Data *cfdata, Evas_Object *obj)
|
||||
{
|
||||
Evas *evas;
|
||||
Eina_List *l, *styles;
|
||||
|
@ -419,7 +419,7 @@ _fill_styles(E_Config_Dialog_Data *cfdata, Evas_Object *obj)
|
|||
e_widget_ilist_clear(obj);
|
||||
|
||||
styles = e_theme_shelf_list();
|
||||
EINA_LIST_FOREACH(styles, l, style)
|
||||
EINA_LIST_FOREACH(styles, l, style)
|
||||
{
|
||||
Evas_Object *thumb, *ow;
|
||||
char buff[PATH_MAX];
|
||||
|
@ -448,8 +448,8 @@ _fill_styles(E_Config_Dialog_Data *cfdata, Evas_Object *obj)
|
|||
eina_stringshare_del(str);
|
||||
}
|
||||
|
||||
static void
|
||||
_cb_autohide_change(void *data, Evas_Object *obj __UNUSED__)
|
||||
static void
|
||||
_cb_autohide_change(void *data, Evas_Object *obj __UNUSED__)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
Eina_List *l;
|
||||
|
@ -460,8 +460,8 @@ _cb_autohide_change(void *data, Evas_Object *obj __UNUSED__)
|
|||
e_widget_disabled_set(ow, !cfdata->autohide);
|
||||
}
|
||||
|
||||
static void
|
||||
_fill_desks(E_Config_Dialog_Data *cfdata)
|
||||
static void
|
||||
_fill_desks(E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
Evas *evas;
|
||||
int mw, x, y;
|
||||
|
@ -474,18 +474,18 @@ _fill_desks(E_Config_Dialog_Data *cfdata)
|
|||
e_widget_ilist_clear(cfdata->o_desk_list);
|
||||
|
||||
for (y = 0; y < e_config->zone_desks_y_count; y++)
|
||||
for (x = 0; x < e_config->zone_desks_x_count; x++)
|
||||
for (x = 0; x < e_config->zone_desks_x_count; x++)
|
||||
{
|
||||
E_Desk *desk;
|
||||
Eina_List *l;
|
||||
E_Config_Shelf_Desk *sd;
|
||||
|
||||
desk = e_desk_at_xy_get(cfdata->es->zone, x, y);
|
||||
e_widget_ilist_append(cfdata->o_desk_list, NULL, desk->name,
|
||||
e_widget_ilist_append(cfdata->o_desk_list, NULL, desk->name,
|
||||
NULL, NULL, NULL);
|
||||
i++;
|
||||
|
||||
EINA_LIST_FOREACH(cfdata->desk_list, l, sd)
|
||||
EINA_LIST_FOREACH(cfdata->desk_list, l, sd)
|
||||
{
|
||||
if ((sd->x != x) || (sd->y != y)) continue;
|
||||
e_widget_ilist_multi_select(cfdata->o_desk_list, i);
|
||||
|
|
|
@ -7,14 +7,14 @@ static void _free_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *c
|
|||
static int _basic_apply (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||
static Evas_Object *_basic_create (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
|
||||
|
||||
struct _E_Config_Dialog_Data
|
||||
struct _E_Config_Dialog_Data
|
||||
{
|
||||
E_Toolbar *tbar;
|
||||
int orient;
|
||||
};
|
||||
|
||||
EAPI void
|
||||
e_int_toolbar_config(E_Toolbar *tbar)
|
||||
EAPI void
|
||||
e_int_toolbar_config(E_Toolbar *tbar)
|
||||
{
|
||||
E_Config_Dialog *cfd;
|
||||
E_Config_Dialog_View *v;
|
||||
|
@ -27,39 +27,39 @@ e_int_toolbar_config(E_Toolbar *tbar)
|
|||
v->free_cfdata = _free_data;
|
||||
v->basic.apply_cfdata = _basic_apply;
|
||||
v->basic.create_widgets = _basic_create;
|
||||
cfd = e_config_dialog_new(con, _("Toolbar Settings"), "E",
|
||||
"_toolbar_config_dialog", "preferences-desktop-shelf",
|
||||
cfd = e_config_dialog_new(con, _("Toolbar Settings"), "E",
|
||||
"_toolbar_config_dialog", "preferences-desktop-shelf",
|
||||
0, v, tbar);
|
||||
tbar->cfg_dlg = cfd;
|
||||
}
|
||||
|
||||
/* local functions */
|
||||
static void *
|
||||
_create_data(E_Config_Dialog *cfd)
|
||||
_create_data(E_Config_Dialog *cfd)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
|
||||
cfdata = E_NEW(E_Config_Dialog_Data, 1);
|
||||
cfdata->tbar = cfd->data;
|
||||
_fill_data(cfdata);
|
||||
return cfdata;
|
||||
}
|
||||
|
||||
static void
|
||||
_fill_data(E_Config_Dialog_Data *cfdata)
|
||||
static void
|
||||
_fill_data(E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
cfdata->orient = cfdata->tbar->gadcon->orient;
|
||||
}
|
||||
|
||||
static void
|
||||
_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
||||
static void
|
||||
_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
cfdata->tbar->cfg_dlg = NULL;
|
||||
E_FREE(cfdata);
|
||||
}
|
||||
|
||||
static int
|
||||
_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
||||
static int
|
||||
_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
E_Toolbar *tbar;
|
||||
|
||||
|
@ -73,7 +73,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
|||
}
|
||||
|
||||
static Evas_Object *
|
||||
_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
Evas_Object *o, *ot, *ow;
|
||||
E_Radio_Group *rg;
|
||||
|
@ -82,22 +82,21 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
|
|||
ot = e_widget_frametable_add(evas, _("Layout"), 1);
|
||||
rg = e_widget_radio_group_new(&(cfdata->orient));
|
||||
/*
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-left",
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-left",
|
||||
24, 24, E_GADCON_ORIENT_LEFT, rg);
|
||||
e_widget_frametable_object_append(ot, ow, 0, 1, 1, 1, 1, 1, 1, 1);
|
||||
*/
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-top",
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-top",
|
||||
24, 24, E_GADCON_ORIENT_TOP, rg);
|
||||
e_widget_frametable_object_append(ot, ow, 0, 0, 1, 1, 1, 1, 1, 1);
|
||||
/*
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-right",
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-right",
|
||||
24, 24, E_GADCON_ORIENT_RIGHT, rg);
|
||||
e_widget_frametable_object_append(ot, ow, 2, 1, 1, 1, 1, 1, 1, 1);
|
||||
*/
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-bottom",
|
||||
ow = e_widget_radio_icon_add(evas, NULL, "preferences-position-bottom",
|
||||
24, 24, E_GADCON_ORIENT_BOTTOM, rg);
|
||||
e_widget_frametable_object_append(ot, ow, 0, 1, 1, 1, 1, 1, 1, 1);
|
||||
e_widget_list_object_append(o, ot, 1, 1, 0.5);
|
||||
return o;
|
||||
}
|
||||
|
||||
|
|
|
@ -1038,4 +1038,3 @@ _e_intl_imc_dir_scan(const char *dir)
|
|||
}
|
||||
return imcs;
|
||||
}
|
||||
|
||||
|
|
|
@ -73,4 +73,3 @@ e_intl_input_method_config_free(E_Input_Method_Config *imc)
|
|||
E_FREE(imc);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -61,18 +61,18 @@ e_ipc_init(void)
|
|||
return 0;
|
||||
}
|
||||
}
|
||||
snprintf(buf, sizeof(buf), "%s/enlightenment-%s/disp-%s-%i",
|
||||
snprintf(buf, sizeof(buf), "%s/enlightenment-%s/disp-%s-%i",
|
||||
tmp, user, disp, pid);
|
||||
_e_ipc_server = ecore_ipc_server_add(ECORE_IPC_LOCAL_SYSTEM, buf, 0, NULL);
|
||||
e_util_env_set("E_IPC_SOCKET", "");
|
||||
if (!_e_ipc_server) return 0;
|
||||
e_util_env_set("E_IPC_SOCKET", buf);
|
||||
printf("INFO: E_IPC_SOCKET=%s\n", buf);
|
||||
ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_ADD,
|
||||
ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_ADD,
|
||||
_e_ipc_cb_client_add, NULL);
|
||||
ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DEL,
|
||||
ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DEL,
|
||||
_e_ipc_cb_client_del, NULL);
|
||||
ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DATA,
|
||||
ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DATA,
|
||||
_e_ipc_cb_client_data, NULL);
|
||||
|
||||
e_ipc_codec_init();
|
||||
|
@ -102,7 +102,7 @@ _e_ipc_cb_client_add(void *data __UNUSED__, int type __UNUSED__, void *event)
|
|||
Ecore_Ipc_Event_Client_Add *e;
|
||||
|
||||
e = event;
|
||||
if (ecore_ipc_client_server_get(e->client) != _e_ipc_server)
|
||||
if (ecore_ipc_client_server_get(e->client) != _e_ipc_server)
|
||||
return ECORE_CALLBACK_PASS_ON;
|
||||
return ECORE_CALLBACK_PASS_ON;
|
||||
}
|
||||
|
@ -113,7 +113,7 @@ _e_ipc_cb_client_del(void *data __UNUSED__, int type __UNUSED__, void *event)
|
|||
Ecore_Ipc_Event_Client_Del *e;
|
||||
|
||||
e = event;
|
||||
if (ecore_ipc_client_server_get(e->client) != _e_ipc_server)
|
||||
if (ecore_ipc_client_server_get(e->client) != _e_ipc_server)
|
||||
return ECORE_CALLBACK_PASS_ON;
|
||||
/* delete client sruct */
|
||||
e_thumb_client_del(e);
|
||||
|
@ -129,7 +129,7 @@ _e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event)
|
|||
Ecore_Ipc_Event_Client_Data *e;
|
||||
|
||||
e = event;
|
||||
if (ecore_ipc_client_server_get(e->client) != _e_ipc_server)
|
||||
if (ecore_ipc_client_server_get(e->client) != _e_ipc_server)
|
||||
return ECORE_CALLBACK_PASS_ON;
|
||||
switch (e->major)
|
||||
{
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#define E_IPC_OP_EXEC_ACTION 386
|
||||
#define E_IPC_OP_EXEC_ACTION_REPLY 387
|
||||
|
||||
|
||||
typedef enum _E_Ipc_Domain
|
||||
{
|
||||
E_IPC_DOMAIN_NONE,
|
||||
|
|
|
@ -168,7 +168,7 @@ EAPI int
|
|||
e_ipc_codec_int_dec(char *data, int bytes, int *dest)
|
||||
{
|
||||
E_Ipc_Int *dat;
|
||||
|
||||
|
||||
if (!data) return 0;
|
||||
dat = eet_data_descriptor_decode(_e_ipc_int_edd, data, bytes);
|
||||
if (!dat) return 0;
|
||||
|
@ -181,7 +181,7 @@ EAPI void *
|
|||
e_ipc_codec_int_enc(int val, int *size_ret)
|
||||
{
|
||||
E_Ipc_Int dat;
|
||||
|
||||
|
||||
dat.val = val;
|
||||
return eet_data_descriptor_encode(_e_ipc_int_edd, &dat, size_ret);
|
||||
}
|
||||
|
@ -190,7 +190,7 @@ EAPI int
|
|||
e_ipc_codec_double_dec(char *data, int bytes, double *dest)
|
||||
{
|
||||
E_Ipc_Double *dat;
|
||||
|
||||
|
||||
if (!data) return 0;
|
||||
dat = eet_data_descriptor_decode(_e_ipc_double_edd, data, bytes);
|
||||
if (!dat) return 0;
|
||||
|
@ -203,7 +203,7 @@ EAPI void *
|
|||
e_ipc_codec_double_enc(double val, int *size_ret)
|
||||
{
|
||||
E_Ipc_Double dat;
|
||||
|
||||
|
||||
dat.val = val;
|
||||
return eet_data_descriptor_encode(_e_ipc_double_edd, &dat, size_ret);
|
||||
}
|
||||
|
@ -212,7 +212,7 @@ EAPI int
|
|||
e_ipc_codec_2int_dec(char *data, int bytes, int *dest, int *dest2)
|
||||
{
|
||||
E_Ipc_2Int *dat;
|
||||
|
||||
|
||||
if (!data) return 0;
|
||||
dat = eet_data_descriptor_decode(_e_ipc_2int_edd, data, bytes);
|
||||
if (!dat) return 0;
|
||||
|
@ -226,7 +226,7 @@ EAPI void *
|
|||
e_ipc_codec_2int_enc(int val1, int val2, int *size_ret)
|
||||
{
|
||||
E_Ipc_2Int dat;
|
||||
|
||||
|
||||
dat.val1 = val1;
|
||||
dat.val2 = val2;
|
||||
return eet_data_descriptor_encode(_e_ipc_2int_edd, &dat, size_ret);
|
||||
|
@ -236,7 +236,7 @@ EAPI int
|
|||
e_ipc_codec_str_dec(char *data, int bytes, char **dest)
|
||||
{
|
||||
E_Ipc_Str *dat;
|
||||
|
||||
|
||||
if (!data) return 0;
|
||||
dat = eet_data_descriptor_decode(_e_ipc_str_edd, data, bytes);
|
||||
if (!dat) return 0;
|
||||
|
@ -249,7 +249,7 @@ EAPI void *
|
|||
e_ipc_codec_str_enc(const char *str, int *size_ret)
|
||||
{
|
||||
E_Ipc_Str dat;
|
||||
|
||||
|
||||
dat.str = (char *) str;
|
||||
return eet_data_descriptor_encode(_e_ipc_str_edd, &dat, size_ret);
|
||||
}
|
||||
|
@ -258,7 +258,7 @@ EAPI int
|
|||
e_ipc_codec_2str_dec(char *data, int bytes, E_Ipc_2Str **dest)
|
||||
{
|
||||
E_Ipc_2Str *dat;
|
||||
|
||||
|
||||
if (!data) return 0;
|
||||
dat = eet_data_descriptor_decode(_e_ipc_2str_edd, data, bytes);
|
||||
if (!dat) return 0;
|
||||
|
@ -270,7 +270,7 @@ EAPI void *
|
|||
e_ipc_codec_2str_enc(const char *str1, const char *str2, int *size_ret)
|
||||
{
|
||||
E_Ipc_2Str dat;
|
||||
|
||||
|
||||
dat.str1 = (char *) str1;
|
||||
dat.str2 = (char *) str2;
|
||||
return eet_data_descriptor_encode(_e_ipc_2str_edd, &dat, size_ret);
|
||||
|
@ -280,7 +280,7 @@ EAPI int
|
|||
e_ipc_codec_2str_list_dec(char *data, int bytes, Eina_List **dest)
|
||||
{
|
||||
E_Ipc_List *dat;
|
||||
|
||||
|
||||
if (!data) return 0;
|
||||
dat = eet_data_descriptor_decode(_e_ipc_2str_list_edd, data, bytes);
|
||||
if (!dat) return 0;
|
||||
|
@ -303,7 +303,7 @@ e_ipc_codec_str_list_dec(char *data, int bytes, Eina_List **dest)
|
|||
E_Ipc_List *dat;
|
||||
Eina_List *list = NULL, *l;
|
||||
E_Ipc_Str *str_node;
|
||||
|
||||
|
||||
if (!data) return 0;
|
||||
dat = eet_data_descriptor_decode(_e_ipc_str_list_edd, data, bytes);
|
||||
if (!dat) return 0;
|
||||
|
@ -325,7 +325,7 @@ e_ipc_codec_str_list_enc(Eina_List *list, int *size_ret)
|
|||
E_Ipc_Str *str_node;
|
||||
char *str;
|
||||
void *data;
|
||||
|
||||
|
||||
dat.list = NULL;
|
||||
EINA_LIST_FOREACH(list, l, str)
|
||||
{
|
||||
|
@ -342,7 +342,7 @@ EAPI int
|
|||
e_ipc_codec_str_int_dec(char *data, int bytes, E_Ipc_Str_Int **dest)
|
||||
{
|
||||
E_Ipc_Str_Int *dat;
|
||||
|
||||
|
||||
if (!data) return 0;
|
||||
dat = eet_data_descriptor_decode(_e_ipc_str_int_edd, data, bytes);
|
||||
if (!dat) return 0;
|
||||
|
@ -354,7 +354,7 @@ EAPI void *
|
|||
e_ipc_codec_str_int_enc(const char *str, int val, int *size_ret)
|
||||
{
|
||||
E_Ipc_Str_Int dat;
|
||||
|
||||
|
||||
dat.str = (char *) str;
|
||||
dat.val = val;
|
||||
return eet_data_descriptor_encode(_e_ipc_str_int_edd, &dat, size_ret);
|
||||
|
@ -364,7 +364,7 @@ EAPI int
|
|||
e_ipc_codec_str_int_list_dec(char *data, int bytes, Eina_List **dest)
|
||||
{
|
||||
E_Ipc_List *dat;
|
||||
|
||||
|
||||
if (!data) return 0;
|
||||
dat = eet_data_descriptor_decode(_e_ipc_str_int_list_edd, data, bytes);
|
||||
if (!dat) return 0;
|
||||
|
@ -385,7 +385,7 @@ EAPI int
|
|||
e_ipc_codec_2str_int_dec(char *data, int bytes, E_Ipc_2Str_Int **dest)
|
||||
{
|
||||
E_Ipc_2Str_Int *dat;
|
||||
|
||||
|
||||
if (!data) return 0;
|
||||
dat = eet_data_descriptor_decode(_e_ipc_2str_int_edd, data, bytes);
|
||||
if (!dat) return 0;
|
||||
|
@ -397,7 +397,7 @@ EAPI void *
|
|||
e_ipc_codec_2str_int_enc(const char *str1, const char *str2, int val, int *size_ret)
|
||||
{
|
||||
E_Ipc_2Str_Int dat;
|
||||
|
||||
|
||||
dat.str1 = (char *) str1;
|
||||
dat.str2 = (char *) str2;
|
||||
dat.val = val;
|
||||
|
@ -408,7 +408,7 @@ EAPI int
|
|||
e_ipc_codec_2str_int_list_dec(char *data, int bytes, Eina_List **dest)
|
||||
{
|
||||
E_Ipc_List *dat;
|
||||
|
||||
|
||||
if (!data) return 0;
|
||||
dat = eet_data_descriptor_decode(_e_ipc_2str_int_list_edd, data, bytes);
|
||||
if (!dat) return 0;
|
||||
|
@ -448,7 +448,7 @@ e_ipc_codec_4int_2str_enc(int val1, int val2, int val3, int val4, const char *st
|
|||
dat.val4 = val4;
|
||||
dat.str1 = (char *) str1;
|
||||
dat.str2 = (char *) str2;
|
||||
return eet_data_descriptor_encode(_e_ipc_4int_2str_edd, &dat, size_ret);
|
||||
return eet_data_descriptor_encode(_e_ipc_4int_2str_edd, &dat, size_ret);
|
||||
}
|
||||
|
||||
EAPI int
|
||||
|
@ -496,7 +496,7 @@ e_ipc_codec_5int_2str_enc(int val1, int val2, int val3, int val4, int val5, cons
|
|||
dat.val5 = val5;
|
||||
dat.str1 = (char *) str1;
|
||||
dat.str2 = (char *) str2;
|
||||
return eet_data_descriptor_encode(_e_ipc_5int_2str_edd, &dat, size_ret);
|
||||
return eet_data_descriptor_encode(_e_ipc_5int_2str_edd, &dat, size_ret);
|
||||
}
|
||||
|
||||
EAPI int
|
||||
|
@ -544,7 +544,7 @@ e_ipc_codec_3int_4str_enc(int val1, int val2, int val3, const char *str1, const
|
|||
dat.str2 = (char *) str2;
|
||||
dat.str3 = (char *) str3;
|
||||
dat.str4 = (char *) str4;
|
||||
return eet_data_descriptor_encode(_e_ipc_3int_4str_edd, &dat, size_ret);
|
||||
return eet_data_descriptor_encode(_e_ipc_3int_4str_edd, &dat, size_ret);
|
||||
}
|
||||
|
||||
EAPI int
|
||||
|
@ -591,7 +591,7 @@ e_ipc_codec_3int_3str_enc(int val1, int val2, int val3, const char *str1, const
|
|||
dat.str1 = (char *) str1;
|
||||
dat.str2 = (char *) str2;
|
||||
dat.str3 = (char *) str3;
|
||||
return eet_data_descriptor_encode(_e_ipc_3int_3str_edd, &dat, size_ret);
|
||||
return eet_data_descriptor_encode(_e_ipc_3int_3str_edd, &dat, size_ret);
|
||||
}
|
||||
|
||||
EAPI int
|
||||
|
@ -665,4 +665,3 @@ e_ipc_codec_str_4int_list_enc(Eina_List *list, int *size_ret)
|
|||
/* local subsystem globals */
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
@ -128,22 +128,22 @@ EAPI void *e_ipc_codec_2str_int_list_enc(Eina_List *list, int *size_ret);
|
|||
EAPI int e_ipc_codec_4int_2str_dec(char *data, int bytes, E_Ipc_4Int_2Str **dest);
|
||||
EAPI void *e_ipc_codec_4int_2str_enc(int val1, int val2, int val3, int val4, const char *str1, const char *str2, int *size_ret);
|
||||
EAPI int e_ipc_codec_4int_2str_list_dec(char *data, int bytes, Eina_List **dest);
|
||||
EAPI void *e_ipc_codec_4int_2str_list_enc(Eina_List *list, int *size_ret);
|
||||
EAPI void *e_ipc_codec_4int_2str_list_enc(Eina_List *list, int *size_ret);
|
||||
|
||||
EAPI int e_ipc_codec_5int_2str_dec(char *data, int bytes, E_Ipc_5Int_2Str **dest);
|
||||
EAPI void *e_ipc_codec_5int_2str_enc(int val1, int val2, int val3, int val4, int val5, const char *str1, const char *str2, int *size_ret);
|
||||
EAPI int e_ipc_codec_5int_2str_list_dec(char *data, int bytes, Eina_List **dest);
|
||||
EAPI void *e_ipc_codec_5int_2str_list_enc(Eina_List *list, int *size_ret);
|
||||
EAPI void *e_ipc_codec_5int_2str_list_enc(Eina_List *list, int *size_ret);
|
||||
|
||||
EAPI int e_ipc_codec_3int_4str_dec(char *data, int bytes, E_Ipc_3Int_4Str **dest);
|
||||
EAPI void *e_ipc_codec_3int_4str_enc(int val1, int val2, int val3, const char *str1, const char *str2, const char *str3, const char *str4, int *size_ret);
|
||||
EAPI int e_ipc_codec_3int_4str_list_dec(char *data, int bytes, Eina_List **dest);
|
||||
EAPI void *e_ipc_codec_3int_4str_list_enc(Eina_List *list, int *size_ret);
|
||||
EAPI void *e_ipc_codec_3int_4str_list_enc(Eina_List *list, int *size_ret);
|
||||
|
||||
EAPI int e_ipc_codec_3int_3str_dec(char *data, int bytes, E_Ipc_3Int_3Str **dest);
|
||||
EAPI void *e_ipc_codec_3int_3str_enc(int val1, int val2, int val3, const char *str1, const char *str2, const char *str3, int *size_ret);
|
||||
EAPI int e_ipc_codec_3int_3str_list_dec(char *data, int bytes, Eina_List **dest);
|
||||
EAPI void *e_ipc_codec_3int_3str_list_enc(Eina_List *list, int *size_ret);
|
||||
EAPI void *e_ipc_codec_3int_3str_list_enc(Eina_List *list, int *size_ret);
|
||||
|
||||
EAPI int e_ipc_codec_str_4int_dec(char *data, int bytes, E_Ipc_Str_4Int **dest);
|
||||
EAPI void *e_ipc_codec_str_4int_enc(const char *str1, int val1, int val2, int val3, int val4, int *size_ret);
|
||||
|
|
|
@ -7,7 +7,7 @@ typedef struct _E_Smart_Data E_Smart_Data;
|
|||
typedef struct _E_Layout_Item E_Layout_Item;
|
||||
|
||||
struct _E_Smart_Data
|
||||
{
|
||||
{
|
||||
Evas_Coord x, y, w, h;
|
||||
Evas_Coord vw, vh;
|
||||
Evas_Object *obj;
|
||||
|
@ -15,7 +15,7 @@ struct _E_Smart_Data
|
|||
int frozen;
|
||||
unsigned char changed : 1;
|
||||
Eina_List *items;
|
||||
};
|
||||
};
|
||||
|
||||
struct _E_Layout_Item
|
||||
{
|
||||
|
@ -57,7 +57,7 @@ EAPI int
|
|||
e_layout_freeze(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(0);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
sd->frozen++;
|
||||
|
@ -68,7 +68,7 @@ EAPI int
|
|||
e_layout_thaw(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERR(0);
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
sd->frozen--;
|
||||
|
@ -80,7 +80,7 @@ EAPI void
|
|||
e_layout_virtual_size_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERRNR();
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (w < 1) w = 1;
|
||||
|
@ -96,7 +96,7 @@ EAPI void
|
|||
e_layout_virtual_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERRNR();
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (w) *w = sd->vw;
|
||||
|
@ -132,7 +132,7 @@ e_layout_pack(Evas_Object *obj, Evas_Object *child)
|
|||
{
|
||||
E_Smart_Data *sd;
|
||||
E_Layout_Item *li;
|
||||
|
||||
|
||||
if (evas_object_smart_smart_get(obj) != _e_smart) SMARTERRNR();
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
_e_layout_smart_adopt(sd, child);
|
||||
|
@ -145,7 +145,7 @@ EAPI void
|
|||
e_layout_child_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
|
||||
{
|
||||
E_Layout_Item *li;
|
||||
|
||||
|
||||
li = evas_object_data_get(obj, "e_layout_data");
|
||||
if (!li) return;
|
||||
if ((li->x == x) && (li->y == y)) return;
|
||||
|
@ -158,7 +158,7 @@ EAPI void
|
|||
e_layout_child_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
|
||||
{
|
||||
E_Layout_Item *li;
|
||||
|
||||
|
||||
li = evas_object_data_get(obj, "e_layout_data");
|
||||
if (!li) return;
|
||||
if (w < 0) w = 0;
|
||||
|
@ -173,7 +173,7 @@ EAPI void
|
|||
e_layout_child_lower(Evas_Object *obj)
|
||||
{
|
||||
E_Layout_Item *li;
|
||||
|
||||
|
||||
li = evas_object_data_get(obj, "e_layout_data");
|
||||
if (!li) return;
|
||||
if (!eina_list_data_find(li->sd->items, obj)) return;
|
||||
|
@ -189,7 +189,7 @@ EAPI void
|
|||
e_layout_child_raise(Evas_Object *obj)
|
||||
{
|
||||
E_Layout_Item *li;
|
||||
|
||||
|
||||
li = evas_object_data_get(obj, "e_layout_data");
|
||||
if (!li) return;
|
||||
if (!eina_list_data_find(li->sd->items, obj)) return;
|
||||
|
@ -205,7 +205,7 @@ EAPI void
|
|||
e_layout_child_lower_below(Evas_Object *obj, Evas_Object *below)
|
||||
{
|
||||
E_Layout_Item *li;
|
||||
|
||||
|
||||
li = evas_object_data_get(obj, "e_layout_data");
|
||||
if (!li) return;
|
||||
if (!eina_list_data_find(li->sd->items, below)) return;
|
||||
|
@ -222,7 +222,7 @@ EAPI void
|
|||
e_layout_child_raise_above(Evas_Object *obj, Evas_Object *above)
|
||||
{
|
||||
E_Layout_Item *li;
|
||||
|
||||
|
||||
li = evas_object_data_get(obj, "e_layout_data");
|
||||
if (!li) return;
|
||||
if (!eina_list_data_find(li->sd->items, above)) return;
|
||||
|
@ -242,7 +242,7 @@ e_layout_child_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas
|
|||
|
||||
li = evas_object_data_get(obj, "e_layout_data");
|
||||
if (!li) return;
|
||||
|
||||
|
||||
if (x) *x = li->x;
|
||||
if (y) *y = li->y;
|
||||
if (w) *w = li->w;
|
||||
|
@ -254,7 +254,7 @@ e_layout_unpack(Evas_Object *obj)
|
|||
{
|
||||
E_Layout_Item *li;
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
li = evas_object_data_get(obj, "e_layout_data");
|
||||
if (!li) return;
|
||||
sd = li->sd;
|
||||
|
@ -267,7 +267,7 @@ static E_Layout_Item *
|
|||
_e_layout_smart_adopt(E_Smart_Data *sd, Evas_Object *obj)
|
||||
{
|
||||
E_Layout_Item *li;
|
||||
|
||||
|
||||
li = calloc(1, sizeof(E_Layout_Item));
|
||||
if (!li) return NULL;
|
||||
li->sd = sd;
|
||||
|
@ -292,7 +292,7 @@ static void
|
|||
_e_layout_smart_disown(Evas_Object *obj)
|
||||
{
|
||||
E_Layout_Item *li;
|
||||
|
||||
|
||||
li = evas_object_data_get(obj, "e_layout_data");
|
||||
if (!li) return;
|
||||
if (!li->sd->items)
|
||||
|
@ -321,7 +321,7 @@ _e_layout_smart_reconfigure(E_Smart_Data *sd)
|
|||
Evas_Object *obj;
|
||||
|
||||
if (!sd->changed) return;
|
||||
|
||||
|
||||
EINA_LIST_FOREACH(sd->items, l, obj)
|
||||
{
|
||||
E_Layout_Item *li;
|
||||
|
@ -376,7 +376,7 @@ static void
|
|||
_e_layout_smart_add(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = calloc(1, sizeof(E_Smart_Data));
|
||||
if (!sd) return;
|
||||
sd->obj = obj;
|
||||
|
@ -393,18 +393,18 @@ _e_layout_smart_add(Evas_Object *obj)
|
|||
evas_object_color_set(sd->clip, 255, 255, 255, 255);
|
||||
evas_object_smart_data_set(obj, sd);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
_e_layout_smart_del(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
while (sd->items)
|
||||
{
|
||||
Evas_Object *child;
|
||||
|
||||
|
||||
child = eina_list_data_get(sd->items);
|
||||
e_layout_unpack(child);
|
||||
}
|
||||
|
@ -417,7 +417,7 @@ _e_layout_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
|
|||
{
|
||||
E_Smart_Data *sd;
|
||||
Evas_Object *item;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
if ((x == sd->x) && (y == sd->y)) return;
|
||||
|
@ -425,13 +425,13 @@ _e_layout_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
|
|||
{
|
||||
Eina_List *l;
|
||||
Evas_Coord dx, dy;
|
||||
|
||||
|
||||
dx = x - sd->x;
|
||||
dy = y - sd->y;
|
||||
EINA_LIST_FOREACH(sd->items, l, item)
|
||||
{
|
||||
Evas_Coord ox, oy;
|
||||
|
||||
|
||||
evas_object_geometry_get(item, &ox, &oy, NULL, NULL);
|
||||
evas_object_move(item, ox + dx, oy + dy);
|
||||
}
|
||||
|
@ -444,7 +444,7 @@ static void
|
|||
_e_layout_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
if ((w == sd->w) && (h == sd->h)) return;
|
||||
|
@ -458,7 +458,7 @@ static void
|
|||
_e_layout_smart_show(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
if (sd->items) evas_object_show(sd->clip);
|
||||
|
@ -468,7 +468,7 @@ static void
|
|||
_e_layout_smart_hide(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
evas_object_hide(sd->clip);
|
||||
|
@ -478,9 +478,9 @@ static void
|
|||
_e_layout_smart_color_set(Evas_Object *obj, int r, int g, int b, int a)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
if (!sd) return;
|
||||
evas_object_color_set(sd->clip, r, g, b, a);
|
||||
}
|
||||
|
||||
|
@ -488,7 +488,7 @@ static void
|
|||
_e_layout_smart_clip_set(Evas_Object *obj, Evas_Object *clip)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
evas_object_clip_set(sd->clip, clip);
|
||||
|
@ -498,8 +498,8 @@ static void
|
|||
_e_layout_smart_clip_unset(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = evas_object_smart_data_get(obj);
|
||||
if (!sd) return;
|
||||
evas_object_clip_unset(sd->clip);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -7,15 +7,15 @@ typedef struct _E_Smart_Data E_Smart_Data;
|
|||
typedef struct _E_Smart_Item E_Smart_Item;
|
||||
|
||||
struct _E_Smart_Data
|
||||
{
|
||||
{
|
||||
Evas_Coord x, y, w, h;
|
||||
|
||||
|
||||
Evas_Object *smart_obj;
|
||||
Evas_Object *evas_obj;
|
||||
Evas_Object *thumb_obj;
|
||||
Evas *evas;
|
||||
Evas_Coord vw, vh;
|
||||
};
|
||||
};
|
||||
|
||||
/* local subsystem functions */
|
||||
static void _e_smart_reconfigure(E_Smart_Data *sd);
|
||||
|
@ -88,7 +88,7 @@ e_livethumb_thumb_get(Evas_Object *obj)
|
|||
API_ENTRY return NULL;
|
||||
return sd->thumb_obj;
|
||||
}
|
||||
|
||||
|
||||
/* local subsystem functions */
|
||||
|
||||
static void
|
||||
|
@ -103,11 +103,11 @@ static void
|
|||
_e_smart_add(Evas_Object *obj)
|
||||
{
|
||||
E_Smart_Data *sd;
|
||||
|
||||
|
||||
sd = calloc(1, sizeof(E_Smart_Data));
|
||||
if (!sd) return;
|
||||
evas_object_smart_data_set(obj, sd);
|
||||
|
||||
|
||||
sd->smart_obj = obj;
|
||||
sd->x = 0;
|
||||
sd->y = 0;
|
||||
|
@ -186,7 +186,7 @@ _e_smart_clip_unset(Evas_Object *obj)
|
|||
{
|
||||
INTERNAL_ENTRY;
|
||||
evas_object_clip_unset(sd->evas_obj);
|
||||
}
|
||||
}
|
||||
|
||||
/* never need to touch this */
|
||||
|
||||
|
@ -200,7 +200,7 @@ _e_smart_init(void)
|
|||
SMART_NAME,
|
||||
EVAS_SMART_CLASS_VERSION,
|
||||
_e_smart_add,
|
||||
_e_smart_del,
|
||||
_e_smart_del,
|
||||
_e_smart_move,
|
||||
_e_smart_resize,
|
||||
_e_smart_show,
|
||||
|
@ -219,4 +219,3 @@ _e_smart_init(void)
|
|||
_e_smart = evas_smart_class_new(&sc);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -9,6 +9,6 @@ EAPI void e_livethumb_vsize_set (Evas_Object *obj, Evas_Coor
|
|||
EAPI void e_livethumb_vsize_get (Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
|
||||
EAPI void e_livethumb_thumb_set (Evas_Object *obj, Evas_Object *thumb);
|
||||
EAPI Evas_Object *e_livethumb_thumb_get (Evas_Object *obj);
|
||||
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
@ -1816,4 +1816,3 @@ _e_main_cb_startup_fake_end(void *data __UNUSED__)
|
|||
e_init_hide();
|
||||
return ECORE_CALLBACK_CANCEL;
|
||||
}
|
||||
|
||||
|
|
|
@ -95,51 +95,51 @@ e_manager_new(Ecore_X_Window root, int num)
|
|||
ecore_x_window_size_get(man->root, &(man->w), &(man->h));
|
||||
man->win = man->root;
|
||||
|
||||
man->handlers =
|
||||
eina_list_append(man->handlers,
|
||||
ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHOW_REQUEST,
|
||||
_e_manager_cb_window_show_request,
|
||||
man->handlers =
|
||||
eina_list_append(man->handlers,
|
||||
ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHOW_REQUEST,
|
||||
_e_manager_cb_window_show_request,
|
||||
man));
|
||||
man->handlers =
|
||||
eina_list_append(man->handlers,
|
||||
ecore_event_handler_add(ECORE_X_EVENT_WINDOW_CONFIGURE,
|
||||
_e_manager_cb_window_configure,
|
||||
man->handlers =
|
||||
eina_list_append(man->handlers,
|
||||
ecore_event_handler_add(ECORE_X_EVENT_WINDOW_CONFIGURE,
|
||||
_e_manager_cb_window_configure,
|
||||
man));
|
||||
man->handlers =
|
||||
eina_list_append(man->handlers,
|
||||
ecore_event_handler_add(ECORE_EVENT_KEY_DOWN,
|
||||
_e_manager_cb_key_down,
|
||||
man->handlers =
|
||||
eina_list_append(man->handlers,
|
||||
ecore_event_handler_add(ECORE_EVENT_KEY_DOWN,
|
||||
_e_manager_cb_key_down,
|
||||
man));
|
||||
man->handlers =
|
||||
eina_list_append(man->handlers,
|
||||
ecore_event_handler_add(ECORE_EVENT_KEY_UP,
|
||||
_e_manager_cb_key_up,
|
||||
man->handlers =
|
||||
eina_list_append(man->handlers,
|
||||
ecore_event_handler_add(ECORE_EVENT_KEY_UP,
|
||||
_e_manager_cb_key_up,
|
||||
man));
|
||||
man->handlers =
|
||||
eina_list_append(man->handlers,
|
||||
ecore_event_handler_add(ECORE_X_EVENT_FRAME_EXTENTS_REQUEST,
|
||||
_e_manager_cb_frame_extents_request,
|
||||
man->handlers =
|
||||
eina_list_append(man->handlers,
|
||||
ecore_event_handler_add(ECORE_X_EVENT_FRAME_EXTENTS_REQUEST,
|
||||
_e_manager_cb_frame_extents_request,
|
||||
man));
|
||||
man->handlers =
|
||||
eina_list_append(man->handlers,
|
||||
ecore_event_handler_add(ECORE_X_EVENT_PING,
|
||||
_e_manager_cb_ping,
|
||||
man->handlers =
|
||||
eina_list_append(man->handlers,
|
||||
ecore_event_handler_add(ECORE_X_EVENT_PING,
|
||||
_e_manager_cb_ping,
|
||||
man));
|
||||
man->handlers =
|
||||
eina_list_append(man->handlers,
|
||||
ecore_event_handler_add(ECORE_X_EVENT_SCREENSAVER_NOTIFY,
|
||||
_e_manager_cb_screensaver_notify,
|
||||
man->handlers =
|
||||
eina_list_append(man->handlers,
|
||||
ecore_event_handler_add(ECORE_X_EVENT_SCREENSAVER_NOTIFY,
|
||||
_e_manager_cb_screensaver_notify,
|
||||
man));
|
||||
man->handlers =
|
||||
eina_list_append(man->handlers,
|
||||
ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE,
|
||||
_e_manager_cb_client_message,
|
||||
man->handlers =
|
||||
eina_list_append(man->handlers,
|
||||
ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE,
|
||||
_e_manager_cb_client_message,
|
||||
man));
|
||||
|
||||
man->pointer = e_pointer_window_new(man->root, 1);
|
||||
|
||||
ecore_x_window_background_color_set(man->root, 0, 0, 0);
|
||||
|
||||
|
||||
man->clear_timer = ecore_timer_add(10.0, _e_manager_clear_timer, man);
|
||||
return man;
|
||||
}
|
||||
|
@ -208,9 +208,9 @@ e_manager_manage_windows(E_Manager *man)
|
|||
}
|
||||
/* XXX manage xembed windows as long as they are not override_redirect..
|
||||
* if (!ecore_x_window_prop_property_get(windows[i],
|
||||
* atom_xmbed,
|
||||
* atom_xmbed, 32,
|
||||
* &data, &count))
|
||||
* atom_xmbed,
|
||||
* atom_xmbed, 32,
|
||||
* &data, &count))
|
||||
* data = NULL;
|
||||
* if (!data) */
|
||||
{
|
||||
|
@ -1015,7 +1015,7 @@ _e_manager_cb_client_message(void *data __UNUSED__, int ev_type __UNUSED__, void
|
|||
causing the pointer to jump back and forth. */
|
||||
if ((e_config->focus_policy != E_FOCUS_CLICK) &&
|
||||
!(bd->client.icccm.name && !strcmp(bd->client.icccm.name, "VCLSalFrame")))
|
||||
ecore_x_pointer_warp(bd->zone->container->win,
|
||||
ecore_x_pointer_warp(bd->zone->container->win,
|
||||
bd->x + (bd->w / 2), bd->y + (bd->h / 2));
|
||||
e_border_focus_set(bd, 1, 1);
|
||||
}
|
||||
|
|
|
@ -9,11 +9,11 @@ typedef struct _E_Manager_Comp_Source E_Manager_Comp_Source;
|
|||
#define E_MANAGER_H
|
||||
|
||||
#define E_MANAGER_TYPE (int) 0xE0b01008
|
||||
|
||||
|
||||
struct _E_Manager
|
||||
{
|
||||
E_Object e_obj_inherit;
|
||||
|
||||
|
||||
Ecore_X_Window win;
|
||||
int num;
|
||||
int x, y, w, h;
|
||||
|
@ -24,7 +24,7 @@ struct _E_Manager
|
|||
|
||||
E_Pointer *pointer;
|
||||
Ecore_X_Window initwin;
|
||||
|
||||
|
||||
E_Manager_Comp *comp;
|
||||
Ecore_Timer *clear_timer;
|
||||
};
|
||||
|
@ -52,7 +52,7 @@ struct _E_Manager_Comp
|
|||
EINTERN int e_manager_init(void);
|
||||
EINTERN int e_manager_shutdown(void);
|
||||
EAPI Eina_List *e_manager_list(void);
|
||||
|
||||
|
||||
EAPI E_Manager *e_manager_new(Ecore_X_Window root, int num);
|
||||
EAPI void e_manager_manage_windows(E_Manager *man);
|
||||
EAPI void e_manager_show(E_Manager *man);
|
||||
|
@ -101,13 +101,13 @@ EAPI void e_managers_keys_ungrab(void);
|
|||
// }
|
||||
// }
|
||||
// e_msg_handler_add(handler, mydata);
|
||||
//
|
||||
//
|
||||
// remember to listen to zone confiugre events like:
|
||||
// E_EVENT_ZONE_MOVE_RESIZE
|
||||
// E_EVENT_ZONE_ADD
|
||||
// E_EVENT_ZONE_DEL
|
||||
//
|
||||
// only 1 compositor can own a manager at a time, so before you "set" the
|
||||
//
|
||||
// only 1 compositor can own a manager at a time, so before you "set" the
|
||||
// comp evas, you need to get it and make sure it's NULL, if so, then
|
||||
// you can set the update func and the comp evas
|
||||
EAPI void e_manager_comp_set(E_Manager *man, E_Manager_Comp *comp);
|
||||
|
|
|
@ -15,7 +15,7 @@ struct _E_Maximize_Rect
|
|||
}
|
||||
|
||||
static void _e_maximize_border_rects_fill(E_Border *bd, Eina_List *list, int *x1, int *yy1, int *x2, int *y2, E_Maximize dir);
|
||||
static void _e_maximize_border_rects_fill_both(E_Border *bd, Eina_List *rects, int *x1, int *yy1, int *x2, int *y2);
|
||||
static void _e_maximize_border_rects_fill_both(E_Border *bd, Eina_List *rects, int *x1, int *yy1, int *x2, int *y2);
|
||||
static void _e_maximize_border_rects_fill_horiz(E_Border *bd, Eina_List *rects, int *x1, int *x2, int *bx, int *by, int *bw, int *bh);
|
||||
static void _e_maximize_border_rects_fill_vert(E_Border *bd, Eina_List *rects, int *yy1, int *y2, int *bx, int *by, int *bw, int *bh);
|
||||
|
||||
|
@ -34,10 +34,10 @@ e_maximize_border_dock_fit(E_Border *bd, int *x1, int *yy1, int *x2, int *y2)
|
|||
|
||||
cx1 = bd->zone->x;
|
||||
if (x1) cx1 = *x1;
|
||||
|
||||
|
||||
cy1 = bd->zone->y;
|
||||
if (yy1) cy1 = *yy1;
|
||||
|
||||
|
||||
cx2 = bd->zone->x + bd->zone->w;
|
||||
if (x2) cx2 = *x2;
|
||||
|
||||
|
@ -54,7 +54,7 @@ e_maximize_border_dock_fit(E_Border *bd, int *x1, int *yy1, int *x2, int *y2)
|
|||
BOTTOM,
|
||||
LEFT
|
||||
} edge = NONE;
|
||||
|
||||
|
||||
if ((bd2->zone != bd->zone) || (bd2 == bd) ||
|
||||
(bd2->client.netwm.type != ECORE_X_WINDOW_TYPE_DOCK))
|
||||
continue;
|
||||
|
@ -142,7 +142,7 @@ e_maximize_border_shelf_fill(E_Border *bd, int *x1, int *yy1, int *x2, int *y2,
|
|||
if (!sd) continue;
|
||||
if ((sd->x == bd->desk->x) && (sd->y == bd->desk->y))
|
||||
{
|
||||
OBSTACLE(es->x + es->zone->x, es->y + es->zone->y,
|
||||
OBSTACLE(es->x + es->zone->x, es->y + es->zone->y,
|
||||
es->x + es->zone->x + es->w, es->y + es->zone->y + es->h);
|
||||
break;
|
||||
}
|
||||
|
@ -150,7 +150,7 @@ e_maximize_border_shelf_fill(E_Border *bd, int *x1, int *yy1, int *x2, int *y2,
|
|||
}
|
||||
else
|
||||
{
|
||||
OBSTACLE(es->x + es->zone->x, es->y + es->zone->y,
|
||||
OBSTACLE(es->x + es->zone->x, es->y + es->zone->y,
|
||||
es->x + es->zone->x + es->w, es->y + es->zone->y + es->h);
|
||||
}
|
||||
}
|
||||
|
@ -203,7 +203,7 @@ _e_maximize_border_rects_fill(E_Border *bd, Eina_List *rects, int *x1, int *yy1,
|
|||
if ((dir & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_HORIZONTAL)
|
||||
_e_maximize_border_rects_fill_horiz(bd, rects, x1, x2, &bx, &by, &bw, &bh);
|
||||
else if ((dir & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_VERTICAL)
|
||||
_e_maximize_border_rects_fill_vert(bd, rects, yy1, y2, &bx, &by, &bw, &bh);
|
||||
_e_maximize_border_rects_fill_vert(bd, rects, yy1, y2, &bx, &by, &bw, &bh);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -216,10 +216,10 @@ _e_maximize_border_rects_fill_both(E_Border *bd, Eina_List *rects, int *x1, int
|
|||
|
||||
hx1 = vx1 = bd->zone->x;
|
||||
if (x1) hx1 = vx1 = *x1;
|
||||
|
||||
|
||||
hy1 = vy1 = bd->zone->y;
|
||||
if (yy1) hy1 = vy1 = *yy1;
|
||||
|
||||
|
||||
hx2 = vx2 = bd->zone->x + bd->zone->w;
|
||||
if (x2) hx2 = vx2 = *x2;
|
||||
|
||||
|
@ -268,7 +268,7 @@ _e_maximize_border_rects_fill_horiz(E_Border *bd, Eina_List *rects, int *x1, int
|
|||
|
||||
cx1 = bd->zone->x;
|
||||
if (x1) cx1 = *x1;
|
||||
|
||||
|
||||
cx2 = bd->zone->x + bd->zone->w;
|
||||
if (x2) cx2 = *x2;
|
||||
|
||||
|
@ -294,7 +294,7 @@ _e_maximize_border_rects_fill_horiz(E_Border *bd, Eina_List *rects, int *x1, int
|
|||
}
|
||||
}
|
||||
*bw = (cx2 - cx1);
|
||||
|
||||
|
||||
if (x1) *x1 = cx1;
|
||||
if (x2) *x2 = cx2;
|
||||
}
|
||||
|
@ -308,7 +308,7 @@ _e_maximize_border_rects_fill_vert(E_Border *bd, Eina_List *rects, int *yy1, int
|
|||
|
||||
cy1 = bd->zone->y;
|
||||
if (yy1) cy1 = *yy1;
|
||||
|
||||
|
||||
cy2 = bd->zone->y + bd->zone->h;
|
||||
if (y2) cy2 = *y2;
|
||||
|
||||
|
@ -338,4 +338,3 @@ _e_maximize_border_rects_fill_vert(E_Border *bd, Eina_List *rects, int *yy1, int
|
|||
if (yy1) *yy1 = cy1;
|
||||
if (y2) *y2 = cy2;
|
||||
}
|
||||
|
||||
|
|
186
src/bin/e_menu.c
186
src/bin/e_menu.c
|
@ -1,7 +1,7 @@
|
|||
#include "e.h"
|
||||
|
||||
/* TODO List:
|
||||
*
|
||||
*
|
||||
* * support change of menu items after realize
|
||||
* * support add/del of menu items after realize
|
||||
* * support text/color classes
|
||||
|
@ -138,24 +138,24 @@ _e_menu_list_free_unref(Eina_List *l)
|
|||
EINTERN int
|
||||
e_menu_init(void)
|
||||
{
|
||||
_e_menu_key_down_handler =
|
||||
_e_menu_key_down_handler =
|
||||
ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, _e_menu_cb_key_down, NULL);
|
||||
_e_menu_key_up_handler =
|
||||
_e_menu_key_up_handler =
|
||||
ecore_event_handler_add(ECORE_EVENT_KEY_UP, _e_menu_cb_key_up, NULL);
|
||||
_e_menu_mouse_down_handler =
|
||||
ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN,
|
||||
_e_menu_mouse_down_handler =
|
||||
ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN,
|
||||
_e_menu_cb_mouse_down, NULL);
|
||||
_e_menu_mouse_up_handler =
|
||||
ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP,
|
||||
_e_menu_mouse_up_handler =
|
||||
ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP,
|
||||
_e_menu_cb_mouse_up, NULL);
|
||||
_e_menu_mouse_move_handler =
|
||||
ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE,
|
||||
_e_menu_mouse_move_handler =
|
||||
ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE,
|
||||
_e_menu_cb_mouse_move, NULL);
|
||||
_e_menu_mouse_wheel_handler =
|
||||
ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL,
|
||||
_e_menu_mouse_wheel_handler =
|
||||
ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL,
|
||||
_e_menu_cb_mouse_wheel, NULL);
|
||||
_e_menu_window_shape_handler =
|
||||
ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHAPE,
|
||||
_e_menu_window_shape_handler =
|
||||
ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHAPE,
|
||||
_e_menu_cb_window_shape, NULL);
|
||||
_e_menu_categories = eina_hash_string_superfast_new(NULL);
|
||||
|
||||
|
@ -573,7 +573,7 @@ EAPI E_Menu_Item *
|
|||
e_menu_item_new(E_Menu *m)
|
||||
{
|
||||
E_Menu_Item *mi;
|
||||
|
||||
|
||||
E_OBJECT_CHECK_RETURN(m, NULL);
|
||||
E_OBJECT_TYPE_CHECK_RETURN(m, E_MENU_TYPE, NULL);
|
||||
mi = E_OBJECT_ALLOC(E_Menu_Item, E_MENU_ITEM_TYPE, _e_menu_item_free);
|
||||
|
@ -595,24 +595,24 @@ e_menu_item_new_relative(E_Menu *m, E_Menu_Item *rel)
|
|||
E_OBJECT_TYPE_CHECK_RETURN(rel, E_MENU_ITEM_TYPE, NULL);
|
||||
if (rel->menu != m) return NULL;
|
||||
}
|
||||
|
||||
|
||||
mi = E_OBJECT_ALLOC(E_Menu_Item, E_MENU_ITEM_TYPE, _e_menu_item_free);
|
||||
mi->menu = m;
|
||||
|
||||
if (rel)
|
||||
{
|
||||
Eina_List *l;
|
||||
|
||||
|
||||
l = eina_list_data_find_list(m->items, rel);
|
||||
m->items = eina_list_append_relative_list(m->items, mi, l);
|
||||
mi->list_position = eina_list_data_find_list(m->items, mi);
|
||||
mi->list_position = eina_list_data_find_list(m->items, mi);
|
||||
}
|
||||
else
|
||||
{
|
||||
m->items = eina_list_prepend(m->items, mi);
|
||||
mi->list_position = m->items;
|
||||
}
|
||||
|
||||
|
||||
return mi;
|
||||
}
|
||||
|
||||
|
@ -649,7 +649,7 @@ e_menu_item_icon_file_set(E_Menu_Item *mi, const char *icon)
|
|||
E_OBJECT_CHECK(mi);
|
||||
E_OBJECT_TYPE_CHECK(mi, E_MENU_ITEM_TYPE);
|
||||
if (((mi->icon) && (icon) && (!strcmp(icon, mi->icon))) ||
|
||||
((!mi->icon) && (!icon)))
|
||||
((!mi->icon) && (!icon)))
|
||||
return;
|
||||
if (mi->icon) eina_stringshare_del(mi->icon);
|
||||
if (mi->icon_key) eina_stringshare_del(mi->icon_key);
|
||||
|
@ -672,7 +672,7 @@ e_menu_item_icon_edje_set(E_Menu_Item *mi, const char *icon, const char *key)
|
|||
E_OBJECT_CHECK(mi);
|
||||
E_OBJECT_TYPE_CHECK(mi, E_MENU_ITEM_TYPE);
|
||||
if (((mi->icon) && (icon) && (!strcmp(icon, mi->icon))) ||
|
||||
((!mi->icon) && (!icon)) ||
|
||||
((!mi->icon) && (!icon)) ||
|
||||
((key) && (mi->icon_key) && (!strcmp(key, mi->icon_key))))
|
||||
return;
|
||||
if (mi->icon) eina_stringshare_del(mi->icon);
|
||||
|
@ -691,7 +691,7 @@ e_menu_item_label_set(E_Menu_Item *mi, const char *label)
|
|||
E_OBJECT_CHECK(mi);
|
||||
E_OBJECT_TYPE_CHECK(mi, E_MENU_ITEM_TYPE);
|
||||
if (((mi->label) && (label) && (!strcmp(label, mi->label))) ||
|
||||
((!mi->label) && (!label)))
|
||||
((!mi->label) && (!label)))
|
||||
return;
|
||||
if (mi->label) eina_stringshare_del(mi->label);
|
||||
mi->label = NULL;
|
||||
|
@ -1115,7 +1115,7 @@ EAPI E_Menu *
|
|||
e_menu_find_by_window(Ecore_X_Window win)
|
||||
{
|
||||
E_Menu *m;
|
||||
|
||||
|
||||
m = eina_hash_find(_e_menu_hash, e_util_winid_str_get(win));
|
||||
if ((m) && (m->evas_win != win))
|
||||
return NULL;
|
||||
|
@ -1166,7 +1166,7 @@ _e_menu_item_free(E_Menu_Item *mi)
|
|||
{
|
||||
mi->submenu->parent_item = NULL;
|
||||
e_object_unref(E_OBJECT(mi->submenu)); /* added on submenu_set() */
|
||||
/* e_object_del(E_OBJECT(mi->submenu)); */
|
||||
/* e_object_del(E_OBJECT(mi->submenu)); */
|
||||
}
|
||||
if (mi->menu->realized) _e_menu_item_unrealize(mi);
|
||||
mi->menu->items = eina_list_remove(mi->menu->items, mi);
|
||||
|
@ -1234,12 +1234,12 @@ _e_menu_item_realize(E_Menu_Item *mi)
|
|||
Evas_Object *o;
|
||||
Evas_Coord ww, hh;
|
||||
|
||||
/* and set up initial item state */
|
||||
/* and set up initial item state */
|
||||
if (mi->separator)
|
||||
{
|
||||
o = edje_object_add(mi->menu->evas);
|
||||
mi->separator_object = o;
|
||||
e_theme_edje_object_set(o, "base/theme/menus",
|
||||
e_theme_edje_object_set(o, "base/theme/menus",
|
||||
"e/widgets/menu/default/separator");
|
||||
evas_object_show(o);
|
||||
edje_object_size_min_calc(mi->separator_object, &ww, &hh);
|
||||
|
@ -1326,7 +1326,7 @@ _e_menu_item_realize(E_Menu_Item *mi)
|
|||
evas_object_del(o);
|
||||
o = NULL;
|
||||
}
|
||||
|
||||
|
||||
/* FIXME: Not sure why there are two different tries to get the icon size, surely only the last one si needed. */
|
||||
/* FIXME: Do it this way later, when e_app_icon_add() just registers a request for an icon to be filled in when it's ready.
|
||||
if (mi->app)
|
||||
|
@ -1362,7 +1362,7 @@ _e_menu_item_realize(E_Menu_Item *mi)
|
|||
{
|
||||
o = e_icon_add(mi->menu->evas);
|
||||
mi->icon_object = o;
|
||||
e_icon_scale_size_set(o, e_util_icon_size_normalize(24 * e_scale));
|
||||
e_icon_scale_size_set(o, e_util_icon_size_normalize(24 * e_scale));
|
||||
e_icon_preload_set(mi->icon_object, 1);
|
||||
e_icon_file_set(o, mi->icon);
|
||||
e_icon_fill_inside_set(mi->icon_object, 1);
|
||||
|
@ -1383,16 +1383,16 @@ _e_menu_item_realize(E_Menu_Item *mi)
|
|||
{
|
||||
edje_extern_object_min_size_set(mi->icon_object,
|
||||
icon_w, icon_h);
|
||||
edje_object_part_swallow(mi->icon_bg_object,
|
||||
"e.swallow.content",
|
||||
edje_object_part_swallow(mi->icon_bg_object,
|
||||
"e.swallow.content",
|
||||
mi->icon_object);
|
||||
edje_object_size_min_calc(mi->icon_bg_object, &ww, &hh);
|
||||
mi->icon_w = ww;
|
||||
mi->icon_h = hh;
|
||||
|
||||
edje_extern_object_min_size_set(mi->icon_object, 0, 0);
|
||||
edje_object_part_swallow(mi->icon_bg_object,
|
||||
"e.swallow.content",
|
||||
edje_object_part_swallow(mi->icon_bg_object,
|
||||
"e.swallow.content",
|
||||
mi->icon_object);
|
||||
e_box_pack_end(mi->container_object, mi->icon_bg_object);
|
||||
}
|
||||
|
@ -1459,7 +1459,7 @@ _e_menu_item_realize(E_Menu_Item *mi)
|
|||
e_box_pack_end(mi->container_object, o);
|
||||
}
|
||||
|
||||
edje_object_part_swallow(mi->bg_object, "e.swallow.content",
|
||||
edje_object_part_swallow(mi->bg_object, "e.swallow.content",
|
||||
mi->container_object);
|
||||
|
||||
o = evas_object_rectangle_add(mi->menu->evas);
|
||||
|
@ -1468,7 +1468,7 @@ _e_menu_item_realize(E_Menu_Item *mi)
|
|||
evas_object_repeat_events_set(o, 1);
|
||||
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_IN,
|
||||
_e_menu_cb_item_in, mi);
|
||||
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_OUT,
|
||||
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_OUT,
|
||||
_e_menu_cb_item_out, mi);
|
||||
evas_object_show(o);
|
||||
mi->event_object = o;
|
||||
|
@ -1499,13 +1499,13 @@ _e_menu_realize(E_Menu *m)
|
|||
m->shape = e_container_shape_add(m->zone->container);
|
||||
e_container_shape_move(m->shape, m->cur.x, m->cur.y);
|
||||
e_container_shape_resize(m->shape, m->cur.w, m->cur.h);
|
||||
|
||||
|
||||
ecore_evas_callback_resize_set(m->ecore_evas, _e_menu_cb_ecore_evas_resize);
|
||||
m->evas = ecore_evas_get(m->ecore_evas);
|
||||
evas_event_freeze(m->evas);
|
||||
/* move cursor out to avoid event cycles during setup */
|
||||
evas_event_feed_mouse_in(m->evas, ecore_x_current_time_get(), NULL);
|
||||
evas_event_feed_mouse_move(m->evas, -1000000, -1000000,
|
||||
evas_event_feed_mouse_move(m->evas, -1000000, -1000000,
|
||||
ecore_x_current_time_get(), NULL);
|
||||
ecore_x_window_shape_events_select(m->evas_win, 1);
|
||||
ecore_evas_name_class_set(m->ecore_evas, "E", "_e_menu_window");
|
||||
|
@ -1538,7 +1538,7 @@ _e_menu_realize(E_Menu *m)
|
|||
evas_object_show(o);
|
||||
|
||||
if (m->shaped)
|
||||
{
|
||||
{
|
||||
if (e_config->use_composite)
|
||||
{
|
||||
ecore_evas_alpha_set(m->ecore_evas, m->shaped);
|
||||
|
@ -1552,7 +1552,7 @@ _e_menu_realize(E_Menu *m)
|
|||
}
|
||||
|
||||
ecore_x_netwm_window_type_set(m->evas_win, ECORE_X_WINDOW_TYPE_MENU);
|
||||
|
||||
|
||||
o = e_box_add(m->evas);
|
||||
m->container_object = o;
|
||||
evas_object_intercept_move_callback_add(o, _e_menu_cb_intercept_container_move, m);
|
||||
|
@ -1561,7 +1561,7 @@ _e_menu_realize(E_Menu *m)
|
|||
evas_object_show(o);
|
||||
e_box_homogenous_set(o, 0);
|
||||
edje_object_part_swallow(m->bg_object, "e.swallow.content", m->container_object);
|
||||
|
||||
|
||||
EINA_LIST_FOREACH(m->items, l, mi)
|
||||
_e_menu_item_realize(mi);
|
||||
|
||||
|
@ -1586,7 +1586,7 @@ _e_menu_items_layout_update(E_Menu *m)
|
|||
int min_submenu_w = 0, min_submenu_h = 0;
|
||||
int min_toggle_w = 0, min_toggle_h = 0;
|
||||
int min_w = 0, min_h = 0;
|
||||
|
||||
|
||||
e_box_freeze(m->container_object);
|
||||
EINA_LIST_FOREACH(m->items, l, mi)
|
||||
{
|
||||
|
@ -1596,7 +1596,7 @@ _e_menu_items_layout_update(E_Menu *m)
|
|||
if (mi->submenu) submenus_on = 1;
|
||||
if (mi->check) toggles_on = 1;
|
||||
if (mi->radio) toggles_on = 1;
|
||||
|
||||
|
||||
if (mi->icon_w > min_icon_w) min_icon_w = mi->icon_w;
|
||||
if (mi->icon_h > min_icon_h) min_icon_h = mi->icon_h;
|
||||
if (mi->label_w > min_label_w) min_label_w = mi->label_w;
|
||||
|
@ -1655,7 +1655,7 @@ _e_menu_items_layout_update(E_Menu *m)
|
|||
{
|
||||
if (mi->separator)
|
||||
{
|
||||
e_box_pack_options_set(mi->separator_object,
|
||||
e_box_pack_options_set(mi->separator_object,
|
||||
1, 1, /* fill */
|
||||
1, 0, /* expand */
|
||||
0.5, 0.5, /* align */
|
||||
|
@ -1741,9 +1741,9 @@ _e_menu_items_layout_update(E_Menu *m)
|
|||
0, 0, /* min */
|
||||
0, 0 /* max */
|
||||
);
|
||||
edje_extern_object_min_size_set(mi->container_object,
|
||||
edje_extern_object_min_size_set(mi->container_object,
|
||||
min_w, min_h);
|
||||
edje_object_part_swallow(mi->bg_object, "e.swallow.content",
|
||||
edje_object_part_swallow(mi->bg_object, "e.swallow.content",
|
||||
mi->container_object);
|
||||
edje_object_size_min_calc(mi->bg_object, &mw, &mh);
|
||||
e_box_pack_options_set(mi->bg_object,
|
||||
|
@ -1834,7 +1834,7 @@ _e_menu_activate_internal(E_Menu *m, E_Zone *zone)
|
|||
m->pending_new_submenu = 0;
|
||||
if (!_e_menu_win)
|
||||
{
|
||||
_e_menu_win = ecore_x_window_input_new(zone->container->win,
|
||||
_e_menu_win = ecore_x_window_input_new(zone->container->win,
|
||||
zone->x, zone->y,
|
||||
zone->w, zone->h);
|
||||
ecore_x_window_show(_e_menu_win);
|
||||
|
@ -1936,7 +1936,7 @@ _e_menu_submenu_activate(E_Menu_Item *mi)
|
|||
if (mi->submenu)
|
||||
{
|
||||
E_Menu *m;
|
||||
|
||||
|
||||
m = mi->submenu;
|
||||
e_object_ref(E_OBJECT(m));
|
||||
m->parent_item = mi;
|
||||
|
@ -1960,7 +1960,7 @@ _e_menu_reposition(E_Menu *m)
|
|||
Eina_List *l, *tmp;
|
||||
E_Menu_Item *mi;
|
||||
int parent_item_bottom;
|
||||
|
||||
|
||||
if (!m->parent_item) return;
|
||||
m->cur.x = m->parent_item->menu->cur.x + m->parent_item->menu->cur.w;
|
||||
|
||||
|
@ -1970,22 +1970,22 @@ _e_menu_reposition(E_Menu *m)
|
|||
/* menu is larger than screen */
|
||||
if (parent_item_bottom > (m->zone->h / 2))
|
||||
/* more is shown if menu goes up */
|
||||
m->cur.y = (parent_item_bottom - (m->container_h + 1));
|
||||
m->cur.y = (parent_item_bottom - (m->container_h + 1));
|
||||
else
|
||||
/* more is shown if menu goes down */
|
||||
m->cur.y = parent_item_bottom - m->container_y;
|
||||
}
|
||||
else
|
||||
{
|
||||
{
|
||||
/* menu is smaller than screen */
|
||||
if (((parent_item_bottom + m->cur.h - m->container_y) > m->zone->h) &&
|
||||
if (((parent_item_bottom + m->cur.h - m->container_y) > m->zone->h) &&
|
||||
(parent_item_bottom > (m->zone->h / 2)))
|
||||
/* menu is partially out of screen and more is shown if menu goes up */
|
||||
m->cur.y = (parent_item_bottom - (m->container_h + 1)) + m->parent_item->h;
|
||||
m->cur.y = (parent_item_bottom - (m->container_h + 1)) + m->parent_item->h;
|
||||
else
|
||||
m->cur.y = parent_item_bottom - m->container_y;
|
||||
}
|
||||
|
||||
|
||||
/* FIXME: this will suck for big menus */
|
||||
tmp = _e_active_menus_copy_ref();
|
||||
|
||||
|
@ -2037,13 +2037,13 @@ _e_menu_item_activate_next(void)
|
|||
|
||||
ll = _e_menu_list_item_active_get();
|
||||
mi = _e_menu_item_active_get();
|
||||
if (ll && mi)
|
||||
if (ll && mi)
|
||||
{
|
||||
/* Look at the next item and then cycle until we're not on
|
||||
* a separator. */
|
||||
do
|
||||
{
|
||||
if (!eina_list_next(ll))
|
||||
{
|
||||
if (!eina_list_next(ll))
|
||||
ll = mi->menu->items;
|
||||
else
|
||||
ll = eina_list_next(ll);
|
||||
|
@ -2067,13 +2067,13 @@ _e_menu_item_activate_previous(void)
|
|||
|
||||
ll = _e_menu_list_item_active_get();
|
||||
mi = _e_menu_item_active_get();
|
||||
if (ll && mi)
|
||||
if (ll && mi)
|
||||
{
|
||||
/* Look at the prev item and then cycle until we're not on
|
||||
* a separator. */
|
||||
do
|
||||
{
|
||||
if (!eina_list_prev(ll))
|
||||
{
|
||||
if (!eina_list_prev(ll))
|
||||
ll = eina_list_last(ll);
|
||||
else
|
||||
ll = eina_list_prev(ll);
|
||||
|
@ -2146,7 +2146,7 @@ _e_menu_item_activate_nth(int n)
|
|||
E_Menu_Item *mi;
|
||||
Eina_List *ll;
|
||||
int i = -1;
|
||||
|
||||
|
||||
mi = _e_menu_item_active_get();
|
||||
if (!mi)
|
||||
{
|
||||
|
@ -2176,7 +2176,7 @@ _e_menu_item_activate_char(const char * key_compose)
|
|||
|
||||
/* Check we've got a menu and it's active. */
|
||||
m = _e_menu_active_get();
|
||||
if (!m)
|
||||
if (!m)
|
||||
{
|
||||
if (!_e_active_menus) return;
|
||||
m = eina_list_data_get(_e_active_menus);
|
||||
|
@ -2190,7 +2190,7 @@ _e_menu_item_activate_char(const char * key_compose)
|
|||
ll = m->items;
|
||||
mi = eina_list_data_get(ll);
|
||||
/* Only check the current item if it wasn't active before. */
|
||||
if (!mi->separator && mi->label && !strncasecmp(key_compose, mi->label, strlen(key_compose)))
|
||||
if (!mi->separator && mi->label && !strncasecmp(key_compose, mi->label, strlen(key_compose)))
|
||||
{
|
||||
e_menu_item_active_set(mi, 1);
|
||||
_e_menu_item_ensure_onscreen(mi);
|
||||
|
@ -2201,7 +2201,7 @@ _e_menu_item_activate_char(const char * key_compose)
|
|||
ll_orig = ll;
|
||||
|
||||
mi = eina_list_data_get(ll);
|
||||
if (!eina_list_next(ll))
|
||||
if (!eina_list_next(ll))
|
||||
ll = mi->menu->items;
|
||||
else
|
||||
ll = eina_list_next(ll);
|
||||
|
@ -2209,16 +2209,16 @@ _e_menu_item_activate_char(const char * key_compose)
|
|||
|
||||
/* While we don't have a label OR we don't match AND we haven't
|
||||
* wrapped around */
|
||||
while ((!mi->label || strncasecmp(key_compose, mi->label, strlen(key_compose)))
|
||||
while ((!mi->label || strncasecmp(key_compose, mi->label, strlen(key_compose)))
|
||||
&& ll != ll_orig)
|
||||
{
|
||||
do
|
||||
{
|
||||
if (!eina_list_next(ll))
|
||||
ll = mi->menu->items;
|
||||
else
|
||||
ll = eina_list_next(ll);
|
||||
mi = eina_list_data_get(ll);
|
||||
if (!eina_list_next(ll))
|
||||
ll = mi->menu->items;
|
||||
else
|
||||
ll = eina_list_next(ll);
|
||||
mi = eina_list_data_get(ll);
|
||||
}
|
||||
while (mi->separator);
|
||||
}
|
||||
|
@ -2275,7 +2275,7 @@ _e_menu_activate_first(void)
|
|||
E_Menu *m;
|
||||
E_Menu_Item *mi;
|
||||
Eina_List *ll;
|
||||
|
||||
|
||||
if (!_e_active_menus) return;
|
||||
m = eina_list_data_get(_e_active_menus);
|
||||
if (!m->items) return;
|
||||
|
@ -2287,7 +2287,7 @@ _e_menu_activate_first(void)
|
|||
mi = eina_list_data_get(ll);
|
||||
}
|
||||
if (mi->separator) return;
|
||||
e_menu_item_active_set(mi, 1);
|
||||
e_menu_item_active_set(mi, 1);
|
||||
_e_menu_item_ensure_onscreen(mi);
|
||||
}
|
||||
|
||||
|
@ -2297,7 +2297,7 @@ _e_menu_activate_last(void)
|
|||
E_Menu *m;
|
||||
E_Menu_Item *mi;
|
||||
Eina_List *ll;
|
||||
|
||||
|
||||
if (!_e_active_menus) return;
|
||||
m = eina_list_data_get(_e_active_menus);
|
||||
if (!m->items) return;
|
||||
|
@ -2309,7 +2309,7 @@ _e_menu_activate_last(void)
|
|||
mi = eina_list_data_get(ll);
|
||||
}
|
||||
if (mi->separator) return;
|
||||
e_menu_item_active_set(mi, 1);
|
||||
e_menu_item_active_set(mi, 1);
|
||||
_e_menu_item_ensure_onscreen(mi);
|
||||
}
|
||||
|
||||
|
@ -2321,7 +2321,7 @@ _e_menu_activate_nth(int n)
|
|||
E_Menu_Item *mi;
|
||||
Eina_List *ll;
|
||||
int i = -1;
|
||||
|
||||
|
||||
mi = _e_menu_item_active_get();
|
||||
if (!mi)
|
||||
{
|
||||
|
@ -2356,7 +2356,7 @@ _e_menu_item_active_get(void)
|
|||
return _e_active_menu_item;
|
||||
}
|
||||
|
||||
static Eina_List *
|
||||
static Eina_List *
|
||||
_e_menu_list_item_active_get(void)
|
||||
{
|
||||
if (_e_active_menu_item)
|
||||
|
@ -2436,7 +2436,7 @@ _e_menu_mouse_autoscroll_check(void)
|
|||
{
|
||||
int autoscroll_x = 0;
|
||||
int autoscroll_y = 0;
|
||||
|
||||
|
||||
if (_e_menu_x - e_config->menu_autoscroll_cursor_margin <= 0)
|
||||
{
|
||||
if (_e_menu_outside_bounds_get(-1, 0)) autoscroll_x = -1;
|
||||
|
@ -2450,7 +2450,7 @@ _e_menu_mouse_autoscroll_check(void)
|
|||
if (_e_active_menus)
|
||||
{
|
||||
E_Menu *m;
|
||||
|
||||
|
||||
m = eina_list_data_get(_e_active_menus);
|
||||
if (_e_menu_x + e_config->menu_autoscroll_cursor_margin >= (m->zone->w - 1))
|
||||
{
|
||||
|
@ -2476,7 +2476,7 @@ _e_menu_item_ensure_onscreen(E_Menu_Item *mi)
|
|||
{
|
||||
int x = 0, y = 0, w = 0, h = 0;
|
||||
int dx = 0, dy = 0;
|
||||
|
||||
|
||||
if (!mi->menu) return;
|
||||
if (!mi->menu->zone) return;
|
||||
x = mi->x + mi->menu->cur.x;
|
||||
|
@ -2499,7 +2499,7 @@ static int
|
|||
_e_menu_auto_place(E_Menu *m, int x, int y, int w, int h)
|
||||
{
|
||||
double xr, yr;
|
||||
|
||||
|
||||
_e_menu_realize(m);
|
||||
/* +-----+
|
||||
* |\ T /|
|
||||
|
@ -2508,7 +2508,7 @@ _e_menu_auto_place(E_Menu *m, int x, int y, int w, int h)
|
|||
* | / \ |
|
||||
* |/ B \|
|
||||
* +-----+
|
||||
*
|
||||
*
|
||||
* quadrants... which one
|
||||
*/
|
||||
if (w != m->zone->w)
|
||||
|
@ -2584,7 +2584,7 @@ _e_menu_cb_ecore_evas_resize(Ecore_Evas *ee)
|
|||
Evas *evas;
|
||||
Evas_Object *o;
|
||||
Evas_Coord w, h;
|
||||
|
||||
|
||||
evas = ecore_evas_get(ee);
|
||||
evas_output_viewport_get(evas, NULL, NULL, &w, &h);
|
||||
o = evas_object_name_find(evas, "menu/background");
|
||||
|
@ -2595,7 +2595,7 @@ static void
|
|||
_e_menu_cb_item_in(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
|
||||
{
|
||||
E_Menu_Item *mi;
|
||||
|
||||
|
||||
mi = data;
|
||||
e_menu_item_active_set(mi, 1);
|
||||
}
|
||||
|
@ -2605,7 +2605,7 @@ _e_menu_cb_item_out(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED
|
|||
{
|
||||
E_Menu_Item *mi;
|
||||
Evas_Event_Mouse_In *ev;
|
||||
|
||||
|
||||
mi = data;
|
||||
ev = event_info;
|
||||
e_menu_item_active_set(mi, 0);
|
||||
|
@ -2628,7 +2628,7 @@ static Eina_Bool
|
|||
_e_menu_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
|
||||
{
|
||||
Ecore_Event_Key *ev;
|
||||
|
||||
|
||||
ev = event;
|
||||
if (ev->window != _e_menu_win) return ECORE_CALLBACK_PASS_ON;
|
||||
if ((!strcmp(ev->key, "Up")) || (!strcmp(ev->key, "KP_Up")))
|
||||
|
@ -2681,7 +2681,7 @@ static Eina_Bool
|
|||
_e_menu_cb_key_up(void *data __UNUSED__, int type __UNUSED__, void *event)
|
||||
{
|
||||
Ecore_Event_Key *ev;
|
||||
|
||||
|
||||
ev = event;
|
||||
if (ev->window != _e_menu_win) return ECORE_CALLBACK_PASS_ON;
|
||||
return ECORE_CALLBACK_PASS_ON;
|
||||
|
@ -2696,12 +2696,12 @@ static Eina_Bool
|
|||
_e_menu_cb_mouse_down(void *data __UNUSED__, int type __UNUSED__, void *event)
|
||||
{
|
||||
Ecore_Event_Mouse_Button *ev;
|
||||
|
||||
|
||||
ev = event;
|
||||
if (ev->window != _e_menu_win) return ECORE_CALLBACK_PASS_ON;
|
||||
|
||||
/* Only allow dragging from floating menus for now.
|
||||
* The reason for this is that for non floating menus,
|
||||
* The reason for this is that for non floating menus,
|
||||
* the mouse is already down and dragging, so the decision
|
||||
* to start a drag is much more complex.
|
||||
*/
|
||||
|
@ -2717,7 +2717,7 @@ _e_menu_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event)
|
|||
Ecore_Event_Mouse_Button *ev;
|
||||
Ecore_X_Time t;
|
||||
int ret = 0;
|
||||
|
||||
|
||||
ev = event;
|
||||
if (ev->window != _e_menu_win) return ECORE_CALLBACK_PASS_ON;
|
||||
|
||||
|
@ -2741,7 +2741,7 @@ _e_menu_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event)
|
|||
_e_menu_activate_dragging = 0;
|
||||
if (ret == 1)
|
||||
{
|
||||
/* allow mouse to pop down menu if clicked elsewhere */
|
||||
/* allow mouse to pop down menu if clicked elsewhere */
|
||||
/* if (_e_menu_activate_time != 0) */
|
||||
_e_menu_deactivate_all();
|
||||
}
|
||||
|
@ -2762,7 +2762,7 @@ _e_menu_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event)
|
|||
double dt;
|
||||
double fast_move_threshold;
|
||||
int is_fast = 0;
|
||||
|
||||
|
||||
ev = event;
|
||||
if (ev->window != _e_menu_win) return ECORE_CALLBACK_PASS_ON;
|
||||
fast_move_threshold = e_config->menus_fast_mouse_move_threshhold;
|
||||
|
@ -2788,7 +2788,7 @@ _e_menu_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event)
|
|||
if (m->pending_new_submenu)
|
||||
{
|
||||
E_Menu_Item *mi;
|
||||
|
||||
|
||||
mi = _e_menu_item_active_get();
|
||||
if (mi)
|
||||
_e_menu_submenu_activate(mi);
|
||||
|
@ -2814,20 +2814,20 @@ static Eina_Bool
|
|||
_e_menu_cb_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *event)
|
||||
{
|
||||
Ecore_Event_Mouse_Wheel *ev;
|
||||
|
||||
|
||||
ev = event;
|
||||
if (ev->window != _e_menu_win) return ECORE_CALLBACK_PASS_ON;
|
||||
if (ev->z < 0) /* up */
|
||||
{
|
||||
int i;
|
||||
|
||||
|
||||
for (i = ev->z; i < 0; i++)
|
||||
_e_menu_item_activate_previous();
|
||||
}
|
||||
else if (ev->z > 0) /* down */
|
||||
{
|
||||
int i;
|
||||
|
||||
|
||||
for (i = ev->z; i > 0; i--)
|
||||
_e_menu_item_activate_next();
|
||||
}
|
||||
|
@ -2841,7 +2841,7 @@ _e_menu_cb_scroll_animator(void *data __UNUSED__)
|
|||
double dx, dy;
|
||||
int out;
|
||||
double spd;
|
||||
|
||||
|
||||
t = ecore_loop_time_get();
|
||||
spd = e_config->menus_scroll_speed;
|
||||
dt = t - _e_menu_scroll_start;
|
||||
|
|
|
@ -27,30 +27,30 @@ typedef void (*E_Menu_Cb) (void *data, E_Menu *m, E_Menu_Item *mi);
|
|||
struct _E_Menu
|
||||
{
|
||||
E_Object e_obj_inherit;
|
||||
|
||||
|
||||
const char *category;
|
||||
|
||||
struct {
|
||||
char visible : 1;
|
||||
int x, y, w, h;
|
||||
} cur, prev;
|
||||
|
||||
|
||||
int frozen;
|
||||
|
||||
|
||||
struct {
|
||||
const char *title;
|
||||
const char *icon_file;
|
||||
Evas_Object *icon;
|
||||
} header;
|
||||
|
||||
|
||||
Eina_List *items;
|
||||
|
||||
/* the zone it belongs to */
|
||||
E_Zone *zone;
|
||||
|
||||
|
||||
/* if a menu item spawned this menu, what item is it? */
|
||||
E_Menu_Item *parent_item;
|
||||
|
||||
|
||||
/* only useful if realized != 0 (ie menu is ACTUALLY realized) */
|
||||
Ecore_Evas *ecore_evas;
|
||||
Evas *evas;
|
||||
|
@ -61,12 +61,12 @@ struct _E_Menu
|
|||
E_Container_Shape *shape;
|
||||
int shape_rects_num;
|
||||
Ecore_X_Rectangle *shape_rects;
|
||||
|
||||
|
||||
struct {
|
||||
void *data;
|
||||
void (*func) (void *data, E_Menu *m);
|
||||
} pre_activate_cb, post_deactivate_cb;
|
||||
|
||||
|
||||
unsigned char realized : 1; /* 1 if it is realized */
|
||||
unsigned char active : 1; /* 1 if it is in active list */
|
||||
unsigned char changed : 1;
|
||||
|
@ -86,13 +86,13 @@ struct _E_Menu_Item
|
|||
const char *icon_key;
|
||||
const char *label;
|
||||
E_Menu *submenu;
|
||||
|
||||
|
||||
Evas_Object *separator_object;
|
||||
|
||||
|
||||
Evas_Object *bg_object;
|
||||
|
||||
Evas_Object *container_object;
|
||||
|
||||
|
||||
Evas_Object *toggle_object;
|
||||
Evas_Object *icon_bg_object;
|
||||
Evas_Object *icon_object;
|
||||
|
@ -102,7 +102,7 @@ struct _E_Menu_Item
|
|||
Evas_Object *event_object;
|
||||
|
||||
Eina_List *list_position;
|
||||
|
||||
|
||||
int label_w, label_h;
|
||||
int icon_w, icon_h;
|
||||
int separator_w, separator_h;
|
||||
|
@ -110,7 +110,7 @@ struct _E_Menu_Item
|
|||
int toggle_w, toggle_h;
|
||||
int radio_group;
|
||||
int x, y, w, h;
|
||||
|
||||
|
||||
struct {
|
||||
void *data;
|
||||
E_Menu_Cb func;
|
||||
|
@ -153,8 +153,8 @@ struct _E_Menu_Category_Callback
|
|||
{
|
||||
const char *category;
|
||||
void *data;
|
||||
void (*create) (E_Menu *m, void *category_data, void *data);
|
||||
void (*free) (void *data);
|
||||
void (*create) (E_Menu *m, void *category_data, void *data);
|
||||
void (*free) (void *data);
|
||||
};
|
||||
|
||||
|
||||
|
@ -177,7 +177,7 @@ EAPI void e_menu_category_data_set(char *category, void *data);
|
|||
EAPI E_Menu_Category_Callback *e_menu_category_callback_add(char *category, void (*create) (E_Menu *m, void *category_data, void *data), void (free) (void *data), void *data);
|
||||
EAPI void e_menu_category_callback_del(E_Menu_Category_Callback *cb);
|
||||
|
||||
|
||||
|
||||
EAPI void e_menu_pre_activate_callback_set(E_Menu *m, void (*func) (void *data, E_Menu *m), void *data);
|
||||
EAPI void e_menu_post_deactivate_callback_set(E_Menu *m, void (*func) (void *data, E_Menu *m), void *data);
|
||||
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue