From: pcg <pcg>
Date: Wed, 24 Dec 2003 06:26:52 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=8abc1efda30e6e8daaf0f58c118bf8d87f56565b;p=dana%2Furxvt.git

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

diff --git a/src/command.C b/src/command.C
index 10694204..01041d5d 100644
--- a/src/command.C
+++ b/src/command.C
@@ -1,7 +1,7 @@
 /*--------------------------------*-C-*---------------------------------*
  * File:	command.c
  *----------------------------------------------------------------------*
- * $Id: command.C,v 1.25 2003-12-19 09:41:09 pcg Exp $
+ * $Id: command.C,v 1.26 2003-12-24 06:26:52 pcg Exp $
  *
  * All portions of code are copyright by their respective author/s.
  * Copyright (c) 1992      John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
@@ -1528,7 +1528,7 @@ rxvt_process_x_event(pR_ XEvent *ev)
 void
 rxvt_button_press(pR_ XButtonEvent *ev)
 {
-    int             reportmode = 0, clickintime;
+    int reportmode = 0, clickintime;
 
     R->bypass_keystate = ev->state & (R->ModMetaMask | ShiftMask);
     if (!R->bypass_keystate)
@@ -1586,7 +1586,7 @@ rxvt_button_press(pR_ XButtonEvent *ev)
                   {
                     case Button1:
                         /* allow shift+left click to extend selection */
-                        if (ev->state & ShiftMask)
+                        if (ev->state & ShiftMask && !(R->PrivateModes & PrivMode_mouse_report))
                           {
                             if (R->MEvent.button == Button1 && clickintime)
                               R->selection_rotate (ev->x, ev->y);
diff --git a/src/defaultfont.C b/src/defaultfont.C
index 7194c3be..02c26a44 100644
--- a/src/defaultfont.C
+++ b/src/defaultfont.C
@@ -61,38 +61,39 @@ const struct rxvt_fallback_font {
 #if ENCODING_JP || ENCODING_JP_EXT
 # if XFT
   // prefer xft for complex scripts
-  { CS_UNICODE,        "xft:Kochi Gothic:antialias=false"     },
+  { CS_UNICODE,        "xft:Kochi Gothic:antialias=false"          },
 # endif
-  { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0" },
-  { CS_JIS0208_1983_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0" },
-  { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0" },
+  { CS_JIS0201_1976_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0201*-0"  },
+  { CS_JIS0208_1983_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0208*-0"  },
+  { CS_JIS0212_1990_0, "-*-mincho-*-r-*--*-*-*-*-c-*-jisx0212*-0"  },
 #endif
 
 #if ENCODING_CN || ENCODING_CN_EXT
 # if XFT
-  { CS_BIG5_EXT,       "xft:AR PL Mingti2L Big5"              },
-  { CS_BIG5_EXT,       "xft:AR PL KaitiM Big5"                },
-  { CS_GB2312_1980_0,  "xft:AR PL KaitiM GB"                  },
-  { CS_GB2312_1980_0,  "xft:AR PL SungtiL GB"                 },
+  { CS_BIG5_EXT,       "xft:AR PL Mingti2L Big5"                   },
+  { CS_BIG5_EXT,       "xft:AR PL KaitiM Big5"                     },
+  { CS_GB2312_1980_0,  "xft:AR PL KaitiM GB"                       },
+  { CS_GB2312_1980_0,  "xft:AR PL SungtiL GB"                      },
 # endif
-  { CS_CNS11643_1992_1, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-1" },
-  { CS_CNS11643_1992_2, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-2" },
-  { CS_CNS11643_1992_3, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-3" },
-  { CS_CNS11643_1992_4, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-4" },
-  { CS_CNS11643_1992_5, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-5" },
-  { CS_CNS11643_1992_6, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-6" },
-  { CS_CNS11643_1992_7, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-7" },
-  { CS_CNS11643_1992_F, "-*-*-*-r-*-*-*-*-*-*-c-*-cns11643.1992-f" },
+  { CS_CNS11643_1992_1, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-1" },
+  { CS_CNS11643_1992_2, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-2" },
+  { CS_CNS11643_1992_3, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-3" },
+  { CS_CNS11643_1992_4, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-4" },
+  { CS_CNS11643_1992_5, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-5" },
+  { CS_CNS11643_1992_6, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-6" },
+  { CS_CNS11643_1992_7, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-7" },
+  { CS_CNS11643_1992_F, "-*-*-*-*-*-*-*-*-*-*-c-*-cns11643.1992-f" },
 #endif
 
 #if XFT
-  { CS_UNICODE,      "xft:Andale Mono"                        },
-  { CS_UNICODE,      "xft:Arial Unicode MS"                   },
+  { CS_UNICODE,      "xft:Andale Mono"                             },
+  { CS_UNICODE,      "xft:Arial Unicode MS"                        },
 #endif
-  { CS_UNICODE,      "-*-lucidatypewriter-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
-  { CS_UNICODE,      "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
-  { CS_UNICODE,      "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
-  { CS_UNICODE,      "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1" },
+  { CS_UNICODE,      "-*-lucidatypewriter-*-*-*-*-*-*-*-*-m-*-iso10646-1" },
+  { CS_UNICODE,      "xft:FreeMono"                                },
+  { CS_UNICODE,      "-*-unifont-*-*-*-*-*-*-*-*-c-*-iso10646-1"   },
+  { CS_UNICODE,      "-*-*-*-r-*-*-*-*-*-*-c-*-iso10646-1"         },
+  { CS_UNICODE,      "-*-*-*-r-*-*-*-*-*-*-m-*-iso10646-1"         },
 
   { CS_UNKNOWN, 0 }
 };
@@ -422,6 +423,9 @@ rxvt_font_x11::load (const rxvt_fontprop &prop)
         }
     }
 
+  if (!best)
+    return false;
+
   set_name (strdup (list[best - info]));
 
   XFreeFontInfo (list, info, count);