From 78193c99bfc298742c8b2409b3e718ae97e65126 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sun, 25 Mar 2001 02:47:41 +0000 Subject: [PATCH] oops - now right menu works reliably... slight booboo :) SVN revision: 4445 --- client/client.c | 1 + src/border.c | 6 +++--- src/e.h | 32 ++++++++++++++++++++++++++++++++ src/entry.c | 6 +++--- src/ipc.c | 2 +- src/resist.c | 2 +- src/util.c | 2 +- src/view.c | 9 +++++---- 8 files changed, 47 insertions(+), 13 deletions(-) diff --git a/client/client.c b/client/client.c index 6cf7c2099..aae301414 100644 --- a/client/client.c +++ b/client/client.c @@ -5,6 +5,7 @@ #include #include #include +#include struct _coords { int xid; diff --git a/src/border.c b/src/border.c index 2479650f5..5d966d4c5 100644 --- a/src/border.c +++ b/src/border.c @@ -403,10 +403,10 @@ e_focus_out(Eevent * ev) b = e_border_find_by_window(e->win); if (b) { - char *settings_db; - E_DB_File *db; + /* char *settings_db; */ + /* E_DB_File *db; */ int focus_mode; - char buf[4096]; + /* char buf[4096]; */ E_CFG_INT(cfg_focus_mode, "settings", "/focus/mode", 0); E_CONFIG_INT_GET(cfg_focus_mode, focus_mode); diff --git a/src/e.h b/src/e.h index 8d7d5764f..9280a15cb 100644 --- a/src/e.h +++ b/src/e.h @@ -968,3 +968,35 @@ void e_fs_add_event_handler(void (*func) (EfsdEvent *ev)); void e_fs_init(void); EfsdConnection *e_fs_get_connection(void); +void e_keys_grab(char *key, Ev_Key_Modifiers mods, int anymod); +void e_keys_ungrab(char *key, Ev_Key_Modifiers mods, int anymod); +void e_keys_init(void); +E_Background *e_background_new(void); +void e_background_realize(E_Background *bg, Evas evas); +void e_background_free(E_Background *bg); +void e_view_realize(E_View *v); +void e_view_update(E_View *v); +void e_icon_set_xy(E_Icon *icon, int x, int y); +void e_icon_update(E_Icon *icon); +void e_icon_show(E_Icon *icon); +void e_icon_get_xy(E_Icon *icon, int *x, int *y); +void e_icon_set_xy(E_Icon *icon, int x, int y); +E_Icon *e_icon_new(void); +void e_icon_set_filename(E_Icon *icon, char *file); +void e_icon_pre_show(E_Icon *icon); +void e_icon_realize(E_Icon *icon); +void e_icon_unrealize(E_Icon *icon); +void e_shelf_del_icon(E_Shelf *sh, E_Icon *icon); +void e_shelf_add_icon(E_Shelf *sh, E_Icon *icon); +void e_shelf_move_by(E_Shelf *sh, int dx, int dy); +void e_shelf_resize_by(E_Shelf *sh, int dw, int dh); +void e_shelf_realize(E_Shelf *sh); +void e_ipc_init(void); +void e_pack_object_init(void); +void e_view_update_selection(E_View *v, int x, int y); +void e_view_update(E_View *v); +void e_view_scroll(E_View *v, int dx, int dy); +E_View *e_view_find_by_monitor_id(int id); +void e_view_add_icon(E_View *v, E_Icon *icon); +E_Icon *e_view_find_icon_by_file(E_View *v, char *file); +void e_view_del_icon(E_View *v, E_Icon *icon); diff --git a/src/entry.c b/src/entry.c index 32fffeebd..de973c2fd 100644 --- a/src/entry.c +++ b/src/entry.c @@ -103,7 +103,7 @@ static void e_entry_up_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y) { E_Entry *entry; - int pos; + /* int pos; */ entry = _data; if (_b == entry->mouse_down) entry->mouse_down = 0; @@ -404,14 +404,14 @@ e_entry_handle_keypress(E_Entry *entry, Ev_Key_Down *e) } else if (!strcmp(e->key, "BackSpace")) { - char *str2; + /* char *str2; */ if (entry->select.start >= 0) e_entry_clear_selection(entry); else if (entry->cursor_pos > 0) e_entry_delete_to_left(entry); } else if (!strcmp(e->key, "Delete")) { - char *str2; + /* char *str2; */ if (entry->select.start >= 0) e_entry_clear_selection(entry); else if (entry->cursor_pos < strlen(entry->buffer)) e_entry_delete_to_right(entry); diff --git a/src/ipc.c b/src/ipc.c index cc57b8491..fdb10af6a 100644 --- a/src/ipc.c +++ b/src/ipc.c @@ -8,7 +8,7 @@ struct _coords { typedef struct _coords coords; -void e_ipc_init(void); +/* void e_ipc_init(void); */ static void e_ipc_get_version(int fd); static void e_ipc_move_window(int fd); diff --git a/src/resist.c b/src/resist.c index b5357e915..59e90cebc 100644 --- a/src/resist.c +++ b/src/resist.c @@ -6,7 +6,7 @@ e_resist_border(E_Border *b) int resist = 1; int desk_resist = 32; int win_resist = 12; - int ok = 0; + /* int ok = 0; */ int dx, dy, d; int resist_x = 0, resist_y = 0; Evas_List l, rects = NULL; diff --git a/src/util.c b/src/util.c index 7796cf2cf..92a65743b 100644 --- a/src/util.c +++ b/src/util.c @@ -92,7 +92,7 @@ char * e_file_get_file(char *file) { char *p; - char buf[4096]; + /* char buf[4096]; */ p = strrchr(file, '/'); if (!p) return strdup(file); diff --git a/src/view.c b/src/view.c index a85905450..9bde051c9 100644 --- a/src/view.c +++ b/src/view.c @@ -67,7 +67,8 @@ e_bg_up_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y) ev = current_ev->event; v = _data; - if ((v->selection.w < 6) && (v->selection.h < 6)) + if (((v->selection.w < 6) && (v->selection.h < 6)) || + (!v->selection.on)) { if (_b == 1) { @@ -417,8 +418,8 @@ e_view_file_added(int id, char *file) { E_Icon *icon; E_View *v; - char *realfile; - char buf[4096]; + /* char *realfile; */ + /* char buf[4096]; */ /* if we get a path - ignore it - its not a file in the a dir */ printf("e_view_file_added(%i, \"%s\");\n", id, file); @@ -453,7 +454,7 @@ e_view_file_deleted(int id, char *file) { E_Icon *icon; E_View *v; - char *realfile; + /* char *realfile; */ printf("e_view_file_deleted(%i, \"%s\");\n", id, file); v = e_view_find_by_monitor_id(id);