From 306200f5301ac430e2e91b6ced1c7793706e0aa8 Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Mon, 8 Sep 2003 03:40:07 +0000 Subject: [PATCH] Reverted parts of revision 1299 - the dialog update is very broken and corrupts the terminal at exit. PLEASE DO TEST THE PATCHES A BIT MORE! - And please fix the new version including upstream sent. git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1337 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 2 +- package/base/dialog/dialog.desc | 4 +- package/base/dialog/menubox-4-2.patch | 50 +++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 package/base/dialog/menubox-4-2.patch diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 738d5d9de..c0605c4a5 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -38,7 +38,7 @@ *) 2003-09-02 (2.0.0-rc1 - 2.0.0-rc2) - - Sebastian Jaenicke: updated bsd-games, ircii and dialog + - Sebastian Jaenicke: updated bsd-games and ircii - Dimitar Zhekov: updated jimmy repository and added xfce4 repository - Alejandro Mery: boehm-gc - complete integration diff --git a/package/base/dialog/dialog.desc b/package/base/dialog/dialog.desc index 416e97446..146147a56 100644 --- a/package/base/dialog/dialog.desc +++ b/package/base/dialog/dialog.desc @@ -42,8 +42,8 @@ [L] GPL [S] Stable -[V] 0.9b-20030830 +[V] 0.9b-20030308 [P] X -----5---9 225.000 -[D] 0 dialog-0.9b-20030830.tgz ftp://invisible-island.net/dialog/ +[D] 2347918971 dialog-0.9b-20030308.tgz ftp://invisible-island.net/dialog/ diff --git a/package/base/dialog/menubox-4-2.patch b/package/base/dialog/menubox-4-2.patch new file mode 100644 index 000000000..e1ff60b27 --- /dev/null +++ b/package/base/dialog/menubox-4-2.patch @@ -0,0 +1,50 @@ +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/base/dialog/menubox-4-2.patch +# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. A copy of the GNU General Public +# License can be found at Documentation/COPYING. +# +# Many people helped and are helping developing ROCK Linux. Please +# have a look at http://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +--- ./menubox.c.orig 2003-03-08 18:40:50.000000000 +0200 ++++ ./menubox.c 2003-06-28 19:33:18.000000000 +0300 +@@ -77,14 +77,14 @@ + /* Draw the input field box (only for inputmenu) */ + (void) wmove(win, y + 1, item_x); + if (dialog_vars.input_menu) +- draw_box(win, y, item_x, INPUT_ROWS, menu_width - 2 - item_x - tag_x, ++ draw_box(win, y, item_x, INPUT_ROWS, menu_width - item_x - tag_x, + selected ? item_selected_attr : item_attr, + selected ? item_selected_attr : item_attr); + + /* print actual item */ + wmove(win, y + 1, item_x + 1); /* go into inputbox */ + wattrset(win, selected ? item_selected_attr : item_attr); +- dlg_print_text(win, ItemText(0), menu_width - 2 - item_x - 2, &attr); ++ dlg_print_text(win, ItemText(0), menu_width - item_x - 2, &attr); + + if (selected) { + dlg_item_help(ItemHelp(0)); +@@ -132,7 +132,7 @@ + * ( see in dialog_menu() ) + */ + dlg_show_string(win, result, offset, item_selected_attr, +- y + 1, item_x + 1, menu_width - 2 - item_x - 2, ++ y + 1, item_x + 1, menu_width - item_x - 2, + FALSE, first); + first = FALSE; + }