More SPLIT merging.

SVN revision: 6588
devs/princeamd/enlightenment-0.17-elive
rbdpngn 20 years ago committed by rbdpngn
parent aeac895ef7
commit 63e20e7f14
  1. 2
      Makefile.am
  2. 12
      README
  3. 4
      autogen.sh
  4. 1
      configure.ac
  5. 1
      configure.in
  6. BIN
      data/config/behavior/default/behavior.db
  7. 38
      data/scripts/build_db.sh
  8. 27
      po/ChangeLog
  9. 202
      setup-gettext.sh
  10. 13
      src/Makefile.am
  11. 205
      src/actions.c
  12. 7
      src/actions.h
  13. 39
      src/background.c
  14. 10
      src/background.h
  15. 4
      src/block.c
  16. 876
      src/border.c
  17. 18
      src/border.h
  18. 65
      src/bordermenu.c
  19. 1
      src/bordermenu.h
  20. 507
      src/config.c
  21. 247
      src/config.h
  22. 4
      src/cursors.c
  23. 220
      src/data.c
  24. 97
      src/data.h
  25. 2
      src/debug.c
  26. 8
      src/delayed.c
  27. 6
      src/delayed.h
  28. 888
      src/desktops.c
  29. 49
      src/desktops.h
  30. 7
      src/e.h
  31. 92
      src/e_dir.c
  32. 2
      src/e_dir.h
  33. 76
      src/e_ferite.c
  34. 170
      src/e_ferite.fec
  35. 30
      src/e_ferite.h
  36. 9
      src/e_file.c
  37. 2
      src/e_file.h
  38. 15
      src/e_view_look.c
  39. 12
      src/e_view_machine.c
  40. 6
      src/e_view_machine.h
  41. 64
      src/embed.c
  42. 4
      src/embed.h
  43. 167
      src/entry.c
  44. 12
      src/entry.h
  45. 821
      src/epplet.c
  46. 123
      src/epplet.h
  47. 6
      src/exec.c
  48. 8
      src/file.c
  49. 2
      src/file.h
  50. 2
      src/focus.c
  51. 8
      src/fs.c
  52. 103
      src/guides.c
  53. 456
      src/iconbar.c
  54. 15
      src/iconbar.h
  55. 173
      src/icons.c
  56. 6
      src/icons.h
  57. 43
      src/main.c
  58. 197
      src/menu.c
  59. 13
      src/menu.h
  60. 40
      src/menubuild.c
  61. 5
      src/menubuild.h
  62. 10
      src/observer.c
  63. 44
      src/observer.h
  64. 10
      src/place.c
  65. 20
      src/resist.c
  66. 22
      src/scrollbar.c
  67. 4
      src/scrollbar.h
  68. 173
      src/text.c
  69. 16
      src/text.h
  70. 98
      src/util.c
  71. 17
      src/util.h
  72. 406
      src/view.c
  73. 30
      src/view.h
  74. 63
      src/view_layout.c
  75. 9
      src/view_layout.h
  76. 293
      tools/e_setup.c

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
SUBDIRS = intl po src lib client tools doc
SUBDIRS = po src lib client tools doc
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
config.h.in config.sub configure install-sh \

@ -1,3 +1,15 @@
Additional notes
todo
entry.c - check 'todo' entries (although nobody uses entries except for
me in med, do they?)
guides.c - imlib parts that aren't converted yet.
text.c
menu.c
menubuild.c - e_observer_init() call.
border.c - use e_evas_new_all in place of the inlined code. cleanup.
+-----------------------------------------------------------------------------+
| Enlightenment 0.17.pre CVS Code.... |
+-----------------------------------------------------------------------------+

@ -111,7 +111,7 @@ do
echo "Creating $dr/aclocal.m4 ..."
test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
echo "Running gettextize... Ignore non-fatal messages."
echo "no" | gettextize --force --copy || abort "gettextize"
echo "no" | setup-gettext.sh
echo "Making $dr/aclocal.m4 writable ..."
test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
fi
@ -120,7 +120,7 @@ do
echo "Creating $dr/aclocal.m4 ..."
test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
echo "Running gettextize... Ignore non-fatal messages."
echo "no" | gettextize --force --copy || abort "gettextize"
echo "no" | setup-gettext.sh
echo "Making $dr/aclocal.m4 writable ..."
test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
fi

@ -234,7 +234,6 @@ Makefile
src/Makefile
lib/Makefile
client/Makefile
intl/Makefile
po/Makefile.in
tools/Makefile
doc/Makefile

@ -233,7 +233,6 @@ Makefile
src/Makefile
lib/Makefile
client/Makefile
intl/Makefile
po/Makefile.in
tools/Makefile
doc/Makefile

