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.194 by root, Mon Feb 14 10:44:50 2005 UTC vs.
Revision 1.215 by root, Fri Dec 23 14:46:34 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 (!IN_RANGE_EXC (x, 0, ncol)
133 || y < 0 || y >= TermWin.nrow) 141 || !IN_RANGE_EXC (y, 0, 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 = ROW(y - 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--;
149 } 158 }
150
151} 159}
152#endif 160#endif
153 161
154#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
155void 163void
156rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
157{ 165{
158 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
159 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
160 wchar_t *chr, *alloc, ch2; 168 wchar_t *chr, *alloc, ch2, *fname;
161 int len; 169 int len;
170
171 fname = rxvt_utf8towcs (f->name);
162 172
163#if ENABLE_COMBINING 173#if ENABLE_COMBINING
164 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
165 { 175 {
166 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
175 alloc = 0; 185 alloc = 0;
176 chr = &ch2; 186 chr = &ch2;
177 len = 1; 187 len = 1;
178 } 188 }
179 189
180 int width = strlen (f->name); 190 int width = wcswidth (fname, wcslen (fname));
181 191
182 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);
183 193
184 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
185 195
198#endif 208#endif
199 scr_overlay_set (11, y, ch, r); 209 scr_overlay_set (11, y, ch, r);
200 scr_overlay_set (12, y, NOCHAR, r); 210 scr_overlay_set (12, y, NOCHAR, r);
201 } 211 }
202 212
203 scr_overlay_set (0, len, f->name); 213 scr_overlay_set (0, len, fname);
214
215 free (fname);
204 216
205#if ENABLE_COMBINING 217#if ENABLE_COMBINING
206 if (alloc) 218 if (alloc)
207 delete [] alloc; 219 delete [] alloc;
208#endif 220#endif
276 * 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
277 * escape sequence to toggle the Keypad. 289 * escape sequence to toggle the Keypad.
278 * 290 *
279 * Always permit `shift' to override the current setting 291 * Always permit `shift' to override the current setting
280 */ 292 */
281 shft = (ev.state & ShiftMask); 293 shft = ev.state & ShiftMask;
282 ctrl = (ev.state & ControlMask); 294 ctrl = ev.state & ControlMask;
283 meta = (ev.state & ModMetaMask); 295 meta = ev.state & ModMetaMask;
284 296
285 if (numlock_state || (ev.state & ModNumLockMask)) 297 if (numlock_state || (ev.state & ModNumLockMask))
286 { 298 {
287 numlock_state = (ev.state & ModNumLockMask); 299 numlock_state = (ev.state & ModNumLockMask);
288 PrivMode ((!numlock_state), PrivMode_aplKP); 300 PrivMode ((!numlock_state), PrivMode_aplKP);
308 320
309 // the XOpenIM manpage lies about hardcoding the locale 321 // the XOpenIM manpage lies about hardcoding the locale
310 // at the point of XOpenIM, so temporarily switch locales 322 // at the point of XOpenIM, so temporarily switch locales
311 if (rs[Rs_imLocale]) 323 if (rs[Rs_imLocale])
312 SET_LOCALE (rs[Rs_imLocale]); 324 SET_LOCALE (rs[Rs_imLocale]);
325
313 // assume wchar_t == unicode or better 326 // assume wchar_t == unicode or better
314 len = XwcLookupString (Input_Context, &ev, wkbuf, 327 len = XwcLookupString (Input_Context, &ev, wkbuf,
315 KBUFSZ, &keysym, &status_return); 328 KBUFSZ, &keysym, &status_return);
329
316 if (rs[Rs_imLocale]) 330 if (rs[Rs_imLocale])
317 SET_LOCALE (locale); 331 SET_LOCALE (locale);
318 332
319 if (status_return == XLookupChars 333 if (status_return == XLookupChars
320 || status_return == XLookupBoth) 334 || status_return == XLookupBoth)
352#ifdef KEYSYM_RESOURCE 366#ifdef KEYSYM_RESOURCE
353 if (keyboard->dispatch (this, keysym, ev.state)) 367 if (keyboard->dispatch (this, keysym, ev.state))
354 return; 368 return;
355#endif 369#endif
356 370
357 if (TermWin.saveLines) 371 if (saveLines)
358 { 372 {
359#ifdef UNSHIFTED_SCROLLKEYS 373#ifdef UNSHIFTED_SCROLLKEYS
360 if (!ctrl && !meta) 374 if (!ctrl && !meta)
361#else 375#else
362 if (IS_SCROLL_MOD) 376 if (IS_SCROLL_MOD)
363#endif 377#endif
364 { 378 {
365 int lnsppg; 379 int lnsppg;
366 380
367#ifdef PAGING_CONTEXT_LINES 381#ifdef PAGING_CONTEXT_LINES
368 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 382 lnsppg = nrow - PAGING_CONTEXT_LINES;
369#else 383#else
370 lnsppg = TermWin.nrow * 4 / 5; 384 lnsppg = nrow * 4 / 5;
371#endif 385#endif
372 if (keysym == XK_Prior) 386 if (keysym == XK_Prior)
373 { 387 {
374 scr_page (UP, lnsppg); 388 scr_page (UP, lnsppg);
375 return; 389 return;
512 else 526 else
513 strcpy (kbuf, key_backspace); 527 strcpy (kbuf, key_backspace);
514 break; 528 break;
515#endif 529#endif
516#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
517 case XK_Delete: 541 case XK_Delete:
518 strcpy (kbuf, key_delete); 542 strcpy (kbuf, key_delete);
519 break; 543 break;
520#endif 544#endif
521 case XK_Tab: 545 case XK_Tab:
624#ifdef XK_KP_Begin 648#ifdef XK_KP_Begin
625 case XK_KP_Begin: 649 case XK_KP_Begin:
626 strcpy (kbuf, "\033Ou"); 650 strcpy (kbuf, "\033Ou");
627 break; 651 break;
628 652
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 653#endif
637 case XK_KP_F1: /* "\033OP" */ 654 case XK_KP_F1: /* "\033OP" */
638 case XK_KP_F2: /* "\033OQ" */ 655 case XK_KP_F2: /* "\033OQ" */
639 case XK_KP_F3: /* "\033OR" */ 656 case XK_KP_F3: /* "\033OR" */
640 case XK_KP_F4: /* "\033OS" */ 657 case XK_KP_F4: /* "\033OS" */
672 break; 689 break;
673 690
674 case XK_Find: 691 case XK_Find:
675 strcpy (kbuf, "\033[1~"); 692 strcpy (kbuf, "\033[1~");
676 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
677 case XK_Insert: 705 case XK_Insert:
678 strcpy (kbuf, "\033[2~"); 706 strcpy (kbuf, "\033[2~");
679 break; 707 break;
680#ifdef DXK_Remove /* support for DEC remove like key */ 708#ifdef DXK_Remove /* support for DEC remove like key */
681 case DXK_Remove: 709 case DXK_Remove:
817 845
818 if (len <= 0) 846 if (len <= 0)
819 return; /* not mapped */ 847 return; /* not mapped */
820 848
821 if (options & Opt_scrollTtyKeypress) 849 if (options & Opt_scrollTtyKeypress)
822 if (TermWin.view_start) 850 if (view_start)
823 { 851 {
824 TermWin.view_start = 0; 852 view_start = 0;
825 want_refresh = 1; 853 want_refresh = 1;
826 } 854 }
827 855
828 /* 856 /*
829 * these modifications only affect the static keybuffer 857 * these modifications only affect the static keybuffer
1006{ 1034{
1007 if (mouse_slip_wheel_speed == 0 1035 if (mouse_slip_wheel_speed == 0
1008 || 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)
1009 : scr_page (UP, mouse_slip_wheel_speed)) 1037 : scr_page (UP, mouse_slip_wheel_speed))
1010 { 1038 {
1011 if (TermWin.view_start == TermWin.nscrolled || 1039 if (view_start == nsaved ||
1012 TermWin.view_start == 0) 1040 view_start == 0)
1013 mouse_slip_wheel_speed = 0; 1041 mouse_slip_wheel_speed = 0;
1014 1042
1015 refresh_type |= SMOOTH_REFRESH; 1043 refresh_type |= SMOOTH_REFRESH;
1016 want_refresh = 1; 1044 want_refresh = 1;
1017 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1039 if (n > 0) 1067 if (n > 0)
1040 { 1068 {
1041 cmdbuf_endp += n; 1069 cmdbuf_endp += n;
1042 return true; 1070 return true;
1043 } 1071 }
1044 else if (n < 0 && errno != EAGAIN) 1072 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
1073 {
1074 pty_ev.stop ();
1075
1076 if (!(options & Opt_hold))
1045 destroy (); 1077 destroy ();
1078 }
1046 1079
1047 return false; 1080 return false;
1048} 1081}
1049 1082
1050void 1083void
1064} 1097}
1065 1098
1066void 1099void
1067rxvt_term::pointer_unblank () 1100rxvt_term::pointer_unblank ()
1068{ 1101{
1069 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1102 XDefineCursor (display->display, vt, TermWin_cursor);
1070 recolour_cursor (); 1103 recolour_cursor ();
1071 1104
1072#ifdef POINTER_BLANK 1105#ifdef POINTER_BLANK
1073 hidden_pointer = 0; 1106 hidden_pointer = 0;
1074 1107
1082rxvt_term::pointer_blank () 1115rxvt_term::pointer_blank ()
1083{ 1116{
1084 if (! (options & Opt_pointerBlank)) 1117 if (! (options & Opt_pointerBlank))
1085 return; 1118 return;
1086 1119
1087 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1120 XDefineCursor (display->display, vt, display->blank_cursor);
1088 XFlush (display->display); 1121 XFlush (display->display);
1089 1122
1090 hidden_pointer = 1; 1123 hidden_pointer = 1;
1091} 1124}
1092 1125
1308 button_release (ev.xbutton); 1341 button_release (ev.xbutton);
1309 break; 1342 break;
1310 1343
1311 case ClientMessage: 1344 case ClientMessage:
1312 if (ev.xclient.format == 32 1345 if (ev.xclient.format == 32
1346 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1347 {
1313 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1348 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1314 destroy (); 1349 destroy ();
1350#if ENABLE_EWMH
1351 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1352 XSendEvent (disp, ev.xclient.window = display->root,
1353 False, SubstructureRedirectMask | SubstructureNotifyMask,
1354 &ev);
1355#endif
1356 }
1357#if ENABLE_XEMBED
1358 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1359 {
1360 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1361 focus_in ();
1362 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1363 focus_out ();
1364 }
1365#endif
1315#ifdef OFFIX_DND 1366#ifdef OFFIX_DND
1316 /* OffiX Dnd (drag 'n' drop) protocol */ 1367 /* OffiX Dnd (drag 'n' drop) protocol */
1317 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1368 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1318 && (ev.xclient.data.l[0] == DndFile 1369 && (ev.xclient.data.l[0] == DndFile
1319 || ev.xclient.data.l[0] == DndDir 1370 || ev.xclient.data.l[0] == DndDir
1320 || ev.xclient.data.l[0] == DndLink)) 1371 || ev.xclient.data.l[0] == DndLink))
1321 { 1372 {
1322 /* Get Dnd data */ 1373 /* Get Dnd data */
1323 Atom ActualType; 1374 Atom ActualType;
1324 int ActualFormat; 1375 int ActualFormat;
1325 unsigned char *data; 1376 unsigned char *data;
1368 break; 1419 break;
1369 } 1420 }
1370 break; 1421 break;
1371 1422
1372 case FocusIn: 1423 case FocusIn:
1373 if (!TermWin.focus) 1424 focus_in ();
1425 break;
1426
1427 case FocusOut:
1428 focus_out ();
1429 break;
1430
1431 case ConfigureNotify:
1432 if (ev.xconfigure.window == parent[0])
1374 { 1433 {
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)); 1434 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1435 ;
1442 1436
1443 if (szHint.width != width || szHint.height != height) 1437 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1438 {
1445 seen_resize = 1; 1439 seen_resize = 1;
1446 resize_all_windows (width, height, 1); 1440 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1441 }
1448 1442
1449#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1443#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1450 if (options & Opt_transparent) 1444 if (options & Opt_transparent)
1451 check_our_parents (); 1445 check_our_parents ();
1472 case SelectionRequest: 1466 case SelectionRequest:
1473 selection_send (ev.xselectionrequest); 1467 selection_send (ev.xselectionrequest);
1474 break; 1468 break;
1475 1469
1476 case UnmapNotify: 1470 case UnmapNotify:
1477 TermWin.mapped = 0; 1471 mapped = 0;
1478#ifdef TEXT_BLINK 1472#ifdef TEXT_BLINK
1479 text_blink_ev.stop (); 1473 text_blink_ev.stop ();
1480#endif 1474#endif
1481 break; 1475 break;
1482 1476
1483 case MapNotify: 1477 case MapNotify:
1484 TermWin.mapped = 1; 1478 mapped = 1;
1485#ifdef TEXT_BLINK 1479#ifdef TEXT_BLINK
1486 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1480 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1487#endif 1481#endif
1488 break; 1482 break;
1489 1483
1493 break; 1487 break;
1494#endif /* TRANSPARENT */ 1488#endif /* TRANSPARENT */
1495 1489
1496 case GraphicsExpose: 1490 case GraphicsExpose:
1497 case Expose: 1491 case Expose:
1498 if (ev.xany.window == TermWin.vt) 1492 if (ev.xany.window == vt)
1499 { 1493 {
1500 do 1494 do
1501 scr_expose (ev.xexpose.x, ev.xexpose.y, 1495 scr_expose (ev.xexpose.x, ev.xexpose.y,
1502 ev.xexpose.width, ev.xexpose.height, False); 1496 ev.xexpose.width, ev.xexpose.height, False);
1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1504 1498
1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1499 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1506 1500
1507 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1501 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1508 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1509 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1510 1504
1511 scr_refresh (refresh_type); 1505 scr_refresh (refresh_type);
1512 } 1506 }
1528 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1522 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1529 menubar_expose (); 1523 menubar_expose ();
1530#endif 1524#endif
1531 1525
1532#ifdef TRANSPARENT 1526#ifdef TRANSPARENT
1533 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1527 if (am_transparent && ev.xany.window == parent[0])
1534 XClearWindow (disp, ev.xany.window); 1528 XClearWindow (disp, ev.xany.window);
1535#endif 1529#endif
1536 } 1530 }
1537 break; 1531 break;
1538 1532
1549 } 1543 }
1550#endif 1544#endif
1551 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1545 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1552 break; 1546 break;
1553 1547
1554 if (ev.xany.window == TermWin.vt) 1548 if (ev.xany.window == vt)
1555 { 1549 {
1556 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1550 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1557 { 1551 {
1558 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1552 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1559 ; 1553 ;
1560 1554
1561 XQueryPointer (disp, TermWin.vt, 1555 XQueryPointer (disp, vt,
1562 &unused_root, &unused_child, 1556 &unused_root, &unused_child,
1563 &unused_root_x, &unused_root_y, 1557 &unused_root_x, &unused_root_y,
1564 &ev.xbutton.x, &ev.xbutton.y, 1558 &ev.xbutton.x, &ev.xbutton.y,
1565 &ev.xbutton.state); 1559 &ev.xbutton.state);
1566#ifdef MOUSE_THRESHOLD 1560#ifdef MOUSE_THRESHOLD
1578#endif 1572#endif
1579 selection_extend (ev.xbutton.x, ev.xbutton.y, 1573 selection_extend (ev.xbutton.x, ev.xbutton.y,
1580 ev.xbutton.state & Button3Mask ? 2 : 0); 1574 ev.xbutton.state & Button3Mask ? 2 : 0);
1581 1575
1582#ifdef SELECTION_SCROLLING 1576#ifdef SELECTION_SCROLLING
1583 if (ev.xbutton.y < TermWin.int_bwidth 1577 if (ev.xbutton.y < int_bwidth
1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1578 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1585 { 1579 {
1586 int dist; 1580 int dist;
1587 1581
1588 /* don't clobber the current delay if we are 1582 /* don't clobber the current delay if we are
1589 * already in the middle of scrolling. 1583 * already in the middle of scrolling.
1597 selection_save_x = ev.xbutton.x; 1591 selection_save_x = ev.xbutton.x;
1598 selection_save_y = ev.xbutton.y; 1592 selection_save_y = ev.xbutton.y;
1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1593 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1600 1594
1601 /* calc number of lines to scroll */ 1595 /* calc number of lines to scroll */
1602 if (ev.xbutton.y < TermWin.int_bwidth) 1596 if (ev.xbutton.y < int_bwidth)
1603 { 1597 {
1604 scroll_selection_dir = UP; 1598 scroll_selection_dir = UP;
1605 dist = TermWin.int_bwidth - ev.xbutton.y; 1599 dist = int_bwidth - ev.xbutton.y;
1606 } 1600 }
1607 else 1601 else
1608 { 1602 {
1609 scroll_selection_dir = DN; 1603 scroll_selection_dir = DN;
1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1604 dist = ev.xbutton.y - (int_bwidth + height);
1611 } 1605 }
1612 1606
1613 scroll_selection_lines = Pixel2Height (dist) 1607 scroll_selection_lines = Pixel2Height (dist)
1614 / SELECTION_SCROLL_LINE_SPEEDUP 1608 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1; 1609 + 1;
1616 MIN_IT (scroll_selection_lines, 1610 min_it (scroll_selection_lines,
1617 SELECTION_SCROLL_MAX_LINES); 1611 SELECTION_SCROLL_MAX_LINES);
1618 } 1612 }
1619 else 1613 else
1620 { 1614 {
1621 /* we are within the text window, so we 1615 /* we are within the text window, so we
1649 } 1643 }
1650 break; 1644 break;
1651 } 1645 }
1652} 1646}
1653 1647
1648void
1649rxvt_term::focus_in ()
1650{
1651 if (!focus)
1652 {
1653 focus = 1;
1654 want_refresh = 1;
1655#if USE_XIM
1656 if (Input_Context != NULL)
1657 {
1658 IMSetStatusPosition ();
1659 XSetICFocus (Input_Context);
1660 }
1661#endif
1662#if CURSOR_BLINK
1663 if (options & Opt_cursorBlink)
1664 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1665#endif
1666#if OFF_FOCUS_FADING
1667 if (rs[Rs_fade])
1668 {
1669 pix_colors = pix_colors_focused;
1670 scr_recolour ();
1671 }
1672#endif
1673 }
1674}
1675
1676void
1677rxvt_term::focus_out ()
1678{
1679 if (focus)
1680 {
1681 focus = 0;
1682 want_refresh = 1;
1683
1684#if ENABLE_FRILLS || ISO_14755
1685 iso14755buf = 0;
1686#endif
1687#if ENABLE_OVERLAY
1688 scr_overlay_off ();
1689#endif
1690#if USE_XIM
1691 if (Input_Context != NULL)
1692 XUnsetICFocus (Input_Context);
1693#endif
1694#if CURSOR_BLINK
1695 if (options & Opt_cursorBlink)
1696 cursor_blink_ev.stop ();
1697 hidden_cursor = 0;
1698#endif
1699#if OFF_FOCUS_FADING
1700 if (rs[Rs_fade])
1701 {
1702 pix_colors = pix_colors_unfocused;
1703 scr_recolour ();
1704 }
1705#endif
1706 }
1707}
1708
1654#if TRANSPARENT 1709#if TRANSPARENT
1655void 1710void
1656rxvt_term::rootwin_cb (XEvent &ev) 1711rxvt_term::rootwin_cb (XEvent &ev)
1657{ 1712{
1658 SET_R (this); 1713 SET_R (this);
1688 reportmode = !! (priv_modes & PrivMode_mouse_report); 1743 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689 1744
1690 /* 1745 /*
1691 * VT window processing of button press 1746 * VT window processing of button press
1692 */ 1747 */
1693 if (ev.window == TermWin.vt) 1748 if (ev.window == vt)
1694 { 1749 {
1695#if ISO_14755 1750#if ISO_14755
1696 // 5.4 1751 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1752 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 { 1753 {
1903 case Button3: 1958 case Button3:
1904 if (scrollBar.style != R_SB_XTERM) 1959 if (scrollBar.style != R_SB_XTERM)
1905 { 1960 {
1906 if (scrollbar_above_slider (ev.y)) 1961 if (scrollbar_above_slider (ev.y))
1907# ifdef RXVT_SCROLL_FULL 1962# ifdef RXVT_SCROLL_FULL
1908 scr_page (UP, TermWin.nrow - 1); 1963 scr_page (UP, nrow - 1);
1909# else 1964# else
1910 scr_page (UP, TermWin.nrow / 4); 1965 scr_page (UP, nrow / 4);
1911# endif 1966# endif
1912 else if (scrollbar_below_slider (ev.y)) 1967 else if (scrollbar_below_slider (ev.y))
1913# ifdef RXVT_SCROLL_FULL 1968# ifdef RXVT_SCROLL_FULL
1914 scr_page (DN, TermWin.nrow - 1); 1969 scr_page (DN, nrow - 1);
1915# else 1970# else
1916 scr_page (DN, TermWin.nrow / 4); 1971 scr_page (DN, nrow / 4);
1917# endif 1972# endif
1918 else 1973 else
1919 scrollBar.setMotion (); 1974 scrollBar.setMotion ();
1920 } 1975 }
1921 else 1976 else
1922 { 1977 {
1923 scr_page ((ev.button == Button1 ? DN : UP), 1978 scr_page ((ev.button == Button1 ? DN : UP),
1924 (TermWin.nrow 1979 (nrow
1925 * scrollbar_position (ev.y) 1980 * scrollbar_position (ev.y)
1926 / scrollbar_size ())); 1981 / scrollbar_size ()));
1927 } 1982 }
1928 1983
1929 break; 1984 break;
1961#ifdef SELECTION_SCROLLING 2016#ifdef SELECTION_SCROLLING
1962 if (sel_scroll_ev.active) 2017 if (sel_scroll_ev.active)
1963 sel_scroll_ev.stop(); 2018 sel_scroll_ev.stop();
1964#endif 2019#endif
1965 2020
1966 if (ev.window == TermWin.vt) 2021 if (ev.window == vt)
1967 { 2022 {
1968#if ISO_14755 2023#if ISO_14755
1969 // 5.4 2024 // 5.4
1970 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2025 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1971 return; 2026 return;
2022 v = ev.button == Button4 ? UP : DN; 2077 v = ev.button == Button4 ? UP : DN;
2023 2078
2024 if (ev.state & ShiftMask) 2079 if (ev.state & ShiftMask)
2025 i = 1; 2080 i = 1;
2026 else if (options & Opt_mouseWheelScrollPage) 2081 else if (options & Opt_mouseWheelScrollPage)
2027 i = TermWin.nrow - 1; 2082 i = nrow - 1;
2028 else 2083 else
2029 i = 5; 2084 i = 5;
2030 2085
2031# ifdef MOUSE_SLIP_WHEELING 2086# ifdef MOUSE_SLIP_WHEELING
2032 if (ev.state & ControlMask) 2087 if (ev.state & ControlMask)
2033 { 2088 {
2034 mouse_slip_wheel_speed += v ? -1 : 1; 2089 mouse_slip_wheel_speed += v ? -1 : 1;
2035 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2090 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; 2091 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2037 2092
2038 if (slip_wheel_ev.at < NOW) 2093 if (slip_wheel_ev.at < NOW)
2039 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2094 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2040 2095
2041 slip_wheel_ev.start (); 2096 slip_wheel_ev.start ();
2323 return pchanged; /* Don't try any more */ 2378 return pchanged; /* Don't try any more */
2324 2379
2325 XGetWindowAttributes (disp, display->root, &wrootattr); 2380 XGetWindowAttributes (disp, display->root, &wrootattr);
2326 rootdepth = wrootattr.depth; 2381 rootdepth = wrootattr.depth;
2327 2382
2328 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2383 XGetWindowAttributes (disp, parent[0], &wattr);
2329 2384
2330 if (rootdepth != wattr.depth) 2385 if (rootdepth != wattr.depth)
2331 { 2386 {
2332 if (am_transparent) 2387 if (am_transparent)
2333 { 2388 {
2334 pchanged = 1; 2389 pchanged = 1;
2335 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2390 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2336 am_transparent = am_pixmap_trans = 0; 2391 am_transparent = am_pixmap_trans = 0;
2337 } 2392 }
2338 2393
2339 return pchanged; /* Don't try any more */ 2394 return pchanged; /* Don't try any more */
2340 } 2395 }
2381 Window cr; 2436 Window cr;
2382 XImage *image; 2437 XImage *image;
2383 GC gc; 2438 GC gc;
2384 XGCValues gcvalue; 2439 XGCValues gcvalue;
2385 2440
2386 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2441 XTranslateCoordinates (disp, parent[0], display->root,
2387 0, 0, &sx, &sy, &cr); 2442 0, 0, &sx, &sy, &cr);
2388 nw = (unsigned int)szHint.width; 2443 nw = (unsigned int)szHint.width;
2389 nh = (unsigned int)szHint.height; 2444 nh = (unsigned int)szHint.height;
2390 nx = ny = 0; 2445 nx = ny = 0;
2391 2446
2401 nh += sy; 2456 nh += sy;
2402 ny = -sy; 2457 ny = -sy;
2403 sy = 0; 2458 sy = 0;
2404 } 2459 }
2405 2460
2406 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2461 min_it (nw, (unsigned int) (wrootattr.width - sx));
2407 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2462 min_it (nh, (unsigned int) (wrootattr.height - sy));
2408 2463
2409 XSync (disp, False); 2464 XSync (disp, False);
2410 allowedxerror = -1; 2465 allowedxerror = -1;
2411 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2466 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2412 2467
2417 if (image == NULL) 2472 if (image == NULL)
2418 { 2473 {
2419 if (am_transparent && am_pixmap_trans) 2474 if (am_transparent && am_pixmap_trans)
2420 { 2475 {
2421 pchanged = 1; 2476 pchanged = 1;
2422 if (TermWin.pixmap != None) 2477 if (pixmap != None)
2423 { 2478 {
2424 XFreePixmap (disp, TermWin.pixmap); 2479 XFreePixmap (disp, pixmap);
2425 TermWin.pixmap = None; 2480 pixmap = None;
2426 } 2481 }
2427 } 2482 }
2428 2483
2429 am_pixmap_trans = 0; 2484 am_pixmap_trans = 0;
2430 } 2485 }
2431 else 2486 else
2432 { 2487 {
2433 if (TermWin.pixmap != None) 2488 if (pixmap != None)
2434 XFreePixmap (disp, TermWin.pixmap); 2489 XFreePixmap (disp, pixmap);
2435 2490
2436#if TINTING 2491#if TINTING
2437 if (ISSET_PIXCOLOR (Color_tint)) 2492 if (ISSET_PIXCOLOR (Color_tint))
2438 { 2493 {
2439 unsigned short rm, gm, bm; 2494 unsigned short rm, gm, bm;
2443 2498
2444 ShadeXImage (display, image, shade, rm, gm, bm); 2499 ShadeXImage (display, image, shade, rm, gm, bm);
2445 } 2500 }
2446#endif 2501#endif
2447 2502
2448 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2503 pixmap = XCreatePixmap (disp, vt,
2449 szHint.width, szHint.height, image->depth); 2504 szHint.width, szHint.height, image->depth);
2450 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2505 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2451 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2506 XPutImage (disp, pixmap, gc, image, 0, 0,
2452 nx, ny, image->width, image->height); 2507 nx, ny, image->width, image->height);
2453 XFreeGC (disp, gc); 2508 XFreeGC (disp, gc);
2454 XDestroyImage (image); 2509 XDestroyImage (image);
2455 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2510 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2456 XClearWindow (disp, TermWin.parent[0]); 2511 XClearWindow (disp, parent[0]);
2457 2512
2458 if (!am_transparent || !am_pixmap_trans) 2513 if (!am_transparent || !am_pixmap_trans)
2459 pchanged = 1; 2514 pchanged = 1;
2460 2515
2461 am_transparent = am_pixmap_trans = 1; 2516 am_transparent = am_pixmap_trans = 1;
2462 } 2517 }
2463 } 2518 }
2464 2519
2465 if (am_pixmap_trans) 2520 if (am_pixmap_trans)
2466 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2521 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2467 else 2522 else
2468 { 2523 {
2469 unsigned int n; 2524 unsigned int n;
2470 /* 2525 /*
2471 * InheritPixmap transparency 2526 * InheritPixmap transparency
2472 */ 2527 */
2473 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2528 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2474 { 2529 {
2475 oldp = TermWin.parent[i]; 2530 oldp = parent[i];
2476 XQueryTree (disp, TermWin.parent[i - 1], &root, 2531 XQueryTree (disp, parent[i - 1], &root,
2477 &TermWin.parent[i], &list, &n); 2532 &parent[i], &list, &n);
2478 XFree (list); 2533 XFree (list);
2479 2534
2480 if (TermWin.parent[i] == display->root) 2535 if (parent[i] == display->root)
2481 { 2536 {
2482 if (oldp != None) 2537 if (oldp != None)
2483 pchanged = 1; 2538 pchanged = 1;
2484 2539
2485 break; 2540 break;
2486 } 2541 }
2487 2542
2488 if (oldp != TermWin.parent[i]) 2543 if (oldp != parent[i])
2489 pchanged = 1; 2544 pchanged = 1;
2490 } 2545 }
2491 2546
2492 n = 0; 2547 n = 0;
2493 2548
2494 if (pchanged) 2549 if (pchanged)
2495 { 2550 {
2496 for (; n < (unsigned int)i; n++) 2551 for (; n < (unsigned int)i; n++)
2497 { 2552 {
2498 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2553 XGetWindowAttributes (disp, parent[n], &wattr);
2499 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2554 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2500 { 2555 {
2501 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2556 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2502 break; 2557 break;
2503 } 2558 }
2504 } 2559 }
2505 } 2560 }
2506 2561
2507 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2562 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2508 { 2563 {
2509 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2564 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2510 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2565 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2511 am_transparent = 0; 2566 am_transparent = 0;
2512 /* XXX: also turn off Opt_transparent? */ 2567 /* XXX: also turn off Opt_transparent? */
2513 } 2568 }
2514 else 2569 else
2515 { 2570 {
2518 * needed for fvwm2.2.2 (and before?) */ 2573 * needed for fvwm2.2.2 (and before?) */
2519 sleep (1); 2574 sleep (1);
2520#endif 2575#endif
2521 for (n = 0; n < (unsigned int)i; n++) 2576 for (n = 0; n < (unsigned int)i; n++)
2522 { 2577 {
2523 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2578 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2524 XClearWindow (disp, TermWin.parent[n]); 2579 XClearWindow (disp, parent[n]);
2525 } 2580 }
2526 2581
2527 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2528 am_transparent = 1; 2583 am_transparent = 1;
2529 } 2584 }
2530 2585
2531 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2586 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2532 TermWin.parent[i] = None; 2587 parent[i] = None;
2533 } 2588 }
2534 2589
2535 if (scrollBar.win) 2590 if (scrollBar.win)
2536 { 2591 {
2537 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2592 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2580 // some window managers resize the window early, and these programs 2635 // some window managers resize the window early, and these programs
2581 // then sometimes get the size wrong. 2636 // then sometimes get the size wrong.
2582 // unfortunately other programs are even more buggy and dislike 2637 // unfortunately other programs are even more buggy and dislike
2583 // being sent SIGWINCH, so only do it when we were in fact being 2638 // being sent SIGWINCH, so only do it when we were in fact being
2584 // resized. 2639 // resized.
2585 if (seen_resize) 2640 if (seen_resize && cmd_pid)
2586 kill (-cmd_pid, SIGWINCH); 2641 kill (-cmd_pid, SIGWINCH);
2587 } 2642 }
2588 2643
2589 /* Read a text string from the input buffer */ 2644 /* Read a text string from the input buffer */
2590 unicode_t buf[UBUFSIZ]; 2645 unicode_t buf[UBUFSIZ];
2591 bool refreshnow = false; 2646 bool refreshnow = false;
2592 int nlines = 0; 2647 int nlines = 0;
2593 unicode_t *str = buf; 2648 unicode_t *str = buf;
2649 unicode_t *eol = str + min (ncol, UBUFSIZ);
2594 2650
2595 for (;;) 2651 for (;;)
2596 { 2652 {
2597 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2653 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2598 break; 2654 break;
2599 2655
2600 *str++ = ch; 2656 *str++ = ch;
2601 2657
2602 if (ch == C0_LF) 2658 if (ch == C0_LF || str >= eol)
2603 { 2659 {
2660 if (ch == C0_LF)
2604 nlines++; 2661 nlines++;
2662
2605 refresh_count++; 2663 refresh_count++;
2606 2664
2607 if (!(options & Opt_jumpScroll) 2665 if (!(options & Opt_jumpScroll)
2608 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2666 || (refresh_count >= refresh_limit * (nrow - 1)))
2609 { 2667 {
2610 refreshnow = true; 2668 refreshnow = true;
2611 ch = NOCHAR; 2669 ch = NOCHAR;
2612 break; 2670 break;
2613 } 2671 }
2614 2672
2615 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2673 // scr_add_lines only works for nlines <= nrow - 1.
2616 if (nlines >= TermWin.nrow - 1) 2674 if (nlines >= nrow - 1)
2617 { 2675 {
2618 scr_add_lines (buf, nlines, str - buf); 2676 scr_add_lines (buf, nlines, str - buf);
2619 nlines = 0; 2677 nlines = 0;
2620 str = buf; 2678 str = buf;
2679 eol = str + min (ncol, UBUFSIZ);
2621 } 2680 }
2622 }
2623 2681
2624 if (str >= buf + UBUFSIZ) 2682 if (str >= eol)
2625 { 2683 {
2684 if (eol >= buf + UBUFSIZ)
2685 {
2626 ch = NOCHAR; 2686 ch = NOCHAR;
2627 break; 2687 break;
2688 }
2689 else
2690 eol = min (eol + ncol, buf + UBUFSIZ);
2691 }
2692
2628 } 2693 }
2629 2694
2630 seq_begin = cmdbuf_ptr; 2695 seq_begin = cmdbuf_ptr;
2631 ch = next_char (); 2696 ch = next_char ();
2632 } 2697 }
3291 3356
3292 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3357 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3293 arg[0] = -arg[0]; 3358 arg[0] = -arg[0];
3294 /* FALLTHROUGH */ 3359 /* FALLTHROUGH */
3295 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3360 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3296 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3361 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3297 break; 3362 break;
3298 3363
3299 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3364 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3300 tt_write ((const unsigned char *)VT100_ANS, 3365 tt_write ((const unsigned char *)VT100_ANS,
3301 (unsigned int) (sizeof (VT100_ANS) - 1)); 3366 (unsigned int) (sizeof (VT100_ANS) - 1));
3426 { 3491 {
3427 /* 3492 /*
3428 * commands 3493 * commands
3429 */ 3494 */
3430 case 1: /* deiconify window */ 3495 case 1: /* deiconify window */
3431 XMapWindow (disp, TermWin.parent[0]); 3496 XMapWindow (disp, parent[0]);
3432 break; 3497 break;
3433 case 2: /* iconify window */ 3498 case 2: /* iconify window */
3434 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3499 XIconifyWindow (disp, parent[0], display->screen);
3435 break; 3500 break;
3436 case 3: /* set position (pixels) */ 3501 case 3: /* set position (pixels) */
3437 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3502 XMoveWindow (disp, parent[0], args[1], args[2]);
3438 break; 3503 break;
3439 case 4: /* set size (pixels) */ 3504 case 4: /* set size (pixels) */
3440 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3505 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3441 break; 3506 break;
3442 case 5: /* raise window */ 3507 case 5: /* raise window */
3443 XRaiseWindow (disp, TermWin.parent[0]); 3508 XRaiseWindow (disp, parent[0]);
3444 break; 3509 break;
3445 case 6: /* lower window */ 3510 case 6: /* lower window */
3446 XLowerWindow (disp, TermWin.parent[0]); 3511 XLowerWindow (disp, parent[0]);
3447 break; 3512 break;
3448 case 7: /* refresh window */ 3513 case 7: /* refresh window */
3449 scr_touch (true); 3514 scr_touch (true);
3450 break; 3515 break;
3451 case 8: /* set size (chars) */ 3516 case 8: /* set size (chars) */
3452 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3517 set_widthheight ((unsigned int) (args[2] * fwidth),
3453 (unsigned int) (args[1] * TermWin.fheight)); 3518 (unsigned int) (args[1] * fheight));
3454 break; 3519 break;
3455 3520
3456 //case 9: NYI, TODO, restore maximized window or maximize window 3521 //case 9: NYI, TODO, restore maximized window or maximize window
3457 default: 3522 default:
3458 if (args[0] >= 24) /* set height (chars) */ 3523 if (args[0] >= 24) /* set height (chars) */
3459 set_widthheight ((unsigned int)TermWin.width, 3524 set_widthheight ((unsigned int)width,
3460 (unsigned int) (args[1] * TermWin.fheight)); 3525 (unsigned int) (args[1] * fheight));
3461 break; 3526 break;
3462 3527
3463 3528
3464 /* 3529 /*
3465 * reports - some output format copied from XTerm 3530 * reports - some output format copied from XTerm
3466 */ 3531 */
3467 case 11: /* report window state */ 3532 case 11: /* report window state */
3468 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3533 XGetWindowAttributes (disp, parent[0], &wattr);
3469 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3534 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3470 break; 3535 break;
3471 case 13: /* report window position */ 3536 case 13: /* report window position */
3472 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3537 XGetWindowAttributes (disp, parent[0], &wattr);
3473 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3538 XTranslateCoordinates (disp, parent[0], wattr.root,
3474 -wattr.border_width, -wattr.border_width, 3539 -wattr.border_width, -wattr.border_width,
3475 &x, &y, &wdummy); 3540 &x, &y, &wdummy);
3476 tt_printf ("\033[3;%d;%dt", x, y); 3541 tt_printf ("\033[3;%d;%dt", x, y);
3477 break; 3542 break;
3478 case 14: /* report window size (pixels) */ 3543 case 14: /* report window size (pixels) */
3479 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3544 XGetWindowAttributes (disp, parent[0], &wattr);
3480 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3545 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3481 break; 3546 break;
3482 case 18: /* report text area size (chars) */ 3547 case 18: /* report text area size (chars) */
3483 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3548 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3484 break; 3549 break;
3485 case 19: /* report window size (chars) */ 3550 case 19: /* report window size (chars) */
3486 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3551 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3487 break; 3552 break;
3488 case 20: /* report icon label */ 3553 case 20: /* report icon label */
3489 { 3554 {
3490 char *s; 3555 char *s;
3491 XGetIconName (disp, TermWin.parent[0], &s); 3556 XGetIconName (disp, parent[0], &s);
3492 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 */
3493 XFree (s); 3558 XFree (s);
3494 } 3559 }
3495 break; 3560 break;
3496 case 21: /* report window title */ 3561 case 21: /* report window title */
3497 { 3562 {
3498 char *s; 3563 char *s;
3499 XFetchName (disp, TermWin.parent[0], &s); 3564 XFetchName (disp, parent[0], &s);
3500 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 */
3501 XFree (s); 3566 XFree (s);
3502 } 3567 }
3503 break; 3568 break;
3504 } 3569 }
3537 else if (ch < 0x20) 3602 else if (ch < 0x20)
3538 return NULL; /* other control character - exit */ 3603 return NULL; /* other control character - exit */
3539 3604
3540 seen_esc = false; 3605 seen_esc = false;
3541 3606
3542 if (n >= sizeof (string) - 1) 3607 if (n >= STRING_MAX - 1)
3543 // stop at some sane length 3608 // stop at some sane length
3544 return NULL; 3609 return NULL;
3545 3610
3546 if (ch == C0_SYN) 3611 if (ch == C0_SYN)
3547 string[n++] = cmd_get8 (); 3612 string[n++] = cmd_get8 ();
3615 set_window_color (color, str); 3680 set_window_color (color, str);
3616} 3681}
3617 3682
3618/* 3683/*
3619 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3684 * 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 */ 3685 */
3643void 3686void
3644rxvt_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)
3645{ 3688{
3646 int changed = 0; 3689 int changed = 0;
3672 unsigned long bytes_after; 3715 unsigned long bytes_after;
3673 unsigned char *value = 0; 3716 unsigned char *value = 0;
3674 const char *str = ""; 3717 const char *str = "";
3675 3718
3676 if (prop 3719 if (prop
3677 && XGetWindowProperty (disp, TermWin.parent[0], 3720 && XGetWindowProperty (disp, parent[0],
3678 prop, 0, 1<<16, 0, AnyPropertyType, 3721 prop, 0, 1<<16, 0, AnyPropertyType,
3679 &actual_type, &actual_format, 3722 &actual_type, &actual_format,
3680 &nitems, &bytes_after, &value) == Success 3723 &nitems, &bytes_after, &value) == Success
3681 && actual_type != None 3724 && actual_type != None
3682 && actual_format == 8) 3725 && actual_format == 8)
3694 { 3737 {
3695 *eq = 0; 3738 *eq = 0;
3696 set_utf8_property (display->atom (str), eq + 1); 3739 set_utf8_property (display->atom (str), eq + 1);
3697 } 3740 }
3698 else 3741 else
3699 XDeleteProperty (disp, TermWin.parent[0], 3742 XDeleteProperty (disp, parent[0],
3700 display->atom (str)); 3743 display->atom (str));
3701 } 3744 }
3702 break; 3745 break;
3703 3746
3704 case XTerm_Color: 3747 case XTerm_Color:
3745 break; 3788 break;
3746#ifndef NO_BOLD_UNDERLINE_REVERSE 3789#ifndef NO_BOLD_UNDERLINE_REVERSE
3747 case XTerm_Color_BD: 3790 case XTerm_Color_BD:
3748 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3791 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3749 break; 3792 break;
3750 case XTerm_Color_IT:
3751 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3752 break;
3753 case XTerm_Color_UL: 3793 case XTerm_Color_UL:
3754 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3794 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3755 break; 3795 break;
3756 case XTerm_Color_RV: 3796 case XTerm_Color_RV:
3757 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3797 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3758 break; 3798 break;
3799 case URxvt_Color_IT:
3800 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3801 break;
3759#endif 3802#endif
3760#if TRANSPARENT && TINTING 3803#if TRANSPARENT && TINTING
3761 case XTerm_Color_tint: 3804 case URxvt_Color_tint:
3762 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3805 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3763 check_our_parents (); 3806 check_our_parents ();
3764 if (am_transparent) 3807 if (am_transparent)
3765 want_full_refresh = want_refresh = 1; 3808 want_full_refresh = want_refresh = 1;
3766 break; 3809 break;
3767#endif 3810#endif
3801 3844
3802 case XTerm_logfile: 3845 case XTerm_logfile:
3803 // TODO, when secure mode? 3846 // TODO, when secure mode?
3804 break; 3847 break;
3805 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
3806 case XTerm_font: 3867 case XTerm_font:
3807 op = URxvt_font; 3868 op = URxvt_font;
3808 case URxvt_font: 3869 case URxvt_font:
3809#if ENABLE_STYLES 3870#if ENABLE_STYLES
3810 case URxvt_boldFont: 3871 case URxvt_boldFont:
3811 case URxvt_italicFont: 3872 case URxvt_italicFont:
3812 case URxvt_boldItalicFont: 3873 case URxvt_boldItalicFont:
3813#endif 3874#endif
3814 if (query) 3875 if (query)
3815 tt_printf ("\33]%d;%-.250s%c", saveop, 3876 tt_printf ("\33]%d;%-.250s%c", saveop,
3816 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3877 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3817 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3878 ? fontset[op - URxvt_font]->fontdesc : "",
3818 resp); 3879 resp);
3819 else 3880 else
3820 { 3881 {
3821 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3882 const char *&res = rs[Rs_font + (op - URxvt_font)];
3822 3883
3825 set_fonts (); 3886 set_fonts ();
3826 } 3887 }
3827 break; 3888 break;
3828 3889
3829#if ENABLE_FRILLS 3890#if ENABLE_FRILLS
3830 case XTerm_locale: 3891 case URxvt_locale:
3831 if (query) 3892 if (query)
3832 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);
3833 else 3894 else
3834 { 3895 {
3835 set_locale (str); 3896 set_locale (str);
3836 pty.set_utf8_mode (enc_utf8); 3897 pty.set_utf8_mode (enc_utf8);
3837# ifdef USE_XIM
3838 im_cb (); 3898 init_xlocale ();
3839# endif
3840 } 3899 }
3841 break; 3900 break;
3842#endif
3843 3901
3844#ifdef MENUBAR 3902 case URxvt_view_up:
3845 case XTerm_Menu: 3903 case URxvt_view_down:
3846 if (options & Opt_insecure) 3904 int lines = atoi (str);
3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3905
3848 break; 3906 if (lines)
3849#endif 3907 scr_page (op == URxvt_view_up ? UP : DN, lines);
3850#if 0
3851 case XTerm_dumpscreen: /* no error notices */
3852 { 3908 else
3853 int fd;
3854 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3855 { 3909 {
3856 scr_dump (fd); 3910 scr_erase_savelines ();
3857 close (fd);
3858 } 3911 }
3859 } 3912
3860 break; 3913 break;
3861#endif 3914#endif
3862 } 3915 }
3863} 3916}
3864/*----------------------------------------------------------------------*/ 3917/*----------------------------------------------------------------------*/
3997 */ 4050 */
3998 PrivMode (1, PrivMode_vt52); 4051 PrivMode (1, PrivMode_vt52);
3999 break; 4052 break;
4000 case 3: /* 80/132 */ 4053 case 3: /* 80/132 */
4001 if (priv_modes & PrivMode_132OK) 4054 if (priv_modes & PrivMode_132OK)
4002 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4055 set_widthheight (((state ? 132 : 80) * fwidth), height);
4003 break; 4056 break;
4004 case 4: /* smooth scrolling */ 4057 case 4: /* smooth scrolling */
4005 if (state) 4058 if (state)
4006 options &= ~Opt_jumpScroll; 4059 options &= ~Opt_jumpScroll;
4007 else 4060 else
4324 } 4377 }
4325 4378
4326 memmove (v_buffer, v_buffer + written, v_buflen); 4379 memmove (v_buffer, v_buffer + written, v_buflen);
4327 } 4380 }
4328 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4381 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4329 // original code just ignores this... 4382 pty_ev.set (EVENT_READ);
4330 destroy ();
4331} 4383}
4332 4384
4333/*----------------------- end-of-file (C source) -----------------------*/ 4385/*----------------------- end-of-file (C source) -----------------------*/
4334 4386

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines