From e9cba11f174c3e3cd0baf887f2ac09d20da5b457 Mon Sep 17 00:00:00 2001 From: "jk7744.park" Date: Tue, 8 Sep 2015 22:17:59 +0900 Subject: [PATCH] tizen 2.3.1 release --- CMakeLists.txt | 6 +- data/mobile/syspopup_db.sql | 58 ++++ data/syspopup_db.sql | 49 --- data/wearable/syspopup_db.sql | 27 ++ debian/changelog | 583 ---------------------------------- debian/compat | 1 - debian/control | 43 --- debian/dirs | 2 - debian/docs | 0 debian/rules | 122 ------- debian/syspopup-0.install.in | 4 - debian/syspopup-0.postinst | 17 - debian/syspopup-caller-0.install.in | 1 - debian/syspopup-caller-0.postinst | 8 - debian/syspopup-caller-dev.install.in | 2 - debian/syspopup-dev.install.in | 3 - image/README | 1 - image/syspopup_diag.png | Bin 0 -> 12337 bytes include/SLP_SYSPOPUP_PG.h | 49 +-- include/simple_util.h | 5 +- include/syspopup.h | 18 +- include/syspopup_caller.h | 1 - include/syspopup_core.h | 1 - include/syspopup_db.h | 1 - org.tizen.syspopup-app.manifest | 12 + org.tizen.syspopup-app.rule | 17 + packaging/syspopup.spec | 183 +++++++++-- src/syspopup_core.c | 9 +- src/syspopup_db.c | 171 ++-------- syspopup-app/CMakeLists.txt | 7 +- syspopup-app/syspopup-app.c | 360 +++++++++------------ syspopup-app/syspopup-app.h | 24 +- syspopup-caller.manifest | 5 + syspopup.manifest | 17 + syspopup/syspopup.c | 124 ++++++-- syspopup/syspopup_efl.c | 29 +- test/CMakeLists.txt | 2 +- test/test.c | 8 +- 38 files changed, 646 insertions(+), 1324 deletions(-) create mode 100755 data/mobile/syspopup_db.sql delete mode 100755 data/syspopup_db.sql create mode 100755 data/wearable/syspopup_db.sql delete mode 100755 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/dirs delete mode 100644 debian/docs delete mode 100755 debian/rules delete mode 100644 debian/syspopup-0.install.in delete mode 100644 debian/syspopup-0.postinst delete mode 100644 debian/syspopup-caller-0.install.in delete mode 100644 debian/syspopup-caller-0.postinst delete mode 100644 debian/syspopup-caller-dev.install.in delete mode 100644 debian/syspopup-dev.install.in delete mode 100644 image/README create mode 100755 image/syspopup_diag.png create mode 100644 org.tizen.syspopup-app.manifest create mode 100755 org.tizen.syspopup-app.rule create mode 100755 syspopup-caller.manifest create mode 100755 syspopup.manifest diff --git a/CMakeLists.txt b/CMakeLists.txt index b67f39c..9bbf853 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,11 @@ add_library(syspopup_mods STATIC ) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/SLP_SYSPOPUP_PG.h DESTINATION include) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/syspopup_db.sql DESTINATION /usr/share/syspopup/) +IF(_WEARABLE) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/wearable/syspopup_db.sql DESTINATION /usr/share/syspopup/) +ELSE(_WEARABLE) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/mobile/syspopup_db.sql DESTINATION /usr/share/syspopup/) +ENDIF(_WEARABLE) add_subdirectory(syspopup) add_subdirectory(syspopup-caller) diff --git a/data/mobile/syspopup_db.sql b/data/mobile/syspopup_db.sql new file mode 100755 index 0000000..f4623ca --- /dev/null +++ b/data/mobile/syspopup_db.sql @@ -0,0 +1,58 @@ +PRAGMA journal_mode = PERSIST; + +/* prio : 0~2 (0:low, 2:high) */ +/* focus : 0~1 (0:focus, 1:unfocus) */ +/* timeout : -1 ~ integer value (-1:infinite, 0:don't use) */ +/* term_act : 0~2(0:TERM, 1:HIDE, 2:IGNORE) */ +/* endkey_act : 0~2(0:TERM, 1:HIDE, 2:IGNORE) */ +CREATE TABLE IF NOT EXISTS syspopup_info ( + id INTEGER PRIMARY KEY, + name TEXT UNIQUE NOT NULL, + prio INTEGER, + focus INTEGER, + timeout INTEGER, + term_act INTEGER, + endkey_act INTEGER, + pkgname TEXT +); + +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"syspopup-app", 2,1,5,0,0,"org.tizen.syspopup-app"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"volume", 1,1,-1,1,1,"org.tizen.volume"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"bt-syspopup", 0,0,-1,0,0,"org.tizen.bt-syspopup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"wifi-qs", 0,0,-1,0,2,"net.wifi-qs"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"poweroff-syspopup", 2,0,-1,0,0,"org.tizen.poweroff-syspopup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"lowmem-syspopup", 0,0,5,0,0,"org.tizen.lowmem-syspopup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"lowbat-syspopup", 1,0,5,0,0,"org.tizen.lowbat-syspopup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"net-popup", 0,0,-1,0,0,"net.netpopup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"usb-syspopup", 1,0,-1,2,2,"org.tizen.usb-syspopup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"usbotg-syspopup", 0,1,-1,0,0,"org.tizen.usbotg-syspopup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"mmc-syspopup", 0,0,-1,0,0,"org.tizen.mmc-syspopup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"mobileap-syspopup", 0,0,-1,0,0,"org.tizen.mobileap-syspopup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"telephony-syspopup", 1,1,5,0,0,"org.tizen.telephony-syspopup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"system-syspopup", 2,0,-1,0,0,"org.tizen.system-syspopup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"safetyvolume-syspopup", 1,0,-1,0,0,"org.tizen.safetyvolume-syspopup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"datausage-syspopup", 1,0,-1,0,0,"org.tizen.datausage-syspopup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"crash-popup", 1,0,-1,0,0,"org.tizen.crash-popup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"gps-syspopup", 0,0,-1,0,0,"org.tizen.gps-syspopup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"mode-syspopup", 1,0,-1,0,0,"org.tizen.mode-syspopup"); +/* +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"drm", 0,0,5,0,0,"com.samsung.drm-popup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"incoming_call", 2,0,-1,2,2,"com.samsung.incoming_call"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"phone_lock", 2,0,-1,2,2,"com.samsung.screen_lock"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"screen_lock", 1,0,-1,0,2,"com.samsung.screen_lock"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"alarm", 1,0,-1,0,2,"com.samsung.alarm"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"timer", 1,0,5,0,2,"com.samsung.timer"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"schedule_alarm", 1,0,-1,0,2,"com.samsung.schedule_alarm"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"change_select_network", 0,0,-1,0,0,"com.samsung.change_select_network"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"privacy_lock", 0,0,-1,0,2,"com.samsung.privacy_lock"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"active_sync_policy", 0,0,-1,0,0,"com.samsung.active_sync_policy"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"memory_full", 0,1,5,0,0,"com.samsung.memory_full"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"charger_conn", 0,1,5,0,0,"com.samsung.charger_conn"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"sim_extraction", 0,1,5,0,0,"com.samsung.sim_extraction"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"time_zone_update", 0,1,5,0,0,"com.samsung.time_zone_update"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"dnet-popup", 0,0,5,0,0,"com.samsung.dnet-popup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"nfc-syspopup", 0,1,3,0,0,"com.samsung.nfc-sys-popup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"push-syspopup", 2,0,5,0,0,"com.samsung.push-syspopup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"hdmi-syspopup", 0,1,-1,0,0,"com.samsung.hdmi-syspopup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"tickernoti-syspopup", 1,1,-1,2,2,"com.samsung.tickernoti-syspopup"); +*/ diff --git a/data/syspopup_db.sql b/data/syspopup_db.sql deleted file mode 100755 index edf5c2b..0000000 --- a/data/syspopup_db.sql +++ /dev/null @@ -1,49 +0,0 @@ -PRAGMA journal_mode = PERSIST; - -/* prio : 0~2 (0:low, 2:high) */ -/* focus : 0~1 (0:focus, 1:unfocus) */ -/* timeout : -1 ~ integer value (-1:infinite, 0:don't use) */ -/* term_act : 0~2(0:TERM, 1:HIDE, 2:IGNORE) */ -/* endkey_act : 0~2(0:TERM, 1:HIDE, 2:IGNORE) */ -CREATE TABLE IF NOT EXISTS syspopup_info ( - id INTEGER PRIMARY KEY, - name TEXT UNIQUE NOT NULL, - prio INTEGER, - focus INTEGER, - timeout INTEGER, - term_act INTEGER, - endkey_act INTEGER, - pkgname TEXT -); - -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"syspopup-app", 2,1,5,0,0,"org.tizen.syspopup-app"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"incoming_call", 2,0,-1,2,2,"org.tizen.incoming_call"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"phone_lock", 2,0,-1,2,2,"org.tizen.screen_lock"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"screen_lock", 1,0,-1,0,2,"org.tizen.screen_lock"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"volume", 1,1,-1,1,1,"org.tizen.volume"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"alarm", 1,0,-1,0,2,"org.tizen.alarm"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"timer", 1,0,5,0,2,"org.tizen.timer"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"schedule_alarm", 1,0,-1,0,2,"org.tizen.schedule_alarm"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"bt-syspopup", 0,0,-1,0,0,"org.tizen.bt-syspopup"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"change_select_network", 0,0,-1,0,0,"org.tizen.change_select_network"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"wifi-qs", 0,0,-1,0,0,"net.wifi-qs"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"privacy_lock", 0,0,-1,0,2,"org.tizen.privacy_lock"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"poweroff-syspopup", 1,1,-1,0,0,"org.tizen.poweroff-syspopup"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"drm", 0,0,5,0,0,"org.tizen.drm-popup"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"active_sync_policy", 0,0,-1,0,0,"org.tizen.active_sync_policy"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"memory_full", 0,1,5,0,0,"org.tizen.memory_full"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"lowmem-syspopup", 1,1,5,0,0,"org.tizen.lowmem-syspopup"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"lowbat-syspopup", 1,1,5,0,0,"org.tizen.lowbat-syspopup"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"charger_conn", 0,1,5,0,0,"org.tizen.charger_conn"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"sim_extraction", 0,1,5,0,0,"org.tizen.sim_extraction"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"time_zone_update", 0,1,5,0,0,"org.tizen.time_zone_update"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"dnet-popup", 0,0,5,0,0,"org.tizen.dnet-popup"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"nfc-syspopup", 0,1,3,0,0,"org.tizen.nfc-sys-popup"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"push-syspopup", 2,0,5,0,0,"org.tizen.push-syspopup"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"net-popup", 0,0,-1,0,0,"net.netpopup"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"usb-syspopup", 1,1,-1,2,2,"org.tizen.usb-syspopup"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"ims-syspopup", 1,1,-1,2,2,"org.tizen.ims-syspopup"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"mdm-syspopup", 1,1,5,0,0,"org.tizen.mdm-syspopup"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"tickernoti-syspopup", 1,1,-1,2,2,"org.tizen.tickernoti-syspopup"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"usbotg-syspopup", 0,1,5,0,0,"org.tizen.usbotg-syspopup"); -INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"allshare-popup", 0,0,-1,0,0,"org.tizen.allshare-popup"); diff --git a/data/wearable/syspopup_db.sql b/data/wearable/syspopup_db.sql new file mode 100755 index 0000000..99128ee --- /dev/null +++ b/data/wearable/syspopup_db.sql @@ -0,0 +1,27 @@ +PRAGMA journal_mode = PERSIST; + +/* prio : 0~2 (0:low, 2:high) */ +/* focus : 0~1 (0:focus, 1:unfocus) */ +/* timeout : -1 ~ integer value (-1:infinite, 0:don't use) */ +/* term_act : 0~2(0:TERM, 1:HIDE, 2:IGNORE) */ +/* endkey_act : 0~2(0:TERM, 1:HIDE, 2:IGNORE) */ +CREATE TABLE IF NOT EXISTS syspopup_info ( + id INTEGER PRIMARY KEY, + name TEXT UNIQUE NOT NULL, + prio INTEGER, + focus INTEGER, + timeout INTEGER, + term_act INTEGER, + endkey_act INTEGER, + pkgname TEXT +); + +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"volume", 1,1,-1,1,1,"org.tizen.windicator"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"poweroff-syspopup", 2,0,-1,0,0,"org.tizen.poweroff-syspopup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"lowmem-syspopup", 0,0,5,0,0,"org.tizen.lowmem-syspopup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"lowbat-syspopup", 1,0,5,0,0,"org.tizen.lowbat-syspopup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"system-syspopup", 2,0,-1,0,0,"org.tizen.system-syspopup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"safetyvolume-syspopup", 2,1,-1,0,0,"org.tizen.safetyvolume-syspopup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"crash-popup", 1,0,-1,0,0,"org.tizen.crash-popup"); +INSERT OR REPLACE INTO "syspopup_info" VALUES(NULL,"wc-syspopup", 0,0,-1,0,0,"net.wc-syspopup"); + diff --git a/debian/changelog b/debian/changelog deleted file mode 100755 index dcea1d7..0000000 --- a/debian/changelog +++ /dev/null @@ -1,583 +0,0 @@ -syspopup (0.0.75) unstable; urgency=low - - * Added OTG syspopup info - * Git: slp/pkgs/s/syspopup - * Tag: syspopup_0.0.75 - - -- Sewook Park Mon, 21 May 2012 21:07:17 +0900 - -syspopup (0.0.74) unstable; urgency=low - - * Fixed compile warnings - * Git: slp/pkgs/s/syspopup - * Tag: syspopup_0.0.74 - - -- Jaeho Lee Tue, 20 Mar 2012 14:45:42 +0900 - -syspopup (0.0.73) unstable; urgency=low - - * Changed network syspopup name, Fixed desktop field - * Git: slp/pkgs/s/syspopup - * Tag: syspopup_0.0.73 - - -- Sewook Park Thu, 15 Mar 2012 16:07:54 +0900 - -syspopup (0.0.72) unstable; urgency=low - - * Added ticker popup info - * Git: slp/pkgs/s/syspopup - * Tag: syspopup_0.0.72 - - -- Sewook Park Wed, 14 Mar 2012 16:22:20 +0900 - -syspopup (0.0.71) unstable; urgency=low - - * API Changes in elementary - * Git: slp/pkgs/s/syspopup - * Tag: syspopup_0.0.71 - - -- Jaeho Lee Tue, 13 Mar 2012 17:59:18 +0900 - -syspopup (0.0.70) unstable; urgency=low - - * Fixed to use dbus instead of heynoti - * Git: slp/pkgs/s/syspopup - * Tag: syspopup_0.0.70 - - -- Sewook Park Wed, 22 Feb 2012 10:41:10 +0900 - -syspopup (0.0.69) unstable; urgency=low - - * Added ims-syspopup info - * Git: slp/pkgs/s/syspopup - * Tag: syspopup_0.0.69 - - -- Sewook Park Wed, 15 Feb 2012 16:25:22 +0900 - -syspopup (0.0.68) unstable; urgency=low - - * remove quickpanel dependency - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.68 - - -- Jaeho Lee Fri, 16 Dec 2011 09:51:11 +0900 - -syspopup (0.0.67) unstable; urgency=low - - * Updated changelog - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.67 - - -- Sewook Park Mon, 05 Dec 2011 15:55:09 +0900 - -syspopup (0.0.66) unstable; urgency=low - - * Fix desktop not to be removed - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.66 - - -- Sewook Park Mon, 21 Nov 2011 12:51:51 +0900 - -syspopup (0.0.65) unstable; urgency=low - - * Changed Boilerplate as per the guideline - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.65 - - -- Jaeho Lee Mon, 07 Nov 2011 18:38:10 +0900 - -syspopup (0.0.64) unstable; urgency=low - - * Fix syspopup focus concept - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.64 - - -- Sewook Park Thu, 27 Oct 2011 16:40:49 +0900 - -syspopup (0.0.63) unstable; urgency=low - - * Change active window angle to root angle - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.63 - - -- Sewook Park Wed, 19 Oct 2011 19:14:24 +0900 - -syspopup (0.0.62) unstable; urgency=low - - * Fix syspopup-app layout - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.62 - - -- Sewook Park Tue, 11 Oct 2011 11:11:31 +0900 - -syspopup (0.0.61) unstable; urgency=low - - * add usb-syspopup - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.61 - - -- Jaeho Lee Wed, 05 Oct 2011 16:02:45 +0900 - -syspopup (0.0.60) unstable; urgency=low - - * Fix prevent issue - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.60 - - -- Jaeho Lee Mon, 05 Sep 2011 13:42:51 +0900 - -syspopup (0.0.59) unstable; urgency=low - - * Add alert-3g-syspopup - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.59 - - -- Sewook Park Tue, 23 Aug 2011 16:08:24 +0900 - -syspopup (0.0.58) unstable; urgency=low - - * Apply code cleanup - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.58 - - -- Sewook Park Mon, 01 Aug 2011 19:59:37 +0900 - -syspopup (0.0.57) unstable; urgency=low - - * Fix Boilerplate module name - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.57 - - -- Sewook Park Sat, 16 Jul 2011 13:38:40 +0900 - -syspopup (0.0.56) unstable; urgency=low - - * Apply Boilerplate - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.56 - - -- Sewook Park Wed, 13 Jul 2011 17:31:28 +0900 - -syspopup (0.0.55) unstable; urgency=low - - * Modify bt-syspopup to be unfocused - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.55 - - -- Sewook Park Fri, 01 Jul 2011 14:37:08 +0900 - -syspopup (0.0.54) unstable; urgency=low - - * Modify push popup - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.54 - - -- Noha Park Tue, 17 May 2011 20:53:53 +0900 - -syspopup (0.0.53) unstable; urgency=low - - * Modify push popup - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.53 - - -- Noha Park Tue, 17 May 2011 20:43:19 +0900 - -syspopup (0.0.52) unstable; urgency=low - - * Modify push popup - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.52 - - -- Noha Park Tue, 17 May 2011 20:29:23 +0900 - -syspopup (0.0.51) unstable; urgency=low - - * Modify push popup - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.51 - - -- Noha Park Tue, 17 May 2011 20:02:11 +0900 - -syspopup (0.0.50) unstable; urgency=low - - * Add push popup - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.50 - - -- Noha Park Wed, 11 May 2011 09:55:52 +0900 - -syspopup (0.0.49) unstable; urgency=low - - * Remove deb. from package name - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.49 - - -- Noha Park Tue, 12 Apr 2011 11:47:30 +0900 - -syspopup (0.0.48) unstable; urgency=low - - * Remove quickpanel insert option - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.48 - - -- Noha Park Wed, 16 Mar 2011 19:02:23 +0900 - -syspopup (0.0.47) unstable; urgency=low - - * Remove quickpanel insert option - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.47 - - -- Noha Park Wed, 16 Mar 2011 18:55:50 +0900 - -syspopup (0.0.46) unstable; urgency=low - - * Call term act callback when the option is hide - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.46 - - -- Noha Park Tue, 22 Feb 2011 15:47:35 +0900 - -syspopup (0.0.45) unstable; urgency=low - - * Image optimization - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.45 - - -- Noha Park Mon, 21 Feb 2011 11:37:26 +0900 - -syspopup (0.0.44) unstable; urgency=low - - * Image optimization - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.44 - - -- Noha Park Mon, 21 Feb 2011 11:37:26 +0900 - -syspopup (0.0.43) unstable; urgency=low - - * Rebuild for quickpanel structure - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.43 - - -- Noha Park Fri, 18 Feb 2011 09:13:42 +0900 - -syspopup (0.0.42) unstable; urgency=low - - * Move desktop file destination - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.42 - - -- Noha Park Mon, 14 Feb 2011 17:03:56 +0900 - -syspopup (0.0.41) unstable; urgency=low - - * Add NFC syspopup - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.41 - - -- Noha Park Thu, 27 Jan 2011 14:20:40 +0900 - -syspopup (0.0.40) unstable; urgency=low - - * Add extern C to syspopup_caller header - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.40 - - -- Noha Park Thu, 27 Jan 2011 10:35:47 +0900 - -syspopup (0.0.39) unstable; urgency=low - - * Add extern C to syspopup_caller header - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.39 - - -- Noha Park Thu, 27 Jan 2011 10:30:18 +0900 - -syspopup (0.0.38) unstable; urgency=low - - * Modify wifi qs timeout - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.38 - - -- Noha Park Wed, 12 Jan 2011 16:45:21 +0900 - -syspopup (0.0.37) unstable; urgency=low - - * Modify syspopup app - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.37 - - -- Noha Park Wed, 05 Jan 2011 08:59:54 +0900 - -syspopup (0.0.36) unstable; urgency=low - - * Modify bt syspopup name - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.36 - - -- Noha Park Tue, 04 Jan 2011 08:47:34 +0900 - -syspopup (0.0.35) unstable; urgency=low - - * Modify drm popup - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.35 - - -- Noha Park Tue, 21 Dec 2010 10:02:26 +0900 - -syspopup (0.0.34) unstable; urgency=low - - * Add dnet popup - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.34 - - -- Noha Park Mon, 20 Dec 2010 17:25:43 +0900 - -syspopup (0.0.33) unstable; urgency=low - - * Modify ap_con_wifi to wifi-qs - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.33 - - -- Noha Park Mon, 20 Dec 2010 17:12:50 +0900 - -syspopup (0.0.32) unstable; urgency=low - - * Modify ap_con_wifi to wifi-qs - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.32 - - -- Noha Park Wed, 15 Dec 2010 16:39:25 +0900 - -syspopup (0.0.31) unstable; urgency=low - - * Modify ap_con_wifi to wifi-qs - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.31 - - -- Noha Park Wed, 15 Dec 2010 14:57:17 +0900 - -syspopup (0.0.30) unstable; urgency=low - - * Modify wifi-qs to ap_con_wifi - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.30 - - -- Noha Park Wed, 15 Dec 2010 11:37:51 +0900 - -syspopup (0.0.29) unstable; urgency=low - - * Update bash shell script (== to =) - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.29 - - -- Noha Park Wed, 15 Dec 2010 09:54:41 +0900 - -syspopup (0.0.28) unstable; urgency=low - - * Add wifi-qs - * Git: slp-source.sec.samsung.net:slp/pkgs/s/syspopup - * Tag: syspopup_0.0.28 - - -- Noha Park Mon, 13 Dec 2010 14:53:03 +0900 - -syspopup (0.0.27) unstable; urgency=low - - * Modify Sample code (syspopup-app) - * Git: 165.213.180.234:/git/slp/pkgs/syspopup - * Tag: syspopup_0.0.27 - - -- Noha Park Thu, 02 Dec 2010 10:56:57 +0900 - -syspopup (0.0.26) unstable; urgency=low - - * Modify power off popup - * Git: 165.213.180.234:/git/slp/pkgs/syspopup - * Tag: syspopup_0.0.26 - - -- Noha Park Fri, 26 Nov 2010 21:41:14 +0900 - -syspopup (0.0.25) unstable; urgency=low - - * Modify default rotation angle - * Git: 165.213.180.234:/git/slp/pkgs/syspopup - * Tag: syspopup_0.0.25 - - -- Noha Park Mon, 22 Nov 2010 20:33:07 +0900 - -syspopup (0.0.24) unstable; urgency=low - - * Modified desktop file - * Git: 165.213.180.234:/git/slp/pkgs/syspopup - * Tag: syspopup_0.0.24 - - -- Noha Park Mon, 22 Nov 2010 15:59:26 +0900 - -syspopup (0.0.23) unstable; urgency=low - - * Modified desktop file - * Git: 165.213.180.234:/git/slp/pkgs/syspopup - * Tag: syspopup_0.0.23 - - -- Noha Park Mon, 22 Nov 2010 13:57:09 +0900 - -syspopup (0.0.22) unstable; urgency=low - - * Code regeneration - * Git: 165.213.180.234:/git/slp/pkgs/syspopup - * Tag: syspopup_0.0.22 - - -- Noha Park Mon, 15 Nov 2010 18:14:36 +0900 - -syspopup (0.0.21) unstable; urgency=low - - * Modify rotation cb in syspopup-app - * Git: 165.213.180.234:/git/slp/pkgs/syspopup - * Tag: syspopup_0.0.21 - - -- Noha Park Fri, 12 Nov 2010 21:49:34 +0900 - -syspopup (0.0.20) unstable; urgency=low - - * Modify rotation cb in syspopup-app - * Git: 165.213.180.234:/git/slp/pkgs/syspopup - * Tag: syspopup_0.0.20 - - -- Noha Park Fri, 12 Nov 2010 14:17:49 +0900 - -syspopup (0.0.19) unstable; urgency=low - - * Modify DB create procedure(updated) - * Git: 165.213.180.234:/git/slp/pkgs/syspopup - * Tag: syspopup_0.0.19 - - -- Noha Park Thu, 11 Nov 2010 11:44:26 +0900 - -syspopup (0.0.18) unstable; urgency=low - - * Modify DB create procedure(updated) - * Git: 165.213.180.234:/git/slp/pkgs/syspopup - * Tag: syspopup_0.0.18 - - -- Noha Park Thu, 11 Nov 2010 09:37:41 +0900 - -syspopup (0.0.17) unstable; urgency=low - - * Modify DB create procedure(updated) - * Git: 165.213.180.234:/git/slp/pkgs/syspopup - * Tag: syspopup_0.0.17 - - -- Noha Park Wed, 10 Nov 2010 15:23:36 +0900 - -syspopup (0.0.16) unstable; urgency=low - - * Modify DB create procedure(updated) - * Git: 165.213.180.234:/git/slp/pkgs/syspopup - * Tag: syspopup_0.0.16 - - -- Noha Park Wed, 10 Nov 2010 14:32:11 +0900 - -syspopup (0.0.15) unstable; urgency=low - - * Modify DB create procedure - * Git: 165.213.180.234:/git/slp/pkgs/syspopup - * Tag: syspopup_0.0.15 - - -- Noha Park Wed, 10 Nov 2010 11:31:47 +0900 - -syspopup (0.0.14) unstable; urgency=low - - * Modify Syspopup API name - * Git: 165.213.180.234:/git/slp/pkgs/syspopup - * Tag: syspopup_0.0.14 - - -- Noha Park Tue, 09 Nov 2010 10:18:47 +0900 - -syspopup (0.0.13) unstable; urgency=low - - * Modify Syspopup create procedure - * Git: 165.213.180.234:/git/slp/pkgs/syspopup - * Tag: syspopup_0.0.13 - - -- Noha Park Mon, 08 Nov 2010 12:18:06 +0900 - -syspopup (0.0.12) unstable; urgency=low - - * Modify Syspopup create procedure - * Git: 165.213.180.234:/git/slp/pkgs/syspopup - * Tag: syspopup_0.0.12 - - -- Noha Park Mon, 08 Nov 2010 11:16:33 +0900 - -syspopup (0.0.11) unstable; urgency=low - - * Modify Syspopup Caller - * Git: 165.213.180.234:/git/slp/pkgs/syspopup - * Tag: syspopup_0.0.11 - - -- Noha Park Thu, 04 Nov 2010 11:54:31 +0900 - -syspopup (0.0.10) unstable; urgency=low - - * Modify e17 - * Git: 165.213.180.234:/git/slp/pkgs/syspopup - * Tag: syspopup_0.0.10 - - -- Noha Park Thu, 04 Nov 2010 10:18:19 +0900 - -syspopup (0.0.9) unstable; urgency=low - - * add endkey handler - * Git: 165.213.180.234:/git/slp/pkgs/syspopup - * Tag: syspopup_0.0.9 - - -- Noha Park Tue, 02 Nov 2010 16:07:30 +0900 - -syspopup (0.0.8) unstable; urgency=low - - * modify syspopup parent window - * Git: 165.213.180.234:/git/slp/pkgs/syspopup - * Tag: syspopup_0.0.8 - - -- Noha Park Fri, 15 Oct 2010 11:01:33 +0900 - -syspopup (0.0.7) unstable; urgency=low - - * modify quickpanel insert procedure - * Git: 165.213.180.234:/git/slp/pkgs/syspopup - * Tag: syspopup_0.0.7 - - -- Noha Park Thu, 14 Oct 2010 19:14:33 +0900 - -syspopup (0.0.6) unstable; urgency=low - - * modify user callback function - * Git: 165.213.180.234:/git/slp/pkgs/syspopup - * Tag: syspopup_0.0.6 - - -- Kunhoon Baik Thu, 14 Oct 2010 17:48:52 +0900 - -syspopup (0.0.5) unstable; urgency=low - - * build fail fix - - -- Kunhoon Baik Wed, 13 Oct 2010 17:49:08 +0900 - -syspopup (0.0.3) unstable; urgency=low - - * add doxygen and change maintainer - - -- Kunhoon Baik Wed, 13 Oct 2010 16:35:43 +0900 - -syspopup (0.0.2) unstable; urgency=low - - * modify dpkg - - -- Kunhoon Baik Tue, 12 Oct 2010 13:14:35 +0900 - -syspopup (0.0.1) unstable; urgency=low - - * initial update - - -- Kunhoon Baik Tue, 27 Jul 2010 15:51:31 +0900 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7ed6ff8..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/debian/control b/debian/control deleted file mode 100644 index db77e9c..0000000 --- a/debian/control +++ /dev/null @@ -1,43 +0,0 @@ -Source: syspopup -Section: devel -Priority: extra -Maintainer: Jayoun Lee , Sewook Park , Jaeho Lee -Build-Depends: debhelper (>= 5), libdbus-glib-1-dev, libsqlite3-dev, libx11-dev, libecore-dev, libbundle-dev, dlog-dev, libslp-utilx-dev, sqlite3, libaul-1-dev, libevas-dev, libappcore-efl-dev, libdbus-glib-1-dev -Standards-Version: 0.1.0 - -Package: syspopup-caller-0 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: syspopup-caller package - -Package: syspopup-caller-dev -Section: libs -Architecture: any -Depends: syspopup-caller-0 (= ${Source-Version}), libdbus-glib-1-dev, libsqlite3-dev, libbundle-dev, dlog-dev, libaul-1-dev -Description: syspopup-caller dev package - -Package: syspopup-caller-dbg -Section: debug -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, syspopup-caller-0 (= ${Source-Version}) -Description: syspopup-caller dbg package - -Package: syspopup-0 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, sqlite3 -Description: syspopup package - -Package: syspopup-dev -Section: libs -Architecture: any -Depends: syspopup-0 (= ${Source-Version}), libdbus-glib-1-dev, libsqlite3-dev, libbundle-dev, dlog-dev, sqlite3, libslp-utilx-dev, libx11-dev, libecore-dev, libevas-dev, libappcore-efl-dev -Description: syspopup dev package - -Package: syspopup-dbg -Section: debug -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, syspopup-0 (= ${Source-Version}) -Description: syspopup dbg package - diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index ca882bb..0000000 --- a/debian/dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/sbin diff --git a/debian/docs b/debian/docs deleted file mode 100644 index e69de29..0000000 diff --git a/debian/rules b/debian/rules deleted file mode 100755 index a65f12b..0000000 --- a/debian/rules +++ /dev/null @@ -1,122 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -# Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 - -CFLAGS ?= -Wall -g -LDFLAGS ?= -PREFIX ?= /usr -DATADIR ?= /opt - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -CFLAGS += -fvisibility=hidden -fpic -LDFLAGS += -Wl,--rpath=$(PREFIX)/lib -Wl,--as-needed - -CMAKE_TMP_DIR = $(CURDIR)/cmake_tmp - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - mkdir -p $(CMAKE_TMP_DIR); - cd $(CMAKE_TMP_DIR); CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" cmake .. -DCMAKE_INSTALL_PREFIX=$(PREFIX) - - touch configure-stamp - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - - # Add here commands to compile the package. - cd $(CMAKE_TMP_DIR) && $(MAKE) all test - - for f in `find $(CURDIR)/debian/ -name "*.in"`; do \ - cat $$f > $${f%.in}; \ - sed -i -e "s#@PREFIX@#$(PREFIX)#g" $${f%.in}; \ - sed -i -e "s#@DATADIR@#$(DATADIR)#g" $${f%.in}; \ - done - - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - rm -rf $(CMAKE_TMP_DIR) - - for f in `find $(CURDIR)/debian/ -name "*.in"`; do \ - rm -f $${f%.in}; \ - done - - rm -rf include/pg-doxy/doxygen_output - - rm -rf TC/results - rm -rf TC/tet_tmp_dir - cd TC/unit/ && make clean && cd ../../ - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/wavplayer. - cd $(CMAKE_TMP_DIR) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install - - mkdir -p $(CURDIR)/debian/tmp/opt/dbspace -# sqlite3 $(CURDIR)/debian/tmp/opt/dbspace/.syspopup.db < $(CURDIR)/data/syspopup_db.sql - touch $(CURDIR)/debian/tmp/usr/share/popup_noti_term - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_install --sourcedir=debian/tmp -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip --dbg-package=syspopup-dbg - dh_compress - dh_fixperms -# dh_perl - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/debian/syspopup-0.install.in b/debian/syspopup-0.install.in deleted file mode 100644 index 8f8964b..0000000 --- a/debian/syspopup-0.install.in +++ /dev/null @@ -1,4 +0,0 @@ -@PREFIX@/lib/libsyspopup.* -@PREFIX@/bin/* -usr/share/popup_noti_term -@PREFIX@/share/* diff --git a/debian/syspopup-0.postinst b/debian/syspopup-0.postinst deleted file mode 100644 index ccece2d..0000000 --- a/debian/syspopup-0.postinst +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -mkdir -p /opt/dbspace/ -sqlite3 /opt/dbspace/.syspopup.db < /usr/share/syspopup/syspopup_db.sql - -if [ ${USER} = "root" ] -then - chown root:root /usr/lib/libsyspopup.so.0.1.0 - chown root:5000 /opt/dbspace/.syspopup.db - chown root:5000 /opt/dbspace/.syspopup.db-journal -fi - -chmod 644 /usr/lib/libsyspopup.so.0.1.0 -chmod 664 /opt/dbspace/.syspopup.db -chmod 664 /opt/dbspace/.syspopup.db-journal - - - diff --git a/debian/syspopup-caller-0.install.in b/debian/syspopup-caller-0.install.in deleted file mode 100644 index 9add798..0000000 --- a/debian/syspopup-caller-0.install.in +++ /dev/null @@ -1 +0,0 @@ -@PREFIX@/lib/libsyspopup_caller.* diff --git a/debian/syspopup-caller-0.postinst b/debian/syspopup-caller-0.postinst deleted file mode 100644 index 91f47b5..0000000 --- a/debian/syspopup-caller-0.postinst +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -if [ ${USER} = "root" ] -then - chown root:root /usr/lib/libsyspopup_caller.so.0.1.0 -fi - -chmod 644 /usr/lib/libsyspopup_caller.so.0.1.0 - diff --git a/debian/syspopup-caller-dev.install.in b/debian/syspopup-caller-dev.install.in deleted file mode 100644 index 107006c..0000000 --- a/debian/syspopup-caller-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -@PREFIX@/include/syspopup_caller.h -@PREFIX@/lib/pkgconfig/syspopup-caller.pc diff --git a/debian/syspopup-dev.install.in b/debian/syspopup-dev.install.in deleted file mode 100644 index f70f39e..0000000 --- a/debian/syspopup-dev.install.in +++ /dev/null @@ -1,3 +0,0 @@ -@PREFIX@/include/syspopup.h -@PREFIX@/include/SLP_SYSPOPUP_PG.h -@PREFIX@/lib/pkgconfig/syspopup.pc diff --git a/image/README b/image/README deleted file mode 100644 index a8f7df0..0000000 --- a/image/README +++ /dev/null @@ -1 +0,0 @@ -PG diff --git a/image/syspopup_diag.png b/image/syspopup_diag.png new file mode 100755 index 0000000000000000000000000000000000000000..510834347c71668ca01275f7542013a3b00c4691 GIT binary patch literal 12337 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 literal 0 HcmV?d00001 diff --git a/include/SLP_SYSPOPUP_PG.h b/include/SLP_SYSPOPUP_PG.h index fc03885..faa7b0e 100755 --- a/include/SLP_SYSPOPUP_PG.h +++ b/include/SLP_SYSPOPUP_PG.h @@ -25,36 +25,37 @@ * * @ingroup SLP_PG - * @defgroup SYSPOPUP Library for System Popup + * @defgroup SYSPOPUP System Popup @par SYSPOPUP Programming Guide

