Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_config.c e_config.h e_configure.c e_includes.h
e_main.c
Added Files:
e_mouse.h e_mouse.c e_int_config_mouse.h e_int_config_mouse.c
Log Message:
Part 2 of Ravenlock's mouse acceleration patch. This adds a config dialog
for setting the mouse accel threshold and the necessary mouse_init calls to
setup accel when E launches.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -3 -r1.176 -r1.177
--- Makefile.am 2 Mar 2007 17:00:20 -0000 1.176
+++ Makefile.am 20 Mar 2007 01:08:38 -0000 1.177
@@ -11,7 +11,8 @@
-DPACKAGE_LIB_DIR=\"@[EMAIL PROTECTED]" \
-DPACKAGE_DATA_DIR=\"@[EMAIL PROTECTED]" \
-DLOCALE_DIR=\"@[EMAIL PROTECTED]" \
- -DPACKAGE_SYSCONF_DIR=\"@[EMAIL PROTECTED]"
+ -DPACKAGE_SYSCONF_DIR=\"@[EMAIL PROTECTED]" \
+ -Wno-unused
bin_PROGRAMS = \
enlightenment \
@@ -187,7 +188,9 @@
e_int_config_borders.h \
e_int_config_desk.h \
e_int_config_clientlist.h \
-e_fm_prop.h
+e_fm_prop.h \
+e_int_config_mouse.h \
+e_mouse.h
enlightenment_src = \
e_user.c \
@@ -350,6 +353,8 @@
e_int_config_desk.c \
e_fm_prop.c \
e_int_config_clientlist.c \
+e_int_config_mouse.c \
+e_mouse.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_SOURCES = \
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -3 -r1.229 -r1.230
--- e_config.c 13 Mar 2007 18:03:19 -0000 1.229
+++ e_config.c 20 Mar 2007 01:08:38 -0000 1.230
@@ -512,6 +512,10 @@
E_CONFIG_VAL(D, T, clientlist_separate_iconified_apps, INT);
E_CONFIG_VAL(D, T, clientlist_warp_to_iconified_desktop, INT);
+ E_CONFIG_VAL(D, T, mouse_accel_numerator, INT);
+ E_CONFIG_VAL(D, T, mouse_accel_denominator, INT);
+ E_CONFIG_VAL(D, T, mouse_accel_threshold, INT);
+
E_CONFIG_VAL(D, T, border_raise_on_mouse_action, INT);
E_CONFIG_VAL(D, T, border_raise_on_focus, INT);
E_CONFIG_VAL(D, T, desk_flip_wrap, INT);
@@ -1342,6 +1346,12 @@
e_config->clientlist_include_all_zones = 0;
IFCFGEND;
+ IFCFG(0x0112);
+ e_config->mouse_accel_numerator = 2;
+ e_config->mouse_accel_denominator = 1;
+ e_config->mouse_accel_threshold = 4;
+ IFCFGEND;
+
e_config->config_version = E_CONFIG_FILE_VERSION;
#if 0 /* example of new config */
@@ -1461,6 +1471,10 @@
E_CONFIG_LIMIT(e_config->clientlist_separate_iconified_apps, 0, 2);
E_CONFIG_LIMIT(e_config->clientlist_warp_to_iconified_desktop, 0, 1);
+ E_CONFIG_LIMIT(e_config->mouse_accel_numerator, 1, 10);
+ E_CONFIG_LIMIT(e_config->mouse_accel_denominator, 1, 10);
+ E_CONFIG_LIMIT(e_config->mouse_accel_threshold, 1, 10);
+
/* FIXME: disabled auto apply because it causes problems */
e_config->cfgdlg_auto_apply = 0;
/* FIXME: desklock personalized password id disabled for security reasons */
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.h,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -3 -r1.144 -r1.145
--- e_config.h 13 Mar 2007 18:03:19 -0000 1.144
+++ e_config.h 20 Mar 2007 01:08:38 -0000 1.145
@@ -52,7 +52,7 @@
/* increment this whenever a new set of config values are added but the users
* config doesn't need to be wiped - simply new values need to be put in
*/
-#define E_CONFIG_FILE_GENERATION 0x0111
+#define E_CONFIG_FILE_GENERATION 0x0112
#define E_CONFIG_FILE_VERSION ((E_CONFIG_FILE_EPOCH << 16) |
E_CONFIG_FILE_GENERATION)
#define E_EVAS_ENGINE_DEFAULT 0
@@ -254,6 +254,10 @@
int clientlist_separate_iconified_apps;
int clientlist_warp_to_iconified_desktop;
+ int mouse_accel_numerator;
+ int mouse_accel_denominator;
+ int mouse_accel_threshold;
+
int display_res_restore; // GUI
int display_res_width; // GUI
int display_res_height; // GUI
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- e_configure.c 17 Mar 2007 10:26:48 -0000 1.91
+++ e_configure.c 20 Mar 2007 01:08:38 -0000 1.92
@@ -418,6 +418,7 @@
cat = _e_configure_category_add(eco, _("Keyboard & Mouse"),
"enlightenment/behavior");
_e_configure_item_add(cat, _("Key Bindings"), "enlightenment/keys",
e_int_config_keybindings);
_e_configure_item_add(cat, _("Mouse Bindings"),
"enlightenment/mouse_clean", e_int_config_mousebindings);
+ _e_configure_item_add(cat, _("Mouse Acceleration"),
"enlightenment/mouse_clean", e_int_config_mouse);
cat = _e_configure_category_add(eco, _("Windows"), "enlightenment/windows");
_e_configure_item_add(cat, _("Window Display"), "enlightenment/windows",
e_int_config_window_display);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -3 -r1.148 -r1.149
--- e_includes.h 21 Feb 2007 00:05:27 -0000 1.148
+++ e_includes.h 20 Mar 2007 01:08:38 -0000 1.149
@@ -163,3 +163,5 @@
#include "e_int_config_desk.h"
#include "e_int_config_clientlist.h"
#include "e_fm_prop.h"
+#include "e_mouse.h"
+#include "e_int_config_mouse.h"
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -3 -r1.202 -r1.203
--- e_main.c 12 Mar 2007 14:46:05 -0000 1.202
+++ e_main.c 20 Mar 2007 01:08:38 -0000 1.203
@@ -792,6 +792,14 @@
_e_main_shutdown(-1);
}
+ TS("mouse");
+ /* setup mouse accel */
+ if (!e_mouse_init())
+ {
+ e_error_message_show(_("Enlightenment cannot configure the mouse
acceleration settings."));
+ _e_main_shutdown(-1);
+ }
+
TS("desklock");
/* setup desklock */
if (!e_desklock_init())
-------------------------------------------------------------------------
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.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
