ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.383 by root, Fri Dec 14 06:29:28 2007 UTC vs.
Revision 1.387 by ayin, Sun Dec 30 23:45:42 2007 UTC

198 r & RS_Uline ? " uline" : "", 198 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 199 r & RS_Careful ? " careful" : "");
200 200
201 int width = wcswidth (fname, wcslen (fname)); 201 int width = wcswidth (fname, wcslen (fname));
202 202
203 max_it (width, 8+5); // for char + hey 203 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 204 max_it (width, strlen (attr));
205 205
206 if (y >= 0) 206 if (y >= 0)
207 { 207 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
220 ch = *chr++; 220 ch = *chr++;
221 221
222 sprintf (buf, "%8x", ch); 222 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 223 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 224 scr_overlay_set (9, y, '=');
225# if !UNICODE3 225# if !UNICODE_3
226 if (ch >= 0x10000) 226 if (ch >= 0x10000)
227 ch = 0xfffd; 227 ch = 0xfffd;
228# endif 228# endif
229 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230 230
1457#ifdef HAVE_BG_PIXMAP 1457#ifdef HAVE_BG_PIXMAP
1458 if (bgPixmap.window_position_sensitive ()) 1458 if (bgPixmap.window_position_sensitive ())
1459 update_background (); 1459 update_background ();
1460#endif 1460#endif
1461 } 1461 }
1462
1462 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1463 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1463 } 1464 }
1464 break; 1465 break;
1465 1466
1466 case PropertyNotify: 1467 case PropertyNotify:
1794 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1795 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1795 { 1796 {
1796 bgPixmap.set_root_pixmap (); 1797 bgPixmap.set_root_pixmap ();
1797 update_background (); 1798 update_background ();
1798 } 1799 }
1800
1799 break; 1801 break;
1800 } 1802 }
1801# endif 1803# endif
1802 1804
1803 refresh_check (); 1805 refresh_check ();
2005 } 2007 }
2006 else 2008 else
2007 switch (ev.button) 2009 switch (ev.button)
2008 { 2010 {
2009 case Button2: 2011 case Button2:
2010 switch (scrollbar_align) 2012 switch (scrollBar.align)
2011 { 2013 {
2012 case R_SB_ALIGN_TOP: 2014 case R_SB_ALIGN_TOP:
2013 csrO = 0; 2015 csrO = 0;
2014 break; 2016 break;
2015 case R_SB_ALIGN_CENTRE: 2017 case R_SB_ALIGN_CENTRE:
2027 2029
2028 scrollBar.setMotion (); 2030 scrollBar.setMotion ();
2029 break; 2031 break;
2030 2032
2031 case Button1: 2033 case Button1:
2032 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2034 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2033 csrO = ev.y - scrollBar.top; 2035 csrO = ev.y - scrollBar.top;
2034 /* FALLTHROUGH */ 2036 /* FALLTHROUGH */
2035 2037
2036 case Button3: 2038 case Button3:
2037 if (scrollBar.style != R_SB_XTERM) 2039 if (scrollBar.style != R_SB_XTERM)
3389#if ENABLE_TRANSPARENCY 3391#if ENABLE_TRANSPARENCY
3390 case URxvt_Color_tint: 3392 case URxvt_Color_tint:
3391 process_color_seq (op, Color_tint, str, resp); 3393 process_color_seq (op, Color_tint, str, resp);
3392 { 3394 {
3393 bool changed = false; 3395 bool changed = false;
3396
3394 if (ISSET_PIXCOLOR (Color_tint)) 3397 if (ISSET_PIXCOLOR (Color_tint))
3395 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3398 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3396 else 3399 else
3397 changed = bgPixmap.unset_tint (); 3400 changed = bgPixmap.unset_tint ();
3401
3398 if (changed) 3402 if (changed)
3399 update_background (); 3403 update_background ();
3400 } 3404 }
3401 3405
3402 break; 3406 break;
3425 changed++; 3429 changed++;
3426 str = strchr (str, ';'); 3430 str = strchr (str, ';');
3427 if (str == NULL) 3431 if (str == NULL)
3428 bgPixmap.set_defaultGeometry (); 3432 bgPixmap.set_defaultGeometry ();
3429 } 3433 }
3434
3430 while (str) 3435 while (str)
3431 { 3436 {
3432 str++; 3437 str++;
3433 if (bgPixmap.set_geometry (str)) 3438 if (bgPixmap.set_geometry (str))
3434 changed++; 3439 changed++;
3435 str = strchr (str, ';'); 3440 str = strchr (str, ';');
3436 } 3441 }
3442
3437 if (changed) 3443 if (changed)
3438 update_background (); 3444 update_background ();
3439 } 3445 }
3440 break; 3446 break;
3441#endif 3447#endif
3442 3448
3443 case Rxvt_restoreFG: 3449 case Rxvt_restoreFG:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines