Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e.h e_includes.h e_ipc.c e_ipc.h
Added Files:
e_ipc_codec.c e_ipc_codec.h
Log Message:
move some to codecs. this needs cleaning tho... (ipc)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- Makefile.am 7 May 2005 04:34:25 -0000 1.27
+++ Makefile.am 12 May 2005 14:46:28 -0000 1.28
@@ -51,7 +51,8 @@
e_bindings.h \
e_moveresize.h \
e_actions.h \
-e_popup.h
+e_popup.h \
+e_ipc_codec.h
enlightenment_SOURCES = \
e_main.c \
@@ -96,12 +97,14 @@
e_moveresize.c \
e_actions.c \
e_popup.c \
+e_ipc_codec.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_LDFLAGS = -export-dynamic @e_libs@ @dlopen_libs@
enlightenment_remote_SOURCES = \
e.h \
+e_ipc_codec.c \
e_remote_main.c
enlightenment_remote_LDFLAGS = @e_libs@ @dlopen_libs@
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e.h 1 May 2005 18:34:56 -0000 1.15
+++ e.h 12 May 2005 14:46:28 -0000 1.16
@@ -4,6 +4,8 @@
#ifndef E_H
#define E_H
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -28,10 +30,6 @@
#include <Eet.h>
#include <Edje.h>
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#if HAVE___ATTRIBUTE__
#define __UNUSED__ __attribute__((unused))
#else
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_includes.h 12 May 2005 13:13:53 -0000 1.18
+++ e_includes.h 12 May 2005 14:46:28 -0000 1.19
@@ -41,4 +41,5 @@
#include "e_moveresize.h"
#include "e_actions.h"
#include "e_popup.h"
+#include "e_ipc_codec.h"
#include "e_test.h"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_ipc.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- e_ipc.c 12 May 2005 13:56:30 -0000 1.22
+++ e_ipc.c 12 May 2005 14:46:28 -0000 1.23
@@ -9,6 +9,9 @@
static char *_e_ipc_simple_str_dec(char *data, int bytes);
static char **_e_ipc_multi_str_dec(char *data, int bytes, int str_count);
+static int _e_ipc_double_dec(char *data, int bytes, double *dest);
+static int _e_ipc_int_dec(char *data, int bytes, int *dest);
+
/* encode functions, Should these be global? */
ECORE_IPC_ENC_EVAS_LIST_PROTO(_e_ipc_module_list_enc);
ECORE_IPC_ENC_EVAS_LIST_PROTO(_e_ipc_font_available_list_enc);
@@ -40,12 +43,15 @@
ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_ADD, _e_ipc_cb_client_add,
NULL);
ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DEL, _e_ipc_cb_client_del,
NULL);
ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DATA, _e_ipc_cb_client_data,
NULL);
+
+ e_ipc_codec_init();
return 1;
}
void
e_ipc_shutdown(void)
{
+ e_ipc_codec_shutdown();
if (_e_ipc_server)
{
ecore_ipc_server_del(_e_ipc_server);
@@ -582,6 +588,71 @@
}
}
break;
+ case E_IPC_OP_MENUS_SCROLL_SPEED_SET:
+ if (e_ipc_codec_double_dec(e->data, e->size,
+ &(e_config->menus_scroll_speed)))
+ {
+ E_CONFIG_LIMIT(e_config->menus_scroll_speed, 1.0, 20000.0);
+ e_config_save_queue();
+ }
+ break;
+ case E_IPC_OP_MENUS_SCROLL_SPEED_GET:
+ {
+ void *data;
+ int bytes;
+
+ if ((data = e_ipc_codec_double_enc(e_config->menus_scroll_speed,
+ &bytes)))
+ {
+ ecore_ipc_client_send(e->client,
+ E_IPC_DOMAIN_REPLY,
+ E_IPC_OP_MENUS_SCROLL_SPEED_GET_REPLY,
+ 0/*ref*/, 0/*ref_to*/, 0/*response*/,
+ data, bytes);
+ free(data);
+ }
+ }
+ break;
+ case E_IPC_OP_MENUS_FAST_MOVE_THRESHHOLD_SET:
+ break;
+ case E_IPC_OP_MENUS_FAST_MOVE_THRESHHOLD_GET:
+ break;
+ case E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_SET:
+ break;
+ case E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_GET:
+ break;
+ case E_IPC_OP_BORDER_SHADE_ANIMATE_SET:
+ break;
+ case E_IPC_OP_BORDER_SHADE_ANIMATE_GET:
+ break;
+ case E_IPC_OP_BORDER_SHADE_TRANSITION_SET:
+ break;
+ case E_IPC_OP_BORDER_SHADE_TRANSITION_GET:
+ break;
+ case E_IPC_OP_BORDER_SHADE_SPEED_SET:
+ break;
+ case E_IPC_OP_BORDER_SHADE_SPEED_GET:
+ break;
+ case E_IPC_OP_FRAMERATE_SET:
+ break;
+ case E_IPC_OP_FRAMERATE_GET:
+ break;
+ case E_IPC_OP_IMAGE_CACHE_SET:
+ break;
+ case E_IPC_OP_IMAGE_CACHE_GET:
+ break;
+ case E_IPC_OP_FONT_CAHCE_SET:
+ break;
+ case E_IPC_OP_FONT_CACHE_GET:
+ break;
+ case E_IPC_OP_USE_EDGE_FLIP_SET:
+ break;
+ case E_IPC_OP_USE_EDGE_FLIP_GET:
+ break;
+ case E_IPC_OP_EDGE_FLIP_TIMEOUT_SET:
+ break;
+ case E_IPC_OP_EDGE_FLIP_TIMEOUT_GET:
+ break;
default:
break;
}
@@ -668,7 +739,6 @@
str = malloc(bytes + 1);
str[bytes] = 0;
memcpy(str, data, bytes);
-
return str;
}
@@ -700,7 +770,8 @@
return str_array;
}
-
+
+/* FIXME: just use eet for this - saves a lot of hassle */
/* list/struct encoding functions */
ECORE_IPC_ENC_EVAS_LIST_PROTO(_e_ipc_module_list_enc)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_ipc.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_ipc.h 3 May 2005 16:27:46 -0000 1.13
+++ e_ipc.h 12 May 2005 14:46:28 -0000 1.14
@@ -59,6 +59,41 @@
E_IPC_OP_BINDING_KEY_LIST_REPLY,
E_IPC_OP_BINDING_KEY_ADD,
E_IPC_OP_BINDING_KEY_DEL,
+
+ E_IPC_OP_MENUS_SCROLL_SPEED_SET,
+ E_IPC_OP_MENUS_SCROLL_SPEED_GET,
+ E_IPC_OP_MENUS_SCROLL_SPEED_GET_REPLY,
+ E_IPC_OP_MENUS_FAST_MOVE_THRESHHOLD_SET,
+ E_IPC_OP_MENUS_FAST_MOVE_THRESHHOLD_GET,
+ E_IPC_OP_MENUS_FAST_MOVE_THRESHHOLD_GET_REPLY,
+ E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_SET,
+ E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_GET,
+ E_IPC_OP_MENUS_CLICK_DRAG_TIMEOUT_GET_REPLY,
+ E_IPC_OP_BORDER_SHADE_ANIMATE_SET,
+ E_IPC_OP_BORDER_SHADE_ANIMATE_GET,
+ E_IPC_OP_BORDER_SHADE_ANIMATE_GET_REPLY,
+ E_IPC_OP_BORDER_SHADE_TRANSITION_SET,
+ E_IPC_OP_BORDER_SHADE_TRANSITION_GET,
+ E_IPC_OP_BORDER_SHADE_TRANSITION_GET_REPLY,
+ E_IPC_OP_BORDER_SHADE_SPEED_SET,
+ E_IPC_OP_BORDER_SHADE_SPEED_GET,
+ E_IPC_OP_BORDER_SHADE_SPEED_GET_REPLY,
+ E_IPC_OP_FRAMERATE_SET,
+ E_IPC_OP_FRAMERATE_GET,
+ E_IPC_OP_FRAMERATE_GET_REPLY,
+ E_IPC_OP_IMAGE_CACHE_SET,
+ E_IPC_OP_IMAGE_CACHE_GET,
+ E_IPC_OP_IMAGE_CACHE_GET_REPLY,
+ E_IPC_OP_FONT_CAHCE_SET,
+ E_IPC_OP_FONT_CACHE_GET,
+ E_IPC_OP_FONT_CACHE_GET_REPLY,
+ E_IPC_OP_USE_EDGE_FLIP_SET,
+ E_IPC_OP_USE_EDGE_FLIP_GET,
+ E_IPC_OP_USE_EDGE_FLIP_GET_REPLY,
+ E_IPC_OP_EDGE_FLIP_TIMEOUT_SET,
+ E_IPC_OP_EDGE_FLIP_TIMEOUT_GET,
+ E_IPC_OP_EDGE_FLIP_TIMEOUT_GET_REPLY,
+
E_IPC_OP_LAST
} E_Ipc_Op;
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7393&alloc_id=16281&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