@ -27,11 +27,26 @@ WINDOW_MODE_BORDER=1
WINDOW_MODE_BOX=2
WINDOW_MODE_TECHNICAL=3
WINDOW_PLACE_MANUAL=0
WINDOW_PLACE_SMART=1
WINDOW_PLACE_MIDDLE=2
WINDOW_PLACE_CASCADE=3
WINDOW_PLACE_RANDOM=4
DESKTOP_COUNT=8
DESKTOP_SCROLL=0
DESKTOP_SCROLL_STICKY=0
DESKTOP_RESIST=3
DESKTOP_SPEED=30
DESKTOP_WIDTH=2
DESKTOP_HEIGHT=2
GUIDES_LOC_WIN=0
GUIDES_LOC_SCR=1
DB="./behavior.db"
# actions defining how to react to things
DB="./actions.db"
NUM=0
edb_ed $DB add "/actions/"$NUM"/name" str "Title_Bar"
edb_ed $DB add "/actions/"$NUM"/action" str "Window_Raise"
@ -337,26 +352,41 @@ edb_ed $DB add "/actions/"$NUM"/button" int 0
edb_ed $DB add "/actions/"$NUM"/key" str "Insert"
edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_CTRL_ALT
NUM=$[ $NUM + 1 ];
edb_ed $DB add "/actions/"$NUM"/name" str "Key_Binding"
edb_ed $DB add "/actions/"$NUM"/action" str "Window_Next"
edb_ed $DB add "/actions/"$NUM"/params" str ""
edb_ed $DB add "/actions/"$NUM"/event" int $ACT_KEY_DOWN
edb_ed $DB add "/actions/"$NUM"/button" int 0
edb_ed $DB add "/actions/"$NUM"/key" str "Tab"
edb_ed $DB add "/actions/"$NUM"/modifiers" int $MOD_ALT
NUM=$[ $NUM + 1 ];
edb_ed $DB add "/actions/count" int $NUM
edb_ed $DB add "/desktops/count" int $DESKTOP_COUNT
edb_ed $DB add "/desktops/scroll" int $DESKTOP_SCROLL
edb_ed $DB add "/desktops/scroll_sticky" int $DESKTOP_SCROLL_STICKY
edb_ed $DB add "/desktops/resist" int $DESKTOP_RESIST
edb_ed $DB add "/desktops/speed" int $DESKTOP_SPEED
edb_ed $DB add "/desktops/width" int $DESKTOP_WIDTH
edb_ed $DB add "/desktops/height" int $DESKTOP_HEIGHT
# basic settings
DB="./settings.db"
edb_ed $DB add "/focus/mode " int $FOCUS_POINTER
edb_ed $DB add "/move/resist" int 1
edb_ed $DB add "/move/resist/desk" int 24
edb_ed $DB add "/move/resist/win" int 12
edb_ed $DB add "/menu/scroll/resist" int 5
edb_ed $DB add "/menu/scroll/speed" int 12
edb_ed $DB add "/window/focus/mode" int $FOCUS_POINTER
edb_ed $DB add "/window/raise/auto" int 0
edb_ed $DB add "/window/raise/delay" float 0.5
edb_ed $DB add "/window/move/mode" int $WINDOW_MODE_OPAQUE
edb_ed $DB add "/window/resize/mode" int $WINDOW_MODE_BOX
edb_ed $DB add "/window/place/mode" int $WINDOW_PLACE_SMART
edb_ed $DB add "/guides/display/x" float 0.5
edb_ed $DB add "/guides/display/y" float 0.5
edb_ed $DB add "/guides/display/location" int $GUIDES_LOC_SCR
# what events on windows are "grabbed" by the window manager
DB="./grabs.db"
NUM=0
edb_ed $DB add "/grabs/"$NUM"/button" int 1
edb_ed $DB add "/grabs/"$NUM"/modifiers" int $MOD_ALT

@ -98,32 +98,6 @@
* Makefile.in.in: Upgrade to gettext-0.10.39.
<<<<<<< ChangeLog
2001-10-08 gettextize <bug-gnu-utils@gnu.org>
* Makefile.in.in: Upgrade to gettext-0.10.39.
2001-10-08 gettextize <bug-gnu-utils@gnu.org>
* Makefile.in.in: Upgrade to gettext-0.10.39.
2001-09-25 gettextize <bug-gnu-utils@gnu.org>
* Makefile.in.in: Upgrade to gettext-0.10.39.
2001-09-25 gettextize <bug-gnu-utils@gnu.org>
* Makefile.in.in: Upgrade to gettext-0.10.39.
2001-09-10 gettextize <bug-gnu-utils@gnu.org>
* Makefile.in.in: Upgrade to gettext-0.10.39.
2001-09-10 gettextize <bug-gnu-utils@gnu.org>
* Makefile.in.in: Upgrade to gettext-0.10.39.
=======
2001-10-09 gettextize <bug-gnu-utils@gnu.org>
* Makefile.in.in: Upgrade to gettext-0.10.40.
@ -132,7 +106,6 @@
* Makefile.in.in: Upgrade to gettext-0.10.40.
>>>>>>> 1.6
2001-08-31 gettextize <bug-gnu-utils@gnu.org>
* Makefile.in.in: Upgrade to gettext-0.10.39.

