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.215 by root, Fri Dec 23 14:46:34 2005 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
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)
125{ 136{
126 x = Pixel2Col (x); 137 x = Pixel2Col (x);
127 y = Pixel2Row (y); 138 y = Pixel2Row (y);
128 139
129 if (x < 0 || x >= TermWin.ncol 140 if (!IN_RANGE_EXC (x, 0, ncol)
130 || y < 0 || y >= TermWin.nrow) 141 || !IN_RANGE_EXC (y, 0, nrow))
131 return; 142 return;
132 143
133 for (;;) 144 for (;;)
134 { 145 {
135 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];
136 149
137 if (t != NOCHAR || !x) 150 if (t != NOCHAR || !x)
138 { 151 {
139 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 152 iso14755_51 (l.t[x], l.r[x]);
140 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
141 iso14755buf = ISO_14755_54; 153 iso14755buf = ISO_14755_54;
142 break; 154 break;
143 } 155 }
144 156
145 x--; 157 x--;
146 } 158 }
147
148} 159}
149#endif 160#endif
150 161
151#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
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 (saveLines)
350 { 372 {
351#ifdef UNSHIFTED_SCROLLKEYS 373#ifdef UNSHIFTED_SCROLLKEYS
352 if (!ctrl && !meta) 374 if (!ctrl && !meta)
353#else 375#else
354 if (IS_SCROLL_MOD) 376 if (IS_SCROLL_MOD)
355#endif 377#endif
356 { 378 {
357 int lnsppg; 379 int lnsppg;
358 380
359#ifdef PAGING_CONTEXT_LINES 381#ifdef PAGING_CONTEXT_LINES
360 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 382 lnsppg = nrow - PAGING_CONTEXT_LINES;
361#else 383#else
362 lnsppg = TermWin.nrow * 4 / 5; 384 lnsppg = nrow * 4 / 5;
363#endif 385#endif
364 if (keysym == XK_Prior) 386 if (keysym == XK_Prior)
365 { 387 {
366 scr_page (UP, lnsppg); 388 scr_page (UP, lnsppg);
367 return; 389 return;
… …
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 }
… …
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 } 827 }
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 else 828 else
828 { 829 {
829#ifdef META8_OPTION 830#ifdef META8_OPTION
830 /* set 8-bit on */ 831 /* set 8-bit on */
831 if (meta && (meta_char == 0x80)) 832 if (meta && (meta_char == 0x80))
… …
844 845
845 if (len <= 0) 846 if (len <= 0)
846 return; /* not mapped */ 847 return; /* not mapped */
847 848
848 if (options & Opt_scrollTtyKeypress) 849 if (options & Opt_scrollTtyKeypress)
849 if (TermWin.view_start) 850 if (view_start)
850 { 851 {
851 TermWin.view_start = 0; 852 view_start = 0;
852 want_refresh = 1; 853 want_refresh = 1;
853 } 854 }
854 855
855 /* 856 /*
856 * these modifications only affect the static keybuffer 857 * these modifications only affect the static keybuffer
… …
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 (view_start == nsaved ||
1040 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}
… …
1062 if (n > 0) 1067 if (n > 0)
1063 { 1068 {
1064 cmdbuf_endp += n; 1069 cmdbuf_endp += n;
1065 return true; 1070 return true;
1066 } 1071 }
1067 else if (n < 0 && errno != EAGAIN) 1072 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0)
1073 {
1074 pty_ev.stop ();
1075
1076 if (!(options & Opt_hold))
1068 destroy (); 1077 destroy ();
1078 }
1069 1079
1070 return false; 1080 return false;
1071} 1081}
1072 1082
1073void 1083void
… …
1087} 1097}
1088 1098
1089void 1099void
1090rxvt_term::pointer_unblank () 1100rxvt_term::pointer_unblank ()
1091{ 1101{
1092 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1102 XDefineCursor (display->display, vt, TermWin_cursor);
1093 recolour_cursor (); 1103 recolour_cursor ();
1094 1104
1095#ifdef POINTER_BLANK 1105#ifdef POINTER_BLANK
1096 hidden_pointer = 0; 1106 hidden_pointer = 0;
1097 1107
… …
1105rxvt_term::pointer_blank () 1115rxvt_term::pointer_blank ()
1106{ 1116{
1107 if (! (options & Opt_pointerBlank)) 1117 if (! (options & Opt_pointerBlank))
1108 return; 1118 return;
1109 1119
1110 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1120 XDefineCursor (display->display, vt, display->blank_cursor);
1111 XFlush (display->display); 1121 XFlush (display->display);
1112 1122
1113 hidden_pointer = 1; 1123 hidden_pointer = 1;
1114} 1124}
1115 1125
… …
1204 1214
1205/*{{{ process an X event */ 1215/*{{{ process an X event */
1206void 1216void
1207rxvt_term::x_cb (XEvent &ev) 1217rxvt_term::x_cb (XEvent &ev)
1208{ 1218{
1219 dDisp;
1220
1209 SET_R (this); 1221 SET_R (this);
1210 SET_LOCALE (locale); 1222 SET_LOCALE (locale);
1211 1223
1212#if defined(CURSOR_BLINK) 1224#if defined(CURSOR_BLINK)
1213 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1225 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
… …
1329 button_release (ev.xbutton); 1341 button_release (ev.xbutton);
1330 break; 1342 break;
1331 1343
1332 case ClientMessage: 1344 case ClientMessage:
1333 if (ev.xclient.format == 32 1345 if (ev.xclient.format == 32
1346 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1347 {
1334 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1348 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1335 destroy (); 1349 destroy ();
1350#if ENABLE_EWMH
1351 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1352 XSendEvent (disp, ev.xclient.window = display->root,
1353 False, SubstructureRedirectMask | SubstructureNotifyMask,
1354 &ev);
1355#endif
1356 }
1357#if ENABLE_XEMBED
1358 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1359 {
1360 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1361 focus_in ();
1362 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1363 focus_out ();
1364 }
1365#endif
1336#ifdef OFFIX_DND 1366#ifdef OFFIX_DND
1337 /* OffiX Dnd (drag 'n' drop) protocol */ 1367 /* OffiX Dnd (drag 'n' drop) protocol */
1338 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1368 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1339 && (ev.xclient.data.l[0] == DndFile 1369 && (ev.xclient.data.l[0] == DndFile
1340 || ev.xclient.data.l[0] == DndDir 1370 || ev.xclient.data.l[0] == DndDir
1341 || ev.xclient.data.l[0] == DndLink)) 1371 || ev.xclient.data.l[0] == DndLink))
1342 { 1372 {
1343 /* Get Dnd data */ 1373 /* Get Dnd data */
1344 Atom ActualType; 1374 Atom ActualType;
1345 int ActualFormat; 1375 int ActualFormat;
1346 unsigned char *data; 1376 unsigned char *data;
1347 unsigned long Size, RemainingBytes; 1377 unsigned long Size, RemainingBytes;
1348 1378
1349 XGetWindowProperty (display->display, display->root, 1379 XGetWindowProperty (disp, display->root,
1350 xa[XA_DNDSELECTION], 1380 xa[XA_DNDSELECTION],
1351 0L, 1000000L, 1381 0L, 1000000L,
1352 False, AnyPropertyType, 1382 False, AnyPropertyType,
1353 &ActualType, &ActualFormat, 1383 &ActualType, &ActualFormat,
1354 &Size, &RemainingBytes, 1384 &Size, &RemainingBytes,
1355 &data); 1385 &data);
1356 set_string_property (XA_CUT_BUFFER0, data); 1386 set_string_property (XA_CUT_BUFFER0, data);
1357 XFree (data); 1387 XFree (data);
1358 selection_paste (display->root, XA_CUT_BUFFER0, true); 1388 selection_paste (display->root, XA_CUT_BUFFER0, true);
1359 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1389 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1360 } 1390 }
1361#endif /* OFFIX_DND */ 1391#endif /* OFFIX_DND */
1362 break; 1392 break;
1363 1393
1364 case MappingNotify: 1394 case MappingNotify:
… …
1389 break; 1419 break;
1390 } 1420 }
1391 break; 1421 break;
1392 1422
1393 case FocusIn: 1423 case FocusIn:
1394 if (!TermWin.focus) 1424 focus_in ();
1425 break;
1426
1427 case FocusOut:
1428 focus_out ();
1429 break;
1430
1431 case ConfigureNotify:
1432 if (ev.xconfigure.window == parent[0])
1395 { 1433 {
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;
1419
1420 case FocusOut:
1421 if (TermWin.focus)
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;
1450
1451 case ConfigureNotify:
1452 if (ev.xconfigure.window == TermWin.parent[0])
1453 {
1454 int height, width;
1455
1456 do
1457 { /* Wrap lots of configures into one */
1458 width = ev.xconfigure.width;
1459 height = ev.xconfigure.height;
1460 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1461 }
1462 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1434 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1435 ;
1463 1436
1464 if (szHint.width != width || szHint.height != height) 1437 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1465 { 1438 {
1466 seen_resize = 1; 1439 seen_resize = 1;
1467 resize_all_windows (width, height, 1); 1440 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1468 } 1441 }
1469 1442
1470#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1443#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1471 if (options & Opt_transparent) 1444 if (options & Opt_transparent)
1472 check_our_parents (); 1445 check_our_parents ();
… …
1493 case SelectionRequest: 1466 case SelectionRequest:
1494 selection_send (ev.xselectionrequest); 1467 selection_send (ev.xselectionrequest);
1495 break; 1468 break;
1496 1469
1497 case UnmapNotify: 1470 case UnmapNotify:
1498 TermWin.mapped = 0; 1471 mapped = 0;
1499#ifdef TEXT_BLINK 1472#ifdef TEXT_BLINK
1500 text_blink_ev.stop (); 1473 text_blink_ev.stop ();
1501#endif 1474#endif
1502 break; 1475 break;
1503 1476
1504 case MapNotify: 1477 case MapNotify:
1505 TermWin.mapped = 1; 1478 mapped = 1;
1506#ifdef TEXT_BLINK 1479#ifdef TEXT_BLINK
1507 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1480 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1508#endif 1481#endif
1509 break; 1482 break;
1510 1483
… …
1514 break; 1487 break;
1515#endif /* TRANSPARENT */ 1488#endif /* TRANSPARENT */
1516 1489
1517 case GraphicsExpose: 1490 case GraphicsExpose:
1518 case Expose: 1491 case Expose:
1519 if (ev.xany.window == TermWin.vt) 1492 if (ev.xany.window == vt)
1520 { 1493 {
1521 do 1494 do
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1495 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1496 ev.xexpose.width, ev.xexpose.height, False);
1524 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1525 1498
1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1499 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527 1500
1528 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1501 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1529 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1530 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1531 1504
1532 scr_refresh (refresh_type); 1505 scr_refresh (refresh_type);
1533 } 1506 }
1534 else 1507 else
1535 { 1508 {
1536 XEvent unused_event; 1509 XEvent unused_event;
1537 1510
1538 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1511 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1539 ; 1512 ;
1540 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1513 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1541 ; 1514 ;
1542 1515
1543 if (isScrollbarWindow (ev.xany.window)) 1516 if (isScrollbarWindow (ev.xany.window))
1544 { 1517 {
1545 scrollBar.setIdle (); 1518 scrollBar.setIdle ();
… …
1549 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1522 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1550 menubar_expose (); 1523 menubar_expose ();
1551#endif 1524#endif
1552 1525
1553#ifdef TRANSPARENT 1526#ifdef TRANSPARENT
1554 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1527 if (am_transparent && ev.xany.window == parent[0])
1555 XClearWindow (display->display, ev.xany.window); 1528 XClearWindow (disp, ev.xany.window);
1556#endif 1529#endif
1557 } 1530 }
1558 break; 1531 break;
1559 1532
1560 case MotionNotify: 1533 case MotionNotify:
… …
1570 } 1543 }
1571#endif 1544#endif
1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1545 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1573 break; 1546 break;
1574 1547
1575 if (ev.xany.window == TermWin.vt) 1548 if (ev.xany.window == vt)
1576 { 1549 {
1577 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1550 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1578 { 1551 {
1579 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1552 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1580 ; 1553 ;
1581 1554
1582 XQueryPointer (display->display, TermWin.vt, 1555 XQueryPointer (disp, vt,
1583 &unused_root, &unused_child, 1556 &unused_root, &unused_child,
1584 &unused_root_x, &unused_root_y, 1557 &unused_root_x, &unused_root_y,
1585 &ev.xbutton.x, &ev.xbutton.y, 1558 &ev.xbutton.x, &ev.xbutton.y,
1586 &ev.xbutton.state); 1559 &ev.xbutton.state);
1587#ifdef MOUSE_THRESHOLD 1560#ifdef MOUSE_THRESHOLD
… …
1599#endif 1572#endif
1600 selection_extend (ev.xbutton.x, ev.xbutton.y, 1573 selection_extend (ev.xbutton.x, ev.xbutton.y,
1601 ev.xbutton.state & Button3Mask ? 2 : 0); 1574 ev.xbutton.state & Button3Mask ? 2 : 0);
1602 1575
1603#ifdef SELECTION_SCROLLING 1576#ifdef SELECTION_SCROLLING
1604 if (ev.xbutton.y < TermWin.int_bwidth 1577 if (ev.xbutton.y < int_bwidth
1605 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1578 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1606 { 1579 {
1607 int dist; 1580 int dist;
1608 1581
1609 /* don't clobber the current delay if we are 1582 /* don't clobber the current delay if we are
1610 * already in the middle of scrolling. 1583 * already in the middle of scrolling.
… …
1618 selection_save_x = ev.xbutton.x; 1591 selection_save_x = ev.xbutton.x;
1619 selection_save_y = ev.xbutton.y; 1592 selection_save_y = ev.xbutton.y;
1620 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1593 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1621 1594
1622 /* calc number of lines to scroll */ 1595 /* calc number of lines to scroll */
1623 if (ev.xbutton.y < TermWin.int_bwidth) 1596 if (ev.xbutton.y < int_bwidth)
1624 { 1597 {
1625 scroll_selection_dir = UP; 1598 scroll_selection_dir = UP;
1626 dist = TermWin.int_bwidth - ev.xbutton.y; 1599 dist = int_bwidth - ev.xbutton.y;
1627 } 1600 }
1628 else 1601 else
1629 { 1602 {
1630 scroll_selection_dir = DN; 1603 scroll_selection_dir = DN;
1631 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1604 dist = ev.xbutton.y - (int_bwidth + height);
1632 } 1605 }
1633 1606
1634 scroll_selection_lines = Pixel2Height (dist) 1607 scroll_selection_lines = Pixel2Height (dist)
1635 / SELECTION_SCROLL_LINE_SPEEDUP 1608 / SELECTION_SCROLL_LINE_SPEEDUP
1636 + 1; 1609 + 1;
1637 MIN_IT (scroll_selection_lines, 1610 min_it (scroll_selection_lines,
1638 SELECTION_SCROLL_MAX_LINES); 1611 SELECTION_SCROLL_MAX_LINES);
1639 } 1612 }
1640 else 1613 else
1641 { 1614 {
1642 /* we are within the text window, so we 1615 /* we are within the text window, so we
… …
1651#endif 1624#endif
1652 } 1625 }
1653 } 1626 }
1654 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1627 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1655 { 1628 {
1656 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1629 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1657 MotionNotify, &ev)) 1630 MotionNotify, &ev))
1658 ; 1631 ;
1659 1632
1660 XQueryPointer (display->display, scrollBar.win, 1633 XQueryPointer (disp, scrollBar.win,
1661 &unused_root, &unused_child, 1634 &unused_root, &unused_child,
1662 &unused_root_x, &unused_root_y, 1635 &unused_root_x, &unused_root_y,
1663 &ev.xbutton.x, &ev.xbutton.y, 1636 &ev.xbutton.x, &ev.xbutton.y,
1664 &unused_mask); 1637 &unused_mask);
1665 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1638 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1670 } 1643 }
1671 break; 1644 break;
1672 } 1645 }
1673} 1646}
1674 1647
1648void
1649rxvt_term::focus_in ()
1650{
1651 if (!focus)
1652 {
1653 focus = 1;
1654 want_refresh = 1;
1655#if USE_XIM
1656 if (Input_Context != NULL)
1657 {
1658 IMSetStatusPosition ();
1659 XSetICFocus (Input_Context);
1660 }
1661#endif
1662#if CURSOR_BLINK
1663 if (options & Opt_cursorBlink)
1664 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1665#endif
1666#if OFF_FOCUS_FADING
1667 if (rs[Rs_fade])
1668 {
1669 pix_colors = pix_colors_focused;
1670 scr_recolour ();
1671 }
1672#endif
1673 }
1674}
1675
1676void
1677rxvt_term::focus_out ()
1678{
1679 if (focus)
1680 {
1681 focus = 0;
1682 want_refresh = 1;
1683
1684#if ENABLE_FRILLS || ISO_14755
1685 iso14755buf = 0;
1686#endif
1687#if ENABLE_OVERLAY
1688 scr_overlay_off ();
1689#endif
1690#if USE_XIM
1691 if (Input_Context != NULL)
1692 XUnsetICFocus (Input_Context);
1693#endif
1694#if CURSOR_BLINK
1695 if (options & Opt_cursorBlink)
1696 cursor_blink_ev.stop ();
1697 hidden_cursor = 0;
1698#endif
1699#if OFF_FOCUS_FADING
1700 if (rs[Rs_fade])
1701 {
1702 pix_colors = pix_colors_unfocused;
1703 scr_recolour ();
1704 }
1705#endif
1706 }
1707}
1708
1675#if TRANSPARENT 1709#if TRANSPARENT
1676void 1710void
1677rxvt_term::rootwin_cb (XEvent &ev) 1711rxvt_term::rootwin_cb (XEvent &ev)
1678{ 1712{
1679 SET_R (this); 1713 SET_R (this);
… …
1709 reportmode = !! (priv_modes & PrivMode_mouse_report); 1743 reportmode = !! (priv_modes & PrivMode_mouse_report);
1710 1744
1711 /* 1745 /*
1712 * VT window processing of button press 1746 * VT window processing of button press
1713 */ 1747 */
1714 if (ev.window == TermWin.vt) 1748 if (ev.window == vt)
1715 { 1749 {
1716#if ISO_14755 1750#if ISO_14755
1717 // 5.4 1751 // 5.4
1718 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1752 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1719 { 1753 {
… …
1767 { 1801 {
1768 case Button1: 1802 case Button1:
1769 /* allow meta + click to select rectangular areas */ 1803 /* allow meta + click to select rectangular areas */
1770 /* should be done in screen.C */ 1804 /* should be done in screen.C */
1771#if ENABLE_FRILLS 1805#if ENABLE_FRILLS
1772 selection.rect = !! (ev.state & ModMetaMask); 1806 selection.rect = !!(ev.state & ModMetaMask);
1773#else 1807#else
1774 selection.rect = false; 1808 selection.rect = false;
1775#endif 1809#endif
1776 1810
1777 /* allow shift+left click to extend selection */ 1811 /* allow shift+left click to extend selection */
… …
1924 case Button3: 1958 case Button3:
1925 if (scrollBar.style != R_SB_XTERM) 1959 if (scrollBar.style != R_SB_XTERM)
1926 { 1960 {
1927 if (scrollbar_above_slider (ev.y)) 1961 if (scrollbar_above_slider (ev.y))
1928# ifdef RXVT_SCROLL_FULL 1962# ifdef RXVT_SCROLL_FULL
1929 scr_page (UP, TermWin.nrow - 1); 1963 scr_page (UP, nrow - 1);
1930# else 1964# else
1931 scr_page (UP, TermWin.nrow / 4); 1965 scr_page (UP, nrow / 4);
1932# endif 1966# endif
1933 else if (scrollbar_below_slider (ev.y)) 1967 else if (scrollbar_below_slider (ev.y))
1934# ifdef RXVT_SCROLL_FULL 1968# ifdef RXVT_SCROLL_FULL
1935 scr_page (DN, TermWin.nrow - 1); 1969 scr_page (DN, nrow - 1);
1936# else 1970# else
1937 scr_page (DN, TermWin.nrow / 4); 1971 scr_page (DN, nrow / 4);
1938# endif 1972# endif
1939 else 1973 else
1940 scrollBar.setMotion (); 1974 scrollBar.setMotion ();
1941 } 1975 }
1942 else 1976 else
1943 { 1977 {
1944 scr_page ((ev.button == Button1 ? DN : UP), 1978 scr_page ((ev.button == Button1 ? DN : UP),
1945 (TermWin.nrow 1979 (nrow
1946 * scrollbar_position (ev.y) 1980 * scrollbar_position (ev.y)
1947 / scrollbar_size ())); 1981 / scrollbar_size ()));
1948 } 1982 }
1949 1983
1950 break; 1984 break;
… …
1982#ifdef SELECTION_SCROLLING 2016#ifdef SELECTION_SCROLLING
1983 if (sel_scroll_ev.active) 2017 if (sel_scroll_ev.active)
1984 sel_scroll_ev.stop(); 2018 sel_scroll_ev.stop();
1985#endif 2019#endif
1986 2020
1987 if (ev.window == TermWin.vt) 2021 if (ev.window == vt)
1988 { 2022 {
1989#if ISO_14755 2023#if ISO_14755
1990 // 5.4 2024 // 5.4
1991 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2025 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1992 return; 2026 return;
… …
2043 v = ev.button == Button4 ? UP : DN; 2077 v = ev.button == Button4 ? UP : DN;
2044 2078
2045 if (ev.state & ShiftMask) 2079 if (ev.state & ShiftMask)
2046 i = 1; 2080 i = 1;
2047 else if (options & Opt_mouseWheelScrollPage) 2081 else if (options & Opt_mouseWheelScrollPage)
2048 i = TermWin.nrow - 1; 2082 i = nrow - 1;
2049 else 2083 else
2050 i = 5; 2084 i = 5;
2051 2085
2052# ifdef MOUSE_SLIP_WHEELING 2086# ifdef MOUSE_SLIP_WHEELING
2053 if (ev.state & ControlMask) 2087 if (ev.state & ControlMask)
2054 { 2088 {
2055 mouse_slip_wheel_speed += v ? -1 : 1; 2089 mouse_slip_wheel_speed += v ? -1 : 1;
2056 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2090 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2057 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2091 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2058 2092
2059 if (slip_wheel_ev.at < NOW) 2093 if (slip_wheel_ev.at < NOW)
2060 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2094 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2061 2095
2062 slip_wheel_ev.start (); 2096 slip_wheel_ev.start ();
… …
2103 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2137 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2104 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2138 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2105 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2139 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2106 int i; 2140 int i;
2107 2141
2108 Visual* visual = display->visual; 2142 Visual *visual = display->visual;
2109 2143
2110 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2144 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2111 2145
2112 /* for convenience */ 2146 /* for convenience */
2113 mask_r = visual->red_mask; 2147 mask_r = visual->red_mask;
… …
2334 Atom atype; 2368 Atom atype;
2335 unsigned char *prop = NULL; 2369 unsigned char *prop = NULL;
2336 Window root, oldp, *list; 2370 Window root, oldp, *list;
2337 Pixmap rootpixmap = None; 2371 Pixmap rootpixmap = None;
2338 XWindowAttributes wattr, wrootattr; 2372 XWindowAttributes wattr, wrootattr;
2373 dDisp;
2339 2374
2340 pchanged = 0; 2375 pchanged = 0;
2341 2376
2342 if (!(options & Opt_transparent)) 2377 if (!(options & Opt_transparent))
2343 return pchanged; /* Don't try any more */ 2378 return pchanged; /* Don't try any more */
2344 2379
2345 XGetWindowAttributes (display->display, display->root, &wrootattr); 2380 XGetWindowAttributes (disp, display->root, &wrootattr);
2346 rootdepth = wrootattr.depth; 2381 rootdepth = wrootattr.depth;
2347 2382
2348 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2383 XGetWindowAttributes (disp, parent[0], &wattr);
2349 2384
2350 if (rootdepth != wattr.depth) 2385 if (rootdepth != wattr.depth)
2351 { 2386 {
2352 if (am_transparent) 2387 if (am_transparent)
2353 { 2388 {
2354 pchanged = 1; 2389 pchanged = 1;
2355 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2390 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2356 am_transparent = am_pixmap_trans = 0; 2391 am_transparent = am_pixmap_trans = 0;
2357 } 2392 }
2358 2393
2359 return pchanged; /* Don't try any more */ 2394 return pchanged; /* Don't try any more */
2360 } 2395 }
2361 2396
2362 /* Get all X ops out of the queue so that our information is up-to-date. */ 2397 /* Get all X ops out of the queue so that our information is up-to-date. */
2363 XSync (display->display, False); 2398 XSync (disp, False);
2364 2399
2365 /* 2400 /*
2366 * Make the frame window set by the window manager have 2401 * Make the frame window set by the window manager have
2367 * the root background. Some window managers put multiple nested frame 2402 * the root background. Some window managers put multiple nested frame
2368 * windows for each client, so we have to take care about that. 2403 * windows for each client, so we have to take care about that.
2369 */ 2404 */
2370 i = (xa[XA_XROOTPMAP_ID] 2405 i = (xa[XA_XROOTPMAP_ID]
2371 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2406 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2372 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2407 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2373 &nitems, &bytes_after, &prop) == Success); 2408 &nitems, &bytes_after, &prop) == Success);
2374 2409
2375 if (!i || prop == NULL) 2410 if (!i || prop == NULL)
2376 i = (xa[XA_ESETROOT_PMAP_ID] 2411 i = (xa[XA_ESETROOT_PMAP_ID]
2377 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2412 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2378 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2413 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2379 &nitems, &bytes_after, &prop) == Success); 2414 &nitems, &bytes_after, &prop) == Success);
2380 2415
2381 if (!i || prop == NULL 2416 if (!i || prop == NULL
2382#if TINTING 2417#if TINTING
… …
2401 Window cr; 2436 Window cr;
2402 XImage *image; 2437 XImage *image;
2403 GC gc; 2438 GC gc;
2404 XGCValues gcvalue; 2439 XGCValues gcvalue;
2405 2440
2406 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2441 XTranslateCoordinates (disp, parent[0], display->root,
2407 0, 0, &sx, &sy, &cr); 2442 0, 0, &sx, &sy, &cr);
2408 nw = (unsigned int)szHint.width; 2443 nw = (unsigned int)szHint.width;
2409 nh = (unsigned int)szHint.height; 2444 nh = (unsigned int)szHint.height;
2410 nx = ny = 0; 2445 nx = ny = 0;
2411 2446
… …
2421 nh += sy; 2456 nh += sy;
2422 ny = -sy; 2457 ny = -sy;
2423 sy = 0; 2458 sy = 0;
2424 } 2459 }
2425 2460
2426 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2461 min_it (nw, (unsigned int) (wrootattr.width - sx));
2427 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2462 min_it (nh, (unsigned int) (wrootattr.height - sy));
2428 2463
2429 XSync (display->display, False); 2464 XSync (disp, False);
2430 allowedxerror = -1; 2465 allowedxerror = -1;
2431 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2466 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2432 2467
2433 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2468 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2434 /* XXX: may need a delay here? */ 2469 /* XXX: may need a delay here? */
2435 allowedxerror = 0; 2470 allowedxerror = 0;
2436 2471
2437 if (image == NULL) 2472 if (image == NULL)
2438 { 2473 {
2439 if (am_transparent && am_pixmap_trans) 2474 if (am_transparent && am_pixmap_trans)
2440 { 2475 {
2441 pchanged = 1; 2476 pchanged = 1;
2442 if (TermWin.pixmap != None) 2477 if (pixmap != None)
2443 { 2478 {
2444 XFreePixmap (display->display, TermWin.pixmap); 2479 XFreePixmap (disp, pixmap);
2445 TermWin.pixmap = None; 2480 pixmap = None;
2446 } 2481 }
2447 } 2482 }
2448 2483
2449 am_pixmap_trans = 0; 2484 am_pixmap_trans = 0;
2450 } 2485 }
2451 else 2486 else
2452 { 2487 {
2453 if (TermWin.pixmap != None) 2488 if (pixmap != None)
2454 XFreePixmap (display->display, TermWin.pixmap); 2489 XFreePixmap (disp, pixmap);
2455 2490
2456#if TINTING 2491#if TINTING
2457 if (ISSET_PIXCOLOR (Color_tint)) 2492 if (ISSET_PIXCOLOR (Color_tint))
2458 { 2493 {
2459 unsigned short rm, gm, bm; 2494 unsigned short rm, gm, bm;
… …
2463 2498
2464 ShadeXImage (display, image, shade, rm, gm, bm); 2499 ShadeXImage (display, image, shade, rm, gm, bm);
2465 } 2500 }
2466#endif 2501#endif
2467 2502
2468 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2503 pixmap = XCreatePixmap (disp, vt,
2469 szHint.width, szHint.height, image->depth); 2504 szHint.width, szHint.height, image->depth);
2470 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2505 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2471 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2506 XPutImage (disp, pixmap, gc, image, 0, 0,
2472 nx, ny, image->width, image->height); 2507 nx, ny, image->width, image->height);
2473 XFreeGC (display->display, gc); 2508 XFreeGC (disp, gc);
2474 XDestroyImage (image); 2509 XDestroyImage (image);
2475 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2510 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2476 XClearWindow (display->display, TermWin.parent[0]); 2511 XClearWindow (disp, parent[0]);
2477 2512
2478 if (!am_transparent || !am_pixmap_trans) 2513 if (!am_transparent || !am_pixmap_trans)
2479 pchanged = 1; 2514 pchanged = 1;
2480 2515
2481 am_transparent = am_pixmap_trans = 1; 2516 am_transparent = am_pixmap_trans = 1;
2482 } 2517 }
2483 } 2518 }
2484 2519
2485 if (am_pixmap_trans) 2520 if (am_pixmap_trans)
2486 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2521 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2487 else 2522 else
2488 { 2523 {
2489 unsigned int n; 2524 unsigned int n;
2490 /* 2525 /*
2491 * InheritPixmap transparency 2526 * InheritPixmap transparency
2492 */ 2527 */
2493 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2528 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2494 { 2529 {
2495 oldp = TermWin.parent[i]; 2530 oldp = parent[i];
2496 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2531 XQueryTree (disp, parent[i - 1], &root,
2497 &TermWin.parent[i], &list, &n); 2532 &parent[i], &list, &n);
2498 XFree (list); 2533 XFree (list);
2499 2534
2500 if (TermWin.parent[i] == display->root) 2535 if (parent[i] == display->root)
2501 { 2536 {
2502 if (oldp != None) 2537 if (oldp != None)
2503 pchanged = 1; 2538 pchanged = 1;
2504 2539
2505 break; 2540 break;
2506 } 2541 }
2507 2542
2508 if (oldp != TermWin.parent[i]) 2543 if (oldp != parent[i])
2509 pchanged = 1; 2544 pchanged = 1;
2510 } 2545 }
2511 2546
2512 n = 0; 2547 n = 0;
2513 2548
2514 if (pchanged) 2549 if (pchanged)
2515 { 2550 {
2516 for (; n < (unsigned int)i; n++) 2551 for (; n < (unsigned int)i; n++)
2517 { 2552 {
2518 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2553 XGetWindowAttributes (disp, parent[n], &wattr);
2519 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2554 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2520 { 2555 {
2521 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2556 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2522 break; 2557 break;
2523 } 2558 }
2524 } 2559 }
2525 } 2560 }
2526 2561
2527 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2562 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2528 { 2563 {
2529 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2564 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2530 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2565 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2531 am_transparent = 0; 2566 am_transparent = 0;
2532 /* XXX: also turn off Opt_transparent? */ 2567 /* XXX: also turn off Opt_transparent? */
2533 } 2568 }
2534 else 2569 else
2535 { 2570 {
… …
2538 * needed for fvwm2.2.2 (and before?) */ 2573 * needed for fvwm2.2.2 (and before?) */
2539 sleep (1); 2574 sleep (1);
2540#endif 2575#endif
2541 for (n = 0; n < (unsigned int)i; n++) 2576 for (n = 0; n < (unsigned int)i; n++)
2542 { 2577 {
2543 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2578 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2544 XClearWindow (display->display, TermWin.parent[n]); 2579 XClearWindow (disp, parent[n]);
2545 } 2580 }
2546 2581
2547 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2548 am_transparent = 1; 2583 am_transparent = 1;
2549 } 2584 }
2550 2585
2551 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2586 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2552 TermWin.parent[i] = None; 2587 parent[i] = None;
2553 } 2588 }
2554 2589
2555 if (scrollBar.win) 2590 if (scrollBar.win)
2556 { 2591 {
2557 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2592 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2558 scrollBar.setIdle (); 2593 scrollBar.setIdle ();
2559 scrollbar_show (0); 2594 scrollbar_show (0);
2560 } 2595 }
2561 2596
2562 if (am_transparent) 2597 if (am_transparent)
… …
2600 // some window managers resize the window early, and these programs 2635 // some window managers resize the window early, and these programs
2601 // then sometimes get the size wrong. 2636 // then sometimes get the size wrong.
2602 // unfortunately other programs are even more buggy and dislike 2637 // unfortunately other programs are even more buggy and dislike
2603 // being sent SIGWINCH, so only do it when we were in fact being 2638 // being sent SIGWINCH, so only do it when we were in fact being
2604 // resized. 2639 // resized.
2605 if (seen_resize) 2640 if (seen_resize && cmd_pid)
2606 kill (-cmd_pid, SIGWINCH); 2641 kill (-cmd_pid, SIGWINCH);
2607 } 2642 }
2608 2643
2609 /* Read a text string from the input buffer */ 2644 /* Read a text string from the input buffer */
2610 unicode_t buf[UBUFSIZ]; 2645 unicode_t buf[UBUFSIZ];
2611 bool refreshnow = false; 2646 bool refreshnow = false;
2612 int nlines = 0; 2647 int nlines = 0;
2613 unicode_t *str = buf; 2648 unicode_t *str = buf;
2649 unicode_t *eol = str + min (ncol, UBUFSIZ);
2614 2650
2615 for (;;) 2651 for (;;)
2616 { 2652 {
2617 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2653 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2618 break; 2654 break;
2619 2655
2620 *str++ = ch; 2656 *str++ = ch;
2621 2657
2622 if (ch == C0_LF) 2658 if (ch == C0_LF || str >= eol)
2623 { 2659 {
2660 if (ch == C0_LF)
2624 nlines++; 2661 nlines++;
2662
2625 refresh_count++; 2663 refresh_count++;
2626 2664
2627 if (!(options & Opt_jumpScroll) 2665 if (!(options & Opt_jumpScroll)
2628 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2666 || (refresh_count >= refresh_limit * (nrow - 1)))
2629 { 2667 {
2630 refreshnow = true; 2668 refreshnow = true;
2631 ch = NOCHAR; 2669 ch = NOCHAR;
2632 break; 2670 break;
2633 } 2671 }
2634 2672
2635 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2673 // scr_add_lines only works for nlines <= nrow - 1.
2636 if (nlines >= TermWin.nrow - 1) 2674 if (nlines >= nrow - 1)
2637 { 2675 {
2638 scr_add_lines (buf, nlines, str - buf); 2676 scr_add_lines (buf, nlines, str - buf);
2639 nlines = 0; 2677 nlines = 0;
2640 str = buf; 2678 str = buf;
2679 eol = str + min (ncol, UBUFSIZ);
2641 } 2680 }
2642 }
2643 2681
2644 if (str >= buf + UBUFSIZ) 2682 if (str >= eol)
2645 { 2683 {
2684 if (eol >= buf + UBUFSIZ)
2685 {
2646 ch = NOCHAR; 2686 ch = NOCHAR;
2647 break; 2687 break;
2688 }
2689 else
2690 eol = min (eol + ncol, buf + UBUFSIZ);
2691 }
2692
2648 } 2693 }
2649 2694
2650 seq_begin = cmdbuf_ptr; 2695 seq_begin = cmdbuf_ptr;
2651 ch = next_char (); 2696 ch = next_char ();
2652 } 2697 }
… …
3196 { 3241 {
3197 switch (priv) 3242 switch (priv)
3198 { 3243 {
3199 case '>': 3244 case '>':
3200 if (ch == CSI_DA) /* secondary device attributes */ 3245 if (ch == CSI_DA) /* secondary device attributes */
3201 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3246 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3202 break; 3247 break;
3203 case '?': 3248 case '?':
3204 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3249 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3205 process_terminal_mode (ch, priv, nargs, arg); 3250 process_terminal_mode (ch, priv, nargs, arg);
3206 break; 3251 break;
… …
3311 3356
3312 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3357 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3313 arg[0] = -arg[0]; 3358 arg[0] = -arg[0];
3314 /* FALLTHROUGH */ 3359 /* FALLTHROUGH */
3315 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3360 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3316 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3361 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3317 break; 3362 break;
3318 3363
3319 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3364 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3320 tt_write ((const unsigned char *)VT100_ANS, 3365 tt_write ((const unsigned char *)VT100_ANS,
3321 (unsigned int) (sizeof (VT100_ANS) - 1)); 3366 (unsigned int) (sizeof (VT100_ANS) - 1));
… …
3435rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3480rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3436{ 3481{
3437 int x, y; 3482 int x, y;
3438 XWindowAttributes wattr; 3483 XWindowAttributes wattr;
3439 Window wdummy; 3484 Window wdummy;
3485 dDisp;
3440 3486
3441 if (nargs == 0) 3487 if (nargs == 0)
3442 return; 3488 return;
3443 3489
3444 switch (args[0]) 3490 switch (args[0])
3445 { 3491 {
3446 /* 3492 /*
3447 * commands 3493 * commands
3448 */ 3494 */
3449 case 1: /* deiconify window */ 3495 case 1: /* deiconify window */
3450 XMapWindow (display->display, TermWin.parent[0]); 3496 XMapWindow (disp, parent[0]);
3451 break; 3497 break;
3452 case 2: /* iconify window */ 3498 case 2: /* iconify window */
3453 XIconifyWindow (display->display, TermWin.parent[0], 3499 XIconifyWindow (disp, parent[0], display->screen);
3454 DefaultScreen (display->display));
3455 break; 3500 break;
3456 case 3: /* set position (pixels) */ 3501 case 3: /* set position (pixels) */
3457 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3502 XMoveWindow (disp, parent[0], args[1], args[2]);
3458 break; 3503 break;
3459 case 4: /* set size (pixels) */ 3504 case 4: /* set size (pixels) */
3460 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3505 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3461 break; 3506 break;
3462 case 5: /* raise window */ 3507 case 5: /* raise window */
3463 XRaiseWindow (display->display, TermWin.parent[0]); 3508 XRaiseWindow (disp, parent[0]);
3464 break; 3509 break;
3465 case 6: /* lower window */ 3510 case 6: /* lower window */
3466 XLowerWindow (display->display, TermWin.parent[0]); 3511 XLowerWindow (disp, parent[0]);
3467 break; 3512 break;
3468 case 7: /* refresh window */ 3513 case 7: /* refresh window */
3469 scr_touch (true); 3514 scr_touch (true);
3470 break; 3515 break;
3471 case 8: /* set size (chars) */ 3516 case 8: /* set size (chars) */
3472 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3517 set_widthheight ((unsigned int) (args[2] * fwidth),
3473 (unsigned int) (args[1] * TermWin.fheight)); 3518 (unsigned int) (args[1] * fheight));
3474 break; 3519 break;
3475 3520
3476 //case 9: NYI, TODO, restore maximized window or maximize window 3521 //case 9: NYI, TODO, restore maximized window or maximize window
3477 default: 3522 default:
3478 if (args[0] >= 24) /* set height (chars) */ 3523 if (args[0] >= 24) /* set height (chars) */
3479 set_widthheight ((unsigned int)TermWin.width, 3524 set_widthheight ((unsigned int)width,
3480 (unsigned int) (args[1] * TermWin.fheight)); 3525 (unsigned int) (args[1] * fheight));
3481 break; 3526 break;
3482 3527
3483 3528
3484 /* 3529 /*
3485 * reports - some output format copied from XTerm 3530 * reports - some output format copied from XTerm
3486 */ 3531 */
3487 case 11: /* report window state */ 3532 case 11: /* report window state */
3488 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3533 XGetWindowAttributes (disp, parent[0], &wattr);
3489 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3534 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3490 break; 3535 break;
3491 case 13: /* report window position */ 3536 case 13: /* report window position */
3492 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3537 XGetWindowAttributes (disp, parent[0], &wattr);
3493 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3538 XTranslateCoordinates (disp, parent[0], wattr.root,
3494 -wattr.border_width, -wattr.border_width, 3539 -wattr.border_width, -wattr.border_width,
3495 &x, &y, &wdummy); 3540 &x, &y, &wdummy);
3496 tt_printf ("\033[3;%d;%dt", x, y); 3541 tt_printf ("\033[3;%d;%dt", x, y);
3497 break; 3542 break;
3498 case 14: /* report window size (pixels) */ 3543 case 14: /* report window size (pixels) */
3499 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3544 XGetWindowAttributes (disp, parent[0], &wattr);
3500 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3545 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3501 break; 3546 break;
3502 case 18: /* report text area size (chars) */ 3547 case 18: /* report text area size (chars) */
3503 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3548 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3504 break; 3549 break;
3505 case 19: /* report window size (chars) */ 3550 case 19: /* report window size (chars) */
3506 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3551 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3507 break; 3552 break;
3508 case 20: /* report icon label */ 3553 case 20: /* report icon label */
3509 { 3554 {
3510 char *s; 3555 char *s;
3511 XGetIconName (display->display, TermWin.parent[0], &s); 3556 XGetIconName (disp, parent[0], &s);
3512 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3557 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3513 XFree (s); 3558 XFree (s);
3514 } 3559 }
3515 break; 3560 break;
3516 case 21: /* report window title */ 3561 case 21: /* report window title */
3517 { 3562 {
3518 char *s; 3563 char *s;
3519 XFetchName (display->display, TermWin.parent[0], &s); 3564 XFetchName (disp, parent[0], &s);
3520 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3565 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3521 XFree (s); 3566 XFree (s);
3522 } 3567 }
3523 break; 3568 break;
3524 } 3569 }
… …
3557 else if (ch < 0x20) 3602 else if (ch < 0x20)
3558 return NULL; /* other control character - exit */ 3603 return NULL; /* other control character - exit */
3559 3604
3560 seen_esc = false; 3605 seen_esc = false;
3561 3606
3562 if (n >= sizeof (string) - 1) 3607 if (n >= STRING_MAX - 1)
3563 // stop at some sane length 3608 // stop at some sane length
3564 return NULL; 3609 return NULL;
3565 3610
3566 if (ch == C0_SYN) 3611 if (ch == C0_SYN)
3567 string[n++] = cmd_get8 (); 3612 string[n++] = cmd_get8 ();
… …
3635 set_window_color (color, str); 3680 set_window_color (color, str);
3636} 3681}
3637 3682
3638/* 3683/*
3639 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3684 * 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 */ 3685 */
3663void 3686void
3664rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3687rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3665{ 3688{
3666 int changed = 0; 3689 int changed = 0;
3667 int color; 3690 int color;
3668 char *buf, *name; 3691 char *buf, *name;
3669 bool query = str[0] == '?' && !str[1]; 3692 bool query = str[0] == '?' && !str[1];
3670 int saveop = op; 3693 int saveop = op;
3694 dDisp;
3671 3695
3672 assert (str != NULL); 3696 assert (str != NULL);
3673 switch (op) 3697 switch (op)
3674 { 3698 {
3675 case XTerm_name: 3699 case XTerm_name:
… …
3691 unsigned long bytes_after; 3715 unsigned long bytes_after;
3692 unsigned char *value = 0; 3716 unsigned char *value = 0;
3693 const char *str = ""; 3717 const char *str = "";
3694 3718
3695 if (prop 3719 if (prop
3696 && XGetWindowProperty (display->display, TermWin.parent[0], 3720 && XGetWindowProperty (disp, parent[0],
3697 prop, 0, 1<<16, 0, AnyPropertyType, 3721 prop, 0, 1<<16, 0, AnyPropertyType,
3698 &actual_type, &actual_format, 3722 &actual_type, &actual_format,
3699 &nitems, &bytes_after, &value) == Success 3723 &nitems, &bytes_after, &value) == Success
3700 && actual_type != None 3724 && actual_type != None
3701 && actual_format == 8) 3725 && actual_format == 8)
… …
3713 { 3737 {
3714 *eq = 0; 3738 *eq = 0;
3715 set_utf8_property (display->atom (str), eq + 1); 3739 set_utf8_property (display->atom (str), eq + 1);
3716 } 3740 }
3717 else 3741 else
3718 XDeleteProperty (display->display, TermWin.parent[0], 3742 XDeleteProperty (disp, parent[0],
3719 display->atom (str)); 3743 display->atom (str));
3720 } 3744 }
3721 break; 3745 break;
3722 3746
3723 case XTerm_Color: 3747 case XTerm_Color:
… …
3764 break; 3788 break;
3765#ifndef NO_BOLD_UNDERLINE_REVERSE 3789#ifndef NO_BOLD_UNDERLINE_REVERSE
3766 case XTerm_Color_BD: 3790 case XTerm_Color_BD:
3767 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3791 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3768 break; 3792 break;
3769 case XTerm_Color_IT:
3770 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3771 break;
3772 case XTerm_Color_UL: 3793 case XTerm_Color_UL:
3773 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3794 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3774 break; 3795 break;
3775 case XTerm_Color_RV: 3796 case XTerm_Color_RV:
3776 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3797 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3777 break; 3798 break;
3799 case URxvt_Color_IT:
3800 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3801 break;
3778#endif 3802#endif
3779#if TRANSPARENT && TINTING 3803#if TRANSPARENT && TINTING
3780 case XTerm_Color_tint: 3804 case URxvt_Color_tint:
3781 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3805 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3782 check_our_parents (); 3806 check_our_parents ();
3783 if (am_transparent) 3807 if (am_transparent)
3784 want_full_refresh = want_refresh = 1; 3808 want_full_refresh = want_refresh = 1;
3785 break; 3809 break;
3786#endif 3810#endif
… …
3798 { 3822 {
3799 str++; 3823 str++;
3800#if XPM_BACKGROUND 3824#if XPM_BACKGROUND
3801 changed += scale_pixmap (str); 3825 changed += scale_pixmap (str);
3802#endif 3826#endif
3803
3804 } 3827 }
3828
3805 if (changed) 3829 if (changed)
3806 { 3830 {
3807#ifdef XPM_BACKGROUND 3831#ifdef XPM_BACKGROUND
3808 resize_pixmap (); 3832 resize_pixmap ();
3809#endif 3833#endif
… …
3820 3844
3821 case XTerm_logfile: 3845 case XTerm_logfile:
3822 // TODO, when secure mode? 3846 // TODO, when secure mode?
3823 break; 3847 break;
3824 3848
3849#ifdef MENUBAR
3850 case URxvt_Menu:
3851 if (options & Opt_insecure)
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3853 break;
3854#endif
3855#if 0
3856 case XTerm_dumpscreen: /* no error notices */
3857 {
3858 int fd;
3859 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3860 {
3861 scr_dump (fd);
3862 close (fd);
3863 }
3864 }
3865 break;
3866#endif
3825 case XTerm_font: 3867 case XTerm_font:
3826 op = URxvt_font; 3868 op = URxvt_font;
3827 case URxvt_font: 3869 case URxvt_font:
3828#if ENABLE_STYLES 3870#if ENABLE_STYLES
3829 case URxvt_boldFont: 3871 case URxvt_boldFont:
3830 case URxvt_italicFont: 3872 case URxvt_italicFont:
3831 case URxvt_boldItalicFont: 3873 case URxvt_boldItalicFont:
3832#endif 3874#endif
3833 if (query) 3875 if (query)
3834 tt_printf ("\33]%d;%-.250s%c", saveop, 3876 tt_printf ("\33]%d;%-.250s%c", saveop,
3835 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3877 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3836 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3878 ? fontset[op - URxvt_font]->fontdesc : "",
3837 resp); 3879 resp);
3838 else 3880 else
3839 { 3881 {
3840 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3882 const char *&res = rs[Rs_font + (op - URxvt_font)];
3841 3883
… …
3844 set_fonts (); 3886 set_fonts ();
3845 } 3887 }
3846 break; 3888 break;
3847 3889
3848#if ENABLE_FRILLS 3890#if ENABLE_FRILLS
3849 case XTerm_locale: 3891 case URxvt_locale:
3850 if (query) 3892 if (query)
3851 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3893 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3852 else 3894 else
3853 { 3895 {
3854 set_locale (str); 3896 set_locale (str);
3855# ifdef USE_XIM 3897 pty.set_utf8_mode (enc_utf8);
3856 im_cb (); 3898 init_xlocale ();
3857# endif
3858 } 3899 }
3859 break; 3900 break;
3860#endif
3861 3901
3862#ifdef MENUBAR 3902 case URxvt_view_up:
3863 case XTerm_Menu: 3903 case URxvt_view_down:
3864 if (options & Opt_insecure) 3904 int lines = atoi (str);
3865 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3905
3866 break; 3906 if (lines)
3867#endif 3907 scr_page (op == URxvt_view_up ? UP : DN, lines);
3868#if 0
3869 case XTerm_dumpscreen: /* no error notices */
3870 { 3908 else
3871 int fd;
3872 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3873 { 3909 {
3874 scr_dump (fd); 3910 scr_erase_savelines ();
3875 close (fd);
3876 } 3911 }
3877 } 3912
3878 break; 3913 break;
3879#endif 3914#endif
3880 } 3915 }
3881} 3916}
3882/*----------------------------------------------------------------------*/ 3917/*----------------------------------------------------------------------*/
… …
4015 */ 4050 */
4016 PrivMode (1, PrivMode_vt52); 4051 PrivMode (1, PrivMode_vt52);
4017 break; 4052 break;
4018 case 3: /* 80/132 */ 4053 case 3: /* 80/132 */
4019 if (priv_modes & PrivMode_132OK) 4054 if (priv_modes & PrivMode_132OK)
4020 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4055 set_widthheight (((state ? 132 : 80) * fwidth), height);
4021 break; 4056 break;
4022 case 4: /* smooth scrolling */ 4057 case 4: /* smooth scrolling */
4023 if (state) 4058 if (state)
4024 options &= ~Opt_jumpScroll; 4059 options &= ~Opt_jumpScroll;
4025 else 4060 else
… …
4342 } 4377 }
4343 4378
4344 memmove (v_buffer, v_buffer + written, v_buflen); 4379 memmove (v_buffer, v_buffer + written, v_buflen);
4345 } 4380 }
4346 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4381 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4347 // original code just ignores this... 4382 pty_ev.set (EVENT_READ);
4348 destroy ();
4349} 4383}
4350 4384
4351/*----------------------- end-of-file (C source) -----------------------*/ 4385/*----------------------- end-of-file (C source) -----------------------*/
4352 4386

Diff Legend

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