E CVS: libs/edje raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_cc_out.c edje_cc_parse.c
Log Message:
formattign and allocs...
===
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc_out.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- edje_cc_out.c 31 Mar 2007 10:33:23 - 1.55
+++ edje_cc_out.c 21 Jul 2007 05:06:39 - 1.56
@@ -700,7 +700,12 @@
data = malloc(size);
if (data)
{
-fread(data, size, 1, f);
+if (fread(data, size, 1, f) != 1)
+ {
+ fprintf(stderr, "%s: Error. unable to
read all of script object \"%s\"\n",
+ progname, tmpo);
+ ABORT_WRITE(ef, file_out);
+ }
snprintf(buf, sizeof(buf), "scripts/%i", i);
bt = eet_write(ef, buf, data, size, 1);
free(data);
@@ -1084,12 +1089,12 @@
{
/* concat strings like "foo""bar" to
"foobar" */
if (*(pp + 1) == '\"')
- pp++;
+pp++;
else
- {
- name[i] = 0;
- break;
- }
+{
+ name[i] = 0;
+ break;
+}
}
else
{
===
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc_parse.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- edje_cc_parse.c 11 Jul 2007 20:47:28 - 1.44
+++ edje_cc_parse.c 21 Jul 2007 05:06:39 - 1.45
@@ -212,7 +212,7 @@
pp++;
}
l = pp - p;
-tmpstr = malloc(l + 1);
+tmpstr = alloca(l + 1);
if (!tmpstr)
{
fprintf(stderr, "%s: Error. %s:%i malloc %i bytes failed\n",
@@ -228,7 +228,6 @@
line = nm;
file_in = file_buf;
}
-free(tmpstr);
}
else if ((!in_comment_ss) && (!in_comment_sa) && (!in_comment_cpp))
{
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_shelf.edc
Log Message:
Fix alternate shelf w/ inset style for recent swallow color changes.
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_shelf.edc,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- default_shelf.edc 7 Jul 2007 05:20:39 - 1.24
+++ default_shelf.edc 21 Jul 2007 03:39:14 - 1.25
@@ -1077,7 +1077,6 @@
rel2 {
offset: -5-5;
}
- color: 0 0 0 0;
}
}
part {
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_object_textblock.c
Log Message:
no need for extra nul byte check - while terminated IF its null. so known
condition. formatting too.
===
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_object_textblock.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -3 -r1.141 -r1.142
--- evas_object_textblock.c 20 Jul 2007 22:30:12 - 1.141
+++ evas_object_textblock.c 21 Jul 2007 03:06:08 - 1.142
@@ -2423,11 +2423,8 @@
static inline void
_advance_after_end_of_string(const char **p_buf)
{
- while (**p_buf != '\0')
- (*p_buf)++;
-
- if (**p_buf == '\0')
- (*p_buf)++;
+ while (**p_buf != 0) (*p_buf)++;
+ (*p_buf)++;
}
static inline int
@@ -2435,12 +2432,14 @@
const char **p_m, const char *m_end)
{
for (;((s < s_end) && (*p_m < m_end)); s++, (*p_m)++)
- if (*s != **p_m)
- {
- _advance_after_end_of_string(p_m);
- return 0;
- }
-
+ {
+ if (*s != **p_m)
+ {
+_advance_after_end_of_string(p_m);
+return 0;
+ }
+ }
+
if (*p_m < m_end)
_advance_after_end_of_string(p_m);
@@ -2463,7 +2462,7 @@
evas_textblock_cursor_text_append(cur, map_itr);
return;
}
-
+
if (map_itr < map_itr)
_advance_after_end_of_string(&map_itr);
}
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e morlenxus
Enlightenment CVS committal
Author : morlenxus
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/conf_profiles
Modified Files:
e_int_config_profiles.c
Log Message:
fixed seggi, changed window size for devilhorns
===
RCS file: /cvs/e/e17/apps/e/src/modules/conf_profiles/e_int_config_profiles.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_int_config_profiles.c 16 Jul 2007 00:45:58 - 1.1
+++ e_int_config_profiles.c 20 Jul 2007 23:58:02 - 1.2
@@ -212,7 +212,7 @@
snprintf(buf, sizeof(buf), _("You requested to delete \"%s\"."
"Are you sure you want to delete this
profile?"),
-cfdata->sel_profile);
+d->cfdata->sel_profile);
e_confirm_dialog_show(_("Are you sure you want to delete this profile?"),
"enlightenment/exit", buf, NULL, NULL,
_cb_dialog_yes, NULL, d, NULL,
_cb_dialog_destroy, d);
@@ -247,7 +247,7 @@
{
E_Dialog *dia;
Evas *evas;
- Evas_Coord mw, mh;
+ Evas_Coord mh;
Evas_Object *ol, *ob;
dia = e_dialog_new(cfdata->cfd->con, "E", "profiles_new_profile_dialog");
@@ -268,8 +268,8 @@
e_widget_table_object_append(ol, ob,
1, 0, 1, 1,
1, 1, 1, 1);
- e_widget_min_size_get(ol, &mw, &mh);
- e_dialog_content_set(dia, ol, mw, mh);
+ e_widget_min_size_get(ol, NULL, &mh);
+ e_dialog_content_set(dia, ol, 150, mh);
e_dialog_button_add(dia, _("OK"), NULL, _new_profile_cb_ok, cfdata);
e_dialog_button_add(dia, _("Cancel"), NULL, _new_profile_cb_close, cfdata);
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/etk andrunko
Enlightenment CVS committal
Author : andrunko
Project : e17
Module : libs/etk
Dir : e17/libs/etk/src/bin
Modified Files:
etk_mdi_window_test.c
Log Message:
Added Etk_Mdi_Area (container for Etk_Mdi_Window).
===
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_mdi_window_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_mdi_window_test.c 19 Jul 2007 22:31:47 - 1.1
+++ etk_mdi_window_test.c 20 Jul 2007 22:45:27 - 1.2
@@ -11,7 +11,7 @@
void etk_test_mdi_window_window_create(void *data)
{
static Etk_Widget *win = NULL;
- Evas *evas;
+ Etk_Widget *mdi_area;
Etk_Widget *mdi_window;
if (win)
@@ -25,18 +25,20 @@
etk_window_title_set(ETK_WINDOW(win), "Etk Mdi Window Test");
etk_container_border_width_set(ETK_CONTAINER(win), 5);
etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
- etk_widget_show_all(win);
- evas = etk_widget_toplevel_evas_get(ETK_WIDGET(win));
+ mdi_area = etk_mdi_area_new();
+ etk_container_add(ETK_CONTAINER(win), mdi_area);
- mdi_window = etk_mdi_window_new(evas);
+ mdi_window = etk_mdi_window_new();
etk_mdi_window_title_set(ETK_MDI_WINDOW(mdi_window), "Mdi Window 1");
- etk_mdi_window_resize(ETK_MDI_WINDOW(mdi_window), 100, 100);
- etk_widget_show_all(mdi_window);
+ etk_widget_size_request_set(ETK_WIDGET(mdi_window), 100, 100);
+ etk_container_add(ETK_CONTAINER(mdi_area), mdi_window);
- mdi_window = etk_mdi_window_new(evas);
+ mdi_window = etk_mdi_window_new();
etk_mdi_window_title_set(ETK_MDI_WINDOW(mdi_window), "Mdi Window 2");
etk_mdi_window_move(ETK_MDI_WINDOW(mdi_window), 100, 100);
- etk_mdi_window_resize(ETK_MDI_WINDOW(mdi_window), 100, 100);
- etk_widget_show_all(mdi_window);
+ etk_widget_size_request_set(ETK_WIDGET(mdi_window), 100, 100);
+ etk_container_add(ETK_CONTAINER(mdi_area), mdi_window);
+
+ etk_widget_show_all(win);
}
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/etk andrunko
Enlightenment CVS committal
Author : andrunko
Project : e17
Module : libs/etk
Dir : e17/libs/etk/src/lib
Modified Files:
Etk.h Makefile.am etk_mdi_window.c etk_mdi_window.h
etk_types.h
Added Files:
etk_mdi_area.c etk_mdi_area.h
Log Message:
Added Etk_Mdi_Area (container for Etk_Mdi_Window).
===
RCS file: /cvs/e/e17/libs/etk/src/lib/Etk.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- Etk.h 19 Jul 2007 22:31:47 - 1.49
+++ Etk.h 20 Jul 2007 22:45:27 - 1.50
@@ -46,6 +46,7 @@
#include "etk_iconbox.h"
#include "etk_image.h"
#include "etk_label.h"
+#include "etk_mdi_area.h"
#include "etk_mdi_window.h"
#include "etk_menu.h"
#include "etk_menu_bar.h"
===
RCS file: /cvs/e/e17/libs/etk/src/lib/Makefile.am,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- Makefile.am 19 Jul 2007 22:31:47 - 1.54
+++ Makefile.am 20 Jul 2007 22:45:27 - 1.55
@@ -46,6 +46,7 @@
etk_label.h \
etk_main.h \
etk_marshallers.h \
+etk_mdi_area.h \
etk_mdi_window.h \
etk_menu.h \
etk_menu_bar.h \
@@ -120,6 +121,7 @@
etk_label.c \
etk_main.c \
etk_marshallers.c \
+etk_mdi_area.c \
etk_mdi_window.c \
etk_menu.c \
etk_menu_bar.c \
===
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_mdi_window.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_mdi_window.c19 Jul 2007 22:31:47 - 1.1
+++ etk_mdi_window.c20 Jul 2007 22:45:27 - 1.2
@@ -4,16 +4,14 @@
#endif
#include "etk_mdi_window.h"
-#include "etk_config.h"
-#include "etk_engine.h"
+
+#include "etk_utils.h"
#include "etk_signal.h"
#include "etk_signal_callback.h"
-#include "etk_utils.h"
+#include "etk_toplevel.h"
-#include
#include
-#include
#include
#include
@@ -22,12 +20,9 @@
* @{
*/
-#define ETK_MDI_WINDOW_DATA(data) ((Etk_Mdi_Window_Data*)data)
-
enum Etk_Widget_Signal_Id
{
ETK_MDI_WINDOW_MOVED_SIGNAL,
- ETK_MDI_WINDOW_RESIZED_SIGNAL,
ETK_MDI_WINDOW_DELETE_EVENT_SIGNAL,
ETK_MDI_WINDOW_NUM_SIGNALS
};
@@ -35,43 +30,14 @@
enum Etk_Mdi_Window_Property_Id
{
ETK_MDI_WINDOW_TITLE_PROPERTY,
- ETK_MDI_WINDOW_MAXIMIZED_PROPERTY,
- ETK_MDI_WINDOW_DECORATED_PROPERTY
-};
-
-/* Engine specific data for Etk_Mdi_Window */
-struct _Etk_Mdi_Window_Data
-{
- Etk_Size size;
- Etk_Size min_size;
- Evas_Object *border;
- Etk_Position border_position;
- Etk_Bool borderless;
- Etk_Bool visible;
- Etk_Bool maximized;
- Etk_Bool is_dragging;
- int drag_offset_x;
- int drag_offset_y;
- Etk_Bool is_resizing;
- int resize_offset_x;
- int resize_offset_y;
- char *title;
+ ETK_MDI_WINDOW_MAXIMIZED_PROPERTY
};
static void _etk_mdi_window_constructor(Etk_Mdi_Window *mdi_window);
static void _etk_mdi_window_destructor(Etk_Mdi_Window *mdi_window);
static void _etk_mdi_window_property_set(Etk_Object *object, int property_id,
Etk_Property_Value *value);
static void _etk_mdi_window_property_get(Etk_Object *object, int property_id,
Etk_Property_Value *value);
-static void _etk_mdi_window_shown_cb(Etk_Object *object, void *data);
-static void _etk_mdi_window_hidden_cb(Etk_Object *object, void *data);
-static void _etk_mdi_window_size_requested_cb(Etk_Object *object, Etk_Size
*requested_size, void *data);
-static void _etk_mdi_window_evas_position_get(Etk_Toplevel *toplevel, int *x,
int *y);
-static void _etk_mdi_window_screen_position_get(Etk_Toplevel *toplevel, int
*x, int *y);
-static void _etk_mdi_window_size_get(Etk_Toplevel *toplevel, int *w, int *h);
-static void _etk_mdi_window_disable(Etk_Mdi_Window *mdi_window);
-static void _etk_mdi_window_enable(Etk_Mdi_Window *mdi_window);
static void _etk_mdi_window_realized_cb(Etk_Object *object, void *data);
-static void _etk_mdi_window_unrealized_cb(Etk_Object *object, void *data);
static void _etk_mdi_window_titlebar_mouse_down_cb(void *data, Evas *e,
Evas_Object *obj, void *event_info);
static void _etk_mdi_window_titlebar_mouse_up_cb(void *data, Evas *e,
Evas_Object *obj, void *event_info);
static void _etk_mdi_window_titlebar_mouse_move_cb(void *data, Evas *e,
Evas_Object *obj, void *event_info);
@@ -80,11 +46,9 @@
static void _etk_mdi_window_resize_mouse_down_cb(void *data, Evas *e,
Evas_Object *obj, void *event_info);
static void _etk_mdi_window_resize_mouse_up_cb(void *data, Evas *e,
Evas_Object *obj, void *event_info);
static void _etk_mdi_window_resize_mouse_move_cb(void *data, Evas *e,
Evas_Object *obj, void *event_info);
-static void _etk_mdi_window_maximize_mouse_up_cb(void *data, Evas_Object *obj,
const char *emission, const char *source);
-static void _etk_mdi_window_close_mouse_up_cb(void *data, Evas_Object *obj,
const char *emission, const char *source);
+sta
E CVS: libs/etk andrunko
Enlightenment CVS committal Author : andrunko Project : e17 Module : libs/etk Dir : e17/libs/etk/data/themes/default Modified Files: default.edc Log Message: Refactor Etk_Mdi_Window to be a Etk_Bin widget. Added Etk_Mdi_Area (container for Etk_Mdi_Window). === RCS file: /cvs/e/e17/libs/etk/data/themes/default/default.edc,v retrieving revision 1.35 retrieving revision 1.36 diff -u -3 -r1.35 -r1.36 --- default.edc 28 Jun 2007 11:05:43 - 1.35 +++ default.edc 20 Jul 2007 22:43:25 - 1.36 @@ -1,6 +1,7 @@ #include "macros/dnd.edc" #include "macros/focus.edc" #include "macros/glint.edc" +#include "macros/mdi_window.edc" #include "macros/paned.edc" #include "macros/scrollbar.edc" #include "macros/style.edc" @@ -43,4 +44,5 @@ #include "widgets/colorpicker.edc" #include "widgets/toolbar.edc" #include "widgets/label.edc" + #include "widgets/mdi_window.edc" } - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/etk andrunko
Enlightenment CVS committal Author : andrunko Project : e17 Module : libs/etk Dir : e17/libs/etk/data/themes/default/widgets Modified Files: Makefile.am Added Files: mdi_window.edc Log Message: Refactor Etk_Mdi_Window to be a Etk_Bin widget. Added Etk_Mdi_Area (container for Etk_Mdi_Window). === RCS file: /cvs/e/e17/libs/etk/data/themes/default/widgets/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- Makefile.am 28 Jan 2007 18:39:07 - 1.6 +++ Makefile.am 20 Jul 2007 22:43:25 - 1.7 @@ -1,26 +1,27 @@ MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = button.edc \ -menu.edc \ -separator.edc \ -tooltips.edc \ -check_button.edc \ -notebook.edc \ -slider.edc \ -tree.edc \ -combobox.edc \ -paned.edc \ -spinner.edc \ -windows.edc \ -progress_bar.edc \ -statusbar.edc \ -entry.edc \ -radio_button.edc \ -text_view.edc \ -frame.edc \ -scrollbar.edc \ -toggle_button.edc \ - iconbox.edc \ - colorpicker.edc \ - toolbar.edc \ -label.edc \ -shadow.edc + menu.edc \ + separator.edc \ + tooltips.edc \ + check_button.edc \ + notebook.edc \ + slider.edc \ + tree.edc \ + combobox.edc \ + paned.edc \ + spinner.edc \ + windows.edc \ + progress_bar.edc \ + statusbar.edc \ + entry.edc \ + radio_button.edc \ + text_view.edc \ + frame.edc \ + scrollbar.edc \ + toggle_button.edc \ + iconbox.edc \ + colorpicker.edc \ + toolbar.edc \ + label.edc \ + shadow.edc \ + mdi_window.edc - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/etk andrunko
Enlightenment CVS committal Author : andrunko Project : e17 Module : libs/etk Dir : e17/libs/etk/data/themes/default/images Modified Files: Makefile.am images.edc Added Files: mdi_window_border.png mdi_window_button.png mdi_window_button_close.png mdi_window_button_maximize.png mdi_window_button_shadow1.png mdi_window_button_shadow2.png mdi_window_glint1.png mdi_window_glint2.png mdi_window_glint3.png mdi_window_shadow.png mdi_window_title_highlight.png mdi_window_title_shadow1.png mdi_window_title_shadow2.png Log Message: Refactor Etk_Mdi_Window to be a Etk_Bin widget. Added Etk_Mdi_Area (container for Etk_Mdi_Window). === RCS file: /cvs/e/e17/libs/etk/data/themes/default/images/Makefile.am,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- Makefile.am 18 Mar 2007 20:44:46 - 1.18 +++ Makefile.am 20 Jul 2007 22:43:25 - 1.19 @@ -1,106 +1,119 @@ MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = \ -images.edc \ -background.png \ -border.png \ -button_disabled.png \ -button_down.png \ -button_toggled.png \ -button_toggled_disabled.png \ -button_up.png \ -checkbox_down.png \ -checkbox_off.png \ -checkbox_on.png \ -checkbox_off_disabled.png \ -checkbox_on_disabled.png \ -colorpicker_preview.png \ -colorpicker_slider_drag.png \ -colorpicker_slider_trough.png \ -colorpicker_square.png \ -colorpicker_vertical.png \ -combo_arrow.png \ -drag_glow.png \ -entry.png \ -focus_glow.png \ -focus_rect.png \ -frame_label_over.png \ -frame_label_under.png \ -frame_outline.png \ -glint1.png \ -glint2.png \ -glint3.png \ -glow_arrow_down.png \ -glow_arrow_left.png \ -glow_arrow_right.png \ -glow_arrow_up.png \ -hpaned_handle.png \ -hscrollbar_trough2.png \ -hscrollbar_trough.png \ -hseparator.png \ -hslider_bar.png \ -htoolbar.png \ -iconbox_label_bg.png \ -iconbox_selection.png \ -menu_arrow.png \ -menu_bar.png \ -menu_item_highlight.png \ -menu_item_outline.png \ -menu_item_shadow1.png \ -menu_item_shadow2.png \ -menu_separator.png \ -notebook_frame.png \ -notebook_tab.png \ -notebook_tab_shadow.png \ -radio_off.png \ -radio_on.png \ -radio_off_disabled.png \ -radio_on_disabled.png \ -scrollbar_button_down1.png \ -scrollbar_button_down2.png \ -scrollbar_button_left1.png \ -scrollbar_button_left2.png \ -scrollbar_button_right1.png \ -scrollbar_button_right2.png \ -scrollbar_button_up1.png \ -scrollbar_button_up2.png \ -scrollbar_hdrag1.png \ -scrollbar_hdrag2.png \ -scrollbar_hdrag_thumb.png \ -scrollbar_vdrag1.png \ -scrollbar_vdrag2.png \ -scrollbar_vdrag_thumb.png \ -slider_button1.png \ -slider_button2.png \ -slider_button_glow.png \ -spinner_bg.png \ -spinner_button_down1.png \ -spinner_button_down2.png \ -spinner_button_up1.png \ -spinner_button_up2.png \ -status_bar.png \ -status_resize.png \ -text_view_bg.png \ -text_view_over.png \ -toolbar.png \ -tooltip_border.png \ -tooltip.png \ -tree_asc_arrow.png \ -tree_desc_arrow.png \ -tree_expander_fold.png \ -tree_expander_unfold.png \ -tree_header_over.png \ -tree_header_first.png \ -tree_header_first2.png \ -tree_header_last.png \ -tree_header_last2.png \ -tree_header_middle.png \ -tree_header_middle2.png \ -tree_header_unique.png \ -tree_header_unique2.png \ -tree.png \ -tree_shadow.png \ -vpaned_handle.png \ -vscrollbar_trough2.png \ -vscrollbar_trough.png \ -vseparator.png \ -vslider_bar.png + images.edc \ + background.png \ + border.png \ + button_disabled.png \ + button_down.png \ + button_toggled.png \ + button_toggled_disabled.png \ + button_up.png \ + checkbox_down.png \ + checkbox_off.pn
E CVS: libs/etk andrunko
Enlightenment CVS committal Author : andrunko Project : e17 Module : libs/etk Dir : e17/libs/etk/data/themes/default/macros Modified Files: Makefile.am Added Files: mdi_window.edc Log Message: Refactor Etk_Mdi_Window to be a Etk_Bin widget. Added Etk_Mdi_Area (container for Etk_Mdi_Window). === RCS file: /cvs/e/e17/libs/etk/data/themes/default/macros/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- Makefile.am 22 Mar 2007 13:48:58 - 1.5 +++ Makefile.am 20 Jul 2007 22:43:25 - 1.6 @@ -1,9 +1,10 @@ MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = dnd.edc \ -focus.edc \ -glint.edc \ -paned.edc \ -scrollbar.edc \ -style.edc \ - toolbar.edc \ - tree_header.edc + focus.edc \ + glint.edc \ + mdi_window.edc \ + paned.edc \ + scrollbar.edc \ + style.edc \ + toolbar.edc \ + tree_header.edc - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_object_textblock.c
Log Message:
Fix bug introduced with r1.138, removed incorrect offset table.
I changed evas_object_textblock_text_markup_get() to just return
previously known contents, not try to recreate them set with other
means, this was not used (at least in our CVS) and was slow and
incorrect.
===
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_object_textblock.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -3 -r1.140 -r1.141
--- evas_object_textblock.c 28 Jun 2007 23:22:20 - 1.140
+++ evas_object_textblock.c 20 Jul 2007 22:30:12 - 1.141
@@ -627,48 +627,6 @@
"Ω\0\xce\xa9\0"
;
-static const unsigned short escape_offsets[] = {
- 0, 4, 5, 9, 10, 15, 16, 22, 23, 29, 30, 36,
- 38, 43, 45, 53, 56, 64, 66, 74, 76, 84, 86,
- 94, 96, 103, 105, 112, 114, 121, 123, 128, 130,
- 135, 137, 144, 146, 153, 155, 160, 162, 167,
- 169, 175, 177, 184, 186, 194, 196, 201, 203,
- 209, 212, 218, 220, 226, 228, 235, 237, 244,
- 246, 253, 255, 263, 265, 273, 275, 281, 283,
- 289, 291, 298, 300, 306, 308, 315, 318, 323,
- 326, 331, 334, 340, 343, 349, 352, 356, 359,
- 364, 367, 374, 377, 381, 384, 392, 395, 402,
- 405, 412, 415, 421, 424, 430, 433, 439, 442,
- 448, 451, 457, 460, 466, 469, 475, 478, 486,
- 488, 496, 498, 505, 507, 515, 517, 523, 525,
- 531, 533, 539, 541, 549, 551, 559, 561, 569,
- 571, 576, 578, 586, 588, 596, 598, 606, 608,
- 616, 618, 626, 628, 636, 638, 646, 648, 656,
- 658, 666, 668, 676, 678, 686, 688, 696, 698,
- 705, 707, 714, 716, 723, 725, 732, 734, 741,
- 743, 750, 752, 759, 761, 768, 770, 777, 779,
- 786, 788, 796, 798, 806, 808, 816, 818, 826,
- 828, 836, 838, 846, 848, 856, 858, 866, 868,
- 876, 878, 886, 888, 894, 896, 902, 904, 910,
- 912, 918, 920, 926, 928, 934, 936, 942, 944,
- 950, 952, 958, 960, 966, 968, 976, 978, 986,
- 988, 996, 998, 1006, 1008, 1015, 1017, 1024, 1026,
- 1034, 1036, 1044, 1046, 1053, 1055, 1062, 1064, 1072,
- 1074, 1082, 1084, 1092, 1094, 1102, 1104, , 1113,
- 1120, 1122, 1129, 1131, 1136, 1138, 1143, 1145, 1152,
- 1154, 1160, 1162, 1169, 1171, 1178, 1180, 1189, 1191,
- 1197, 1199, 1204, 1206, 1213, 1215, 1221, 1223, 1230,
- 1232, 1240, 1242, 1246, 1248, 1252, 1254, 1263, 1265,
- 1269, 1271, 1275, 1277, 1282, 1284, 1291, 1293, 1298,
- 1300, 1309, 1311, 1316, 1318, 1323, 1325, 1330, 1332,
- 1339, 1341, 1348, 1350, 1356, 1358, 1365, 1367, 1374,
- 1376, 1385, 1387, 1393, 1395, 1400, 1402, 1409, 1411,
- 1417, 1419, 1426, 1428, 1436, 1438, 1442, 1444, 1448,
- 1450, 1459, 1461, 1465, 1467, 1471, 1473, 1478, 1480,
- 1487, 1489, 1494, 1496, 1505, 1507, 1512, 1514, 1519,
- 1521, 1526, 1528, 1535
-};
-
static int
_is_white(int c)
@@ -2462,6 +2420,55 @@
return o->style;
}
+static inline void
+_advance_after_end_of_string(const char **p_buf)
+{
+ while (**p_buf != '\0')
+ (*p_buf)++;
+
+ if (**p_buf == '\0')
+ (*p_buf)++;
+}
+
+static inline int
+_is_eq_and_advance(const char *s, const char *s_end,
+ const char **p_m, const char *m_end)
+{
+ for (;((s < s_end) && (*p_m < m_end)); s++, (*p_m)++)
+ if (*s != **p_m)
+ {
+ _advance_after_end_of_string(p_m);
+ return 0;
+ }
+
+ if (*p_m < m_end)
+ _advance_after_end_of_string(p_m);
+
+ return s == s_end;
+}
+
+static inline void
+_append_escaped_char(Evas_Textblock_Cursor *cur, const char *s,
+const char *s_end)
+{
+ const char *map_itr, *map_end;
+
+ map_itr = escape_strings;
+ map_end = map_itr + sizeof(escape_strings);
+
+ while (map_itr < map_end)
+ {
+ if (_is_eq_and_advance(s, s_end, &map_itr, map_end))
+ {
+evas_textblock_cursor_text_append(cur, map_itr);
+return;
+ }
+
+ if (map_itr < map_itr)
+ _advance_after_end_of_string(&map_itr);
+ }
+}
+
EAPI void
evas_object_textblock_text_markup_set(Evas_Object *obj, const char *text)
{
@@ -2535,19 +2542,7 @@
}
else if (esc_end)
{
- int i;
-
- for (i = 0; i < (int)(sizeof(escape_offsets) /
sizeof(escape_offsets[0])); i += 2)
-{
- const char *in = escape_strings + escape_offsets[i];
- const char *out = escape_strings + escape_offsets[i
+ 1];
-
- if (!strncmp(in, esc_start, esc_end - esc_start +
1))
- {
-evas_textblock_
E CVS: libs/evas barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/software_16
Modified Files:
evas_soft16_dither_mask.c
Log Message:
Fix CPP warnings about DM_* macros, do loop unrolling for dither mask
processing.
===
RCS file:
/cvs/e/e17/libs/evas/src/modules/engines/software_16/evas_soft16_dither_mask.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_soft16_dither_mask.c 20 Jul 2007 00:18:07 - 1.1
+++ evas_soft16_dither_mask.c 20 Jul 2007 17:29:31 - 1.2
@@ -1,12 +1,12 @@
#include "evas_soft16.h"
-#define DM_SIZE 128
-#define DM_BITS 6
-#define DM_DIV 64
-#define DM_MSK (DM_SIZE - 1)
-#define DM_SHF(_b) (DM_BITS - (8 - _b))
+#define S16_DM_SIZE 128
+#define S16_DM_BITS 6
+#define S16_DM_DIV 64
+#define S16_DM_MSK (S16_DM_SIZE - 1)
+#define S16_DM_SHF(_b) (S16_DM_BITS - (8 - _b))
-static const DATA8 dither_table[DM_SIZE][DM_SIZE] =
+static const DATA8 dither_table[S16_DM_SIZE][S16_DM_SIZE] =
{
{ 0, 41, 23, 5, 17, 39, 7, 15, 62, 23, 40, 51, 31, 47, 9, 32, 52, 27, 57,
25, 6, 61, 27, 52, 37, 7, 40, 63, 18, 36, 10, 42, 25, 62, 45, 34, 20, 42, 37,
14, 35, 29, 50, 10, 61, 2, 40, 8, 37, 12, 58, 22, 5, 41, 10, 39, 0, 60, 11, 46,
2, 55, 38, 17, 36, 59, 13, 54, 37, 56, 8, 29, 16, 13, 63, 22, 41, 55, 7, 20,
49, 14, 23, 55, 37, 23, 19, 36, 15, 49, 23, 63, 30, 14, 38, 27, 53, 13, 22, 41,
19, 31, 7, 19, 50, 30, 49, 16, 3, 32, 56, 40, 29, 34, 8, 48, 19, 45, 4, 51, 12,
46, 35, 49, 16, 42, 12, 62 },
{ 30, 57, 36, 54, 47, 34, 52, 27, 43, 4, 28, 7, 17, 36, 62, 13, 44, 7,
18, 48, 33, 21, 44, 14, 30, 47, 12, 33, 5, 55, 31, 58, 13, 30, 4, 17, 52, 10,
60, 26, 46, 0, 39, 27, 42, 22, 47, 25, 60, 32, 9, 38, 48, 17, 59, 30, 49, 18,
34, 25, 51, 19, 5, 48, 21, 8, 28, 46, 1, 32, 41, 19, 54, 47, 37, 18, 28, 11,
44, 30, 39, 56, 2, 33, 8, 42, 61, 28, 58, 8, 46, 9, 41, 4, 58, 7, 21, 48, 59,
10, 52, 14, 42, 57, 12, 25, 7, 53, 42, 24, 11, 50, 17, 59, 42, 2, 36, 60, 32,
17, 63, 29, 21, 7, 59, 32, 24, 39 },
@@ -142,7 +142,7 @@
_soft16_convert_from_rgba_pt(const DATA32 *src, DATA16 *dst, DATA8 *alpha,
const int x, const int y)
{
- DATA8 orig_r, orig_g, orig_b, orig_a, r, g, b, a, dith5, dith6;
+ DATA8 orig_r, orig_g, orig_b, orig_a, r, g, b, a, dith5, dith6, dith;
orig_r = R_VAL(src);
orig_g = G_VAL(src);
@@ -154,8 +154,9 @@
b = orig_b >> 3;
a = orig_a >> 3;
- dith5 = dither_table[x & DM_MSK][y & DM_MSK] >> DM_SHF(5);
- dith6 = dither_table[x & DM_MSK][y & DM_MSK] >> DM_SHF(6);
+ dith = dither_table[x & S16_DM_MSK][y & S16_DM_MSK];
+ dith5 = dith >> S16_DM_SHF(5);
+ dith6 = dith >> S16_DM_SHF(6);
if (((orig_r - (r << 3)) >= dith5) && (r < 0x1f)) r++;
if (((orig_g - (g << 2)) >= dith6) && (g < 0x3f)) g++;
@@ -166,29 +167,53 @@
*alpha = a;
}
+static inline void
+_soft16_convert_from_rgba_scanline(const DATA32 *src, DATA16 *dst,
+ DATA8 *alpha, const int y, const int w)
+{
+ int x, m;
+
+ m = (w & ~7);
+ x = 0;
+ pld(src, 0);
+
+ while (x < m)
+ {
+ pld(src, 32);
+ UNROLL8({
+ _soft16_convert_from_rgba_pt(src, dst, alpha, x, y);
+ src++;
+ dst++;
+ alpha++;
+ x++;
+ });
+ }
+
+ for (; x < w; x++, src++, dst++, alpha++)
+ _soft16_convert_from_rgba_pt(src, dst, alpha, x, y);
+}
+
void
soft16_image_convert_from_rgba(Soft16_Image *im, const DATA32 *src)
{
const DATA32 *sp;
DATA16 *dp;
DATA8 *ap;
- int x, y, pad;
+ int y;
sp = src;
dp = im->pixels;
ap = im->alpha;
- pad = im->stride - im->w;
- for (y = 0; y < im->h; y++, dp += pad, ap += pad)
- for (x = 0; x < im->w; x++, sp++, dp++, ap++)
- _soft16_convert_from_rgba_pt(sp, dp, ap, x, y);
+ for (y = 0; y < im->h; y++, sp += im->w, dp += im->stride, ap += im->stride)
+ _soft16_convert_from_rgba_scanline(sp, dp, ap, y, im->w);
}
static inline void
_soft16_convert_from_rgb_pt(const DATA32 *src, DATA16 *dst,
const int x, const int y)
{
- DATA8 orig_r, orig_g, orig_b, r, g, b, dith5, dith6;
+ DATA8 orig_r, orig_g, orig_b, r, g, b, dith5, dith6, dith;
orig_r = R_VAL(src);
orig_g = G_VAL(src);
@@ -198,8 +223,9 @@
g = orig_g >> 2;
b = orig_b >> 3;
- dith5 = dither_table[x & DM_MSK][y & DM_MSK] >> DM_SHF(5);
- dith6 = dither_table[x & DM_MSK][y & DM_MSK] >> DM_SHF(6);
+ dith = dither_table[x & S16_DM_MSK][y & S16_DM_MSK];
+ dith5 = dith >> S16_DM_SHF(5);
+ dith6 = dith >> S16_DM_SHF(6);
if (((orig_r - (r << 3)) >= dith5) && (r < 0x1f)) r++;
if (((orig_g - (g << 2)) >= dith6) && (g < 0x3f)) g++;
@@ -208,6 +234,31 @@
*dst = (r << 11) | (g << 5) | b;
}
+static inline void
+_soft16_convert_from_rgb_scanline(c
E CVS: libs/ewl ningerso
Enlightenment CVS committal Author : ningerso Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/engines/evas Modified Files: ewl_engine_evas.c Log Message: Move the include of Evas.h to the files that use it directly. === RCS file: /cvs/e/e17/libs/ewl/src/engines/evas/ewl_engine_evas.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- ewl_engine_evas.c 29 Jun 2007 14:48:56 - 1.14 +++ ewl_engine_evas.c 20 Jul 2007 13:54:07 - 1.15 @@ -4,6 +4,8 @@ #include "ewl_debug.h" #include "ewl_macros.h" +#include + static Evas_Smart *widget_smart = NULL; static int ee_init(Ewl_Engine *engine); - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl ningerso
Enlightenment CVS committal Author : ningerso Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_attach.c ewl_container.c ewl_embed.c ewl_histogram.c ewl_image.c ewl_media.c ewl_misc.c ewl_private.h ewl_spectrum.c ewl_text.c ewl_widget.c Log Message: Move the include of Evas.h to the files that use it directly. === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_attach.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -3 -r1.44 -r1.45 --- ewl_attach.c29 Mar 2007 19:25:09 - 1.44 +++ ewl_attach.c20 Jul 2007 13:54:07 - 1.45 @@ -7,6 +7,8 @@ #include "ewl_private.h" #include "ewl_debug.h" +#include + /** * Ewl_Attach_Tooltip */ === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_container.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -3 -r1.60 -r1.61 --- ewl_container.c 8 Jul 2007 19:08:56 - 1.60 +++ ewl_container.c 20 Jul 2007 13:54:07 - 1.61 @@ -4,6 +4,8 @@ #include "ewl_private.h" #include "ewl_debug.h" +#include + static void ewl_container_child_insert_helper(Ewl_Container *pc, Ewl_Widget *child, int index, === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.c,v retrieving revision 1.121 retrieving revision 1.122 diff -u -3 -r1.121 -r1.122 --- ewl_embed.c 17 Jul 2007 03:45:39 - 1.121 +++ ewl_embed.c 20 Jul 2007 13:54:07 - 1.122 @@ -4,6 +4,8 @@ #include "ewl_macros.h" #include "ewl_debug.h" +#include + static int ewl_embed_last_mouse_x = 0; static int ewl_embed_last_mouse_y = 0; === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_histogram.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- ewl_histogram.c 1 Apr 2007 21:48:06 - 1.13 +++ ewl_histogram.c 20 Jul 2007 13:54:07 - 1.14 @@ -5,6 +5,8 @@ #include "ewl_private.h" #include "ewl_debug.h" +#include + static void ewl_histogram_cb_data_load(Ewl_Widget *w, void *ev, void *h); static void ewl_histogram_draw(Ewl_Histogram *hist); === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_image.c,v retrieving revision 1.64 retrieving revision 1.65 diff -u -3 -r1.64 -r1.65 --- ewl_image.c 19 Jul 2007 19:00:38 - 1.64 +++ ewl_image.c 20 Jul 2007 13:54:07 - 1.65 @@ -5,6 +5,7 @@ #include "ewl_macros.h" #include "ewl_debug.h" +#include #include #ifdef BUILD_EPSILON_SUPPORT === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_media.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- ewl_media.c 1 Apr 2007 21:48:06 - 1.29 +++ ewl_media.c 20 Jul 2007 13:54:07 - 1.30 @@ -5,6 +5,8 @@ #include "ewl_private.h" #include "ewl_debug.h" +#include + #ifdef BUILD_EMOTION_SUPPORT #include #endif === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_misc.c,v retrieving revision 1.98 retrieving revision 1.99 diff -u -3 -r1.98 -r1.99 --- ewl_misc.c 19 Jul 2007 19:00:41 - 1.98 +++ ewl_misc.c 20 Jul 2007 13:54:07 - 1.99 @@ -7,6 +7,8 @@ #include "ewl_private.h" #include "ewl_debug.h" +#include + #include #include #include === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_private.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- ewl_private.h 19 Jul 2007 19:00:41 - 1.20 +++ ewl_private.h 20 Jul 2007 13:54:07 - 1.21 @@ -2,7 +2,6 @@ #ifndef _EWL_PRIVATE_H #define _EWL_PRIVATE_H -#include #include #include === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_spectrum.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -3 -r1.37 -r1.38 --- ewl_spectrum.c 10 Apr 2007 22:52:02 - 1.37 +++ ewl_spectrum.c 20 Jul 2007 13:54:07 - 1.38 @@ -7,6 +7,8 @@ #include "ewl_private.h" #include "ewl_debug.h" +#include + static void ewl_spectrum_hsv_from_rgb(Ewl_Spectrum *sp); static void ewl_spectrum_rgb_from_hsv(Ewl_Spectrum *sp); static void ewl_spectrum_draw(Ewl_Spectrum *sp); === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_text.c,v retrieving revision 1.170 retrieving revision 1.171 diff -u -3 -r1.170 -r1.171 --- ewl_text.c 18 Jul 2007 14:43:32 - 1.170 +++ ewl_text.c 20 Jul 2007 13:54:07 - 1.171 @@ -8,6 +8,8 @@ #include "
E CVS: mail englebass
Enlightenment CVS committal
Author : englebass
Project : e_modules
Module : mail
Dir : e_modules/mail
Modified Files:
imap2.c
Log Message:
Reset idling on reconnect.
===
RCS file: /cvs/e/e_modules/mail/imap2.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- imap2.c 22 Jun 2007 14:38:23 - 1.6
+++ imap2.c 20 Jul 2007 12:50:31 - 1.7
@@ -66,6 +66,7 @@
ic->config->port, NULL);
ic->cmd = 1;
ic->idle = -1;
+ic->idling = 0;
}
else
{
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_maximize.c
Log Message:
When using "fill available space", take into account if the border is on the
current desk or not. This fixes bug #113.
Fix minor formatting issue in e_border.c
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.596
retrieving revision 1.597
diff -u -3 -r1.596 -r1.597
--- e_border.c 15 Jul 2007 08:28:03 - 1.596
+++ e_border.c 20 Jul 2007 08:27:59 - 1.597
@@ -611,10 +611,7 @@
bd->zone = zone;
if (bd->desk->zone != bd->zone)
- {
- e_border_desk_set(bd, e_desk_current_get(bd->zone));
- }
-
+ e_border_desk_set(bd, e_desk_current_get(bd->zone));
ev = calloc(1, sizeof(E_Event_Border_Zone_Set));
ev->border = bd;
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_maximize.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_maximize.c1 Oct 2006 20:10:37 - 1.19
+++ e_maximize.c20 Jul 2007 08:27:59 - 1.20
@@ -160,8 +160,7 @@
bl = e_container_border_list_first(bd->zone->container);
while ((bd2 = e_container_border_list_next(bl)))
{
- if ((bd2->zone != bd->zone) ||
- (bd == bd2))
+ if ((bd2->zone != bd->zone) || (bd == bd2) || (bd2->desk != bd->desk))
continue;
OBSTACLE(bd2->x, bd2->y, bd2->x + bd2->w, bd2->y + bd2->h);
}
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_fonts Modified Files: e_int_config_fonts.c Log Message: If we don't reassign a value to either tc->font or style, then be sure to set them to NULL. This fixes bug #120. === RCS file: /cvs/e/e17/apps/e/src/modules/conf_fonts/e_int_config_fonts.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_int_config_fonts.c7 Jul 2007 15:44:01 - 1.1 +++ e_int_config_fonts.c20 Jul 2007 08:11:39 - 1.2 @@ -205,7 +205,8 @@ E_Font_Properties *efp; efp = e_font_fontconfig_name_parse(efd->font); - tc->font = evas_stringshare_add(efp->name); + if (efp->name) + tc->font = evas_stringshare_add(efp->name); if (efp->styles) tc->style = evas_stringshare_add(efp->styles->data); e_font_properties_free(efp); @@ -226,7 +227,8 @@ E_Font_Properties *efp; efp = e_font_fontconfig_name_parse(efd->font); - tc->font = evas_stringshare_add(efp->name); + if (efp->name) + tc->font = evas_stringshare_add(efp->name); if (efp->styles) tc->style = evas_stringshare_add(efp->styles->data); e_font_properties_free(efp); @@ -399,11 +401,14 @@ if (tc->font) evas_stringshare_del(tc->font); if (cfdata->cur_font) tc->font = evas_stringshare_add(cfdata->cur_font); - + else + tc->font = NULL; + if (tc->style) evas_stringshare_del(tc->style); if (cfdata->cur_style) tc->style = evas_stringshare_add(cfdata->cur_style); - + else + tc->style = NULL; tc->enabled = cfdata->cur_enabled; } @@ -784,9 +789,13 @@ if (tc->font) evas_stringshare_del(tc->font); if (cfdata->cur_font) tc->font = evas_stringshare_add(cfdata->cur_font); + else + tc->font = NULL; if (tc->style) evas_stringshare_del(tc->style); if (cfdata->cur_style) tc->style = evas_stringshare_add(cfdata->cur_style); + else + tc->style = NULL; if (cfdata->gui.style_list) e_widget_ilist_unselect(cfdata->gui.style_list); if (cfdata->gui.size_list) @@ -1120,6 +1129,8 @@ if (tc->style) evas_stringshare_del(tc->style); if (cfdata->cur_style) tc->style = evas_stringshare_add(cfdata->cur_style); + else + tc->style = NULL; } _font_preview_update(cfdata); - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
