Enlightenment CVS committal
Author : fletch3k
Project : misc
Module : enotes
Dir : misc/enotes/src
Modified Files:
note.c saveload.c saveload.h settings.c settings.h
Log Message:
EWL windows are used in all but controlcentre and notes now. Handles things nicer and
stops the segvs on closing them via ewl buttons.
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/note.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- note.c 24 Aug 2004 13:01:33 -0000 1.16
+++ note.c 24 Aug 2004 19:20:19 -0000 1.17
@@ -196,7 +196,7 @@
p->emb = ewl_embed_new();
ewl_object_fill_policy_set((Ewl_Object *) p->emb, EWL_FLAG_FILL_FILL);
ewl_widget_show(p->emb);
- p->eo = ewl_embed_evas_set((Ewl_Embed*)p->emb,
+ p->eo = ewl_embed_evas_set(EWL_EMBED(p->emb),
ecore_evas_get(p->win), (void *)
ecore_evas_software_x11_window_get(p->win));
evas_object_layer_set(p->eo, 2);
@@ -206,7 +206,6 @@
evas_object_focus_set (p->eo, TRUE);
- ewl_embed_focus_set ((Ewl_Embed*)p->emb, TRUE);
p->vbox = ewl_vbox_new();
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/saveload.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- saveload.c 24 Aug 2004 13:01:33 -0000 1.10
+++ saveload.c 24 Aug 2004 19:20:19 -0000 1.11
@@ -14,10 +14,10 @@
#include "saveload.h"
char *saveload_selected;
-SaveLoad *saveload;
+SaveLoad *saveload=NULL;
char *load_selected;
-Load *load;
+Load *load=NULL;
@@ -51,47 +51,18 @@
Ecore_Timer *revtim;
/* Setup the Window */
- saveload->win =
- ecore_evas_software_x11_new(NULL, 0, SAVELOAD_X, SAVELOAD_Y,
- SAVELOAD_W, SAVELOAD_H);
- ecore_evas_title_set(saveload->win, "E-Notes: Save/Load");
- ecore_evas_show(saveload->win);
-
- /* Setup the Canvas, Render-Method */
- saveload->evas = ecore_evas_get(saveload->win);
- evas_output_method_set(saveload->evas,
- evas_render_method_lookup(main_config->
- render_method));
-
- /* Setup the EWL Widgets */
- saveload->emb = ewl_embed_new();
- ewl_object_fill_policy_set((Ewl_Object *) saveload->emb,
- EWL_FLAG_FILL_FILL);
- ewl_widget_appearance_set(saveload->emb, "window");
- ewl_widget_show(saveload->emb);
-
- saveload->eo =
- ewl_embed_evas_set((Ewl_Embed *) saveload->emb, saveload->evas,
- (void *)
- ecore_evas_software_x11_window_get(saveload->
- win));
- evas_object_name_set(saveload->eo, "eo");
- evas_object_layer_set(saveload->eo, 0);
- evas_object_move(saveload->eo, 0, 0);
- evas_object_resize(saveload->eo, SAVELOAD_W, SAVELOAD_H);
- evas_object_show(saveload->eo);
-
- evas_object_focus_set (saveload->eo, TRUE);
- ewl_embed_focus_set ((Ewl_Embed*)saveload->emb, TRUE);
+ saveload->win=ewl_window_new();
+ ewl_window_title_set((Ewl_Window*)saveload->win, "E-Notes Save/Load");
+ ewl_widget_show(saveload->win);
saveload->vbox = ewl_vbox_new();
- ewl_container_child_append((Ewl_Container *) saveload->emb,
+ ewl_container_child_append((Ewl_Container *) saveload->win,
saveload->vbox);
ewl_object_fill_policy_set((Ewl_Object *) saveload->vbox,
EWL_FLAG_FILL_FILL);
ewl_widget_show(saveload->vbox);
- ewl_callback_append(saveload->emb, EWL_CALLBACK_CONFIGURE,
+ ewl_callback_append(saveload->win, EWL_CALLBACK_CONFIGURE,
save_and_load_move_embed, saveload->vbox);
saveload->tree = ewl_tree_new(1);
@@ -120,16 +91,9 @@
saveload_setup_button(saveload->hbox, &saveload->savebtn, "Save.");
saveload_setup_button(saveload->hbox, &saveload->loadbtn, "Load.");
- saveload_setup_button(saveload->hbox, &saveload->refreshbtn,
- "Refresh.");
+ saveload_setup_button(saveload->hbox, &saveload->refreshbtn, "Refresh.");
saveload_setup_button(saveload->hbox, &saveload->closebtn, "Close.");
- /* Ecore Callbacks */
- ecore_evas_callback_resize_set(saveload->win, ecore_saveload_resize);
- ecore_evas_callback_delete_request_set(saveload->win,
- ecore_saveload_close);
- ecore_evas_callback_destroy_set(saveload->win, ecore_saveload_close);
-
/* EWL Callbacks */
ewl_callback_append(saveload->refreshbtn, EWL_CALLBACK_CLICKED,
(void *) ewl_saveload_revert,
@@ -137,6 +101,8 @@
ewl_callback_append(saveload->closebtn, EWL_CALLBACK_CLICKED,
(void *) ewl_saveload_close,
(void *) saveload->win);
+ ewl_callback_append(saveload->win, EWL_CALLBACK_DELETE_WINDOW,
+ (void *) ewl_saveload_close, (void*)saveload->win);
ewl_callback_append(saveload->savebtn, EWL_CALLBACK_CLICKED,
(void *) ewl_saveload_save, NULL);
ewl_callback_append(saveload->loadbtn, EWL_CALLBACK_CLICKED,
@@ -212,40 +178,6 @@
/* Callbacks */
/**
- * @param ee: The Ecore_Evas resized so we can get the new size to resize to.
- * @brief: Saveload window resize callback, resizes the ewl embed accordingly.
- */
-void
-ecore_saveload_resize(Ecore_Evas * ee)
-{
- int x, y, w, h;
-
- dml("Resizing the Saveload Window", 2);
-
- ecore_evas_geometry_get(ee, &x, &y, &w, &h);
- evas_object_resize(evas_object_name_find(ecore_evas_get(ee), "eo"),
- w, h);
- return;
-}
-
-/**
- * @param ee: The Ecore_Evas to free, and of course its contents.
- * @brief: Callback for wm requesting to close the window. So we do so by
- * free'ing the window and structure used, elibs free the rest.
- * Set some NULL's so it works when they pull it back up again.
- */
-void
-ecore_saveload_close(Ecore_Evas * ee)
-{
- dml("Closing the Saveload Window", 2);
- ecore_evas_free(ee);
- free(saveload);
- saveload = NULL;
- saveload_selected = NULL;
- return;
-}
-
-/**
* @param widget: The widget clicked (we don't use this).
* @param ev_data: Event data, we don't use this either.
* @param p: Thats our data, its the tree we're going to empty and refill.
@@ -275,7 +207,9 @@
void
ewl_saveload_close(Ewl_Widget * o, void *ev_data, Ecore_Evas * ee)
{
- ecore_saveload_close(ee);
+ ewl_widget_destroy (saveload->win);
+ free(saveload);
+ saveload=NULL;
return;
}
@@ -382,44 +316,17 @@
char *headers[1];
/* Setup the Window */
- load->win = ecore_evas_software_x11_new(NULL, 0, LOAD_X, LOAD_Y,
- LOAD_W, LOAD_H);
- ecore_evas_title_set(load->win, "E-Notes: Load Note");
- ecore_evas_show(load->win);
-
- /* Setup the Canvas, Render-Method */
- load->evas = ecore_evas_get(load->win);
- evas_output_method_set(load->evas,
- evas_render_method_lookup(main_config->
- render_method));
-
- /* Setup the EWL Widgets */
- load->emb = ewl_embed_new();
- ewl_object_fill_policy_set((Ewl_Object *) load->emb,
- EWL_FLAG_FILL_FILL);
- ewl_widget_appearance_set(load->emb, "window");
- ewl_widget_show(load->emb);
-
- load->eo = ewl_embed_evas_set((Ewl_Embed *) load->emb, load->evas,
- (void *)
- ecore_evas_software_x11_window_get(load->
- win));
- evas_object_name_set(load->eo, "eo");
- evas_object_layer_set(load->eo, 0);
- evas_object_move(load->eo, 0, 0);
- evas_object_resize(load->eo, LOAD_W, LOAD_H);
- evas_object_show(load->eo);
-
- evas_object_focus_set (load->eo, TRUE);
- ewl_embed_focus_set ((Ewl_Embed*)load->emb, TRUE);
+ load->win=ewl_window_new();
+ ewl_window_title_set((Ewl_Window*)load->win, "E-Notes Load");
+ ewl_widget_show(load->win);
load->vbox = ewl_vbox_new();
- ewl_container_child_append((Ewl_Container *) load->emb, load->vbox);
+ ewl_container_child_append((Ewl_Container *) load->win, load->vbox);
ewl_object_fill_policy_set((Ewl_Object *) load->vbox,
EWL_FLAG_FILL_FILL);
ewl_widget_show(load->vbox);
- ewl_callback_append(load->emb, EWL_CALLBACK_CONFIGURE,
+ ewl_callback_append(load->win, EWL_CALLBACK_CONFIGURE,
save_and_load_move_embed, load->vbox);
load->tree = ewl_tree_new(1);
@@ -449,16 +356,13 @@
load_setup_button(load->hbox, &load->refreshbtn, "Refresh.");
load_setup_button(load->hbox, &load->closebtn, "Close.");
- /* Ecore Callbacks */
- ecore_evas_callback_resize_set(load->win, ecore_load_resize);
- ecore_evas_callback_delete_request_set(load->win, ecore_load_close);
- ecore_evas_callback_destroy_set(load->win, ecore_load_close);
-
/* EWL Callbacks */
ewl_callback_append(load->refreshbtn, EWL_CALLBACK_CLICKED,
(void *) ewl_load_revert, (void *) load->tree);
ewl_callback_append(load->closebtn, EWL_CALLBACK_CLICKED,
(void *) ewl_load_close, (void *) load->win);
+ ewl_callback_append(load->win, EWL_CALLBACK_DELETE_WINDOW,
+ (void *) ewl_load_close, (void*)load->win);
ewl_callback_append(load->loadbtn, EWL_CALLBACK_CLICKED,
(void *) ewl_load_load, NULL);
ewl_callback_append(load->deletebtn, EWL_CALLBACK_CLICKED,
@@ -519,40 +423,6 @@
return;
}
-/**
- * @param ee: The Ecore_Evas resized so we can get the new size to resize to.
- * @brief: Saveload window resize callback, resizes the ewl embed accordingly.
- */
-void
-ecore_load_resize(Ecore_Evas * ee)
-{
- int x, y, w, h;
-
- dml("Resizing the Load Note Window", 2);
-
- ecore_evas_geometry_get(ee, &x, &y, &w, &h);
- evas_object_resize(evas_object_name_find(ecore_evas_get(ee), "eo"),
- w, h);
- return;
-}
-
-/**
- * @param ee: The Ecore_Evas to free, and of course its contents.
- * @brief: Callback for wm requesting to close the window. So we do so by
- * free'ing the window and structure used, elibs free the rest.
- * Set some NULL's so it works when they pull it back up again.
- */
-void
-ecore_load_close(Ecore_Evas * ee)
-{
- dml("Closing the Load Note Window", 2);
- ecore_evas_free(ee);
- free(load);
- load = NULL;
- load_selected = NULL;
- return;
-}
-
/**
* @param widget: The widget clicked (we don't use this).
* @param ev_data: Event data, we don't use this either.
@@ -581,7 +451,9 @@
void
ewl_load_close(Ewl_Widget * o, void *ev_data, Ecore_Evas * ee)
{
- ecore_load_close(ee);
+ ewl_widget_destroy(load->win);
+ free(load);
+ load=NULL;
return;
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/saveload.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- saveload.h 5 May 2004 18:59:26 -0000 1.7
+++ saveload.h 24 Aug 2004 19:20:19 -0000 1.8
@@ -28,23 +28,10 @@
#include "config.h"
#include "../config.h"
-#define SAVELOAD_X 0
-#define SAVELOAD_Y 0
-#define SAVELOAD_W 450
-#define SAVELOAD_H 350
-
-#define LOAD_X 0
-#define LOAD_Y 0
-#define LOAD_W 450
-#define LOAD_H 350
-
#define MAX_TITLE 500
typedef struct {
- Ecore_Evas *win;
- Evas *evas;
- Evas_Object *eo;
- Ewl_Widget *emb;
+ Ewl_Widget *win;
Ewl_Widget *vbox;
Ewl_Widget *txt_selected;
Ewl_Widget *tree;
@@ -56,10 +43,7 @@
} SaveLoad;
typedef struct {
- Ecore_Evas *win;
- Evas *evas;
- Evas_Object *eo;
- Ewl_Widget *emb;
+ Ewl_Widget *win;
Ewl_Widget *vbox;
Ewl_Widget *txt_selected;
Ewl_Widget *tree;
@@ -83,8 +67,6 @@
void fill_saveload_tree(void);
void setup_saveload_opt(Ewl_Widget * tree, char *caption,
Evas_List * p);
-void ecore_saveload_resize(Ecore_Evas * ee);
-void ecore_saveload_close(Ecore_Evas * ee);
void ewl_saveload_revert(Ewl_Widget * widget, void *ev_data,
Ewl_Widget * p);
void ewl_saveload_close(Ewl_Widget * o, void *ev_data,
@@ -101,8 +83,6 @@
void load_setup_button(Ewl_Widget * c, Ewl_Widget ** b, char *label);
void fill_load_tree(void);
void setup_load_opt(Ewl_Widget * tree, char *caption);
-void ecore_load_resize(Ecore_Evas * ee);
-void ecore_load_close(Ecore_Evas * ee);
void ewl_load_revert(Ewl_Widget * widget, void *ev_data,
Ewl_Widget * p);
void ewl_load_close(Ewl_Widget * o, void *ev_data, Ecore_Evas * ee);
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/settings.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- settings.c 24 Aug 2004 13:01:33 -0000 1.8
+++ settings.c 24 Aug 2004 19:20:19 -0000 1.9
@@ -13,7 +13,7 @@
#include "settings.h"
-Settings *settings;
+Settings *settings=NULL;
/* High Level */
@@ -48,40 +48,16 @@
char *headers[2];
/* Setup the Window */
- s->win = ecore_evas_software_x11_new(NULL, 0, SETTINGS_X, SETTINGS_Y,
- SETTINGS_W, SETTINGS_H);
- ecore_evas_title_set(s->win, "E-Notes Settings");
- ecore_evas_show(s->win);
-
- /* Setup the Canvas, Render-Method */
- s->evas = ecore_evas_get(s->win);
- evas_output_method_set(s->evas,
- evas_render_method_lookup(main_config->
- render_method));
-
- /* Setup the EWL Widgets */
- s->emb = ewl_embed_new();
- ewl_object_fill_policy_set((Ewl_Object *) s->emb, EWL_FLAG_FILL_ALL);
- ewl_widget_appearance_set(s->emb, "window");
- ewl_widget_show(s->emb);
-
- s->eo = ewl_embed_evas_set((Ewl_Embed *) s->emb, s->evas, (void *)
- ecore_evas_software_x11_window_get(s->win));
- evas_object_name_set(s->eo, "eo");
- evas_object_layer_set(s->eo, 0);
- evas_object_move(s->eo, 0, 0);
- evas_object_resize(s->eo, SETTINGS_W, SETTINGS_H);
- evas_object_show(s->eo);
-
- evas_object_focus_set (s->eo, TRUE);
- ewl_embed_focus_set ((Ewl_Embed*)s->emb, TRUE);
+ s->win=ewl_window_new();
+ ewl_window_title_set((Ewl_Window*)s->win, "E-Notes Settings");
+ ewl_widget_show(s->win);
s->vbox = ewl_vbox_new();
- ewl_container_child_append((Ewl_Container *) s->emb, s->vbox);
+ ewl_container_child_append((Ewl_Container *) s->win, s->vbox);
ewl_object_fill_policy_set((Ewl_Object *) s->vbox, EWL_FLAG_FILL_ALL);
ewl_widget_show(s->vbox);
- ewl_callback_append(s->emb, EWL_CALLBACK_CONFIGURE, settings_move_embed,
+ ewl_callback_append(s->win, EWL_CALLBACK_CONFIGURE, settings_move_embed,
s->vbox);
s->tree = ewl_tree_new(2);
@@ -104,16 +80,13 @@
settings_setup_button(s->hbox, &(s->revertbtn), "Revert.");
settings_setup_button(s->hbox, &(s->closebtn), "Close.");
- /* Ecore Callbacks */
- ecore_evas_callback_resize_set(s->win, ecore_settings_resize);
- ecore_evas_callback_delete_request_set(s->win, ecore_settings_close);
- ecore_evas_callback_destroy_set(s->win, ecore_settings_close);
-
/* EWL Callbacks */
ewl_callback_append(s->revertbtn, EWL_CALLBACK_CLICKED,
(void *) ewl_settings_revert, (void *) s->tree);
ewl_callback_append(s->closebtn, EWL_CALLBACK_CLICKED,
(void *) ewl_settings_close, (void *) s->win);
+ ewl_callback_append(s->win, EWL_CALLBACK_DELETE_WINDOW,
+ (void *) ewl_settings_close, (void *) s->win);
ewl_callback_append(s->savebtn, EWL_CALLBACK_CLICKED,
(void *) ewl_settings_save, NULL);
@@ -223,39 +196,6 @@
/* Callbacks */
/**
- * @param ee: The Ecore_Evas which was resized.
- * @brief: Window resize callback, resizes the ewl embed to compensate.
- */
-void
-ecore_settings_resize(Ecore_Evas * ee)
-{
- int x, y, w, h;
-
- dml("Resizing the Settings Window", 2);
-
- ecore_evas_geometry_get(ee, &x, &y, &w, &h);
- evas_object_resize(evas_object_name_find(ecore_evas_get(ee), "eo"),
- w, h);
- return;
-}
-
-/**
- * @param ee: The Ecore_Evas which wants to be closed.
- * @brief: Callback for the wm wanting the settings window to be closed.
- * We free the ecore_evas and free + NULL the structure. This
- * concequently makes the elibs free the rest up.
- */
-void
-ecore_settings_close(Ecore_Evas * ee)
-{
- dml("Closing the Settings Window", 2);
- ecore_evas_free(ee);
- free(settings);
- settings = NULL;
- return;
-}
-
-/**
* @param widget: The widget which was clicked (we don't use this).
* @param ev_data: The event data. We don't use this either.
* @param p: The widget supplied during the callback definition, its the tree.
@@ -282,7 +222,9 @@
void
ewl_settings_close(Ewl_Widget * o, void *ev_data, Ecore_Evas * ee)
{
- ecore_settings_close(ee);
+ ewl_widget_destroy(settings->win);
+ free(settings);
+ settings=NULL;
return;
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/settings.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- settings.h 5 May 2004 18:59:26 -0000 1.6
+++ settings.h 24 Aug 2004 19:20:19 -0000 1.7
@@ -26,21 +26,13 @@
#include "debug.h"
#include "config.h"
-#define SETTINGS_X 0
-#define SETTINGS_Y 0
-#define SETTINGS_W 450
-#define SETTINGS_H 350
-
typedef struct {
Ewl_Widget *caption;
Ewl_Widget *entry;
} Settings_Opt;
typedef struct {
- Ecore_Evas *win;
- Evas *evas;
- Evas_Object *eo;
- Ewl_Widget *emb;
+ Ewl_Widget *win;
Ewl_Widget *vbox;
Ewl_Widget *tree;
Ewl_Widget *hbox;
@@ -70,8 +62,6 @@
char *caption, int value);
/* Callbacks */
-void ecore_settings_resize(Ecore_Evas * ee);
-void ecore_settings_close(Ecore_Evas * ee);
void ewl_settings_revert(Ewl_Widget * widget, void *ev_data,
Ewl_Widget * p);
void ewl_settings_close(Ewl_Widget * o, void *ev_data,
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