@ -0,0 +1,202 @@
#!/bin/sh
#
# setup-gettext - Provides compatibility with versions of gettext
# from the 0.10.x series and 0.11.x.
#
# Copyright (C) 2002 Christian Hammond.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation; either version 2 of
# the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public
# License along with this program; if not, write to the Free
# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA
#
VERSION=0.1.3
VERBOSE=0
parse_gettext_version() {
GETTEXT_VERSION=`$GETTEXT_TOOL --version | sed -n 's/^.*\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\).*$/\1.\2.\3/p'`
GETTEXT_MAJOR_VERSION=`echo $GETTEXT_VERSION | sed -n 's/^\([0-9]\+\).*/\1/p'`
GETTEXT_MINOR_VERSION=`echo $GETTEXT_VERSION | sed -n 's/^[0-9]\+\.\([0-9]\+\).*/\1/p'`
GETTEXT_MICRO_VERSION=`echo $GETTEXT_VERSION | sed -n 's/^[0-9]\+\.[0-9]\+\.\([0-9]\+\).*/\1/p'`
}
find_gettext() {
GETTEXT_TOOL=autopoint
(autopoint --version) < /dev/null > /dev/null 2>&1 || {
GETTEXT_TOOL=gettextize
(gettextize --version) < /dev/null > /dev/null 2>&1 || {
GETTEXT_TOOL=
}
}
}
install() {
[ -f configure.in ] && {
cp configure.in .tmp-configure.in
sed -e 's/^AM_GNU_GETTEXT\(.*\)$/AM_GNU_GETTEXT\1\
AM_GNU_GETTEXT_VERSION(0.10.40)/' < .tmp-configure.in > configure.in
rm .tmp-configure.in
}
[ -f configure.ac ] && {
cp configure.ac .tmp-configure.ac
sed -e 's/^AM_GNU_GETTEXT\(.*\)$/AM_GNU_GETTEXT\1\
AM_GNU_GETTEXT_VERSION(0.10.40)/' < .tmp-configure.ac > configure.ac
rm .tmp-configure.ac
}
[ -f autogen.sh ] && {
cp autogen.sh .tmp-autogen.sh
sed -e 's/\(gettextize\|autopoint\) --version/.\/setup-gettext --gettext-tool/1' -e 's/^\(echo.*|[\t ]*\)\?\(gettextize\|autopoint\) -.*$/.\/setup-gettext/1' < .tmp-autogen.sh > autogen.sh
rm .tmp-autogen.sh
}
echo 'AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])' >> acinclude.m4
}
backup_m4() {
[ -d m4 ] && mv m4 m4~
}
restore_m4() {
[ -d m4~ ] && {
rm -rf m4
mv m4~ m4
}
}
restore_files() {
[ -f configure.in~ ] && mv -f configure.in~ configure.in
[ -f configure.ac~ ] && mv -f configure.ac~ configure.ac
[ -f Makefile.am~ ] && mv -f Makefile.am~ Makefile.am
}
abort() {
restore_files
restore_m4
exit 1
}
# Main code
find_gettext
# See if a version of gettext and its tools are installed.
if [ x$GETTEXT_TOOL = x ]; then
echo
echo "You do not have a version of gettext installed."
echo "Please download one from your local package repository or"
echo "from ftp://ftp.gnu.org/pub/gnu/gettext/"
echo
exit 1
fi
parse_gettext_version
NUMVAR=$#
if [ $NUMVAR -gt 0 ]; then
if [ $NUMVAR -gt 1 ]; then
echo "Only one option at a time!"
exit 1
elif [ $1 = "--gettext-tool" ]; then
echo $GETTEXT_TOOL
exit 0
elif [ $1 = "--help" ]; then
echo "setup-gettext v$VERSION"
echo "Usage:"
echo " --gettext-tool Returns gettextize or autopoint, depending"
echo " on the version of gettext installed."
echo " --gettext-version Returns the version of gettext installed."
echo " --gettext-major-version Returns the major version of gettext installed."
echo " --gettext-minor-version Returns the minor version of gettext installed."
echo " --gettext-micro-version Returns the micro version of gettext installed."
echo " --help Displays this help screen."
echo
exit 0
elif [ $1 = "--version" ]; then
echo $VERSION
exit 0
elif [ $1 = "--gettext-version" ]; then
echo $GETTEXT_VERSION
exit 0
elif [ $1 = "--gettext-major-version" ]; then
echo $GETTEXT_MAJOR_VERSION
exit 0
elif [ $1 = "--gettext-minor-version" ]; then
echo $GETTEXT_MINOR_VERSION
exit 0
elif [ $1 = "--gettext-micro-version" ]; then
echo $GETTEXT_MICRO_VERSION
exit 0
elif [ $1 = "--install" ]; then
install
echo "setup-gettext installed."
exit 0
elif [ $1 = "--happy-url" ]; then
echo http://gaim.sf.net/forkgettext.jpg
exit 0
elif [ $1 = "--verbose" ]; then
VERBOSE=1
else
echo "Invalid option '$1'"
exit 1
fi
fi
# Okay, run the main stuff
if [ "$GETTEXT_TOOL" = "autopoint" ]; then
backup_m4
[ $VERBOSE -eq 1 ] && echo " autopoint --force"
echo n | autopoint --force || abort
restore_m4
else
if [ $GETTEXT_MINOR_VERSION -eq 11 ]; then
backup_m4
# Gettext is pure evil. It DEMANDS that we press Return no matter
# what. This gets rid of their happy "feature" of doom.
[ $VERBOSE -eq 1 ] && \
echo " gettextize --copy --force --intl --no-changelog"
sed 's:read .*< /dev/tty::' `which gettextize` > .temp-gettextize
chmod +x .temp-gettextize
echo n | ./.temp-gettextize --copy --force --intl --no-changelog || abort
rm .temp-gettextize
restore_files
restore_m4
[ -f po/Makevars.template ] && mv po/Makevars.template po/Makevars
else
[ $VERBOSE -eq 1 ] && echo " gettextize --copy --force"
echo n | gettextize --copy --force || exit;
fi
fi

