diff --git a/api/epplet.c b/api/epplet.c index 97456dd..7b1fa98 100644 --- a/api/epplet.c +++ b/api/epplet.c @@ -2,6 +2,7 @@ #include "epplet.h" #include #include +#include #include #include #include @@ -977,6 +978,15 @@ Epplet_cleanup(void) Epplet_save_config(); } +void +Epplet_adjust_priority(int nice) +{ + int prio; + + prio = getpriority(PRIO_PROCESS, getpid()); + setpriority(PRIO_PROCESS, getpid(), prio + nice); +} + void Epplet_show(void) { diff --git a/api/epplet.h.in b/api/epplet.h.in index 4b038c0..6d2141d 100644 --- a/api/epplet.h.in +++ b/api/epplet.h.in @@ -91,6 +91,9 @@ EAPI void Epplet_Init(const char *name, const char *version, EAPI void Epplet_cleanup(void); +/* Adjust priority */ +EAPI void Epplet_adjust_priority(int nice); + /* actualy display the app */ EAPI void Epplet_show(void); diff --git a/epplets/E-Bandwidth.c b/epplets/E-Bandwidth.c index 1271ae3..b5c6487 100644 --- a/epplets/E-Bandwidth.c +++ b/epplets/E-Bandwidth.c @@ -21,7 +21,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include -#include #include "config.h" #include "epplet.h" @@ -266,10 +265,8 @@ parse_conf(void) int main(int argc, char **argv) { - int prio; + Epplet_adjust_priority(10); - prio = getpriority(PRIO_PROCESS, getpid()); - setpriority(PRIO_PROCESS, getpid(), prio + 10); atexit(Epplet_cleanup); Epplet_Init("E-Bandwidth", "0.2", "Enlightenment Network I/O Monitor Epplet", 3, 3, argc, argv, 0); diff --git a/epplets/E-Biff.c b/epplets/E-Biff.c index 919e771..1166fda 100644 --- a/epplets/E-Biff.c +++ b/epplets/E-Biff.c @@ -22,7 +22,6 @@ */ #include #include -#include #include #include #include @@ -425,10 +424,8 @@ process_conf(void) int main(int argc, char **argv) { - int prio; + Epplet_adjust_priority(10); - prio = getpriority(PRIO_PROCESS, getpid()); - setpriority(PRIO_PROCESS, getpid(), prio + 10); atexit(Epplet_cleanup); Epplet_Init("E-Biff", "0.5", "Enlightenment Mailbox Checker Epplet", 3, 3, argc, argv, 0); diff --git a/epplets/E-Cpu.c b/epplets/E-Cpu.c index 30a7bad..f5f0dc5 100644 --- a/epplets/E-Cpu.c +++ b/epplets/E-Cpu.c @@ -1,6 +1,5 @@ #include #include -#include #include #include #include @@ -421,10 +420,9 @@ int main(int argc, char **argv) { Epplet_gadget p; - int prio; - prio = getpriority(PRIO_PROCESS, getpid()); - setpriority(PRIO_PROCESS, getpid(), prio + 10); + Epplet_adjust_priority(10); + atexit(Epplet_cleanup); cpus = count_cpus(); diff --git a/epplets/E-Disk.c b/epplets/E-Disk.c index 550f32e..67f8595 100644 --- a/epplets/E-Disk.c +++ b/epplets/E-Disk.c @@ -22,7 +22,6 @@ */ #include #include -#include #include "config.h" #include "epplet.h" @@ -245,10 +244,8 @@ parse_conf(void) int main(int argc, char **argv) { - int prio; + Epplet_adjust_priority(10); - prio = getpriority(PRIO_PROCESS, getpid()); - setpriority(PRIO_PROCESS, getpid(), prio + 10); atexit(Epplet_cleanup); Epplet_Init("E-Disk", "0.2", "Enlightenment Disk I/O Monitor Epplet", 3, 3, argc, argv, 0); diff --git a/epplets/E-MemWatch.c b/epplets/E-MemWatch.c index 29891f1..7c62efd 100644 --- a/epplets/E-MemWatch.c +++ b/epplets/E-MemWatch.c @@ -22,7 +22,6 @@ */ #include #include -#include #include "config.h" #include "epplet.h" @@ -249,7 +248,7 @@ out_cb(void *data __UNUSED__, Window w) int main(int argc, char **argv) { - int prio; + Epplet_adjust_priority(10); /* check for Kernel 2.6 */ FILE *fp; @@ -274,8 +273,7 @@ main(int argc, char **argv) /* end check for Kernel 2.6 */ atexit(Epplet_cleanup); - prio = getpriority(PRIO_PROCESS, getpid()); - setpriority(PRIO_PROCESS, getpid(), prio + 10); + Epplet_Init("E-MemWatch", "0.1", "Enlightenment RAM/Swap Monitor Epplet", 3, 3, argc, argv, 0); Epplet_load_config(); diff --git a/epplets/E-MoonClock.c b/epplets/E-MoonClock.c index 46cbe5d..7ba424c 100644 --- a/epplets/E-MoonClock.c +++ b/epplets/E-MoonClock.c @@ -22,8 +22,6 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA */ -#include - #include "config.h" #include "epplet.h" #include "CalcEphem.h" @@ -101,11 +99,10 @@ out_cb(void *data __UNUSED__, Window w) int main(int argc, char **argv) { - int prio; + Epplet_adjust_priority(10); - prio = getpriority(PRIO_PROCESS, getpid()); - setpriority(PRIO_PROCESS, getpid(), prio + 10); atexit(Epplet_cleanup); + Epplet_Init("E-MoonClock", "0.1", "Enlightenment MoonClock Epplet", 3, 3, argc, argv, 0); Epplet_load_config(); diff --git a/epplets/E-Net.c b/epplets/E-Net.c index b5127bf..67bca67 100644 --- a/epplets/E-Net.c +++ b/epplets/E-Net.c @@ -1,6 +1,5 @@ #include #include -#include #include #include #include @@ -107,10 +106,9 @@ int main(int argc, char **argv) { Epplet_gadget p1, p2; - int prio; - prio = getpriority(PRIO_PROCESS, getpid()); - setpriority(PRIO_PROCESS, getpid(), prio + 10); + Epplet_adjust_priority(10); + atexit(Epplet_cleanup); Epplet_Init("E-Net", "0.1", "Enlightenment Network Load Epplet", diff --git a/epplets/E-NetFlame.c b/epplets/E-NetFlame.c index dd6e08f..6730984 100644 --- a/epplets/E-NetFlame.c +++ b/epplets/E-NetFlame.c @@ -5,7 +5,6 @@ /****************************************************************/ #include #include -#include #include "config.h" #include "epplet.h" @@ -392,10 +391,9 @@ int main(int argc, char **argv) { Epplet_gadget p; - int prio; - prio = getpriority(PRIO_PROCESS, getpid()); - setpriority(PRIO_PROCESS, getpid(), prio + 10); + Epplet_adjust_priority(10); + atexit(Epplet_cleanup); load_val = calloc(DIVISIONS, sizeof(int)); diff --git a/epplets/E-NetGraph.c b/epplets/E-NetGraph.c index 4d94027..97ed8e8 100644 --- a/epplets/E-NetGraph.c +++ b/epplets/E-NetGraph.c @@ -6,7 +6,6 @@ * Modified by Rahsheen Porter (StriderZ) */ #include -#include #include #include "config.h" @@ -402,10 +401,9 @@ main(int argc, char **argv) { Epplet_gadget drawingarea; int i = 1; - int prio; - prio = getpriority(PRIO_PROCESS, getpid()); - setpriority(PRIO_PROCESS, getpid(), prio + 10); + Epplet_adjust_priority(10); + Epplet_Init("E-NetGraph", "0.2", "Enlightenment Network Activity epplet", 3, 3, argc, argv, 0); diff --git a/epplets/E-OpenGL-Demo.c b/epplets/E-OpenGL-Demo.c index 9778b2b..7348ed4 100644 --- a/epplets/E-OpenGL-Demo.c +++ b/epplets/E-OpenGL-Demo.c @@ -21,7 +21,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include -#include #include "config.h" #include "epplet.h" @@ -372,18 +371,16 @@ int main(int argc, char **argv) { char buf[1024]; - GLXContext cx; - int prio; Epplet_gadget objectPopup, lightingPopup, texturePopup; FILE *textureFile; + Epplet_adjust_priority(10); + /* This has to be an unsignned byte, otherwise you'll loose the 8th * bit to the sign since the texture is 8 bits per color component. */ GLubyte textureArray[3 * 64 * 64]; - prio = getpriority(PRIO_PROCESS, getpid()); - setpriority(PRIO_PROCESS, getpid(), prio + 10); atexit(Epplet_cleanup); Epplet_Init("E-OpenGL-Demo", "0.1", "Enlightenment OpenGL Demo", diff --git a/epplets/E-PlayCD.c b/epplets/E-PlayCD.c index c3a5a58..0ee0ab9 100644 --- a/epplets/E-PlayCD.c +++ b/epplets/E-PlayCD.c @@ -1,5 +1,4 @@ #include -#include #include "config.h" #include "epplet.h" @@ -524,7 +523,7 @@ main(int argc, char **argv) "HELP", "REWIND", "FAST_FORWARD", "REPEAT", "CONFIGURE", "EJECT" }; - int i, prio; + int i; typedef void (*callback_func) (void *data); callback_func button_funcs[] = { @@ -532,9 +531,11 @@ main(int argc, char **argv) popup_tracks, do_help, rew_cd, ff_cd, NULL, cddb_update, eject_cd }; + + Epplet_adjust_priority(10); + atexit(Epplet_cleanup); - prio = getpriority(PRIO_PROCESS, getpid()); - setpriority(PRIO_PROCESS, getpid(), prio + 10); + Epplet_Init("E-PlayCD", "0.5", "Enlightenment CD Player Epplet", 5, 3, argc, argv, 0); Epplet_load_config(); diff --git a/epplets/E-SD.c b/epplets/E-SD.c index 5a4ff9f..a74151b 100644 --- a/epplets/E-SD.c +++ b/epplets/E-SD.c @@ -21,7 +21,6 @@ #include #include #include -#include #include "config.h" #include "epplet.h" @@ -544,10 +543,7 @@ clean_exit(void) int main(int argc, char **argv) { - int prio; - - prio = getpriority(PRIO_PROCESS, getpid()); - setpriority(PRIO_PROCESS, getpid(), prio + 10); + Epplet_adjust_priority(10); atexit(clean_exit); diff --git a/epplets/E-ScreenSave.c b/epplets/E-ScreenSave.c index e449a5f..d73de08 100644 --- a/epplets/E-ScreenSave.c +++ b/epplets/E-ScreenSave.c @@ -18,7 +18,6 @@ * USA */ #include -#include #include "config.h" #include "cloak.h" @@ -614,10 +613,8 @@ clean_exit(void) int main(int argc, char **argv) { - int prio; + Epplet_adjust_priority(10); - prio = getpriority(PRIO_PROCESS, getpid()); - setpriority(PRIO_PROCESS, getpid(), prio + 10); atexit(clean_exit); /* Initialise random numbers */ srand(time(0)); diff --git a/epplets/E-ScreenShoot.c b/epplets/E-ScreenShoot.c index dfebde8..577a88b 100644 --- a/epplets/E-ScreenShoot.c +++ b/epplets/E-ScreenShoot.c @@ -18,7 +18,6 @@ * USA */ #include -#include #include "config.h" #include "epplet.h" @@ -976,10 +975,7 @@ clean_exit(void) int main(int argc, char **argv) { - int prio; - - prio = getpriority(PRIO_PROCESS, getpid()); - setpriority(PRIO_PROCESS, getpid(), prio + 10); + Epplet_adjust_priority(10); atexit(clean_exit); diff --git a/epplets/E-Slides.c b/epplets/E-Slides.c index 0427615..547dcc1 100644 --- a/epplets/E-Slides.c +++ b/epplets/E-Slides.c @@ -22,7 +22,6 @@ */ #include #include -#include #include "config.h" #include "epplet.h" @@ -691,11 +690,10 @@ get_images(char *image_path) int main(int argc, char **argv) { + int j = 0; - int prio, j = 0; + Epplet_adjust_priority(10); - prio = getpriority(PRIO_PROCESS, getpid()); - setpriority(PRIO_PROCESS, getpid(), prio + 10); atexit(Epplet_cleanup); srand(getpid() * time(NULL) % ((unsigned int)-1)); diff --git a/epplets/E-Sys.c b/epplets/E-Sys.c index 10f48cc..8240077 100644 --- a/epplets/E-Sys.c +++ b/epplets/E-Sys.c @@ -21,7 +21,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include -#include #include "config.h" #include "epplet.h" @@ -124,12 +123,10 @@ out_cb(void *data __UNUSED__, Window w) int main(int argc, char **argv) { - - int prio; + Epplet_adjust_priority(10); atexit(Epplet_cleanup); - prio = getpriority(PRIO_PROCESS, getpid()); - setpriority(PRIO_PROCESS, getpid(), prio + 10); + Epplet_Init("E-Sys", "0.1", "Enlightenment Uptime Epplet", 3, 3, argc, argv, 0); diff --git a/epplets/E-UrlWatch.c b/epplets/E-UrlWatch.c index 4795262..fb67963 100644 --- a/epplets/E-UrlWatch.c +++ b/epplets/E-UrlWatch.c @@ -18,7 +18,6 @@ * USA */ #include -#include #include "config.h" #include "epplet.h" @@ -836,12 +835,10 @@ work_out_cb(void *data __UNUSED__, Window w) int main(int argc, char **argv) { - int prio; + Epplet_adjust_priority(10); - /* Lower priority to save cpu cycles */ - prio = getpriority(PRIO_PROCESS, getpid()); - setpriority(PRIO_PROCESS, getpid(), prio + 10); atexit(clean_exit); + Epplet_Init("E-UrlWatch", "0.1", "Enlightenment Url Watcher Epplet", 6, 3, argc, argv, 0); Epplet_load_config(); diff --git a/epplets/E-Wireless.c b/epplets/E-Wireless.c index ab92bab..2a5cd8f 100644 --- a/epplets/E-Wireless.c +++ b/epplets/E-Wireless.c @@ -5,7 +5,6 @@ * and his E-CpuX Epplet. */ #include -#include #include "config.h" #include "epplet.h" @@ -225,11 +224,10 @@ main(int argc, char *argv[]) { const char *ptr; char s[64]; - int priority; Epplet_gadget p; - priority = getpriority(PRIO_PROCESS, getpid()); - setpriority(PRIO_PROCESS, getpid(), priority + 10); + Epplet_adjust_priority(10); + atexit(Epplet_cleanup); cpu_hist_size = WIDTH; diff --git a/epplets/E-Xss.c b/epplets/E-Xss.c index 1403944..c4a2486 100644 --- a/epplets/E-Xss.c +++ b/epplets/E-Xss.c @@ -21,7 +21,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include -#include #include #include "config.h" @@ -331,10 +330,7 @@ parse_config(void) int main(int argc, char **argv) { - int prio; - - prio = getpriority(PRIO_PROCESS, getpid()); - setpriority(PRIO_PROCESS, getpid(), prio + 10); + Epplet_adjust_priority(10); atexit(Epplet_cleanup);