Changeset 382:0d4b409996b9

Timestamp:

1998-10-05 11:24:42 (10 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

HEAD

Message:

Vikas' macro_function patch.

Files:

• aclocal.m4 (modified) (1 diff)
• addrbook.c (modified) (3 diffs)
• browser.c (modified) (9 diffs)
• commands.c (modified) (4 diffs)
• compose.c (modified) (2 diffs)
• configure (modified) (27 diffs)
• configure.in (modified) (1 diff)
• curs_lib.c (modified) (10 diffs)
• curs_main.c (modified) (10 diffs)
• enter.c (modified) (4 diffs)
• flags.c (modified) (1 diff)
• globals.h (modified) (1 diff)
• init.c (modified) (3 diffs)
• init.h (modified) (1 diff)
• keymap.c (modified) (8 diffs)
• menu.c (modified) (2 diffs)
• mutt.h (modified) (1 diff)
• mutt_curses.h (modified) (2 diffs)
• pager.c (modified) (1 diff)
• pgpkey.c (modified) (3 diffs)
• postpone.c (modified) (2 diffs)
• protos.h (modified) (1 diff)
• query.c (modified) (3 diffs)
• recvattach.c (modified) (3 diffs)

aclocal.m4

@@ -183 +183 @@
            if test "$gt_cv_func_gettext_libc" != "yes"; then
              AC_CHECK_LIB(intl, bindtextdomain,
-               [AC_CACHE_CHECK([for gettext in libintl],
-                 gt_cv_func_gettext_libintl,
-                 [AC_CHECK_LIB(intl, gettext,
-                  gt_cv_func_gettext_libintl=yes,
-                  gt_cv_func_gettext_libintl=no)],
+               [AC_CHECK_LIB(intl, gettext,
+                 gt_cv_func_gettext_libintl=yes,
                  gt_cv_func_gettext_libintl=no)])
            fi

addrbook.c

@@ -126 +126 @@
   int i, done = 0;
   char helpstr[SHORT_STRING];
+  int savedmenu = CurrentMenu;
 
   if (!aliases)
@@ -140 +141 @@
   menu->search = alias_search;
   menu->tag = alias_tag;
-  menu->menu = MENU_ALIAS;
+  menu->menu = CurrentMenu = MENU_ALIAS;
   menu->title = _("Aliases");
   menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_ALIAS, AliasHelp);
@@ -189 +190 @@
   
   mutt_menuDestroy (&menu);
+  CurrentMenu = savedmenu;
   safe_free ((void **) &AliasTable);
 }

browser.c

@@ -466 +466 @@
   struct stat st;
   int i, killPrefix = 0;
+  int savedmenu = CurrentMenu;
 
   memset (&state, 0, sizeof (struct browser_state));
@@ -516 +517 @@
 
   menu = mutt_new_menu ();
-  menu->menu = MENU_FOLDER;
+  menu->menu = CurrentMenu = MENU_FOLDER;
   menu->make_entry = folder_entry;
   menu->search = select_file_search;
@@ -625 +626 @@
         destroy_state (&state);
         mutt_menuDestroy (&menu);
+        CurrentMenu = savedmenu;
         return;
 
@@ -663 +665 @@
                 destroy_state (&state);
                 mutt_menuDestroy (&menu);
+                CurrentMenu = savedmenu;
                 return;
               }
@@ -719 +722 @@
               mutt_error _("Error scanning directory.");
               mutt_menuDestroy (&menu);
+              CurrentMenu = savedmenu;
               return;
             }