@ -9,15 +9,18 @@ INCLUDES = \
-I$(top_srcdir)/intl \
@evas_cflags@ @edb_cflags@ @ebits_cflags@ @ecore_cflags@ @efsd_cflags@ @ebg_cflags@ $(DEBUGFLAGS)
bin_PROGRAMS = enlightenment
bin_PROGRAMS = enlightenment
enlightenment_SOURCES = \
actions.h actions.c \
block.c block.h \
border.h border.c \
bordermenu.h bordermenu.c \
menu.h menu.c \
menubuild.h menubuild.c \
config.h config.c \
cursors.c cursors.h \
data.c data.h \
debug.c debug.h \
delayed.h delayed.c \
desktops.h desktops.c \
@ -30,14 +33,12 @@ enlightenment_SOURCES = \
guides.h guides.c \
globals.h globals.c \
icccm.h icccm.c \
iconbar.h iconbar.c\
icons.h icons.c\
iconbar.h iconbar.c \
icons.h icons.c \
ipc.h ipc.c \
keys.h keys.c \
main.c \
match.c match.h \
menu.h menu.c \
menubuild.h menubuild.c \
object.h object.c \
observer.h observer.c\
pack.c \
@ -52,7 +53,7 @@ enlightenment_SOURCES = \
e_dir.h e_dir.c \
e_view_machine.h e_view_machine.c \
view_layout.h view_layout.c \
e_view_look.h e_view_look.c \
e_view_look.h e_view_look.c \
e.h
enlightenment_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ @efsd_libs@ @ebg_libs@ -lm $(INTLLIBS)

