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.193 by root, Sun Feb 13 08:56:27 2005 UTC vs.
Revision 1.209 by root, Tue Dec 20 19:30:59 2005 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
117 XK_Escape, 0x238b, 117 XK_Escape, 0x238b,
118 XK_Undo, 0x238c, 118 XK_Undo, 0x238c,
119 XK_Print, 0x2399, 119 XK_Print, 0x2399,
120 120
121 XK_space, 0x2423, 121 XK_space, 0x2423,
122
123#ifdef XK_KP_Begin
124 XK_KP_Prior, 0x21de,
125 XK_KP_Next, 0x21df,
126 XK_KP_Begin, 0x2320,
127 XK_KP_Insert, 0x2380,
128 XK_KP_Delete, 0x2326,
122 XK_KP_Space, 0x2422, 129 XK_KP_Space, 0x2422,
130#endif
123 0, 131 0,
124}; 132};
125 133
126void 134void
127rxvt_term::iso14755_54 (int x, int y) 135rxvt_term::iso14755_54 (int x, int y)
128{ 136{
129 x = Pixel2Col (x); 137 x = Pixel2Col (x);
130 y = Pixel2Row (y); 138 y = Pixel2Row (y);
131 139
132 if (x < 0 || x >= TermWin.ncol 140 if (x < 0 || x >= ncol
133 || y < 0 || y >= TermWin.nrow) 141 || y < 0 || y >= nrow)
134 return; 142 return;
135 143
136 for (;;) 144 for (;;)
137 { 145 {
138 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 146 const line_t &l = save[y + saveLines - view_start];
147
148 text_t t = l.t[x];
139 149
140 if (t != NOCHAR || !x) 150 if (t != NOCHAR || !x)
141 { 151 {
142 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 152 iso14755_51 (l.t[x], l.r[x]);
143 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
144 iso14755buf = ISO_14755_54; 153 iso14755buf = ISO_14755_54;
145 break; 154 break;
146 } 155 }
147 156
148 x--; 157 x--;
… …
155void 164void
156rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 165rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
157{ 166{
158 rxvt_fontset *fs = FONTSET (r); 167 rxvt_fontset *fs = FONTSET (r);
159 rxvt_font *f = (*fs)[fs->find_font (ch)]; 168 rxvt_font *f = (*fs)[fs->find_font (ch)];
160 wchar_t *chr, *alloc, ch2; 169 wchar_t *chr, *alloc, ch2, *fname;
161 int len; 170 int len;
171
172 fname = rxvt_utf8towcs (f->name);
162 173
163#if ENABLE_COMBINING 174#if ENABLE_COMBINING
164 if (IS_COMPOSE (ch)) 175 if (IS_COMPOSE (ch))
165 { 176 {
166 len = rxvt_composite.expand (ch, 0); 177 len = rxvt_composite.expand (ch, 0);
… …
175 alloc = 0; 186 alloc = 0;
176 chr = &ch2; 187 chr = &ch2;
177 len = 1; 188 len = 1;
178 } 189 }
179 190
180 int width = strlen (f->name); 191 int width = wcswidth (fname, wcslen (fname));
181 192
182 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 193 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
183 194
184 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 195 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
185 196
… …
198#endif 209#endif
199 scr_overlay_set (11, y, ch, r); 210 scr_overlay_set (11, y, ch, r);
200 scr_overlay_set (12, y, NOCHAR, r); 211 scr_overlay_set (12, y, NOCHAR, r);
201 } 212 }
202 213
203 scr_overlay_set (0, len, f->name); 214 scr_overlay_set (0, len, fname);
215
216 free (fname);
204 217
205#if ENABLE_COMBINING 218#if ENABLE_COMBINING
206 if (alloc) 219 if (alloc)
207 delete [] alloc; 220 delete [] alloc;
208#endif 221#endif
… …
276 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 289 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
277 * escape sequence to toggle the Keypad. 290 * escape sequence to toggle the Keypad.
278 * 291 *
279 * Always permit `shift' to override the current setting 292 * Always permit `shift' to override the current setting
280 */ 293 */
281 shft = (ev.state & ShiftMask); 294 shft = ev.state & ShiftMask;
282 ctrl = (ev.state & ControlMask); 295 ctrl = ev.state & ControlMask;
283 meta = (ev.state & ModMetaMask); 296 meta = ev.state & ModMetaMask;
284 297
285 if (numlock_state || (ev.state & ModNumLockMask)) 298 if (numlock_state || (ev.state & ModNumLockMask))
286 { 299 {
287 numlock_state = (ev.state & ModNumLockMask); 300 numlock_state = (ev.state & ModNumLockMask);
288 PrivMode ((!numlock_state), PrivMode_aplKP); 301 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
308 321
309 // the XOpenIM manpage lies about hardcoding the locale 322 // the XOpenIM manpage lies about hardcoding the locale
310 // at the point of XOpenIM, so temporarily switch locales 323 // at the point of XOpenIM, so temporarily switch locales
311 if (rs[Rs_imLocale]) 324 if (rs[Rs_imLocale])
312 SET_LOCALE (rs[Rs_imLocale]); 325 SET_LOCALE (rs[Rs_imLocale]);
326
313 // assume wchar_t == unicode or better 327 // assume wchar_t == unicode or better
314 len = XwcLookupString (Input_Context, &ev, wkbuf, 328 len = XwcLookupString (Input_Context, &ev, wkbuf,
315 KBUFSZ, &keysym, &status_return); 329 KBUFSZ, &keysym, &status_return);
330
316 if (rs[Rs_imLocale]) 331 if (rs[Rs_imLocale])
317 SET_LOCALE (locale); 332 SET_LOCALE (locale);
318 333
319 if (status_return == XLookupChars 334 if (status_return == XLookupChars
320 || status_return == XLookupBoth) 335 || status_return == XLookupBoth)
… …
352#ifdef KEYSYM_RESOURCE 367#ifdef KEYSYM_RESOURCE
353 if (keyboard->dispatch (this, keysym, ev.state)) 368 if (keyboard->dispatch (this, keysym, ev.state))
354 return; 369 return;
355#endif 370#endif
356 371
357 if (TermWin.saveLines) 372 if (saveLines)
358 { 373 {
359#ifdef UNSHIFTED_SCROLLKEYS 374#ifdef UNSHIFTED_SCROLLKEYS
360 if (!ctrl && !meta) 375 if (!ctrl && !meta)
361#else 376#else
362 if (IS_SCROLL_MOD) 377 if (IS_SCROLL_MOD)
363#endif 378#endif
364 { 379 {
365 int lnsppg; 380 int lnsppg;
366 381
367#ifdef PAGING_CONTEXT_LINES 382#ifdef PAGING_CONTEXT_LINES
368 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 383 lnsppg = nrow - PAGING_CONTEXT_LINES;
369#else 384#else
370 lnsppg = TermWin.nrow * 4 / 5; 385 lnsppg = nrow * 4 / 5;
371#endif 386#endif
372 if (keysym == XK_Prior) 387 if (keysym == XK_Prior)
373 { 388 {
374 scr_page (UP, lnsppg); 389 scr_page (UP, lnsppg);
375 return; 390 return;
… …
512 else 527 else
513 strcpy (kbuf, key_backspace); 528 strcpy (kbuf, key_backspace);
514 break; 529 break;
515#endif 530#endif
516#ifndef NO_DELETE_KEY 531#ifndef NO_DELETE_KEY
532# ifdef XK_KP_Prior
533 case XK_KP_Delete:
534 /* allow shift to override */
535 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
536 {
537 strcpy (kbuf, "\033On");
538 break;
539 }
540 /* FALLTHROUGH */
541# endif
517 case XK_Delete: 542 case XK_Delete:
518 strcpy (kbuf, key_delete); 543 strcpy (kbuf, key_delete);
519 break; 544 break;
520#endif 545#endif
521 case XK_Tab: 546 case XK_Tab:
… …
624#ifdef XK_KP_Begin 649#ifdef XK_KP_Begin
625 case XK_KP_Begin: 650 case XK_KP_Begin:
626 strcpy (kbuf, "\033Ou"); 651 strcpy (kbuf, "\033Ou");
627 break; 652 break;
628 653
629 case XK_KP_Insert:
630 strcpy (kbuf, "\033Op");
631 break;
632
633 case XK_KP_Delete:
634 strcpy (kbuf, "\033On");
635 break;
636#endif 654#endif
637 case XK_KP_F1: /* "\033OP" */ 655 case XK_KP_F1: /* "\033OP" */
638 case XK_KP_F2: /* "\033OQ" */ 656 case XK_KP_F2: /* "\033OQ" */
639 case XK_KP_F3: /* "\033OR" */ 657 case XK_KP_F3: /* "\033OR" */
640 case XK_KP_F4: /* "\033OS" */ 658 case XK_KP_F4: /* "\033OS" */
… …
672 break; 690 break;
673 691
674 case XK_Find: 692 case XK_Find:
675 strcpy (kbuf, "\033[1~"); 693 strcpy (kbuf, "\033[1~");
676 break; 694 break;
695
696#ifdef XK_KP_End
697 case XK_KP_Insert:
698 /* allow shift to override */
699 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
700 {
701 strcpy (kbuf, "\033Op");
702 break;
703 }
704 /* FALLTHROUGH */
705#endif
677 case XK_Insert: 706 case XK_Insert:
678 strcpy (kbuf, "\033[2~"); 707 strcpy (kbuf, "\033[2~");
679 break; 708 break;
680#ifdef DXK_Remove /* support for DEC remove like key */ 709#ifdef DXK_Remove /* support for DEC remove like key */
681 case DXK_Remove: 710 case DXK_Remove:
… …
817 846
818 if (len <= 0) 847 if (len <= 0)
819 return; /* not mapped */ 848 return; /* not mapped */
820 849
821 if (options & Opt_scrollTtyKeypress) 850 if (options & Opt_scrollTtyKeypress)
822 if (TermWin.view_start) 851 if (view_start)
823 { 852 {
824 TermWin.view_start = 0; 853 view_start = 0;
825 want_refresh = 1; 854 want_refresh = 1;
826 } 855 }
827 856
828 /* 857 /*
829 * these modifications only affect the static keybuffer 858 * these modifications only affect the static keybuffer
… …
1006{ 1035{
1007 if (mouse_slip_wheel_speed == 0 1036 if (mouse_slip_wheel_speed == 0
1008 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1037 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1009 : scr_page (UP, mouse_slip_wheel_speed)) 1038 : scr_page (UP, mouse_slip_wheel_speed))
1010 { 1039 {
1011 if (TermWin.view_start == TermWin.nscrolled || 1040 if (view_start == nsaved ||
1012 TermWin.view_start == 0) 1041 view_start == 0)
1013 mouse_slip_wheel_speed = 0; 1042 mouse_slip_wheel_speed = 0;
1014 1043
1015 refresh_type |= SMOOTH_REFRESH; 1044 refresh_type |= SMOOTH_REFRESH;
1016 want_refresh = 1; 1045 want_refresh = 1;
1017 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1046 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1064} 1093}
1065 1094
1066void 1095void
1067rxvt_term::pointer_unblank () 1096rxvt_term::pointer_unblank ()
1068{ 1097{
1069 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1098 XDefineCursor (display->display, vt, TermWin_cursor);
1070 recolour_cursor (); 1099 recolour_cursor ();
1071 1100
1072#ifdef POINTER_BLANK 1101#ifdef POINTER_BLANK
1073 hidden_pointer = 0; 1102 hidden_pointer = 0;
1074 1103
… …
1082rxvt_term::pointer_blank () 1111rxvt_term::pointer_blank ()
1083{ 1112{
1084 if (! (options & Opt_pointerBlank)) 1113 if (! (options & Opt_pointerBlank))
1085 return; 1114 return;
1086 1115
1087 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1116 XDefineCursor (display->display, vt, display->blank_cursor);
1088 XFlush (display->display); 1117 XFlush (display->display);
1089 1118
1090 hidden_pointer = 1; 1119 hidden_pointer = 1;
1091} 1120}
1092 1121
… …
1308 button_release (ev.xbutton); 1337 button_release (ev.xbutton);
1309 break; 1338 break;
1310 1339
1311 case ClientMessage: 1340 case ClientMessage:
1312 if (ev.xclient.format == 32 1341 if (ev.xclient.format == 32
1342 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1343 {
1313 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1344 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1314 destroy (); 1345 destroy ();
1346#if ENABLE_EWMH
1347 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1348 XSendEvent (disp, ev.xclient.window = display->root,
1349 False, SubstructureRedirectMask | SubstructureNotifyMask,
1350 &ev);
1351#endif
1352 }
1353#if ENABLE_XEMBED
1354 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1355 {
1356 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1357 focus_in ();
1358 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1359 focus_out ();
1360 }
1361#endif
1315#ifdef OFFIX_DND 1362#ifdef OFFIX_DND
1316 /* OffiX Dnd (drag 'n' drop) protocol */ 1363 /* OffiX Dnd (drag 'n' drop) protocol */
1317 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1364 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1318 && (ev.xclient.data.l[0] == DndFile 1365 && (ev.xclient.data.l[0] == DndFile
1319 || ev.xclient.data.l[0] == DndDir 1366 || ev.xclient.data.l[0] == DndDir
1320 || ev.xclient.data.l[0] == DndLink)) 1367 || ev.xclient.data.l[0] == DndLink))
1321 { 1368 {
1322 /* Get Dnd data */ 1369 /* Get Dnd data */
1323 Atom ActualType; 1370 Atom ActualType;
1324 int ActualFormat; 1371 int ActualFormat;
1325 unsigned char *data; 1372 unsigned char *data;
… …
1368 break; 1415 break;
1369 } 1416 }
1370 break; 1417 break;
1371 1418
1372 case FocusIn: 1419 case FocusIn:
1373 if (!TermWin.focus) 1420 focus_in ();
1421 break;
1422
1423 case FocusOut:
1424 focus_out ();
1425 break;
1426
1427 case ConfigureNotify:
1428 if (ev.xconfigure.window == parent[0])
1374 { 1429 {
1375 TermWin.focus = 1;
1376 want_refresh = 1;
1377#ifdef USE_XIM
1378 if (Input_Context != NULL)
1379 {
1380 IMSetStatusPosition ();
1381 XSetICFocus (Input_Context);
1382 }
1383#endif
1384#ifdef CURSOR_BLINK
1385 if (options & Opt_cursorBlink)
1386 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1387#endif
1388#ifdef OFF_FOCUS_FADING
1389 if (rs[Rs_fade])
1390 {
1391 pix_colors = pix_colors_focused;
1392 scr_recolour ();
1393 }
1394#endif
1395
1396 }
1397 break;
1398
1399 case FocusOut:
1400 if (TermWin.focus)
1401 {
1402 TermWin.focus = 0;
1403 want_refresh = 1;
1404
1405#if ENABLE_FRILLS || ISO_14755
1406 iso14755buf = 0;
1407#endif
1408#if ENABLE_OVERLAY
1409 scr_overlay_off ();
1410#endif
1411#ifdef USE_XIM
1412 if (Input_Context != NULL)
1413 XUnsetICFocus (Input_Context);
1414#endif
1415#ifdef CURSOR_BLINK
1416 if (options & Opt_cursorBlink)
1417 cursor_blink_ev.stop ();
1418 hidden_cursor = 0;
1419#endif
1420#ifdef OFF_FOCUS_FADING
1421 if (rs[Rs_fade])
1422 {
1423 pix_colors = pix_colors_unfocused;
1424 scr_recolour ();
1425 }
1426#endif
1427 }
1428 break;
1429
1430 case ConfigureNotify:
1431 if (ev.xconfigure.window == TermWin.parent[0])
1432 {
1433 int height, width;
1434
1435 do
1436 { /* Wrap lots of configures into one */
1437 width = ev.xconfigure.width;
1438 height = ev.xconfigure.height;
1439 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1440 }
1441 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1430 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ;
1442 1432
1443 if (szHint.width != width || szHint.height != height) 1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1434 {
1445 seen_resize = 1; 1435 seen_resize = 1;
1446 resize_all_windows (width, height, 1); 1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1437 }
1448 1438
1449#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1450 if (options & Opt_transparent) 1440 if (options & Opt_transparent)
1451 check_our_parents (); 1441 check_our_parents ();
… …
1472 case SelectionRequest: 1462 case SelectionRequest:
1473 selection_send (ev.xselectionrequest); 1463 selection_send (ev.xselectionrequest);
1474 break; 1464 break;
1475 1465
1476 case UnmapNotify: 1466 case UnmapNotify:
1477 TermWin.mapped = 0; 1467 mapped = 0;
1478#ifdef TEXT_BLINK 1468#ifdef TEXT_BLINK
1479 text_blink_ev.stop (); 1469 text_blink_ev.stop ();
1480#endif 1470#endif
1481 break; 1471 break;
1482 1472
1483 case MapNotify: 1473 case MapNotify:
1484 TermWin.mapped = 1; 1474 mapped = 1;
1485#ifdef TEXT_BLINK 1475#ifdef TEXT_BLINK
1486 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1476 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1487#endif 1477#endif
1488 break; 1478 break;
1489 1479
… …
1493 break; 1483 break;
1494#endif /* TRANSPARENT */ 1484#endif /* TRANSPARENT */
1495 1485
1496 case GraphicsExpose: 1486 case GraphicsExpose:
1497 case Expose: 1487 case Expose:
1498 if (ev.xany.window == TermWin.vt) 1488 if (ev.xany.window == vt)
1499 { 1489 {
1500 do 1490 do
1501 scr_expose (ev.xexpose.x, ev.xexpose.y, 1491 scr_expose (ev.xexpose.x, ev.xexpose.y,
1502 ev.xexpose.width, ev.xexpose.height, False); 1492 ev.xexpose.width, ev.xexpose.height, False);
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1493 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1504 1494
1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1506 1496
1507 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1508 scr_expose (ev.xexpose.x, ev.xexpose.y, 1498 scr_expose (ev.xexpose.x, ev.xexpose.y,
1509 ev.xexpose.width, ev.xexpose.height, False); 1499 ev.xexpose.width, ev.xexpose.height, False);
1510 1500
1511 scr_refresh (refresh_type); 1501 scr_refresh (refresh_type);
1512 } 1502 }
… …
1528 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1518 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1529 menubar_expose (); 1519 menubar_expose ();
1530#endif 1520#endif
1531 1521
1532#ifdef TRANSPARENT 1522#ifdef TRANSPARENT
1533 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1523 if (am_transparent && ev.xany.window == parent[0])
1534 XClearWindow (disp, ev.xany.window); 1524 XClearWindow (disp, ev.xany.window);
1535#endif 1525#endif
1536 } 1526 }
1537 break; 1527 break;
1538 1528
… …
1549 } 1539 }
1550#endif 1540#endif
1551 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1552 break; 1542 break;
1553 1543
1554 if (ev.xany.window == TermWin.vt) 1544 if (ev.xany.window == vt)
1555 { 1545 {
1556 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1546 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1557 { 1547 {
1558 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1548 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1559 ; 1549 ;
1560 1550
1561 XQueryPointer (disp, TermWin.vt, 1551 XQueryPointer (disp, vt,
1562 &unused_root, &unused_child, 1552 &unused_root, &unused_child,
1563 &unused_root_x, &unused_root_y, 1553 &unused_root_x, &unused_root_y,
1564 &ev.xbutton.x, &ev.xbutton.y, 1554 &ev.xbutton.x, &ev.xbutton.y,
1565 &ev.xbutton.state); 1555 &ev.xbutton.state);
1566#ifdef MOUSE_THRESHOLD 1556#ifdef MOUSE_THRESHOLD
… …
1578#endif 1568#endif
1579 selection_extend (ev.xbutton.x, ev.xbutton.y, 1569 selection_extend (ev.xbutton.x, ev.xbutton.y,
1580 ev.xbutton.state & Button3Mask ? 2 : 0); 1570 ev.xbutton.state & Button3Mask ? 2 : 0);
1581 1571
1582#ifdef SELECTION_SCROLLING 1572#ifdef SELECTION_SCROLLING
1583 if (ev.xbutton.y < TermWin.int_bwidth 1573 if (ev.xbutton.y < int_bwidth
1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1574 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1585 { 1575 {
1586 int dist; 1576 int dist;
1587 1577
1588 /* don't clobber the current delay if we are 1578 /* don't clobber the current delay if we are
1589 * already in the middle of scrolling. 1579 * already in the middle of scrolling.
… …
1597 selection_save_x = ev.xbutton.x; 1587 selection_save_x = ev.xbutton.x;
1598 selection_save_y = ev.xbutton.y; 1588 selection_save_y = ev.xbutton.y;
1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1600 1590
1601 /* calc number of lines to scroll */ 1591 /* calc number of lines to scroll */
1602 if (ev.xbutton.y < TermWin.int_bwidth) 1592 if (ev.xbutton.y < int_bwidth)
1603 { 1593 {
1604 scroll_selection_dir = UP; 1594 scroll_selection_dir = UP;
1605 dist = TermWin.int_bwidth - ev.xbutton.y; 1595 dist = int_bwidth - ev.xbutton.y;
1606 } 1596 }
1607 else 1597 else
1608 { 1598 {
1609 scroll_selection_dir = DN; 1599 scroll_selection_dir = DN;
1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1600 dist = ev.xbutton.y - (int_bwidth + height);
1611 } 1601 }
1612 1602
1613 scroll_selection_lines = Pixel2Height (dist) 1603 scroll_selection_lines = Pixel2Height (dist)
1614 / SELECTION_SCROLL_LINE_SPEEDUP 1604 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1; 1605 + 1;
… …
1649 } 1639 }
1650 break; 1640 break;
1651 } 1641 }
1652} 1642}
1653 1643
1644void
1645rxvt_term::focus_in ()
1646{
1647 if (!focus)
1648 {
1649 focus = 1;
1650 want_refresh = 1;
1651#if USE_XIM
1652 if (Input_Context != NULL)
1653 {
1654 IMSetStatusPosition ();
1655 XSetICFocus (Input_Context);
1656 }
1657#endif
1658#if CURSOR_BLINK
1659 if (options & Opt_cursorBlink)
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1661#endif
1662#if OFF_FOCUS_FADING
1663 if (rs[Rs_fade])
1664 {
1665 pix_colors = pix_colors_focused;
1666 scr_recolour ();
1667 }
1668#endif
1669 }
1670}
1671
1672void
1673rxvt_term::focus_out ()
1674{
1675 if (focus)
1676 {
1677 focus = 0;
1678 want_refresh = 1;
1679
1680#if ENABLE_FRILLS || ISO_14755
1681 iso14755buf = 0;
1682#endif
1683#if ENABLE_OVERLAY
1684 scr_overlay_off ();
1685#endif
1686#if USE_XIM
1687 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context);
1689#endif
1690#if CURSOR_BLINK
1691 if (options & Opt_cursorBlink)
1692 cursor_blink_ev.stop ();
1693 hidden_cursor = 0;
1694#endif
1695#if OFF_FOCUS_FADING
1696 if (rs[Rs_fade])
1697 {
1698 pix_colors = pix_colors_unfocused;
1699 scr_recolour ();
1700 }
1701#endif
1702 }
1703}
1704
1654#if TRANSPARENT 1705#if TRANSPARENT
1655void 1706void
1656rxvt_term::rootwin_cb (XEvent &ev) 1707rxvt_term::rootwin_cb (XEvent &ev)
1657{ 1708{
1658 SET_R (this); 1709 SET_R (this);
… …
1688 reportmode = !! (priv_modes & PrivMode_mouse_report); 1739 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689 1740
1690 /* 1741 /*
1691 * VT window processing of button press 1742 * VT window processing of button press
1692 */ 1743 */
1693 if (ev.window == TermWin.vt) 1744 if (ev.window == vt)
1694 { 1745 {
1695#if ISO_14755 1746#if ISO_14755
1696 // 5.4 1747 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 { 1749 {
… …
1903 case Button3: 1954 case Button3:
1904 if (scrollBar.style != R_SB_XTERM) 1955 if (scrollBar.style != R_SB_XTERM)
1905 { 1956 {
1906 if (scrollbar_above_slider (ev.y)) 1957 if (scrollbar_above_slider (ev.y))
1907# ifdef RXVT_SCROLL_FULL 1958# ifdef RXVT_SCROLL_FULL
1908 scr_page (UP, TermWin.nrow - 1); 1959 scr_page (UP, nrow - 1);
1909# else 1960# else
1910 scr_page (UP, TermWin.nrow / 4); 1961 scr_page (UP, nrow / 4);
1911# endif 1962# endif
1912 else if (scrollbar_below_slider (ev.y)) 1963 else if (scrollbar_below_slider (ev.y))
1913# ifdef RXVT_SCROLL_FULL 1964# ifdef RXVT_SCROLL_FULL
1914 scr_page (DN, TermWin.nrow - 1); 1965 scr_page (DN, nrow - 1);
1915# else 1966# else
1916 scr_page (DN, TermWin.nrow / 4); 1967 scr_page (DN, nrow / 4);
1917# endif 1968# endif
1918 else 1969 else
1919 scrollBar.setMotion (); 1970 scrollBar.setMotion ();
1920 } 1971 }
1921 else 1972 else
1922 { 1973 {
1923 scr_page ((ev.button == Button1 ? DN : UP), 1974 scr_page ((ev.button == Button1 ? DN : UP),
1924 (TermWin.nrow 1975 (nrow
1925 * scrollbar_position (ev.y) 1976 * scrollbar_position (ev.y)
1926 / scrollbar_size ())); 1977 / scrollbar_size ()));
1927 } 1978 }
1928 1979
1929 break; 1980 break;
… …
1961#ifdef SELECTION_SCROLLING 2012#ifdef SELECTION_SCROLLING
1962 if (sel_scroll_ev.active) 2013 if (sel_scroll_ev.active)
1963 sel_scroll_ev.stop(); 2014 sel_scroll_ev.stop();
1964#endif 2015#endif
1965 2016
1966 if (ev.window == TermWin.vt) 2017 if (ev.window == vt)
1967 { 2018 {
1968#if ISO_14755 2019#if ISO_14755
1969 // 5.4 2020 // 5.4
1970 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1971 return; 2022 return;
… …
2022 v = ev.button == Button4 ? UP : DN; 2073 v = ev.button == Button4 ? UP : DN;
2023 2074
2024 if (ev.state & ShiftMask) 2075 if (ev.state & ShiftMask)
2025 i = 1; 2076 i = 1;
2026 else if (options & Opt_mouseWheelScrollPage) 2077 else if (options & Opt_mouseWheelScrollPage)
2027 i = TermWin.nrow - 1; 2078 i = nrow - 1;
2028 else 2079 else
2029 i = 5; 2080 i = 5;
2030 2081
2031# ifdef MOUSE_SLIP_WHEELING 2082# ifdef MOUSE_SLIP_WHEELING
2032 if (ev.state & ControlMask) 2083 if (ev.state & ControlMask)
2033 { 2084 {
2034 mouse_slip_wheel_speed += v ? -1 : 1; 2085 mouse_slip_wheel_speed += v ? -1 : 1;
2035 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2086 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2036 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2087 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2037 2088
2038 if (slip_wheel_ev.at < NOW) 2089 if (slip_wheel_ev.at < NOW)
2039 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2090 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2040 2091
2041 slip_wheel_ev.start (); 2092 slip_wheel_ev.start ();
… …
2323 return pchanged; /* Don't try any more */ 2374 return pchanged; /* Don't try any more */
2324 2375
2325 XGetWindowAttributes (disp, display->root, &wrootattr); 2376 XGetWindowAttributes (disp, display->root, &wrootattr);
2326 rootdepth = wrootattr.depth; 2377 rootdepth = wrootattr.depth;
2327 2378
2328 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2379 XGetWindowAttributes (disp, parent[0], &wattr);
2329 2380
2330 if (rootdepth != wattr.depth) 2381 if (rootdepth != wattr.depth)
2331 { 2382 {
2332 if (am_transparent) 2383 if (am_transparent)
2333 { 2384 {
2334 pchanged = 1; 2385 pchanged = 1;
2335 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2386 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2336 am_transparent = am_pixmap_trans = 0; 2387 am_transparent = am_pixmap_trans = 0;
2337 } 2388 }
2338 2389
2339 return pchanged; /* Don't try any more */ 2390 return pchanged; /* Don't try any more */
2340 } 2391 }
… …
2381 Window cr; 2432 Window cr;
2382 XImage *image; 2433 XImage *image;
2383 GC gc; 2434 GC gc;
2384 XGCValues gcvalue; 2435 XGCValues gcvalue;
2385 2436
2386 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2437 XTranslateCoordinates (disp, parent[0], display->root,
2387 0, 0, &sx, &sy, &cr); 2438 0, 0, &sx, &sy, &cr);
2388 nw = (unsigned int)szHint.width; 2439 nw = (unsigned int)szHint.width;
2389 nh = (unsigned int)szHint.height; 2440 nh = (unsigned int)szHint.height;
2390 nx = ny = 0; 2441 nx = ny = 0;
2391 2442
… …
2417 if (image == NULL) 2468 if (image == NULL)
2418 { 2469 {
2419 if (am_transparent && am_pixmap_trans) 2470 if (am_transparent && am_pixmap_trans)
2420 { 2471 {
2421 pchanged = 1; 2472 pchanged = 1;
2422 if (TermWin.pixmap != None) 2473 if (pixmap != None)
2423 { 2474 {
2424 XFreePixmap (disp, TermWin.pixmap); 2475 XFreePixmap (disp, pixmap);
2425 TermWin.pixmap = None; 2476 pixmap = None;
2426 } 2477 }
2427 } 2478 }
2428 2479
2429 am_pixmap_trans = 0; 2480 am_pixmap_trans = 0;
2430 } 2481 }
2431 else 2482 else
2432 { 2483 {
2433 if (TermWin.pixmap != None) 2484 if (pixmap != None)
2434 XFreePixmap (disp, TermWin.pixmap); 2485 XFreePixmap (disp, pixmap);
2435 2486
2436#if TINTING 2487#if TINTING
2437 if (ISSET_PIXCOLOR (Color_tint)) 2488 if (ISSET_PIXCOLOR (Color_tint))
2438 { 2489 {
2439 unsigned short rm, gm, bm; 2490 unsigned short rm, gm, bm;
… …
2443 2494
2444 ShadeXImage (display, image, shade, rm, gm, bm); 2495 ShadeXImage (display, image, shade, rm, gm, bm);
2445 } 2496 }
2446#endif 2497#endif
2447 2498
2448 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2499 pixmap = XCreatePixmap (disp, vt,
2449 szHint.width, szHint.height, image->depth); 2500 szHint.width, szHint.height, image->depth);
2450 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2501 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2451 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2502 XPutImage (disp, pixmap, gc, image, 0, 0,
2452 nx, ny, image->width, image->height); 2503 nx, ny, image->width, image->height);
2453 XFreeGC (disp, gc); 2504 XFreeGC (disp, gc);
2454 XDestroyImage (image); 2505 XDestroyImage (image);
2455 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2506 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2456 XClearWindow (disp, TermWin.parent[0]); 2507 XClearWindow (disp, parent[0]);
2457 2508
2458 if (!am_transparent || !am_pixmap_trans) 2509 if (!am_transparent || !am_pixmap_trans)
2459 pchanged = 1; 2510 pchanged = 1;
2460 2511
2461 am_transparent = am_pixmap_trans = 1; 2512 am_transparent = am_pixmap_trans = 1;
2462 } 2513 }
2463 } 2514 }
2464 2515
2465 if (am_pixmap_trans) 2516 if (am_pixmap_trans)
2466 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2517 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2467 else 2518 else
2468 { 2519 {
2469 unsigned int n; 2520 unsigned int n;
2470 /* 2521 /*
2471 * InheritPixmap transparency 2522 * InheritPixmap transparency
2472 */ 2523 */
2473 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2524 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2474 { 2525 {
2475 oldp = TermWin.parent[i]; 2526 oldp = parent[i];
2476 XQueryTree (disp, TermWin.parent[i - 1], &root, 2527 XQueryTree (disp, parent[i - 1], &root,
2477 &TermWin.parent[i], &list, &n); 2528 &parent[i], &list, &n);
2478 XFree (list); 2529 XFree (list);
2479 2530
2480 if (TermWin.parent[i] == display->root) 2531 if (parent[i] == display->root)
2481 { 2532 {
2482 if (oldp != None) 2533 if (oldp != None)
2483 pchanged = 1; 2534 pchanged = 1;
2484 2535
2485 break; 2536 break;
2486 } 2537 }
2487 2538
2488 if (oldp != TermWin.parent[i]) 2539 if (oldp != parent[i])
2489 pchanged = 1; 2540 pchanged = 1;
2490 } 2541 }
2491 2542
2492 n = 0; 2543 n = 0;
2493 2544
2494 if (pchanged) 2545 if (pchanged)
2495 { 2546 {
2496 for (; n < (unsigned int)i; n++) 2547 for (; n < (unsigned int)i; n++)
2497 { 2548 {
2498 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2549 XGetWindowAttributes (disp, parent[n], &wattr);
2499 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2500 { 2551 {
2501 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2552 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2502 break; 2553 break;
2503 } 2554 }
2504 } 2555 }
2505 } 2556 }
2506 2557
2507 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2558 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2508 { 2559 {
2509 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2560 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2510 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2561 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2511 am_transparent = 0; 2562 am_transparent = 0;
2512 /* XXX: also turn off Opt_transparent? */ 2563 /* XXX: also turn off Opt_transparent? */
2513 } 2564 }
2514 else 2565 else
2515 { 2566 {
… …
2518 * needed for fvwm2.2.2 (and before?) */ 2569 * needed for fvwm2.2.2 (and before?) */
2519 sleep (1); 2570 sleep (1);
2520#endif 2571#endif
2521 for (n = 0; n < (unsigned int)i; n++) 2572 for (n = 0; n < (unsigned int)i; n++)
2522 { 2573 {
2523 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2574 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2524 XClearWindow (disp, TermWin.parent[n]); 2575 XClearWindow (disp, parent[n]);
2525 } 2576 }
2526 2577
2527 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2528 am_transparent = 1; 2579 am_transparent = 1;
2529 } 2580 }
2530 2581
2531 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2582 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2532 TermWin.parent[i] = None; 2583 parent[i] = None;
2533 } 2584 }
2534 2585
2535 if (scrollBar.win) 2586 if (scrollBar.win)
2536 { 2587 {
2537 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2580 // some window managers resize the window early, and these programs 2631 // some window managers resize the window early, and these programs
2581 // then sometimes get the size wrong. 2632 // then sometimes get the size wrong.
2582 // unfortunately other programs are even more buggy and dislike 2633 // unfortunately other programs are even more buggy and dislike
2583 // being sent SIGWINCH, so only do it when we were in fact being 2634 // being sent SIGWINCH, so only do it when we were in fact being
2584 // resized. 2635 // resized.
2585 if (seen_resize) 2636 if (seen_resize && cmd_pid)
2586 kill (-cmd_pid, SIGWINCH); 2637 kill (-cmd_pid, SIGWINCH);
2587 } 2638 }
2588 2639
2589 /* Read a text string from the input buffer */ 2640 /* Read a text string from the input buffer */
2590 unicode_t buf[UBUFSIZ]; 2641 unicode_t buf[UBUFSIZ];
2591 bool refreshnow = false; 2642 bool refreshnow = false;
2592 int nlines = 0; 2643 int nlines = 0;
2593 unicode_t *str = buf; 2644 unicode_t *str = buf;
2645 unicode_t *eol = str + min (ncol, UBUFSIZ);
2594 2646
2595 for (;;) 2647 for (;;)
2596 { 2648 {
2597 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2649 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2598 break; 2650 break;
2599 2651
2600 *str++ = ch; 2652 *str++ = ch;
2601 2653
2602 if (ch == C0_LF) 2654 if (ch == C0_LF || str >= eol)
2603 { 2655 {
2656 if (ch == C0_LF)
2604 nlines++; 2657 nlines++;
2658
2605 refresh_count++; 2659 refresh_count++;
2606 2660
2607 if (!(options & Opt_jumpScroll) 2661 if (!(options & Opt_jumpScroll)
2608 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2662 || (refresh_count >= refresh_limit * (nrow - 1)))
2609 { 2663 {
2610 refreshnow = true; 2664 refreshnow = true;
2611 ch = NOCHAR; 2665 ch = NOCHAR;
2612 break; 2666 break;
2613 } 2667 }
2614 2668
2615 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2669 // scr_add_lines only works for nlines <= nrow - 1.
2616 if (nlines >= TermWin.nrow - 1) 2670 if (nlines >= nrow - 1)
2617 { 2671 {
2618 scr_add_lines (buf, nlines, str - buf); 2672 scr_add_lines (buf, nlines, str - buf);
2619 nlines = 0; 2673 nlines = 0;
2620 str = buf; 2674 str = buf;
2675 eol = str + min (ncol, UBUFSIZ);
2621 } 2676 }
2622 }
2623 2677
2624 if (str >= buf + UBUFSIZ) 2678 if (str >= eol)
2625 { 2679 {
2680 if (eol >= buf + UBUFSIZ)
2681 {
2626 ch = NOCHAR; 2682 ch = NOCHAR;
2627 break; 2683 break;
2684 }
2685 else
2686 eol = min (eol + ncol, buf + UBUFSIZ);
2687 }
2688
2628 } 2689 }
2629 2690
2630 seq_begin = cmdbuf_ptr; 2691 seq_begin = cmdbuf_ptr;
2631 ch = next_char (); 2692 ch = next_char ();
2632 } 2693 }
… …
3176 { 3237 {
3177 switch (priv) 3238 switch (priv)
3178 { 3239 {
3179 case '>': 3240 case '>':
3180 if (ch == CSI_DA) /* secondary device attributes */ 3241 if (ch == CSI_DA) /* secondary device attributes */
3181 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3242 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3182 break; 3243 break;
3183 case '?': 3244 case '?':
3184 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3245 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3185 process_terminal_mode (ch, priv, nargs, arg); 3246 process_terminal_mode (ch, priv, nargs, arg);
3186 break; 3247 break;
… …
3426 { 3487 {
3427 /* 3488 /*
3428 * commands 3489 * commands
3429 */ 3490 */
3430 case 1: /* deiconify window */ 3491 case 1: /* deiconify window */
3431 XMapWindow (disp, TermWin.parent[0]); 3492 XMapWindow (disp, parent[0]);
3432 break; 3493 break;
3433 case 2: /* iconify window */ 3494 case 2: /* iconify window */
3434 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3495 XIconifyWindow (disp, parent[0], display->screen);
3435 break; 3496 break;
3436 case 3: /* set position (pixels) */ 3497 case 3: /* set position (pixels) */
3437 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3498 XMoveWindow (disp, parent[0], args[1], args[2]);
3438 break; 3499 break;
3439 case 4: /* set size (pixels) */ 3500 case 4: /* set size (pixels) */
3440 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3501 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3441 break; 3502 break;
3442 case 5: /* raise window */ 3503 case 5: /* raise window */
3443 XRaiseWindow (disp, TermWin.parent[0]); 3504 XRaiseWindow (disp, parent[0]);
3444 break; 3505 break;
3445 case 6: /* lower window */ 3506 case 6: /* lower window */
3446 XLowerWindow (disp, TermWin.parent[0]); 3507 XLowerWindow (disp, parent[0]);
3447 break; 3508 break;
3448 case 7: /* refresh window */ 3509 case 7: /* refresh window */
3449 scr_touch (true); 3510 scr_touch (true);
3450 break; 3511 break;
3451 case 8: /* set size (chars) */ 3512 case 8: /* set size (chars) */
3452 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3513 set_widthheight ((unsigned int) (args[2] * fwidth),
3453 (unsigned int) (args[1] * TermWin.fheight)); 3514 (unsigned int) (args[1] * fheight));
3454 break; 3515 break;
3455 3516
3456 //case 9: NYI, TODO, restore maximized window or maximize window 3517 //case 9: NYI, TODO, restore maximized window or maximize window
3457 default: 3518 default:
3458 if (args[0] >= 24) /* set height (chars) */ 3519 if (args[0] >= 24) /* set height (chars) */
3459 set_widthheight ((unsigned int)TermWin.width, 3520 set_widthheight ((unsigned int)width,
3460 (unsigned int) (args[1] * TermWin.fheight)); 3521 (unsigned int) (args[1] * fheight));
3461 break; 3522 break;
3462 3523
3463 3524
3464 /* 3525 /*
3465 * reports - some output format copied from XTerm 3526 * reports - some output format copied from XTerm
3466 */ 3527 */
3467 case 11: /* report window state */ 3528 case 11: /* report window state */
3468 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3529 XGetWindowAttributes (disp, parent[0], &wattr);
3469 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3530 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3470 break; 3531 break;
3471 case 13: /* report window position */ 3532 case 13: /* report window position */
3472 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3533 XGetWindowAttributes (disp, parent[0], &wattr);
3473 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3534 XTranslateCoordinates (disp, parent[0], wattr.root,
3474 -wattr.border_width, -wattr.border_width, 3535 -wattr.border_width, -wattr.border_width,
3475 &x, &y, &wdummy); 3536 &x, &y, &wdummy);
3476 tt_printf ("\033[3;%d;%dt", x, y); 3537 tt_printf ("\033[3;%d;%dt", x, y);
3477 break; 3538 break;
3478 case 14: /* report window size (pixels) */ 3539 case 14: /* report window size (pixels) */
3479 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3540 XGetWindowAttributes (disp, parent[0], &wattr);
3480 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3541 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3481 break; 3542 break;
3482 case 18: /* report text area size (chars) */ 3543 case 18: /* report text area size (chars) */
3483 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3544 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3484 break; 3545 break;
3485 case 19: /* report window size (chars) */ 3546 case 19: /* report window size (chars) */
3486 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3547 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3487 break; 3548 break;
3488 case 20: /* report icon label */ 3549 case 20: /* report icon label */
3489 { 3550 {
3490 char *s; 3551 char *s;
3491 XGetIconName (disp, TermWin.parent[0], &s); 3552 XGetIconName (disp, parent[0], &s);
3492 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3553 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3493 XFree (s); 3554 XFree (s);
3494 } 3555 }
3495 break; 3556 break;
3496 case 21: /* report window title */ 3557 case 21: /* report window title */
3497 { 3558 {
3498 char *s; 3559 char *s;
3499 XFetchName (disp, TermWin.parent[0], &s); 3560 XFetchName (disp, parent[0], &s);
3500 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3561 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3501 XFree (s); 3562 XFree (s);
3502 } 3563 }
3503 break; 3564 break;
3504 } 3565 }
… …
3537 else if (ch < 0x20) 3598 else if (ch < 0x20)
3538 return NULL; /* other control character - exit */ 3599 return NULL; /* other control character - exit */
3539 3600
3540 seen_esc = false; 3601 seen_esc = false;
3541 3602
3542 if (n >= sizeof (string) - 1) 3603 if (n >= STRING_MAX - 1)
3543 // stop at some sane length 3604 // stop at some sane length
3544 return NULL; 3605 return NULL;
3545 3606
3546 if (ch == C0_SYN) 3607 if (ch == C0_SYN)
3547 string[n++] = cmd_get8 (); 3608 string[n++] = cmd_get8 ();
… …
3615 set_window_color (color, str); 3676 set_window_color (color, str);
3616} 3677}
3617 3678
3618/* 3679/*
3619 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3680 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3620 * 0 = change iconName/title
3621 * 1 = change iconName
3622 * 2 = change title
3623 * 4 = change color
3624 * 10 = change fg color
3625 * 11 = change bg color
3626 * 12 = change text color
3627 * 13 = change mouse foreground color
3628 * 17 = change highlight character colour
3629 * 18 = change bold character color
3630 * 19 = change underlined character color
3631 * 46 = change logfile (not implemented)
3632 * 50 = change font
3633 *
3634 * rxvt extensions:
3635 * 20 = bg pixmap
3636 * 39 = change default fg color
3637 * 49 = change default bg color
3638 * 55 = dump scrollback buffer and all of screen
3639 * 701 = change locale
3640 * 702 = find font
3641 * 703 = menu
3642 */ 3681 */
3643void 3682void
3644rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3683rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3645{ 3684{
3646 int changed = 0; 3685 int changed = 0;
… …
3672 unsigned long bytes_after; 3711 unsigned long bytes_after;
3673 unsigned char *value = 0; 3712 unsigned char *value = 0;
3674 const char *str = ""; 3713 const char *str = "";
3675 3714
3676 if (prop 3715 if (prop
3677 && XGetWindowProperty (disp, TermWin.parent[0], 3716 && XGetWindowProperty (disp, parent[0],
3678 prop, 0, 1<<16, 0, AnyPropertyType, 3717 prop, 0, 1<<16, 0, AnyPropertyType,
3679 &actual_type, &actual_format, 3718 &actual_type, &actual_format,
3680 &nitems, &bytes_after, &value) == Success 3719 &nitems, &bytes_after, &value) == Success
3681 && actual_type != None 3720 && actual_type != None
3682 && actual_format == 8) 3721 && actual_format == 8)
… …
3694 { 3733 {
3695 *eq = 0; 3734 *eq = 0;
3696 set_utf8_property (display->atom (str), eq + 1); 3735 set_utf8_property (display->atom (str), eq + 1);
3697 } 3736 }
3698 else 3737 else
3699 XDeleteProperty (disp, TermWin.parent[0], 3738 XDeleteProperty (disp, parent[0],
3700 display->atom (str)); 3739 display->atom (str));
3701 } 3740 }
3702 break; 3741 break;
3703 3742
3704 case XTerm_Color: 3743 case XTerm_Color:
… …
3745 break; 3784 break;
3746#ifndef NO_BOLD_UNDERLINE_REVERSE 3785#ifndef NO_BOLD_UNDERLINE_REVERSE
3747 case XTerm_Color_BD: 3786 case XTerm_Color_BD:
3748 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3787 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3749 break; 3788 break;
3750 case XTerm_Color_IT:
3751 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3752 break;
3753 case XTerm_Color_UL: 3789 case XTerm_Color_UL:
3754 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3790 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3755 break; 3791 break;
3756 case XTerm_Color_RV: 3792 case XTerm_Color_RV:
3757 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3793 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3758 break; 3794 break;
3795 case URxvt_Color_IT:
3796 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3797 break;
3759#endif 3798#endif
3760#if TRANSPARENT && TINTING 3799#if TRANSPARENT && TINTING
3761 case XTerm_Color_tint: 3800 case URxvt_Color_tint:
3762 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3801 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3763 check_our_parents (); 3802 check_our_parents ();
3764 if (am_transparent) 3803 if (am_transparent)
3765 want_full_refresh = want_refresh = 1; 3804 want_full_refresh = want_refresh = 1;
3766 break; 3805 break;
3767#endif 3806#endif
… …
3801 3840
3802 case XTerm_logfile: 3841 case XTerm_logfile:
3803 // TODO, when secure mode? 3842 // TODO, when secure mode?
3804 break; 3843 break;
3805 3844
3845#ifdef MENUBAR
3846 case URxvt_Menu:
3847 if (options & Opt_insecure)
3848 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3849 break;
3850#endif
3851#if 0
3852 case XTerm_dumpscreen: /* no error notices */
3853 {
3854 int fd;
3855 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3856 {
3857 scr_dump (fd);
3858 close (fd);
3859 }
3860 }
3861 break;
3862#endif
3806 case XTerm_font: 3863 case XTerm_font:
3807 op = URxvt_font; 3864 op = URxvt_font;
3808 case URxvt_font: 3865 case URxvt_font:
3809#if ENABLE_STYLES 3866#if ENABLE_STYLES
3810 case URxvt_boldFont: 3867 case URxvt_boldFont:
3811 case URxvt_italicFont: 3868 case URxvt_italicFont:
3812 case URxvt_boldItalicFont: 3869 case URxvt_boldItalicFont:
3813#endif 3870#endif
3814 if (query) 3871 if (query)
3815 tt_printf ("\33]%d;%-.250s%c", saveop, 3872 tt_printf ("\33]%d;%-.250s%c", saveop,
3816 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3873 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3817 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3874 ? fontset[op - URxvt_font]->fontdesc : "",
3818 resp); 3875 resp);
3819 else 3876 else
3820 { 3877 {
3821 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3878 const char *&res = rs[Rs_font + (op - URxvt_font)];
3822 3879
… …
3825 set_fonts (); 3882 set_fonts ();
3826 } 3883 }
3827 break; 3884 break;
3828 3885
3829#if ENABLE_FRILLS 3886#if ENABLE_FRILLS
3830 case XTerm_locale: 3887 case URxvt_locale:
3831 if (query) 3888 if (query)
3832 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3889 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3833 else 3890 else
3834 { 3891 {
3835 set_locale (str); 3892 set_locale (str);
3836 pty.set_utf8_mode (enc_utf8); 3893 pty.set_utf8_mode (enc_utf8);
3837# ifdef USE_XIM
3838 im_cb (); 3894 init_xlocale ();
3839# endif
3840 } 3895 }
3841 break; 3896 break;
3842#endif
3843 3897
3844#ifdef MENUBAR 3898 case URxvt_view_up:
3845 case XTerm_Menu: 3899 case URxvt_view_down:
3846 if (options & Opt_insecure) 3900 int lines = atoi (str);
3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3901
3848 break; 3902 if (lines)
3849#endif 3903 scr_page (op == URxvt_view_up ? UP : DN, lines);
3850#if 0
3851 case XTerm_dumpscreen: /* no error notices */
3852 { 3904 else
3853 int fd;
3854 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3855 { 3905 {
3856 scr_dump (fd); 3906 scr_erase_savelines ();
3857 close (fd);
3858 } 3907 }
3859 } 3908
3860 break; 3909 break;
3861#endif 3910#endif
3862 } 3911 }
3863} 3912}
3864/*----------------------------------------------------------------------*/ 3913/*----------------------------------------------------------------------*/
… …
3997 */ 4046 */
3998 PrivMode (1, PrivMode_vt52); 4047 PrivMode (1, PrivMode_vt52);
3999 break; 4048 break;
4000 case 3: /* 80/132 */ 4049 case 3: /* 80/132 */
4001 if (priv_modes & PrivMode_132OK) 4050 if (priv_modes & PrivMode_132OK)
4002 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4051 set_widthheight (((state ? 132 : 80) * fwidth), height);
4003 break; 4052 break;
4004 case 4: /* smooth scrolling */ 4053 case 4: /* smooth scrolling */
4005 if (state) 4054 if (state)
4006 options &= ~Opt_jumpScroll; 4055 options &= ~Opt_jumpScroll;
4007 else 4056 else

Diff Legend

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