Horizontal scrolling + Get rid of internal busybox to reduce size. (We have busybox on /xbin) + Fix of writing on the line

Author: Xmister

Android.mk

@@ -44,7 +44,7 @@ LOCAL_MODULE := recovery
 
 LOCAL_FORCE_STATIC_EXECUTABLE := true
 
-RECOVERY_VERSION := CM Recovery v2.5.1.0 & LK+XM0.4
+RECOVERY_VERSION := CM Recovery v2.5.1.0 & LK+XM0.5
 LOCAL_CFLAGS += -DRECOVERY_VERSION="$(RECOVERY_VERSION)"
 RECOVERY_API_VERSION := 2
 LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
@@ -147,15 +147,15 @@ ifeq ($(BOARD_CUSTOM_RECOVERY_KEYMAPPING),)
 else
   LOCAL_SRC_FILES += $(BOARD_CUSTOM_RECOVERY_KEYMAPPING)
 endif
-LOCAL_STATIC_LIBRARIES += libbusybox libclearsilverregex libmkyaffs2image libunyaffs liberase_image libdump_image libflash_image libmtdutils
+LOCAL_STATIC_LIBRARIES += libclearsilverregex libmkyaffs2image libunyaffs liberase_image libdump_image libflash_image libmtdutils
 LOCAL_STATIC_LIBRARIES += libamend
 LOCAL_STATIC_LIBRARIES += libminzip libunz libmtdutils libmmcutils libmincrypt
 LOCAL_STATIC_LIBRARIES += libminui libpixelflinger_static libpng libcutils
 LOCAL_STATIC_LIBRARIES += libstdc++ libc
 
 include $(BUILD_EXECUTABLE)
 
-RECOVERY_LINKS := amend busybox flash_image dump_image mkyaffs2image unyaffs erase_image nandroid reboot
+RECOVERY_LINKS := amend flash_image dump_image mkyaffs2image unyaffs erase_image nandroid reboot
 
 # nc is provided by external/netcat
 SYMLINKS := $(addprefix $(TARGET_RECOVERY_ROOT_OUT)/sbin/,$(RECOVERY_LINKS))
@@ -169,16 +169,16 @@ $(SYMLINKS): $(LOCAL_INSTALLED_MODULE)
 ALL_DEFAULT_INSTALLED_MODULES += $(SYMLINKS)
 
 # Now let's do recovery symlinks
-BUSYBOX_LINKS := $(shell cat external/busybox/busybox-minimal.links)
-SYMLINKS := $(addprefix $(TARGET_RECOVERY_ROOT_OUT)/sbin/,$(filter-out $(exclude),$(notdir $(BUSYBOX_LINKS))))
-$(SYMLINKS): BUSYBOX_BINARY := busybox
-$(SYMLINKS): $(LOCAL_INSTALLED_MODULE)
-	@echo "Symlink: $@ -> $(BUSYBOX_BINARY)"
-	@mkdir -p $(dir $@)
-	@rm -rf $@
-	$(hide) ln -sf $(BUSYBOX_BINARY) $@
-
-ALL_DEFAULT_INSTALLED_MODULES += $(SYMLINKS)
+#BUSYBOX_LINKS := $(shell cat external/busybox/busybox-minimal.links)
+#SYMLINKS := $(addprefix $(TARGET_RECOVERY_ROOT_OUT)/sbin/,$(filter-out $(exclude),$(notdir $(BUSYBOX_LINKS))))
+#$(SYMLINKS): BUSYBOX_BINARY := /xbin/busybox
+#$(SYMLINKS): $(LOCAL_INSTALLED_MODULE)
+#	@echo "Symlink: $@ -> $(BUSYBOX_BINARY)"
+#	@mkdir -p $(dir $@)
+#	@rm -rf $@
+#	$(hide) ln -sf $(BUSYBOX_BINARY) $@
+
+#ALL_DEFAULT_INSTALLED_MODULES += $(SYMLINKS)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := nandroid-md5.sh