Introduction

-

Purpose of this document

+SYSPOPPUP is designed to create popups for system events like low battery, low memory, incoming call etc. Sys-popup (System Popup) Library provides API's for creating system popup applications and launching/destroying the system popup's. +

Scope

The purpose of this document is to describe how applications can use System Popup Library APIs.\n This document gives only programming guidelines to system popup application engineers. - -

Scope

-The scope of this document is limited to Samsung platform System Popup API usage. - -

Architecture

-

Architecture overview

- -

SLP Features

- -

SYSPOPUP API descriptions

- SEE API manual - -

SYSPOPUP features with sample code

-

...

- -@code -@endcode - -@code -*/ - -/** +The scope of this document is limited to System Popup API usage. + +

Syspopup Features

+Syspopup exposes two kinds of API's. +1. Create system popup application.\n +2. Launch System popup application. + +

Syspopup Architecture

+\image html syspopup_diag.png "Picture 1. Syspopup Process View" +\image rtf syspopup_diag.png "Picture 1. Syspopup Process View" + +Whenever system daemon receives system event for which popup is to be created, it calls syspopup launch API with the required popup name (lowbatt, lowmem etc). Syspopup library finds the appropriate syspopup application to be launched based on the popup name. It then calls the AUL API for launching the syspoup application. +The syspopup application calls syspopup's create API for creating the systempopup. Picture 1 above shows the process view of syspopup. + +

API list and description

+
    +
  • syspopup_create() : Creates System Popup
    • +
  • syspopup_reset() : Reset the created system popup properties
    • +
  • syspopup_has_popup() : Checks system popup is created and is running
    • +
  • syspopup_launch() : Launches system popup application
    • +
  • syspopup_destroy_all() : Destroy all the system popups
    • +
@} */ diff --git a/include/simple_util.h b/include/simple_util.h index ecf5ae2..e95bc18 100755 --- a/include/simple_util.h +++ b/include/simple_util.h @@ -33,8 +33,9 @@ #define MAX_LOCAL_BUFSZ 128 -#define _E(fmt, arg...) LOGE("[%s,%d] "fmt , __FUNCTION__, __LINE__, ##arg) -#define _D(fmt, arg...) LOGD("[%s,%d] "fmt , __FUNCTION__, __LINE__, ##arg) +#define _E(fmt, arg...) LOGE(fmt,##arg) +#define _D(fmt, arg...) LOGD(fmt,##arg) +#define _I(fmt, arg...) LOGI(fmt,##arg) #define SYSPOPUP_DBUS_PATH "/syspopup/dbus_handler" #define SYSPOPUP_DBUS_SIGNAL_INTERFACE "org.tizen.syspopup.signal" diff --git a/include/syspopup.h b/include/syspopup.h index db742ab..79f8106 100755 --- a/include/syspopup.h +++ b/include/syspopup.h @@ -37,8 +37,9 @@ */ /** - * @close - * @ingroup APPLICATION_FRAMEWORK + * @addtogroup APPLICATION_FRAMEWORK + * @{ + * * @defgroup syspopup System Popup Library * @{ */ @@ -120,6 +121,19 @@ int syspopup_reset(bundle *b); */ int syspopup_has_popup(bundle *b); +/** + * @brief This API reset timeout value of system popup. + * + * This API reset timeout value of system popup. + * + * @param[in] b bundle received by app_reset handler (included system popup name) + * @param[in] time timeout time (sec) + * @return 0 if success, negative value(<0) if fail + * @retval 0 success + * @retval -1 generic error + */ +int syspopup_reset_timeout(bundle *b, unsigned int time); + /** @} */ #endif diff --git a/include/syspopup_caller.h b/include/syspopup_caller.h index c534707..e00d5d2 100755 --- a/include/syspopup_caller.h +++ b/include/syspopup_caller.h @@ -25,7 +25,6 @@ #define __SYSPOPUP_CALLER_H__ #include -#include #ifdef __cplusplus extern "C" { diff --git a/include/syspopup_core.h b/include/syspopup_core.h index 463a60a..6e943ec 100755 --- a/include/syspopup_core.h +++ b/include/syspopup_core.h @@ -29,7 +29,6 @@ #include "syspopup_db.h" #define SYSPOPUP_DEFAULT_TIMEOUT 20 /* sec */ -#define SYSPOPUP_TERM_NOTI_PATH "/usr/share/popup_noti_term" struct _syspopup { int id; diff --git a/include/syspopup_db.h b/include/syspopup_db.h index f57e0dd..2a518d7 100755 --- a/include/syspopup_db.h +++ b/include/syspopup_db.h @@ -53,7 +53,6 @@ struct _syspopup_info_t { typedef struct _syspopup_info_t syspopup_info_t; -int _syspopup_info_add(syspopup_info_t *pinfo); syspopup_info_t *_syspopup_info_get(const char *popup_name); void _syspopup_info_free(syspopup_info_t *pinfo); diff --git a/org.tizen.syspopup-app.manifest b/org.tizen.syspopup-app.manifest new file mode 100644 index 0000000..71faac1 --- /dev/null +++ b/org.tizen.syspopup-app.manifest @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/org.tizen.syspopup-app.rule b/org.tizen.syspopup-app.rule new file mode 100755 index 0000000..3c71e26 --- /dev/null +++ b/org.tizen.syspopup-app.rule @@ -0,0 +1,17 @@ +#default rule +org.tizen.syspopup-app system::homedir rwxat +org.tizen.syspopup-app system::vconf rwxat +org.tizen.syspopup-app system::media rwxat +org.tizen.syspopup-app system::share rwxat +$1 pulseaudio rwxat +e17 $1 w +$1 sys-assert::core rwxat + +#app rule +org.tizen.syspopup-app system::app_logging w +org.tizen.syspopup-app system::use_internet r +org.tizen.syspopup-app xorg rw +org.tizen.syspopup-app isf rx +org.tizen.syspopup-app ail::db rw +org.tizen.syspopup-app syspopup::db rw +org.tizen.syspopup-app dbus w diff --git a/packaging/syspopup.spec b/packaging/syspopup.spec index 669049c..e4e0a64 100755 --- a/packaging/syspopup.spec +++ b/packaging/syspopup.spec @@ -1,10 +1,10 @@ Name: syspopup Summary: syspopup package -Version: 0.0.80 +Version: 0.0.134 Release: 1 Group: System/Libraries -License: Apache License, Version 2.0 +License: Apache-2.0 Source0: syspopup-%{version}.tar.gz Requires(post): /sbin/ldconfig Requires(post): /bin/touch @@ -19,12 +19,11 @@ BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(aul) BuildRequires: pkgconfig(evas) BuildRequires: pkgconfig(appcore-efl) - +BuildRequires: pkgconfig(capi-appfw-application) %description syspopup package for popup - %package devel Summary: syspopup development package Group: Development/Libraries @@ -51,14 +50,33 @@ Requires: %{name} = %{version}-%{release} %description caller-devel syspopup-caller development package for popup +%package app +Summary: org.tizen.syspopup-app test app +Group: TO_BE/FILLED_IN +Requires: %{name} = %{version}-%{release} + +%description app +org.tizen.syspopup-app test app package %prep %setup -q -n %{name}-%{version} -CFLAGS=${_cflags} cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DEXTRA_CFLAGS=-fPIC - %build - +%if "%{?tizen_profile_name}" == "wearable" +export CFLAGS="$CFLAGS –D_WEARABLE" +%else +export CFLAGS="$CFLAGS -D_MOBILE" +%endif + +%if 0%{?sec_build_binary_debug_enable} +export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE" +export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE" +export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" +%endif +export CFLAGS="$CFLAGS -Wall -Werror -Wno-unused-function" +CFLAGS=${_cflags} cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DEXTRA_CFLAGS=-fPIC \ + -D_WEARABLE:BOOL=${_WEARABLE} -D_MOBILE:BOOL=${_MOBILE} \ + . make %{?jobs:-j%jobs} @@ -67,39 +85,30 @@ rm -rf %{buildroot} %make_install mkdir -p %{buildroot}/opt/dbspace -#sqlite3 $(CURDIR)/debian/tmp/opt/dbspace/.syspopup.db < $(CURDIR)/data/syspopup_db.sql -touch %{buildroot}%{_datadir}/popup_noti_term - +sqlite3 %{buildroot}/opt/dbspace/.syspopup.db < %{buildroot}/usr/share/syspopup/syspopup_db.sql +rm -rf %{buildroot}/usr/share/syspopup/syspopup_db.sql +mkdir -p %{buildroot}/usr/share/license +cp LICENSE %{buildroot}/usr/share/license/%{name} +cp LICENSE %{buildroot}/usr/share/license/%{name}-caller %post /sbin/ldconfig -mkdir -p /opt/dbspace/ -sqlite3 /opt/dbspace/.syspopup.db < /usr/share/syspopup/syspopup_db.sql - %postun -p /sbin/ldconfig - - - %post caller -p /sbin/ldconfig %postun caller -p /sbin/ldconfig - - - %files +%manifest syspopup.manifest %defattr(-,root,root,-) -%{_datadir}/icons/default/small/org.tizen.syspopup-app.png -%{_bindir}/sp_test -%{_bindir}/syspopup-app %{_libdir}/libsyspopup.so.0.1.0 -/usr/share/syspopup/syspopup_db.sql -/usr/share/packages/org.tizen.syspopup-app.xml -%{_datadir}/popup_noti_term - +%attr(644,root,app) /opt/dbspace/.syspopup.db +%attr(644,root,app) /opt/dbspace/.syspopup.db-journal +%{_bindir}/sp_test +/usr/share/license/%{name} %files devel %defattr(-,root,root,-) @@ -109,8 +118,10 @@ sqlite3 /opt/dbspace/.syspopup.db < /usr/share/syspopup/syspopup_db.sql %{_libdir}/pkgconfig/syspopup.pc %files caller +%manifest syspopup-caller.manifest %defattr(-,root,root,-) %{_libdir}/libsyspopup_caller.so.0.1.0 +/usr/share/license/%{name}-caller %files caller-devel %defattr(-,root,root,-) @@ -118,3 +129,123 @@ sqlite3 /opt/dbspace/.syspopup.db < /usr/share/syspopup/syspopup_db.sql %{_includedir}/syspopup_caller.h %{_libdir}/pkgconfig/syspopup-caller.pc +%files app +%manifest org.tizen.syspopup-app.manifest +%defattr(-,root,root,-) +%{_datadir}/icons/default/small/org.tizen.syspopup-app.png +%{_bindir}/syspopup-app +/usr/share/packages/org.tizen.syspopup-app.xml +/etc/smack/accesses2.d/org.tizen.syspopup-app.rule + +%changelog +* Fri Aug 1 2014 - Hyungdeuk Kim +- Change focus info of safetysyspopup +- Requested by nannan.wu , parkjg + +* Thu May 22 2014 - Hyungdeuk Kim +- Change timeout info of wc syspopup +- Requested by sunil85.kim + +* Thu May 22 2014 - Hyungdeuk Kim +- Change focus info of mode syspopup +- Requested by setting + +* Mon May 19 2014 - Hyungdeuk Kim +- Add root detection popup +- Requested by daehoon ko of security r&d group + +* Mon May 12 2014 - Hyungdeuk Kim +- Add setting noti popup for blocking mode + +* Thu May 8 2014 - Hyungdeuk Kim +- Remove code to grab back key for volume popup + +* Mon Apr 28 2014 - Hyungdeuk Kim +- Add wc syspopup requested by ms0123.kim of telephony team + +* Mon Mar 31 2014 - Hyungdeuk Kim +- Enable telephony syspopup following telephony build feature + +* Tue Feb 18 2014 - Hyungdeuk Kim +- Remove unused system popup sample app +- Remove unused debian folder + +* Wed Jan 15 2014 - Hyungdeuk Kim +- Add fota syspopup +- Requested by seokey.jeong + +* Tue Dec 10 2013 - Hyungdeuk Kim +- Add fota-noti popup +- Requested by juhaki.park + +* Wed Oct 23 2013 - Hyungdeuk Kim +- Add fus-ode-syspopup +- Requested by sunbong.ha + +* Fri Oct 18 2013 - Hyungdeuk Kim +- Add keepit screen capture system popup +- Requested by wc0917.lee + +* Thu Oct 10 2013 - Hyungdeuk Kim +- Add mode system popup +- Requested by shy81.shin + +* Fri Sep 13 2013 - Hyungdeuk Kim +- Add crash system popup +- Requested by ty317.kim + +* Tue Sep 10 2013 - Hyungdeuk Kim +- Remove unused ticker noti system popup +- Maintained by sungho1.kwak +- Add Wall, Werror build option + +* Fri Jun 21 2013 - Hyungdeuk Kim +- Change end key term info for wifi-qs popup + +* Wed Jun 5 2013 - Hyungdeuk Kim +- Add datausage system popup +- Requested by ty317.kim + +* Fri May 17 2013 - Hyungdeuk Kim +- Add safety volume popup +- Requested by bw.jang + +* Tue Apr 30 2013 - Hyungdeuk Kim +- Change focus value to 0 for power-off syspopup +- Requested by ty317.kim + +* Thu Apr 25 2013 - Hyungdeuk Kim +- Change prio info for system , power-off syspopup +- Requested by ty317.kim + +* Wed Apr 24 2013 - Hyungdeuk Kim +- Add system-syspopup +- Requested by ty317.kim + +* Fri Apr 12 2013 - Hyungdeuk Kim +- Remove drm syspopup +- Requested by hakjoo.ko + +* Tue Apr 2 2013 - Hyugdeuk Kim +- Add syspopup_reset_timeout api + +* Thu Mar 28 2013 - Hyungdeuk Kim +- Add sym extraction syspopup info(telephony-syspopup) +- Requested by jh48.an + +* Mon Mar 25 2013 - Hyungdeuk Kim +- Add mobileap syspopup +- Requested by sy39.ju + +* Thu Feb 21 2013 - Hyungdeuk Kim +- Add syspopup app smack rule +- Change dlog tag +- Add dlogs for debug + +* Wed Nov 21 2012 - Hyungdeuk Kim +- Add syspopup info for gcf supl + +* Tue Oct 30 2012 - Hyungdeuk Kim +- Fix prevent issues +- Add syspopup info for hdmi syspopup +- move CFLAGS location to %build at spec file diff --git a/src/syspopup_core.c b/src/syspopup_core.c index 262bc95..dc76dca 100755 --- a/src/syspopup_core.c +++ b/src/syspopup_core.c @@ -210,10 +210,13 @@ int _syspopup_reset_timeout(syspopup *sp, syspopup_info_t *info) if (sp->timeout_id != 0) g_source_remove(sp->timeout_id); - sp->timeout_id = g_timeout_add_seconds(info->timeout, _timeout_handler, + + if(info->timeout > 0) { + sp->timeout_id = g_timeout_add_seconds(info->timeout, _timeout_handler, (void *)sp->id); - _D("add timeout - timeout : id=%d,timeout=%d(sec)", sp->id, - info->timeout); + _D("add timeout - timeout : id=%d,timeout=%d(sec)", sp->id, + info->timeout); + } return 0; } diff --git a/src/syspopup_db.c b/src/syspopup_db.c index 9721b4a..c4f8d0f 100755 --- a/src/syspopup_db.c +++ b/src/syspopup_db.c @@ -37,33 +37,6 @@ static sqlite3 *db = NULL; /** - * exec - * param[in] db handler - * param[in] query query - * return This method returns 0 (SUCCESS) or -1 (FAIL) - */ -static int __exec(sqlite3 *db, char *query) -{ - int rc = 0; - char *errmsg = NULL; - - if (db == NULL) { - _E("DB handler is null"); - return -1; - } - rc = sqlite3_exec(db, query, NULL, 0, &errmsg); - - if (rc != SQLITE_OK) { - _D("Query: [%s]", query); - _E("SQL error: %s\n", errmsg); - sqlite3_free(errmsg); - return (-1); - } - - return 0; -} - -/** * db initialize */ static int __init(void) @@ -76,22 +49,15 @@ static int __init(void) } rc = sqlite3_open(SYSPOPUP_DB_PATH, &db); - if (rc) { - _E("Can't open database: %s", sqlite3_errmsg(db)); - goto err; - } - /* Enable persist journal mode*/ - rc = sqlite3_exec(db, "PRAGMA journal_mode = PERSIST", NULL, NULL, - NULL); - if (SQLITE_OK != rc) { - _D("Fail to change journal mode\n"); - goto err; + if (rc != SQLITE_OK) { + _E("Can't open database: %s / %d / %d", sqlite3_errmsg(db), + rc, sqlite3_extended_errcode(db)); + return -1; + } else { + _D("db open sucess"); } return 0; -err: - sqlite3_close(db); - return -1; } static int __fini(void) @@ -103,106 +69,11 @@ static int __fini(void) return 0; } -static int __delete_all(const char *tbl_name) -{ - char *_sqlbuf; - int rc; - - _sqlbuf = sqlite3_mprintf("DELETE FROM %s;", tbl_name); - rc = __exec(db, _sqlbuf); - sqlite3_free(_sqlbuf); - - return rc; -} - -static int __delete_with_field(const char *tbl_name, const char *f_name, - const char *val) -{ - char *_sqlbuf; - int rc; - - _sqlbuf = sqlite3_mprintf("DELETE FROM %s WHERE %s = '%s';", - tbl_name, f_name, val); - rc = __exec(db, _sqlbuf); - sqlite3_free(_sqlbuf); - - return rc; -} - -static int __count_with_field(const char *tbl_name, const char *f_name, - const char *val) -{ - char *_sqlbuf; - int rc; - char **db_result = NULL; - char *db_err = NULL; - int nrows = 0; - int ncols = 0; - int cnt; - - _sqlbuf = sqlite3_mprintf("SELECT COUNT(*) FROM %s WHERE %s = '%s';", - tbl_name, f_name, val); - - rc = sqlite3_get_table(db, _sqlbuf, &db_result, &nrows, &ncols, - &db_err); - if (rc == -1 || nrows == 0) { - _E("get count = 0 or fail"); - sqlite3_free_table(db_result); - sqlite3_free(_sqlbuf); - return 0; - } else { - cnt = atoi(db_result[1]); - sqlite3_free_table(db_result); - sqlite3_free(_sqlbuf); - } - - return cnt; -} - -int _syspopup_info_add(syspopup_info_t *pinfo) -{ - int rc = -1; - int cnt = 0; - char *_sqlbuf; - - if (pinfo->name == NULL) { - _E("Name is null\n"); - return -1; - } - - if (__init() < 0) - return -1; - - cnt = __count_with_field(SP_INFO_TBL, SP_INFO_TBL_F_NAME, pinfo->name); - - if (cnt == 0) { - _sqlbuf = sqlite3_mprintf("INSERT INTO %s " - "(name,prio,focus,timeout,term_act,endkey_act,pkgname) values " - "(\"%s\", %d, %d, %d, \"%s\");", - SP_INFO_TBL, - pinfo->name, pinfo->prio, - pinfo->focus, pinfo->timeout, - pinfo->term_act, pinfo->endkey_act, - pinfo->pkgname); - rc = __exec(db, _sqlbuf); - sqlite3_free(_sqlbuf); - } else { - _E("already exist - %s", pinfo->name); - rc = -1; - } - - if (rc < 0) - _E("Fail to insert\n"); - - __fini(); - return rc; -} - syspopup_info_t *_syspopup_info_get(const char *popup_name) { int rc = 0; - char *_sqlbuf; - sqlite3_stmt *stmt; + char sqlbuf[256] = {0,}; + sqlite3_stmt *stmt = NULL; syspopup_info_t *pinfo = NULL; if (popup_name == NULL) { @@ -213,18 +84,26 @@ syspopup_info_t *_syspopup_info_get(const char *popup_name) if (__init() < 0) return NULL; - _sqlbuf = sqlite3_mprintf("SELECT name,prio,focus,timeout,term_act,endkey_act,pkgname " - "FROM %s WHERE %s='%s';", - SP_INFO_TBL, SP_INFO_TBL_F_NAME, popup_name); + snprintf(sqlbuf, 256, + "SELECT name,prio,focus,timeout,term_act,endkey_act,pkgname FROM %s WHERE %s = ?;", + SP_INFO_TBL, SP_INFO_TBL_F_NAME); - rc = sqlite3_prepare_v2(db, _sqlbuf, -1, &stmt, NULL); + rc = sqlite3_prepare_v2(db, sqlbuf, -1, &stmt, NULL); if (rc == SQLITE_OK) { + rc =sqlite3_bind_text(stmt, 1, popup_name, strlen(popup_name), SQLITE_STATIC); + if(rc != SQLITE_OK) { + _E("popup name bind error(%d) \n", rc); + sqlite3_finalize(stmt); + goto out; + } + rc = sqlite3_step(stmt); if (rc == SQLITE_ROW) { pinfo = (syspopup_info_t *) malloc(sizeof(syspopup_info_t)); if (pinfo == NULL) { - __fini(); - return NULL; + _E("malloc error"); + sqlite3_finalize(stmt); + goto out; } pinfo->name = strdup((char *) sqlite3_column_text(stmt, 0)); pinfo->prio = sqlite3_column_int(stmt, 1); @@ -240,7 +119,11 @@ syspopup_info_t *_syspopup_info_get(const char *popup_name) sqlite3_finalize(stmt); } - sqlite3_free(_sqlbuf); + if(pinfo == NULL) { + _E("error(%d) in prepare", rc); + } + +out: __fini(); return pinfo; } diff --git a/syspopup-app/CMakeLists.txt b/syspopup-app/CMakeLists.txt index 821aeaa..09370e4 100644 --- a/syspopup-app/CMakeLists.txt +++ b/syspopup-app/CMakeLists.txt @@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/syspopup) INCLUDE(FindPkgConfig) -pkg_check_modules(syspopup_app_pkgs REQUIRED appcore-efl) +pkg_check_modules(syspopup_app_pkgs REQUIRED appcore-efl capi-appfw-application) FOREACH(flag ${syspopup_app_pkgs_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") @@ -49,7 +49,7 @@ ADD_DEFINITIONS("-DEDJDIR=\"${EDJDIR}\"") SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed") ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS}) -TARGET_LINK_LIBRARIES(${PROJECT_NAME} syspopup ${syspopup_app_pkgs_LDFLAGS}) +TARGET_LINK_LIBRARIES(${PROJECT_NAME} "-pie" syspopup ${syspopup_app_pkgs_LDFLAGS}) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR}) @@ -59,6 +59,9 @@ CONFIGURE_FILE(${PKGNAME}.xml.in ${CMAKE_BINARY_DIR}/${PKGNAME}.xml) INSTALL(FILES ${CMAKE_BINARY_DIR}/${PKGNAME}.xml DESTINATION /usr/share/packages) INSTALL(FILES ${CMAKE_SOURCE_DIR}/syspopup-app/${PKGNAME}.png DESTINATION share/icons/default/small) +# install smack rule +INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PKGNAME}.rule DESTINATION /etc/smack/accesses2.d) + # i18n #ADD_SUBDIRECTORY(po) diff --git a/syspopup-app/syspopup-app.c b/syspopup-app/syspopup-app.c index f2fe316..11ea84a 100755 --- a/syspopup-app/syspopup-app.c +++ b/syspopup-app/syspopup-app.c @@ -20,92 +20,30 @@ * */ - -#include -#include -#include - +#include +#include #include "syspopup.h" #include "syspopup-app.h" -/*#include */ -#include -/* -struct quickpanel { - int type; - int priv_id; - char *title; - char *content; - time_t rtime; - bundle *args; - bundle *args_group; - int group_id; -}; -*/ +typedef struct appdata { + Evas_Object *win; + Evas_Object *conform; + Evas_Object *label; + Evas_Object *popup; + bundle *b; + char title[TITLE_BUF_LEN]; + char content[CONTENT_BUF_LEN]; +} appdata_s; int myterm(bundle *b, void *data) { - /* - char b_str[QP_BUF_LEN]; - int ret = 0; - const char* val; - - struct appdata *ad = data; - struct quickpanel* qp; - - val = bundle_get_val(b,"_INTERNAL_SYSPOPUP_NAME_"); - printf("[SYSTEM POPUP] Popup Name : %s\n", val); - - qp = malloc(sizeof(struct quickpanel)); - memset(qp,0,sizeof(struct quickpanel)); - - //qp->type = QP_TYPE_SYSPOPUP; - qp->type = quickpanel_get_type_id("org.tizen.syspopup-app", NULL, 0); - qp->priv_id = QP_PRIVID; - qp->title = ad->title; - qp->content = ad->content; - qp->args = b; - qp->group_id = qp->priv_id; - - ret = quickpanel_insert(qp); - if (ret < 0) - printf("[SYSTEM POPUP] Error!! Cannot insert to quickpanel!\n"); - - free(qp); - */ + dlog_print(DLOG_DEBUG, LOG_TAG, "myterm called"); return 0; } int mytimeout(bundle *b, void* data) { - /* - char b_str[QP_BUF_LEN]; - int ret = 0; - const char* val; - - struct appdata *ad = data; - struct quickpanel* qp; - - val = bundle_get_val(b,"_INTERNAL_SYSPOPUP_NAME_"); - printf("[SYSTEM POPUP] Popup Name : %s\n", val); - - qp = malloc(sizeof(struct quickpanel)); - memset(qp,0,sizeof(struct quickpanel)); - - //qp->type = QP_TYPE_SYSPOPUP; - qp->type = quickpanel_get_type_id("org.tizen.syspopup-app", NULL, 0); - qp->priv_id = QP_PRIVID; - qp->title = ad->title; - qp->content = ad->content; - qp->args = b; - qp->group_id = qp->priv_id; - - ret = quickpanel_insert(qp); - if (ret < 0) - printf("[SYSTEM POPUP] Error!! Cannot insert to quickpanel!\n"); - - free(qp); - */ + dlog_print(DLOG_DEBUG, LOG_TAG, "mytimeout called"); return 0; } @@ -114,216 +52,212 @@ syspopup_handler handler = { .def_timeout_fn = mytimeout }; -static void __win_del(void *data, Evas_Object * obj, void *event) +static bool _app_control_extra_data_cb(app_control_h app_control, const char *key, void *user_data) { - elm_exit(); -} + int ret; + char *value; + appdata_s *ad = user_data; + + ret = app_control_get_extra_data(app_control, key, &value); + if (ret != APP_CONTROL_ERROR_NONE) + { + dlog_print(DLOG_ERROR, LOG_TAG, "app_control_get_extra_data() is failed. err = %d", ret); + } -/* -static int rotate(enum appcore_rm m, void *data) -{ - struct appdata *ad = data; - int r; - - if (ad == NULL || ad->win == NULL) - return 0; - - switch(m) { - case APPCORE_RM_PORTRAIT_NORMAL: - r = 0; - break; - case APPCORE_RM_PORTRAIT_REVERSE: - r = 180; - break; - case APPCORE_RM_LANDSCAPE_NORMAL: - r = 270; - break; - case APPCORE_RM_LANDSCAPE_REVERSE: - r = 90; - break; - default: - r = -1; - break; + if (bundle_add(ad->b, key, value) != BUNDLE_ERROR_NONE) { + free(value); + return APP_CONTROL_ERROR_INVALID_PARAMETER; } - if (r >= 0) - elm_win_rotation_with_resize_set(ad->win, r); + free(value); - return 0; + return true; } -*/ -static Evas_Object *__create_win(const char *name) +static void win_delete_request_cb(void *data , Evas_Object *obj , void *event_info) { - Evas_Object *eo; - int w; - int h; - - eo = elm_win_add(NULL, name, ELM_WIN_DIALOG_BASIC); - if (eo) { - elm_win_title_set(eo, name); - elm_win_borderless_set(eo, EINA_TRUE); - - elm_win_alpha_set(eo, EINA_TRUE); - - evas_object_smart_callback_add(eo, "delete,request", - __win_del, NULL); - ecore_x_window_size_get(ecore_x_window_root_first_get(), - &w, &h); - evas_object_resize(eo, w, h); - } - - return eo; + ui_app_exit(); } -static int __app_create(void *data) +static void win_back_cb(void *data, Evas_Object *obj, void *event_info) { - struct appdata *ad = data; - Evas_Object *win; - int r; - - /* create window */ - win = __create_win(PACKAGE); - if (win == NULL) - return -1; - ad->win = win; - /* evas_object_show(win);*/ - - /* init internationalization */ - r = appcore_set_i18n(PACKAGE, LOCALEDIR); - if (r) - return -1; + appdata_s *ad = data; + /* Let window go to hide state. */ + elm_win_lower(ad->win); +} - /* appcore_set_rotation_cb(rotate, ad);*/ +static void response_cb(void *data, Evas_Object * obj, void *event_info) +{ + dlog_print(DLOG_DEBUG, LOG_TAG, "response_cb called"); - appcore_measure_start(); - return 0; + if ((int)event_info != 5) + evas_object_del(obj); + elm_exit(); } -static int __app_terminate(void *data) +static void block_clicked_cb(void *data, Evas_Object *obj, void *event_info) { - struct appdata *ad = data; + dlog_print(DLOG_DEBUG, LOG_TAG, "block_clicked_cb called"); + evas_object_del(obj); +} - printf("[SYSPOPUP] %s, %d\n", __func__, __LINE__); +static void create_base_gui(appdata_s *ad) { - if (ad->win) - evas_object_del(ad->win); + int w; + int h; - return 0; -} + ad->win = elm_win_add(NULL, PACKAGE, ELM_WIN_DIALOG_BASIC); + if (ad->win) { + elm_win_title_set(ad->win, PACKAGE); + elm_win_borderless_set(ad->win, EINA_TRUE); + elm_win_alpha_set(ad->win, EINA_TRUE); + ecore_x_window_size_get(ecore_x_window_root_first_get(), &w, &h); + evas_object_resize(ad->win, w, h); + } -static int __app_pause(void *data) -{ - struct appdata *ad = data; + elm_win_autodel_set(ad->win, EINA_TRUE); + evas_object_smart_callback_add(ad->win, "delete,request", win_delete_request_cb, NULL); - return 0; } -static int __app_resume(void *data) +static bool app_create(void *data) { - struct appdata *ad = data; + appdata_s *ad = data; - return 0; -} + create_base_gui(ad); -static void __prt_recvd_bundle(const char *key, const char *value, void *d) -{ - printf("recvd - key: %s, value: %s\n", key, value); + return true; } -static void __response_cb(void *data, Evas_Object * obj, void *event_info) +static void app_control(app_control_h app_control, void *data) { - if ((int)event_info != 5) - evas_object_del(obj); - elm_exit(); -} + /* Handle the launch request. */ + appdata_s *ad = data; -static void _block_clicked_cb(void *data, Evas_Object *obj, void *event_info) -{ - evas_object_del(obj); -} - -static int __app_reset(bundle *b, void *data) -{ - struct appdata *ad = data; Evas_Object *popup; const char *val; int ret = 0; - ad->b = bundle_dup(b); + if(ad->b == NULL) + ad->b = bundle_create(); - bundle_iterate(b, __prt_recvd_bundle, NULL); + ret = app_control_foreach_extra_data(app_control, _app_control_extra_data_cb, data); + if (ret != APP_CONTROL_ERROR_NONE) + dlog_print(DLOG_ERROR, LOG_TAG, "app_control_foreach_extra_data() is failed. err = %d", ret); - if (syspopup_has_popup(b)) { - syspopup_reset(b); + if (syspopup_has_popup(ad->b)) { + syspopup_reset(ad->b); } else { popup = elm_popup_add(ad->win); if (popup != NULL) { - ret = syspopup_create(b, &handler, ad->win, ad); + ret = syspopup_create(ad->b, &handler, ad->win, ad); evas_object_show(ad->win); if (ret == 0) { - val = bundle_get_val(b, - "_INTERNAL_SYSPOPUP_NAME_"); - - val = bundle_get_val(b, "_SYSPOPUP_TITLE_"); + val = bundle_get_val(ad->b, "_SYSPOPUP_TITLE_"); if (val) { snprintf(ad->title, TITLE_BUF_LEN, "%s", - val); + val); } else { snprintf(ad->title, TITLE_BUF_LEN, "%s", - "Unknown Title"); + "Unknown Title"); } - val = bundle_get_val(b, "_SYSPOPUP_CONTENT_"); + val = bundle_get_val(ad->b, "_SYSPOPUP_CONTENT_"); if (val) { snprintf(ad->content, CONTENT_BUF_LEN, - "%s", val); + "%s", val); } else { snprintf(ad->content, CONTENT_BUF_LEN, - "%s", "Unknown Content"); + "%s", "Unknown Content"); } elm_object_style_set(popup, "char_wrap_style"); evas_object_size_hint_weight_set(popup, - EVAS_HINT_EXPAND, - EVAS_HINT_EXPAND); - evas_object_smart_callback_add(popup, "block,clicked", _block_clicked_cb, NULL); + EVAS_HINT_EXPAND, + EVAS_HINT_EXPAND); + evas_object_smart_callback_add(popup, "block,clicked", block_clicked_cb, NULL); elm_object_part_text_set(popup, "title,text", ad->title); elm_object_text_set(popup, ad->content); evas_object_smart_callback_add(popup, - "response", - __response_cb, - NULL); + "response", + response_cb, + NULL); evas_object_show(popup); } } } + bundle_free(ad->b); +} - return 0; +static void app_pause(void *data) +{ + /* Take necessary actions when application becomes invisible. */ +} + +static void app_resume(void *data) +{ + /* Take necessary actions when application becomes visible. */ +} + +static void app_terminate(void *data) +{ + /* Release all resources. */ +} + +static void ui_app_lang_changed(app_event_info_h event_info, void *user_data) +{ + /* APP_EVENT_LANGUAGE_CHANGED*/ + return; +} + +static void ui_app_orient_changed(app_event_info_h event_info, void *user_data) +{ + /* APP_EVENT_DEVICE_ORIENTATION_CHANGED*/ + return; +} + +static void ui_app_region_changed(app_event_info_h event_info, void *user_data) +{ + /* APP_EVENT_REGION_FORMAT_CHANGED*/ +} + +static void ui_app_low_battery(app_event_info_h event_info, void *user_data) +{ + /* APP_EVENT_LOW_BATTERY*/ +} + +static void ui_app_low_memory(app_event_info_h event_info, void *user_data) +{ + /* APP_EVENT_LOW_MEMORY*/ } int main(int argc, char *argv[]) { - struct appdata ad; - struct appcore_ops ops = { - .create = __app_create, - .terminate = __app_terminate, - .pause = __app_pause, - .resume = __app_resume, - .reset = __app_reset, - }; + appdata_s ad = {0,}; + int ret = 0; -// unsetenv("ELM_SCALE"); + ui_app_lifecycle_callback_s event_callback = {0,}; + app_event_handler_h handlers[5] = {NULL, }; - /* appcore measure time example */ - printf("from AUL to %s(): %d msec\n", __func__, - appcore_measure_time_from("APP_START_TIME")); + event_callback.create = app_create; + event_callback.terminate = app_terminate; + event_callback.pause = app_pause; + event_callback.resume = app_resume; + event_callback.app_control = app_control; - memset(&ad, 0x0, sizeof(struct appdata)); - ops.data = &ad; + ui_app_add_event_handler(&handlers[APP_EVENT_LOW_BATTERY], APP_EVENT_LOW_BATTERY, ui_app_low_battery, &ad); + ui_app_add_event_handler(&handlers[APP_EVENT_LOW_MEMORY], APP_EVENT_LOW_MEMORY, ui_app_low_memory, &ad); + ui_app_add_event_handler(&handlers[APP_EVENT_DEVICE_ORIENTATION_CHANGED], APP_EVENT_DEVICE_ORIENTATION_CHANGED, ui_app_orient_changed, &ad); + ui_app_add_event_handler(&handlers[APP_EVENT_LANGUAGE_CHANGED], APP_EVENT_LANGUAGE_CHANGED, ui_app_lang_changed, &ad); + ui_app_add_event_handler(&handlers[APP_EVENT_REGION_FORMAT_CHANGED], APP_EVENT_REGION_FORMAT_CHANGED, ui_app_region_changed, &ad); + + ret = ui_app_main(argc, argv, &event_callback, &ad); + if (ret != APP_ERROR_NONE) { + dlog_print(DLOG_ERROR, LOG_TAG, "app_main() is failed. err = %d", ret); + } - return appcore_efl_main(PACKAGE, &argc, &argv, &ops); + return ret; } diff --git a/syspopup-app/syspopup-app.h b/syspopup-app/syspopup-app.h index 558d4ae..c77c4c7 100755 --- a/syspopup-app/syspopup-app.h +++ b/syspopup-app/syspopup-app.h @@ -24,30 +24,20 @@ #ifndef __SYSPOPUP_APP_H__ #define __SYSPOPUP_APP_H__ +#include #include +#ifdef LOG_TAG +#undef LOG_TAG +#endif +#define LOG_TAG "syspopup-app" + #if !defined(PACKAGE) -# define PACKAGE "syspopup-app" +#define PACKAGE "syspopup-app" #endif -#define NAME_BUF_LEN 256 #define TITLE_BUF_LEN 256 #define CONTENT_BUF_LEN 256 -#define QP_BUF_LEN 10 -#define QP_PRIVID 1 -#define QP_TERM 1 -#define QP_TIMEOUT 1 - -struct appdata { - Evas_Object *win; - Evas_Object *popup; - bundle *b; - char title[TITLE_BUF_LEN]; - char content[CONTENT_BUF_LEN]; - - /* add more variables here */ -}; - #endif /* __SYSPOPUP_APP_H__ */ diff --git a/syspopup-caller.manifest b/syspopup-caller.manifest new file mode 100755 index 0000000..97e8c31 --- /dev/null +++ b/syspopup-caller.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/syspopup.manifest b/syspopup.manifest new file mode 100755 index 0000000..1d49be5 --- /dev/null +++ b/syspopup.manifest @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + diff --git a/syspopup/syspopup.c b/syspopup/syspopup.c index 0ad0b54..12d9995 100755 --- a/syspopup/syspopup.c +++ b/syspopup/syspopup.c @@ -28,6 +28,8 @@ #include #include +#define WIN_PROP_NAME "SYSTEM_POPUP" + static int __utilx_ss_get_window_property(Display *dpy, Window win, Atom atom, Atom type, unsigned int *val, unsigned int len) @@ -89,41 +91,47 @@ static Window get_active_win(Display *dpy, Window win, Atom property) static void __X_syspopup_term_handler(void *data) { syspopup *tmp; - Display *d; + syspopup *next; + Display *d = NULL; Window win; - _D("enter syspopup term handler"); + _I("enter syspopup term handler"); d = XOpenDisplay(NULL); + if(!d){ + _E("XOpenDisplay return null"); + } + tmp = _syspopup_get_head(); while (tmp) { + + _I("term action %d - %s", tmp->term_act, tmp->name); + next = tmp->next; + switch (tmp->term_act) { case SYSPOPUP_TERM: + win = (Window) tmp->internal_data; + if (tmp->def_term_fn != NULL) - tmp->def_term_fn(tmp->dupped_bundle, - tmp->user_data); + tmp->def_term_fn(tmp->dupped_bundle, tmp->user_data); - win = (Window) tmp->internal_data; - XKillClient(d, win); - /*XDestroyWindow(d, win);*/ - /* TODO :modify for multi popup */ + if(d) XKillClient(d, win); break; case SYSPOPUP_HIDE: + win = (Window) tmp->internal_data; + if (tmp->def_term_fn != NULL) - tmp->def_term_fn(tmp->dupped_bundle, - tmp->user_data); + tmp->def_term_fn(tmp->dupped_bundle, tmp->user_data); - win = (Window) tmp->internal_data; - XUnmapWindow(d, win); + if(d) XUnmapWindow(d, win); break; default: - _D("term action IGNORED - %s", tmp->name); + _I("term action IGNORED - %s", tmp->name); } - tmp = tmp->next; + tmp = next; } - XCloseDisplay(d); - /*TODO : if there is no popup window, kill client*/ + if(d) XCloseDisplay(d); } static gboolean __X_syspopup_timeout_handler(void *user_data) @@ -259,6 +267,7 @@ int X_syspopup_process_keydown(int id, const char *keyname) return 0; } +#ifdef ROTATE_USING_X_CLIENT int X_syspopup_process_rotate(int id) { Display *d; @@ -278,6 +287,18 @@ int X_syspopup_process_rotate(int id) return 0; } +#else +static void __efl_rotation_set(Evas_Object* win, Ecore_X_Window xwin) +{ + ecore_x_icccm_name_class_set(xwin, WIN_PROP_NAME, WIN_PROP_NAME); + if (elm_win_wm_rotation_supported_get(win)) { + int rots[4] = { 0, 90, 180, 270 }; + elm_win_wm_rotation_available_rotations_set(win, &rots, 4); + } else { + _E("win rotation no supported"); + } +} +#endif int X_make_syspopup(bundle *b, Display *dpy, Window xwin, void *win, int (*rotate_func) (Display*, Window, syspopup*), @@ -334,13 +355,15 @@ int X_make_syspopup(bundle *b, Display *dpy, Window xwin, void *win, __X_syspopup_change_xwin_type(dpy, xwin); utilx_set_system_notification_level(dpy, xwin, info->prio); - utilx_grab_key(dpy, xwin, KEY_END, TOP_POSITION_GRAB); - if (info->focus == 1) { __X_syspopup_disable_focus (dpy, xwin); } +#ifdef ROTATE_USING_X_CLIENT rotate_func(dpy, xwin, sp); +#else + __efl_rotation_set((Evas_Object* )win,(Ecore_X_Window)xwin); +#endif if (is_unviewable == 1) { XMapWindow(dpy, xwin); @@ -370,7 +393,6 @@ int X_syspopup_reset(bundle *b) const char *popup_name; syspopup_info_t *info; syspopup *sp = NULL; - int (*rotate_func) (Display *, Window, syspopup *); popup_name = _syspopup_get_name_from_bundle(b); if (popup_name == NULL) @@ -392,19 +414,30 @@ int X_syspopup_reset(bundle *b) free(sp->dupped_bundle); sp->dupped_bundle = bundle_dup(b); - d = XOpenDisplay(NULL); - win = (Window) sp->internal_data; - utilx_set_system_notification_level(d, win, info->prio); + do { + d = XOpenDisplay(NULL); + win = (Window) sp->internal_data; + if((!d) || (!win)) { + _E("X open is null"); + break; + } + utilx_set_system_notification_level(d, win, info->prio); - if (info->focus == 1) { - __X_syspopup_disable_focus (d, win); - } - rotate_func = sp->rotate_cb; - rotate_func(d, win, sp); + if (info->focus == 1) { + __X_syspopup_disable_focus (d, win); + } - XMapWindow(d, win); - /*XMapRaised(d,win);*/ - XCloseDisplay(d); +#ifdef ROTATE_USING_X_CLIENT + int (*rotate_func) (Display *, Window, syspopup *); + rotate_func = sp->rotate_cb; + rotate_func(d, win, sp); +#else + __efl_rotation_set((Evas_Object *)sp->win, (Ecore_X_Window)win); +#endif + XMapWindow(d, win); + /*XMapRaised(d,win);*/ + XCloseDisplay(d); + } while (0); _syspopup_info_free(info); } @@ -424,3 +457,34 @@ API int syspopup_has_popup(bundle *b) return 0; } +API int syspopup_reset_timeout(bundle *b, unsigned int time) +{ + const char *popup_name; + syspopup_info_t *info; + syspopup *sp = NULL; + int ret; + + popup_name = _syspopup_get_name_from_bundle(b); + if (popup_name == NULL) { + _E("popup_name is null"); + return -1; + } + + sp = _syspopup_find(popup_name); + if (!sp) { + _E("find syspopup error"); + return -1; + } else { + info = _syspopup_info_get(popup_name); + if (info == NULL) { + _E("get syspopup info error"); + return -1; + } + info->timeout = time; + ret = _syspopup_reset_timeout(sp, info); + _syspopup_info_free(info); + } + + return ret; +} + diff --git a/syspopup/syspopup_efl.c b/syspopup/syspopup_efl.c index 4360b01..7767d2f 100755 --- a/syspopup/syspopup_efl.c +++ b/syspopup/syspopup_efl.c @@ -30,17 +30,6 @@ #include #include -static void __elm_popupwin_del_cb(void *data, Evas * e, Evas_Object * obj, - void *event_info) -{ - int id; - - id = (int)data; - _D("callback del called, destroy internal data - id = %d\n", id); - - _syspopup_del(id); -} - static Eina_Bool __x_keydown_cb(void *data, int type, void *event) { int id = (int)data; @@ -54,6 +43,7 @@ static Eina_Bool __x_keydown_cb(void *data, int type, void *event) return ECORE_CALLBACK_DONE; } +#ifdef ROTATE_USING_X_CLIENT static Eina_Bool __x_rotate_cb(void *data, int type, void *event) { int id = (int)data; @@ -83,6 +73,12 @@ static int __efl_rotate(Display *dpy, Window win, syspopup *sp) return 0; } +#else +static int __efl_rotate(Display *dpy, Window win, syspopup *sp) +{ + return 0; +} +#endif API int syspopup_create(bundle *b, syspopup_handler *handler, Evas_Object *parent, void *user_data) @@ -116,7 +112,7 @@ API int syspopup_create(bundle *b, syspopup_handler *handler, id = X_make_syspopup(b, dpy, xwin, parent, __efl_rotate, handler, user_data); - if (id < 0) { + if (id < 0) { _E("fail to make X syspopup"); return -1; } @@ -124,15 +120,12 @@ API int syspopup_create(bundle *b, syspopup_handler *handler, ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, __x_keydown_cb, (void *)id); - evas_object_event_callback_add(parent, EVAS_CALLBACK_DEL, - __elm_popupwin_del_cb, (void *)id); - /* X_syspopup_core should process 2 events */ /* First, rotate event */ /* Second, keydown event */ - ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE, - __x_rotate_cb, (void *)id); - +#ifdef ROTATE_USING_X_CLIENT + ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE,__x_rotate_cb, (void *)id); +#endif } return 0; diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 86f105d..fbb9dac 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -3,6 +3,6 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TEST_CFLAGS}") INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/syspopup-caller) add_executable(sp_test test.c) -target_link_libraries(sp_test syspopup_caller ${pkgs_LDFLAGS}) +target_link_libraries(sp_test syspopup_caller ${pkgs_LDFLAGS} "-pie") INSTALL(TARGETS sp_test DESTINATION bin) diff --git a/test/test.c b/test/test.c index 8bf3163..ea23627 100755 --- a/test/test.c +++ b/test/test.c @@ -35,6 +35,7 @@ int main(int argc, char **argv) { bundle *b; int i; + int ret = 0; if (argc < 2) { usage(); @@ -50,10 +51,13 @@ int main(int argc, char **argv) b = bundle_create(); for (i = 3; i < argc; i = i + 2) bundle_add(b, argv[i], argv[i + 1]); - syspopup_launch(argv[2], b); + ret = syspopup_launch(argv[2], b); bundle_free(b); + if(ret < 0) return -1; + } else if (strcmp(argv[1], "destroy") == 0) { - syspopup_destroy_all(); + ret = syspopup_destroy_all(); + if(ret < 0) return -1; } else { usage(); } -- 2.7.4