From: root <root>
Date: Mon, 30 Jan 2006 20:12:37 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=141c3577499fd08db2a56c3e843e5331b3d27bdb;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/doc/rxvt.7.pod b/doc/rxvt.7.pod
index c7f40f2b..0d2e3661 100644
--- a/doc/rxvt.7.pod
+++ b/doc/rxvt.7.pod
@@ -2092,11 +2092,9 @@ in combination with other switches) is:
   EWMH-hints (pid, utf8 names) and protocols (ping)
   seperate underline colour (-underlineColor)
   settable border widths and borderless switch (-w, -b, -bl)
-  visual selection (-depth)
+  visual depth selection (-depth)
   settable extra linespacing /-lsp)
   iso-14755-2 and -3, and visual feedback
-  backindex and forwardindex escape sequence
-  window op and some xterm/OSC escape sequences
   tripleclickwords (-tcw)
   settable insecure mode (-insecure)
   keysym remapping support
@@ -2105,12 +2103,20 @@ in combination with other switches) is:
   user-pty (-pty-fd)
   hold on exit (-hold)
   skip builtin block graphics (-sbg)
-  sgr modes 90..97 and 100..107
 
 It also enabled some non-essential features otherwise disabled, such as:
 
   some round-trip time optimisations
   nearest color allocation on pseudocolor screens
+  UTF8_STRING supporr for selection
+  sgr modes 90..97 and 100..107
+  backindex and forwardindex escape sequences
+  view change/zero scorllback esacpe sequences
+  locale switching escape sequence
+  window op and some xterm/OSC escape sequences
+  rectangular selections
+  trailing space removal for selections
+  verbose X error handling
 
 =item --enable-iso14755 (default: on)
 
diff --git a/src/command.C b/src/command.C
index 0382beb4..1a29da99 100644
--- a/src/command.C
+++ b/src/command.C
@@ -3093,7 +3093,7 @@ rxvt_term::process_escape_seq ()
       case '+':
         scr_charset_set (3, (unsigned int)cmd_getc ());
         break;
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
       case '6':
         scr_backindex ();
         break;
@@ -3104,7 +3104,7 @@ rxvt_term::process_escape_seq ()
       case '8':
         scr_cursor (RESTORE);
         break;
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
       case '9':
         scr_forwardindex ();
         break;
@@ -3507,7 +3507,7 @@ rxvt_term::process_csi_seq ()
         scr_cursor (RESTORE);
         break;
 
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
       case CSI_74:
         process_window_ops (arg, nargs);
         break;
@@ -3524,7 +3524,7 @@ rxvt_term::process_csi_seq ()
 }
 /*}}} */
 
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
 /* ARGSUSED */
 void
 rxvt_term::process_window_ops (const int *args, unsigned int nargs)
@@ -3946,7 +3946,7 @@ rxvt_term::process_xterm_seq (int op, const char *str, char resp)
                      resp);
         break;
 
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
       case URxvt_locale:
         if (query)
           tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
@@ -4320,7 +4320,7 @@ rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
 
           //case 50: // not variable spacing
 
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
           case 90:
           case 91:		/* set bright fg color */
           case 92:
diff --git a/src/init.C b/src/init.C
index e034d812..22526317 100644
--- a/src/init.C
+++ b/src/init.C
@@ -301,7 +301,7 @@ rxvt_term::init_resources (int argc, const char *const *argv)
 
   xa = display->xa;
 
-#if ENABLE_FRILLS
+#if XFT
   if (rs[Rs_depth])
     set (display, strtol (rs[Rs_depth], 0, 0));
   else
