ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

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

Diff Legend

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