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.381 by root, Fri Dec 14 05:25:23 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
… …
1047void 1047void
1048rxvt_term::refresh_check () 1048rxvt_term::refresh_check ()
1049{ 1049{
1050 if (want_refresh && !flush_ev.is_active ()) 1050 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1052
1053 display->flush ();
1052} 1054}
1053 1055
1054void 1056void
1055rxvt_term::flush_cb (ev::timer &w, int revents) 1057rxvt_term::flush_cb (ev::timer &w, int revents)
1056{ 1058{
… …
1209 if (cmd_parse ()) 1211 if (cmd_parse ())
1210 break; 1212 break;
1211 1213
1212 if (revents & ev::WRITE) 1214 if (revents & ev::WRITE)
1213 pty_write (); 1215 pty_write ();
1216
1217 refresh_check ();
1214} 1218}
1215 1219
1216void 1220void
1217rxvt_term::pointer_unblank () 1221rxvt_term::pointer_unblank ()
1218{ 1222{
… …
1453#ifdef HAVE_BG_PIXMAP 1457#ifdef HAVE_BG_PIXMAP
1454 if (bgPixmap.window_position_sensitive ()) 1458 if (bgPixmap.window_position_sensitive ())
1455 update_background (); 1459 update_background ();
1456#endif 1460#endif
1457 } 1461 }
1462
1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1463 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 } 1464 }
1460 break; 1465 break;
1461 1466
1462 case PropertyNotify: 1467 case PropertyNotify:
… …
1790 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1795 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1791 { 1796 {
1792 bgPixmap.set_root_pixmap (); 1797 bgPixmap.set_root_pixmap ();
1793 update_background (); 1798 update_background ();
1794 } 1799 }
1800
1795 break; 1801 break;
1796 } 1802 }
1797# endif 1803# endif
1798 1804
1799 refresh_check (); 1805 refresh_check ();
… …
2001 } 2007 }
2002 else 2008 else
2003 switch (ev.button) 2009 switch (ev.button)
2004 { 2010 {
2005 case Button2: 2011 case Button2:
2006 switch (scrollbar_align) 2012 switch (scrollBar.align)
2007 { 2013 {
2008 case R_SB_ALIGN_TOP: 2014 case R_SB_ALIGN_TOP:
2009 csrO = 0; 2015 csrO = 0;
2010 break; 2016 break;
2011 case R_SB_ALIGN_CENTRE: 2017 case R_SB_ALIGN_CENTRE:
… …
2023 2029
2024 scrollBar.setMotion (); 2030 scrollBar.setMotion ();
2025 break; 2031 break;
2026 2032
2027 case Button1: 2033 case Button1:
2028 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2034 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2029 csrO = ev.y - scrollBar.top; 2035 csrO = ev.y - scrollBar.top;
2030 /* FALLTHROUGH */ 2036 /* FALLTHROUGH */
2031 2037
2032 case Button3: 2038 case Button3:
2033 if (scrollBar.style != R_SB_XTERM) 2039 if (scrollBar.style != R_SB_XTERM)
… …
2309 2315
2310 ch = NOCHAR; 2316 ch = NOCHAR;
2311 } 2317 }
2312 } 2318 }
2313 2319
2314 refresh_check ();
2315
2316 return flag; 2320 return flag;
2317} 2321}
2318 2322
2319// read the next character 2323// read the next character
2320wchar_t 2324wchar_t
… …
3387#if ENABLE_TRANSPARENCY 3391#if ENABLE_TRANSPARENCY
3388 case URxvt_Color_tint: 3392 case URxvt_Color_tint:
3389 process_color_seq (op, Color_tint, str, resp); 3393 process_color_seq (op, Color_tint, str, resp);
3390 { 3394 {
3391 bool changed = false; 3395 bool changed = false;
3396
3392 if (ISSET_PIXCOLOR (Color_tint)) 3397 if (ISSET_PIXCOLOR (Color_tint))
3393 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3398 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3394 else 3399 else
3395 changed = bgPixmap.unset_tint (); 3400 changed = bgPixmap.unset_tint ();
3401
3396 if (changed) 3402 if (changed)
3397 update_background (); 3403 update_background ();
3398 } 3404 }
3399 3405
3400 break; 3406 break;
… …
3423 changed++; 3429 changed++;
3424 str = strchr (str, ';'); 3430 str = strchr (str, ';');
3425 if (str == NULL) 3431 if (str == NULL)
3426 bgPixmap.set_defaultGeometry (); 3432 bgPixmap.set_defaultGeometry ();
3427 } 3433 }
3434
3428 while (str) 3435 while (str)
3429 { 3436 {
3430 str++; 3437 str++;
3431 if (bgPixmap.set_geometry (str)) 3438 if (bgPixmap.set_geometry (str))
3432 changed++; 3439 changed++;
3433 str = strchr (str, ';'); 3440 str = strchr (str, ';');
3434 } 3441 }
3442
3435 if (changed) 3443 if (changed)
3436 update_background (); 3444 update_background ();
3437 } 3445 }
3438 break; 3446 break;
3439#endif 3447#endif
3440 3448
3441 case Rxvt_restoreFG: 3449 case Rxvt_restoreFG:

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines