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.192 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.216 by root, Tue Dec 27 01:25:42 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.
… …
52 52
53#ifdef KEYSYM_RESOURCE 53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 54# include "keyboard.h"
55#endif 55#endif
56 56
57#include <cwchar>
58#include <csignal> 57#include <csignal>
59 58
60/*----------------------------------------------------------------------*/ 59/*----------------------------------------------------------------------*/
61 60
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
118 XK_Escape, 0x238b, 117 XK_Escape, 0x238b,
119 XK_Undo, 0x238c, 118 XK_Undo, 0x238c,
120 XK_Print, 0x2399, 119 XK_Print, 0x2399,
121 120
122 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,
123 XK_KP_Space, 0x2422, 129 XK_KP_Space, 0x2422,
130#endif
124 0, 131 0,
125}; 132};
126 133
127void 134void
128rxvt_term::iso14755_54 (int x, int y) 135rxvt_term::iso14755_54 (int x, int y)
129{ 136{
130 x = Pixel2Col (x); 137 x = Pixel2Col (x);
131 y = Pixel2Row (y); 138 y = Pixel2Row (y);
132 139
133 if (x < 0 || x >= TermWin.ncol 140 if (!IN_RANGE_EXC (x, 0, ncol)
134 || y < 0 || y >= TermWin.nrow) 141 || !IN_RANGE_EXC (y, 0, nrow))
135 return; 142 return;
136 143
137 for (;;) 144 for (;;)
138 { 145 {
139 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];
140 149
141 if (t != NOCHAR || !x) 150 if (t != NOCHAR || !x)
142 { 151 {
143 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 152 iso14755_51 (l.t[x], l.r[x]);
144 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
145 iso14755buf = ISO_14755_54; 153 iso14755buf = ISO_14755_54;
146 break; 154 break;
147 } 155 }
148 156
149 x--; 157 x--;
150 } 158 }
151
152} 159}
153#endif 160#endif
154 161
155#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
156void 163void
157rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
158{ 165{
159 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
160 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
161 wchar_t *chr, *alloc, ch2; 168 wchar_t *chr, *alloc, ch2, *fname;
162 int len; 169 int len;
170
171 fname = rxvt_utf8towcs (f->name);
163 172
164#if ENABLE_COMBINING 173#if ENABLE_COMBINING
165 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
166 { 175 {
167 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
… …
176 alloc = 0; 185 alloc = 0;
177 chr = &ch2; 186 chr = &ch2;
178 len = 1; 187 len = 1;
179 } 188 }
180 189
181 int width = strlen (f->name); 190 char attr[80]; // plenty
182 191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 GET_FGCOLOR (r), GET_BGCOLOR (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
202 int width = wcswidth (fname, wcslen (fname));
203
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
183 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 207 scr_overlay_new (0, -1, width, len + 2);
184 208
185 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 209 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
186 210
187 for (int y = 0; y < len; y++) 211 for (int y = 0; y < len; y++)
188 { 212 {
… …
199#endif 223#endif
200 scr_overlay_set (11, y, ch, r); 224 scr_overlay_set (11, y, ch, r);
201 scr_overlay_set (12, y, NOCHAR, r); 225 scr_overlay_set (12, y, NOCHAR, r);
202 } 226 }
203 227
228 scr_overlay_set (0, len , attr);
204 scr_overlay_set (0, len, f->name); 229 scr_overlay_set (0, len + 1, fname);
230
231 free (fname);
205 232
206#if ENABLE_COMBINING 233#if ENABLE_COMBINING
207 if (alloc) 234 if (alloc)
208 delete [] alloc; 235 delete [] alloc;
209#endif 236#endif
… …
277 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 304 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
278 * escape sequence to toggle the Keypad. 305 * escape sequence to toggle the Keypad.
279 * 306 *
280 * Always permit `shift' to override the current setting 307 * Always permit `shift' to override the current setting
281 */ 308 */
282 shft = (ev.state & ShiftMask); 309 shft = ev.state & ShiftMask;
283 ctrl = (ev.state & ControlMask); 310 ctrl = ev.state & ControlMask;
284 meta = (ev.state & ModMetaMask); 311 meta = ev.state & ModMetaMask;
285 312
286 if (numlock_state || (ev.state & ModNumLockMask)) 313 if (numlock_state || (ev.state & ModNumLockMask))
287 { 314 {
288 numlock_state = (ev.state & ModNumLockMask); 315 numlock_state = (ev.state & ModNumLockMask);
289 PrivMode ((!numlock_state), PrivMode_aplKP); 316 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
309 336
310 // the XOpenIM manpage lies about hardcoding the locale 337 // the XOpenIM manpage lies about hardcoding the locale
311 // at the point of XOpenIM, so temporarily switch locales 338 // at the point of XOpenIM, so temporarily switch locales
312 if (rs[Rs_imLocale]) 339 if (rs[Rs_imLocale])
313 SET_LOCALE (rs[Rs_imLocale]); 340 SET_LOCALE (rs[Rs_imLocale]);
341
314 // assume wchar_t == unicode or better 342 // assume wchar_t == unicode or better
315 len = XwcLookupString (Input_Context, &ev, wkbuf, 343 len = XwcLookupString (Input_Context, &ev, wkbuf,
316 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
345
317 if (rs[Rs_imLocale]) 346 if (rs[Rs_imLocale])
318 SET_LOCALE (locale); 347 SET_LOCALE (locale);
319 348
320 if (status_return == XLookupChars 349 if (status_return == XLookupChars
321 || status_return == XLookupBoth) 350 || status_return == XLookupBoth)
… …
353#ifdef KEYSYM_RESOURCE 382#ifdef KEYSYM_RESOURCE
354 if (keyboard->dispatch (this, keysym, ev.state)) 383 if (keyboard->dispatch (this, keysym, ev.state))
355 return; 384 return;
356#endif 385#endif
357 386
358 if (TermWin.saveLines) 387 if (saveLines)
359 { 388 {
360#ifdef UNSHIFTED_SCROLLKEYS 389#ifdef UNSHIFTED_SCROLLKEYS
361 if (!ctrl && !meta) 390 if (!ctrl && !meta)
362#else 391#else
363 if (IS_SCROLL_MOD) 392 if (IS_SCROLL_MOD)
364#endif 393#endif
365 { 394 {
366 int lnsppg; 395 int lnsppg;
367 396
368#ifdef PAGING_CONTEXT_LINES 397#ifdef PAGING_CONTEXT_LINES
369 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 398 lnsppg = nrow - PAGING_CONTEXT_LINES;
370#else 399#else
371 lnsppg = TermWin.nrow * 4 / 5; 400 lnsppg = nrow * 4 / 5;
372#endif 401#endif
373 if (keysym == XK_Prior) 402 if (keysym == XK_Prior)
374 { 403 {
375 scr_page (UP, lnsppg); 404 scr_page (UP, lnsppg);
376 return; 405 return;
… …
513 else 542 else
514 strcpy (kbuf, key_backspace); 543 strcpy (kbuf, key_backspace);
515 break; 544 break;
516#endif 545#endif
517#ifndef NO_DELETE_KEY 546#ifndef NO_DELETE_KEY
547# ifdef XK_KP_Prior
548 case XK_KP_Delete:
549 /* allow shift to override */
550 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
551 {
552 strcpy (kbuf, "\033On");
553 break;
554 }
555 /* FALLTHROUGH */
556# endif
518 case XK_Delete: 557 case XK_Delete:
519 strcpy (kbuf, key_delete); 558 strcpy (kbuf, key_delete);
520 break; 559 break;
521#endif 560#endif
522 case XK_Tab: 561 case XK_Tab:
… …
625#ifdef XK_KP_Begin 664#ifdef XK_KP_Begin
626 case XK_KP_Begin: 665 case XK_KP_Begin:
627 strcpy (kbuf, "\033Ou"); 666 strcpy (kbuf, "\033Ou");
628 break; 667 break;
629 668
630 case XK_KP_Insert:
631 strcpy (kbuf, "\033Op");
632 break;
633
634 case XK_KP_Delete:
635 strcpy (kbuf, "\033On");
636 break;
637#endif 669#endif
638 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
639 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
640 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
641 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
… …
673 break; 705 break;
674 706
675 case XK_Find: 707 case XK_Find:
676 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
677 break; 709 break;
710
711#ifdef XK_KP_End
712 case XK_KP_Insert:
713 /* allow shift to override */
714 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
715 {
716 strcpy (kbuf, "\033Op");
717 break;
718 }
719 /* FALLTHROUGH */
720#endif
678 case XK_Insert: 721 case XK_Insert:
679 strcpy (kbuf, "\033[2~"); 722 strcpy (kbuf, "\033[2~");
680 break; 723 break;
681#ifdef DXK_Remove /* support for DEC remove like key */ 724#ifdef DXK_Remove /* support for DEC remove like key */
682 case DXK_Remove: 725 case DXK_Remove:
… …
818 861
819 if (len <= 0) 862 if (len <= 0)
820 return; /* not mapped */ 863 return; /* not mapped */
821 864
822 if (options & Opt_scrollTtyKeypress) 865 if (options & Opt_scrollTtyKeypress)
823 if (TermWin.view_start) 866 if (view_start)
824 { 867 {
825 TermWin.view_start = 0; 868 view_start = 0;
826 want_refresh = 1; 869 want_refresh = 1;
827 } 870 }
828 871
829 /* 872 /*
830 * these modifications only affect the static keybuffer 873 * these modifications only affect the static keybuffer
… …
1007{ 1050{
1008 if (mouse_slip_wheel_speed == 0 1051 if (mouse_slip_wheel_speed == 0
1009 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1052 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1010 : scr_page (UP, mouse_slip_wheel_speed)) 1053 : scr_page (UP, mouse_slip_wheel_speed))
1011 { 1054 {
1012 if (TermWin.view_start == TermWin.nscrolled || 1055 if (view_start == nsaved ||
1013 TermWin.view_start == 0) 1056 view_start == 0)
1014 mouse_slip_wheel_speed = 0; 1057 mouse_slip_wheel_speed = 0;
1015 1058
1016 refresh_type |= SMOOTH_REFRESH; 1059 refresh_type |= SMOOTH_REFRESH;
1017 want_refresh = 1; 1060 want_refresh = 1;
1018 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1061 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1040 if (n > 0) 1083 if (n > 0)
1041 { 1084 {
1042 cmdbuf_endp += n; 1085 cmdbuf_endp += n;
1043 return true; 1086 return true;
1044 } 1087 }
1045 else if (n < 0 && errno != EAGAIN) 1088 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
1089 {
1090 pty_ev.stop ();
1091
1092 if (!(options & Opt_hold))
1046 destroy (); 1093 destroy ();
1094 }
1047 1095
1048 return false; 1096 return false;
1049} 1097}
1050 1098
1051void 1099void
… …
1065} 1113}
1066 1114
1067void 1115void
1068rxvt_term::pointer_unblank () 1116rxvt_term::pointer_unblank ()
1069{ 1117{
1070 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1118 XDefineCursor (display->display, vt, TermWin_cursor);
1071 recolour_cursor (); 1119 recolour_cursor ();
1072 1120
1073#ifdef POINTER_BLANK 1121#ifdef POINTER_BLANK
1074 hidden_pointer = 0; 1122 hidden_pointer = 0;
1075 1123
… …
1083rxvt_term::pointer_blank () 1131rxvt_term::pointer_blank ()
1084{ 1132{
1085 if (! (options & Opt_pointerBlank)) 1133 if (! (options & Opt_pointerBlank))
1086 return; 1134 return;
1087 1135
1088 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1136 XDefineCursor (display->display, vt, display->blank_cursor);
1089 XFlush (display->display); 1137 XFlush (display->display);
1090 1138
1091 hidden_pointer = 1; 1139 hidden_pointer = 1;
1092} 1140}
1093 1141
… …
1309 button_release (ev.xbutton); 1357 button_release (ev.xbutton);
1310 break; 1358 break;
1311 1359
1312 case ClientMessage: 1360 case ClientMessage:
1313 if (ev.xclient.format == 32 1361 if (ev.xclient.format == 32
1362 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1363 {
1314 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1364 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1315 destroy (); 1365 destroy ();
1366#if ENABLE_EWMH
1367 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1368 XSendEvent (disp, ev.xclient.window = display->root,
1369 False, SubstructureRedirectMask | SubstructureNotifyMask,
1370 &ev);
1371#endif
1372 }
1373#if ENABLE_XEMBED
1374 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1375 {
1376 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1377 focus_in ();
1378 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1379 focus_out ();
1380 }
1381#endif
1316#ifdef OFFIX_DND 1382#ifdef OFFIX_DND
1317 /* OffiX Dnd (drag 'n' drop) protocol */ 1383 /* OffiX Dnd (drag 'n' drop) protocol */
1318 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1384 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1319 && (ev.xclient.data.l[0] == DndFile 1385 && (ev.xclient.data.l[0] == DndFile
1320 || ev.xclient.data.l[0] == DndDir 1386 || ev.xclient.data.l[0] == DndDir
1321 || ev.xclient.data.l[0] == DndLink)) 1387 || ev.xclient.data.l[0] == DndLink))
1322 { 1388 {
1323 /* Get Dnd data */ 1389 /* Get Dnd data */
1324 Atom ActualType; 1390 Atom ActualType;
1325 int ActualFormat; 1391 int ActualFormat;
1326 unsigned char *data; 1392 unsigned char *data;
… …
1369 break; 1435 break;
1370 } 1436 }
1371 break; 1437 break;
1372 1438
1373 case FocusIn: 1439 case FocusIn:
1374 if (!TermWin.focus) 1440 focus_in ();
1441 break;
1442
1443 case FocusOut:
1444 focus_out ();
1445 break;
1446
1447 case ConfigureNotify:
1448 if (ev.xconfigure.window == parent[0])
1375 { 1449 {
1376 TermWin.focus = 1;
1377 want_refresh = 1;
1378#ifdef USE_XIM
1379 if (Input_Context != NULL)
1380 {
1381 IMSetStatusPosition ();
1382 XSetICFocus (Input_Context);
1383 }
1384#endif
1385#ifdef CURSOR_BLINK
1386 if (options & Opt_cursorBlink)
1387 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1388#endif
1389#ifdef OFF_FOCUS_FADING
1390 if (rs[Rs_fade])
1391 {
1392 pix_colors = pix_colors_focused;
1393 scr_recolour ();
1394 }
1395#endif
1396
1397 }
1398 break;
1399
1400 case FocusOut:
1401 if (TermWin.focus)
1402 {
1403 TermWin.focus = 0;
1404 want_refresh = 1;
1405
1406#if ENABLE_FRILLS || ISO_14755
1407 iso14755buf = 0;
1408#endif
1409#if ENABLE_OVERLAY
1410 scr_overlay_off ();
1411#endif
1412#ifdef USE_XIM
1413 if (Input_Context != NULL)
1414 XUnsetICFocus (Input_Context);
1415#endif
1416#ifdef CURSOR_BLINK
1417 if (options & Opt_cursorBlink)
1418 cursor_blink_ev.stop ();
1419 hidden_cursor = 0;
1420#endif
1421#ifdef OFF_FOCUS_FADING
1422 if (rs[Rs_fade])
1423 {
1424 pix_colors = pix_colors_unfocused;
1425 scr_recolour ();
1426 }
1427#endif
1428 }
1429 break;
1430
1431 case ConfigureNotify:
1432 if (ev.xconfigure.window == TermWin.parent[0])
1433 {
1434 int height, width;
1435
1436 do
1437 { /* Wrap lots of configures into one */
1438 width = ev.xconfigure.width;
1439 height = ev.xconfigure.height;
1440 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1441 }
1442 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1450 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1451 ;
1443 1452
1444 if (szHint.width != width || szHint.height != height) 1453 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1445 { 1454 {
1446 seen_resize = 1; 1455 seen_resize = 1;
1447 resize_all_windows (width, height, 1); 1456 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1448 } 1457 }
1449 1458
1450#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1459#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1451 if (options & Opt_transparent) 1460 if (options & Opt_transparent)
1452 check_our_parents (); 1461 check_our_parents ();
… …
1473 case SelectionRequest: 1482 case SelectionRequest:
1474 selection_send (ev.xselectionrequest); 1483 selection_send (ev.xselectionrequest);
1475 break; 1484 break;
1476 1485
1477 case UnmapNotify: 1486 case UnmapNotify:
1478 TermWin.mapped = 0; 1487 mapped = 0;
1479#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1480 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1481#endif 1490#endif
1482 break; 1491 break;
1483 1492
1484 case MapNotify: 1493 case MapNotify:
1485 TermWin.mapped = 1; 1494 mapped = 1;
1486#ifdef TEXT_BLINK 1495#ifdef TEXT_BLINK
1487 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1496 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1488#endif 1497#endif
1489 break; 1498 break;
1490 1499
… …
1494 break; 1503 break;
1495#endif /* TRANSPARENT */ 1504#endif /* TRANSPARENT */
1496 1505
1497 case GraphicsExpose: 1506 case GraphicsExpose:
1498 case Expose: 1507 case Expose:
1499 if (ev.xany.window == TermWin.vt) 1508 if (ev.xany.window == vt)
1500 { 1509 {
1501 do 1510 do
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1511 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1512 ev.xexpose.width, ev.xexpose.height, False);
1504 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1513 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1505 1514
1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1515 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1507 1516
1508 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1517 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1518 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1519 ev.xexpose.width, ev.xexpose.height, False);
1511 1520
1512 scr_refresh (refresh_type); 1521 scr_refresh (refresh_type);
1513 } 1522 }
… …
1529 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1538 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1530 menubar_expose (); 1539 menubar_expose ();
1531#endif 1540#endif
1532 1541
1533#ifdef TRANSPARENT 1542#ifdef TRANSPARENT
1534 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1543 if (am_transparent && ev.xany.window == parent[0])
1535 XClearWindow (disp, ev.xany.window); 1544 XClearWindow (disp, ev.xany.window);
1536#endif 1545#endif
1537 } 1546 }
1538 break; 1547 break;
1539 1548
… …
1550 } 1559 }
1551#endif 1560#endif
1552 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1561 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1553 break; 1562 break;
1554 1563
1555 if (ev.xany.window == TermWin.vt) 1564 if (ev.xany.window == vt)
1556 { 1565 {
1557 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1566 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1558 { 1567 {
1559 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1568 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1560 ; 1569 ;
1561 1570
1562 XQueryPointer (disp, TermWin.vt, 1571 XQueryPointer (disp, vt,
1563 &unused_root, &unused_child, 1572 &unused_root, &unused_child,
1564 &unused_root_x, &unused_root_y, 1573 &unused_root_x, &unused_root_y,
1565 &ev.xbutton.x, &ev.xbutton.y, 1574 &ev.xbutton.x, &ev.xbutton.y,
1566 &ev.xbutton.state); 1575 &ev.xbutton.state);
1567#ifdef MOUSE_THRESHOLD 1576#ifdef MOUSE_THRESHOLD
… …
1579#endif 1588#endif
1580 selection_extend (ev.xbutton.x, ev.xbutton.y, 1589 selection_extend (ev.xbutton.x, ev.xbutton.y,
1581 ev.xbutton.state & Button3Mask ? 2 : 0); 1590 ev.xbutton.state & Button3Mask ? 2 : 0);
1582 1591
1583#ifdef SELECTION_SCROLLING 1592#ifdef SELECTION_SCROLLING
1584 if (ev.xbutton.y < TermWin.int_bwidth 1593 if (ev.xbutton.y < int_bwidth
1585 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1594 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1586 { 1595 {
1587 int dist; 1596 int dist;
1588 1597
1589 /* don't clobber the current delay if we are 1598 /* don't clobber the current delay if we are
1590 * already in the middle of scrolling. 1599 * already in the middle of scrolling.
… …
1598 selection_save_x = ev.xbutton.x; 1607 selection_save_x = ev.xbutton.x;
1599 selection_save_y = ev.xbutton.y; 1608 selection_save_y = ev.xbutton.y;
1600 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1609 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1601 1610
1602 /* calc number of lines to scroll */ 1611 /* calc number of lines to scroll */
1603 if (ev.xbutton.y < TermWin.int_bwidth) 1612 if (ev.xbutton.y < int_bwidth)
1604 { 1613 {
1605 scroll_selection_dir = UP; 1614 scroll_selection_dir = UP;
1606 dist = TermWin.int_bwidth - ev.xbutton.y; 1615 dist = int_bwidth - ev.xbutton.y;
1607 } 1616 }
1608 else 1617 else
1609 { 1618 {
1610 scroll_selection_dir = DN; 1619 scroll_selection_dir = DN;
1611 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1620 dist = ev.xbutton.y - (int_bwidth + height);
1612 } 1621 }
1613 1622
1614 scroll_selection_lines = Pixel2Height (dist) 1623 scroll_selection_lines = Pixel2Height (dist)
1615 / SELECTION_SCROLL_LINE_SPEEDUP 1624 / SELECTION_SCROLL_LINE_SPEEDUP
1616 + 1; 1625 + 1;
1617 MIN_IT (scroll_selection_lines, 1626 min_it (scroll_selection_lines,
1618 SELECTION_SCROLL_MAX_LINES); 1627 SELECTION_SCROLL_MAX_LINES);
1619 } 1628 }
1620 else 1629 else
1621 { 1630 {
1622 /* we are within the text window, so we 1631 /* we are within the text window, so we
… …
1650 } 1659 }
1651 break; 1660 break;
1652 } 1661 }
1653} 1662}
1654 1663
1664void
1665rxvt_term::focus_in ()
1666{
1667 if (!focus)
1668 {
1669 focus = 1;
1670 want_refresh = 1;
1671#if USE_XIM
1672 if (Input_Context != NULL)
1673 {
1674 IMSetStatusPosition ();
1675 XSetICFocus (Input_Context);
1676 }
1677#endif
1678#if CURSOR_BLINK
1679 if (options & Opt_cursorBlink)
1680 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1681#endif
1682#if OFF_FOCUS_FADING
1683 if (rs[Rs_fade])
1684 {
1685 pix_colors = pix_colors_focused;
1686 scr_recolour ();
1687 }
1688#endif
1689 }
1690}
1691
1692void
1693rxvt_term::focus_out ()
1694{
1695 if (focus)
1696 {
1697 focus = 0;
1698 want_refresh = 1;
1699
1700#if ENABLE_FRILLS || ISO_14755
1701 iso14755buf = 0;
1702#endif
1703#if ENABLE_OVERLAY
1704 scr_overlay_off ();
1705#endif
1706#if USE_XIM
1707 if (Input_Context != NULL)
1708 XUnsetICFocus (Input_Context);
1709#endif
1710#if CURSOR_BLINK
1711 if (options & Opt_cursorBlink)
1712 cursor_blink_ev.stop ();
1713 hidden_cursor = 0;
1714#endif
1715#if OFF_FOCUS_FADING
1716 if (rs[Rs_fade])
1717 {
1718 pix_colors = pix_colors_unfocused;
1719 scr_recolour ();
1720 }
1721#endif
1722 }
1723}
1724
1655#if TRANSPARENT 1725#if TRANSPARENT
1656void 1726void
1657rxvt_term::rootwin_cb (XEvent &ev) 1727rxvt_term::rootwin_cb (XEvent &ev)
1658{ 1728{
1659 SET_R (this); 1729 SET_R (this);
… …
1689 reportmode = !! (priv_modes & PrivMode_mouse_report); 1759 reportmode = !! (priv_modes & PrivMode_mouse_report);
1690 1760
1691 /* 1761 /*
1692 * VT window processing of button press 1762 * VT window processing of button press
1693 */ 1763 */
1694 if (ev.window == TermWin.vt) 1764 if (ev.window == vt)
1695 { 1765 {
1696#if ISO_14755 1766#if ISO_14755
1697 // 5.4 1767 // 5.4
1698 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1768 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1699 { 1769 {
… …
1904 case Button3: 1974 case Button3:
1905 if (scrollBar.style != R_SB_XTERM) 1975 if (scrollBar.style != R_SB_XTERM)
1906 { 1976 {
1907 if (scrollbar_above_slider (ev.y)) 1977 if (scrollbar_above_slider (ev.y))
1908# ifdef RXVT_SCROLL_FULL 1978# ifdef RXVT_SCROLL_FULL
1909 scr_page (UP, TermWin.nrow - 1); 1979 scr_page (UP, nrow - 1);
1910# else 1980# else
1911 scr_page (UP, TermWin.nrow / 4); 1981 scr_page (UP, nrow / 4);
1912# endif 1982# endif
1913 else if (scrollbar_below_slider (ev.y)) 1983 else if (scrollbar_below_slider (ev.y))
1914# ifdef RXVT_SCROLL_FULL 1984# ifdef RXVT_SCROLL_FULL
1915 scr_page (DN, TermWin.nrow - 1); 1985 scr_page (DN, nrow - 1);
1916# else 1986# else
1917 scr_page (DN, TermWin.nrow / 4); 1987 scr_page (DN, nrow / 4);
1918# endif 1988# endif
1919 else 1989 else
1920 scrollBar.setMotion (); 1990 scrollBar.setMotion ();
1921 } 1991 }
1922 else 1992 else
1923 { 1993 {
1924 scr_page ((ev.button == Button1 ? DN : UP), 1994 scr_page ((ev.button == Button1 ? DN : UP),
1925 (TermWin.nrow 1995 (nrow
1926 * scrollbar_position (ev.y) 1996 * scrollbar_position (ev.y)
1927 / scrollbar_size ())); 1997 / scrollbar_size ()));
1928 } 1998 }
1929 1999
1930 break; 2000 break;
… …
1962#ifdef SELECTION_SCROLLING 2032#ifdef SELECTION_SCROLLING
1963 if (sel_scroll_ev.active) 2033 if (sel_scroll_ev.active)
1964 sel_scroll_ev.stop(); 2034 sel_scroll_ev.stop();
1965#endif 2035#endif
1966 2036
1967 if (ev.window == TermWin.vt) 2037 if (ev.window == vt)
1968 { 2038 {
1969#if ISO_14755 2039#if ISO_14755
1970 // 5.4 2040 // 5.4
1971 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2041 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1972 return; 2042 return;
… …
2023 v = ev.button == Button4 ? UP : DN; 2093 v = ev.button == Button4 ? UP : DN;
2024 2094
2025 if (ev.state & ShiftMask) 2095 if (ev.state & ShiftMask)
2026 i = 1; 2096 i = 1;
2027 else if (options & Opt_mouseWheelScrollPage) 2097 else if (options & Opt_mouseWheelScrollPage)
2028 i = TermWin.nrow - 1; 2098 i = nrow - 1;
2029 else 2099 else
2030 i = 5; 2100 i = 5;
2031 2101
2032# ifdef MOUSE_SLIP_WHEELING 2102# ifdef MOUSE_SLIP_WHEELING
2033 if (ev.state & ControlMask) 2103 if (ev.state & ControlMask)
2034 { 2104 {
2035 mouse_slip_wheel_speed += v ? -1 : 1; 2105 mouse_slip_wheel_speed += v ? -1 : 1;
2036 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2106 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2037 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2107 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2038 2108
2039 if (slip_wheel_ev.at < NOW) 2109 if (slip_wheel_ev.at < NOW)
2040 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2110 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2041 2111
2042 slip_wheel_ev.start (); 2112 slip_wheel_ev.start ();
… …
2324 return pchanged; /* Don't try any more */ 2394 return pchanged; /* Don't try any more */
2325 2395
2326 XGetWindowAttributes (disp, display->root, &wrootattr); 2396 XGetWindowAttributes (disp, display->root, &wrootattr);
2327 rootdepth = wrootattr.depth; 2397 rootdepth = wrootattr.depth;
2328 2398
2329 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2399 XGetWindowAttributes (disp, parent[0], &wattr);
2330 2400
2331 if (rootdepth != wattr.depth) 2401 if (rootdepth != wattr.depth)
2332 { 2402 {
2333 if (am_transparent) 2403 if (am_transparent)
2334 { 2404 {
2335 pchanged = 1; 2405 pchanged = 1;
2336 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2406 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2337 am_transparent = am_pixmap_trans = 0; 2407 am_transparent = am_pixmap_trans = 0;
2338 } 2408 }
2339 2409
2340 return pchanged; /* Don't try any more */ 2410 return pchanged; /* Don't try any more */
2341 } 2411 }
… …
2382 Window cr; 2452 Window cr;
2383 XImage *image; 2453 XImage *image;
2384 GC gc; 2454 GC gc;
2385 XGCValues gcvalue; 2455 XGCValues gcvalue;
2386 2456
2387 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2457 XTranslateCoordinates (disp, parent[0], display->root,
2388 0, 0, &sx, &sy, &cr); 2458 0, 0, &sx, &sy, &cr);
2389 nw = (unsigned int)szHint.width; 2459 nw = (unsigned int)szHint.width;
2390 nh = (unsigned int)szHint.height; 2460 nh = (unsigned int)szHint.height;
2391 nx = ny = 0; 2461 nx = ny = 0;
2392 2462
… …
2402 nh += sy; 2472 nh += sy;
2403 ny = -sy; 2473 ny = -sy;
2404 sy = 0; 2474 sy = 0;
2405 } 2475 }
2406 2476
2407 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2477 min_it (nw, (unsigned int) (wrootattr.width - sx));
2408 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2478 min_it (nh, (unsigned int) (wrootattr.height - sy));
2409 2479
2410 XSync (disp, False); 2480 XSync (disp, False);
2411 allowedxerror = -1; 2481 allowedxerror = -1;
2412 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2482 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2413 2483
… …
2418 if (image == NULL) 2488 if (image == NULL)
2419 { 2489 {
2420 if (am_transparent && am_pixmap_trans) 2490 if (am_transparent && am_pixmap_trans)
2421 { 2491 {
2422 pchanged = 1; 2492 pchanged = 1;
2423 if (TermWin.pixmap != None) 2493 if (pixmap != None)
2424 { 2494 {
2425 XFreePixmap (disp, TermWin.pixmap); 2495 XFreePixmap (disp, pixmap);
2426 TermWin.pixmap = None; 2496 pixmap = None;
2427 } 2497 }
2428 } 2498 }
2429 2499
2430 am_pixmap_trans = 0; 2500 am_pixmap_trans = 0;
2431 } 2501 }
2432 else 2502 else
2433 { 2503 {
2434 if (TermWin.pixmap != None) 2504 if (pixmap != None)
2435 XFreePixmap (disp, TermWin.pixmap); 2505 XFreePixmap (disp, pixmap);
2436 2506
2437#if TINTING 2507#if TINTING
2438 if (ISSET_PIXCOLOR (Color_tint)) 2508 if (ISSET_PIXCOLOR (Color_tint))
2439 { 2509 {
2440 unsigned short rm, gm, bm; 2510 unsigned short rm, gm, bm;
… …
2444 2514
2445 ShadeXImage (display, image, shade, rm, gm, bm); 2515 ShadeXImage (display, image, shade, rm, gm, bm);
2446 } 2516 }
2447#endif 2517#endif
2448 2518
2449 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2519 pixmap = XCreatePixmap (disp, vt,
2450 szHint.width, szHint.height, image->depth); 2520 szHint.width, szHint.height, image->depth);
2451 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2521 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2452 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2522 XPutImage (disp, pixmap, gc, image, 0, 0,
2453 nx, ny, image->width, image->height); 2523 nx, ny, image->width, image->height);
2454 XFreeGC (disp, gc); 2524 XFreeGC (disp, gc);
2455 XDestroyImage (image); 2525 XDestroyImage (image);
2456 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2526 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2457 XClearWindow (disp, TermWin.parent[0]); 2527 XClearWindow (disp, parent[0]);
2458 2528
2459 if (!am_transparent || !am_pixmap_trans) 2529 if (!am_transparent || !am_pixmap_trans)
2460 pchanged = 1; 2530 pchanged = 1;
2461 2531
2462 am_transparent = am_pixmap_trans = 1; 2532 am_transparent = am_pixmap_trans = 1;
2463 } 2533 }
2464 } 2534 }
2465 2535
2466 if (am_pixmap_trans) 2536 if (am_pixmap_trans)
2467 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2537 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2468 else 2538 else
2469 { 2539 {
2470 unsigned int n; 2540 unsigned int n;
2471 /* 2541 /*
2472 * InheritPixmap transparency 2542 * InheritPixmap transparency
2473 */ 2543 */
2474 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2544 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2475 { 2545 {
2476 oldp = TermWin.parent[i]; 2546 oldp = parent[i];
2477 XQueryTree (disp, TermWin.parent[i - 1], &root, 2547 XQueryTree (disp, parent[i - 1], &root,
2478 &TermWin.parent[i], &list, &n); 2548 &parent[i], &list, &n);
2479 XFree (list); 2549 XFree (list);
2480 2550
2481 if (TermWin.parent[i] == display->root) 2551 if (parent[i] == display->root)
2482 { 2552 {
2483 if (oldp != None) 2553 if (oldp != None)
2484 pchanged = 1; 2554 pchanged = 1;
2485 2555
2486 break; 2556 break;
2487 } 2557 }
2488 2558
2489 if (oldp != TermWin.parent[i]) 2559 if (oldp != parent[i])
2490 pchanged = 1; 2560 pchanged = 1;
2491 } 2561 }
2492 2562
2493 n = 0; 2563 n = 0;
2494 2564
2495 if (pchanged) 2565 if (pchanged)
2496 { 2566 {
2497 for (; n < (unsigned int)i; n++) 2567 for (; n < (unsigned int)i; n++)
2498 { 2568 {
2499 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2569 XGetWindowAttributes (disp, parent[n], &wattr);
2500 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2570 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2501 { 2571 {
2502 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2572 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2503 break; 2573 break;
2504 } 2574 }
2505 } 2575 }
2506 } 2576 }
2507 2577
2508 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2578 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2509 { 2579 {
2510 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2580 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2511 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2581 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2512 am_transparent = 0; 2582 am_transparent = 0;
2513 /* XXX: also turn off Opt_transparent? */ 2583 /* XXX: also turn off Opt_transparent? */
2514 } 2584 }
2515 else 2585 else
2516 { 2586 {
… …
2519 * needed for fvwm2.2.2 (and before?) */ 2589 * needed for fvwm2.2.2 (and before?) */
2520 sleep (1); 2590 sleep (1);
2521#endif 2591#endif
2522 for (n = 0; n < (unsigned int)i; n++) 2592 for (n = 0; n < (unsigned int)i; n++)
2523 { 2593 {
2524 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2594 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2525 XClearWindow (disp, TermWin.parent[n]); 2595 XClearWindow (disp, parent[n]);
2526 } 2596 }
2527 2597
2528 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2598 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2529 am_transparent = 1; 2599 am_transparent = 1;
2530 } 2600 }
2531 2601
2532 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2602 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2533 TermWin.parent[i] = None; 2603 parent[i] = None;
2534 } 2604 }
2535 2605
2536 if (scrollBar.win) 2606 if (scrollBar.win)
2537 { 2607 {
2538 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2608 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2581 // some window managers resize the window early, and these programs 2651 // some window managers resize the window early, and these programs
2582 // then sometimes get the size wrong. 2652 // then sometimes get the size wrong.
2583 // unfortunately other programs are even more buggy and dislike 2653 // unfortunately other programs are even more buggy and dislike
2584 // being sent SIGWINCH, so only do it when we were in fact being 2654 // being sent SIGWINCH, so only do it when we were in fact being
2585 // resized. 2655 // resized.
2586 if (seen_resize) 2656 if (seen_resize && cmd_pid)
2587 kill (-cmd_pid, SIGWINCH); 2657 kill (-cmd_pid, SIGWINCH);
2588 } 2658 }
2589 2659
2590 /* Read a text string from the input buffer */ 2660 /* Read a text string from the input buffer */
2591 unicode_t buf[UBUFSIZ]; 2661 unicode_t buf[UBUFSIZ];
2592 bool refreshnow = false; 2662 bool refreshnow = false;
2593 int nlines = 0; 2663 int nlines = 0;
2594 unicode_t *str = buf; 2664 unicode_t *str = buf;
2665 unicode_t *eol = str + min (ncol, UBUFSIZ);
2595 2666
2596 for (;;) 2667 for (;;)
2597 { 2668 {
2598 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2669 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2599 break; 2670 break;
2600 2671
2601 *str++ = ch; 2672 *str++ = ch;
2602 2673
2603 if (ch == C0_LF) 2674 if (ch == C0_LF || str >= eol)
2604 { 2675 {
2676 if (ch == C0_LF)
2605 nlines++; 2677 nlines++;
2678
2606 refresh_count++; 2679 refresh_count++;
2607 2680
2608 if (!(options & Opt_jumpScroll) 2681 if (!(options & Opt_jumpScroll)
2609 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2682 || (refresh_count >= refresh_limit * (nrow - 1)))
2610 { 2683 {
2611 refreshnow = true; 2684 refreshnow = true;
2612 ch = NOCHAR; 2685 ch = NOCHAR;
2613 break; 2686 break;
2614 } 2687 }
2615 2688
2616 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2689 // scr_add_lines only works for nlines <= nrow - 1.
2617 if (nlines >= TermWin.nrow - 1) 2690 if (nlines >= nrow - 1)
2618 { 2691 {
2619 scr_add_lines (buf, nlines, str - buf); 2692 scr_add_lines (buf, nlines, str - buf);
2620 nlines = 0; 2693 nlines = 0;
2621 str = buf; 2694 str = buf;
2695 eol = str + min (ncol, UBUFSIZ);
2622 } 2696 }
2623 }
2624 2697
2625 if (str >= buf + UBUFSIZ) 2698 if (str >= eol)
2626 { 2699 {
2700 if (eol >= buf + UBUFSIZ)
2701 {
2627 ch = NOCHAR; 2702 ch = NOCHAR;
2628 break; 2703 break;
2704 }
2705 else
2706 eol = min (eol + ncol, buf + UBUFSIZ);
2707 }
2708
2629 } 2709 }
2630 2710
2631 seq_begin = cmdbuf_ptr; 2711 seq_begin = cmdbuf_ptr;
2632 ch = next_char (); 2712 ch = next_char ();
2633 } 2713 }
… …
3177 { 3257 {
3178 switch (priv) 3258 switch (priv)
3179 { 3259 {
3180 case '>': 3260 case '>':
3181 if (ch == CSI_DA) /* secondary device attributes */ 3261 if (ch == CSI_DA) /* secondary device attributes */
3182 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3262 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3183 break; 3263 break;
3184 case '?': 3264 case '?':
3185 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3265 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3186 process_terminal_mode (ch, priv, nargs, arg); 3266 process_terminal_mode (ch, priv, nargs, arg);
3187 break; 3267 break;
… …
3292 3372
3293 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3373 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3294 arg[0] = -arg[0]; 3374 arg[0] = -arg[0];
3295 /* FALLTHROUGH */ 3375 /* FALLTHROUGH */
3296 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3376 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3297 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3377 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3298 break; 3378 break;
3299 3379
3300 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3380 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3301 tt_write ((const unsigned char *)VT100_ANS, 3381 tt_write ((const unsigned char *)VT100_ANS,
3302 (unsigned int) (sizeof (VT100_ANS) - 1)); 3382 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3427 { 3507 {
3428 /* 3508 /*
3429 * commands 3509 * commands
3430 */ 3510 */
3431 case 1: /* deiconify window */ 3511 case 1: /* deiconify window */
3432 XMapWindow (disp, TermWin.parent[0]); 3512 XMapWindow (disp, parent[0]);
3433 break; 3513 break;
3434 case 2: /* iconify window */ 3514 case 2: /* iconify window */
3435 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3515 XIconifyWindow (disp, parent[0], display->screen);
3436 break; 3516 break;
3437 case 3: /* set position (pixels) */ 3517 case 3: /* set position (pixels) */
3438 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3518 XMoveWindow (disp, parent[0], args[1], args[2]);
3439 break; 3519 break;
3440 case 4: /* set size (pixels) */ 3520 case 4: /* set size (pixels) */
3441 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3521 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3442 break; 3522 break;
3443 case 5: /* raise window */ 3523 case 5: /* raise window */
3444 XRaiseWindow (disp, TermWin.parent[0]); 3524 XRaiseWindow (disp, parent[0]);
3445 break; 3525 break;
3446 case 6: /* lower window */ 3526 case 6: /* lower window */
3447 XLowerWindow (disp, TermWin.parent[0]); 3527 XLowerWindow (disp, parent[0]);
3448 break; 3528 break;
3449 case 7: /* refresh window */ 3529 case 7: /* refresh window */
3450 scr_touch (true); 3530 scr_touch (true);
3451 break; 3531 break;
3452 case 8: /* set size (chars) */ 3532 case 8: /* set size (chars) */
3453 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3533 set_widthheight ((unsigned int) (args[2] * fwidth),
3454 (unsigned int) (args[1] * TermWin.fheight)); 3534 (unsigned int) (args[1] * fheight));
3455 break; 3535 break;
3456 3536
3457 //case 9: NYI, TODO, restore maximized window or maximize window 3537 //case 9: NYI, TODO, restore maximized window or maximize window
3458 default: 3538 default:
3459 if (args[0] >= 24) /* set height (chars) */ 3539 if (args[0] >= 24) /* set height (chars) */
3460 set_widthheight ((unsigned int)TermWin.width, 3540 set_widthheight ((unsigned int)width,
3461 (unsigned int) (args[1] * TermWin.fheight)); 3541 (unsigned int) (args[1] * fheight));
3462 break; 3542 break;
3463 3543
3464 3544
3465 /* 3545 /*
3466 * reports - some output format copied from XTerm 3546 * reports - some output format copied from XTerm
3467 */ 3547 */
3468 case 11: /* report window state */ 3548 case 11: /* report window state */
3469 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3549 XGetWindowAttributes (disp, parent[0], &wattr);
3470 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3550 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3471 break; 3551 break;
3472 case 13: /* report window position */ 3552 case 13: /* report window position */
3473 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3553 XGetWindowAttributes (disp, parent[0], &wattr);
3474 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3554 XTranslateCoordinates (disp, parent[0], wattr.root,
3475 -wattr.border_width, -wattr.border_width, 3555 -wattr.border_width, -wattr.border_width,
3476 &x, &y, &wdummy); 3556 &x, &y, &wdummy);
3477 tt_printf ("\033[3;%d;%dt", x, y); 3557 tt_printf ("\033[3;%d;%dt", x, y);
3478 break; 3558 break;
3479 case 14: /* report window size (pixels) */ 3559 case 14: /* report window size (pixels) */
3480 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3560 XGetWindowAttributes (disp, parent[0], &wattr);
3481 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3561 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3482 break; 3562 break;
3483 case 18: /* report text area size (chars) */ 3563 case 18: /* report text area size (chars) */
3484 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3564 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3485 break; 3565 break;
3486 case 19: /* report window size (chars) */ 3566 case 19: /* report window size (chars) */
3487 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3567 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3488 break; 3568 break;
3489 case 20: /* report icon label */ 3569 case 20: /* report icon label */
3490 { 3570 {
3491 char *s; 3571 char *s;
3492 XGetIconName (disp, TermWin.parent[0], &s); 3572 XGetIconName (disp, parent[0], &s);
3493 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3573 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3494 XFree (s); 3574 XFree (s);
3495 } 3575 }
3496 break; 3576 break;
3497 case 21: /* report window title */ 3577 case 21: /* report window title */
3498 { 3578 {
3499 char *s; 3579 char *s;
3500 XFetchName (disp, TermWin.parent[0], &s); 3580 XFetchName (disp, parent[0], &s);
3501 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3581 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3502 XFree (s); 3582 XFree (s);
3503 } 3583 }
3504 break; 3584 break;
3505 } 3585 }
… …
3538 else if (ch < 0x20) 3618 else if (ch < 0x20)
3539 return NULL; /* other control character - exit */ 3619 return NULL; /* other control character - exit */
3540 3620
3541 seen_esc = false; 3621 seen_esc = false;
3542 3622
3543 if (n >= sizeof (string) - 1) 3623 if (n >= STRING_MAX - 1)
3544 // stop at some sane length 3624 // stop at some sane length
3545 return NULL; 3625 return NULL;
3546 3626
3547 if (ch == C0_SYN) 3627 if (ch == C0_SYN)
3548 string[n++] = cmd_get8 (); 3628 string[n++] = cmd_get8 ();
… …
3616 set_window_color (color, str); 3696 set_window_color (color, str);
3617} 3697}
3618 3698
3619/* 3699/*
3620 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3700 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3621 * 0 = change iconName/title
3622 * 1 = change iconName
3623 * 2 = change title
3624 * 4 = change color
3625 * 10 = change fg color
3626 * 11 = change bg color
3627 * 12 = change text color
3628 * 13 = change mouse foreground color
3629 * 17 = change highlight character colour
3630 * 18 = change bold character color
3631 * 19 = change underlined character color
3632 * 46 = change logfile (not implemented)
3633 * 50 = change font
3634 *
3635 * rxvt extensions:
3636 * 20 = bg pixmap
3637 * 39 = change default fg color
3638 * 49 = change default bg color
3639 * 55 = dump scrollback buffer and all of screen
3640 * 701 = change locale
3641 * 702 = find font
3642 * 703 = menu
3643 */ 3701 */
3644void 3702void
3645rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3703rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3646{ 3704{
3647 int changed = 0; 3705 int changed = 0;
… …
3673 unsigned long bytes_after; 3731 unsigned long bytes_after;
3674 unsigned char *value = 0; 3732 unsigned char *value = 0;
3675 const char *str = ""; 3733 const char *str = "";
3676 3734
3677 if (prop 3735 if (prop
3678 && XGetWindowProperty (disp, TermWin.parent[0], 3736 && XGetWindowProperty (disp, parent[0],
3679 prop, 0, 1<<16, 0, AnyPropertyType, 3737 prop, 0, 1<<16, 0, AnyPropertyType,
3680 &actual_type, &actual_format, 3738 &actual_type, &actual_format,
3681 &nitems, &bytes_after, &value) == Success 3739 &nitems, &bytes_after, &value) == Success
3682 && actual_type != None 3740 && actual_type != None
3683 && actual_format == 8) 3741 && actual_format == 8)
… …
3695 { 3753 {
3696 *eq = 0; 3754 *eq = 0;
3697 set_utf8_property (display->atom (str), eq + 1); 3755 set_utf8_property (display->atom (str), eq + 1);
3698 } 3756 }
3699 else 3757 else
3700 XDeleteProperty (disp, TermWin.parent[0], 3758 XDeleteProperty (disp, parent[0],
3701 display->atom (str)); 3759 display->atom (str));
3702 } 3760 }
3703 break; 3761 break;
3704 3762
3705 case XTerm_Color: 3763 case XTerm_Color:
… …
3746 break; 3804 break;
3747#ifndef NO_BOLD_UNDERLINE_REVERSE 3805#ifndef NO_BOLD_UNDERLINE_REVERSE
3748 case XTerm_Color_BD: 3806 case XTerm_Color_BD:
3749 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3807 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3750 break; 3808 break;
3751 case XTerm_Color_IT:
3752 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3753 break;
3754 case XTerm_Color_UL: 3809 case XTerm_Color_UL:
3755 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3810 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3756 break; 3811 break;
3757 case XTerm_Color_RV: 3812 case XTerm_Color_RV:
3758 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3813 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3759 break; 3814 break;
3815 case URxvt_Color_IT:
3816 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3817 break;
3760#endif 3818#endif
3761#if TRANSPARENT && TINTING 3819#if TRANSPARENT && TINTING
3762 case XTerm_Color_tint: 3820 case URxvt_Color_tint:
3763 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3821 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3764 check_our_parents (); 3822 check_our_parents ();
3765 if (am_transparent) 3823 if (am_transparent)
3766 want_full_refresh = want_refresh = 1; 3824 want_full_refresh = want_refresh = 1;
3767 break; 3825 break;
3768#endif 3826#endif
… …
3802 3860
3803 case XTerm_logfile: 3861 case XTerm_logfile:
3804 // TODO, when secure mode? 3862 // TODO, when secure mode?
3805 break; 3863 break;
3806 3864
3865#ifdef MENUBAR
3866 case URxvt_Menu:
3867 if (options & Opt_insecure)
3868 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3869 break;
3870#endif
3871#if 0
3872 case XTerm_dumpscreen: /* no error notices */
3873 {
3874 int fd;
3875 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3876 {
3877 scr_dump (fd);
3878 close (fd);
3879 }
3880 }
3881 break;
3882#endif
3807 case XTerm_font: 3883 case XTerm_font:
3808 op = URxvt_font; 3884 op = URxvt_font;
3809 case URxvt_font: 3885 case URxvt_font:
3810#if ENABLE_STYLES 3886#if ENABLE_STYLES
3811 case URxvt_boldFont: 3887 case URxvt_boldFont:
3812 case URxvt_italicFont: 3888 case URxvt_italicFont:
3813 case URxvt_boldItalicFont: 3889 case URxvt_boldItalicFont:
3814#endif 3890#endif
3815 if (query) 3891 if (query)
3816 tt_printf ("\33]%d;%-.250s%c", saveop, 3892 tt_printf ("\33]%d;%-.250s%c", saveop,
3817 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3893 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3818 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3894 ? fontset[op - URxvt_font]->fontdesc : "",
3819 resp); 3895 resp);
3820 else 3896 else
3821 { 3897 {
3822 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3898 const char *&res = rs[Rs_font + (op - URxvt_font)];
3823 3899
… …
3826 set_fonts (); 3902 set_fonts ();
3827 } 3903 }
3828 break; 3904 break;
3829 3905
3830#if ENABLE_FRILLS 3906#if ENABLE_FRILLS
3831 case XTerm_locale: 3907 case URxvt_locale:
3832 if (query) 3908 if (query)
3833 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3909 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3834 else 3910 else
3835 { 3911 {
3836 set_locale (str); 3912 set_locale (str);
3837 pty.set_utf8_mode (enc_utf8); 3913 pty.set_utf8_mode (enc_utf8);
3838# ifdef USE_XIM
3839 im_cb (); 3914 init_xlocale ();
3840# endif
3841 } 3915 }
3842 break; 3916 break;
3843#endif
3844 3917
3845#ifdef MENUBAR 3918 case URxvt_view_up:
3846 case XTerm_Menu: 3919 case URxvt_view_down:
3847 if (options & Opt_insecure) 3920 int lines = atoi (str);
3848 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3921
3849 break; 3922 if (lines)
3850#endif 3923 scr_page (op == URxvt_view_up ? UP : DN, lines);
3851#if 0
3852 case XTerm_dumpscreen: /* no error notices */
3853 { 3924 else
3854 int fd;
3855 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3856 { 3925 {
3857 scr_dump (fd); 3926 scr_erase_savelines ();
3858 close (fd);
3859 } 3927 }
3860 } 3928
3861 break; 3929 break;
3862#endif 3930#endif
3863 } 3931 }
3864} 3932}
3865/*----------------------------------------------------------------------*/ 3933/*----------------------------------------------------------------------*/
… …
3998 */ 4066 */
3999 PrivMode (1, PrivMode_vt52); 4067 PrivMode (1, PrivMode_vt52);
4000 break; 4068 break;
4001 case 3: /* 80/132 */ 4069 case 3: /* 80/132 */
4002 if (priv_modes & PrivMode_132OK) 4070 if (priv_modes & PrivMode_132OK)
4003 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4071 set_widthheight (((state ? 132 : 80) * fwidth), height);
4004 break; 4072 break;
4005 case 4: /* smooth scrolling */ 4073 case 4: /* smooth scrolling */
4006 if (state) 4074 if (state)
4007 options &= ~Opt_jumpScroll; 4075 options &= ~Opt_jumpScroll;
4008 else 4076 else
… …
4325 } 4393 }
4326 4394
4327 memmove (v_buffer, v_buffer + written, v_buflen); 4395 memmove (v_buffer, v_buffer + written, v_buflen);
4328 } 4396 }
4329 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4397 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4330 // original code just ignores this... 4398 pty_ev.set (EVENT_READ);
4331 destroy ();
4332} 4399}
4333 4400
4334/*----------------------- end-of-file (C source) -----------------------*/ 4401/*----------------------- end-of-file (C source) -----------------------*/
4335 4402

Diff Legend

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