Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/include
Modified Files:
entropy.h entropy_core.h entropy_gui.h plugin_base.h
plugin_helper.h
Log Message:
Lotsa changes (tm):
* Layout engine selector. EWL layout engine is currently the default. Can be
selected with 'entropy --layout=(ewl|etk)'
* ETK structure viewer/ETK list viewer. Currently needs a bit of work, but it
functions. Ability to add/remove locations coming soon.
* Core settings engine, and command line parser
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/include/entropy.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- entropy.h 1 Feb 2006 05:02:23 -0000 1.16
+++ entropy.h 20 Feb 2006 06:48:36 -0000 1.17
@@ -49,6 +49,7 @@
entropy_plugin* entropy_plugins_type_get_first(int type, int subtype);
void entropy_core_layout_register(entropy_core* core,
entropy_gui_component_instance* comp);
entropy_thumbnail* entropy_thumbnail_create(entropy_generic_file* e_file);
+char* entropy_layout_global_toolkit_get();
/*Event hierarchy functions*/
void entropy_core_component_event_register(entropy_gui_component_instance*
comp, char* event);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/include/entropy_core.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- entropy_core.h 2 Jan 2006 09:05:42 -0000 1.5
+++ entropy_core.h 20 Feb 2006 06:48:36 -0000 1.6
@@ -5,7 +5,10 @@
#include "entropy.h"
#include "notification_engine.h"
-
+typedef struct _entropy_core_settings entropy_core_settings;
+struct _entropy_core_settings {
+ char* layout_engine;
+};
typedef struct entropy_core entropy_core;
@@ -23,6 +26,7 @@
void* layout_global; /*The global layout context*/
entropy_notification_engine* notify;
+
entropy_plugin* layout_plugin; /* The main layout plugin that we are
relying on */
pthread_mutex_t file_cache_mutex;
@@ -31,20 +35,14 @@
Ecore_Hash* object_associate_hash;
Ecore_Hash* mime_action_hint;
-
-
char* user_home_dir;
char* thumbnail_path;
-
-
+ entropy_core_settings settings;
};
-
-
-
entropy_core* entropy_core_new();
-entropy_core* entropy_core_init();
+entropy_core* entropy_core_init(int,char**);
void entropy_core_destroy(entropy_core* core);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/include/entropy_gui.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- entropy_gui.h 1 Feb 2006 11:48:21 -0000 1.7
+++ entropy_gui.h 20 Feb 2006 06:48:36 -0000 1.8
@@ -14,6 +14,10 @@
#define ENTROPY_GUI_EVENT_FILE_STAT_AVAILABLE
"entropy_gui_event_file_stat_available" //Request
a stat of a file
#define ENTROPY_GUI_EVENT_USER_INTERACTION_YES_NO_ABORT
"entropy_gui_event_user_interaction_yes_no_abort" //User
needs to respond in some way
+
+#define ENTROPY_TOOLKIT_EWL "ewl"
+#define ENTROPY_TOOLKIT_ETK "etk"
+
/*File copy/move etc progress event*/
#define ENTROPY_GUI_EVENT_FILE_PROGRESS "entropy_gui_event_file_progress"
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/include/plugin_base.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- plugin_base.h 7 Jan 2006 08:21:01 -0000 1.3
+++ plugin_base.h 20 Feb 2006 06:48:36 -0000 1.4
@@ -1,6 +1,7 @@
#ifndef __PLUGIN_BASE_H_
#define __PLUGIN_BASE_H_
+#include <limits.h>
enum ENTROPY_PLUGIN_TYPES {
ENTROPY_PLUGIN_BACKEND_FILE ,
@@ -27,11 +28,12 @@
struct entropy_plugin {
int type;
int subtype;
- char filename[255];
+ char filename[PATH_MAX];
void* dl_ref;
void (*gui_event_callback_p)();
void* data;
+ char* toolkit;
};
typedef struct entropy_mime_object entropy_mime_object;
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/include/plugin_helper.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- plugin_helper.h 2 Jan 2006 09:05:42 -0000 1.4
+++ plugin_helper.h 20 Feb 2006 06:48:36 -0000 1.5
@@ -6,6 +6,7 @@
void entropy_thumbnailer_plugin_print(Ecore_Hash* mime_register);
Ecore_List* entropy_plugins_type_get(int type, int subtype);
char* entropy_plugin_plugin_identify(entropy_plugin* plugin);
+char* entropy_plugin_helper_toolkit_get(entropy_plugin* plugin);
void entropy_plugin_filesystem_file_remove(entropy_plugin* plugin,
entropy_generic_file* file);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
