diff --git a/data/config/appearance/default/borders/default/selected-0.sticky-0.shaded-0.bits.db b/data/config/appearance/default/borders/default/selected-0.sticky-0.shaded-0.bits.db index 7c9d03ffc..05cc81536 100644 Binary files a/data/config/appearance/default/borders/default/selected-0.sticky-0.shaded-0.bits.db and b/data/config/appearance/default/borders/default/selected-0.sticky-0.shaded-0.bits.db differ diff --git a/data/config/appearance/default/borders/default/selected-1.sticky-0.shaded-0.bits.db b/data/config/appearance/default/borders/default/selected-1.sticky-0.shaded-0.bits.db index 159753eee..489476bb9 100644 Binary files a/data/config/appearance/default/borders/default/selected-1.sticky-0.shaded-0.bits.db and b/data/config/appearance/default/borders/default/selected-1.sticky-0.shaded-0.bits.db differ diff --git a/src/actions.c b/src/actions.c index a800d0fc9..5a7e91138 100644 --- a/src/actions.c +++ b/src/actions.c @@ -500,6 +500,7 @@ e_act_resize_start (void *o, E_Action *a, void *data, int x, int y, int rx, int E_Border *b; b = o; + if (b->current.shaded != 0) return; /* 0 | 1 */ /* --+-- */ /* 2 | 3 */ @@ -564,6 +565,7 @@ e_act_resize_go (void *o, E_Action *a, void *data, int x, int y, int rx, int E_Border *b; b = o; + if (b->current.shaded != 0) return; if (b->mode.resize == 0) { b->current.requested.w -= dx; @@ -606,6 +608,7 @@ e_act_resize_h_start (void *o, E_Action *a, void *data, int x, int y, int rx, in E_Border *b; b = o; + if (b->current.shaded != 0) return; /* 4 | 5 */ if (x > (b->current.w / 2)) { @@ -653,6 +656,7 @@ e_act_resize_h_go (void *o, E_Action *a, void *data, int x, int y, int rx, in E_Border *b; b = o; + if (b->current.shaded != 0) return; if (b->mode.resize == 4) { b->current.requested.w -= dx; @@ -681,6 +685,7 @@ e_act_resize_v_start (void *o, E_Action *a, void *data, int x, int y, int rx, in E_Border *b; b = o; + if (b->current.shaded != 0) return; /* 6 */ /* - */ /* 7 */ @@ -730,6 +735,7 @@ e_act_resize_v_go (void *o, E_Action *a, void *data, int x, int y, int rx, in E_Border *b; b = o; + if (b->current.shaded != 0) return; if (b->mode.resize == 6) { b->current.requested.h -= dy; diff --git a/src/border.c b/src/border.c index 2f9dec90a..1e6256baf 100644 --- a/src/border.c +++ b/src/border.c @@ -62,12 +62,18 @@ e_idle(void *data) b = l->data; e_border_update(b); } - for (l = evases; l; l = l->next) + for (l = borders; l; l = l->next) { - Evas evas; + E_Border *b; - evas = l->data; - evas_render(evas); + b = l->data; + if (b->first_expose) + { + evas_render(b->evas.l); + evas_render(b->evas.r); + evas_render(b->evas.t); + evas_render(b->evas.b); + } } e_db_runtime_flush(); return; @@ -704,6 +710,7 @@ e_window_expose(Eevent * ev) e = ev->event; { Evas_List l; + E_Border *b; for (l = evases; l; l = l->next) { @@ -713,6 +720,8 @@ e_window_expose(Eevent * ev) if (evas_get_window(evas) == e->win) evas_update_rect(evas, e->x, e->y, e->w, e->h); } + b = e_border_find_by_window(e->win); + if (b) b->first_expose = 1; } current_ev = NULL; } @@ -1146,6 +1155,7 @@ e_border_adopt(Window win, int use_client_pos) e_icccm_get_size_info(win, b); e_icccm_get_mwm_hints(win, b); e_icccm_get_layer(win, b); + e_icccm_get_title(win, b); b->current.shaped_client = e_icccm_is_shaped(win); /* we have now placed the bugger */ b->placed = 1; @@ -1220,7 +1230,10 @@ e_border_new(void) b->win.main = e_window_override_new(desk->win.container, 0, 0, 1, 1); b->win.input = e_window_input_new(b->win.main, 0, 0, 1, 1); b->win.container = e_window_override_new(b->win.main, 0, 0, 1, 1); - e_window_set_events(b->win.input, XEV_MOUSE_MOVE | XEV_BUTTON | XEV_IN_OUT); + e_window_set_events_propagate(b->win.input, 1); + e_window_set_events(b->win.input, XEV_MOUSE_MOVE | XEV_BUTTON); + e_window_set_events(b->win.main, XEV_IN_OUT); + e_window_set_events(b->win.container, XEV_IN_OUT); e_window_show(b->win.input); e_window_show(b->win.container); @@ -1264,7 +1277,47 @@ e_border_new(void) font_dir); b->win.b = evas_get_window(b->evas.b); e_add_child(b->win.main, b->win.b); + + b->obj.title.l = evas_add_text(b->evas.l, "borzoib", 8, ""); + b->obj.title.r = evas_add_text(b->evas.r, "borzoib", 8, ""); + b->obj.title.t = evas_add_text(b->evas.t, "borzoib", 8, ""); + b->obj.title.b = evas_add_text(b->evas.b, "borzoib", 8, ""); + + b->obj.title_clip.l = evas_add_rectangle(b->evas.l); + b->obj.title_clip.r = evas_add_rectangle(b->evas.r); + b->obj.title_clip.t = evas_add_rectangle(b->evas.t); + b->obj.title_clip.b = evas_add_rectangle(b->evas.b); + evas_set_color(b->evas.l, b->obj.title_clip.l, 255, 255, 255, 255); + evas_set_color(b->evas.r, b->obj.title_clip.r, 255, 255, 255, 255); + evas_set_color(b->evas.t, b->obj.title_clip.t, 255, 255, 255, 255); + evas_set_color(b->evas.b, b->obj.title_clip.b, 255, 255, 255, 255); + + evas_set_pass_events(b->evas.l, b->obj.title.l, 1); + evas_set_pass_events(b->evas.r, b->obj.title.r, 1); + evas_set_pass_events(b->evas.t, b->obj.title.t, 1); + evas_set_pass_events(b->evas.b, b->obj.title.b, 1); + + evas_set_color(b->evas.l, b->obj.title.l, 0, 0, 0, 255); + evas_set_color(b->evas.r, b->obj.title.r, 0, 0, 0, 255); + evas_set_color(b->evas.t, b->obj.title.t, 0, 0, 0, 255); + evas_set_color(b->evas.b, b->obj.title.b, 0, 0, 0, 255); + + evas_show(b->evas.l, b->obj.title.l); + evas_show(b->evas.r, b->obj.title.r); + evas_show(b->evas.t, b->obj.title.t); + evas_show(b->evas.b, b->obj.title.b); + + evas_show(b->evas.l, b->obj.title_clip.l); + evas_show(b->evas.r, b->obj.title_clip.r); + evas_show(b->evas.t, b->obj.title_clip.t); + evas_show(b->evas.b, b->obj.title_clip.b); + + evas_set_clip(b->evas.l, b->obj.title.l, b->obj.title_clip.l); + evas_set_clip(b->evas.l, b->obj.title.r, b->obj.title_clip.r); + evas_set_clip(b->evas.l, b->obj.title.t, b->obj.title_clip.t); + evas_set_clip(b->evas.l, b->obj.title.b, b->obj.title_clip.b); + e_window_raise(b->win.input); e_window_raise(b->win.container); @@ -1516,11 +1569,11 @@ e_border_set_bits(E_Border *b, char *file) b->bits.r = ebits_load(file); b->bits.t = ebits_load(file); b->bits.b = ebits_load(file); - + b->bits.new = 1; b->changed = 1; - if (b->bits.t) ebits_get_insets(b->bits.l, &ppl, &ppr, &ppt, &ppb); + if (b->bits.t) ebits_get_insets(b->bits.t, &ppl, &ppr, &ppt, &ppb); b->current.requested.w -= (pl + pr) - (ppl + ppr); b->current.requested.h -= (pt + pb) - (ppt + ppb); b->current.requested.x += (pl - ppl); @@ -1825,12 +1878,45 @@ e_border_update(E_Border *b) if (b->bits.r) ebits_resize(b->bits.r, b->current.w, b->current.h); if (b->bits.t) ebits_resize(b->bits.t, b->current.w, b->current.h); if (b->bits.b) ebits_resize(b->bits.b, b->current.w, b->current.h); - + e_icccm_move_resize(b->win.client, b->current.x + pl, b->current.y + pt - b->current.shaded, b->client.w, b->client.h); e_cb_border_move_resize(b); } + if ((b->client.title) && (b->bits.t)) + { + double tx, ty, tw, th; + + ebits_get_bit_geometry(b->bits.l, "Title_Area", &tx, &ty, &tw, &th); + evas_set_text(b->evas.l, b->obj.title.l, b->client.title); + evas_move(b->evas.l, b->obj.title.l, tx, ty); + evas_move(b->evas.l, b->obj.title_clip.l, tx, ty); + evas_resize(b->evas.l, b->obj.title_clip.l, tw, th); + + ebits_get_bit_geometry(b->bits.r, "Title_Area", &tx, &ty, &tw, &th); + evas_set_text(b->evas.r, b->obj.title.r, b->client.title); + evas_move(b->evas.r, b->obj.title.r, tx, ty); + evas_move(b->evas.r, b->obj.title_clip.r, tx, ty); + evas_resize(b->evas.r, b->obj.title_clip.r, tw, th); + + ebits_get_bit_geometry(b->bits.t, "Title_Area", &tx, &ty, &tw, &th); + evas_set_text(b->evas.t, b->obj.title.t, b->client.title); + evas_move(b->evas.t, b->obj.title.t, tx, ty); + evas_move(b->evas.t, b->obj.title_clip.t, tx, ty); + evas_resize(b->evas.t, b->obj.title_clip.t, tw, th); + + ebits_get_bit_geometry(b->bits.b, "Title_Area", &tx, &ty, &tw, &th); + evas_set_text(b->evas.b, b->obj.title.b, b->client.title); + evas_move(b->evas.b, b->obj.title.b, tx, ty); + evas_move(b->evas.b, b->obj.title_clip.b, tx, ty); + evas_resize(b->evas.b, b->obj.title_clip.b, tw, th); + + evas_set_layer(b->evas.l, b->obj.title.l, 1); + evas_set_layer(b->evas.r, b->obj.title.r, 1); + evas_set_layer(b->evas.t, b->obj.title.t, 1); + evas_set_layer(b->evas.b, b->obj.title.b, 1); + } e_border_reshape(b); if (visibility_changed) { diff --git a/src/config.c b/src/config.c index 6c3bc1d0e..b251ee11a 100644 --- a/src/config.c +++ b/src/config.c @@ -16,6 +16,7 @@ static char cfg_grabs_db[4096] = ""; static char cfg_settings_db[4096] = ""; static char cfg_actions_db[4096] = ""; static char cfg_borders_db[4096] = ""; +static char cfg_menus_db[4096] = ""; static char cfg_user_dir[4096] = ""; static char cfg_images_dir[4096] = ""; static char cfg_fonts_dir[4096] = ""; @@ -46,6 +47,8 @@ e_config_get(char *type) PACKAGE_DATA_DIR"/data/config/behavior/default/actions.db"); E_CONF("borders", cfg_borders_db, PACKAGE_DATA_DIR"/data/config/appearance/default/borders/"); + E_CONF("menus", cfg_menus_db, + PACKAGE_DATA_DIR"/data/config/appearance/default/menus/"); E_CONF("images", cfg_images_dir, PACKAGE_DATA_DIR"/data/images/"); E_CONF("fonts", cfg_fonts_dir, diff --git a/src/desktops.c b/src/desktops.c index 2cb8788cc..447c6e579 100644 --- a/src/desktops.c +++ b/src/desktops.c @@ -130,6 +130,56 @@ e_mouse_down(Eevent * ev) x = e->rx - x; y = e->ry - y; evas_event_button_down(evas, x, y, e->button); + if (e->button == 1) + { + int count; + static E_Menu *menu = NULL; + char buf[4096]; + + if (!menu) + { + menu = e_menu_new(); + for (count = 1; count <= 16; count++) + { + int count2; + E_Menu *menu2; + E_Menu_Item *menuitem; + + sprintf(buf, "Menu item %i", count); + menuitem = e_menu_item_new(buf); + if (count < 10) + { + menu2 = e_menu_new(); + menuitem->submenu = menu2; + } + e_menu_add_item(menu, menuitem); + if (count < 10) + { + for (count2 = 1; count2 <= 14; count2++) + { + E_Menu_Item *menuitem2; + E_Menu *menu3; + int count3; + + sprintf(buf, "Submenu item %i", count2); + menuitem2 = e_menu_item_new(buf); + menu3 = e_menu_new(); + menuitem2->submenu = menu3; + e_menu_add_item(menu2, menuitem2); + for (count3 = 1; count3 <= 12; count3++) + { + E_Menu_Item *menuitem3; + + sprintf(buf, "Submenu item %i", count3); + menuitem3 = e_menu_item_new(buf); + e_menu_add_item(menu3, menuitem3); + } + } + } + } + } + e_menu_show_at_mouse(menu, e->rx, e->ry, e->time); + } if (e->button == 3) e_exec_restart(); return; diff --git a/src/e.h b/src/e.h index 90c100ef8..112a29c37 100644 --- a/src/e.h +++ b/src/e.h @@ -152,6 +152,14 @@ struct _E_Border struct { Evas l, r, t, b; } evas; + struct { + struct { + Evas_Object l, r, t, b; + } title; + struct { + Evas_Object l, r, t, b; + } title_clip; + } obj; struct { Pixmap l, r, t, b; } pixmap; @@ -212,6 +220,8 @@ struct _E_Border E_Desktop *desk; char *border_file; + + int first_expose; int changed; }; @@ -295,12 +305,65 @@ struct _E_Menu { OBJ_PROPERTIES; - Window win; + struct { + int x, y, w, h; + int visible; + } current, previous; + struct { + int l, r, t, b; + } border, sel_border; + struct { + Window main, evas; + } win; + Evas evas; + Ebits_Object bg; + Evas_List entries; + char *bg_file; + + int first_expose; + + int recalc_entries; + int redo_sel; + int changed; + + E_Menu_Item *selected; + + Time time; }; struct _E_Menu_Item { OBJ_PROPERTIES; + + int x, y; + struct { + struct { + int w, h; + } min; + int w, h; + } size; + + Ebits_Object bg; + char *bg_file; + int selected; + + Evas_Object obj_entry; + + char *str; + Evas_Object obj_text; + + char *icon; + Evas_Object obj_icon; + + int radio_group; + int check; + int on; + + E_Menu *menu; + E_Menu *submenu; + + void (*func_select) (E_Menu *m, E_Menu_Item *mi, void *data); + void *func_select_data; }; void e_action_add_proto(char *action, @@ -349,6 +412,7 @@ void e_icccm_release(Window win); void e_icccm_get_size_info(Window win, E_Border *b); void e_icccm_get_mwm_hints(Window win, E_Border *b); void e_icccm_get_layer(Window win, E_Border *b); +void e_icccm_get_title(Window win, E_Border *b); void e_icccm_set_frame_size(Window win, int l, int r, int t, int b); void e_icccm_set_desk_area(Window win, int ax, int ay); void e_icccm_set_desk_area_size(Window win, int ax, int ay); diff --git a/src/icccm.c b/src/icccm.c index a38194dca..e280b82fb 100644 --- a/src/icccm.c +++ b/src/icccm.c @@ -296,6 +296,7 @@ e_icccm_get_mwm_hints(Window win, E_Border *b) if (mwmhints->decorations & MWM_DECOR_BORDER) b->client.border = 1; if (mwmhints->decorations & MWM_DECOR_RESIZEH) b->client.handles = 1; if (mwmhints->decorations & MWM_DECOR_TITLE) b->client.titlebar = 1; + e_border_apply_border(b); } FREE(mwmhints); } @@ -321,6 +322,24 @@ e_icccm_get_layer(Window win, E_Border *b) } } +void +e_icccm_get_title(Window win, E_Border *b) +{ + char *title; + + title = e_window_get_title(win); + + if (b->client.title) + { + if ((title) && (!strcmp(title, b->client.title))) return; + b->changed = 1; + FREE(b->client.title); + } + b->client.title = NULL; + if (title) b->client.title = title; + else b->client.title = strdup("No Title"); +} + void e_icccm_set_frame_size(Window win, int l, int r, int t, int b) { @@ -392,10 +411,16 @@ void e_icccm_handle_property_change(Atom a, E_Border *b) { static Atom a_wm_normal_hints = 0; + static Atom a_motif_wm_hints = 0; + static Atom a_wm_name = 0; E_ATOM(a_wm_normal_hints, "WM_NORMAL_HINTS"); + E_ATOM(a_motif_wm_hints, "_MOTIF_WM_HINTS"); + E_ATOM(a_wm_name, "WM_NAME"); if (a == a_wm_normal_hints) e_icccm_get_size_info(b->win.client, b); + else if (a == a_motif_wm_hints) e_icccm_get_mwm_hints(b->win.client, b); + else if (a == a_wm_name) e_icccm_get_title(b->win.client, b); } void diff --git a/src/main.c b/src/main.c index 3c192a86d..a326dac47 100644 --- a/src/main.c +++ b/src/main.c @@ -50,6 +50,7 @@ main(int argc, char **argv) e_desktops_init(); e_border_init(); e_actions_init(); + e_menu_init(); setup(); diff --git a/src/menu.c b/src/menu.c index fbdbc172c..f949ce8de 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1,7 +1,10 @@ #include "e.h" static Evas_List open_menus = NULL; -static Evas_list menus = NULL; +static Evas_List menus = NULL; +static Window menu_event_win = 0; +static int screen_w, screen_h; +static int mouse_x, mouse_y; static void e_idle(void *data); static void e_key_down(Eevent * ev); @@ -12,6 +15,112 @@ static void e_mouse_in(Eevent * ev); static void e_mouse_out(Eevent * ev); static void e_window_expose(Eevent * ev); +static void +e_scroller_timer(int val, void *data) +{ + Evas_List l; + int ok = 0; + int resist = 5; + int scroll_speed = 16; + static double last_time = 0.0, t; + + t = e_get_time(); + if (val != 0) + scroll_speed = (int)(((t - last_time) / 0.02) * (double)scroll_speed); + last_time = t; + + if (mouse_x >= (screen_w - resist)) + { + int scroll = 0; + + for (l = open_menus; l; l = l->next) + { + E_Menu *m; + + m = l->data; + if ((m->current.x + m->current.w) > screen_w) + { + scroll = m->current.x + m->current.w - screen_w; + break; + } + } + if (scroll) + { + if (scroll > scroll_speed) scroll = scroll_speed; + e_menu_scroll_all_by(-scroll, 0); + ok = 1; + } + } + else if (mouse_x < resist) + { + int scroll = 0; + + for (l = open_menus; l; l = l->next) + { + E_Menu *m; + + m = l->data; + if (m->current.x < 0) + { + scroll = -m->current.x; + break; + } + } + if (scroll) + { + if (scroll > scroll_speed) scroll = scroll_speed; + e_menu_scroll_all_by(scroll, 0); + ok = 1; + } + } + if (mouse_y >= (screen_h - resist)) + { + int scroll = 0; + + for (l = open_menus; l; l = l->next) + { + E_Menu *m; + + m = l->data; + if ((m->current.y + m->current.h) > screen_h) + { + scroll = m->current.y + m->current.h - screen_h; + break; + } + } + if (scroll) + { + if (scroll > scroll_speed) scroll = scroll_speed; + e_menu_scroll_all_by(0, -scroll); + ok = 1; + } + } + else if (mouse_y < resist) + { + int scroll = 0; + + for (l = open_menus; l; l = l->next) + { + E_Menu *m; + + m = l->data; + if (m->current.y < 0) + { + scroll = -m->current.y; + break; + } + } + if (scroll) + { + if (scroll > scroll_speed) scroll = scroll_speed; + e_menu_scroll_all_by(0, scroll); + ok = 1; + } + } + if (ok) + e_add_event_timer("menu_scroller", 0.02, e_scroller_timer, val + 1, NULL); +} + static void e_idle(void *data) { @@ -22,34 +131,129 @@ e_idle(void *data) E_Menu *m; m = l->data; - e_menu_update(m); + e_menu_update_base(m); + } + for (l = menus; l; l = l->next) + { + E_Menu *m; + + m = l->data; + e_menu_update_shows(m); + } + for (l = menus; l; l = l->next) + { + E_Menu *m; + + m = l->data; + e_menu_update_hides(m); + } + for (l = menus; l; l = l->next) + { + E_Menu *m; + + m = l->data; + e_menu_update_finish(m); + } + for (l = menus; l; l = l->next) + { + E_Menu *m; + + m = l->data; + if (m->first_expose) + evas_render(m->evas); } e_db_runtime_flush(); return; UN(data); } +static void +e_wheel(Eevent * ev) +{ + Ev_Wheel *e; + + e = ev->event; + if (e->win == menu_event_win) + { + } +} + static void e_key_down(Eevent * ev) { Ev_Key_Down *e; + int ok; e = ev->event; + ok = 0; + if (e->win == menu_event_win) ok = 1; + else { + Evas_List l; + + for (l = open_menus; l; l = l->next) + { + E_Menu *m; + + m = l->data; + if ((e->win == m->win.main) || (e->win == m->win.evas)) ok = 1; + } + } + if (ok) + { + Evas_List l; + E_Menu *m = NULL; + E_Menu_Item *mi = NULL; + + for (l = open_menus; l; l = l->next) + { + m = l->data; + if (m->selected) + { + mi = m->selected; + } + } if (!strcmp(e->key, "Up")) { + e_menu_select(0, -1); } else if (!strcmp(e->key, "Down")) { + e_menu_select(0, 1); } else if (!strcmp(e->key, "Left")) { + e_menu_select(-1, 0); } else if (!strcmp(e->key, "Right")) { + e_menu_select(1, 0); } else if (!strcmp(e->key, "Escape")) { + for (l = menus; l; l = l->next) + { + m = l->data; + + if (m->current.visible) + e_menu_hide(m); + } + } + else if (!strcmp(e->key, "Return")) + { + if (mi) + { + e_menu_callback_item(m, mi); + mi->selected = 0; + mi->menu->selected = NULL; + } + for (l = menus; l; l = l->next) + { + m = l->data; + + if (m->current.visible) + e_menu_hide(m); + } } else { @@ -67,9 +271,491 @@ e_key_up(Eevent * ev) } } -E_Menu * -e_menu_new(void) +/* handling mouse down events */ +static void +e_mouse_down(Eevent * ev) { + Ev_Mouse_Down *e; + + e = ev->event; + { + } +} + +/* handling mouse up events */ +static void +e_mouse_up(Eevent * ev) +{ + Ev_Mouse_Up *e; + + e = ev->event; + if (e->win == menu_event_win) + { + if (open_menus) + { + E_Menu *m; + + m = open_menus->data; + if ((e->time - m->time) > 200) + { + Evas_List l; + + for (l = open_menus; l; l = l->next) + { + m = l->data; + if (m->selected) + { + e_menu_callback_item(m, m->selected); + m->selected->selected = 0; + m->selected = NULL; + break; + } + } + for (l = menus; l; l = l->next) + { + m = l->data; + + if (m->current.visible) + e_menu_hide(m); + } + } + } + } +} + +/* handling mouse move events */ +static void +e_mouse_move(Eevent * ev) +{ + Ev_Mouse_Move *e; + + e = ev->event; + if (e->win == menu_event_win) + { + Evas_List l; + + mouse_x = e->rx; + mouse_y = e->ry; + for (l = open_menus; l; l = l->next) + { + E_Menu *m; + + m = l->data; + evas_event_move(m->evas, + e->rx - m->current.x, + e->ry - m->current.y); + } + } + else + { + Evas_List l; + + mouse_x = e->rx; + mouse_y = e->ry; + for (l = open_menus; l; l = l->next) + { + E_Menu *m; + + m = l->data; + + evas_event_move(m->evas, + e->rx - m->current.x, + e->ry - m->current.y); + } + } + e_scroller_timer(0, NULL); +} + +/* handling mouse enter events */ +static void +e_mouse_in(Eevent * ev) +{ + Ev_Window_Enter *e; + + e = ev->event; + if (e->win == menu_event_win) + { + } +} + +/* handling mouse leave events */ +static void +e_mouse_out(Eevent * ev) +{ + Ev_Window_Leave *e; + + e = ev->event; + if (e->win == menu_event_win) + { + } + else + { + Evas_List l; + + for (l = open_menus; l; l = l->next) + { + E_Menu *m; + + m = l->data; + if ((e->win == m->win.main) || (e->win == m->win.evas)) + { + evas_event_move(m->evas, -99999999, -99999999); + } + } + } +} + +/* handling expose events */ +static void +e_window_expose(Eevent * ev) +{ + Ev_Window_Expose *e; + + e = ev->event; + { + Evas_List l; + + for (l = open_menus; l; l = l->next) + { + E_Menu *m; + + m = l->data; + if (e->win == m->win.evas) + { + m->first_expose = 1; + evas_update_rect(m->evas, e->x, e->y, e->w, e->h); + } + } + } +} + +static void +e_menu_item_in_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y) +{ + E_Menu_Item *mi; + Evas_List l; + + mi = _data; + mi->menu->selected = mi; + mi->selected = 1; + mi->menu->redo_sel = 1; + mi->menu->changed = 1; + e_menu_hide_submenus(mi->menu); + if (mi->submenu) + { + e_menu_move_to(mi->submenu, + mi->menu->current.x + mi->menu->current.w, + mi->menu->current.y + mi->y - mi->menu->border.t); + e_menu_show(mi->submenu); + } +} + +static void +e_menu_item_out_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y) +{ + E_Menu_Item *mi; + + mi = _data; + if (mi->menu->selected == mi) mi->menu->selected = NULL; + mi->selected = 0; + mi->menu->redo_sel = 1; + mi->menu->changed = 1; +} + +void +e_menu_callback_item(E_Menu *m, E_Menu_Item *mi) +{ + if (mi->func_select) mi->func_select(m, mi, mi->func_select_data); +} + +void +e_menu_item_set_callback(E_Menu_Item *mi, void (*func) (E_Menu *m, E_Menu_Item *mi, void *data), void *data) +{ + mi->func_select = func; + mi->func_select_data = data; +} + +void +e_menu_hide_submenus(E_Menu *menus_after) +{ + Evas_List l; + + for (l = open_menus; l; l = l->next) + { + if (l->data == menus_after) + { + l = l->next; + for (; l; l = l->next) + { + E_Menu *m; + + m = l->data; + e_menu_hide(m); + } + break; + } + } +} + +void +e_menu_select(int dx, int dy) +{ + Evas_List l, ll; + int done = 0; + + for (l = open_menus; (l) && (!done); l = l->next) + { + E_Menu *m; + + m = l->data; + if (m->selected) + { + for (ll = m->entries; (ll) && (!done); ll = ll->next) + { + E_Menu_Item *mi; + + mi = ll->data; + if (mi->selected) + { + if (dy != 0) + { + int ok = 0; + + if ((dy < 0) && (ll->prev)) ok = 1; + else if ((dy > 0) && (ll->next)) ok = 1; + if (ok) + { + if (m->selected) + { + m->selected->selected = 0; + m->redo_sel = 1; + m->changed = 1; + m->selected = NULL; + } + if (dy < 0) mi = ll->prev->data; + else mi = ll->next->data; + m->selected = mi; + mi->selected = 1; + mi->menu->redo_sel = 1; + mi->menu->changed = 1; + e_menu_hide_submenus(mi->menu); + if (mi->submenu) + { + e_menu_move_to(mi->submenu, + mi->menu->current.x + mi->menu->current.w, + mi->menu->current.y + mi->y - mi->menu->border.t); + e_menu_show(mi->submenu); + } + } + } + done = 1; + } + } + if (dx != 0) + { + int ok = 0; + + if ((dx < 0) && (l->prev)) ok = 1; + else if ((dx > 0) && (l->next)) ok = 1; + if (ok) + { + E_Menu_Item *mi = NULL; + E_Menu *mm; + + if (dx < 0) + { + Evas_List ll; + + mm = l->prev->data; + for (ll = mm->entries; (ll) && (!mi); ll = ll->next) + { + E_Menu_Item *mmi; + + mmi = ll->data; + if (mmi->submenu == m) mi = mmi; + } + } + else + { + mm = l->next->data; + if (mm->entries) + mi = mm->entries->data; + } + if (mi) + { + if (m->selected) + { + m->selected->selected = 0; + m->redo_sel = 1; + m->changed = 1; + m->selected = NULL; + } + mm->selected = mi; + mi->selected = 1; + mi->menu->redo_sel = 1; + mi->menu->changed = 1; + e_menu_hide_submenus(mi->menu); + if (mi->submenu) + { + e_menu_move_to(mi->submenu, + mi->menu->current.x + mi->menu->current.w, + mi->menu->current.y + mi->y - mi->menu->border.t); + e_menu_show(mi->submenu); + } + e_menu_update_visibility(mm); + } + } + done = 1; + } + e_menu_update_visibility(m); + } + } + if (!done) + { + if (open_menus) + { + E_Menu *m; + E_Menu_Item *mi; + + m = open_menus->data; + mi = m->entries->data; + m->selected = mi; + mi->selected = 1; + mi->menu->redo_sel = 1; + mi->menu->changed = 1; + if (mi->submenu) + { + e_menu_move_to(mi->submenu, + mi->menu->current.x + mi->menu->current.w, + mi->menu->current.y + mi->y - mi->menu->border.t); + e_menu_show(mi->submenu); + } + } + } +} + +void +e_menu_init(void) +{ + e_window_get_geometry(0, NULL, NULL, &screen_w, &screen_h); + e_event_filter_handler_add(EV_MOUSE_DOWN, e_mouse_down); + e_event_filter_handler_add(EV_MOUSE_UP, e_mouse_up); + e_event_filter_handler_add(EV_MOUSE_MOVE, e_mouse_move); + e_event_filter_handler_add(EV_MOUSE_IN, e_mouse_in); + e_event_filter_handler_add(EV_MOUSE_OUT, e_mouse_out); + e_event_filter_handler_add(EV_WINDOW_EXPOSE, e_window_expose); + e_event_filter_handler_add(EV_KEY_DOWN, e_key_down); + e_event_filter_handler_add(EV_KEY_UP, e_key_up); + e_event_filter_handler_add(EV_MOUSE_WHEEL, e_wheel); + e_event_filter_idle_handler_add(e_idle, NULL); +} + +void +e_menu_event_win_show(void) +{ + /* create it */ + if (!menu_event_win) + { + menu_event_win = e_window_input_new(0, 0, 0, screen_w, screen_h); + e_window_set_events(menu_event_win, XEV_MOUSE_MOVE | XEV_BUTTON | XEV_IN_OUT | XEV_KEY); + e_window_show(menu_event_win); + e_keyboard_grab(menu_event_win); + e_grab_mouse(menu_event_win, 1, 0); + } + /* raise it */ + if (menu_event_win) e_window_raise(menu_event_win); +} + +void +e_menu_event_win_hide(void) +{ + /* destroy it */ + if (menu_event_win) + { + e_keyboard_ungrab(); + e_window_destroy(menu_event_win); + menu_event_win = 0; + } +} + +void +e_menu_set_background(E_Menu *m) +{ + char *menus; + char buf[4096]; + char *style = "default"; + char *part; + int pl, pr, pt, pb; + + menus = e_config_get("menus"); + + part = "base.bits.db"; + sprintf(buf, "%s%s/%s", menus, style, part); + if ((m->bg_file) && (!strcmp(m->bg_file, buf))) return; + + IF_FREE(m->bg_file); + m->bg_file = strdup(buf); + + if (m->bg) ebits_free(m->bg); + m->bg = ebits_load(m->bg_file); + if (m->bg) ebits_set_color_class(m->bg, "Menu BG", 100, 200, 255, 255); + + pl = pr = pt = pb = 0; + if (m->bg) + { + ebits_get_insets(m->bg, &pl, &pr, &pt, &pb); + ebits_add_to_evas(m->bg, m->evas); + ebits_move(m->bg, 0, 0); + ebits_show(m->bg); + ebits_set_layer(m->bg, 0); + } + m->current.w += ((pl + pr) - (m->border.l + m->border.r)); + m->current.h += ((pt + pb) - (m->border.t + m->border.b)); + m->border.l = pl; + m->border.r = pr; + m->border.t = pt; + m->border.b = pb; + m->changed = 1; +} + +void +e_menu_set_sel(E_Menu *m, E_Menu_Item *mi) +{ + char *menus; + char buf[4096]; + char *style = "default"; + char *part; + int pl, pr, pt, pb; + int has_sub = 0; + int selected = 0; + + menus = e_config_get("menus"); + selected = mi->selected; + if (mi->submenu) has_sub = 1; + sprintf(buf, "%s%s/selected-%i.submenu-%i.bits.db", menus, style, + selected, has_sub); + if ((mi->bg_file) && (!strcmp(mi->bg_file, buf))) return; + + IF_FREE(mi->bg_file); + mi->bg_file = strdup(buf); + + if (mi->bg) ebits_free(mi->bg); + mi->bg = ebits_load(mi->bg_file); + if (mi->bg) ebits_set_color_class(mi->bg, "Menu BG", 100, 200, 255, 255); + + pl = pr = pt = pb = 0; + if (mi->bg) + { + ebits_get_insets(mi->bg, &pl, &pr, &pt, &pb); + ebits_add_to_evas(mi->bg, m->evas); + ebits_set_layer(mi->bg, 1); + } + if (m->sel_border.l < pl) {m->sel_border.l = pl; m->recalc_entries = 1;} + if (m->sel_border.r < pr) {m->sel_border.r = pr; m->recalc_entries = 1;} + if (m->sel_border.t < pt) {m->sel_border.t = pt; m->recalc_entries = 1;} + if (m->sel_border.b < pb) {m->sel_border.b = pb; m->recalc_entries = 1;} + m->redo_sel = 1; + m->changed = 1; } void @@ -77,37 +763,409 @@ e_menu_free(E_Menu *m) { } +E_Menu * +e_menu_new(void) +{ + E_Menu *m; + int max_colors = 216; + int font_cache = 1024 * 1024; + int image_cache = 8192 * 1024; + char *font_dir; + + font_dir = e_config_get("fonts"); + + m = NEW(E_Menu, 1); + ZERO(m, E_Menu, 1); + + OBJ_INIT(m, e_menu_free); + + m->win.main = e_window_override_new(0, 0, 0, 1, 1); + m->evas = evas_new_all(e_display_get(), + m->win.main, + 0, 0, 1, 1, + RENDER_METHOD_ALPHA_SOFTWARE, + max_colors, + font_cache, + image_cache, + font_dir); + /* aaaaaaaaah. this makes building the menu fast - moves the mouse far */ + /* far far far far away so callbacks and events arent triggerd as we */ + /* create objects that ofter hang around 0,0 - the default place for */ + /* the pointer to be... this means my 2000 entry menu works and comes up */ + /* pretty damn fast - considering i creating it when i click :) - problem */ + /* you can't fit 2000 entires into a window in X - since the limit is */ + /* 65536x65536 fo X - the other problem is i can only really draw in */ + /* the first 32768x32768 pixels of the window - thus limiting the menu */ + /* size to well - 32768x32768 - normally ok - but in extremes not so */ + /* good. We *COULD* do a workaround that meant we did the menu scrolling */ + /* within the evas and faked a menu window that only gets as big as the */ + /* screen - an then re-render it all - but well.. it's an extreme and */ + /* for now i think people will just have to live with a maximum menu size */ + /* of 32768x32768... didums! */ + evas_event_move(m->evas, -999999999, -99999999); + + m->win.evas = evas_get_window(m->evas); + e_window_set_events(m->win.evas, XEV_EXPOSE | XEV_MOUSE_MOVE | XEV_BUTTON | XEV_IN_OUT | XEV_KEY); + e_window_set_events(m->win.main, XEV_IN_OUT | XEV_KEY); + e_window_show(m->win.evas); + e_add_child(m->win.main, m->win.evas); + + e_menu_set_background(m); + + m->current.w = m->border.l + m->border.r; + m->current.h = m->border.t + m->border.b; + m->changed = 1; + + menus = evas_list_prepend(menus, m); + + return m; +} + void e_menu_hide(E_Menu *m) { + m->current.visible = 0; + m->changed = 1; } void e_menu_show(E_Menu *m) { + m->current.visible = 1; + m->changed = 1; } void e_menu_move_to(E_Menu *m, int x, int y) { + m->current.x = x; + m->current.y = y; + m->changed = 1; } void -e_menu_show_at_mouse(E_Menu *m, int x, int y) +e_menu_show_at_mouse(E_Menu *m, int x, int y, Time t) { + m->current.x = x; + m->current.y = y; + m->time = t; + e_menu_show(m); } void e_menu_add_item(E_Menu *m, E_Menu_Item *mi) { + m->entries = evas_list_append(m->entries, mi); + m->recalc_entries = 1; + m->changed = 1; + mi->menu = m; + e_menu_item_realize(m, mi); } void e_menu_del_item(E_Menu *m, E_Menu_Item *mi) { + m->entries = evas_list_remove(m->entries, mi); + m->recalc_entries = 1; + m->changed = 1; + e_menu_item_unrealize(m, mi); + mi->menu = NULL; +} + +void +e_menu_item_update(E_Menu *m, E_Menu_Item *mi) +{ + evas_move(m->evas, mi->obj_text, mi->x + m->sel_border.l, mi->y + m->sel_border.t); + evas_move(m->evas, mi->obj_entry, mi->x, mi->y); + evas_resize(m->evas, mi->obj_entry, mi->size.w + m->sel_border.l + m->sel_border.r, mi->size.h + m->sel_border.t + m->sel_border.b); +} + +void +e_menu_item_unrealize(E_Menu *m, E_Menu_Item *mi) +{ +} + +void +e_menu_item_realize(E_Menu *m, E_Menu_Item *mi) +{ + double tw, th; + + mi->obj_text = evas_add_text(m->evas, "borzoib", 8, mi->str); + mi->obj_entry = evas_add_rectangle(m->evas); + evas_set_color(m->evas, mi->obj_text, 0, 0, 0, 255); + evas_set_color(m->evas, mi->obj_entry, 0, 0, 0, 0); + evas_show(m->evas, mi->obj_text); + evas_show(m->evas, mi->obj_entry); + evas_set_layer(m->evas, mi->obj_text, 10); + evas_set_layer(m->evas, mi->obj_entry, 11); + evas_get_geometry(m->evas, mi->obj_text, NULL, NULL, &tw, &th); + mi->size.min.w = tw; + mi->size.min.h = th; + evas_callback_add(m->evas, mi->obj_entry, CALLBACK_MOUSE_IN, e_menu_item_in_cb, mi); + evas_callback_add(m->evas, mi->obj_entry, CALLBACK_MOUSE_OUT, e_menu_item_out_cb, mi); + e_menu_set_sel(m, mi); +} + +E_Menu_Item * +e_menu_item_new(char *str) +{ + E_Menu_Item *mi; + + mi = NEW(E_Menu_Item, 1); + ZERO(mi, E_Menu_Item, 1); + + mi->str = strdup(str); + + return mi; +} + +void +e_menu_obscure_outside_screen(E_Menu *m) +{ + /* obscure stuff outside the screen boundaries - optimizes rendering */ + evas_clear_obscured_rects(m->evas); + evas_add_obscured_rect(m->evas, + -m->current.x - 100000, + -m->current.y - 100000, + 200000 + screen_w, 100000); + evas_add_obscured_rect(m->evas, + -m->current.x - 100000, + -m->current.y - 100000, + 100000, 200000 + screen_h); + evas_add_obscured_rect(m->evas, + -m->current.x - 100000, + screen_h - m->current.y, + 200000 + screen_w, 100000); + evas_add_obscured_rect(m->evas, + screen_w - m->current.x, + -m->current.y - 100000, + 100000, 200000 + screen_h); +} + +void +e_menu_scroll_all_by(int dx, int dy) +{ + Evas_List l; + + for (l = menus; l; l = l->next) + { + E_Menu *m; + + m = l->data; + if (m->current.visible) + { + m->current.x += dx; + m->current.y += dy; + m->changed = 1; + } + } + for (l = open_menus; l; l = l->next) + { + E_Menu *m; + + m = l->data; + evas_event_move(m->evas, + mouse_x - m->current.x, + mouse_y - m->current.y); + } +} + +void +e_menu_update_visibility(E_Menu *m) +{ + E_Menu_Item *mi; + + mi = m->selected; + if (mi) + { + /* if the entry is off screen - scroll so it's on screen */ + if (m->current.x < 0) + e_menu_scroll_all_by(-m->current.x, 0); + else if ((m->current.x + m->current.w) > screen_w) + { + e_menu_scroll_all_by(screen_w - (m->current.x + m->current.w), 0); + } + if ((m->current.y + m->sel_border.t + mi->y) < 0) + { + if (m->current.y < -(screen_h / 4)) + e_menu_scroll_all_by(0, screen_h / 4); + else + e_menu_scroll_all_by(0, - m->current.y); + } + else if ((m->current.y + m->sel_border.t + mi->y + mi->size.h) > screen_h) + { + if ((m->current.y + m->current.h - screen_h) < (screen_h / 4)) + e_menu_scroll_all_by(0, -(m->current.y + m->current.h - screen_h)); + else + e_menu_scroll_all_by(0, -(screen_h / 4)); + } + } +} + +void +e_menu_update_base(E_Menu *m) +{ + int size_changed = 0; + int location_changed = 0; + + if (!m->changed) return; + + if (m->recalc_entries) + { + Evas_List l; + int max_w, max_h; + int i, count; + + max_w = 0; + max_h = 0; + count = 0; + for (l = m->entries; l; l = l->next) + { + E_Menu_Item *mi; + + mi = l->data; + if (mi->size.min.w > max_w) max_w = mi->size.min.w; + if (mi->size.min.h > max_h) max_h = mi->size.min.h; + count++; + } + m->current.w = m->border.l + m->border.r + max_w + m->sel_border.l + m->sel_border.r; + m->current.h = m->border.b + m->border.t + ((max_h + m->sel_border.t + m->sel_border.b) * count); + i = 0; + for (l = m->entries; l; l = l->next) + { + E_Menu_Item *mi; + + mi = l->data; + mi->size.w = max_w; + mi->size.h = max_h; + mi->x = m->border.l; + mi->y = m->border.t + (i * (max_h + m->sel_border.t + m->sel_border.b)); + e_menu_item_update(m, mi); + i++; + } + m->recalc_entries = 0; + } + if (m->redo_sel) + { + Evas_List l; + + for (l = m->entries; l; l = l->next) + { + E_Menu_Item *mi; + + mi = l->data; + e_menu_set_sel(m, mi); + if (mi) + { + if (mi->bg) + { + ebits_move(mi->bg, mi->x, mi->y); + ebits_resize(mi->bg, + mi->size.w + m->sel_border.l + m->sel_border.r, + mi->size.h + m->sel_border.t + m->sel_border.b); + ebits_show(mi->bg); + } + } + } + m->redo_sel = 0; + } + + if ((m->current.x != m->previous.x) || + (m->current.y != m->previous.y)) + location_changed = 1; + if ((m->current.w != m->previous.w) || + (m->current.h != m->previous.h)) + size_changed = 1; + + if ((location_changed) && (size_changed)) + { + e_window_move_resize(m->win.main, m->current.x, m->current.y, m->current.w, m->current.h); + e_menu_obscure_outside_screen(m); + } + else if (location_changed) + { + e_window_move(m->win.main, m->current.x, m->current.y); + e_menu_obscure_outside_screen(m); + } + else if (size_changed) + { + e_window_resize(m->win.main, m->current.w, m->current.h); + } + if (size_changed) + { + e_window_resize(m->win.evas, m->current.w, m->current.h); + evas_set_output_size(m->evas, m->current.w, m->current.h); + evas_set_output_viewport(m->evas, 0, 0, m->current.w, m->current.h); + if (m->bg) ebits_resize(m->bg, m->current.w, m->current.h); + } +} + +void +e_menu_update_finish(E_Menu *m) +{ + if (!m->changed) return; + m->previous = m->current; + m->changed = 0; +} + +void +e_menu_update_shows(E_Menu *m) +{ + if (!m->changed) return; + if (m->current.visible != m->previous.visible) + { + if (m->current.visible) + { + e_window_raise(m->win.main); + e_menu_event_win_show(); + e_window_show(m->win.main); + open_menus = evas_list_append(open_menus, m); + } + } +} + +void +e_menu_update_hides(E_Menu *m) +{ + if (!m->changed) return; + if (m->current.visible != m->previous.visible) + { + if (!m->current.visible) + { + if (m->selected) + { + E_Menu_Item *mi; + + mi = m->selected; + mi->selected = 0; + e_menu_set_sel(m, mi); + if (mi) + { + if (mi->bg) + { + ebits_move(mi->bg, mi->x, mi->y); + ebits_resize(mi->bg, + mi->size.w + m->sel_border.l + m->sel_border.r, + mi->size.h + m->sel_border.t + m->sel_border.b); + ebits_show(mi->bg); + } + } + m->redo_sel = 1; + m->changed = 1; + m->selected = NULL; + } + open_menus = evas_list_remove(open_menus, m); + e_window_hide(m->win.main); + if (!open_menus) e_menu_event_win_hide(); + } + } } void e_menu_update(E_Menu *m) { + e_menu_update_base(m); + e_menu_update_shows(m); + e_menu_update_hides(m); + e_menu_update_finish(m); }