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.178 by root, Wed Dec 15 00:53:23 2004 UTC vs.
Revision 1.204 by root, Wed Jul 13 02:47:02 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.
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h> 53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h"
55#endif
56
54#include <signal.h> 57#include <csignal>
55 58
56/*----------------------------------------------------------------------*/ 59/*----------------------------------------------------------------------*/
57 60
58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59 62
… …
114 XK_Escape, 0x238b, 117 XK_Escape, 0x238b,
115 XK_Undo, 0x238c, 118 XK_Undo, 0x238c,
116 XK_Print, 0x2399, 119 XK_Print, 0x2399,
117 120
118 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,
119 XK_KP_Space, 0x2422, 129 XK_KP_Space, 0x2422,
130#endif
120 0, 131 0,
121}; 132};
122 133
123void 134void
124rxvt_term::iso14755_54 (int x, int y) 135rxvt_term::iso14755_54 (int x, int y)
… …
152void 163void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
154{ 165{
155 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2; 168 wchar_t *chr, *alloc, ch2, *fname;
158 int len; 169 int len;
170
171 fname = rxvt_utf8towcs (f->name);
159 172
160#if ENABLE_COMBINING 173#if ENABLE_COMBINING
161 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
162 { 175 {
163 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
… …
172 alloc = 0; 185 alloc = 0;
173 chr = &ch2; 186 chr = &ch2;
174 len = 1; 187 len = 1;
175 } 188 }
176 189
177 int width = strlen (f->name); 190 int width = wcswidth (fname, wcslen (fname));
178 191
179 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
180 193
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182 195
… …
195#endif 208#endif
196 scr_overlay_set (11, y, ch, r); 209 scr_overlay_set (11, y, ch, r);
197 scr_overlay_set (12, y, NOCHAR, r); 210 scr_overlay_set (12, y, NOCHAR, r);
198 } 211 }
199 212
200 scr_overlay_set (0, len, f->name); 213 scr_overlay_set (0, len, fname);
214
215 free (fname);
201 216
202#if ENABLE_COMBINING 217#if ENABLE_COMBINING
203 if (alloc) 218 if (alloc)
204 delete [] alloc; 219 delete [] alloc;
205#endif 220#endif
… …
273 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 288 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274 * escape sequence to toggle the Keypad. 289 * escape sequence to toggle the Keypad.
275 * 290 *
276 * Always permit `shift' to override the current setting 291 * Always permit `shift' to override the current setting
277 */ 292 */
278 shft = (ev.state & ShiftMask); 293 shft = ev.state & ShiftMask;
279 ctrl = (ev.state & ControlMask); 294 ctrl = ev.state & ControlMask;
280 meta = (ev.state & ModMetaMask); 295 meta = ev.state & ModMetaMask;
281 296
282 if (numlock_state || (ev.state & ModNumLockMask)) 297 if (numlock_state || (ev.state & ModNumLockMask))
283 { 298 {
284 numlock_state = (ev.state & ModNumLockMask); 299 numlock_state = (ev.state & ModNumLockMask);
285 PrivMode ((!numlock_state), PrivMode_aplKP); 300 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
305 320
306 // the XOpenIM manpage lies about hardcoding the locale 321 // the XOpenIM manpage lies about hardcoding the locale
307 // at the point of XOpenIM, so temporarily switch locales 322 // at the point of XOpenIM, so temporarily switch locales
308 if (rs[Rs_imLocale]) 323 if (rs[Rs_imLocale])
309 SET_LOCALE (rs[Rs_imLocale]); 324 SET_LOCALE (rs[Rs_imLocale]);
325
310 // assume wchar_t == unicode or better 326 // assume wchar_t == unicode or better
311 len = XwcLookupString (Input_Context, &ev, wkbuf, 327 len = XwcLookupString (Input_Context, &ev, wkbuf,
312 KBUFSZ, &keysym, &status_return); 328 KBUFSZ, &keysym, &status_return);
329
313 if (rs[Rs_imLocale]) 330 if (rs[Rs_imLocale])
314 SET_LOCALE (locale); 331 SET_LOCALE (locale);
315 332
316 if (status_return == XLookupChars 333 if (status_return == XLookupChars
317 || status_return == XLookupBoth) 334 || status_return == XLookupBoth)
… …
344 valid_keysym = keysym != NoSymbol; 361 valid_keysym = keysym != NoSymbol;
345 } 362 }
346 363
347 if (valid_keysym) 364 if (valid_keysym)
348 { 365 {
366#ifdef KEYSYM_RESOURCE
367 if (keyboard->dispatch (this, keysym, ev.state))
368 return;
369#endif
370
349 if (TermWin.saveLines) 371 if (TermWin.saveLines)
350 { 372 {
351#ifdef UNSHIFTED_SCROLLKEYS 373#ifdef UNSHIFTED_SCROLLKEYS
352 if (!ctrl && !meta) 374 if (!ctrl && !meta)
353#else 375#else
… …
487 } 509 }
488#endif 510#endif
489 511
490 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 512 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491 { 513 {
492#ifdef KEYSYM_RESOURCE
493 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
494 {
495 unsigned int l;
496 const unsigned char *kbuf0;
497
498 kbuf0 = (Keysym_map[keysym & 0xFF]);
499 l = (unsigned int)*kbuf0++;
500
501 /* escape prefix */
502 if (meta
503# ifdef META8_OPTION
504 && meta_char == C0_ESC
505# endif
506 )
507 {
508 const unsigned char ch = C0_ESC;
509 tt_write (&ch, 1);
510 }
511
512 tt_write (kbuf0, l);
513 return;
514 }
515 else
516#endif
517 { 514 {
518 newlen = 1; 515 newlen = 1;
519 switch (keysym) 516 switch (keysym)
520 { 517 {
521#ifndef NO_BACKSPACE_KEY 518#ifndef NO_BACKSPACE_KEY
… …
529 else 526 else
530 strcpy (kbuf, key_backspace); 527 strcpy (kbuf, key_backspace);
531 break; 528 break;
532#endif 529#endif
533#ifndef NO_DELETE_KEY 530#ifndef NO_DELETE_KEY
531# ifdef XK_KP_Prior
532 case XK_KP_Delete:
533 /* allow shift to override */
534 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
535 {
536 strcpy (kbuf, "\033On");
537 break;
538 }
539 /* FALLTHROUGH */
540# endif
534 case XK_Delete: 541 case XK_Delete:
535 strcpy (kbuf, key_delete); 542 strcpy (kbuf, key_delete);
536 break; 543 break;
537#endif 544#endif
538 case XK_Tab: 545 case XK_Tab:
… …
641#ifdef XK_KP_Begin 648#ifdef XK_KP_Begin
642 case XK_KP_Begin: 649 case XK_KP_Begin:
643 strcpy (kbuf, "\033Ou"); 650 strcpy (kbuf, "\033Ou");
644 break; 651 break;
645 652
646 case XK_KP_Insert:
647 strcpy (kbuf, "\033Op");
648 break;
649
650 case XK_KP_Delete:
651 strcpy (kbuf, "\033On");
652 break;
653#endif 653#endif
654 case XK_KP_F1: /* "\033OP" */ 654 case XK_KP_F1: /* "\033OP" */
655 case XK_KP_F2: /* "\033OQ" */ 655 case XK_KP_F2: /* "\033OQ" */
656 case XK_KP_F3: /* "\033OR" */ 656 case XK_KP_F3: /* "\033OR" */
657 case XK_KP_F4: /* "\033OS" */ 657 case XK_KP_F4: /* "\033OS" */
… …
689 break; 689 break;
690 690
691 case XK_Find: 691 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 692 strcpy (kbuf, "\033[1~");
693 break; 693 break;
694
695#ifdef XK_KP_End
696 case XK_KP_Insert:
697 /* allow shift to override */
698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
699 {
700 strcpy (kbuf, "\033Op");
701 break;
702 }
703 /* FALLTHROUGH */
704#endif
694 case XK_Insert: 705 case XK_Insert:
695 strcpy (kbuf, "\033[2~"); 706 strcpy (kbuf, "\033[2~");
696 break; 707 break;
697#ifdef DXK_Remove /* support for DEC remove like key */ 708#ifdef DXK_Remove /* support for DEC remove like key */
698 case DXK_Remove: 709 case DXK_Remove:
… …
788#undef FKEY 799#undef FKEY
789 default: 800 default:
790 newlen = 0; 801 newlen = 0;
791 break; 802 break;
792 } 803 }
804
793 if (newlen) 805 if (newlen)
794 len = strlen (kbuf); 806 len = strlen (kbuf);
795 } 807 }
796 808
797 /* 809 /*
… …
805 } 817 }
806 else if (ctrl && keysym == XK_minus) 818 else if (ctrl && keysym == XK_minus)
807 { 819 {
808 len = 1; 820 len = 1;
809 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 821 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
822 }
823 else if (keysym == XK_ISO_Left_Tab)
824 {
825 strcpy (kbuf, "\033[Z");
826 len = 3;
810 } 827 }
811 else 828 else
812 { 829 {
813#ifdef META8_OPTION 830#ifdef META8_OPTION
814 /* set 8-bit on */ 831 /* set 8-bit on */
… …
873#endif /* DEBUG_CMD */ 890#endif /* DEBUG_CMD */
874 tt_write (kbuf, (unsigned int)len); 891 tt_write (kbuf, (unsigned int)len);
875} 892}
876/*}}} */ 893/*}}} */
877 894
878#if (MENUBAR_MAX) 895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
879/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
880/* attempt to `write' count to the input buffer */ 897/* attempt to `write' count to the input buffer */
881unsigned int 898unsigned int
882rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 899rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
883{ 900{
… …
906 923
907 cmd_parse (); 924 cmd_parse ();
908 925
909 return 0; 926 return 0;
910} 927}
911#endif /* MENUBAR_MAX */ 928#endif
912 929
913void 930void
914rxvt_term::flush () 931rxvt_term::flush ()
915{ 932{
916 flush_ev.stop (); 933 flush_ev.stop ();
… …
1017{ 1034{
1018 if (mouse_slip_wheel_speed == 0 1035 if (mouse_slip_wheel_speed == 0
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed)) 1037 : scr_page (UP, mouse_slip_wheel_speed))
1021 { 1038 {
1039 if (TermWin.view_start == TermWin.nscrolled ||
1040 TermWin.view_start == 0)
1041 mouse_slip_wheel_speed = 0;
1042
1022 refresh_type |= SMOOTH_REFRESH; 1043 refresh_type |= SMOOTH_REFRESH;
1023 want_refresh = 1; 1044 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 } 1046 }
1026} 1047}
… …
1089rxvt_term::pointer_blank () 1110rxvt_term::pointer_blank ()
1090{ 1111{
1091 if (! (options & Opt_pointerBlank)) 1112 if (! (options & Opt_pointerBlank))
1092 return; 1113 return;
1093 1114
1094 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1115 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
1095 XFlush (display->display); 1116 XFlush (display->display);
1096 1117
1097 hidden_pointer = 1; 1118 hidden_pointer = 1;
1098} 1119}
1099 1120
… …
1188 1209
1189/*{{{ process an X event */ 1210/*{{{ process an X event */
1190void 1211void
1191rxvt_term::x_cb (XEvent &ev) 1212rxvt_term::x_cb (XEvent &ev)
1192{ 1213{
1214 dDisp;
1215
1193 SET_R (this); 1216 SET_R (this);
1194 SET_LOCALE (locale); 1217 SET_LOCALE (locale);
1195 1218
1196#if defined(CURSOR_BLINK) 1219#if defined(CURSOR_BLINK)
1197 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
… …
1313 button_release (ev.xbutton); 1336 button_release (ev.xbutton);
1314 break; 1337 break;
1315 1338
1316 case ClientMessage: 1339 case ClientMessage:
1317 if (ev.xclient.format == 32 1340 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1342 {
1318 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1319 destroy (); 1344 destroy ();
1345#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev);
1350#endif
1351 }
1352#if ENABLE_XEMBED
1353 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1354 {
1355 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1356 focus_in ();
1357 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1358 focus_out ();
1359 }
1360#endif
1320#ifdef OFFIX_DND 1361#ifdef OFFIX_DND
1321 /* OffiX Dnd (drag 'n' drop) protocol */ 1362 /* OffiX Dnd (drag 'n' drop) protocol */
1322 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1363 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1323 && (ev.xclient.data.l[0] == DndFile 1364 && (ev.xclient.data.l[0] == DndFile
1324 || ev.xclient.data.l[0] == DndDir 1365 || ev.xclient.data.l[0] == DndDir
1325 || ev.xclient.data.l[0] == DndLink)) 1366 || ev.xclient.data.l[0] == DndLink))
1326 { 1367 {
1327 /* Get Dnd data */ 1368 /* Get Dnd data */
1328 Atom ActualType; 1369 Atom ActualType;
1329 int ActualFormat; 1370 int ActualFormat;
1330 unsigned char *data; 1371 unsigned char *data;
1331 unsigned long Size, RemainingBytes; 1372 unsigned long Size, RemainingBytes;
1332 1373
1333 XGetWindowProperty (display->display, display->root, 1374 XGetWindowProperty (disp, display->root,
1334 xa[XA_DNDSELECTION], 1375 xa[XA_DNDSELECTION],
1335 0L, 1000000L, 1376 0L, 1000000L,
1336 False, AnyPropertyType, 1377 False, AnyPropertyType,
1337 &ActualType, &ActualFormat, 1378 &ActualType, &ActualFormat,
1338 &Size, &RemainingBytes, 1379 &Size, &RemainingBytes,
1339 &data); 1380 &data);
1340 set_string_property (XA_CUT_BUFFER0, data); 1381 set_string_property (XA_CUT_BUFFER0, data);
1341 XFree (data); 1382 XFree (data);
1342 selection_paste (display->root, XA_CUT_BUFFER0, true); 1383 selection_paste (display->root, XA_CUT_BUFFER0, true);
1343 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1384 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1344 } 1385 }
1345#endif /* OFFIX_DND */ 1386#endif /* OFFIX_DND */
1346 break; 1387 break;
1347 1388
1348 case MappingNotify: 1389 case MappingNotify:
… …
1373 break; 1414 break;
1374 } 1415 }
1375 break; 1416 break;
1376 1417
1377 case FocusIn: 1418 case FocusIn:
1378 if (!TermWin.focus) 1419 focus_in ();
1379 {
1380 TermWin.focus = 1;
1381 want_refresh = 1;
1382#ifdef USE_XIM
1383 if (Input_Context != NULL)
1384 {
1385 IMSetStatusPosition ();
1386 XSetICFocus (Input_Context);
1387 }
1388#endif
1389#ifdef CURSOR_BLINK
1390 if (options & Opt_cursorBlink)
1391 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1392#endif
1393#ifdef OFF_FOCUS_FADING
1394 if (rs[Rs_fade])
1395 {
1396 pix_colors = pix_colors_focused;
1397 scr_recolour ();
1398 }
1399#endif
1400
1401 }
1402 break; 1420 break;
1403 1421
1404 case FocusOut: 1422 case FocusOut:
1405 if (TermWin.focus) 1423 focus_out ();
1406 {
1407 TermWin.focus = 0;
1408 want_refresh = 1;
1409
1410#if ENABLE_FRILLS || ISO_14755
1411 iso14755buf = 0;
1412#endif
1413#if ENABLE_OVERLAY
1414 scr_overlay_off ();
1415#endif
1416#ifdef USE_XIM
1417 if (Input_Context != NULL)
1418 XUnsetICFocus (Input_Context);
1419#endif
1420#ifdef CURSOR_BLINK
1421 if (options & Opt_cursorBlink)
1422 cursor_blink_ev.stop ();
1423 hidden_cursor = 0;
1424#endif
1425#ifdef OFF_FOCUS_FADING
1426 if (rs[Rs_fade])
1427 {
1428 pix_colors = pix_colors_unfocused;
1429 scr_recolour ();
1430 }
1431#endif
1432 }
1433 break; 1424 break;
1434 1425
1435 case ConfigureNotify: 1426 case ConfigureNotify:
1436 if (ev.xconfigure.window == TermWin.parent[0]) 1427 if (ev.xconfigure.window == TermWin.parent[0])
1437 { 1428 {
… …
1441 { /* Wrap lots of configures into one */ 1432 { /* Wrap lots of configures into one */
1442 width = ev.xconfigure.width; 1433 width = ev.xconfigure.width;
1443 height = ev.xconfigure.height; 1434 height = ev.xconfigure.height;
1444 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1435 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1445 } 1436 }
1446 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1437 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1447 1438
1448 if (szHint.width != width || szHint.height != height) 1439 if (szHint.width != width || szHint.height != height)
1449 { 1440 {
1450 seen_resize = 1; 1441 seen_resize = 1;
1451 resize_all_windows (width, height, 1); 1442 resize_all_windows (width, height, 1);
… …
1503 if (ev.xany.window == TermWin.vt) 1494 if (ev.xany.window == TermWin.vt)
1504 { 1495 {
1505 do 1496 do
1506 scr_expose (ev.xexpose.x, ev.xexpose.y, 1497 scr_expose (ev.xexpose.x, ev.xexpose.y,
1507 ev.xexpose.width, ev.xexpose.height, False); 1498 ev.xexpose.width, ev.xexpose.height, False);
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1509 1500
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1501 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511 1502
1512 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1513 scr_expose (ev.xexpose.x, ev.xexpose.y, 1504 scr_expose (ev.xexpose.x, ev.xexpose.y,
1514 ev.xexpose.width, ev.xexpose.height, False); 1505 ev.xexpose.width, ev.xexpose.height, False);
1515 1506
1516 scr_refresh (refresh_type); 1507 scr_refresh (refresh_type);
1517 } 1508 }
1518 else 1509 else
1519 { 1510 {
1520 XEvent unused_event; 1511 XEvent unused_event;
1521 1512
1522 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1513 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1523 ; 1514 ;
1524 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1515 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1525 ; 1516 ;
1526 1517
1527 if (isScrollbarWindow (ev.xany.window)) 1518 if (isScrollbarWindow (ev.xany.window))
1528 { 1519 {
1529 scrollBar.setIdle (); 1520 scrollBar.setIdle ();
… …
1534 menubar_expose (); 1525 menubar_expose ();
1535#endif 1526#endif
1536 1527
1537#ifdef TRANSPARENT 1528#ifdef TRANSPARENT
1538 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1529 if (am_transparent && ev.xany.window == TermWin.parent[0])
1539 XClearWindow (display->display, ev.xany.window); 1530 XClearWindow (disp, ev.xany.window);
1540#endif 1531#endif
1541 } 1532 }
1542 break; 1533 break;
1543 1534
1544 case MotionNotify: 1535 case MotionNotify:
… …
1558 1549
1559 if (ev.xany.window == TermWin.vt) 1550 if (ev.xany.window == TermWin.vt)
1560 { 1551 {
1561 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1552 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1562 { 1553 {
1563 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1554 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1564 ; 1555 ;
1565 1556
1566 XQueryPointer (display->display, TermWin.vt, 1557 XQueryPointer (disp, TermWin.vt,
1567 &unused_root, &unused_child, 1558 &unused_root, &unused_child,
1568 &unused_root_x, &unused_root_y, 1559 &unused_root_x, &unused_root_y,
1569 &ev.xbutton.x, &ev.xbutton.y, 1560 &ev.xbutton.x, &ev.xbutton.y,
1570 &ev.xbutton.state); 1561 &ev.xbutton.state);
1571#ifdef MOUSE_THRESHOLD 1562#ifdef MOUSE_THRESHOLD
… …
1635#endif 1626#endif
1636 } 1627 }
1637 } 1628 }
1638 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1639 { 1630 {
1640 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1631 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1641 MotionNotify, &ev)) 1632 MotionNotify, &ev))
1642 ; 1633 ;
1643 1634
1644 XQueryPointer (display->display, scrollBar.win, 1635 XQueryPointer (disp, scrollBar.win,
1645 &unused_root, &unused_child, 1636 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1637 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1638 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1639 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1654 } 1645 }
1655 break; 1646 break;
1656 } 1647 }
1657} 1648}
1658 1649
1650void
1651rxvt_term::focus_in ()
1652{
1653 if (!TermWin.focus)
1654 {
1655 TermWin.focus = 1;
1656 want_refresh = 1;
1657#ifdef USE_XIM
1658 if (Input_Context != NULL)
1659 {
1660 IMSetStatusPosition ();
1661 XSetICFocus (Input_Context);
1662 }
1663#endif
1664#ifdef CURSOR_BLINK
1665 if (options & Opt_cursorBlink)
1666 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1667#endif
1668#ifdef OFF_FOCUS_FADING
1669 if (rs[Rs_fade])
1670 {
1671 pix_colors = pix_colors_focused;
1672 scr_recolour ();
1673 }
1674#endif
1675 }
1676}
1677
1678void
1679rxvt_term::focus_out ()
1680{
1681 if (TermWin.focus)
1682 {
1683 TermWin.focus = 0;
1684 want_refresh = 1;
1685
1686#if ENABLE_FRILLS || ISO_14755
1687 iso14755buf = 0;
1688#endif
1689#if ENABLE_OVERLAY
1690 scr_overlay_off ();
1691#endif
1692#ifdef USE_XIM
1693 if (Input_Context != NULL)
1694 XUnsetICFocus (Input_Context);
1695#endif
1696#ifdef CURSOR_BLINK
1697 if (options & Opt_cursorBlink)
1698 cursor_blink_ev.stop ();
1699 hidden_cursor = 0;
1700#endif
1701#ifdef OFF_FOCUS_FADING
1702 if (rs[Rs_fade])
1703 {
1704 pix_colors = pix_colors_unfocused;
1705 scr_recolour ();
1706 }
1707#endif
1708 }
1709}
1710
1659#if TRANSPARENT 1711#if TRANSPARENT
1660void 1712void
1661rxvt_term::rootwin_cb (XEvent &ev) 1713rxvt_term::rootwin_cb (XEvent &ev)
1662{ 1714{
1663 SET_R (this); 1715 SET_R (this);
… …
1668 case PropertyNotify: 1720 case PropertyNotify:
1669 /* 1721 /*
1670 * if user used some Esetroot compatible prog to set the root bg, 1722 * if user used some Esetroot compatible prog to set the root bg,
1671 * use the property to determine the pixmap. We use it later on. 1723 * use the property to determine the pixmap. We use it later on.
1672 */ 1724 */
1673 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1725 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1674 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1726 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1675 return; 1727 return;
1676 1728
1677 /* FALLTHROUGH */ 1729 /* FALLTHROUGH */
1678 case ReparentNotify: 1730 case ReparentNotify:
1679 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1731 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
… …
1751 { 1803 {
1752 case Button1: 1804 case Button1:
1753 /* allow meta + click to select rectangular areas */ 1805 /* allow meta + click to select rectangular areas */
1754 /* should be done in screen.C */ 1806 /* should be done in screen.C */
1755#if ENABLE_FRILLS 1807#if ENABLE_FRILLS
1756 selection.rect = !! (ev.state & ModMetaMask); 1808 selection.rect = !!(ev.state & ModMetaMask);
1757#else 1809#else
1758 selection.rect = false; 1810 selection.rect = false;
1759#endif 1811#endif
1760 1812
1761 /* allow shift+left click to extend selection */ 1813 /* allow shift+left click to extend selection */
… …
2087 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2139 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2088 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2140 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2089 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2141 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2090 int i; 2142 int i;
2091 2143
2092 Visual* visual = display->visual; 2144 Visual *visual = display->visual;
2093 2145
2094 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2146 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2095 2147
2096 /* for convenience */ 2148 /* for convenience */
2097 mask_r = visual->red_mask; 2149 mask_r = visual->red_mask;
… …
2318 Atom atype; 2370 Atom atype;
2319 unsigned char *prop = NULL; 2371 unsigned char *prop = NULL;
2320 Window root, oldp, *list; 2372 Window root, oldp, *list;
2321 Pixmap rootpixmap = None; 2373 Pixmap rootpixmap = None;
2322 XWindowAttributes wattr, wrootattr; 2374 XWindowAttributes wattr, wrootattr;
2375 dDisp;
2323 2376
2324 pchanged = 0; 2377 pchanged = 0;
2325 2378
2326 if (!(options & Opt_transparent)) 2379 if (!(options & Opt_transparent))
2327 return pchanged; /* Don't try any more */ 2380 return pchanged; /* Don't try any more */
2328 2381
2329 XGetWindowAttributes (display->display, display->root, &wrootattr); 2382 XGetWindowAttributes (disp, display->root, &wrootattr);
2330 rootdepth = wrootattr.depth; 2383 rootdepth = wrootattr.depth;
2331 2384
2332 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2385 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2333 2386
2334 if (rootdepth != wattr.depth) 2387 if (rootdepth != wattr.depth)
2335 { 2388 {
2336 if (am_transparent) 2389 if (am_transparent)
2337 { 2390 {
2338 pchanged = 1; 2391 pchanged = 1;
2339 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2392 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2340 am_transparent = am_pixmap_trans = 0; 2393 am_transparent = am_pixmap_trans = 0;
2341 } 2394 }
2342 2395
2343 return pchanged; /* Don't try any more */ 2396 return pchanged; /* Don't try any more */
2344 } 2397 }
2345 2398
2346 /* Get all X ops out of the queue so that our information is up-to-date. */ 2399 /* Get all X ops out of the queue so that our information is up-to-date. */
2347 XSync (display->display, False); 2400 XSync (disp, False);
2348 2401
2349 /* 2402 /*
2350 * Make the frame window set by the window manager have 2403 * Make the frame window set by the window manager have
2351 * the root background. Some window managers put multiple nested frame 2404 * the root background. Some window managers put multiple nested frame
2352 * windows for each client, so we have to take care about that. 2405 * windows for each client, so we have to take care about that.
2353 */ 2406 */
2354 i = (xa[XA_XROOTPMAP_ID] 2407 i = (xa[XA_XROOTPMAP_ID]
2355 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2408 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2409 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357 &nitems, &bytes_after, &prop) == Success); 2410 &nitems, &bytes_after, &prop) == Success);
2358 2411
2359 if (!i || prop == NULL) 2412 if (!i || prop == NULL)
2360 i = (xa[XA_ESETROOT_PMAP_ID] 2413 i = (xa[XA_ESETROOT_PMAP_ID]
2361 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2414 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2362 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2415 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2363 &nitems, &bytes_after, &prop) == Success); 2416 &nitems, &bytes_after, &prop) == Success);
2364 2417
2365 if (!i || prop == NULL 2418 if (!i || prop == NULL
2366#if TINTING 2419#if TINTING
… …
2385 Window cr; 2438 Window cr;
2386 XImage *image; 2439 XImage *image;
2387 GC gc; 2440 GC gc;
2388 XGCValues gcvalue; 2441 XGCValues gcvalue;
2389 2442
2390 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2443 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2391 0, 0, &sx, &sy, &cr); 2444 0, 0, &sx, &sy, &cr);
2392 nw = (unsigned int)szHint.width; 2445 nw = (unsigned int)szHint.width;
2393 nh = (unsigned int)szHint.height; 2446 nh = (unsigned int)szHint.height;
2394 nx = ny = 0; 2447 nx = ny = 0;
2395 2448
… …
2408 } 2461 }
2409 2462
2410 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2463 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2411 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2464 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2412 2465
2413 XSync (display->display, False); 2466 XSync (disp, False);
2414 allowedxerror = -1; 2467 allowedxerror = -1;
2415 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2468 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2416 2469
2417 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2470 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2418 /* XXX: may need a delay here? */ 2471 /* XXX: may need a delay here? */
2419 allowedxerror = 0; 2472 allowedxerror = 0;
2420 2473
… …
2423 if (am_transparent && am_pixmap_trans) 2476 if (am_transparent && am_pixmap_trans)
2424 { 2477 {
2425 pchanged = 1; 2478 pchanged = 1;
2426 if (TermWin.pixmap != None) 2479 if (TermWin.pixmap != None)
2427 { 2480 {
2428 XFreePixmap (display->display, TermWin.pixmap); 2481 XFreePixmap (disp, TermWin.pixmap);
2429 TermWin.pixmap = None; 2482 TermWin.pixmap = None;
2430 } 2483 }
2431 } 2484 }
2432 2485
2433 am_pixmap_trans = 0; 2486 am_pixmap_trans = 0;
2434 } 2487 }
2435 else 2488 else
2436 { 2489 {
2437 if (TermWin.pixmap != None) 2490 if (TermWin.pixmap != None)
2438 XFreePixmap (display->display, TermWin.pixmap); 2491 XFreePixmap (disp, TermWin.pixmap);
2439 2492
2440#if TINTING 2493#if TINTING
2441 if (ISSET_PIXCOLOR (Color_tint)) 2494 if (ISSET_PIXCOLOR (Color_tint))
2442 { 2495 {
2443 unsigned short rm, gm, bm; 2496 unsigned short rm, gm, bm;
… …
2447 2500
2448 ShadeXImage (display, image, shade, rm, gm, bm); 2501 ShadeXImage (display, image, shade, rm, gm, bm);
2449 } 2502 }
2450#endif 2503#endif
2451 2504
2452 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2505 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2453 szHint.width, szHint.height, image->depth); 2506 szHint.width, szHint.height, image->depth);
2454 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2507 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2455 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2508 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2456 nx, ny, image->width, image->height); 2509 nx, ny, image->width, image->height);
2457 XFreeGC (display->display, gc); 2510 XFreeGC (disp, gc);
2458 XDestroyImage (image); 2511 XDestroyImage (image);
2459 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2512 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2460 XClearWindow (display->display, TermWin.parent[0]); 2513 XClearWindow (disp, TermWin.parent[0]);
2461 2514
2462 if (!am_transparent || !am_pixmap_trans) 2515 if (!am_transparent || !am_pixmap_trans)
2463 pchanged = 1; 2516 pchanged = 1;
2464 2517
2465 am_transparent = am_pixmap_trans = 1; 2518 am_transparent = am_pixmap_trans = 1;
2466 } 2519 }
2467 } 2520 }
2468 2521
2469 if (am_pixmap_trans) 2522 if (am_pixmap_trans)
2470 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2523 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2471 else 2524 else
2472 { 2525 {
2473 unsigned int n; 2526 unsigned int n;
2474 /* 2527 /*
2475 * InheritPixmap transparency 2528 * InheritPixmap transparency
2476 */ 2529 */
2477 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2530 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2478 { 2531 {
2479 oldp = TermWin.parent[i]; 2532 oldp = TermWin.parent[i];
2480 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2533 XQueryTree (disp, TermWin.parent[i - 1], &root,
2481 &TermWin.parent[i], &list, &n); 2534 &TermWin.parent[i], &list, &n);
2482 XFree (list); 2535 XFree (list);
2483 2536
2484 if (TermWin.parent[i] == display->root) 2537 if (TermWin.parent[i] == display->root)
2485 { 2538 {
… …
2497 2550
2498 if (pchanged) 2551 if (pchanged)
2499 { 2552 {
2500 for (; n < (unsigned int)i; n++) 2553 for (; n < (unsigned int)i; n++)
2501 { 2554 {
2502 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2555 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2503 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2556 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2504 { 2557 {
2505 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2558 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2506 break; 2559 break;
2507 } 2560 }
2508 } 2561 }
2509 } 2562 }
2510 2563
2511 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2564 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2512 { 2565 {
2513 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2566 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2514 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2567 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2515 am_transparent = 0; 2568 am_transparent = 0;
2516 /* XXX: also turn off Opt_transparent? */ 2569 /* XXX: also turn off Opt_transparent? */
2517 } 2570 }
2518 else 2571 else
2519 { 2572 {
… …
2522 * needed for fvwm2.2.2 (and before?) */ 2575 * needed for fvwm2.2.2 (and before?) */
2523 sleep (1); 2576 sleep (1);
2524#endif 2577#endif
2525 for (n = 0; n < (unsigned int)i; n++) 2578 for (n = 0; n < (unsigned int)i; n++)
2526 { 2579 {
2527 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2580 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2528 XClearWindow (display->display, TermWin.parent[n]); 2581 XClearWindow (disp, TermWin.parent[n]);
2529 } 2582 }
2530 2583
2531 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2584 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2532 am_transparent = 1; 2585 am_transparent = 1;
2533 } 2586 }
2534 2587
2535 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2588 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2536 TermWin.parent[i] = None; 2589 TermWin.parent[i] = None;
2537 } 2590 }
2538 2591
2539 if (scrollBar.win) 2592 if (scrollBar.win)
2540 { 2593 {
2541 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2594 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2542 scrollBar.setIdle (); 2595 scrollBar.setIdle ();
2543 scrollbar_show (0); 2596 scrollbar_show (0);
2544 } 2597 }
2545 2598
2546 if (am_transparent) 2599 if (am_transparent)
… …
2584 // some window managers resize the window early, and these programs 2637 // some window managers resize the window early, and these programs
2585 // then sometimes get the size wrong. 2638 // then sometimes get the size wrong.
2586 // unfortunately other programs are even more buggy and dislike 2639 // unfortunately other programs are even more buggy and dislike
2587 // being sent SIGWINCH, so only do it when we were in fact being 2640 // being sent SIGWINCH, so only do it when we were in fact being
2588 // resized. 2641 // resized.
2589 if (seen_resize) 2642 if (seen_resize && cmd_pid)
2590 kill (-cmd_pid, SIGWINCH); 2643 kill (-cmd_pid, SIGWINCH);
2591 } 2644 }
2592 2645
2593 /* Read a text string from the input buffer */ 2646 /* Read a text string from the input buffer */
2594 unicode_t buf[UBUFSIZ]; 2647 unicode_t buf[UBUFSIZ];
2595 bool refreshnow = false; 2648 bool refreshnow = false;
2596 int nlines = 0; 2649 int nlines = 0;
2597 unicode_t *str = buf; 2650 unicode_t *str = buf;
2651 unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ);
2598 2652
2599 for (;;) 2653 for (;;)
2600 { 2654 {
2601 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2655 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2602 break; 2656 break;
2603 2657
2604 *str++ = ch; 2658 *str++ = ch;
2605 2659
2606 if (ch == C0_LF) 2660 if (ch == C0_LF || str >= eol)
2607 { 2661 {
2608 nlines++; 2662 nlines++;
2609 refresh_count++; 2663 refresh_count++;
2610 2664
2611 if (!(options & Opt_jumpScroll) 2665 if (!(options & Opt_jumpScroll)
… …
2620 if (nlines >= TermWin.nrow - 1) 2674 if (nlines >= TermWin.nrow - 1)
2621 { 2675 {
2622 scr_add_lines (buf, nlines, str - buf); 2676 scr_add_lines (buf, nlines, str - buf);
2623 nlines = 0; 2677 nlines = 0;
2624 str = buf; 2678 str = buf;
2679 eol = str + min (TermWin.ncol, UBUFSIZ);
2625 } 2680 }
2626 }
2627 2681
2628 if (str >= buf + UBUFSIZ) 2682 if (str >= eol)
2629 { 2683 {
2684 if (eol >= buf + UBUFSIZ)
2685 {
2630 ch = NOCHAR; 2686 ch = NOCHAR;
2631 break; 2687 break;
2688 }
2689 else
2690 eol = min (eol + TermWin.ncol, buf + UBUFSIZ);
2691 }
2692
2632 } 2693 }
2633 2694
2634 seq_begin = cmdbuf_ptr; 2695 seq_begin = cmdbuf_ptr;
2635 ch = next_char (); 2696 ch = next_char ();
2636 } 2697 }
… …
2707 if (len == (size_t)-1) 2768 if (len == (size_t)-1)
2708 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2769 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2709 2770
2710 // assume wchar == unicode 2771 // assume wchar == unicode
2711 cmdbuf_ptr += len; 2772 cmdbuf_ptr += len;
2712 return wc; 2773 return wc & UNICODE_MASK;
2713 } 2774 }
2714 2775
2715 return NOCHAR; 2776 return NOCHAR;
2716} 2777}
2717 2778
… …
3180 { 3241 {
3181 switch (priv) 3242 switch (priv)
3182 { 3243 {
3183 case '>': 3244 case '>':
3184 if (ch == CSI_DA) /* secondary device attributes */ 3245 if (ch == CSI_DA) /* secondary device attributes */
3185 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3246 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3186 break; 3247 break;
3187 case '?': 3248 case '?':
3188 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3249 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3189 process_terminal_mode (ch, priv, nargs, arg); 3250 process_terminal_mode (ch, priv, nargs, arg);
3190 break; 3251 break;
… …
3419rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3480rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3420{ 3481{
3421 int x, y; 3482 int x, y;
3422 XWindowAttributes wattr; 3483 XWindowAttributes wattr;
3423 Window wdummy; 3484 Window wdummy;
3485 dDisp;
3424 3486
3425 if (nargs == 0) 3487 if (nargs == 0)
3426 return; 3488 return;
3427 3489
3428 switch (args[0]) 3490 switch (args[0])
3429 { 3491 {
3430 /* 3492 /*
3431 * commands 3493 * commands
3432 */ 3494 */
3433 case 1: /* deiconify window */ 3495 case 1: /* deiconify window */
3434 XMapWindow (display->display, TermWin.parent[0]); 3496 XMapWindow (disp, TermWin.parent[0]);
3435 break; 3497 break;
3436 case 2: /* iconify window */ 3498 case 2: /* iconify window */
3437 XIconifyWindow (display->display, TermWin.parent[0], 3499 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3438 DefaultScreen (display->display));
3439 break; 3500 break;
3440 case 3: /* set position (pixels) */ 3501 case 3: /* set position (pixels) */
3441 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3502 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3442 break; 3503 break;
3443 case 4: /* set size (pixels) */ 3504 case 4: /* set size (pixels) */
3444 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3505 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3445 break; 3506 break;
3446 case 5: /* raise window */ 3507 case 5: /* raise window */
3447 XRaiseWindow (display->display, TermWin.parent[0]); 3508 XRaiseWindow (disp, TermWin.parent[0]);
3448 break; 3509 break;
3449 case 6: /* lower window */ 3510 case 6: /* lower window */
3450 XLowerWindow (display->display, TermWin.parent[0]); 3511 XLowerWindow (disp, TermWin.parent[0]);
3451 break; 3512 break;
3452 case 7: /* refresh window */ 3513 case 7: /* refresh window */
3453 scr_touch (true); 3514 scr_touch (true);
3454 break; 3515 break;
3455 case 8: /* set size (chars) */ 3516 case 8: /* set size (chars) */
… …
3467 3528
3468 /* 3529 /*
3469 * reports - some output format copied from XTerm 3530 * reports - some output format copied from XTerm
3470 */ 3531 */
3471 case 11: /* report window state */ 3532 case 11: /* report window state */
3472 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3533 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3473 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3534 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3474 break; 3535 break;
3475 case 13: /* report window position */ 3536 case 13: /* report window position */
3476 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3537 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3477 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3538 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3478 -wattr.border_width, -wattr.border_width, 3539 -wattr.border_width, -wattr.border_width,
3479 &x, &y, &wdummy); 3540 &x, &y, &wdummy);
3480 tt_printf ("\033[3;%d;%dt", x, y); 3541 tt_printf ("\033[3;%d;%dt", x, y);
3481 break; 3542 break;
3482 case 14: /* report window size (pixels) */ 3543 case 14: /* report window size (pixels) */
3483 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3544 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3484 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3545 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3485 break; 3546 break;
3486 case 18: /* report text area size (chars) */ 3547 case 18: /* report text area size (chars) */
3487 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3548 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3488 break; 3549 break;
… …
3490 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3551 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3491 break; 3552 break;
3492 case 20: /* report icon label */ 3553 case 20: /* report icon label */
3493 { 3554 {
3494 char *s; 3555 char *s;
3495 XGetIconName (display->display, TermWin.parent[0], &s); 3556 XGetIconName (disp, TermWin.parent[0], &s);
3496 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3557 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3497 XFree (s); 3558 XFree (s);
3498 } 3559 }
3499 break; 3560 break;
3500 case 21: /* report window title */ 3561 case 21: /* report window title */
3501 { 3562 {
3502 char *s; 3563 char *s;
3503 XFetchName (display->display, TermWin.parent[0], &s); 3564 XFetchName (disp, TermWin.parent[0], &s);
3504 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3565 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3505 XFree (s); 3566 XFree (s);
3506 } 3567 }
3507 break; 3568 break;
3508 } 3569 }
… …
3541 else if (ch < 0x20) 3602 else if (ch < 0x20)
3542 return NULL; /* other control character - exit */ 3603 return NULL; /* other control character - exit */
3543 3604
3544 seen_esc = false; 3605 seen_esc = false;
3545 3606
3546 if (n >= sizeof (string) - 1) 3607 if (n >= STRING_MAX - 1)
3547 // stop at some sane length 3608 // stop at some sane length
3548 return NULL; 3609 return NULL;
3549 3610
3550 if (ch == C0_SYN) 3611 if (ch == C0_SYN)
3551 string[n++] = cmd_get8 (); 3612 string[n++] = cmd_get8 ();
… …
3619 set_window_color (color, str); 3680 set_window_color (color, str);
3620} 3681}
3621 3682
3622/* 3683/*
3623 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3684 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3624 * 0 = change iconName/title
3625 * 1 = change iconName
3626 * 2 = change title
3627 * 4 = change color
3628 * 10 = change fg color
3629 * 11 = change bg color
3630 * 12 = change text color
3631 * 13 = change mouse foreground color
3632 * 17 = change highlight character colour
3633 * 18 = change bold character color
3634 * 19 = change underlined character color
3635 * 46 = change logfile (not implemented)
3636 * 50 = change font
3637 *
3638 * rxvt extensions:
3639 * 20 = bg pixmap
3640 * 39 = change default fg color
3641 * 49 = change default bg color
3642 * 55 = dump scrollback buffer and all of screen
3643 * 701 = change locale
3644 * 702 = find font
3645 * 703 = menu
3646 */ 3685 */
3647void 3686void
3648rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3687rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3649{ 3688{
3650 int changed = 0; 3689 int changed = 0;
3651 int color; 3690 int color;
3652 char *buf, *name; 3691 char *buf, *name;
3653 bool query = str[0] == '?' && !str[1]; 3692 bool query = str[0] == '?' && !str[1];
3654 int saveop = op; 3693 int saveop = op;
3694 dDisp;
3655 3695
3656 assert (str != NULL); 3696 assert (str != NULL);
3657 switch (op) 3697 switch (op)
3658 { 3698 {
3659 case XTerm_name: 3699 case XTerm_name:
… …
3675 unsigned long bytes_after; 3715 unsigned long bytes_after;
3676 unsigned char *value = 0; 3716 unsigned char *value = 0;
3677 const char *str = ""; 3717 const char *str = "";
3678 3718
3679 if (prop 3719 if (prop
3680 && XGetWindowProperty (display->display, TermWin.parent[0], 3720 && XGetWindowProperty (disp, TermWin.parent[0],
3681 prop, 0, 1<<16, 0, AnyPropertyType, 3721 prop, 0, 1<<16, 0, AnyPropertyType,
3682 &actual_type, &actual_format, 3722 &actual_type, &actual_format,
3683 &nitems, &bytes_after, &value) == Success 3723 &nitems, &bytes_after, &value) == Success
3684 && actual_type != None 3724 && actual_type != None
3685 && actual_format == 8) 3725 && actual_format == 8)
… …
3697 { 3737 {
3698 *eq = 0; 3738 *eq = 0;
3699 set_utf8_property (display->atom (str), eq + 1); 3739 set_utf8_property (display->atom (str), eq + 1);
3700 } 3740 }
3701 else 3741 else
3702 XDeleteProperty (display->display, TermWin.parent[0], 3742 XDeleteProperty (disp, TermWin.parent[0],
3703 display->atom (str)); 3743 display->atom (str));
3704 } 3744 }
3705 break; 3745 break;
3706 3746
3707 case XTerm_Color: 3747 case XTerm_Color:
… …
3748 break; 3788 break;
3749#ifndef NO_BOLD_UNDERLINE_REVERSE 3789#ifndef NO_BOLD_UNDERLINE_REVERSE
3750 case XTerm_Color_BD: 3790 case XTerm_Color_BD:
3751 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3791 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3752 break; 3792 break;
3753 case XTerm_Color_IT:
3754 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3755 break;
3756 case XTerm_Color_UL: 3793 case XTerm_Color_UL:
3757 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3794 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3758 break; 3795 break;
3759 case XTerm_Color_RV: 3796 case XTerm_Color_RV:
3760 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3797 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3761 break; 3798 break;
3799 case URxvt_Color_IT:
3800 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3801 break;
3762#endif 3802#endif
3763#if TRANSPARENT && TINTING 3803#if TRANSPARENT && TINTING
3764 case XTerm_Color_tint: 3804 case URxvt_Color_tint:
3765 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3805 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3766 check_our_parents (); 3806 check_our_parents ();
3767 if (am_transparent) 3807 if (am_transparent)
3768 want_full_refresh = want_refresh = 1; 3808 want_full_refresh = want_refresh = 1;
3769 break; 3809 break;
3770#endif 3810#endif
… …
3782 { 3822 {
3783 str++; 3823 str++;
3784#if XPM_BACKGROUND 3824#if XPM_BACKGROUND
3785 changed += scale_pixmap (str); 3825 changed += scale_pixmap (str);
3786#endif 3826#endif
3787
3788 } 3827 }
3828
3789 if (changed) 3829 if (changed)
3790 { 3830 {
3791#ifdef XPM_BACKGROUND 3831#ifdef XPM_BACKGROUND
3792 resize_pixmap (); 3832 resize_pixmap ();
3793#endif 3833#endif
… …
3804 3844
3805 case XTerm_logfile: 3845 case XTerm_logfile:
3806 // TODO, when secure mode? 3846 // TODO, when secure mode?
3807 break; 3847 break;
3808 3848
3849#ifdef MENUBAR
3850 case URxvt_Menu:
3851 if (options & Opt_insecure)
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3853 break;
3854#endif
3855#if 0
3856 case XTerm_dumpscreen: /* no error notices */
3857 {
3858 int fd;
3859 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3860 {
3861 scr_dump (fd);
3862 close (fd);
3863 }
3864 }
3865 break;
3866#endif
3809 case XTerm_font: 3867 case XTerm_font:
3810 op = URxvt_font; 3868 op = URxvt_font;
3811 case URxvt_font: 3869 case URxvt_font:
3812#if ENABLE_STYLES 3870#if ENABLE_STYLES
3813 case URxvt_boldFont: 3871 case URxvt_boldFont:
… …
3828 set_fonts (); 3886 set_fonts ();
3829 } 3887 }
3830 break; 3888 break;
3831 3889
3832#if ENABLE_FRILLS 3890#if ENABLE_FRILLS
3833 case XTerm_locale: 3891 case URxvt_locale:
3834 if (query) 3892 if (query)
3835 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3893 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3836 else 3894 else
3837 { 3895 {
3838 set_locale (str); 3896 set_locale (str);
3839# ifdef USE_XIM 3897 pty.set_utf8_mode (enc_utf8);
3840 im_cb (); 3898 init_xlocale ();
3841# endif
3842 } 3899 }
3843 break; 3900 break;
3844#endif
3845 3901
3846#ifdef MENUBAR 3902 case URxvt_view_up:
3847 case XTerm_Menu: 3903 case URxvt_view_down:
3848 if (options & Opt_insecure) 3904 int lines = atoi (str);
3849 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3905
3850 break; 3906 if (lines)
3851#endif 3907 scr_page (op == URxvt_view_up ? UP : DN, lines);
3852#if 0
3853 case XTerm_dumpscreen: /* no error notices */
3854 { 3908 else
3855 int fd;
3856 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3857 { 3909 {
3858 scr_dump (fd); 3910 scr_erase_savelines ();
3859 close (fd);
3860 } 3911 }
3861 } 3912
3862 break; 3913 break;
3863#endif 3914#endif
3864 } 3915 }
3865} 3916}
3866/*----------------------------------------------------------------------*/ 3917/*----------------------------------------------------------------------*/

Diff Legend

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