common.h

@@ -27,6 +27,8 @@ int ui_wait_key();            // waits for a key/button press, returns the code
 int ui_key_pressed(int key);  // returns >0 if the code is currently pressed
 int ui_text_visible();        // returns >0 if text log is currently visible
 void ui_clear_key_queue();
+void ui_menu_offset_inc(); //for horizontal scrolling
+void ui_menu_offset_dec();
 
 // Write a message to the on-screen log shown with Alt-L (also to stderr).
 // The screen is small, and users may need to report these messages to support,
@@ -118,6 +120,8 @@ void ui_reset_progress();
 #define KEY_I5700_CENTER      204
 #define KEY_I5700_DOWN	      210
 #define KEY_I5700_UP          202
+#define KEY_I5700_LEFT		  218  //For horizontal scrolling
+#define KEY_I5700_RIGHT		  203
 
 //Redefine defaults
 #undef KEY_HOME
@@ -150,6 +154,10 @@ void ui_reset_progress();
 #define KEY_DOWN KEY_I5700_DOWN
 #undef KEY_UP
 #define KEY_UP KEY_I5700_UP
+#undef KEY_LEFT
+#define KEY_LEFT KEY_I5700_LEFT
+#undef KEY_RIGHT
+#define KEY_RIGHT KEY_I5700_RIGHT
 #undef KEY_SEND
 #define KEY_SEND KEY_I5700_CENTER
 

default_recovery_ui.c