@@ -737 +741 @@
         {
           int reverse = 0;
+          event_t ch;
 
           move (LINES - 1, 0);
@@ -748 +753 @@
           clrtoeol ();
 
-          while ((i = mutt_getch ()) != EOF && i != 'a' && i != 'd' && i != 'z'
-                 && i != 'n')
-          {
-            if (i == ERR || CI_is_return (i))
+          FOREVER
+          {
+            ch = mutt_getch();
+            if (ch.ch == EOF || ch.ch == 'a' || ch.ch == 'd' || ch.ch == 'z' || ch.ch == 'n')
+              break;
+
+            if (ch.ch == ERR || CI_is_return (ch.ch))
               break;
             else
@@ -757 +765 @@
           }
 
-          if (i != EOF)
-          {
-            switch (i)
+          if (ch.ch != EOF)
+          {
+            switch (ch.ch)
             {
               case 'a': 
@@ -806 +814 @@
           destroy_state (&state);
           mutt_menuDestroy (&menu);
+          CurrentMenu = savedmenu;
           return;
         }

commands.c

@@ -222 +222 @@
     if (option (OPTPROMPTAFTER))
     {
-      mutt_ungetch (mutt_any_key_to_continue _("Command: "));
+      mutt_ungetch (mutt_any_key_to_continue _("Command: "), 0);
       rc = km_dokey (MENU_PAGER);
     }
@@ -394 +394 @@
 {
   int method = Sort; /* save the current method in case of abort */
-  int ch;
+  event_t ch;
 
   Sort = 0;
@@ -404 +404 @@
 _("Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "));
     ch = mutt_getch ();
-    if (ch == ERR || CI_is_return (ch))
+    if (ch.ch == -1 || CI_is_return (ch.ch))
     {
       Sort = method;
@@ -410 +410 @@
       return (-1);
     }
-    switch (ch)
+    switch (ch.ch)
     {
       case 'c':

compose.c

@@ -436 +436 @@
   int oldSort = Sort, oldSortAux = SortAux;
   struct stat st;
+  int savedmenu = CurrentMenu;
 
   idx = mutt_gen_attach_list (msg->content, idx, &idxlen, &idxmax, 0, 1);
 
   menu = mutt_new_menu ();
-  menu->menu = MENU_COMPOSE;
+  menu->menu = CurrentMenu = MENU_COMPOSE;
   menu->offset = HDR_ATTACH;
   menu->max = idxlen;
@@ -1106 +1107 @@
 
   mutt_menuDestroy (&menu);
+  CurrentMenu = savedmenu;
 
   if (idxlen)

configure

@@ -818 +818 @@
 
 
-ALL_LINGUAS="de"
+ALL_LINGUAS="de ru"
 
 
@@ -4325 +4325 @@
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
-echo "configure:4329: checking for gettext in libintl" >&5
-if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
   echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-echo "configure:4334: checking for gettext in -lintl" >&5
+echo "configure:4329: checking for gettext in -lintl" >&5
 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4339 +4334 @@
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4342 "configure"
+#line 4337 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4350 +4345 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4371 +4366 @@
 fi
 
-fi
-
-echo "$ac_t""$gt_cv_func_gettext_libintl" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -4389 +4381 @@
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4392: checking for $ac_word" >&5
+echo "configure:4384: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4423 +4415 @@
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4426: checking for $ac_func" >&5
+echo "configure:4418: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4431 "configure"
+#line 4423 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -4451 +4443 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -4478 +4470 @@
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4481: checking for $ac_word" >&5
+echo "configure:4473: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4510 +4502 @@
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4513: checking for $ac_word" >&5
+echo "configure:4505: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4542 +4534 @@
 
                 cat > conftest.$ac_ext <<EOF
-#line 4545 "configure"
+#line 4537 "configure"
 #include "confdefs.h"
 
@@ -4550 +4542 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   CATOBJEXT=.gmo
@@ -4573 +4565 @@
         if test "$CATOBJEXT" = "NONE"; then
           echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
-echo "configure:4576: checking whether catgets can be used" >&5
+echo "configure:4568: checking whether catgets can be used" >&5
           # Check whether --with-catgets or --without-catgets was given.
 if test "${with_catgets+set}" = set; then
@@ -4586 +4578 @@
           if test "$nls_cv_use_catgets" = "yes"; then
                     echo $ac_n "checking for main in -li""... $ac_c" 1>&6
-echo "configure:4589: checking for main in -li" >&5
+echo "configure:4581: checking for main in -li" >&5
 ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -4594 +4586 @@
 LIBS="-li  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4597 "configure"
+#line 4589 "configure"
 #include "confdefs.h"
 
@@ -4601 +4593 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -4629 +4621 @@
 
             echo $ac_n "checking for catgets""... $ac_c" 1>&6
-echo "configure:4632: checking for catgets" >&5
+echo "configure:4624: checking for catgets" >&5
 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4637 "configure"
+#line 4629 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -4657 +4649 @@
 ; return 0; }
 EOF
-if { (eval echo configure:4660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_catgets=yes"
@@ -4679 +4671 @@
 set dummy gencat; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4682: checking for $ac_word" >&5
+echo "configure:4674: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4711 +4703 @@
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4714: checking for $ac_word" >&5
+echo "configure:4706: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4744 +4736 @@
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4747: checking for $ac_word" >&5
+echo "configure:4739: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4779 +4771 @@
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4782: checking for $ac_word" >&5
+echo "configure:4774: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4837 +4829 @@
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4840: checking for $ac_word" >&5
+echo "configure:4832: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4871 +4863 @@
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4874: checking for $ac_word" >&5
+echo "configure:4866: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4903 +4895 @@
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4906: checking for $ac_word" >&5
+echo "configure:4898: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4996 +4988 @@
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:4999: checking for catalogs to be installed" >&5
+echo "configure:4991: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
@@ -5024 +5016 @@
      ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:5027: checking for linux/version.h" >&5
+echo "configure:5019: checking for linux/version.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5032 "configure"
+#line 5024 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then

configure.in

@@ -4 +4 @@
 AM_INIT_AUTOMAKE(mutt, 0.94.10)
 
-ALL_LINGUAS="de"
+ALL_LINGUAS="de ru"
 
 AC_CANONICAL_HOST

curs_lib.c

@@ -36 +36 @@
  */
 static short UngetCount = 0;
-
 #define UngetBufLen 128
-static int UngetBuf[UngetBufLen];
+static event_t KeyEvent[UngetBufLen] = { {0,0} };
 
 void mutt_refresh (void)
@@ -47 +46 @@
 }
 
-int mutt_getch (void)
+event_t mutt_getch (void)
 {
   int ch;
+  event_t err = {-1,0}, ret;
 
   if (UngetCount)
-    return (UngetBuf[--UngetCount]);
+    return (KeyEvent[--UngetCount]);
 
   Signals &= ~S_INTERRUPT;
@@ -67 +67 @@
 
   if(ch == -1)
-    return ch;
+    return err;
   
   if ((ch & 0x80) && option (OPTMETAKEY))
@@ -73 +73 @@
     /* send ALT-x as ESC-x */
     ch &= ~0x80;
-    mutt_ungetch (ch);
-    return ('\033');
-  }
-
-  return (ch == ctrl ('G') ? ERR : ch);
+    mutt_ungetch (ch, 0);
+    ret.ch = '\033';
+    ret.op = 0;
+    return ret;
+  }
+
+  ret.ch = ch;
+  ret.op = 0;
+  return (ch == ctrl ('G') ? err : ret);
 }
 
@@ -127 +131 @@
 int mutt_yesorno (const char *msg, int def)
 {
-  int ch;
+  event_t ch;
   const char *yes = _("yes");
   const char *no = _("no");
@@ -138 +142 @@
     mutt_refresh ();
     ch = mutt_getch ();
-    if (ch == ERR) return(-1);
-    if (CI_is_return (ch))
+    if (ch.ch == ERR) return(-1);
+    if (CI_is_return (ch.ch))
       break;
-    else if (tolower(ch) == tolower(*yes))
+    else if (tolower(ch.ch) == tolower(*yes))
     {
       def = 1;
       break;
     }
-    else if (tolower(ch) == tolower(*no))
+    else if (tolower(ch.ch) == tolower(*no))
     {
       def = 0;
@@ -298 +302 @@
 int mutt_enter_fname (const char *prompt, char *buf, size_t blen, int *redraw, int buffy)
 {
-  int i;
+  event_t ch;
 
   mvaddstr (LINES-1, 0, (char *) prompt);
@@ -307 +311 @@
   mutt_refresh ();
 
-  if ((i = mutt_getch ()) == ERR)
+  ch = mutt_getch();
+  if (ch.ch == -1)
   {
     CLEARLINE (LINES-1);
     return (-1);
   }
-  else if (i == '?')
+  else if (ch.ch == '?')
   {
     mutt_refresh ();
@@ -324 +329 @@
 
     sprintf (pc, "%s: ", prompt);
-    mutt_ungetch (i);
+    mutt_ungetch (ch.ch, 0);
     if (mutt_get_field (pc, buf, blen, (buffy ? M_EFILE : M_FILE) | M_CLEAR)
         != 0)
@@ -338 +343 @@
  * instead of using a fixed array
  */
-void mutt_ungetch (int ch)
-{
+void mutt_ungetch (int ch, int op)
+{
+  event_t tmp;
+
+  tmp.ch = ch;
+  tmp.op = op;
+
   if (UngetCount < UngetBufLen) /* make sure not to overflow */
-    UngetBuf[UngetCount++] = ch;
+    KeyEvent[UngetCount++] = tmp;
 }
 

curs_main.c

@@ -242 +242 @@
 {
   char buf[LONG_STRING], helpstr[SHORT_STRING];
-  int op = OP_NULL;                 /* function to execute */
+  int op = OP_NULL;
+  event_t event = {OP_NULL, 0};
   int done = 0;                /* controls when to exit the "event" loop */
   int i = 0, j;
@@ -255 +256 @@
   int close = 0; /* did we OP_QUIT or OP_EXIT out of this menu? */
   int attach_msg = option(OPTATTACHMSG);
+  int savedmenu = CurrentMenu;
 
   menu = mutt_new_menu ();
-  menu->menu = MENU_MAIN;
+  menu->menu = CurrentMenu = MENU_MAIN;
   menu->offset = 1;
   menu->pagelen = LINES - 3;
@@ -475 +477 @@
       {
         timeout (Timeout * 1000); /* milliseconds */      
-        op = mutt_getch ();
+        event = mutt_getch ();
         timeout (-1); /* restore blocking operation */
-        if (op != -1)
-        {
-          mutt_ungetch (op);
+        if (event.ch != -1)
+        {
+          mutt_ungetch (event.ch, event.op);
           op = km_dokey (MENU_MAIN);