E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit.h exhibit_comment_jpeg.c exhibit_favorites.c
exhibit_favorites.h exhibit_image.c exhibit_image.h
exhibit_main.c exhibit_menus.c exhibit_options.c exhibit_tab.c
Log Message:
- more code from balony, dialog fixed + general goodiness
- add debug calls (-DEX_DEBUG)
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- exhibit.h 2 Aug 2006 03:10:43 - 1.21
+++ exhibit.h 2 Aug 2006 17:31:03 - 1.22
@@ -36,6 +36,11 @@
#define EX_DEFAULT_SLIDE_INTERVAL 5.0
#define EX_DEFAULT_COMMENTS_VISIBLE 0
+#ifdef EX_DEBUG
+# define D(x) do {printf(__FILE__ :%d: , __LINE__); printf x;
fflush(stdout);} while (0)
+#else
+# define D(x) ((void) 0)
+#endif
typedef struct _Exhibit Exhibit;
typedef struct _Ex_Options Ex_Options;
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_comment_jpeg.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- exhibit_comment_jpeg.c 16 Mar 2006 12:42:39 - 1.4
+++ exhibit_comment_jpeg.c 2 Aug 2006 17:31:03 - 1.5
@@ -1,5 +1,4 @@
/*
- * common.c
* Updated by HandyAndE
*
* based on:
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_favorites.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- exhibit_favorites.c 3 Jan 2006 15:02:15 - 1.1
+++ exhibit_favorites.c 2 Aug 2006 17:31:03 - 1.2
@@ -1,3 +1,6 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
+ */
#include exhibit.h
void
@@ -19,7 +22,7 @@
ecore_file_symlink(realpath, new_path);
if(realpath)
- free(realpath);
+ E_FREE(realpath);
}
void
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_favorites.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- exhibit_favorites.h 3 Jan 2006 15:02:15 - 1.1
+++ exhibit_favorites.h 2 Aug 2006 17:31:03 - 1.2
@@ -1,3 +1,6 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
+ */
#ifndef _EX_FAVORITES_H
#define _EX_FAVORITES_H
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- exhibit_image.c 2 Aug 2006 03:10:43 - 1.25
+++ exhibit_image.c 2 Aug 2006 17:31:03 - 1.26
@@ -18,6 +18,11 @@
#define G_VAL(p) ((DATA8 *)(p))[1]
#define B_VAL(p) ((DATA8 *)(p))[0]
+static void _ex_image_delete_dialog_response(Etk_Object *obj, int response_id,
void *data);
+static void _ex_image_delete_cb(void *data);
+
+
+
void
_ex_image_mouse_wheel(Etk_Object *object, void *event, void *data)
{
@@ -171,13 +176,13 @@
data2 = etk_object_data_get(ETK_OBJECT(im), undo);
if(data2)
- free(data2);
+ E_FREE(data2);
data2 = malloc(w * h * sizeof(unsigned int));
memcpy(data2, data, w * h * sizeof(unsigned int));
etk_object_data_set(ETK_OBJECT(im), undo, data2);
- printf(Undo: setting data %p size %d, image %p\n, data,
-w * h * sizeof(unsigned int), im);
+ D((Undo: setting data %p size %d, image %p\n, data,
+w * h * sizeof(unsigned int), im));
return data2;
}
@@ -197,7 +202,7 @@
if (data)
{
- printf(Undo: getting data %p, image %p\n, data, im);
+ D((Undo: getting data %p, image %p\n, data, im));
evas_object_image_data_set(im-image_object, data);
evas_object_image_data_update_add(im-image_object, 0, 0, w, h);
etk_object_data_set(ETK_OBJECT(im), undo, NULL);
@@ -555,12 +560,14 @@
return;
sprintf(file, %s/%s, dir, basename);
- printf(Saving: %s\n, file);
+ D((Saving: %s\n, file));
/* Dont fork for the tree polulating to work */
evas_object_image_save(im-image_object, file, NULL, NULL);
/* Refresh list if the file is saved in our dir */
+ D((Image path: %s - Cur path: %s\n, fd-e-cur_tab-set_img_path,
+fd-e-cur_tab-cur_path));
if (!strcmp(fd-e-cur_tab-set_img_path, fd-e-cur_tab-cur_path))
{
etk_tree_clear(ETK_TREE(fd-e-cur_tab-itree));
@@ -612,7 +619,7 @@
label = etk_label_new(Filename:);
etk_box_pack_start(ETK_BOX(vbox), label, ETK_FALSE, ETK_FALSE, 0);
- printf (Selected original filename: %s\n, e-cur_tab-cur_file);
+ D((Selected original filename: %s\n, e-cur_tab-cur_file));
fd-entry = etk_entry_new();
etk_entry_text_set(ETK_ENTRY(fd-entry), e-cur_tab-cur_file);
@@ -636,7 +643,7 @@
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit.h exhibit_favorites.c exhibit_image.c exhibit_main.c
exhibit_main.h exhibit_menus.c exhibit_options.c
exhibit_sort.c exhibit_tab.c exhibit_tab.h
Log Message:
- lots of cleanups, moving code around, making things more logical
- config now saves window W and H and uses them next time it starts
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- exhibit.h 2 Aug 2006 17:31:03 - 1.22
+++ exhibit.h 2 Aug 2006 19:23:22 - 1.23
@@ -5,11 +5,12 @@
#define _EX_H
#include Eet.h
-#include Evas.h
#include Ecore.h
#include Ecore_X.h
#include Ecore_File.h
#include Ecore_X_Cursor.h
+#include Evas.h
+#include Ecore_Evas.h
#include Epsilon.h
#include etk/Etk.h
#include stdio.h
@@ -35,7 +36,9 @@
#define EX_DEFAULT_BRIGHTEN_THRESH 100
#define EX_DEFAULT_SLIDE_INTERVAL 5.0
#define EX_DEFAULT_COMMENTS_VISIBLE 0
-
+#define EX_DEFAULT_WINDOW_WIDTH 700
+#define EX_DEFAULT_WINDOW_HEIGHT 500
+
#ifdef EX_DEBUG
# define D(x) do {printf(__FILE__ :%d: , __LINE__); printf x;
fflush(stdout);} while (0)
#else
@@ -73,7 +76,10 @@
double slide_interval;
int comments_visible;
int default_view;
- int default_sort;
+ int default_sort;
+
+ int last_w;
+ int last_h;
};
struct _Ex_Tab
@@ -141,9 +147,7 @@
Etk_Widget*resbar;
Etk_Widget*zoombar;
Etk_Widget*menu;
- Etk_Widget*win;
-
- char fav_path[PATH_MAX];
+ Etk_Widget*win;
intzoom;
intbrightness;
@@ -194,8 +198,6 @@
};
#define WINDOW_TITLE Exhibit
-#define WINDOW_WIDTH 700
-#define WINDOW_HEIGHT 500
#define ZOOM_MAX 16
#define ZOOM_MIN -16
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_favorites.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- exhibit_favorites.c 2 Aug 2006 17:31:03 - 1.2
+++ exhibit_favorites.c 2 Aug 2006 19:23:22 - 1.3
@@ -9,16 +9,16 @@
char new_path[PATH_MAX];
char *realpath;
- if(!ecore_file_is_dir(e-fav_path))
+ if(!ecore_file_is_dir(e-options-fav_path))
{
- if(ecore_file_exists(e-fav_path))
+ if(ecore_file_exists(e-options-fav_path))
return;
- if(!ecore_file_mkdir(e-fav_path))
+ if(!ecore_file_mkdir(e-options-fav_path))
return;
}
realpath = ecore_file_realpath(path);
- snprintf(new_path, sizeof(new_path), %s/%s, e-fav_path, path);
+ snprintf(new_path, sizeof(new_path), %s/%s, e-options-fav_path, path);
ecore_file_symlink(realpath, new_path);
if(realpath)
@@ -30,6 +30,6 @@
{
char new_path[PATH_MAX];
- snprintf(new_path, sizeof(new_path), %s/%s, e-fav_path, path);
+ snprintf(new_path, sizeof(new_path), %s/%s, e-options-fav_path, path);
ecore_file_unlink(new_path);
}
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- exhibit_image.c 2 Aug 2006 17:31:03 - 1.26
+++ exhibit_image.c 2 Aug 2006 19:23:22 - 1.27
@@ -37,9 +37,9 @@
if(evas_key_modifier_is_set(evas_key_modifier_get(evas), Control))
{
if (ev-z 0)
- _ex_main_button_zoom_in_cb(NULL, data);
+ _ex_tab_current_zoom_in(data);
else
- _ex_main_button_zoom_out_cb(NULL, data);
+ _ex_tab_current_zoom_out(data);
}
else
{
@@ -1073,7 +1073,7 @@
if(!r) return ETK_FALSE;
etk_tree_row_fields_get(r,
etk_tree_nth_col_get(ETK_TREE(e-cur_tab-itree), 0), NULL, icol_string,
etk_tree_nth_col_get(ETK_TREE(e-cur_tab-itree), 1),NULL);
- snprintf(path, sizeof(path), %s/%s, e-fav_path, icol_string);
+ snprintf(path, sizeof(path), %s/%s, e-options-fav_path, icol_string);
if(ecore_file_exists(path))
return ETK_TRUE;
return ETK_FALSE;
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- exhibit_main.c 2 Aug 2006 17:31:03 - 1.58
+++ exhibit_main.c 2 Aug 2006 19:23:22 - 1.59
@@ -3,15 +3,24 @@
*/
#include exhibit.h
#include Ecore_File.h
-#include Ecore_Evas.h
+
extern pid_t pid;
extern Evas_List *thumb_list;
Exhibit *e;
-Ecore_Evas *ee_buf;
-Evas *evas_buf;
Evas_List *event_handlers;
+static void _ex_main_button_zoom_in_cb(Etk_Object *obj, void *data);
+static void _ex_main_button_zoom_out_cb(Etk_Object *obj, void *data);
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/exhibit Modified Files: TODO Log Message: - TODO++/-- === RCS file: /cvs/e/e17/proto/exhibit/TODO,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- TODO2 Aug 2006 03:10:43 - 1.7 +++ TODO2 Aug 2006 19:35:20 - 1.8 @@ -7,23 +7,23 @@ -- -menus * new window - * save image as * search * rename - * delete + * delete (needs message dialog) * open in options based on config values * refresh * release notes * about - options + * dialog * slide show speed * comments visibile / hidden by default (with remembering last state) - key shotcuts * x - fit / unfit to window -- save window geometry between sessions +- make slideshow display its status in the statusbar(s) o DONE: -- @@ -33,6 +33,10 @@ + dnd + fix .spec file + make argv work with /path/to/image.png and not only /path/to/dir ++ save window geometry between sessions ++ menus + + save image as + = * RELEASSE 0.2.0: - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: uptime e-taro
Enlightenment CVS committal Author : e-taro Project : e_modules Module : uptime Dir : e_modules/uptime/po Modified Files: ja.po Log Message: uptime ja.po update (Yasufumi Haga) === RCS file: /cvs/e/e_modules/uptime/po/ja.po,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- ja.po 3 Jul 2006 17:24:11 - 1.3 +++ ja.po 2 Aug 2006 20:10:38 - 1.4 @@ -8,57 +8,57 @@ msgstr Project-Id-Version: Uptime\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2006-07-03 01:10+0900\n -PO-Revision-Date: 2006-07-03 11:29+0900\n +POT-Creation-Date: 2006-07-31 00:35+0900\n +PO-Revision-Date: 2006-07-31 11:04+0900\n Last-Translator: Yasufumi Haga [EMAIL PROTECTED]\n Language-Team: LANGUAGE [EMAIL PROTECTED]\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -#: e_mod_config.c:46 +#: e_mod_config.c:52 msgid Uptime Configuration msgstr uptime ã®è¨å® -#: e_mod_config.c:95 +#: e_mod_config.c:105 msgid Uptime Settings msgstr è¨å®å 容 -#: e_mod_config.c:97 +#: e_mod_config.c:107 msgid Update Interval: msgstr æ´æ°éé -#: e_mod_config.c:104 +#: e_mod_config.c:114 msgid Check Interval: msgstr ç£è¦éé -#: e_mod_main.c:153 +#: e_mod_main.c:160 msgid Uptime msgstr -#: e_mod_main.c:192 +#: e_mod_main.c:200 msgid Configuration msgstr è¨å® -#: e_mod_main.c:393 +#: e_mod_main.c:401 msgid Enlightenment Uptime Monitor Module msgstr Enlightenment uptime ç£è¦ã¢ã¸ã¥ã¼ã« -#: e_mod_main.c:394 +#: e_mod_main.c:402 msgid This module is used to monitor uptime. msgstr ãã㯠uptime ãç£è¦ããã¢ã¸ã¥ã¼ã«ã§ã. -#: e_mod_main.c:559 +#: e_mod_main.c:573 #, c-format -msgid up: %ld days, %ld:%02ld:%02ld -msgstr up: %ld æ¥, %ld:%02ld:%02ld +msgid up: %d days, %d:%02d:%02ld +msgstr up: %dæ¥, %d:%02d:%02ld -#: e_mod_main.c:566 +#: e_mod_main.c:580 #, c-format msgid la: %.2f %.2f %.2f msgstr -#: e_mod_main.c:571 +#: e_mod_main.c:585 #, c-format msgid users: %d msgstr ã¦ã¼ã¶ã¼: %d - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: slideshow e-taro
Enlightenment CVS committal Author : e-taro Project : e_modules Module : slideshow Dir : e_modules/slideshow/po Modified Files: ja.po Log Message: slideshow ja.po update (Yasufumi Haga) === RCS file: /cvs/e/e_modules/slideshow/po/ja.po,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- ja.po 8 Jun 2006 13:59:31 - 1.7 +++ ja.po 2 Aug 2006 20:14:21 - 1.8 @@ -8,48 +8,60 @@ msgstr Project-Id-Version: PACKAGE VERSION\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2006-06-03 18:07+0900\n -PO-Revision-Date: 2006-05-30 21:00+0900\n +POT-Creation-Date: 2006-07-31 00:25+0900\n +PO-Revision-Date: 2006-07-31 10:54+0900\n Last-Translator: Yasufumi Haga [EMAIL PROTECTED]\n Language-Team: LANGUAGE [EMAIL PROTECTED]\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -#: e_mod_config.c:32 +#: e_mod_config.c:39 msgid Slideshow Configuration msgstr ã¹ã©ã¤ãã·ã§ã¼ã®è¨å® -#: e_mod_config.c:81 +#: e_mod_config.c:91 msgid Cycle Time msgstr åæ¿éé -#: e_mod_config.c:82 +#: e_mod_config.c:93 msgid Disable Timer msgstr èæ¯ãåãæ¿ããªã -#: e_mod_config.c:84 +#: e_mod_config.c:96 #, c-format msgid %3.0f seconds msgstr %3.0f ç§ -#: e_mod_config.c:88 +#: e_mod_config.c:101 msgid Directory msgstr ãã£ã¬ã¯ã㪠-#: e_mod_config.c:90 +#: e_mod_config.c:103 msgid Sub-directory to use for backgrounds msgstr èæ¯ã®ä¿ç®¡å ´æ -#: e_mod_main.c:124 +#: e_mod_config.c:110 +msgid Extra +msgstr ãã®ä» + +#: e_mod_config.c:111 +msgid Randomize order +msgstr åæ¿é ãã©ã³ãã ã«ãã + +#: e_mod_main.c:139 msgid Slideshow msgstr -#: e_mod_main.c:355 +#: e_mod_main.c:173 +msgid Configuration +msgstr è¨å® + +#: e_mod_main.c:383 msgid Enlightenment Slide Show Module msgstr Enlightenment slideshow ã¢ã¸ã¥ã¼ã« -#: e_mod_main.c:356 +#: e_mod_main.c:384 msgid This module is VERY simple and is used to cycle desktop backgrounds msgstr ããã¯, ãã¹ã¯ãããèæ¯ãå¨æçã«å¤æ´ãã¦ãã, ã¨ã¦ãç°¡åãªã¢ã¸ã¥ã¼ã«ã§ã. - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_menu_bar.c etk_widget.c
Log Message:
* Make Etk compile
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_menu_bar.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- etk_menu_bar.c 2 Aug 2006 05:53:59 - 1.9
+++ etk_menu_bar.c 2 Aug 2006 20:17:38 - 1.10
@@ -241,7 +241,7 @@
if (!_etk_menu_bar_mouse_move_handler)
{
-#if 0
+#if BUILD_ENGINE_EE_S_X11
_etk_menu_bar_mouse_move_handler =
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE,
_etk_menu_bar_mouse_move_cb, menu_bar);
#endif
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_widget.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- etk_widget.c2 Aug 2006 19:17:00 - 1.59
+++ etk_widget.c2 Aug 2006 20:17:38 - 1.60
@@ -156,7 +156,7 @@
static Etk_Signal *_etk_widget_signals[ETK_WIDGET_NUM_SIGNALS];
static Etk_Bool _etk_widget_intercept_show_hide = ETK_TRUE;
static Evas_Smart *_etk_widget_smart_object_smart = NULL;
-static Etk_Widget_Swallow_Error _etk_widget_swallow_error =
ETK_SWALLOW_ERROR_NODE;
+static Etk_Widget_Swallow_Error _etk_widget_swallow_error =
ETK_SWALLOW_ERROR_NONE;
static Evas_List *_etk_widget_dnd_dest_widgets = NULL;
static Evas_List *_etk_widget_dnd_source_widgets = NULL;
static Etk_Bool _etk_dnd_drag_start = ETK_TRUE;
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore turran
Enlightenment CVS committal
Author : turran
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_evas
Modified Files:
ecore_evas_fb.c
Log Message:
Ecore_Evas_Fb
=
+ Now we send events to evas from all input devices
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_fb.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ecore_evas_fb.c 31 Jul 2006 04:13:51 - 1.19
+++ ecore_evas_fb.c 2 Aug 2006 21:41:10 - 1.20
@@ -11,12 +11,11 @@
static int _ecore_evas_init_count = 0;
static int _ecore_evas_fps_debug = 0;
-
+static char *ecore_evas_default_display = 0;
+static Ecore_List *ecore_evas_input_devices = NULL;
static Ecore_Evas *ecore_evases = NULL;
-static Ecore_Event_Handler *ecore_evas_event_handlers[6];
+static Ecore_Event_Handler *ecore_evas_event_handlers[6] = {NULL, NULL, NULL,
NULL, NULL, NULL};
static Ecore_Idle_Enterer *ecore_evas_idle_enterer = NULL;
-static Ecore_Fb_Input_Device *stdkbd = NULL;
-static Ecore_Fb_Input_Device *stdmouse = NULL;
static void
_ecore_evas_mouse_move_process(Ecore_Evas *ee, int x, int y, unsigned int
timestamp)
@@ -77,6 +76,7 @@
_ecore_evas_fb_lose(void *data __UNUSED__)
{
Ecore_List2 *l;
+ Ecore_Fb_Input_Device *dev;
for (l = (Ecore_List2 *)ecore_evases; l; l = l-next)
{
@@ -85,14 +85,19 @@
ee = (Ecore_Evas *)l;
ee-visible = 0;
}
- ecore_fb_input_device_listen(stdmouse, 0);
- ecore_fb_input_device_listen(stdkbd, 0);
+ ecore_list_goto_first(ecore_evas_input_devices);
+ dev = ecore_list_current(ecore_evas_input_devices);
+ do
+ {
+ ecore_fb_input_device_listen(dev, 0);
+ }while((dev = ecore_list_next(ecore_evas_input_devices)));
}
static void
_ecore_evas_fb_gain(void *data __UNUSED__)
{
Ecore_List2 *l;
+ Ecore_Fb_Input_Device *dev;
for (l = (Ecore_List2 *)ecore_evases; l; l = l-next)
{
@@ -102,8 +107,12 @@
ee-visible = 1;
evas_damage_rectangle_add(ee-evas, 0, 0, ee-w, ee-h);
}
- ecore_fb_input_device_listen(stdmouse, 1);
- ecore_fb_input_device_listen(stdkbd, 1);
+ ecore_list_goto_first(ecore_evas_input_devices);
+ dev = ecore_list_current(ecore_evas_input_devices);
+ do
+ {
+ ecore_fb_input_device_listen(dev, 1);
+ }while((dev = ecore_list_next(ecore_evas_input_devices)));
}
static int
@@ -115,7 +124,6 @@
e = event;
ee = _ecore_evas_fb_match();
if (!ee) return 1; /* pass on event */
- if (e-dev != stdkbd) return 1;
evas_event_feed_key_down(ee-evas, e-keyname, e-keysymbol,
e-key_compose, NULL, (unsigned int)((unsigned long long)(ecore_time_get() *
1000.0) 0x), NULL);
return 0; /* dont pass it on */
}
@@ -129,7 +137,6 @@
e = event;
ee = _ecore_evas_fb_match();
if (!ee) return 1; /* pass on event */
- if (e-dev != stdkbd) return 1;
evas_event_feed_key_up(ee-evas, e-keyname, e-keysymbol, e-key_compose,
NULL, (unsigned int)((unsigned long long)(ecore_time_get() * 1000.0)
0x), NULL);
return 0; /* dont pass it on */
}
@@ -144,7 +151,6 @@
e = event;
ee = _ecore_evas_fb_match();
if (!ee) return 1; /* pass on event */
- if (e-dev != stdmouse) return 1;
_ecore_evas_mouse_move_process(ee, e-x, e-y, (unsigned int)((unsigned
long long)(ecore_time_get() * 1000.0) 0x));
if (e-double_click) flags |= EVAS_BUTTON_DOUBLE_CLICK;
if (e-triple_click) flags |= EVAS_BUTTON_TRIPLE_CLICK;
@@ -161,7 +167,6 @@
e = event;
ee = _ecore_evas_fb_match();
if (!ee) return 1; /* pass on event */
- if (e-dev != stdmouse) return 1;
_ecore_evas_mouse_move_process(ee, e-x, e-y, (unsigned int)((unsigned
long long)(ecore_time_get() * 1000.0) 0x));
evas_event_feed_mouse_up(ee-evas, e-button, EVAS_BUTTON_NONE, (unsigned
int)((unsigned long long)(ecore_time_get() * 1000.0) 0x), NULL);
return 0; /* dont pass it on */
@@ -176,7 +181,6 @@
e = event;
ee = _ecore_evas_fb_match();
if (!ee) return 1; /* pass on event */
- if (e-dev != stdmouse) return 1;
_ecore_evas_mouse_move_process(ee, e-x, e-y, (unsigned int)((unsigned
long long)(ecore_time_get() * 1000.0) 0x));
return 0; /* dont pass it on */
}
@@ -190,7 +194,6 @@
e = event;
ee = _ecore_evas_fb_match();
if (!ee) return 1; /* pass on event */
- if (e-dev != stdmouse) return 1;
_ecore_evas_mouse_move_process(ee, e-x, e-y, (unsigned int)((unsigned
long long)(ecore_time_get() * 1000.0) 0x));
return 0; /* dont pass it on */
}
@@ -242,19 +245,67 @@
}
static int
-_ecore_evas_fb_init(void)
+_ecore_evas_fb_init(int w, int h)
{
+ Ecore_Fb_Input_Device *device;
+ Ecore_Fb_Input_Device_Cap caps;
+ int mouse_handled = 0;
+ int keyboard_handled = 0;
+
+ DIR *input_dir;
+ struct dirent *input_entry;
+
E CVS: libs/ecore turran
Enlightenment CVS committal Author : turran Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_fb Modified Files: Ecore_Fb.h Log Message: Ecore_Evas_Fb = + Now we send events to evas from all input devices === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_fb/Ecore_Fb.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- Ecore_Fb.h 31 Jul 2006 04:13:51 - 1.7 +++ Ecore_Fb.h 2 Aug 2006 21:41:11 - 1.8 @@ -35,6 +35,7 @@ * backlight support using new kernel interface * absolute axis * joystick + * ecore_fb_li_device_close_all ? or a shutdown of the subsystem? * */ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto turran
Enlightenment CVS committal
Author : turran
Project : e17
Module : proto
Dir : e17/proto/etk/src/engines/ecore_fb
Modified Files:
ecore_fb.c
Log Message:
Ecore_Fb Engine:
===
+ change the cursor handling to an evas_object
+ better solution for the width/height. Now it sues the current mode
===
RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_fb/ecore_fb.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ecore_fb.c 1 Aug 2006 06:47:33 - 1.3
+++ ecore_fb.c 2 Aug 2006 22:08:10 - 1.4
@@ -19,9 +19,6 @@
#include Etk_Engine_Ecore_Evas.h
#include Etk_Engine_Ecore_Fb.h
-#define WIDTH 1280
-#define HEIGHT 1024
-
#define POINTER_SIZE 64
/* fb data */
@@ -54,10 +51,6 @@
static void _window_size_get(Etk_Window *window, int *w, int *h);
/* Handlers and callbacks */
-static int _key_down_handler(void *data, int ev_type, void *ev);
-static int _key_up_handler(void *data, int ev_type, void *ev);
-static int _mouse_down_handler(void *data, int ev_type, void *ev);
-static int _mouse_up_handler(void *data, int ev_type, void *ev);
static int _mouse_move_handler(void *data, int ev_type, void *ev);
static void _window_realized_cb(Etk_Object *object, void *data);
@@ -138,9 +131,7 @@
static Ecore_Evas *_ecore_evas = NULL;
static Evas *_evas = NULL;
static Evas_Object *_background_object = NULL;
-#if 0
static Evas_Object *_pointer_object = NULL;
-#endif
static Etk_Window *_drag_window = NULL;
static int _drag_offset_x = 0;
@@ -172,16 +163,21 @@
ETK_WARNING(Ecore_Evas initialization failed!);
return ETK_FALSE;
}
+ if (!ecore_fb_init(NULL))
+ {
+ ETK_WARNING(Ecore_Fb initialization failed!);
+ return ETK_FALSE;
+ }
+ /* needed for the pointer */
+ ecore_event_handler_add(ECORE_FB_EVENT_MOUSE_MOVE, _mouse_move_handler,
NULL);
+ ecore_fb_size_get(fb_width, fb_height);
/* Create the evas where all the windows will be drawn */
- _ecore_evas = ecore_evas_fb_new(NULL, 0, 800, 600);
+ _ecore_evas = ecore_evas_fb_new(NULL, 0, fb_width, fb_height);
if(!_ecore_evas)
{
ETK_WARNING(Ecore_Evas_Fb initialization failed!);
return ETK_FALSE;
}
- ecore_evas_fullscreen_set(_ecore_evas, 1);
- ecore_fb_size_get(fb_width, fb_height);
-
if (!(_evas = ecore_evas_get(_ecore_evas)))
{
ETK_WARNING(Unable to create a FB evas);
@@ -192,7 +188,7 @@
#if 0
ecore_evas_ignore_events_set(_ecore_evas, 1);
evas_event_feed_mouse_in(_evas, ecore_time_get(), NULL);
-#endif
+ #endif
/* Create the background */
_background_object = etk_theme_object_load(_evas,
etk_theme_widget_theme_get(), wm_background);
@@ -200,17 +196,14 @@
evas_object_show(_background_object);
/* Create the mouse pointer */
- ecore_evas_cursor_set(_ecore_evas, PACKAGE_DATA_DIR
/pointers/default_pointer.png,100, 1, 1);
-#if 0
_pointer_object = evas_object_image_add(_evas);
evas_object_image_file_set(_pointer_object, PACKAGE_DATA_DIR
/pointers/default_pointer.png, NULL);
evas_object_image_fill_set(_pointer_object, 0, 0, POINTER_SIZE,
POINTER_SIZE);
evas_object_pass_events_set(_pointer_object, 1);
- evas_object_move(_pointer_object, WIDTH - (POINTER_SIZE / 2), HEIGHT -
(POINTER_SIZE / 2));
+ evas_object_move(_pointer_object, fb_width - (POINTER_SIZE / 2), fb_height
- (POINTER_SIZE / 2));
evas_object_resize(_pointer_object, POINTER_SIZE, POINTER_SIZE);
evas_object_show(_pointer_object);
-#endif
-
+
return ETK_TRUE;
}
@@ -221,7 +214,7 @@
_ecore_evas = NULL;
_evas = NULL;
_background_object = NULL;
- //_pointer_object = NULL;
+ _pointer_object = NULL;
_drag_window = NULL;
ecore_evas_shutdown();
@@ -390,12 +383,13 @@
edje_object_signal_callback_add(engine_data-border, mouse,down,1*,
titlebar, _window_titlebar_mouse_down_cb, window);
edje_object_signal_callback_add(engine_data-border, mouse,up,1*,
titlebar, _window_titlebar_mouse_up_cb, window);
- //evas_object_raise(_pointer_object);
+ evas_object_raise(_pointer_object);
}
/* Called when the titlebar of the window is pressed */
static void _window_titlebar_mouse_down_cb(void *data, Evas_Object *obj, const
char *emission, const char *source)
{
+ /* TODO rasie the window */
_drag_window = ETK_WINDOW(data);
}
@@ -404,3 +398,20 @@
{
_drag_window = NULL;
}
+
+/* Called when the mouse is moved */
+static int _mouse_move_handler(void *data, int ev_type, void *ev)
+{
+ Ecore_Fb_Event_Mouse_Move *event = ev;
+
+ /* Move the window to drag */
+ if (_drag_window)
+ etk_window_move(_drag_window, event-x - _drag_offset_x, event-y -
_drag_offset_y);
+
+ evas_object_move(_pointer_object, event-x - (POINTER_SIZE / 2), event-y -
(POINTER_SIZE / 2));
+ evas_event_feed_mouse_move(_evas, event-x, event-y, ecore_time_get(),
NULL);
+
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/engines/ecore_fb
Modified Files:
ecore_fb.c
Log Message:
* The Ecore_FB engine uses ecore_evas_cursor_set() to display the mouse
cursor. turran was right :)
===
RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_fb/ecore_fb.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ecore_fb.c 2 Aug 2006 22:08:10 - 1.4
+++ ecore_fb.c 3 Aug 2006 01:35:46 - 1.5
@@ -16,15 +16,10 @@
#include etk_utils.h
#include config.h
-#include Etk_Engine_Ecore_Evas.h
#include Etk_Engine_Ecore_Fb.h
#define POINTER_SIZE 64
-/* fb data */
-int fb_width = 0;
-int fb_height = 0;
-
/* TODO: prop notify ? */
/* Engine specific data for Etk_Window
@@ -52,7 +47,6 @@
/* Handlers and callbacks */
static int _mouse_move_handler(void *data, int ev_type, void *ev);
-
static void _window_realized_cb(Etk_Object *object, void *data);
static void _window_titlebar_mouse_down_cb(void *data, Evas_Object *obj, const
char *emission, const char *source);
static void _window_titlebar_mouse_up_cb(void *data, Evas_Object *obj, const
char *emission, const char *source);
@@ -131,7 +125,8 @@
static Ecore_Evas *_ecore_evas = NULL;
static Evas *_evas = NULL;
static Evas_Object *_background_object = NULL;
-static Evas_Object *_pointer_object = NULL;
+static int _fb_width = 0;
+static int _fb_height = 0;
static Etk_Window *_drag_window = NULL;
static int _drag_offset_x = 0;
@@ -158,51 +153,39 @@
char *filename;
char device_path[PATH_MAX];
- if (!ecore_evas_init())
+ if (!ecore_fb_init(NULL))
{
- ETK_WARNING(Ecore_Evas initialization failed!);
+ ETK_WARNING(Ecore_Fb initialization failed!);
return ETK_FALSE;
}
- if (!ecore_fb_init(NULL))
+ if (!ecore_evas_init())
{
- ETK_WARNING(Ecore_Fb initialization failed!);
+ ETK_WARNING(Ecore_Evas initialization failed!);
return ETK_FALSE;
}
- /* needed for the pointer */
ecore_event_handler_add(ECORE_FB_EVENT_MOUSE_MOVE, _mouse_move_handler,
NULL);
- ecore_fb_size_get(fb_width, fb_height);
+ ecore_fb_size_get(_fb_width, _fb_height);
+
/* Create the evas where all the windows will be drawn */
- _ecore_evas = ecore_evas_fb_new(NULL, 0, fb_width, fb_height);
- if(!_ecore_evas)
+ _ecore_evas = ecore_evas_fb_new(NULL, 0, _fb_width, _fb_height);
+ if (!_ecore_evas)
{
- ETK_WARNING(Ecore_Evas_Fb initialization failed!);
+ ETK_WARNING(Unable to create a FB Ecore_Evas);
return ETK_FALSE;
}
if (!(_evas = ecore_evas_get(_ecore_evas)))
{
- ETK_WARNING(Unable to create a FB evas);
+ ETK_WARNING(Unable to create a FB Evas);
return ETK_FALSE;
}
- ecore_evas_show(_ecore_evas);
- #if 0
- ecore_evas_ignore_events_set(_ecore_evas, 1);
- evas_event_feed_mouse_in(_evas, ecore_time_get(), NULL);
- #endif
+ ecore_evas_cursor_set(_ecore_evas, PACKAGE_DATA_DIR
/pointers/default_pointer.png, 1000, 32, 32);
+ ecore_evas_show(_ecore_evas);
/* Create the background */
_background_object = etk_theme_object_load(_evas,
etk_theme_widget_theme_get(), wm_background);
- evas_object_resize(_background_object, fb_width, fb_height);
+ evas_object_resize(_background_object, _fb_width, _fb_height);
evas_object_show(_background_object);
-
- /* Create the mouse pointer */
- _pointer_object = evas_object_image_add(_evas);
- evas_object_image_file_set(_pointer_object, PACKAGE_DATA_DIR
/pointers/default_pointer.png, NULL);
- evas_object_image_fill_set(_pointer_object, 0, 0, POINTER_SIZE,
POINTER_SIZE);
- evas_object_pass_events_set(_pointer_object, 1);
- evas_object_move(_pointer_object, fb_width - (POINTER_SIZE / 2), fb_height
- (POINTER_SIZE / 2));
- evas_object_resize(_pointer_object, POINTER_SIZE, POINTER_SIZE);
- evas_object_show(_pointer_object);
return ETK_TRUE;
}
@@ -214,7 +197,6 @@
_ecore_evas = NULL;
_evas = NULL;
_background_object = NULL;
- _pointer_object = NULL;
_drag_window = NULL;
ecore_evas_shutdown();
@@ -382,8 +364,6 @@
edje_object_signal_callback_add(engine_data-border, mouse,down,1*,
titlebar, _window_titlebar_mouse_down_cb, window);
edje_object_signal_callback_add(engine_data-border, mouse,up,1*,
titlebar, _window_titlebar_mouse_up_cb, window);
-
- evas_object_raise(_pointer_object);
}
/* Called when the titlebar of the window is pressed */
@@ -407,9 +387,6 @@
/* Move the window to drag */
if (_drag_window)
etk_window_move(_drag_window, event-x - _drag_offset_x, event-y -
_drag_offset_y);
-
- evas_object_move(_pointer_object, event-x - (POINTER_SIZE / 2), event-y -
(POINTER_SIZE / 2));
- evas_event_feed_mouse_move(_evas, event-x, event-y, ecore_time_get(),
NULL);
return 1;
}
E CVS: apps/e sebastid
Enlightenment CVS committal Author : sebastid Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_startup.c Log Message: Remove double if check === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_startup.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- e_int_config_startup.c 1 Aug 2006 02:42:44 - 1.12 +++ e_int_config_startup.c 3 Aug 2006 02:05:33 - 1.13 @@ -66,9 +66,7 @@ _init_file_monitor = NULL; } - if (cfdata-init_default_theme) - E_FREE(cfdata-init_default_theme); - + E_FREE(cfdata-init_default_theme); E_FREE(cfdata); } - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_object_smart.c
Log Message:
* Add evas_object_smart_parent_get() to get the smart parent of an Evas_Object
* Add evas_object_smart_members_get() to get a list of the member objects of a
smart object
===
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_object_smart.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- evas_object_smart.c 30 Jul 2006 14:30:24 - 1.23
+++ evas_object_smart.c 3 Aug 2006 02:14:53 - 1.24
@@ -184,6 +184,44 @@
}
/**
+ * Gets the smart parent of an Evas_Object
+ * @param obj the Evas_Object you want to get the parent
+ * @return Returns the smart parent of @a obj, or NULL if @a obj is not a
smart member of another Evas_Object
+ */
+EAPI Evas_Object *
+evas_object_smart_parent_get(Evas_Object *obj)
+{
+ MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
+ return NULL;
+ MAGIC_CHECK_END();
+
+ return obj-smart.parent;
+}
+
+/**
+ * Gets the list of the member objects of an Evas_Object
+ * @param obj the Evas_Object you want to get the list of member objects
+ * @return Returns the list of the member objects of @a obj.
+ * The returned list should be freed with evas_list_free() when you no longer
need it
+ */
+EAPI Evas_List *
+evas_object_smart_members_get(Evas_Object *obj)
+{
+ Evas_List *members;
+ Evas_Object_List *member;
+
+ MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
+ return NULL;
+ MAGIC_CHECK_END();
+
+ members = NULL;
+ for (member = obj-smart.contained; member; member = member-next)
+ members = evas_list_append(members, member);
+
+ return members;
+}
+
+/**
* To be documented.
*
* FIXME: To be fixed.
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas moom
Enlightenment CVS committal Author : moom Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib Modified Files: Evas.h Log Message: * Add evas_object_smart_parent_get() to get the smart parent of an Evas_Object * Add evas_object_smart_members_get() to get a list of the member objects of a smart object === RCS file: /cvs/e/e17/libs/evas/src/lib/Evas.h,v retrieving revision 1.86 retrieving revision 1.87 diff -u -3 -r1.86 -r1.87 --- Evas.h 27 Jul 2006 19:27:34 - 1.86 +++ Evas.h 3 Aug 2006 02:14:53 - 1.87 @@ -660,6 +660,8 @@ EAPI Evas_Object *evas_object_smart_add (Evas *e, Evas_Smart *s); EAPI void evas_object_smart_member_add (Evas_Object *obj, Evas_Object *smart_obj); EAPI void evas_object_smart_member_del (Evas_Object *obj); + EAPI Evas_Object *evas_object_smart_parent_get (Evas_Object *obj); + EAPI Evas_List*evas_object_smart_members_get (Evas_Object *obj); EAPI Evas_Smart *evas_object_smart_smart_get (Evas_Object *obj); EAPI void *evas_object_smart_data_get(Evas_Object *obj); EAPI void evas_object_smart_data_set(Evas_Object *obj, void *data); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/estickies/src/bin
Modified Files:
stickies.c stickies.h
Log Message:
- confirmation dialog when the [x] button is pressed (which deletes, not
closes, need to change image soon)
===
RCS file: /cvs/e/e17/proto/estickies/src/bin/stickies.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- stickies.c 2 Aug 2006 05:53:59 - 1.3
+++ stickies.c 3 Aug 2006 02:40:11 - 1.4
@@ -15,6 +15,7 @@
static void _e_sticky_focus_in_cb(Etk_Object *object, void *data);
static void _e_sticky_focus_out_cb(Etk_Object *object, void *data);
static void _e_sticky_sticky_cb(Etk_Object *object, const char *property_name,
void *data);
+static void _e_sticky_delete_confirm_cb(Etk_Object *obj, int response_id, void
*data);
static void
_e_sticky_key_down_cb(Etk_Object *object, void *event, void *data)
@@ -209,7 +210,7 @@
menu = etk_menu_new();
_etk_menu_stock_item_new(New, ETK_STOCK_DOCUMENT_OPEN,
ETK_MENU_SHELL(menu), ETK_CALLBACK(_e_sticky_new_show_append), NULL);
_etk_menu_stock_item_new(Save, ETK_STOCK_DOCUMENT_SAVE,
ETK_MENU_SHELL(menu), ETK_CALLBACK(_e_config_save), ss);
- _etk_menu_stock_item_new(Delete, ETK_STOCK_EDIT_DELETE,
ETK_MENU_SHELL(menu), ETK_CALLBACK(_e_sticky_delete), s);
+ _etk_menu_stock_item_new(Delete, ETK_STOCK_EDIT_DELETE,
ETK_MENU_SHELL(menu), ETK_CALLBACK(_e_sticky_delete_confirm), s);
_etk_menu_stock_item_new(Options, ETK_STOCK_PREFERENCES_DESKTOP_THEME,
ETK_MENU_SHELL(menu), ETK_CALLBACK(_e_theme_chooser_show), s);
_etk_menu_stock_item_new(Quit, ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu),
ETK_CALLBACK(etk_main_quit), NULL);
etk_menu_popup(ETK_MENU(menu));
@@ -290,7 +291,7 @@
ETK_IMAGE(etk_image_new_from_edje(theme,
button_close)));
etk_signal_connect_swapped(clicked, ETK_OBJECT(s-close_button),
- ETK_CALLBACK(_e_sticky_delete), s);
+ ETK_CALLBACK(_e_sticky_delete_confirm), s);
//etk_tooltips_tip_set(button, Delete this sticky);
etk_box_pack_start(ETK_BOX(hbox), s-close_button, ETK_FALSE, ETK_FALSE, 0);
@@ -335,6 +336,24 @@
}
void
+_e_sticky_delete_confirm(E_Sticky *s)
+{
+ Etk_Widget *dialog;
+
+ dialog = etk_message_dialog_new(ETK_MESSAGE_DIALOG_QUESTION,
+ ETK_MESSAGE_DIALOG_YES_NO,
+ Are you sure you want to delete this
sticky?);
+ etk_signal_connect_swapped(delete_event, ETK_OBJECT(dialog),
+ ETK_CALLBACK(etk_object_destroy), dialog);
+ etk_signal_connect(response, ETK_OBJECT(dialog),
+ ETK_CALLBACK(_e_sticky_delete_confirm_cb), s);
+ etk_container_border_width_set(ETK_CONTAINER(dialog), 4);
+
+ etk_window_title_set(ETK_WINDOW(dialog), Confirm Deletion);
+ etk_widget_show_all(dialog);
+}
+
+void
_e_sticky_move(E_Sticky *s, int x, int y)
{
etk_window_move(ETK_WINDOW(s-win), x, y);
@@ -425,6 +444,23 @@
for(l = ss-stickies; l; l = l-next)
_e_sticky_theme_apply(l-data, theme);
+}
+
+static void
+_e_sticky_delete_confirm_cb(Etk_Object *obj, int response_id, void *data)
+{
+ switch(response_id)
+ {
+ case ETK_RESPONSE_YES:
+ if(data)
+ _e_sticky_delete(data);
+ break;
+
+ default:
+ break;
+ }
+
+ etk_object_destroy(obj);
}
int main(int argc, char **argv)
===
RCS file: /cvs/e/e17/proto/estickies/src/bin/stickies.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- stickies.h 31 Jul 2006 00:31:45 - 1.2
+++ stickies.h 3 Aug 2006 02:40:11 - 1.3
@@ -104,5 +104,6 @@
void _e_sticky_load_from(E_Sticky *s);
void _e_sticky_theme_apply(E_Sticky *s, char *theme);
void _e_sticky_theme_apply_all(char *theme);
-
+void _e_sticky_delete_confirm(E_Sticky *s);
+
#endif
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore turran
Enlightenment CVS committal
Author : turran
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_fb
Modified Files:
ecore_fb_li.c ecore_fb_private.h
Log Message:
Ecore_Fb
+ Initial support for absolute axis (touchscreen, touchpad).
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_fb/ecore_fb_li.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ecore_fb_li.c 31 Jul 2006 04:13:51 - 1.1
+++ ecore_fb_li.c 3 Aug 2006 05:58:14 - 1.2
@@ -230,26 +230,55 @@
break;
}
default:
- //printf([ecore_li_device] mouse event %d %d\n,
iev-code, iev-value);
break;
}
}
static void
-_ecore_fb_li_device_event_abs(Ecore_Fb_Input_Device *dev, struct input_event
*ev)
+_ecore_fb_li_device_event_abs(Ecore_Fb_Input_Device *dev, struct input_event
*iev)
{
if(!dev-listen)
return;
- switch(ev-code)
+ switch(iev-code)
{
case ABS_X:
- printf(abs x %d\n, ev-value);
- break;
case ABS_Y:
- printf(abs y %d\n, ev-value);
+ {
+ Ecore_Fb_Event_Mouse_Move *ev;
+ if((iev-code == ABS_X) (dev-mouse.w != 0))
+ {
+ int tmp;
+
+ tmp = (int)((double)(iev-value -
dev-mouse.min_w) / dev-mouse.rel_w);
+ if(tmp 0)
+ dev-mouse.x = 0;
+ else if(tmp dev-mouse.w)
+ dev-mouse.x = dev-mouse.w;
+ else
+ dev-mouse.x = tmp;
+ }
+ else if((iev-code == ABS_Y) (dev-mouse.h != 0))
+ {
+ int tmp;
+
+ tmp = (int)((double)(iev-value -
dev-mouse.min_h) / dev-mouse.rel_h);
+ if(tmp 0)
+ dev-mouse.y = 0;
+ else if(tmp dev-mouse.h)
+ dev-mouse.y = dev-mouse.h;
+ else
+ dev-mouse.y = tmp;
+ }
+ ev = calloc(1,sizeof(Ecore_Fb_Event_Mouse_Move));
+ ev-x = dev-mouse.x;
+ ev-y = dev-mouse.y;
+ ev-dev = dev;
+
+ ecore_event_add(ECORE_FB_EVENT_MOUSE_MOVE, ev, NULL,
NULL);
break;
+ }
case ABS_PRESSURE:
- printf(pressure!!!\n);
+ /* TODO emulate a button press */
break;
}
}
@@ -325,23 +354,20 @@
if((fd = open(dev, O_RDONLY, O_NONBLOCK)) 0)
{
- fprintf(stderr, [ecore_fb_li:device_open] %s , dev);
- perror();
+ fprintf(stderr, [ecore_fb_li:device_open] %s %s, dev,
strerror(errno));
goto error_open;
}
/* query capabilities */
if(ioctl(fd, EVIOCGBIT(0, EV_MAX), event_type_bitmask) 0)
{
- fprintf(stderr,[ecore_fb_li:device_open] query capabilities %s
, dev);
- perror();
+ fprintf(stderr,[ecore_fb_li:device_open] query capabilities %s
%s, dev, strerror(errno));
goto error_caps;
}
/* query name */
device-info.name = calloc(256, sizeof(char));
if(ioctl(fd, EVIOCGNAME(sizeof(char) * 256), device-info.name) 0)
{
- fprintf(stderr, [ecore_fb_li:device_open] get name %s , dev);
- perror();
+ fprintf(stderr, [ecore_fb_li:device_open] get name %s %s,
dev, strerror(errno));
strcpy(device-info.name, Unknown);
}
device-fd = fd;
@@ -369,23 +395,6 @@
case EV_ABS:
device-info.cap |= ECORE_FB_INPUT_DEVICE_CAP_ABSOLUTE;
- {
- #if 0
- struct input_absinfo abs_features;
- ioctl(fd, EVIOCGABS(ABS_X), abs_features);
- printf((min: %d, max: %d, flatness: %d, fuzz:
%d)\n,
- abs_features.minimum,
- abs_features.maximum,
- abs_features.flat,
- abs_features.fuzz);
- ioctl(fd, EVIOCGABS(ABS_Y), abs_features);
-
E CVS: libs/edje rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/edje Dir : e17/libs/edje/src/lib Modified Files: edje_calc.c Log Message: oops. thanks jose :) === RCS file: /cvs/e/e17/libs/edje/src/lib/edje_calc.c,v retrieving revision 1.85 retrieving revision 1.86 diff -u -3 -r1.85 -r1.86 --- edje_calc.c 2 Aug 2006 10:52:44 - 1.85 +++ edje_calc.c 3 Aug 2006 09:47:17 - 1.86 @@ -900,7 +900,7 @@ params-fill.h = desc-fill.abs_y + (params-h * desc-fill.rel_y); } params-fill.angle = desc-fill.angle; - params-fill.spread = desc-fill.angle; + params-fill.spread = desc-fill.spread; /* colors */ params-color.r = desc-color.r; - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
