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.438 by root, Thu Feb 4 21:55:12 2010 UTC vs.
Revision 1.460 by sf-exg, Fri Nov 19 23:29:30 2010 UTC

… …
162 162
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hex 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
282} 288}
283 289
284static int 290static int
285hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
286{ 292{
287 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
290 { 296 {
291 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
292 298
… …
415 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
416 */ 422 */
417 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
420
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 set_privmode (PrivMode_aplKP, !numlock_state);
425 }
426 426
427 kbuf[0] = 0; 427 kbuf[0] = 0;
428 428
429#ifdef USE_XIM 429#ifdef USE_XIM
430 if (Input_Context) 430 if (Input_Context)
… …
647 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
648 { 648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1; 650 unsigned int newlen = 1;
651 651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
652 switch (translate_keypad (keysym, kp)) 655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
653 { 658 {
654#ifndef NO_BACKSPACE_KEY 659#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace: 660 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace) 661 if (priv_modes & PrivMode_HaveBackSpace)
657 { 662 {
… …
970rxvt_term::flush () 975rxvt_term::flush ()
971{ 976{
972 flush_ev.stop (); 977 flush_ev.stop ();
973 978
974#ifdef HAVE_BG_PIXMAP 979#ifdef HAVE_BG_PIXMAP
975 if (bgPixmap.check_clearChanged ()) 980 if (bgPixmap.flags & bgPixmap_t::hasChanged)
976 { 981 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
977// scr_clear (true); This needs to be researched further! 983// scr_clear (true); This needs to be researched further!
978 scr_touch (false); 984 scr_touch (false);
979 } 985 }
980#endif 986#endif
981 987
… …
1027 } 1033 }
1028 1034
1029 display->flush (); 1035 display->flush ();
1030} 1036}
1031 1037
1032/* checks wether a refresh is requested and starts the refresh timer */ 1038/* checks whether a refresh is requested and starts the refresh timer */
1033void 1039void
1034rxvt_term::refresh_check () 1040rxvt_term::refresh_check ()
1035{ 1041{
1036 if (want_refresh && !flush_ev.is_active ()) 1042 if (want_refresh && !flush_ev.is_active ())
1037 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1131 // this should really be sched_yield(), but the linux guys thought 1137 // this should really be sched_yield(), but the linux guys thought
1132 // that giving a process calling sched_yield () less cpu time than 1138 // that giving a process calling sched_yield () less cpu time than
1133 // ones with high nice levels is a useful thing to do. It surely is is 1139 // ones with high nice levels is a useful thing to do. It surely is is
1134 // allowed by the sus... as is returning ENOSYS. 1140 // allowed by the sus... as is returning ENOSYS.
1135 // since the linux guys additionally thought that breaking the only 1141 // since the linux guys additionally thought that breaking the only
1136 // known workaroudn against their unusable sched_yield hack is cool, 1142 // known workaround against their unusable sched_yield hack is cool,
1137 // we just nanosleep a bit and hope for the best. 1143 // we just nanosleep a bit and hope for the best.
1138 1144
1139 struct timespec ts = { 0, 1000 }; 1145 struct timespec ts = { 0, 1000 };
1140 nanosleep (&ts, 0); 1146 nanosleep (&ts, 0);
1141 1147
… …
1425 && ev.xfocus.mode != NotifyGrab) 1431 && ev.xfocus.mode != NotifyGrab)
1426 focus_out (); 1432 focus_out ();
1427 break; 1433 break;
1428 1434
1429 case ConfigureNotify: 1435 case ConfigureNotify:
1430 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1431 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1432 szHint.width, szHint.height);*/
1433 if (ev.xconfigure.window == parent[0]) 1436 if (ev.xconfigure.window == parent[0])
1434 { 1437 {
1435 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1436 ; 1439 ;
1440
1441#ifdef HAVE_BG_PIXMAP
1442 bool moved = false;
1443 if (bgPixmap.window_position_sensitive ())
1444 {
1445 int x, y;
1446 if (ev.xconfigure.send_event)
1447 {
1448 x = ev.xconfigure.x;
1449 y = ev.xconfigure.y;
1450 }
1451 else
1452 get_window_origin (x, y);
1453
1454 if (bgPixmap.set_position (x, y)
1455 || (bgPixmap.flags & bgPixmap_t::isInvalid))
1456 moved = true;
1457 }
1458#endif
1437 1459
1438 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1439 { 1461 {
1440 seen_resize = 1; 1462 seen_resize = 1;
1441 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1463 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1442 } 1464 }
1443 else 1465 else
1444 { 1466 {
1445#ifdef HAVE_BG_PIXMAP 1467#ifdef HAVE_BG_PIXMAP
1446 if (bgPixmap.window_position_sensitive ()) 1468 if (moved)
1447 { 1469 {
1448 if (mapped) 1470 if (mapped)
1449 update_background (); 1471 update_background ();
1450 else 1472 else
1451 bgPixmap.invalidate (); 1473 bgPixmap.invalidate ();
… …
1478 selection_send (ev.xselectionrequest); 1500 selection_send (ev.xselectionrequest);
1479 break; 1501 break;
1480 1502
1481 case MapNotify: 1503 case MapNotify:
1482#ifdef HAVE_BG_PIXMAP 1504#ifdef HAVE_BG_PIXMAP
1483 /* This is needed spcifically to fix the case of no window manager or a 1505 /* This is needed specifically to fix the case of no window manager or a
1484 * non-reparenting window manager. In those cases we never get first 1506 * non-reparenting window manager. In those cases we never get first
1485 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1507 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1486 * care of multiplicity of ConfigureNotify events arriwing while WM does 1508 * care of multiplicity of ConfigureNotify events arriving while WM does
1487 * reparenting. 1509 * reparenting.
1488 * We should not render background immidiately, as there could be several 1510 * We should not render background immediately, as there could be several
1489 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1511 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1490 * by scheduling background redraw as soon as we can, but giving a short 1512 * by scheduling background redraw as soon as we can, but giving a short
1491 * bit of time for ConfigureNotifies to arrive. 1513 * bit of time for ConfigureNotifies to arrive.
1492 * We should render background PRIOR to drawing any text, but AFTER all 1514 * We should render background PRIOR to drawing any text, but AFTER all
1493 * of ConfigureNotifys for the best results. 1515 * of ConfigureNotifys for the best results.
… …
1864 /* save the xbutton state (for ButtonRelease) */ 1886 /* save the xbutton state (for ButtonRelease) */
1865 MEvent.state = ev.state; 1887 MEvent.state = ev.state;
1866#ifdef MOUSE_REPORT_DOUBLECLICK 1888#ifdef MOUSE_REPORT_DOUBLECLICK
1867 if (ev.button == MEvent.button && clickintime) 1889 if (ev.button == MEvent.button && clickintime)
1868 { 1890 {
1869 /* same button, within alloted time */ 1891 /* same button, within allowed time */
1870 MEvent.clicks++; 1892 MEvent.clicks++;
1871 1893
1872 if (MEvent.clicks > 1) 1894 if (MEvent.clicks > 1)
1873 { 1895 {
1874 /* only report double clicks */ 1896 /* only report double clicks */
… …
2145 selection_make (ev.time); 2167 selection_make (ev.time);
2146 break; 2168 break;
2147 2169
2148 case Button2: 2170 case Button2:
2149 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2171 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2150 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2151 break; 2173 break;
2152 2174
2153#ifdef MOUSE_WHEEL 2175#ifdef MOUSE_WHEEL
2154 case Button4: 2176 case Button4:
2155 case Button5: 2177 case Button5:
… …
3226 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3248 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3227 */ 3249 */
3228void 3250void
3229rxvt_term::process_dcs_seq () 3251rxvt_term::process_dcs_seq ()
3230{ 3252{
3231 char *s;
3232 unicode_t eh;
3233
3234 /* 3253 /*
3235 * Not handled yet 3254 * Not handled yet
3236 */ 3255 */
3256
3257 unicode_t eh;
3237 s = get_to_st (eh); 3258 char *s = get_to_st (eh);
3238 if (s) 3259 if (s)
3239 free (s); 3260 free (s);
3240 3261
3241 return; 3262 return;
3242} 3263}
… …
3246 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3267 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3247 */ 3268 */
3248void 3269void
3249rxvt_term::process_osc_seq () 3270rxvt_term::process_osc_seq ()
3250{ 3271{
3251 unicode_t ch, eh;
3252 int arg; 3272 int arg;
3253 3273
3254 ch = cmd_getc (); 3274 unicode_t ch = cmd_getc ();
3255 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3275 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3256 arg = arg * 10 + (ch - '0'); 3276 arg = arg * 10 + (ch - '0');
3257 3277
3258 if (ch == ';') 3278 if (ch == ';')
3259 { 3279 {
3280 unicode_t eh;
3260 char *s = get_to_st (eh); 3281 char *s = get_to_st (eh);
3261 3282
3262 if (s) 3283 if (s)
3263 { 3284 {
3264 process_xterm_seq (arg, s, eh); 3285 process_xterm_seq (arg, s, eh);
… …
3389 process_color_seq (op, Color_pointer_fg, str, resp); 3410 process_color_seq (op, Color_pointer_fg, str, resp);
3390 break; 3411 break;
3391 case XTerm_Color_pointer_bg: 3412 case XTerm_Color_pointer_bg:
3392 process_color_seq (op, Color_pointer_bg, str, resp); 3413 process_color_seq (op, Color_pointer_bg, str, resp);
3393 break; 3414 break;
3415#ifdef OPTION_HC
3416 case XTerm_Color_HC:
3417 process_color_seq (op, Color_HC, str, resp);
3418 break;
3419 case XTerm_Color_HTC:
3420 process_color_seq (op, Color_HTC, str, resp);
3421 break;
3422#endif
3394#ifndef NO_BOLD_UNDERLINE_REVERSE 3423#ifndef NO_BOLD_UNDERLINE_REVERSE
3395 case XTerm_Color_RV:
3396 process_color_seq (op, Color_RV, str, resp);
3397 break;
3398 case Rxvt_Color_BD:
3399 case URxvt_Color_BD: 3424 case URxvt_Color_BD:
3400 process_color_seq (op, Color_BD, str, resp); 3425 process_color_seq (op, Color_BD, str, resp);
3401 break; 3426 break;
3402 case Rxvt_Color_UL:
3403 case URxvt_Color_UL: 3427 case URxvt_Color_UL:
3404 process_color_seq (op, Color_UL, str, resp); 3428 process_color_seq (op, Color_UL, str, resp);
3405 break; 3429 break;
3406 case URxvt_Color_IT: 3430 case URxvt_Color_IT:
3407 process_color_seq (op, Color_IT, str, resp); 3431 process_color_seq (op, Color_IT, str, resp);
… …
3443 { 3467 {
3444 int changed = 0; 3468 int changed = 0;
3445 3469
3446 if (*str != ';') 3470 if (*str != ';')
3447 { 3471 {
3448 /* reset to default scaling :*/
3449 bgPixmap.unset_geometry ();
3450 if (bgPixmap.set_file (str)) /* change pixmap */ 3472 if (bgPixmap.set_file (str)) /* change pixmap */
3473 {
3451 changed++; 3474 changed++;
3452 str = strchr (str, ';'); 3475 str = strchr (str, ';');
3453 if (str == NULL) 3476 if (str == NULL)
3454 bgPixmap.set_defaultGeometry (); 3477 bgPixmap.set_defaultGeometry ();
3478 else
3479 bgPixmap.set_geometry (str+1);
3480 }
3455 } 3481 }
3456 3482 else
3457 while (str)
3458 { 3483 {
3459 str++; 3484 str++;
3460 if (bgPixmap.set_geometry (str)) 3485 if (bgPixmap.set_geometry (str, true))
3461 changed++; 3486 changed++;
3462 str = strchr (str, ';');
3463 } 3487 }
3464 3488
3465 if (changed) 3489 if (changed)
3490 {
3491 if (bgPixmap.window_position_sensitive ())
3492 {
3493 int x, y;
3494 get_window_origin (x, y);
3495 bgPixmap.set_position (x, y);
3496 }
3466 update_background (); 3497 update_background ();
3498 }
3467 } 3499 }
3468 break; 3500 break;
3469#endif 3501#endif
3470 3502
3471 case XTerm_logfile: 3503 case XTerm_logfile:
… …
3574 { 3606 {
3575 if (mode == 'r') 3607 if (mode == 'r')
3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3577 else 3609 else
3578 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3610 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3611
3579 set_privmode (bit, state); 3612 set_privmode (bit, state);
3580 } 3613 }
3581 3614
3582 return state; 3615 return state;
3583} 3616}
… …
3602 { 6, PrivMode_relOrigin }, // DECOM 3635 { 6, PrivMode_relOrigin }, // DECOM
3603 { 7, PrivMode_Autowrap }, // DECAWM 3636 { 7, PrivMode_Autowrap }, // DECAWM
3604 // 8, auto-repeat keys // DECARM 3637 // 8, auto-repeat keys // DECARM
3605 { 9, PrivMode_MouseX10 }, 3638 { 9, PrivMode_MouseX10 },
3606 // 18 end FF to printer after print screen 3639 // 18 end FF to printer after print screen
3607 // 19 Print screen prints full screen/scorll region 3640 // 19 Print screen prints full screen/scroll region
3608 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3609#ifdef scrollBar_esc 3642#ifdef scrollBar_esc
3610 { scrollBar_esc, PrivMode_scrollBar }, 3643 { scrollBar_esc, PrivMode_scrollBar },
3611#endif 3644#endif
3612 { 35, PrivMode_ShiftKeys }, // rxvt extension 3645 { 35, PrivMode_ShiftKeys }, // rxvt extension

Diff Legend

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