mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

re-base patches

Browse Source
This commit is contained in:
marschap
2007-04-14 18:00:26 +00:00
parent ae128a6270
commit 1e15ade483
4 changed files with 138 additions and 1202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/patches/lcdprocserverHKEY.diff
+14 -50
View File
@@ -1,10 +1,10 @@
diff --exclude='*.wanjet' --exclude='.??*' --exclude=config.h --exclude='*.orig' --exclude=Makefile --exclude='*.o' --exclude=Doxyfile --exclude='*.a' --exclude=config.log --exclude=config.status --exclude='init-*' -Nuarp server/menu.c server.HKEY/menu.c diff -Nuarp server/menu.c server.HKEY/menu.c
--- server/menu.c 2006-01-26 19:47:59.000000000 -0800 --- server/menu.c 2006-01-26 19:47:59.000000000 -0800
+++ server.HKEY/menu.c 2006-02-21 09:21:25.000000000 -0800 +++ server.HKEY/menu.c 2006-02-21 09:21:25.000000000 -0800
@@ -39,6 +39,13 @@ @@ -40,6 +40,13 @@
#include "screen.h"
#include "widget.h" #include "widget.h"
+#ifndef HKEY //hybrid keys +#ifndef HKEY //hybrid keys
+#include "shared/configfile.h" +#include "shared/configfile.h"
+ +
@@ -12,10 +12,10 @@ diff --exclude='*.wanjet' --exclude='.??*' --exclude=config.h --exclude='*.orig'
+extern int hybrid_right_key; +extern int hybrid_right_key;
+#endif //HKEY +#endif //HKEY
+ +
extern Menu *custom_main_menu;
/** Basicly a patched version of LL_GetByIndex() that ignores hidden /** Basicly a patched version of LL_GetByIndex() that ignores hidden
* entries completely. (But it takes a menu as an argument.) */ @@ -565,12 +572,86 @@
static void *
@@ -559,12 +566,86 @@ MenuResult menu_process_input(Menu *menu
return MENURESULT_ERROR; return MENURESULT_ERROR;
switch (token) { switch (token) {
@@ -102,7 +102,7 @@ diff --exclude='*.wanjet' --exclude='.??*' --exclude=config.h --exclude='*.orig'
case MENUTOKEN_ENTER: case MENUTOKEN_ENTER:
subitem = menu_get_subitem(menu, menu->data.menu.selector_pos); subitem = menu_get_subitem(menu, menu->data.menu.selector_pos);
if (!subitem) if (!subitem)
@@ -609,6 +690,18 @@ MenuResult menu_process_input(Menu *menu @@ -615,6 +696,18 @@
menu->data.menu.scroll --; menu->data.menu.scroll --;
} }
else if (menu->data.menu.selector_pos == 0) { else if (menu->data.menu.selector_pos == 0) {
@@ -121,7 +121,7 @@ diff --exclude='*.wanjet' --exclude='.??*' --exclude=config.h --exclude='*.orig'
// wrap around to last menu entry // wrap around to last menu entry
menu->data.menu.selector_pos = menu_visible_item_count(menu) - 1; menu->data.menu.selector_pos = menu_visible_item_count(menu) - 1;
menu->data.menu.scroll = menu->data.menu.selector_pos + 2 - display_props->height; menu->data.menu.scroll = menu->data.menu.selector_pos + 2 - display_props->height;
@@ -626,67 +719,6 @@ MenuResult menu_process_input(Menu *menu @@ -632,67 +725,6 @@
menu->data.menu.scroll = 0; menu->data.menu.scroll = 0;
} }
return MENURESULT_NONE; return MENURESULT_NONE;
@@ -189,7 +189,7 @@ diff --exclude='*.wanjet' --exclude='.??*' --exclude=config.h --exclude='*.orig'
case MENUTOKEN_OTHER: case MENUTOKEN_OTHER:
/* TODO: move to the selected number and enter it */ /* TODO: move to the selected number and enter it */
return MENURESULT_NONE; return MENURESULT_NONE;
diff --exclude='*.wanjet' --exclude='.??*' --exclude=config.h --exclude='*.orig' --exclude=Makefile --exclude='*.o' --exclude=Doxyfile --exclude='*.a' --exclude=config.log --exclude=config.status --exclude='init-*' -Nuarp server/menuitem.c server.HKEY/menuitem.c diff -Nuarp server/menuitem.c server.HKEY/menuitem.c
--- server/menuitem.c 2006-01-26 19:47:59.000000000 -0800 --- server/menuitem.c 2006-01-26 19:47:59.000000000 -0800
+++ server.HKEY/menuitem.c 2006-02-21 09:22:53.000000000 -0800 +++ server.HKEY/menuitem.c 2006-02-21 09:22:53.000000000 -0800
@@ -84,6 +84,10 @@ const IpSstringProperties IPinfo[] = { @@ -84,6 +84,10 @@ const IpSstringProperties IPinfo[] = {
@@ -467,10 +467,10 @@ diff --exclude='*.wanjet' --exclude='.??*' --exclude=config.h --exclude='*.orig'
case MENUTOKEN_OTHER: case MENUTOKEN_OTHER:
/* process other keys */ /* process other keys */
if ((strlen(key) == 1) && if ((strlen(key) == 1) &&
diff --exclude='*.wanjet' --exclude='.??*' --exclude=config.h --exclude='*.orig' --exclude=Makefile --exclude='*.o' --exclude=Doxyfile --exclude='*.a' --exclude=config.log --exclude=config.status --exclude='init-*' -Nuarp server/menuscreens.c server.HKEY/menuscreens.c diff -Nuarp server/menuscreens.c server.HKEY/menuscreens.c
--- server/menuscreens.c 2006-01-26 19:47:59.000000000 -0800 --- server/menuscreens.c 2006-01-26 19:47:59.000000000 -0800
+++ server.HKEY/menuscreens.c 2006-02-21 09:33:21.000000000 -0800 +++ server.HKEY/menuscreens.c 2006-02-21 09:33:21.000000000 -0800
@@ -48,6 +48,15 @@ char * down_key; @@ -48,6 +48,15 @@
char *left_key; char *left_key;
char *right_key; char *right_key;
@@ -486,7 +486,7 @@ diff --exclude='*.wanjet' --exclude='.??*' --exclude=config.h --exclude='*.orig'
Screen *menuscreen = NULL; Screen *menuscreen = NULL;
MenuItem *active_menuitem = NULL; MenuItem *active_menuitem = NULL;
/** the "real" main_menu */ /** the "real" main_menu */
@@ -91,6 +100,11 @@ int menuscreens_init() @@ -91,6 +100,10 @@
if (tmp) if (tmp)
right_key = strdup(tmp); right_key = strdup(tmp);
@@ -494,13 +494,12 @@ diff --exclude='*.wanjet' --exclude='.??*' --exclude=config.h --exclude='*.orig'
+ hybrid_right_key = config_get_bool("menu", "HybridRightKey", 0, 0); + hybrid_right_key = config_get_bool("menu", "HybridRightKey", 0, 0);
+ hybrid_left_key = config_get_bool("menu", "HybridLeftKey", 0, 0); + hybrid_left_key = config_get_bool("menu", "HybridLeftKey", 0, 0);
+#endif +#endif
+
/* Now reserve keys */ /* Now reserve keys */
input_reserve_key(menu_key, true, NULL); input_reserve_key(menu_key, true, NULL);
@@ -186,6 +200,11 @@ void menuscreen_inform_item_modified (Me @@ -186,6 +199,11 @@
bool is_menu_key (char * key) bool is_menu_key(const char *key)
{ {
+#ifndef HKEY //hybrid keys, any key wake-up menus +#ifndef HKEY //hybrid keys, any key wake-up menus
+ /* any key wakes up menus */ + /* any key wakes up menus */
@@ -510,38 +509,3 @@ diff --exclude='*.wanjet' --exclude='.??*' --exclude=config.h --exclude='*.orig'
if (menu_key && key && strcmp(key, menu_key) == 0) if (menu_key && key && strcmp(key, menu_key) == 0)
return true; return true;
else else
@@ -466,28 +485,28 @@ void menuscreen_create_menu ()
menu_add_item (options_menu, driver_menu);
if (contrast_avail) {
int contrast = driver->get_contrast(driver);
-
+
/* menu's client is NULL since we're in the server */
slider = menuitem_create_slider ("contrast", contrast_handler, "Contrast",
- NULL, "min", "max", 0, 1000, 25, contrast);
+ NULL, "min", "max", 0, 1000, 25, contrast);
menu_add_item (driver_menu, slider);
}
if (brightness_avail) {
int onbrightness = driver->get_brightness (driver, BACKLIGHT_ON);
int offbrightness = driver->get_brightness (driver, BACKLIGHT_OFF);
-
+
slider = menuitem_create_slider ("onbrightness", brightness_handler, "On Brightness",
- NULL, "min", "max", 0, 1000, 25, onbrightness);
+ NULL, "min", "max", 0, 1000, 25, onbrightness);
menu_add_item (driver_menu, slider);
slider = menuitem_create_slider ("offbrightness", brightness_handler, "Off Brightness",
- NULL, "min", "max", 0, 1000, 25, offbrightness);
+ NULL, "min", "max", 0, 1000, 25, offbrightness);
menu_add_item (driver_menu, slider);
}
}
}
-#ifdef LCDPROC_TESTMENUS
+#ifdef LCDPROC_TESTMENUS
test_menu = menu_create ("test", NULL, "Test menu", NULL);
menu_add_item (main_menu, test_menu);
contrib/patches/lcdprocserverOPT.diff
+6 -14
View File
@@ -11,7 +11,7 @@ diff -ruNp lcdproc-0.5.1-orig/server/drivers/CFontz633.c lcdproc-0.5.1-working/s
/** /**
@@ -302,6 +305,19 @@ CFontz633_init (Driver *drvthis) @@ -303,6 +306,19 @@ CFontz633_init (Driver *drvthis)
CFontz633_no_live_report(drvthis); CFontz633_no_live_report(drvthis);
CFontz633_hardware_clear(drvthis); CFontz633_hardware_clear(drvthis);
@@ -31,7 +31,7 @@ diff -ruNp lcdproc-0.5.1-orig/server/drivers/CFontz633.c lcdproc-0.5.1-working/s
report(RPT_DEBUG, "%s: init() done", drvthis->name); report(RPT_DEBUG, "%s: init() done", drvthis->name);
return 0; return 0;
@@ -1076,3 +1092,15 @@ CFontz633_string (Driver *drvthis, int x @@ -1077,3 +1093,15 @@ CFontz633_string (Driver *drvthis, int x
} }
} }
@@ -196,7 +196,7 @@ diff -ruNp lcdproc-0.5.1-orig/server/menuscreens.c lcdproc-0.5.1-working/server/
diff -ruNp lcdproc-0.5.1-orig/server/serverscreens.c lcdproc-0.5.1-working/server/serverscreens.c diff -ruNp lcdproc-0.5.1-orig/server/serverscreens.c lcdproc-0.5.1-working/server/serverscreens.c
--- lcdproc-0.5.1-orig/server/serverscreens.c 2006-10-06 03:02:47.000000000 -0400 --- lcdproc-0.5.1-orig/server/serverscreens.c 2006-10-06 03:02:47.000000000 -0400
+++ lcdproc-0.5.1-working/server/serverscreens.c 2007-02-23 11:48:56.000000000 -0500 +++ lcdproc-0.5.1-working/server/serverscreens.c 2007-02-23 11:48:56.000000000 -0500
@@ -32,6 +32,12 @@ @@ -33,6 +33,12 @@
#include "main.h" #include "main.h"
#include "serverscreens.h" #include "serverscreens.h"
@@ -208,16 +208,8 @@ diff -ruNp lcdproc-0.5.1-orig/server/serverscreens.c lcdproc-0.5.1-working/serve
+ +
#define UNSET_INT -1 #define UNSET_INT -1
Screen * server_screen;
@@ -39,6 +45,7 @@ int rotate_server_screen = UNSET_INT;
#define MAX_SERVERSCREEN_WIDTH 40 #define MAX_SERVERSCREEN_WIDTH 40
@@ -50,6 +56,11 @@
+
int
server_screen_init ()
{
@@ -47,6 +54,11 @@ server_screen_init ()
debug(RPT_DEBUG, "server_screen_init"); debug(RPT_DEBUG, "server_screen_init");
@@ -229,7 +221,7 @@ diff -ruNp lcdproc-0.5.1-orig/server/serverscreens.c lcdproc-0.5.1-working/serve
/* Create the screen */ /* Create the screen */
server_screen = screen_create("_server_screen", NULL); server_screen = screen_create("_server_screen", NULL);
if (!server_screen) { if (!server_screen) {
@@ -78,7 +90,11 @@ server_screen_init () @@ -81,7 +92,11 @@
w->text = malloc(MAX_SERVERSCREEN_WIDTH+1); w->text = malloc(MAX_SERVERSCREEN_WIDTH+1);
if (line == 1) { if (line == 1) {
w->type = WID_TITLE; w->type = WID_TITLE;
@@ -239,5 +231,5 @@ diff -ruNp lcdproc-0.5.1-orig/server/serverscreens.c lcdproc-0.5.1-working/serve
strncpy(w->text, "LCDproc Server", MAX_SERVERSCREEN_WIDTH); strncpy(w->text, "LCDproc Server", MAX_SERVERSCREEN_WIDTH);
+#endif //OPT +#endif //OPT
} else { } else {
w->text[0] = 0; w->text[0] = '\0';
} }
contrib/patches/lcdprocserverSEG.diff
+4 -1022
View File
File diff suppressed because it is too large Load Diff
contrib/patches/syncscrollers.patch
+6 -8
View File
@@ -1,7 +1,5 @@
Index: server/render.c --- server/render.c
=================================================================== +++ server/render.c
--- server/render.c (revision 78)
+++ server/render.c (revision 79)
@@ -176,6 +176,7 @@ @@ -176,6 +176,7 @@
int length, speed; int length, speed;
int str_length = BUFSIZE-1; int str_length = BUFSIZE-1;
@@ -38,7 +36,7 @@ Index: server/render.c
/* reset widget list */ /* reset widget list */
LL_Rewind(list); LL_Rewind(list);
@@ -343,13 +365,9 @@ @@ -341,13 +363,9 @@
/* it fits within the box, just render it */ /* it fits within the box, just render it */
drivers_string(w->left, w->top, w->text); drivers_string(w->left, w->top, w->text);
} else { } else {
@@ -52,7 +50,7 @@ Index: server/render.c
offset = (timer % (length / (w->speed * -1))) * w->speed * -1; offset = (timer % (length / (w->speed * -1))) * w->speed * -1;
} else { } else {
offset = 0; offset = 0;
@@ -380,28 +398,39 @@ @@ -378,28 +396,39 @@
drivers_string(w->left, w->top, w->text); drivers_string(w->left, w->top, w->text);
} else { } else {
int effLength = length - screen_width; int effLength = length - screen_width;
@@ -103,7 +101,7 @@ Index: server/render.c
} }
} else { } else {
offset = 0; offset = 0;
@@ -440,13 +469,11 @@ @@ -438,13 +467,11 @@
drivers_string (w->left, w->top + i, str); drivers_string (w->left, w->top + i, str);
} }
} else { } else {
@@ -117,7 +115,7 @@ Index: server/render.c
if (((timer / (effLines * w->speed)) % 2) == 0) { if (((timer / (effLines * w->speed)) % 2) == 0) {
/*debug(RPT_DEBUG, "up ");*/ /*debug(RPT_DEBUG, "up ");*/
begin = (timer % (effLines * w->speed)) begin = (timer % (effLines * w->speed))
@@ -458,7 +485,6 @@ @@ -456,7 +483,6 @@
* -1; * -1;
} }
} else if (w->speed < 0) { } else if (w->speed < 0) {