forked from enlightenment/enlightenment
oops - now right menu works reliably... slight booboo :)
SVN revision: 4445
This commit is contained in:
parent
a6c47e5205
commit
78193c99bf
|
@ -5,6 +5,7 @@
|
||||||
#include <sys/un.h>
|
#include <sys/un.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
struct _coords {
|
struct _coords {
|
||||||
int xid;
|
int xid;
|
||||||
|
|
|
@ -403,10 +403,10 @@ e_focus_out(Eevent * ev)
|
||||||
b = e_border_find_by_window(e->win);
|
b = e_border_find_by_window(e->win);
|
||||||
if (b)
|
if (b)
|
||||||
{
|
{
|
||||||
char *settings_db;
|
/* char *settings_db; */
|
||||||
E_DB_File *db;
|
/* E_DB_File *db; */
|
||||||
int focus_mode;
|
int focus_mode;
|
||||||
char buf[4096];
|
/* char buf[4096]; */
|
||||||
E_CFG_INT(cfg_focus_mode, "settings", "/focus/mode", 0);
|
E_CFG_INT(cfg_focus_mode, "settings", "/focus/mode", 0);
|
||||||
|
|
||||||
E_CONFIG_INT_GET(cfg_focus_mode, focus_mode);
|
E_CONFIG_INT_GET(cfg_focus_mode, focus_mode);
|
||||||
|
|
32
src/e.h
32
src/e.h
|
@ -968,3 +968,35 @@ void e_fs_add_event_handler(void (*func) (EfsdEvent *ev));
|
||||||
void e_fs_init(void);
|
void e_fs_init(void);
|
||||||
EfsdConnection *e_fs_get_connection(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);
|
||||||
|
|
|
@ -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_up_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y)
|
||||||
{
|
{
|
||||||
E_Entry *entry;
|
E_Entry *entry;
|
||||||
int pos;
|
/* int pos; */
|
||||||
|
|
||||||
entry = _data;
|
entry = _data;
|
||||||
if (_b == entry->mouse_down) entry->mouse_down = 0;
|
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"))
|
else if (!strcmp(e->key, "BackSpace"))
|
||||||
{
|
{
|
||||||
char *str2;
|
/* char *str2; */
|
||||||
|
|
||||||
if (entry->select.start >= 0) e_entry_clear_selection(entry);
|
if (entry->select.start >= 0) e_entry_clear_selection(entry);
|
||||||
else if (entry->cursor_pos > 0) e_entry_delete_to_left(entry);
|
else if (entry->cursor_pos > 0) e_entry_delete_to_left(entry);
|
||||||
}
|
}
|
||||||
else if (!strcmp(e->key, "Delete"))
|
else if (!strcmp(e->key, "Delete"))
|
||||||
{
|
{
|
||||||
char *str2;
|
/* char *str2; */
|
||||||
|
|
||||||
if (entry->select.start >= 0) e_entry_clear_selection(entry);
|
if (entry->select.start >= 0) e_entry_clear_selection(entry);
|
||||||
else if (entry->cursor_pos < strlen(entry->buffer)) e_entry_delete_to_right(entry);
|
else if (entry->cursor_pos < strlen(entry->buffer)) e_entry_delete_to_right(entry);
|
||||||
|
|
|
@ -8,7 +8,7 @@ struct _coords {
|
||||||
|
|
||||||
typedef struct _coords 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_get_version(int fd);
|
||||||
static void e_ipc_move_window(int fd);
|
static void e_ipc_move_window(int fd);
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ e_resist_border(E_Border *b)
|
||||||
int resist = 1;
|
int resist = 1;
|
||||||
int desk_resist = 32;
|
int desk_resist = 32;
|
||||||
int win_resist = 12;
|
int win_resist = 12;
|
||||||
int ok = 0;
|
/* int ok = 0; */
|
||||||
int dx, dy, d;
|
int dx, dy, d;
|
||||||
int resist_x = 0, resist_y = 0;
|
int resist_x = 0, resist_y = 0;
|
||||||
Evas_List l, rects = NULL;
|
Evas_List l, rects = NULL;
|
||||||
|
|
|
@ -92,7 +92,7 @@ char *
|
||||||
e_file_get_file(char *file)
|
e_file_get_file(char *file)
|
||||||
{
|
{
|
||||||
char *p;
|
char *p;
|
||||||
char buf[4096];
|
/* char buf[4096]; */
|
||||||
|
|
||||||
p = strrchr(file, '/');
|
p = strrchr(file, '/');
|
||||||
if (!p) return strdup(file);
|
if (!p) return strdup(file);
|
||||||
|
|
|
@ -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;
|
ev = current_ev->event;
|
||||||
v = _data;
|
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)
|
if (_b == 1)
|
||||||
{
|
{
|
||||||
|
@ -417,8 +418,8 @@ e_view_file_added(int id, char *file)
|
||||||
{
|
{
|
||||||
E_Icon *icon;
|
E_Icon *icon;
|
||||||
E_View *v;
|
E_View *v;
|
||||||
char *realfile;
|
/* char *realfile; */
|
||||||
char buf[4096];
|
/* char buf[4096]; */
|
||||||
|
|
||||||
/* if we get a path - ignore it - its not a file in the a dir */
|
/* 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);
|
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_Icon *icon;
|
||||||
E_View *v;
|
E_View *v;
|
||||||
char *realfile;
|
/* char *realfile; */
|
||||||
|
|
||||||
printf("e_view_file_deleted(%i, \"%s\");\n", id, file);
|
printf("e_view_file_deleted(%i, \"%s\");\n", id, file);
|
||||||
v = e_view_find_by_monitor_id(id);
|
v = e_view_find_by_monitor_id(id);
|
||||||
|
|
Loading…
Reference in New Issue