[gentoo-commits] gentoo-x86 commit in app-misc/mc/files: mc-4.7.0_pre2-horizontal_split.patch

[Samuli Suominen (ssuominen)]

ssuominen    09/09/04 13:05:24

  Added:                mc-4.7.0_pre2-horizontal_split.patch
  Log:
  Fix wrong charset dialog placement. http://www.midnight-commander.org/ticket/1451.
  (Portage version: 2.2_rc40/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-misc/mc/files/mc-4.7.0_pre2-horizontal_split.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/mc/files/mc-4.7.0_pre2-horizontal_split.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/mc/files/mc-4.7.0_pre2-horizontal_split.patch?rev=1.1&content-type=text/plain

Index: mc-4.7.0_pre2-horizontal_split.patch
===================================================================
http://bugs.gentoo.org/show_bug.cgi?id=282556
http://www.midnight-commander.org/ticket/1451

diff -ur mc-4.7.0-pre2.orig/src/screen.c mc-4.7.0-pre2/src/screen.c
--- mc-4.7.0-pre2.orig/src/screen.c	2009-08-23 23:17:14.000000000 +0300
+++ mc-4.7.0-pre2/src/screen.c	2009-09-04 15:59:56.000000000 +0300
@@ -2702,10 +2702,16 @@
     char *cd_path;
 #ifdef HAVE_CHARSET
     const char *errmsg;
+    int offset;
     int r;
-    int width = (panel->widget.x)? panel->widget.cols : panel->widget.cols * (-1);
 
-    r = select_charset (width, 0, source_codepage, FALSE);
+    if (horizontal_split) {
+	offset = (get_current_index () != 0) ? panel->widget.lines : -panel->widget.lines;
+	r = select_charset (0, offset, source_codepage, FALSE);
+    } else {
+	offset = (get_current_index () != 0) ? panel->widget.cols : -panel->widget.cols;
+	r = select_charset (offset, 0, source_codepage, FALSE);
+    }
 
     if (r == SELECT_CHARSET_CANCEL)
 	return; /* Cancel */