@ -6,21 +6,19 @@
#include "exec.h"
#include "icccm.h"
#include "keys.h"
#include "view.h"
#include "e_view_machine.h"
#include "util.h"
#include "guides.h"
#include "bordermenu.h"
#include "block.h"
static Evas_List action_impls = NULL;
static Evas_List current_actions = NULL;
static Evas_List current_timers = NULL;
static Evas_List * action_impls = NULL;
static Evas_List * current_actions = NULL;
static Evas_List * current_timers = NULL;
static void e_action_find(char *action, E_Action_Type act, int button,
char *key, Ecore_Event_Key_Modifiers mods,
E_Object * object);
static void e_action_cleanup(E_Action * a);
static void e_act_move_start(E_Object * object, E_Action * a,
void *data, int x, int y, int rx, int ry);
@ -91,14 +89,14 @@ static void e_act_exec_start(E_Object * object, E_Action * a,
static void e_act_menu_start(E_Object * object, E_Action * a,
void *data, int x, int y, int rx, int ry);
#if 0
static void e_act_exit_start(E_Object * object, E_Action * a,
void *data, int x, int y, int rx, int ry);
static void e_act_restart_start(E_Object * object, E_Action * a,
void *data, int x, int y, int rx,
int ry);
#endif
static void e_act_stick_start(E_Object * object, E_Action * a,
void *data, int x, int y, int rx, int ry);
@ -133,104 +131,16 @@ static void
e_action_find(char *action, E_Action_Type act, int button,
char *key, Ecore_Event_Key_Modifiers mods, E_Object * object)
{
char *actions_db;
E_DB_File *db;
int i, num;
char *a_name = NULL;
char *a_action = NULL;
char *a_params = NULL;
int a_event = 0;
int a_button = 0;
char *a_key = NULL;
int a_modifiers = 0;
Evas_List l;
Evas_List *l;
E_Action *a;
static Evas_List actions = NULL;
E_CFG_FILE(cfg_actions, "actions");
D_ENTER;
E_CONFIG_CHECK_VALIDITY(cfg_actions, "actions");
/* if we had a previous list - nuke it */
/* FIXME: this has potential to segfault if reference
* counting is actually used and those actions are
* referenced in more than one place --cK.
*/
if (actions)
{
for (l = actions; l; l = l->next)
{
a = l->data;
if (a)
e_action_cleanup(a);
}
actions = evas_list_free(actions);
}
/* now build the list again */
actions_db = e_config_get("actions");
db = e_db_open_read(actions_db);
if (!db)
D_RETURN;
if (!e_db_int_get(db, "/actions/count", &num))
goto error;
for (i = 0; i < num; i++)
{
char buf[PATH_MAX];
snprintf(buf, PATH_MAX, "/actions/%i/name", i);
a_name = e_db_str_get(db, buf);
snprintf(buf, PATH_MAX, "/actions/%i/action", i);
a_action = e_db_str_get(db, buf);
snprintf(buf, PATH_MAX, "/actions/%i/params", i);
a_params = e_db_str_get(db, buf);
snprintf(buf, PATH_MAX, "/actions/%i/event", i);
e_db_int_get(db, buf, &a_event);
snprintf(buf, PATH_MAX, "/actions/%i/button", i);
e_db_int_get(db, buf, &a_button);
snprintf(buf, PATH_MAX, "/actions/%i/key", i);
a_key = e_db_str_get(db, buf);
snprintf(buf, PATH_MAX, "/actions/%i/modifiers", i);
e_db_int_get(db, buf, &a_modifiers);
a = NEW(E_Action, 1);
ZERO(a, E_Action, 1);
e_object_init(E_OBJECT(a), (E_Cleanup_Func) e_action_cleanup);
a->name = a_name;
a->action = a_action;
a->params = a_params;
a->event = a_event;
a->button = a_button;
a->key = a_key;
a->modifiers = a_modifiers;
a->action_impl = NULL;
a->object = NULL;
a->started = 0;
actions = evas_list_append(actions, a);
/* it's a key? lets grab it! */
if ((a->key) && (strlen(a->key) > 0))
{
if (a->modifiers == -1)
e_keys_grab(a->key, ECORE_EVENT_KEY_MODIFIER_NONE, 1);
else
e_keys_grab(a->key, (Ecore_Event_Key_Modifiers) a->modifiers,
0);
a->grabbed = 1;
}
}
error:
e_db_close(db);
E_CONFIG_CHECK_VALIDITY_END;
/* run thru our actions list and match event, state and stuff with an */
/* and action for it */
for (l = actions; l; l = l->next)
for (l = config_data->actions; l; l = l->next)
{
Evas_List ll;
Evas_List * ll;
a = l->data;
if (act != a->event)
@ -288,7 +198,7 @@ e_action_find(char *action, E_Action_Type act, int button,
D_RETURN;
}
static void
void
e_action_cleanup(E_Action * a)
{
D_ENTER;
@ -335,7 +245,7 @@ e_action_start(char *action, E_Action_Type act, int button,
char *key, Ecore_Event_Key_Modifiers mods,
E_Object * object, void *data, int x, int y, int rx, int ry)
{
Evas_List l;
Evas_List * l;
int started_long_action = 0;
D_ENTER;
@ -375,7 +285,7 @@ e_action_stop(char *action, E_Action_Type act, int button,
char *key, Ecore_Event_Key_Modifiers mods, E_Object * object,
void *data, int x, int y, int rx, int ry)
{
Evas_List l;
Evas_List * l;
D_ENTER;
@ -435,7 +345,7 @@ e_action_cont(char *action, E_Action_Type act, int button, char *key,
Ecore_Event_Key_Modifiers mods, E_Object * object, void *data,
int x, int y, int rx, int ry, int dx, int dy)
{
Evas_List l;
Evas_List * l;
D_ENTER;
@ -461,7 +371,7 @@ void
e_action_stop_by_object(E_Object * object, void *data, int x, int y, int rx,
int ry)
{
Evas_List l;
Evas_List * l;
D_ENTER;
@ -493,7 +403,7 @@ e_action_stop_by_object(E_Object * object, void *data, int x, int y, int rx,
void
e_action_stop_by_type(char *action)
{
Evas_List l;
Evas_List * l;
D_ENTER;
@ -518,6 +428,7 @@ e_action_impl_cleanup(E_Action_Impl * eai)
{
D_ENTER;
IF_FREE(eai->action);
e_object_cleanup(E_OBJECT(eai));
D_RETURN;
@ -548,7 +459,7 @@ e_action_add_impl(char *action, E_Action_Start_Func func_start,
void
e_action_del_timer(E_Object * object, char *name)
{
Evas_List l;
Evas_List * l;
D_ENTER;
@ -592,7 +503,7 @@ e_action_add_timer(E_Object * object, char *name)
void
e_action_del_timer_object(E_Object * object)
{
Evas_List l;
Evas_List * l;
D_ENTER;
@ -677,23 +588,10 @@ e_act_move_start(E_Object * object, E_Action * a, void *data, int x, int y,
double align_y = 0.5;
E_Guides_Location display_loc = E_GUIDES_DISPLAY_LOCATION_WINDOW_MIDDLE;
E_CFG_INT(cfg_window_move_mode, "settings", "/window/move/mode",
E_GUIDES_BOX);
E_CFG_FLOAT(cfg_guides_display_x, "settings", "/guides/display/x", 0.5);
E_CFG_FLOAT(cfg_guides_display_y, "settings", "/guides/display/y", 0.5);
E_CFG_INT(cfg_guides_display_location, "settings",
"/guides/display/location",
E_GUIDES_DISPLAY_LOCATION_WINDOW_MIDDLE);
D_ENTER;
e_block_start("menus");
E_CONFIG_INT_GET(cfg_window_move_mode, move_mode);
E_CONFIG_FLOAT_GET(cfg_guides_display_x, align_x);
E_CONFIG_FLOAT_GET(cfg_guides_display_y, align_y);
E_CONFIG_INT_GET(cfg_guides_display_location, display_loc);
b = (E_Border *) object;
if (!b)
@ -705,6 +603,11 @@ e_act_move_start(E_Object * object, E_Action * a, void *data, int x, int y,
if (b->client.fixed)
D_RETURN;
move_mode = config_data->window->move_mode;
display_loc = config_data->guides->location;
align_x = config_data->guides->x;
align_y = config_data->guides->y;
if (move_mode >= E_GUIDES_BOX)
b->hold_changes = 1; /* if non opaque */
b->mode.move = 1;
@ -839,22 +742,10 @@ e_act_resize_start(E_Object * object, E_Action * a, void *data, int x, int y,
double align_y = 0.5;
E_Guides_Location display_loc = E_GUIDES_DISPLAY_LOCATION_WINDOW_MIDDLE;
E_CFG_INT(cfg_window_resize_mode, "settings", "/window/resize/mode",
E_GUIDES_BOX);
E_CFG_FLOAT(cfg_guides_display_x, "settings", "/guides/display/x", 0.5);
E_CFG_FLOAT(cfg_guides_display_y, "settings", "/guides/display/y", 0.5);
E_CFG_INT(cfg_guides_display_location, "settings",
"/guides/display/location",
E_GUIDES_DISPLAY_LOCATION_WINDOW_MIDDLE);
D_ENTER;
e_block_start("menus");
E_CONFIG_INT_GET(cfg_window_resize_mode, resize_mode);
E_CONFIG_FLOAT_GET(cfg_guides_display_x, align_x);
E_CONFIG_FLOAT_GET(cfg_guides_display_y, align_y);
E_CONFIG_INT_GET(cfg_guides_display_location, display_loc);
b = (E_Border *) object;
if (!b)
b = e_border_current_focused();
@ -866,6 +757,12 @@ e_act_resize_start(E_Object * object, E_Action * a, void *data, int x, int y,
D_RETURN;
if (b->current.shaded != 0)
D_RETURN;
resize_mode = config_data->window->resize_mode;
display_loc = config_data->guides->location;
align_x = config_data->guides->x;
align_y = config_data->guides->y;
if (resize_mode >= E_GUIDES_BOX)
b->hold_changes = 1; /* if non opaque */
ecore_window_gravity_set(b->win.client, StaticGravity);
@ -1043,22 +940,10 @@ e_act_resize_h_start(E_Object * object, E_Action * a, void *data, int x, int y,
double align_y = 0.5;
E_Guides_Location display_loc = E_GUIDES_DISPLAY_LOCATION_WINDOW_MIDDLE;
E_CFG_INT(cfg_window_resize_mode, "settings", "/window/resize/mode",
E_GUIDES_BOX);
E_CFG_FLOAT(cfg_guides_display_x, "settings", "/guides/display/x", 0.5);
E_CFG_FLOAT(cfg_guides_display_y, "settings", "/guides/display/y", 0.5);
E_CFG_INT(cfg_guides_display_location, "settings",
"/guides/display/location",
E_GUIDES_DISPLAY_LOCATION_WINDOW_MIDDLE);
D_ENTER;
e_block_start("menus");
E_CONFIG_INT_GET(cfg_window_resize_mode, resize_mode);
E_CONFIG_FLOAT_GET(cfg_guides_display_x, align_x);
E_CONFIG_FLOAT_GET(cfg_guides_display_y, align_y);
E_CONFIG_INT_GET(cfg_guides_display_location, display_loc);
b = (E_Border *) object;
if (!b)
b = e_border_current_focused();
@ -1068,6 +953,12 @@ e_act_resize_h_start(E_Object * object, E_Action * a, void *data, int x, int y,
D_RETURN;
if (b->current.shaded != 0)
D_RETURN;
resize_mode = config_data->window->resize_mode;
display_loc = config_data->guides->location;
align_x = config_data->guides->x;
align_y = config_data->guides->y;
if (resize_mode >= E_GUIDES_BOX)
b->hold_changes = 1; /* if non opaque */
ecore_window_gravity_set(b->win.client, StaticGravity);
@ -1205,22 +1096,10 @@ e_act_resize_v_start(E_Object * object, E_Action * a, void *data, int x, int y,
double align_y = 0.5;
E_Guides_Location display_loc = E_GUIDES_DISPLAY_LOCATION_WINDOW_MIDDLE;
E_CFG_INT(cfg_window_resize_mode, "settings", "/window/resize/mode",
E_GUIDES_BOX);
E_CFG_FLOAT(cfg_guides_display_x, "settings", "/guides/display/x", 0.5);
E_CFG_FLOAT(cfg_guides_display_y, "settings", "/guides/display/y", 0.5);
E_CFG_INT(cfg_guides_display_location, "settings",
"/guides/display/location",
E_GUIDES_DISPLAY_LOCATION_WINDOW_MIDDLE);
D_ENTER;
e_block_start("menus");
E_CONFIG_INT_GET(cfg_window_resize_mode, resize_mode);
E_CONFIG_FLOAT_GET(cfg_guides_display_x, align_x);
E_CONFIG_FLOAT_GET(cfg_guides_display_y, align_y);
E_CONFIG_INT_GET(cfg_guides_display_location, display_loc);
b = (E_Border *) object;
if (!b)
b = e_border_current_focused();
@ -1230,6 +1109,12 @@ e_act_resize_v_start(E_Object * object, E_Action * a, void *data, int x, int y,
D_RETURN;
if (b->current.shaded != 0)
D_RETURN;
resize_mode = config_data->window->resize_mode;
display_loc = config_data->guides->location;
align_x = config_data->guides->x;
align_y = config_data->guides->y;
if (resize_mode >= E_GUIDES_BOX)
b->hold_changes = 1; /* if non opaque */
ecore_window_gravity_set(b->win.client, StaticGravity);
@ -1667,7 +1552,7 @@ e_act_menu_start(E_Object * object, E_Action * a, void *data, int x, int y,
UN(ry);
}
static void
void
e_act_exit_start(E_Object * object, E_Action * a, void *data, int x, int y,
int rx, int ry)
{
@ -1692,7 +1577,7 @@ e_act_exit_start(E_Object * object, E_Action * a, void *data, int x, int y,
UN(ry);
}
static void
void
e_act_restart_start(E_Object * object, E_Action * a, void *data, int x, int y,
int rx, int ry)
{
@ -1967,9 +1852,13 @@ static void
e_act_raise_next_start(E_Object * object, E_Action * a, void *data, int x,
int y, int rx, int ry)
{
E_Border *current = NULL;
D_ENTER;
e_border_raise_next();
current = e_desktop_raise_next_border();
if (current)
e_border_send_pointer(current);
D_RETURN;
UN(object);

@ -73,6 +73,7 @@ struct _E_Action_Impl
* i.e. the way E performs actions.
*/
void e_action_init(void);
void e_action_cleanup(E_Action *a);
int e_action_start(char *action, E_Action_Type act, int button,
char *key, Ecore_Event_Key_Modifiers mods,
@ -97,4 +98,10 @@ void e_action_del_timer(E_Object * object, char *name);
void e_action_add_timer(E_Object * object, char *name);
void e_action_del_timer_object(E_Object * object);
void e_act_exit_start(E_Object * object, E_Action * a, void *data, int x, int y,
int rx, int ry);
void e_act_restart_start(E_Object * object, E_Action * a, void *data, int x, int y,
int rx, int ry);
#endif

@ -6,7 +6,7 @@
static void
e_background_cleanup(E_Background * bg)
{
Evas_List l;
Evas_List * l;
D_ENTER;
@ -22,7 +22,7 @@ e_background_cleanup(E_Background * bg)
if (bl->file)
FREE(bl->file);
if (bl->obj)
evas_del_object(bg->evas, bl->obj);
evas_object_del(bl->obj);
FREE(bl);
}
evas_list_free(bg->layers);
@ -30,7 +30,7 @@ e_background_cleanup(E_Background * bg)
if (bg->file)
FREE(bg->file);
if (bg->base_obj)
evas_del_object(bg->evas, bg->base_obj);
evas_object_del(bg->base_obj);
e_object_cleanup(E_OBJECT(bg));
@ -149,9 +149,9 @@ e_background_load(char *file)
}
void
e_background_realize(E_Background * bg, Evas evas)
e_background_realize(E_Background * bg, Evas * evas)
{
Evas_List l;
Evas_List * l;
int ww, hh, count;
D_ENTER;
@ -168,9 +168,10 @@ e_background_realize(E_Background * bg, Evas evas)
bl = l->data;
if (bl->type == E_BACKGROUND_TYPE_IMAGE)
{
bl->obj = evas_add_image_from_file(bg->evas, bl->file);
evas_set_layer(bg->evas, bl->obj, 0);
evas_show(bg->evas, bl->obj);
bl->obj = evas_object_image_add(bg->evas);
evas_object_image_file_set(bl->obj, bl->file, NULL);
evas_object_layer_set(bl->obj, 0);
evas_object_show(bl->obj);
#if 0 /* dont need this... do we? */
if (evas_get_image_alpha(bg->evas, bl->obj))
{
@ -203,7 +204,7 @@ e_background_realize(E_Background * bg, Evas evas)
void
e_background_set_scroll(E_Background * bg, int sx, int sy)
{
Evas_List l;
Evas_List * l;
D_ENTER;
@ -220,7 +221,7 @@ e_background_set_scroll(E_Background * bg, int sx, int sy)
bl = l->data;
if (bl->type == E_BACKGROUND_TYPE_IMAGE)
{
evas_set_image_fill(bg->evas, bl->obj,
evas_object_image_fill_set(bl->obj,
(double)bg->geom.sx * bl->scroll.x,
(double)bg->geom.sy * bl->scroll.y,
bl->fw, bl->fh);
@ -232,7 +233,7 @@ e_background_set_scroll(E_Background * bg, int sx, int sy)
void
e_background_set_size(E_Background * bg, int w, int h)
{
Evas_List l;
Evas_List * l;
D_ENTER;
@ -250,7 +251,7 @@ e_background_set_size(E_Background * bg, int w, int h)
iw = 0;
ih = 0;
if (bg->evas)
evas_get_image_size(bg->evas, bl->obj, &iw, &ih);
evas_object_image_size_get(bl->obj, &iw, &ih);
w = bl->size.w * (double)bg->geom.w;
h = bl->size.h * (double)bg->geom.h;
if (bl->size.orig.w)
@ -277,18 +278,18 @@ e_background_set_size(E_Background * bg, int w, int h)
bl->fh = fh;
if (bg->evas)
{
evas_move(bg->evas, bl->obj, bl->x, bl->y);
evas_resize(bg->evas, bl->obj, bl->w, bl->h);
evas_object_move(bl->obj, bl->x, bl->y);
evas_object_resize(bl->obj, bl->w, bl->h);
if (bl->type == E_BACKGROUND_TYPE_IMAGE)
{
evas_set_image_fill(bg->evas, bl->obj,
evas_object_image_fill_set(bl->obj,
(double)bg->geom.sx * bl->scroll.x,
(double)bg->geom.sy * bl->scroll.y,
bl->fw, bl->fh);
}
else if (bl->type == E_BACKGROUND_TYPE_GRADIENT)
{
evas_set_angle(bg->evas, bl->obj, bl->angle);
evas_object_angle_set(bl->obj, bl->angle);
}
else if (bl->type == E_BACKGROUND_TYPE_SOLID)
{
@ -302,7 +303,7 @@ void
e_background_set_color_class(E_Background * bg, char *cc, int r, int g, int b,
int a)
{
Evas_List l;
Evas_List * l;
D_ENTER;
@ -316,9 +317,9 @@ e_background_set_color_class(E_Background * bg, char *cc, int r, int g, int b,
if (bg->evas)
{
if ((l == bg->layers) && (bg->base_obj))
evas_set_color(bg->evas, bl->obj, r, g, b, 255);
evas_object_color_set(bl->obj, r, g, b, 255);
else
evas_set_color(bg->evas, bl->obj, r, g, b, a);
evas_object_color_set(bl->obj, r, g, b, a);
}
}
}

@ -18,7 +18,7 @@ struct _E_Background
{
E_Object o;
Evas evas;
Evas * evas;
char *file;
struct
@ -28,9 +28,9 @@ struct _E_Background
}
geom;
Evas_List layers;
Evas_List * layers;
Evas_Object base_obj;
Evas_Object * base_obj;
};
struct _E_Background_Layer
@ -68,13 +68,13 @@ struct _E_Background_Layer
double x, y, w, h, fw, fh;
Evas_Object obj;
Evas_Object * obj;
};
E_Background *e_background_new(void);
E_Background *e_background_load(char *file);
void e_background_realize(E_Background * bg, Evas evas);
void e_background_realize(E_Background * bg, Evas * evas);
void e_background_set_scroll(E_Background * bg, int sx, int sy);
void e_background_set_size(E_Background * bg, int w, int h);
void e_background_set_color_class(E_Background * bg, char *cc,

@ -10,14 +10,14 @@ struct _e_block
int refs;
};
static Evas_List blocks = NULL;
static Evas_List * blocks = NULL;
static E_Block *e_block_find(char *name);
static E_Block *
e_block_find(char *name)
{
Evas_List l;
Evas_List * l;
D_ENTER;
for (l = blocks; l; l = l->next)

File diff suppressed because it is too large Load Diff

@ -36,18 +36,17 @@ struct _E_Border
Window client;
}
win;
Evas evas;
Evas *evas;
struct
{
E_Text *title;
Evas_Object title_clip;
Evas_Object *title_clip;
}
obj;
Pixmap pixmap;
Evas_List *windows;
struct
{
int new;
char *file;
Ebits_Object b;
}
bits;
@ -198,7 +197,6 @@ struct _E_Border
int shape_changed;
int placed;
Evas_List grabs;
E_Grab *click_grab;
E_Desktop *desk;
@ -209,8 +207,6 @@ struct _E_Border
int hold_changes;
Evas_List menus;
int changed;
};
@ -225,6 +221,9 @@ void e_border_init(void);
E_Border *e_border_new(void);
void e_border_update_borders(void);
void e_border_redraw_region(E_Border *b, int x, int y,
int w, int h);
void e_border_update_render(E_Border * b);
void e_border_apply_border(E_Border * b);
void e_border_reshape(E_Border * b);
void e_border_release(E_Border * b);
@ -251,11 +250,12 @@ void e_border_raise_above(E_Border * b, E_Border * above);
void e_border_lower_below(E_Border * b, E_Border * below);
E_Border *e_border_current_focused(void);
void e_border_focus_grab_ended(void);
void e_border_raise_next(void);
void e_border_send_pointer(E_Border * b);
int e_border_viewable(E_Border * b);
void e_border_print_pos(char *buf, E_Border * b);
void e_border_print_size(char *buf, E_Border * b);
void e_border_set_gravity(E_Border * b, int gravity);
Evas_List e_border_get_borders_list();
Evas_List *e_border_get_borders_list();
void e_borders_scroll_list(Evas_List *borders,
int dx, int dy);
#endif

@ -6,6 +6,8 @@
#include "icccm.h"
#include "bordermenu.h"
static E_Menu *bordermenu = NULL;
static void e_bordermenu_cb_close(E_Menu * m, E_Menu_Item * mi,
void *data);
static void e_bordermenu_cb_kill(E_Menu * m, E_Menu_Item * mi,
@ -37,7 +39,8 @@ static void e_bordermenu_cb_remember_prog_location_ignore(E_Menu * m,
E_Menu_Item *
mi,
void *data);
static void e_bordermenu_cb_menu_hide(E_Menu * m, void *data);
static void e_bordermenu_cb_to_desktop(E_Menu * m, E_Menu_Item * mi,
void *data);
static void
e_bordermenu_cb_close(E_Menu * m, E_Menu_Item * mi, void *data)
@ -331,20 +334,32 @@ e_bordermenu_cb_remember_prog_location_ignore(E_Menu * m, E_Menu_Item * mi,
}
static void
e_bordermenu_cb_menu_hide(E_Menu * m, void *data)
e_bordermenu_cb_to_desktop(E_Menu * m, E_Menu_Item * mi, void *data)
{
int d = 0;
E_Border *b;
E_Desktop *desk;
D_ENTER;
b = data;
if (b->client.sticky)
D_RETURN;
while (b->menus)
{
m = b->menus->data;
m->delete_me = 1;
b->menus = evas_list_remove(b->menus, m);
}
e_desktops_del_border(b->desk, b);
sscanf(mi->str, "Desktop %d", &d);
desk = e_desktops_get(d);
if (!desk)
desk = e_desktops_get(e_desktops_get_current());
D("Sending border %p to desk %d\n", b, d);
e_desktops_add_border(desk, b);
b->client.desk = d;
b->current.requested.visible = 0;
b->changed = 1;
e_border_update_borders();
D_RETURN;
UN(m);
@ -353,18 +368,19 @@ e_bordermenu_cb_menu_hide(E_Menu * m, void *data)
void
e_bordermenu_do(E_Border * b)
{
int i;
char label[PATH_MAX];
E_Menu *menu;
E_Menu *menu2;
E_Menu_Item *menuitem;
D_ENTER;
if (!b->menus)
if (!bordermenu)
{
menu = e_menu_new();
b->menus = evas_list_append(b->menus, menu);
e_menu_set_padding_icon(menu, 2);
e_menu_set_padding_state(menu, 2);
e_menu_hide_callback(menu, e_bordermenu_cb_menu_hide, b);
menuitem = e_menu_item_new("Close");
/* e_menu_item_set_icon(menuitem, icon); */
@ -451,6 +467,24 @@ e_bordermenu_do(E_Border * b)
b);
e_menu_add_item(menu, menuitem);
e_menu_set_state(menu, menuitem);
menu2 = e_menu_new();
e_menu_set_padding_icon(menu2, 2);
e_menu_set_padding_state(menu2, 2);
for (i = 0; i < e_desktops_get_num(); i++)
{
snprintf(label, PATH_MAX, "Desktop %d", i);
menuitem = e_menu_item_new(label);
e_menu_item_set_callback(menuitem, e_bordermenu_cb_to_desktop, b);
e_menu_add_item(menu2, menuitem);
}
menuitem = e_menu_item_new("Goto Desktop...");
e_menu_item_set_submenu(menuitem, menu2);
e_menu_add_item(menu, menuitem);
bordermenu = menu;
}
{
@ -458,7 +492,7 @@ e_bordermenu_do(E_Border * b)
int crx, cry, crw, crh;
int mx, my;
menu = b->menus->data;
menu = bordermenu;
pl = pr = pt = pb = 0;
if (b->bits.b)
ebits_get_insets(b->bits.b, &pl, &pr, &pt, &pb);
@ -480,3 +514,10 @@ e_bordermenu_do(E_Border * b)