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.183 by root, Tue Dec 21 06:43:00 2004 UTC vs.
Revision 1.207 by root, Tue Oct 25 19:04:45 2005 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <cwchar> 53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h"
55#endif
56
54#include <csignal> 57#include <csignal>
55 58
56/*----------------------------------------------------------------------*/ 59/*----------------------------------------------------------------------*/
57 60
58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
114 XK_Escape, 0x238b, 117 XK_Escape, 0x238b,
115 XK_Undo, 0x238c, 118 XK_Undo, 0x238c,
116 XK_Print, 0x2399, 119 XK_Print, 0x2399,
117 120
118 XK_space, 0x2423, 121 XK_space, 0x2423,
122
123#ifdef XK_KP_Begin
124 XK_KP_Prior, 0x21de,
125 XK_KP_Next, 0x21df,
126 XK_KP_Begin, 0x2320,
127 XK_KP_Insert, 0x2380,
128 XK_KP_Delete, 0x2326,
119 XK_KP_Space, 0x2422, 129 XK_KP_Space, 0x2422,
130#endif
120 0, 131 0,
121}; 132};
122 133
123void 134void
124rxvt_term::iso14755_54 (int x, int y) 135rxvt_term::iso14755_54 (int x, int y)
… …
152void 163void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
154{ 165{
155 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2; 168 wchar_t *chr, *alloc, ch2, *fname;
158 int len; 169 int len;
170
171 fname = rxvt_utf8towcs (f->name);
159 172
160#if ENABLE_COMBINING 173#if ENABLE_COMBINING
161 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
162 { 175 {
163 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
… …
172 alloc = 0; 185 alloc = 0;
173 chr = &ch2; 186 chr = &ch2;
174 len = 1; 187 len = 1;
175 } 188 }
176 189
177 int width = strlen (f->name); 190 int width = wcswidth (fname, wcslen (fname));
178 191
179 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
180 193
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182 195
… …
195#endif 208#endif
196 scr_overlay_set (11, y, ch, r); 209 scr_overlay_set (11, y, ch, r);
197 scr_overlay_set (12, y, NOCHAR, r); 210 scr_overlay_set (12, y, NOCHAR, r);
198 } 211 }
199 212
200 scr_overlay_set (0, len, f->name); 213 scr_overlay_set (0, len, fname);
214
215 free (fname);
201 216
202#if ENABLE_COMBINING 217#if ENABLE_COMBINING
203 if (alloc) 218 if (alloc)
204 delete [] alloc; 219 delete [] alloc;
205#endif 220#endif
… …
273 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 288 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274 * escape sequence to toggle the Keypad. 289 * escape sequence to toggle the Keypad.
275 * 290 *
276 * Always permit `shift' to override the current setting 291 * Always permit `shift' to override the current setting
277 */ 292 */
278 shft = (ev.state & ShiftMask); 293 shft = ev.state & ShiftMask;
279 ctrl = (ev.state & ControlMask); 294 ctrl = ev.state & ControlMask;
280 meta = (ev.state & ModMetaMask); 295 meta = ev.state & ModMetaMask;
281 296
282 if (numlock_state || (ev.state & ModNumLockMask)) 297 if (numlock_state || (ev.state & ModNumLockMask))
283 { 298 {
284 numlock_state = (ev.state & ModNumLockMask); 299 numlock_state = (ev.state & ModNumLockMask);
285 PrivMode ((!numlock_state), PrivMode_aplKP); 300 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
305 320
306 // the XOpenIM manpage lies about hardcoding the locale 321 // the XOpenIM manpage lies about hardcoding the locale
307 // at the point of XOpenIM, so temporarily switch locales 322 // at the point of XOpenIM, so temporarily switch locales
308 if (rs[Rs_imLocale]) 323 if (rs[Rs_imLocale])
309 SET_LOCALE (rs[Rs_imLocale]); 324 SET_LOCALE (rs[Rs_imLocale]);
325
310 // assume wchar_t == unicode or better 326 // assume wchar_t == unicode or better
311 len = XwcLookupString (Input_Context, &ev, wkbuf, 327 len = XwcLookupString (Input_Context, &ev, wkbuf,
312 KBUFSZ, &keysym, &status_return); 328 KBUFSZ, &keysym, &status_return);
329
313 if (rs[Rs_imLocale]) 330 if (rs[Rs_imLocale])
314 SET_LOCALE (locale); 331 SET_LOCALE (locale);
315 332
316 if (status_return == XLookupChars 333 if (status_return == XLookupChars
317 || status_return == XLookupBoth) 334 || status_return == XLookupBoth)
… …
344 valid_keysym = keysym != NoSymbol; 361 valid_keysym = keysym != NoSymbol;
345 } 362 }
346 363
347 if (valid_keysym) 364 if (valid_keysym)
348 { 365 {
366#ifdef KEYSYM_RESOURCE
367 if (keyboard->dispatch (this, keysym, ev.state))
368 return;
369#endif
370
349 if (TermWin.saveLines) 371 if (TermWin.saveLines)
350 { 372 {
351#ifdef UNSHIFTED_SCROLLKEYS 373#ifdef UNSHIFTED_SCROLLKEYS
352 if (!ctrl && !meta) 374 if (!ctrl && !meta)
353#else 375#else
… …
487 } 509 }
488#endif 510#endif
489 511
490 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 512 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491 { 513 {
492#ifdef KEYSYM_RESOURCE
493 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
494 {
495 unsigned int l;
496 const unsigned char *kbuf0;
497
498 kbuf0 = (Keysym_map[keysym & 0xFF]);
499 l = (unsigned int)*kbuf0++;
500
501 /* escape prefix */
502 if (meta
503# ifdef META8_OPTION
504 && meta_char == C0_ESC
505# endif
506 )
507 {
508 const unsigned char ch = C0_ESC;
509 tt_write (&ch, 1);
510 }
511
512 tt_write (kbuf0, l);
513 return;
514 }
515 else
516#endif
517 { 514 {
518 newlen = 1; 515 newlen = 1;
519 switch (keysym) 516 switch (keysym)
520 { 517 {
521#ifndef NO_BACKSPACE_KEY 518#ifndef NO_BACKSPACE_KEY
… …
529 else 526 else
530 strcpy (kbuf, key_backspace); 527 strcpy (kbuf, key_backspace);
531 break; 528 break;
532#endif 529#endif
533#ifndef NO_DELETE_KEY 530#ifndef NO_DELETE_KEY
531# ifdef XK_KP_Prior
532 case XK_KP_Delete:
533 /* allow shift to override */
534 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
535 {
536 strcpy (kbuf, "\033On");
537 break;
538 }
539 /* FALLTHROUGH */
540# endif
534 case XK_Delete: 541 case XK_Delete:
535 strcpy (kbuf, key_delete); 542 strcpy (kbuf, key_delete);
536 break; 543 break;
537#endif 544#endif
538 case XK_Tab: 545 case XK_Tab:
… …
641#ifdef XK_KP_Begin 648#ifdef XK_KP_Begin
642 case XK_KP_Begin: 649 case XK_KP_Begin:
643 strcpy (kbuf, "\033Ou"); 650 strcpy (kbuf, "\033Ou");
644 break; 651 break;
645 652
646 case XK_KP_Insert:
647 strcpy (kbuf, "\033Op");
648 break;
649
650 case XK_KP_Delete:
651 strcpy (kbuf, "\033On");
652 break;
653#endif 653#endif
654 case XK_KP_F1: /* "\033OP" */ 654 case XK_KP_F1: /* "\033OP" */
655 case XK_KP_F2: /* "\033OQ" */ 655 case XK_KP_F2: /* "\033OQ" */
656 case XK_KP_F3: /* "\033OR" */ 656 case XK_KP_F3: /* "\033OR" */
657 case XK_KP_F4: /* "\033OS" */ 657 case XK_KP_F4: /* "\033OS" */
… …
689 break; 689 break;
690 690
691 case XK_Find: 691 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 692 strcpy (kbuf, "\033[1~");
693 break; 693 break;
694
695#ifdef XK_KP_End
696 case XK_KP_Insert:
697 /* allow shift to override */
698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
699 {
700 strcpy (kbuf, "\033Op");
701 break;
702 }
703 /* FALLTHROUGH */
704#endif
694 case XK_Insert: 705 case XK_Insert:
695 strcpy (kbuf, "\033[2~"); 706 strcpy (kbuf, "\033[2~");
696 break; 707 break;
697#ifdef DXK_Remove /* support for DEC remove like key */ 708#ifdef DXK_Remove /* support for DEC remove like key */
698 case DXK_Remove: 709 case DXK_Remove:
… …
785 case XK_F35: /* "\033[49~" */ 796 case XK_F35: /* "\033[49~" */
786 FKEY (31, XK_F17); 797 FKEY (31, XK_F17);
787 break; 798 break;
788#undef FKEY 799#undef FKEY
789 default: 800 default:
790 if (len == 0 801 newlen = 0;
791 && (keysym & 0xfff0) != 0xff70 802 break;
792 && (keysym & 0xfff0) != 0xffe0)
793 /* generate a keycode for every remaining keypress */
794 sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
795 } 803 }
796 804
797 if (newlen) 805 if (newlen)
798 len = strlen (kbuf); 806 len = strlen (kbuf);
799 } 807 }
… …
814 } 822 }
815 else if (keysym == XK_ISO_Left_Tab) 823 else if (keysym == XK_ISO_Left_Tab)
816 { 824 {
817 strcpy (kbuf, "\033[Z"); 825 strcpy (kbuf, "\033[Z");
818 len = 3; 826 len = 3;
819 }
820 else if (len == 0
821 && (keysym & 0xffe0) != 0xfe00
822 && (keysym < 0xfe50 || keysym > 0xfe6f))
823 {
824 /* generate a keycode for every remaining keypress */
825 len = sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
826 } 827 }
827 else 828 else
828 { 829 {
829#ifdef META8_OPTION 830#ifdef META8_OPTION
830 /* set 8-bit on */ 831 /* set 8-bit on */
… …
889#endif /* DEBUG_CMD */ 890#endif /* DEBUG_CMD */
890 tt_write (kbuf, (unsigned int)len); 891 tt_write (kbuf, (unsigned int)len);
891} 892}
892/*}}} */ 893/*}}} */
893 894
894#if (MENUBAR_MAX) 895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
895/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
896/* attempt to `write' count to the input buffer */ 897/* attempt to `write' count to the input buffer */
897unsigned int 898unsigned int
898rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 899rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
899{ 900{
… …
922 923
923 cmd_parse (); 924 cmd_parse ();
924 925
925 return 0; 926 return 0;
926} 927}
927#endif /* MENUBAR_MAX */ 928#endif
928 929
929void 930void
930rxvt_term::flush () 931rxvt_term::flush ()
931{ 932{
932 flush_ev.stop (); 933 flush_ev.stop ();
… …
1033{ 1034{
1034 if (mouse_slip_wheel_speed == 0 1035 if (mouse_slip_wheel_speed == 0
1035 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1036 : scr_page (UP, mouse_slip_wheel_speed)) 1037 : scr_page (UP, mouse_slip_wheel_speed))
1037 { 1038 {
1039 if (TermWin.view_start == TermWin.nscrolled ||
1040 TermWin.view_start == 0)
1041 mouse_slip_wheel_speed = 0;
1042
1038 refresh_type |= SMOOTH_REFRESH; 1043 refresh_type |= SMOOTH_REFRESH;
1039 want_refresh = 1; 1044 want_refresh = 1;
1040 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1041 } 1046 }
1042} 1047}
… …
1105rxvt_term::pointer_blank () 1110rxvt_term::pointer_blank ()
1106{ 1111{
1107 if (! (options & Opt_pointerBlank)) 1112 if (! (options & Opt_pointerBlank))
1108 return; 1113 return;
1109 1114
1110 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1115 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
1111 XFlush (display->display); 1116 XFlush (display->display);
1112 1117
1113 hidden_pointer = 1; 1118 hidden_pointer = 1;
1114} 1119}
1115 1120
… …
1204 1209
1205/*{{{ process an X event */ 1210/*{{{ process an X event */
1206void 1211void
1207rxvt_term::x_cb (XEvent &ev) 1212rxvt_term::x_cb (XEvent &ev)
1208{ 1213{
1214 dDisp;
1215
1209 SET_R (this); 1216 SET_R (this);
1210 SET_LOCALE (locale); 1217 SET_LOCALE (locale);
1211 1218
1212#if defined(CURSOR_BLINK) 1219#if defined(CURSOR_BLINK)
1213 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
… …
1329 button_release (ev.xbutton); 1336 button_release (ev.xbutton);
1330 break; 1337 break;
1331 1338
1332 case ClientMessage: 1339 case ClientMessage:
1333 if (ev.xclient.format == 32 1340 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1342 {
1334 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1335 destroy (); 1344 destroy ();
1345#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev);
1350#endif
1351 }
1352#if ENABLE_XEMBED
1353 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1354 {
1355 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1356 focus_in ();
1357 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1358 focus_out ();
1359 }
1360#endif
1336#ifdef OFFIX_DND 1361#ifdef OFFIX_DND
1337 /* OffiX Dnd (drag 'n' drop) protocol */ 1362 /* OffiX Dnd (drag 'n' drop) protocol */
1338 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1363 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1339 && (ev.xclient.data.l[0] == DndFile 1364 && (ev.xclient.data.l[0] == DndFile
1340 || ev.xclient.data.l[0] == DndDir 1365 || ev.xclient.data.l[0] == DndDir
1341 || ev.xclient.data.l[0] == DndLink)) 1366 || ev.xclient.data.l[0] == DndLink))
1342 { 1367 {
1343 /* Get Dnd data */ 1368 /* Get Dnd data */
1344 Atom ActualType; 1369 Atom ActualType;
1345 int ActualFormat; 1370 int ActualFormat;
1346 unsigned char *data; 1371 unsigned char *data;
1347 unsigned long Size, RemainingBytes; 1372 unsigned long Size, RemainingBytes;
1348 1373
1349 XGetWindowProperty (display->display, display->root, 1374 XGetWindowProperty (disp, display->root,
1350 xa[XA_DNDSELECTION], 1375 xa[XA_DNDSELECTION],
1351 0L, 1000000L, 1376 0L, 1000000L,
1352 False, AnyPropertyType, 1377 False, AnyPropertyType,
1353 &ActualType, &ActualFormat, 1378 &ActualType, &ActualFormat,
1354 &Size, &RemainingBytes, 1379 &Size, &RemainingBytes,
1355 &data); 1380 &data);
1356 set_string_property (XA_CUT_BUFFER0, data); 1381 set_string_property (XA_CUT_BUFFER0, data);
1357 XFree (data); 1382 XFree (data);
1358 selection_paste (display->root, XA_CUT_BUFFER0, true); 1383 selection_paste (display->root, XA_CUT_BUFFER0, true);
1359 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1384 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1360 } 1385 }
1361#endif /* OFFIX_DND */ 1386#endif /* OFFIX_DND */
1362 break; 1387 break;
1363 1388
1364 case MappingNotify: 1389 case MappingNotify:
… …
1389 break; 1414 break;
1390 } 1415 }
1391 break; 1416 break;
1392 1417
1393 case FocusIn: 1418 case FocusIn:
1394 if (!TermWin.focus) 1419 focus_in ();
1395 {
1396 TermWin.focus = 1;
1397 want_refresh = 1;
1398#ifdef USE_XIM
1399 if (Input_Context != NULL)
1400 {
1401 IMSetStatusPosition ();
1402 XSetICFocus (Input_Context);
1403 }
1404#endif
1405#ifdef CURSOR_BLINK
1406 if (options & Opt_cursorBlink)
1407 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1408#endif
1409#ifdef OFF_FOCUS_FADING
1410 if (rs[Rs_fade])
1411 {
1412 pix_colors = pix_colors_focused;
1413 scr_recolour ();
1414 }
1415#endif
1416
1417 }
1418 break; 1420 break;
1419 1421
1420 case FocusOut: 1422 case FocusOut:
1421 if (TermWin.focus) 1423 focus_out ();
1422 {
1423 TermWin.focus = 0;
1424 want_refresh = 1;
1425
1426#if ENABLE_FRILLS || ISO_14755
1427 iso14755buf = 0;
1428#endif
1429#if ENABLE_OVERLAY
1430 scr_overlay_off ();
1431#endif
1432#ifdef USE_XIM
1433 if (Input_Context != NULL)
1434 XUnsetICFocus (Input_Context);
1435#endif
1436#ifdef CURSOR_BLINK
1437 if (options & Opt_cursorBlink)
1438 cursor_blink_ev.stop ();
1439 hidden_cursor = 0;
1440#endif
1441#ifdef OFF_FOCUS_FADING
1442 if (rs[Rs_fade])
1443 {
1444 pix_colors = pix_colors_unfocused;
1445 scr_recolour ();
1446 }
1447#endif
1448 }
1449 break; 1424 break;
1450 1425
1451 case ConfigureNotify: 1426 case ConfigureNotify:
1452 if (ev.xconfigure.window == TermWin.parent[0]) 1427 if (ev.xconfigure.window == TermWin.parent[0])
1453 { 1428 {
… …
1457 { /* Wrap lots of configures into one */ 1432 { /* Wrap lots of configures into one */
1458 width = ev.xconfigure.width; 1433 width = ev.xconfigure.width;
1459 height = ev.xconfigure.height; 1434 height = ev.xconfigure.height;
1460 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1435 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1461 } 1436 }
1462 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1437 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1463 1438
1464 if (szHint.width != width || szHint.height != height) 1439 if (szHint.width != width || szHint.height != height)
1465 { 1440 {
1466 seen_resize = 1; 1441 seen_resize = 1;
1467 resize_all_windows (width, height, 1); 1442 resize_all_windows (width, height, 1);
… …
1519 if (ev.xany.window == TermWin.vt) 1494 if (ev.xany.window == TermWin.vt)
1520 { 1495 {
1521 do 1496 do
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1497 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1498 ev.xexpose.width, ev.xexpose.height, False);
1524 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1525 1500
1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1501 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527 1502
1528 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1529 scr_expose (ev.xexpose.x, ev.xexpose.y, 1504 scr_expose (ev.xexpose.x, ev.xexpose.y,
1530 ev.xexpose.width, ev.xexpose.height, False); 1505 ev.xexpose.width, ev.xexpose.height, False);
1531 1506
1532 scr_refresh (refresh_type); 1507 scr_refresh (refresh_type);
1533 } 1508 }
1534 else 1509 else
1535 { 1510 {
1536 XEvent unused_event; 1511 XEvent unused_event;
1537 1512
1538 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1513 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1539 ; 1514 ;
1540 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1515 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1541 ; 1516 ;
1542 1517
1543 if (isScrollbarWindow (ev.xany.window)) 1518 if (isScrollbarWindow (ev.xany.window))
1544 { 1519 {
1545 scrollBar.setIdle (); 1520 scrollBar.setIdle ();
… …
1550 menubar_expose (); 1525 menubar_expose ();
1551#endif 1526#endif
1552 1527
1553#ifdef TRANSPARENT 1528#ifdef TRANSPARENT
1554 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1529 if (am_transparent && ev.xany.window == TermWin.parent[0])
1555 XClearWindow (display->display, ev.xany.window); 1530 XClearWindow (disp, ev.xany.window);
1556#endif 1531#endif
1557 } 1532 }
1558 break; 1533 break;
1559 1534
1560 case MotionNotify: 1535 case MotionNotify:
… …
1574 1549
1575 if (ev.xany.window == TermWin.vt) 1550 if (ev.xany.window == TermWin.vt)
1576 { 1551 {
1577 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1552 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1578 { 1553 {
1579 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1554 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1580 ; 1555 ;
1581 1556
1582 XQueryPointer (display->display, TermWin.vt, 1557 XQueryPointer (disp, TermWin.vt,
1583 &unused_root, &unused_child, 1558 &unused_root, &unused_child,
1584 &unused_root_x, &unused_root_y, 1559 &unused_root_x, &unused_root_y,
1585 &ev.xbutton.x, &ev.xbutton.y, 1560 &ev.xbutton.x, &ev.xbutton.y,
1586 &ev.xbutton.state); 1561 &ev.xbutton.state);
1587#ifdef MOUSE_THRESHOLD 1562#ifdef MOUSE_THRESHOLD
… …
1651#endif 1626#endif
1652 } 1627 }
1653 } 1628 }
1654 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1655 { 1630 {
1656 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1631 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1657 MotionNotify, &ev)) 1632 MotionNotify, &ev))
1658 ; 1633 ;
1659 1634
1660 XQueryPointer (display->display, scrollBar.win, 1635 XQueryPointer (disp, scrollBar.win,
1661 &unused_root, &unused_child, 1636 &unused_root, &unused_child,
1662 &unused_root_x, &unused_root_y, 1637 &unused_root_x, &unused_root_y,
1663 &ev.xbutton.x, &ev.xbutton.y, 1638 &ev.xbutton.x, &ev.xbutton.y,
1664 &unused_mask); 1639 &unused_mask);
1665 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1667 scr_refresh (refresh_type); 1642 scr_refresh (refresh_type);
1668 refresh_limit = 0; 1643 refresh_limit = 0;
1669 scrollbar_show (1); 1644 scrollbar_show (1);
1670 } 1645 }
1671 break; 1646 break;
1647 }
1648}
1649
1650void
1651rxvt_term::focus_in ()
1652{
1653 if (!TermWin.focus)
1654 {
1655 TermWin.focus = 1;
1656 want_refresh = 1;
1657#if USE_XIM
1658 if (Input_Context != NULL)
1659 {
1660 IMSetStatusPosition ();
1661 XSetICFocus (Input_Context);
1662 }
1663#endif
1664#if CURSOR_BLINK
1665 if (options & Opt_cursorBlink)
1666 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1667#endif
1668#if OFF_FOCUS_FADING
1669 if (rs[Rs_fade])
1670 {
1671 pix_colors = pix_colors_focused;
1672 scr_recolour ();
1673 }
1674#endif
1675 }
1676}
1677
1678void
1679rxvt_term::focus_out ()
1680{
1681 if (TermWin.focus)
1682 {
1683 TermWin.focus = 0;
1684 want_refresh = 1;
1685
1686#if ENABLE_FRILLS || ISO_14755
1687 iso14755buf = 0;
1688#endif
1689#if ENABLE_OVERLAY
1690 scr_overlay_off ();
1691#endif
1692#if USE_XIM
1693 if (Input_Context != NULL)
1694 XUnsetICFocus (Input_Context);
1695#endif
1696#if CURSOR_BLINK
1697 if (options & Opt_cursorBlink)
1698 cursor_blink_ev.stop ();
1699 hidden_cursor = 0;
1700#endif
1701#if OFF_FOCUS_FADING
1702 if (rs[Rs_fade])
1703 {
1704 pix_colors = pix_colors_unfocused;
1705 scr_recolour ();
1706 }
1707#endif
1672 } 1708 }
1673} 1709}
1674 1710
1675#if TRANSPARENT 1711#if TRANSPARENT
1676void 1712void
… …
1767 { 1803 {
1768 case Button1: 1804 case Button1:
1769 /* allow meta + click to select rectangular areas */ 1805 /* allow meta + click to select rectangular areas */
1770 /* should be done in screen.C */ 1806 /* should be done in screen.C */
1771#if ENABLE_FRILLS 1807#if ENABLE_FRILLS
1772 selection.rect = !! (ev.state & ModMetaMask); 1808 selection.rect = !!(ev.state & ModMetaMask);
1773#else 1809#else
1774 selection.rect = false; 1810 selection.rect = false;
1775#endif 1811#endif
1776 1812
1777 /* allow shift+left click to extend selection */ 1813 /* allow shift+left click to extend selection */
… …
2103 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2139 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2104 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2140 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2105 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2141 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2106 int i; 2142 int i;
2107 2143
2108 Visual* visual = display->visual; 2144 Visual *visual = display->visual;
2109 2145
2110 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2146 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2111 2147
2112 /* for convenience */ 2148 /* for convenience */
2113 mask_r = visual->red_mask; 2149 mask_r = visual->red_mask;
… …
2334 Atom atype; 2370 Atom atype;
2335 unsigned char *prop = NULL; 2371 unsigned char *prop = NULL;
2336 Window root, oldp, *list; 2372 Window root, oldp, *list;
2337 Pixmap rootpixmap = None; 2373 Pixmap rootpixmap = None;
2338 XWindowAttributes wattr, wrootattr; 2374 XWindowAttributes wattr, wrootattr;
2375 dDisp;
2339 2376
2340 pchanged = 0; 2377 pchanged = 0;
2341 2378
2342 if (!(options & Opt_transparent)) 2379 if (!(options & Opt_transparent))
2343 return pchanged; /* Don't try any more */ 2380 return pchanged; /* Don't try any more */
2344 2381
2345 XGetWindowAttributes (display->display, display->root, &wrootattr); 2382 XGetWindowAttributes (disp, display->root, &wrootattr);
2346 rootdepth = wrootattr.depth; 2383 rootdepth = wrootattr.depth;
2347 2384
2348 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2385 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2349 2386
2350 if (rootdepth != wattr.depth) 2387 if (rootdepth != wattr.depth)
2351 { 2388 {
2352 if (am_transparent) 2389 if (am_transparent)
2353 { 2390 {
2354 pchanged = 1; 2391 pchanged = 1;
2355 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2392 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2356 am_transparent = am_pixmap_trans = 0; 2393 am_transparent = am_pixmap_trans = 0;
2357 } 2394 }
2358 2395
2359 return pchanged; /* Don't try any more */ 2396 return pchanged; /* Don't try any more */
2360 } 2397 }
2361 2398
2362 /* Get all X ops out of the queue so that our information is up-to-date. */ 2399 /* Get all X ops out of the queue so that our information is up-to-date. */
2363 XSync (display->display, False); 2400 XSync (disp, False);
2364 2401
2365 /* 2402 /*
2366 * Make the frame window set by the window manager have 2403 * Make the frame window set by the window manager have
2367 * the root background. Some window managers put multiple nested frame 2404 * the root background. Some window managers put multiple nested frame
2368 * windows for each client, so we have to take care about that. 2405 * windows for each client, so we have to take care about that.
2369 */ 2406 */
2370 i = (xa[XA_XROOTPMAP_ID] 2407 i = (xa[XA_XROOTPMAP_ID]
2371 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2408 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2372 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2409 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2373 &nitems, &bytes_after, &prop) == Success); 2410 &nitems, &bytes_after, &prop) == Success);
2374 2411
2375 if (!i || prop == NULL) 2412 if (!i || prop == NULL)
2376 i = (xa[XA_ESETROOT_PMAP_ID] 2413 i = (xa[XA_ESETROOT_PMAP_ID]
2377 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2414 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2378 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2415 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2379 &nitems, &bytes_after, &prop) == Success); 2416 &nitems, &bytes_after, &prop) == Success);
2380 2417
2381 if (!i || prop == NULL 2418 if (!i || prop == NULL
2382#if TINTING 2419#if TINTING
… …
2401 Window cr; 2438 Window cr;
2402 XImage *image; 2439 XImage *image;
2403 GC gc; 2440 GC gc;
2404 XGCValues gcvalue; 2441 XGCValues gcvalue;
2405 2442
2406 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2443 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2407 0, 0, &sx, &sy, &cr); 2444 0, 0, &sx, &sy, &cr);
2408 nw = (unsigned int)szHint.width; 2445 nw = (unsigned int)szHint.width;
2409 nh = (unsigned int)szHint.height; 2446 nh = (unsigned int)szHint.height;
2410 nx = ny = 0; 2447 nx = ny = 0;
2411 2448
… …
2424 } 2461 }
2425 2462
2426 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2463 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2427 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2464 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2428 2465
2429 XSync (display->display, False); 2466 XSync (disp, False);
2430 allowedxerror = -1; 2467 allowedxerror = -1;
2431 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2468 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2432 2469
2433 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2470 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2434 /* XXX: may need a delay here? */ 2471 /* XXX: may need a delay here? */
2435 allowedxerror = 0; 2472 allowedxerror = 0;
2436 2473
… …
2439 if (am_transparent && am_pixmap_trans) 2476 if (am_transparent && am_pixmap_trans)
2440 { 2477 {
2441 pchanged = 1; 2478 pchanged = 1;
2442 if (TermWin.pixmap != None) 2479 if (TermWin.pixmap != None)
2443 { 2480 {
2444 XFreePixmap (display->display, TermWin.pixmap); 2481 XFreePixmap (disp, TermWin.pixmap);
2445 TermWin.pixmap = None; 2482 TermWin.pixmap = None;
2446 } 2483 }
2447 } 2484 }
2448 2485
2449 am_pixmap_trans = 0; 2486 am_pixmap_trans = 0;
2450 } 2487 }
2451 else 2488 else
2452 { 2489 {
2453 if (TermWin.pixmap != None) 2490 if (TermWin.pixmap != None)
2454 XFreePixmap (display->display, TermWin.pixmap); 2491 XFreePixmap (disp, TermWin.pixmap);
2455 2492
2456#if TINTING 2493#if TINTING
2457 if (ISSET_PIXCOLOR (Color_tint)) 2494 if (ISSET_PIXCOLOR (Color_tint))
2458 { 2495 {
2459 unsigned short rm, gm, bm; 2496 unsigned short rm, gm, bm;
… …
2463 2500
2464 ShadeXImage (display, image, shade, rm, gm, bm); 2501 ShadeXImage (display, image, shade, rm, gm, bm);
2465 } 2502 }
2466#endif 2503#endif
2467 2504
2468 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2505 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2469 szHint.width, szHint.height, image->depth); 2506 szHint.width, szHint.height, image->depth);
2470 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2507 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2471 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2508 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2472 nx, ny, image->width, image->height); 2509 nx, ny, image->width, image->height);
2473 XFreeGC (display->display, gc); 2510 XFreeGC (disp, gc);
2474 XDestroyImage (image); 2511 XDestroyImage (image);
2475 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2512 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2476 XClearWindow (display->display, TermWin.parent[0]); 2513 XClearWindow (disp, TermWin.parent[0]);
2477 2514
2478 if (!am_transparent || !am_pixmap_trans) 2515 if (!am_transparent || !am_pixmap_trans)
2479 pchanged = 1; 2516 pchanged = 1;
2480 2517
2481 am_transparent = am_pixmap_trans = 1; 2518 am_transparent = am_pixmap_trans = 1;
2482 } 2519 }
2483 } 2520 }
2484 2521
2485 if (am_pixmap_trans) 2522 if (am_pixmap_trans)
2486 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2523 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2487 else 2524 else
2488 { 2525 {
2489 unsigned int n; 2526 unsigned int n;
2490 /* 2527 /*
2491 * InheritPixmap transparency 2528 * InheritPixmap transparency
2492 */ 2529 */
2493 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2530 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2494 { 2531 {
2495 oldp = TermWin.parent[i]; 2532 oldp = TermWin.parent[i];
2496 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2533 XQueryTree (disp, TermWin.parent[i - 1], &root,
2497 &TermWin.parent[i], &list, &n); 2534 &TermWin.parent[i], &list, &n);
2498 XFree (list); 2535 XFree (list);
2499 2536
2500 if (TermWin.parent[i] == display->root) 2537 if (TermWin.parent[i] == display->root)
2501 { 2538 {
… …
2513 2550
2514 if (pchanged) 2551 if (pchanged)
2515 { 2552 {
2516 for (; n < (unsigned int)i; n++) 2553 for (; n < (unsigned int)i; n++)
2517 { 2554 {
2518 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2555 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2519 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2556 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2520 { 2557 {
2521 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2558 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2522 break; 2559 break;
2523 } 2560 }
2524 } 2561 }
2525 } 2562 }
2526 2563
2527 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2564 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2528 { 2565 {
2529 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2566 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_border]);
2530 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2567 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2531 am_transparent = 0; 2568 am_transparent = 0;
2532 /* XXX: also turn off Opt_transparent? */ 2569 /* XXX: also turn off Opt_transparent? */
2533 } 2570 }
2534 else 2571 else
2535 { 2572 {
… …
2538 * needed for fvwm2.2.2 (and before?) */ 2575 * needed for fvwm2.2.2 (and before?) */
2539 sleep (1); 2576 sleep (1);
2540#endif 2577#endif
2541 for (n = 0; n < (unsigned int)i; n++) 2578 for (n = 0; n < (unsigned int)i; n++)
2542 { 2579 {
2543 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2580 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2544 XClearWindow (display->display, TermWin.parent[n]); 2581 XClearWindow (disp, TermWin.parent[n]);
2545 } 2582 }
2546 2583
2547 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2584 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2548 am_transparent = 1; 2585 am_transparent = 1;
2549 } 2586 }
2550 2587
2551 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2588 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2552 TermWin.parent[i] = None; 2589 TermWin.parent[i] = None;
2553 } 2590 }
2554 2591
2555 if (scrollBar.win) 2592 if (scrollBar.win)
2556 { 2593 {
2557 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2594 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2558 scrollBar.setIdle (); 2595 scrollBar.setIdle ();
2559 scrollbar_show (0); 2596 scrollbar_show (0);
2560 } 2597 }
2561 2598
2562 if (am_transparent) 2599 if (am_transparent)
… …
2600 // some window managers resize the window early, and these programs 2637 // some window managers resize the window early, and these programs
2601 // then sometimes get the size wrong. 2638 // then sometimes get the size wrong.
2602 // unfortunately other programs are even more buggy and dislike 2639 // unfortunately other programs are even more buggy and dislike
2603 // being sent SIGWINCH, so only do it when we were in fact being 2640 // being sent SIGWINCH, so only do it when we were in fact being
2604 // resized. 2641 // resized.
2605 if (seen_resize) 2642 if (seen_resize && cmd_pid)
2606 kill (-cmd_pid, SIGWINCH); 2643 kill (-cmd_pid, SIGWINCH);
2607 } 2644 }
2608 2645
2609 /* Read a text string from the input buffer */ 2646 /* Read a text string from the input buffer */
2610 unicode_t buf[UBUFSIZ]; 2647 unicode_t buf[UBUFSIZ];
2611 bool refreshnow = false; 2648 bool refreshnow = false;
2612 int nlines = 0; 2649 int nlines = 0;
2613 unicode_t *str = buf; 2650 unicode_t *str = buf;
2651 unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ);
2614 2652
2615 for (;;) 2653 for (;;)
2616 { 2654 {
2617 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2655 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2618 break; 2656 break;
2619 2657
2620 *str++ = ch; 2658 *str++ = ch;
2621 2659
2622 if (ch == C0_LF) 2660 if (ch == C0_LF || str >= eol)
2623 { 2661 {
2662 if (ch == C0_LF)
2624 nlines++; 2663 nlines++;
2664
2625 refresh_count++; 2665 refresh_count++;
2626 2666
2627 if (!(options & Opt_jumpScroll) 2667 if (!(options & Opt_jumpScroll)
2628 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2668 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2629 { 2669 {
… …
2636 if (nlines >= TermWin.nrow - 1) 2676 if (nlines >= TermWin.nrow - 1)
2637 { 2677 {
2638 scr_add_lines (buf, nlines, str - buf); 2678 scr_add_lines (buf, nlines, str - buf);
2639 nlines = 0; 2679 nlines = 0;
2640 str = buf; 2680 str = buf;
2681 eol = str + min (TermWin.ncol, UBUFSIZ);
2641 } 2682 }
2642 }
2643 2683
2644 if (str >= buf + UBUFSIZ) 2684 if (str >= eol)
2645 { 2685 {
2686 if (eol >= buf + UBUFSIZ)
2687 {
2646 ch = NOCHAR; 2688 ch = NOCHAR;
2647 break; 2689 break;
2690 }
2691 else
2692 eol = min (eol + TermWin.ncol, buf + UBUFSIZ);
2693 }
2694
2648 } 2695 }
2649 2696
2650 seq_begin = cmdbuf_ptr; 2697 seq_begin = cmdbuf_ptr;
2651 ch = next_char (); 2698 ch = next_char ();
2652 } 2699 }
… …
3196 { 3243 {
3197 switch (priv) 3244 switch (priv)
3198 { 3245 {
3199 case '>': 3246 case '>':
3200 if (ch == CSI_DA) /* secondary device attributes */ 3247 if (ch == CSI_DA) /* secondary device attributes */
3201 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3248 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3202 break; 3249 break;
3203 case '?': 3250 case '?':
3204 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3251 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3205 process_terminal_mode (ch, priv, nargs, arg); 3252 process_terminal_mode (ch, priv, nargs, arg);
3206 break; 3253 break;
… …
3435rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3482rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3436{ 3483{
3437 int x, y; 3484 int x, y;
3438 XWindowAttributes wattr; 3485 XWindowAttributes wattr;
3439 Window wdummy; 3486 Window wdummy;
3487 dDisp;
3440 3488
3441 if (nargs == 0) 3489 if (nargs == 0)
3442 return; 3490 return;
3443 3491
3444 switch (args[0]) 3492 switch (args[0])
3445 { 3493 {
3446 /* 3494 /*
3447 * commands 3495 * commands
3448 */ 3496 */
3449 case 1: /* deiconify window */ 3497 case 1: /* deiconify window */
3450 XMapWindow (display->display, TermWin.parent[0]); 3498 XMapWindow (disp, TermWin.parent[0]);
3451 break; 3499 break;
3452 case 2: /* iconify window */ 3500 case 2: /* iconify window */
3453 XIconifyWindow (display->display, TermWin.parent[0], 3501 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3454 DefaultScreen (display->display));
3455 break; 3502 break;
3456 case 3: /* set position (pixels) */ 3503 case 3: /* set position (pixels) */
3457 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3504 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3458 break; 3505 break;
3459 case 4: /* set size (pixels) */ 3506 case 4: /* set size (pixels) */
3460 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3507 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3461 break; 3508 break;
3462 case 5: /* raise window */ 3509 case 5: /* raise window */
3463 XRaiseWindow (display->display, TermWin.parent[0]); 3510 XRaiseWindow (disp, TermWin.parent[0]);
3464 break; 3511 break;
3465 case 6: /* lower window */ 3512 case 6: /* lower window */
3466 XLowerWindow (display->display, TermWin.parent[0]); 3513 XLowerWindow (disp, TermWin.parent[0]);
3467 break; 3514 break;
3468 case 7: /* refresh window */ 3515 case 7: /* refresh window */
3469 scr_touch (true); 3516 scr_touch (true);
3470 break; 3517 break;
3471 case 8: /* set size (chars) */ 3518 case 8: /* set size (chars) */
… …
3483 3530
3484 /* 3531 /*
3485 * reports - some output format copied from XTerm 3532 * reports - some output format copied from XTerm
3486 */ 3533 */
3487 case 11: /* report window state */ 3534 case 11: /* report window state */
3488 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3535 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3489 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3536 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3490 break; 3537 break;
3491 case 13: /* report window position */ 3538 case 13: /* report window position */
3492 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3539 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3493 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3540 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3494 -wattr.border_width, -wattr.border_width, 3541 -wattr.border_width, -wattr.border_width,
3495 &x, &y, &wdummy); 3542 &x, &y, &wdummy);
3496 tt_printf ("\033[3;%d;%dt", x, y); 3543 tt_printf ("\033[3;%d;%dt", x, y);
3497 break; 3544 break;
3498 case 14: /* report window size (pixels) */ 3545 case 14: /* report window size (pixels) */
3499 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3546 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3500 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3547 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3501 break; 3548 break;
3502 case 18: /* report text area size (chars) */ 3549 case 18: /* report text area size (chars) */
3503 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3550 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3504 break; 3551 break;
… …
3506 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3553 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3507 break; 3554 break;
3508 case 20: /* report icon label */ 3555 case 20: /* report icon label */
3509 { 3556 {
3510 char *s; 3557 char *s;
3511 XGetIconName (display->display, TermWin.parent[0], &s); 3558 XGetIconName (disp, TermWin.parent[0], &s);
3512 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3559 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3513 XFree (s); 3560 XFree (s);
3514 } 3561 }
3515 break; 3562 break;
3516 case 21: /* report window title */ 3563 case 21: /* report window title */
3517 { 3564 {
3518 char *s; 3565 char *s;
3519 XFetchName (display->display, TermWin.parent[0], &s); 3566 XFetchName (disp, TermWin.parent[0], &s);
3520 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3567 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3521 XFree (s); 3568 XFree (s);
3522 } 3569 }
3523 break; 3570 break;
3524 } 3571 }
… …
3557 else if (ch < 0x20) 3604 else if (ch < 0x20)
3558 return NULL; /* other control character - exit */ 3605 return NULL; /* other control character - exit */
3559 3606
3560 seen_esc = false; 3607 seen_esc = false;
3561 3608
3562 if (n >= sizeof (string) - 1) 3609 if (n >= STRING_MAX - 1)
3563 // stop at some sane length 3610 // stop at some sane length
3564 return NULL; 3611 return NULL;
3565 3612
3566 if (ch == C0_SYN) 3613 if (ch == C0_SYN)
3567 string[n++] = cmd_get8 (); 3614 string[n++] = cmd_get8 ();
… …
3635 set_window_color (color, str); 3682 set_window_color (color, str);
3636} 3683}
3637 3684
3638/* 3685/*
3639 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3686 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3640 * 0 = change iconName/title
3641 * 1 = change iconName
3642 * 2 = change title
3643 * 4 = change color
3644 * 10 = change fg color
3645 * 11 = change bg color
3646 * 12 = change text color
3647 * 13 = change mouse foreground color
3648 * 17 = change highlight character colour
3649 * 18 = change bold character color
3650 * 19 = change underlined character color
3651 * 46 = change logfile (not implemented)
3652 * 50 = change font
3653 *
3654 * rxvt extensions:
3655 * 20 = bg pixmap
3656 * 39 = change default fg color
3657 * 49 = change default bg color
3658 * 55 = dump scrollback buffer and all of screen
3659 * 701 = change locale
3660 * 702 = find font
3661 * 703 = menu
3662 */ 3687 */
3663void 3688void
3664rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3689rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3665{ 3690{
3666 int changed = 0; 3691 int changed = 0;
3667 int color; 3692 int color;
3668 char *buf, *name; 3693 char *buf, *name;
3669 bool query = str[0] == '?' && !str[1]; 3694 bool query = str[0] == '?' && !str[1];
3670 int saveop = op; 3695 int saveop = op;
3696 dDisp;
3671 3697
3672 assert (str != NULL); 3698 assert (str != NULL);
3673 switch (op) 3699 switch (op)
3674 { 3700 {
3675 case XTerm_name: 3701 case XTerm_name:
… …
3691 unsigned long bytes_after; 3717 unsigned long bytes_after;
3692 unsigned char *value = 0; 3718 unsigned char *value = 0;
3693 const char *str = ""; 3719 const char *str = "";
3694 3720
3695 if (prop 3721 if (prop
3696 && XGetWindowProperty (display->display, TermWin.parent[0], 3722 && XGetWindowProperty (disp, TermWin.parent[0],
3697 prop, 0, 1<<16, 0, AnyPropertyType, 3723 prop, 0, 1<<16, 0, AnyPropertyType,
3698 &actual_type, &actual_format, 3724 &actual_type, &actual_format,
3699 &nitems, &bytes_after, &value) == Success 3725 &nitems, &bytes_after, &value) == Success
3700 && actual_type != None 3726 && actual_type != None
3701 && actual_format == 8) 3727 && actual_format == 8)
… …
3713 { 3739 {
3714 *eq = 0; 3740 *eq = 0;
3715 set_utf8_property (display->atom (str), eq + 1); 3741 set_utf8_property (display->atom (str), eq + 1);
3716 } 3742 }
3717 else 3743 else
3718 XDeleteProperty (display->display, TermWin.parent[0], 3744 XDeleteProperty (disp, TermWin.parent[0],
3719 display->atom (str)); 3745 display->atom (str));
3720 } 3746 }
3721 break; 3747 break;
3722 3748
3723 case XTerm_Color: 3749 case XTerm_Color:
… …
3764 break; 3790 break;
3765#ifndef NO_BOLD_UNDERLINE_REVERSE 3791#ifndef NO_BOLD_UNDERLINE_REVERSE
3766 case XTerm_Color_BD: 3792 case XTerm_Color_BD:
3767 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3793 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3768 break; 3794 break;
3769 case XTerm_Color_IT:
3770 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3771 break;
3772 case XTerm_Color_UL: 3795 case XTerm_Color_UL:
3773 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3796 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3774 break; 3797 break;
3775 case XTerm_Color_RV: 3798 case XTerm_Color_RV:
3776 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3799 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3777 break; 3800 break;
3801 case URxvt_Color_IT:
3802 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3803 break;
3778#endif 3804#endif
3779#if TRANSPARENT && TINTING 3805#if TRANSPARENT && TINTING
3780 case XTerm_Color_tint: 3806 case URxvt_Color_tint:
3781 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3807 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3782 check_our_parents (); 3808 check_our_parents ();
3783 if (am_transparent) 3809 if (am_transparent)
3784 want_full_refresh = want_refresh = 1; 3810 want_full_refresh = want_refresh = 1;
3785 break; 3811 break;
3786#endif 3812#endif
… …
3798 { 3824 {
3799 str++; 3825 str++;
3800#if XPM_BACKGROUND 3826#if XPM_BACKGROUND
3801 changed += scale_pixmap (str); 3827 changed += scale_pixmap (str);
3802#endif 3828#endif
3803
3804 } 3829 }
3830
3805 if (changed) 3831 if (changed)
3806 { 3832 {
3807#ifdef XPM_BACKGROUND 3833#ifdef XPM_BACKGROUND
3808 resize_pixmap (); 3834 resize_pixmap ();
3809#endif 3835#endif
… …
3820 3846
3821 case XTerm_logfile: 3847 case XTerm_logfile:
3822 // TODO, when secure mode? 3848 // TODO, when secure mode?
3823 break; 3849 break;
3824 3850
3851#ifdef MENUBAR
3852 case URxvt_Menu:
3853 if (options & Opt_insecure)
3854 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3855 break;
3856#endif
3857#if 0
3858 case XTerm_dumpscreen: /* no error notices */
3859 {
3860 int fd;
3861 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3862 {
3863 scr_dump (fd);
3864 close (fd);
3865 }
3866 }
3867 break;
3868#endif
3825 case XTerm_font: 3869 case XTerm_font:
3826 op = URxvt_font; 3870 op = URxvt_font;
3827 case URxvt_font: 3871 case URxvt_font:
3828#if ENABLE_STYLES 3872#if ENABLE_STYLES
3829 case URxvt_boldFont: 3873 case URxvt_boldFont:
… …
3844 set_fonts (); 3888 set_fonts ();
3845 } 3889 }
3846 break; 3890 break;
3847 3891
3848#if ENABLE_FRILLS 3892#if ENABLE_FRILLS
3849 case XTerm_locale: 3893 case URxvt_locale:
3850 if (query) 3894 if (query)
3851 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3895 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3852 else 3896 else
3853 { 3897 {
3854 set_locale (str); 3898 set_locale (str);
3855# ifdef USE_XIM 3899 pty.set_utf8_mode (enc_utf8);
3856 im_cb (); 3900 init_xlocale ();
3857# endif
3858 } 3901 }
3859 break; 3902 break;
3860#endif
3861 3903
3862#ifdef MENUBAR 3904 case URxvt_view_up:
3863 case XTerm_Menu: 3905 case URxvt_view_down:
3864 if (options & Opt_insecure) 3906 int lines = atoi (str);
3865 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3907
3866 break; 3908 if (lines)
3867#endif 3909 scr_page (op == URxvt_view_up ? UP : DN, lines);
3868#if 0
3869 case XTerm_dumpscreen: /* no error notices */
3870 { 3910 else
3871 int fd;
3872 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3873 { 3911 {
3874 scr_dump (fd); 3912 scr_erase_savelines ();
3875 close (fd);
3876 } 3913 }
3877 } 3914
3878 break; 3915 break;
3879#endif 3916#endif
3880 } 3917 }
3881} 3918}
3882/*----------------------------------------------------------------------*/ 3919/*----------------------------------------------------------------------*/

Diff Legend

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