[RFC PATCH 10/12] tablet-shell: update config file

juan.j.zhao at linux.intel.com juan.j.zhao at linux.intel.com
Fri Aug 3 04:22:30 PDT 2012


From: Juan Zhao <juan.j.zhao at linux.intel.com>

Signed-off-by: Juan Zhao <juan.j.zhao at linux.intel.com>
---
 clients/tablet-shell.c |  4 +--
 src/compositor.c       |  6 +++-
 weston-tablet.ini      | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 90 insertions(+), 3 deletions(-)
 create mode 100644 weston-tablet.ini

diff --git a/clients/tablet-shell.c b/clients/tablet-shell.c
index c2ac525..d3d1738 100644
--- a/clients/tablet-shell.c
+++ b/clients/tablet-shell.c
@@ -471,7 +471,7 @@ launcher_motion_handler(struct widget *widget, struct input *input,
 
 static int
 layout_delete_launcher(struct launcher *launcher) {
-	char *config_file = config_file_path("weston.ini");
+	char *config_file = config_file_path("weston-tablet.ini");
 	FILE *fp;
 	char line[512];
 	uint32_t found_pos = 0;
@@ -1180,7 +1180,7 @@ int main(int argc, char *argv[])
 			window_get_wl_surface(tablet.homescreen->window));
 	wl_list_init(&tablet.homescreen->layout_list);
 
-	config_file = config_file_path("weston.ini");
+	config_file = config_file_path("weston-tablet.ini");
 	parse_config_file(config_file,
 			  config_sections, ARRAY_LENGTH(config_sections),
 			  &tablet);
diff --git a/src/compositor.c b/src/compositor.c
index 2d03a14..ae06124 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -3504,7 +3504,11 @@ int main(int argc, char *argv[])
 			backend = "drm-backend.so";
 	}
 
-	config_file = config_file_path("weston.ini");
+	if (getenv("TABLET_SHELL"))
+		config_file = config_file_path("weston-tablet.ini");
+	else
+		config_file = config_file_path("weston.ini");
+
 	parse_config_file(config_file, cs, ARRAY_LENGTH(cs), shell);
 	if (socket_name)
 		setenv("WAYLAND_DISPLAY", socket_name, 1);
diff --git a/weston-tablet.ini b/weston-tablet.ini
new file mode 100644
index 0000000..2ef5ab6
--- /dev/null
+++ b/weston-tablet.ini
@@ -0,0 +1,83 @@
+[shell]
+#type=desktop-shell.so
+#background-image=/usr/share/backgrounds/gnome/Aqua.jpg
+#background-color=0xff002244
+###panel-color=0x90ff0000
+#panel-color=0x90000000
+#locking=true
+#animation=zoom
+#trash-image=/home/worksda8/install/share/weston/trash.png
+
+type=tablet-shell.so
+lockscreen-icon=/usr/share/icons/gnome/256x256/actions/lock.png
+lockscreen=/usr/share/backgrounds/gnome/Garden.jpg
+homescreen=/usr/share/backgrounds/gnome/Aqua.jpg
+animation=zoom
+trash-image=/home/worksda8/install/share/weston/trash.png
+[layout]
+
+[launcher]
+icon=/opt/apps/org.tizen.indicator/res/icons/Home/B03_Home.png
+path=
+
+[launcher]
+icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png
+path=/home/worksda8/install/bin/weston-terminal
+
+[launcher]
+icon=/opt/apps/org.tizen.browser/res/icons/default/small/org.tizen.browser.png
+path=/home/worksda8/install/bin/elementary_test
+
+[launcher]
+icon=/opt/apps/org.tizen.calculator/res/icons/default/small/org.tizen.calculator.png
+path=
+
+[launcher]
+icon=/opt/apps/org.tizen.clock/res/icons/default/small/org.tizen.clock.png
+path=/home/worksda8/svn/trunk/elementary/src/examples/clock_example
+
+
+#=======================================================================================
+[launcher]
+icon=/opt/apps/org.tizen.efl-calendar/res/icons/default/small/org.tizen.efl-calendar.png
+path=/home/worksda8/svn/trunk/elementary/src/examples/calendar_example_01
+
+[launcher]
+icon=/opt/apps/org.tizen.gallery/res/icons/default/small/org.tizen.gallery.png
+path=
+
+[launcher]
+icon=/opt/apps/org.tizen.memo/res/icons/default/small/org.tizen.memo.png
+path=
+
+[launcher]
+icon=/opt/apps/org.tizen.setting/res/icons/default/small/org.tizen.setting.png
+path=/home/worksda8/install/bin/elementary_config
+
+[layout]
+[launcher]
+icon=/opt/apps/org.tizen.message/res/icons/default/small/org.tizen.message.png
+path=
+
+#=======================================================================================
+[launcher]
+icon=/opt/apps/org.tizen.music-player/res/icons/default/small/org.tizen.music-player.png
+path=
+
+[launcher]
+icon=/opt/apps/org.tizen.phone/res/icons/default/small/org.tizen.phone.png
+path=
+
+
+[launcher]
+icon=/opt/apps/org.tizen.smartsearch/res/icons/default/small/org.tizen.smartsearch.png
+path=
+
+[launcher]
+icon=/opt/apps/org.tizen.contacts/res/icons/default/small/org.tizen.contacts.png
+path=
+
+[screensaver]
+#path=./clients/wscreensaver
+duration=600
+#binding-modifier=ctrl
-- 
1.7.11



More information about the wayland-devel mailing list