@@ -65,6 +65,11 @@ int device_handle_key(int key_code, int visible) {
             case KEY_VOLUMEUP:
                 return HIGHLIGHT_UP;
 
+            case KEY_LEFT:
+				return SCROLL_LEFT;
+			case KEY_RIGHT:
+				return SCROLL_RIGHT;
+
             case KEY_POWER:
                 if (ui_get_showing_back_button()) {
                     return SELECT_ITEM;

extendedcommands.c

@@ -329,7 +329,7 @@ void show_choose_zip_menu()
 
 // This was pulled from bionic: The default system command always looks
 // for shell in /system/bin/sh. This is bad.
-#define _PATH_BSHELL "/sbin/ash"
+#define _PATH_BSHELL "/xbin/busybox"
 
 extern char **environ;
 int

recovery.c

@@ -373,9 +373,15 @@ get_menu_selection(char** headers, char** items, int menu_only) {
 
         int action = device_handle_key(key, visible);
         int old_selected = selected;
-
+        
         if (action < 0) {
             switch (action) {
+				case SCROLL_LEFT:
+					ui_menu_offset_dec();
+					break;
+				case SCROLL_RIGHT:
+					ui_menu_offset_inc();
+					break;
                 case HIGHLIGHT_UP:
                     --selected;
                     selected = ui_menu_select(selected);
@@ -985,7 +991,7 @@ main(int argc, char **argv) {
             return reboot_main(argc, argv);
         if (strstr(argv[0], "setprop"))
             return setprop_main(argc, argv);
-		return busybox_driver(argc, argv);
+		//return busybox_driver(argc, argv);
 	}
     //create_fstab();
 

recovery_ui.h

@@ -65,6 +65,8 @@ int device_wipe_data();
 #define HIGHLIGHT_DOWN      -3
 #define SELECT_ITEM         -4
 #define GO_BACK             -5
+#define SCROLL_LEFT			-6
+#define SCROLL_RIGHT		-7
 
 #define ITEM_REBOOT          0
 #define ITEM_APPLY_SDCARD    1

ui.c

@@ -38,7 +38,8 @@ static int gShowBackButton = 0;
 #define MAX_COLS 64
 #define MAX_ROWS 32 
 
-#define MENU_MAX_COLS 64
+//#define MENU_MAX_COLS 64
+#define MENU_MAX_COLS 255
 #define MENU_MAX_ROWS 250
 
 #define CHAR_WIDTH 10
@@ -93,6 +94,7 @@ static char menu[MENU_MAX_ROWS][MENU_MAX_COLS];
 static int show_menu = 0;
 static int menu_top = 0, menu_items = 0, menu_sel = 0;
 static int menu_show_start = 0;             // this is line which menu display is starting at 
+static unsigned int menu_start_char = 0; //The first char to be displayed (If not higher than the last char of an item)
 
 // Key event input queue
 static pthread_mutex_t key_queue_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -195,23 +197,28 @@ static void draw_screen_locked(void)
                 j = menu_items - menu_show_start;
 
             gr_color(MENU_TEXT_COLOR);
+            unsigned int max=0;
             for (i = menu_show_start + menu_top; i < (menu_show_start + menu_top + j); ++i) {
+				unsigned int x;
+				if ( strlen(menu[i]) > max ) max = strlen(menu[i]);
+				for (x=menu_start_char; x >= strlen(menu[i]) || menu[i][x] == '\0'; --x);
                 if (i == menu_top + menu_sel) {
                     gr_color(255, 255, 255, 255);
-                    draw_text_line(i - menu_show_start , menu[i]);
+                    draw_text_line(i - menu_show_start , &(menu[i][x]));
                     gr_color(MENU_TEXT_COLOR);
                 } else {
                     gr_color(MENU_TEXT_COLOR);
-                    draw_text_line(i - menu_show_start, menu[i]);
+                    draw_text_line(i - menu_show_start, &(menu[i][x]));
                 }
                 row++;
             }
+            if ( menu_start_char >= max ) menu_start_char = max-1;
             gr_fill(0, row*CHAR_HEIGHT+CHAR_HEIGHT/2-1,
                     gr_fb_width(), row*CHAR_HEIGHT+CHAR_HEIGHT/2+1);
         }
 
         gr_color(NORMAL_TEXT_COLOR);
-        for (; row < text_rows; ++row) {
+        for (++row; row < text_rows; ++row) { //Fix for writing on the line
             draw_text_line(row, text[(row+text_top) % text_rows]);
         }
     }
@@ -502,8 +509,8 @@ int ui_start_menu(char** headers, char** items) {
         for (; i < MENU_MAX_ROWS; ++i) {
             if (items[i-menu_top] == NULL) break;
             strcpy(menu[i], MENU_ITEM_HEADER);
-            strncpy(menu[i] + MENU_ITEM_HEADER_LENGTH, items[i-menu_top], text_cols-1 - MENU_ITEM_HEADER_LENGTH);
-            menu[i][text_cols-1] = '\0';
+            strncpy(menu[i] + MENU_ITEM_HEADER_LENGTH, items[i-menu_top], MENU_MAX_COLS-1 - MENU_ITEM_HEADER_LENGTH);
+            menu[i][MENU_MAX_COLS-1] = '\0';
         }
 
         if (gShowBackButton) {
@@ -514,6 +521,7 @@ int ui_start_menu(char** headers, char** items) {
         menu_items = i - menu_top;
         show_menu = 1;
         menu_sel = menu_show_start = 0;
+        menu_start_char = 0;
         update_screen_locked();
     }
     pthread_mutex_unlock(&gUpdateMutex);
@@ -523,6 +531,21 @@ int ui_start_menu(char** headers, char** items) {
     return menu_items;
 }
 
+void ui_menu_offset_inc() {
+	pthread_mutex_lock(&gUpdateMutex);
+	++menu_start_char;
+	update_screen_locked();
+	pthread_mutex_unlock(&gUpdateMutex);
+}
+
+void ui_menu_offset_dec() {
+	pthread_mutex_lock(&gUpdateMutex);
+	if ( menu_start_char > 0 )
+		--menu_start_char;
+	update_screen_locked();
+	pthread_mutex_unlock(&gUpdateMutex);
+}
+
 int ui_menu_select(int sel) {
     int old_sel;
     pthread_mutex_lock(&gUpdateMutex);