diff --git a/src/main.C b/src/main.C
index 7ac0e415..d37523ac 100644
--- a/src/main.C
+++ b/src/main.C
@@ -370,7 +370,7 @@ rxvt_emergency_cleanup ()
     (*t)->emergency_cleanup ();
 }
 
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
 static void
 print_x_error (Display *dpy, XErrorEvent *event)
 {
@@ -428,10 +428,10 @@ rxvt_xerror_handler (Display *display, XErrorEvent *event)
     {
       // GET_R is most likely not the terminal which caused the error,
       // so just output the error and continue
-#if ENABLE_FRILLS
-      print_x_error (display, event);
-#else
+#if ENABLE_MINIMAL
       old_xerror_handler (display, event);
+#else
+      print_x_error (display, event);
 #endif
     }
 
diff --git a/src/rsinc.h b/src/rsinc.h
index 9575d5bb..066c5c93 100644
--- a/src/rsinc.h
+++ b/src/rsinc.h
@@ -63,12 +63,14 @@
   def (transparent)
   def (transparent_all)
 #endif
+#if XFT
+  def (depth)
+#endif
 #if ENABLE_FRILLS
   def (transient_for)
   def (override_redirect)
   def (pty_fd)
   def (hold)
-  def (depth)
   def (ext_bwidth)
   def (int_bwidth)
   def (borderLess)
diff --git a/src/screen.C b/src/screen.C
index 2db4dd8f..c215f995 100644
--- a/src/screen.C
+++ b/src/screen.C
@@ -1116,7 +1116,7 @@ rxvt_term::scr_tab (int count, bool ht) NOTHROW
  * Move cursor left in row.  If we're at the left boundary, shift everything
  * in that row right.  Clear left column.
  */
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
 void
 rxvt_term::scr_backindex () NOTHROW
 {
@@ -1133,7 +1133,7 @@ rxvt_term::scr_backindex () NOTHROW
  * Move cursor right in row.  If we're at the right boundary, shift everything
  * in that row left.  Clear right column.
  */
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
 void
 rxvt_term::scr_forwardindex () NOTHROW
 {
@@ -1357,7 +1357,7 @@ rxvt_term::scr_erase_screen (int mode) NOTHROW
     }
 }
 
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
 void
 rxvt_term::scr_erase_savelines () NOTHROW
 {
@@ -2550,7 +2550,7 @@ rxvt_term::scr_reverse_selection () NOTHROW
       && current_screen == selection.screen
       && selection.end.row >= view_start)
     {
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
       if (selection.rect)
         scr_xor_rect (selection.beg.row, selection.beg.col,
                       selection.end.row, selection.end.col,
@@ -2775,7 +2775,7 @@ rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
   char **cl;
   int cr;
 
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
   // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
   // so recode it manually
   if (ct.encoding == xa[XA_UTF8_STRING])
@@ -2956,7 +2956,7 @@ rxvt_term::selection_make (Time tm)
 
   for (; row <= selection.end.row; row++, col = 0)
     {
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
       if (selection.rect)
         {
           col = selection.beg.col;
@@ -2969,7 +2969,7 @@ rxvt_term::selection_make (Time tm)
       col = max (col, 0);
 
       if (row == selection.end.row
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
           || selection.rect
 #endif
           )
@@ -3002,7 +3002,7 @@ rxvt_term::selection_make (Time tm)
             new_selection_text[ofs++] = *t++;
         }
 
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
       if (selection.rect)
         {
           while (ofs
@@ -3373,7 +3373,7 @@ rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int b
     {
       if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
           && !ROW(selection.beg.row).is_longer ()
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
           && !selection.rect
 #endif
          )
@@ -3382,7 +3382,7 @@ rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int b
       if (
           selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
           && !ROW(selection.end.row).is_longer ()
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
           && !selection.rect
 #endif
          )
@@ -3409,7 +3409,9 @@ rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int b
                 {
                   selection.end.row = end_row;
                   selection.end.col = ROW(end_row).l;
+# if !ENABLE_MINIMAL
                   selection_remove_trailing_spaces ();
+# endif
                   break;
                 }
             }
@@ -3448,13 +3450,13 @@ rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int b
         }
     }
 
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
   if (selection.rect && selection.beg.col > selection.end.col)
     ::swap (selection.beg.col, selection.end.col);
 #endif
 }
 
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
 void
 rxvt_term::selection_remove_trailing_spaces () NOTHROW
 {
@@ -3589,7 +3591,7 @@ rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
         style = enc_text;
       else if (target == xa[XA_COMPOUND_TEXT])
         style = enc_compound_text;
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
       else if (target == xa[XA_UTF8_STRING])
         style = enc_utf8;
 #endif
@@ -3610,7 +3612,7 @@ rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
           selectlen = 0;
         }
 
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
       // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
       // so recode it manually
       if (style == enc_utf8)