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.178 by root, Wed Dec 15 00:53:23 2004 UTC vs.
Revision 1.209 by root, Tue Dec 20 19:30:59 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 <wchar.h> 53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h"
55#endif
56
54#include <signal.h> 57#include <csignal>
55 58
56/*----------------------------------------------------------------------*/ 59/*----------------------------------------------------------------------*/
57 60
58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59 62
… …
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 (x < 0 || x >= ncol
130 || y < 0 || y >= TermWin.nrow) 141 || y < 0 || y >= 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 = save[y + saveLines - 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--;
… …
152void 164void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 165rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
154{ 166{
155 rxvt_fontset *fs = FONTSET (r); 167 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)]; 168 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2; 169 wchar_t *chr, *alloc, ch2, *fname;
158 int len; 170 int len;
171
172 fname = rxvt_utf8towcs (f->name);
159 173
160#if ENABLE_COMBINING 174#if ENABLE_COMBINING
161 if (IS_COMPOSE (ch)) 175 if (IS_COMPOSE (ch))
162 { 176 {
163 len = rxvt_composite.expand (ch, 0); 177 len = rxvt_composite.expand (ch, 0);
… …
172 alloc = 0; 186 alloc = 0;
173 chr = &ch2; 187 chr = &ch2;
174 len = 1; 188 len = 1;
175 } 189 }
176 190
177 int width = strlen (f->name); 191 int width = wcswidth (fname, wcslen (fname));
178 192
179 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 193 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
180 194
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 195 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182 196
… …
195#endif 209#endif
196 scr_overlay_set (11, y, ch, r); 210 scr_overlay_set (11, y, ch, r);
197 scr_overlay_set (12, y, NOCHAR, r); 211 scr_overlay_set (12, y, NOCHAR, r);
198 } 212 }
199 213
200 scr_overlay_set (0, len, f->name); 214 scr_overlay_set (0, len, fname);
215
216 free (fname);
201 217
202#if ENABLE_COMBINING 218#if ENABLE_COMBINING
203 if (alloc) 219 if (alloc)
204 delete [] alloc; 220 delete [] alloc;
205#endif 221#endif
… …
273 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 289 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
274 * escape sequence to toggle the Keypad. 290 * escape sequence to toggle the Keypad.
275 * 291 *
276 * Always permit `shift' to override the current setting 292 * Always permit `shift' to override the current setting
277 */ 293 */
278 shft = (ev.state & ShiftMask); 294 shft = ev.state & ShiftMask;
279 ctrl = (ev.state & ControlMask); 295 ctrl = ev.state & ControlMask;
280 meta = (ev.state & ModMetaMask); 296 meta = ev.state & ModMetaMask;
281 297
282 if (numlock_state || (ev.state & ModNumLockMask)) 298 if (numlock_state || (ev.state & ModNumLockMask))
283 { 299 {
284 numlock_state = (ev.state & ModNumLockMask); 300 numlock_state = (ev.state & ModNumLockMask);
285 PrivMode ((!numlock_state), PrivMode_aplKP); 301 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
305 321
306 // the XOpenIM manpage lies about hardcoding the locale 322 // the XOpenIM manpage lies about hardcoding the locale
307 // at the point of XOpenIM, so temporarily switch locales 323 // at the point of XOpenIM, so temporarily switch locales
308 if (rs[Rs_imLocale]) 324 if (rs[Rs_imLocale])
309 SET_LOCALE (rs[Rs_imLocale]); 325 SET_LOCALE (rs[Rs_imLocale]);
326
310 // assume wchar_t == unicode or better 327 // assume wchar_t == unicode or better
311 len = XwcLookupString (Input_Context, &ev, wkbuf, 328 len = XwcLookupString (Input_Context, &ev, wkbuf,
312 KBUFSZ, &keysym, &status_return); 329 KBUFSZ, &keysym, &status_return);
330
313 if (rs[Rs_imLocale]) 331 if (rs[Rs_imLocale])
314 SET_LOCALE (locale); 332 SET_LOCALE (locale);
315 333
316 if (status_return == XLookupChars 334 if (status_return == XLookupChars
317 || status_return == XLookupBoth) 335 || status_return == XLookupBoth)
… …
344 valid_keysym = keysym != NoSymbol; 362 valid_keysym = keysym != NoSymbol;
345 } 363 }
346 364
347 if (valid_keysym) 365 if (valid_keysym)
348 { 366 {
367#ifdef KEYSYM_RESOURCE
368 if (keyboard->dispatch (this, keysym, ev.state))
369 return;
370#endif
371
349 if (TermWin.saveLines) 372 if (saveLines)
350 { 373 {
351#ifdef UNSHIFTED_SCROLLKEYS 374#ifdef UNSHIFTED_SCROLLKEYS
352 if (!ctrl && !meta) 375 if (!ctrl && !meta)
353#else 376#else
354 if (IS_SCROLL_MOD) 377 if (IS_SCROLL_MOD)
355#endif 378#endif
356 { 379 {
357 int lnsppg; 380 int lnsppg;
358 381
359#ifdef PAGING_CONTEXT_LINES 382#ifdef PAGING_CONTEXT_LINES
360 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 383 lnsppg = nrow - PAGING_CONTEXT_LINES;
361#else 384#else
362 lnsppg = TermWin.nrow * 4 / 5; 385 lnsppg = nrow * 4 / 5;
363#endif 386#endif
364 if (keysym == XK_Prior) 387 if (keysym == XK_Prior)
365 { 388 {
366 scr_page (UP, lnsppg); 389 scr_page (UP, lnsppg);
367 return; 390 return;
… …
487 } 510 }
488#endif 511#endif
489 512
490 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 513 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491 { 514 {
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 { 515 {
518 newlen = 1; 516 newlen = 1;
519 switch (keysym) 517 switch (keysym)
520 { 518 {
521#ifndef NO_BACKSPACE_KEY 519#ifndef NO_BACKSPACE_KEY
… …
529 else 527 else
530 strcpy (kbuf, key_backspace); 528 strcpy (kbuf, key_backspace);
531 break; 529 break;
532#endif 530#endif
533#ifndef NO_DELETE_KEY 531#ifndef NO_DELETE_KEY
532# ifdef XK_KP_Prior
533 case XK_KP_Delete:
534 /* allow shift to override */
535 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
536 {
537 strcpy (kbuf, "\033On");
538 break;
539 }
540 /* FALLTHROUGH */
541# endif
534 case XK_Delete: 542 case XK_Delete:
535 strcpy (kbuf, key_delete); 543 strcpy (kbuf, key_delete);
536 break; 544 break;
537#endif 545#endif
538 case XK_Tab: 546 case XK_Tab:
… …
641#ifdef XK_KP_Begin 649#ifdef XK_KP_Begin
642 case XK_KP_Begin: 650 case XK_KP_Begin:
643 strcpy (kbuf, "\033Ou"); 651 strcpy (kbuf, "\033Ou");
644 break; 652 break;
645 653
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 654#endif
654 case XK_KP_F1: /* "\033OP" */ 655 case XK_KP_F1: /* "\033OP" */
655 case XK_KP_F2: /* "\033OQ" */ 656 case XK_KP_F2: /* "\033OQ" */
656 case XK_KP_F3: /* "\033OR" */ 657 case XK_KP_F3: /* "\033OR" */
657 case XK_KP_F4: /* "\033OS" */ 658 case XK_KP_F4: /* "\033OS" */
… …
689 break; 690 break;
690 691
691 case XK_Find: 692 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 693 strcpy (kbuf, "\033[1~");
693 break; 694 break;
695
696#ifdef XK_KP_End
697 case XK_KP_Insert:
698 /* allow shift to override */
699 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
700 {
701 strcpy (kbuf, "\033Op");
702 break;
703 }
704 /* FALLTHROUGH */
705#endif
694 case XK_Insert: 706 case XK_Insert:
695 strcpy (kbuf, "\033[2~"); 707 strcpy (kbuf, "\033[2~");
696 break; 708 break;
697#ifdef DXK_Remove /* support for DEC remove like key */ 709#ifdef DXK_Remove /* support for DEC remove like key */
698 case DXK_Remove: 710 case DXK_Remove:
… …
788#undef FKEY 800#undef FKEY
789 default: 801 default:
790 newlen = 0; 802 newlen = 0;
791 break; 803 break;
792 } 804 }
805
793 if (newlen) 806 if (newlen)
794 len = strlen (kbuf); 807 len = strlen (kbuf);
795 } 808 }
796 809
797 /* 810 /*
… …
806 else if (ctrl && keysym == XK_minus) 819 else if (ctrl && keysym == XK_minus)
807 { 820 {
808 len = 1; 821 len = 1;
809 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 822 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
810 } 823 }
824 else if (keysym == XK_ISO_Left_Tab)
825 {
826 strcpy (kbuf, "\033[Z");
827 len = 3;
828 }
811 else 829 else
812 { 830 {
813#ifdef META8_OPTION 831#ifdef META8_OPTION
814 /* set 8-bit on */ 832 /* set 8-bit on */
815 if (meta && (meta_char == 0x80)) 833 if (meta && (meta_char == 0x80))
… …
828 846
829 if (len <= 0) 847 if (len <= 0)
830 return; /* not mapped */ 848 return; /* not mapped */
831 849
832 if (options & Opt_scrollTtyKeypress) 850 if (options & Opt_scrollTtyKeypress)
833 if (TermWin.view_start) 851 if (view_start)
834 { 852 {
835 TermWin.view_start = 0; 853 view_start = 0;
836 want_refresh = 1; 854 want_refresh = 1;
837 } 855 }
838 856
839 /* 857 /*
840 * these modifications only affect the static keybuffer 858 * these modifications only affect the static keybuffer
… …
873#endif /* DEBUG_CMD */ 891#endif /* DEBUG_CMD */
874 tt_write (kbuf, (unsigned int)len); 892 tt_write (kbuf, (unsigned int)len);
875} 893}
876/*}}} */ 894/*}}} */
877 895
878#if (MENUBAR_MAX) 896#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
879/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 897/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
880/* attempt to `write' count to the input buffer */ 898/* attempt to `write' count to the input buffer */
881unsigned int 899unsigned int
882rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 900rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
883{ 901{
… …
906 924
907 cmd_parse (); 925 cmd_parse ();
908 926
909 return 0; 927 return 0;
910} 928}
911#endif /* MENUBAR_MAX */ 929#endif
912 930
913void 931void
914rxvt_term::flush () 932rxvt_term::flush ()
915{ 933{
916 flush_ev.stop (); 934 flush_ev.stop ();
… …
1017{ 1035{
1018 if (mouse_slip_wheel_speed == 0 1036 if (mouse_slip_wheel_speed == 0
1019 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1037 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1020 : scr_page (UP, mouse_slip_wheel_speed)) 1038 : scr_page (UP, mouse_slip_wheel_speed))
1021 { 1039 {
1040 if (view_start == nsaved ||
1041 view_start == 0)
1042 mouse_slip_wheel_speed = 0;
1043
1022 refresh_type |= SMOOTH_REFRESH; 1044 refresh_type |= SMOOTH_REFRESH;
1023 want_refresh = 1; 1045 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1046 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 } 1047 }
1026} 1048}
… …
1071} 1093}
1072 1094
1073void 1095void
1074rxvt_term::pointer_unblank () 1096rxvt_term::pointer_unblank ()
1075{ 1097{
1076 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1098 XDefineCursor (display->display, vt, TermWin_cursor);
1077 recolour_cursor (); 1099 recolour_cursor ();
1078 1100
1079#ifdef POINTER_BLANK 1101#ifdef POINTER_BLANK
1080 hidden_pointer = 0; 1102 hidden_pointer = 0;
1081 1103
… …
1089rxvt_term::pointer_blank () 1111rxvt_term::pointer_blank ()
1090{ 1112{
1091 if (! (options & Opt_pointerBlank)) 1113 if (! (options & Opt_pointerBlank))
1092 return; 1114 return;
1093 1115
1094 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1116 XDefineCursor (display->display, vt, display->blank_cursor);
1095 XFlush (display->display); 1117 XFlush (display->display);
1096 1118
1097 hidden_pointer = 1; 1119 hidden_pointer = 1;
1098} 1120}
1099 1121
… …
1188 1210
1189/*{{{ process an X event */ 1211/*{{{ process an X event */
1190void 1212void
1191rxvt_term::x_cb (XEvent &ev) 1213rxvt_term::x_cb (XEvent &ev)
1192{ 1214{
1215 dDisp;
1216
1193 SET_R (this); 1217 SET_R (this);
1194 SET_LOCALE (locale); 1218 SET_LOCALE (locale);
1195 1219
1196#if defined(CURSOR_BLINK) 1220#if defined(CURSOR_BLINK)
1197 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1221 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
… …
1313 button_release (ev.xbutton); 1337 button_release (ev.xbutton);
1314 break; 1338 break;
1315 1339
1316 case ClientMessage: 1340 case ClientMessage:
1317 if (ev.xclient.format == 32 1341 if (ev.xclient.format == 32
1342 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1343 {
1318 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1344 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1319 destroy (); 1345 destroy ();
1346#if ENABLE_EWMH
1347 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1348 XSendEvent (disp, ev.xclient.window = display->root,
1349 False, SubstructureRedirectMask | SubstructureNotifyMask,
1350 &ev);
1351#endif
1352 }
1353#if ENABLE_XEMBED
1354 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1355 {
1356 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1357 focus_in ();
1358 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1359 focus_out ();
1360 }
1361#endif
1320#ifdef OFFIX_DND 1362#ifdef OFFIX_DND
1321 /* OffiX Dnd (drag 'n' drop) protocol */ 1363 /* OffiX Dnd (drag 'n' drop) protocol */
1322 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1364 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1323 && (ev.xclient.data.l[0] == DndFile 1365 && (ev.xclient.data.l[0] == DndFile
1324 || ev.xclient.data.l[0] == DndDir 1366 || ev.xclient.data.l[0] == DndDir
1325 || ev.xclient.data.l[0] == DndLink)) 1367 || ev.xclient.data.l[0] == DndLink))
1326 { 1368 {
1327 /* Get Dnd data */ 1369 /* Get Dnd data */
1328 Atom ActualType; 1370 Atom ActualType;
1329 int ActualFormat; 1371 int ActualFormat;
1330 unsigned char *data; 1372 unsigned char *data;
1331 unsigned long Size, RemainingBytes; 1373 unsigned long Size, RemainingBytes;
1332 1374
1333 XGetWindowProperty (display->display, display->root, 1375 XGetWindowProperty (disp, display->root,
1334 xa[XA_DNDSELECTION], 1376 xa[XA_DNDSELECTION],
1335 0L, 1000000L, 1377 0L, 1000000L,
1336 False, AnyPropertyType, 1378 False, AnyPropertyType,
1337 &ActualType, &ActualFormat, 1379 &ActualType, &ActualFormat,
1338 &Size, &RemainingBytes, 1380 &Size, &RemainingBytes,
1339 &data); 1381 &data);
1340 set_string_property (XA_CUT_BUFFER0, data); 1382 set_string_property (XA_CUT_BUFFER0, data);
1341 XFree (data); 1383 XFree (data);
1342 selection_paste (display->root, XA_CUT_BUFFER0, true); 1384 selection_paste (display->root, XA_CUT_BUFFER0, true);
1343 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1385 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1344 } 1386 }
1345#endif /* OFFIX_DND */ 1387#endif /* OFFIX_DND */
1346 break; 1388 break;
1347 1389
1348 case MappingNotify: 1390 case MappingNotify:
… …
1373 break; 1415 break;
1374 } 1416 }
1375 break; 1417 break;
1376 1418
1377 case FocusIn: 1419 case FocusIn:
1378 if (!TermWin.focus) 1420 focus_in ();
1421 break;
1422
1423 case FocusOut:
1424 focus_out ();
1425 break;
1426
1427 case ConfigureNotify:
1428 if (ev.xconfigure.window == parent[0])
1379 { 1429 {
1380 TermWin.focus = 1;
1381 want_refresh = 1;
1382#ifdef USE_XIM
1383 if (Input_Context != NULL)
1384 {
1385 IMSetStatusPosition ();
1386 XSetICFocus (Input_Context);
1387 }
1388#endif
1389#ifdef CURSOR_BLINK
1390 if (options & Opt_cursorBlink)
1391 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1392#endif
1393#ifdef OFF_FOCUS_FADING
1394 if (rs[Rs_fade])
1395 {
1396 pix_colors = pix_colors_focused;
1397 scr_recolour ();
1398 }
1399#endif
1400
1401 }
1402 break;
1403
1404 case FocusOut:
1405 if (TermWin.focus)
1406 {
1407 TermWin.focus = 0;
1408 want_refresh = 1;
1409
1410#if ENABLE_FRILLS || ISO_14755
1411 iso14755buf = 0;
1412#endif
1413#if ENABLE_OVERLAY
1414 scr_overlay_off ();
1415#endif
1416#ifdef USE_XIM
1417 if (Input_Context != NULL)
1418 XUnsetICFocus (Input_Context);
1419#endif
1420#ifdef CURSOR_BLINK
1421 if (options & Opt_cursorBlink)
1422 cursor_blink_ev.stop ();
1423 hidden_cursor = 0;
1424#endif
1425#ifdef OFF_FOCUS_FADING
1426 if (rs[Rs_fade])
1427 {
1428 pix_colors = pix_colors_unfocused;
1429 scr_recolour ();
1430 }
1431#endif
1432 }
1433 break;
1434
1435 case ConfigureNotify:
1436 if (ev.xconfigure.window == TermWin.parent[0])
1437 {
1438 int height, width;
1439
1440 do
1441 { /* Wrap lots of configures into one */
1442 width = ev.xconfigure.width;
1443 height = ev.xconfigure.height;
1444 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1445 }
1446 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1430 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ;
1447 1432
1448 if (szHint.width != width || szHint.height != height) 1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1449 { 1434 {
1450 seen_resize = 1; 1435 seen_resize = 1;
1451 resize_all_windows (width, height, 1); 1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1452 } 1437 }
1453 1438
1454#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1455 if (options & Opt_transparent) 1440 if (options & Opt_transparent)
1456 check_our_parents (); 1441 check_our_parents ();
… …
1477 case SelectionRequest: 1462 case SelectionRequest:
1478 selection_send (ev.xselectionrequest); 1463 selection_send (ev.xselectionrequest);
1479 break; 1464 break;
1480 1465
1481 case UnmapNotify: 1466 case UnmapNotify:
1482 TermWin.mapped = 0; 1467 mapped = 0;
1483#ifdef TEXT_BLINK 1468#ifdef TEXT_BLINK
1484 text_blink_ev.stop (); 1469 text_blink_ev.stop ();
1485#endif 1470#endif
1486 break; 1471 break;
1487 1472
1488 case MapNotify: 1473 case MapNotify:
1489 TermWin.mapped = 1; 1474 mapped = 1;
1490#ifdef TEXT_BLINK 1475#ifdef TEXT_BLINK
1491 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1476 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1492#endif 1477#endif
1493 break; 1478 break;
1494 1479
… …
1498 break; 1483 break;
1499#endif /* TRANSPARENT */ 1484#endif /* TRANSPARENT */
1500 1485
1501 case GraphicsExpose: 1486 case GraphicsExpose:
1502 case Expose: 1487 case Expose:
1503 if (ev.xany.window == TermWin.vt) 1488 if (ev.xany.window == vt)
1504 { 1489 {
1505 do 1490 do
1506 scr_expose (ev.xexpose.x, ev.xexpose.y, 1491 scr_expose (ev.xexpose.x, ev.xexpose.y,
1507 ev.xexpose.width, ev.xexpose.height, False); 1492 ev.xexpose.width, ev.xexpose.height, False);
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1493 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1509 1494
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511 1496
1512 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1513 scr_expose (ev.xexpose.x, ev.xexpose.y, 1498 scr_expose (ev.xexpose.x, ev.xexpose.y,
1514 ev.xexpose.width, ev.xexpose.height, False); 1499 ev.xexpose.width, ev.xexpose.height, False);
1515 1500
1516 scr_refresh (refresh_type); 1501 scr_refresh (refresh_type);
1517 } 1502 }
1518 else 1503 else
1519 { 1504 {
1520 XEvent unused_event; 1505 XEvent unused_event;
1521 1506
1522 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1507 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1523 ; 1508 ;
1524 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1509 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1525 ; 1510 ;
1526 1511
1527 if (isScrollbarWindow (ev.xany.window)) 1512 if (isScrollbarWindow (ev.xany.window))
1528 { 1513 {
1529 scrollBar.setIdle (); 1514 scrollBar.setIdle ();
… …
1533 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1518 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1534 menubar_expose (); 1519 menubar_expose ();
1535#endif 1520#endif
1536 1521
1537#ifdef TRANSPARENT 1522#ifdef TRANSPARENT
1538 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1523 if (am_transparent && ev.xany.window == parent[0])
1539 XClearWindow (display->display, ev.xany.window); 1524 XClearWindow (disp, ev.xany.window);
1540#endif 1525#endif
1541 } 1526 }
1542 break; 1527 break;
1543 1528
1544 case MotionNotify: 1529 case MotionNotify:
… …
1554 } 1539 }
1555#endif 1540#endif
1556 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1557 break; 1542 break;
1558 1543
1559 if (ev.xany.window == TermWin.vt) 1544 if (ev.xany.window == vt)
1560 { 1545 {
1561 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1546 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1562 { 1547 {
1563 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1548 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1564 ; 1549 ;
1565 1550
1566 XQueryPointer (display->display, TermWin.vt, 1551 XQueryPointer (disp, vt,
1567 &unused_root, &unused_child, 1552 &unused_root, &unused_child,
1568 &unused_root_x, &unused_root_y, 1553 &unused_root_x, &unused_root_y,
1569 &ev.xbutton.x, &ev.xbutton.y, 1554 &ev.xbutton.x, &ev.xbutton.y,
1570 &ev.xbutton.state); 1555 &ev.xbutton.state);
1571#ifdef MOUSE_THRESHOLD 1556#ifdef MOUSE_THRESHOLD
… …
1583#endif 1568#endif
1584 selection_extend (ev.xbutton.x, ev.xbutton.y, 1569 selection_extend (ev.xbutton.x, ev.xbutton.y,
1585 ev.xbutton.state & Button3Mask ? 2 : 0); 1570 ev.xbutton.state & Button3Mask ? 2 : 0);
1586 1571
1587#ifdef SELECTION_SCROLLING 1572#ifdef SELECTION_SCROLLING
1588 if (ev.xbutton.y < TermWin.int_bwidth 1573 if (ev.xbutton.y < int_bwidth
1589 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1574 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1590 { 1575 {
1591 int dist; 1576 int dist;
1592 1577
1593 /* don't clobber the current delay if we are 1578 /* don't clobber the current delay if we are
1594 * already in the middle of scrolling. 1579 * already in the middle of scrolling.
… …
1602 selection_save_x = ev.xbutton.x; 1587 selection_save_x = ev.xbutton.x;
1603 selection_save_y = ev.xbutton.y; 1588 selection_save_y = ev.xbutton.y;
1604 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1605 1590
1606 /* calc number of lines to scroll */ 1591 /* calc number of lines to scroll */
1607 if (ev.xbutton.y < TermWin.int_bwidth) 1592 if (ev.xbutton.y < int_bwidth)
1608 { 1593 {
1609 scroll_selection_dir = UP; 1594 scroll_selection_dir = UP;
1610 dist = TermWin.int_bwidth - ev.xbutton.y; 1595 dist = int_bwidth - ev.xbutton.y;
1611 } 1596 }
1612 else 1597 else
1613 { 1598 {
1614 scroll_selection_dir = DN; 1599 scroll_selection_dir = DN;
1615 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1600 dist = ev.xbutton.y - (int_bwidth + height);
1616 } 1601 }
1617 1602
1618 scroll_selection_lines = Pixel2Height (dist) 1603 scroll_selection_lines = Pixel2Height (dist)
1619 / SELECTION_SCROLL_LINE_SPEEDUP 1604 / SELECTION_SCROLL_LINE_SPEEDUP
1620 + 1; 1605 + 1;
… …
1635#endif 1620#endif
1636 } 1621 }
1637 } 1622 }
1638 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1639 { 1624 {
1640 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1625 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1641 MotionNotify, &ev)) 1626 MotionNotify, &ev))
1642 ; 1627 ;
1643 1628
1644 XQueryPointer (display->display, scrollBar.win, 1629 XQueryPointer (disp, scrollBar.win,
1645 &unused_root, &unused_child, 1630 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1631 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1632 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1633 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1654 } 1639 }
1655 break; 1640 break;
1656 } 1641 }
1657} 1642}
1658 1643
1644void
1645rxvt_term::focus_in ()
1646{
1647 if (!focus)
1648 {
1649 focus = 1;
1650 want_refresh = 1;
1651#if USE_XIM
1652 if (Input_Context != NULL)
1653 {
1654 IMSetStatusPosition ();
1655 XSetICFocus (Input_Context);
1656 }
1657#endif
1658#if CURSOR_BLINK
1659 if (options & Opt_cursorBlink)
1660 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1661#endif
1662#if OFF_FOCUS_FADING
1663 if (rs[Rs_fade])
1664 {
1665 pix_colors = pix_colors_focused;
1666 scr_recolour ();
1667 }
1668#endif
1669 }
1670}
1671
1672void
1673rxvt_term::focus_out ()
1674{
1675 if (focus)
1676 {
1677 focus = 0;
1678 want_refresh = 1;
1679
1680#if ENABLE_FRILLS || ISO_14755
1681 iso14755buf = 0;
1682#endif
1683#if ENABLE_OVERLAY
1684 scr_overlay_off ();
1685#endif
1686#if USE_XIM
1687 if (Input_Context != NULL)
1688 XUnsetICFocus (Input_Context);
1689#endif
1690#if CURSOR_BLINK
1691 if (options & Opt_cursorBlink)
1692 cursor_blink_ev.stop ();
1693 hidden_cursor = 0;
1694#endif
1695#if OFF_FOCUS_FADING
1696 if (rs[Rs_fade])
1697 {
1698 pix_colors = pix_colors_unfocused;
1699 scr_recolour ();
1700 }
1701#endif
1702 }
1703}
1704
1659#if TRANSPARENT 1705#if TRANSPARENT
1660void 1706void
1661rxvt_term::rootwin_cb (XEvent &ev) 1707rxvt_term::rootwin_cb (XEvent &ev)
1662{ 1708{
1663 SET_R (this); 1709 SET_R (this);
… …
1668 case PropertyNotify: 1714 case PropertyNotify:
1669 /* 1715 /*
1670 * if user used some Esetroot compatible prog to set the root bg, 1716 * if user used some Esetroot compatible prog to set the root bg,
1671 * use the property to determine the pixmap. We use it later on. 1717 * use the property to determine the pixmap. We use it later on.
1672 */ 1718 */
1673 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1719 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1674 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1720 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1675 return; 1721 return;
1676 1722
1677 /* FALLTHROUGH */ 1723 /* FALLTHROUGH */
1678 case ReparentNotify: 1724 case ReparentNotify:
1679 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1725 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
… …
1693 reportmode = !! (priv_modes & PrivMode_mouse_report); 1739 reportmode = !! (priv_modes & PrivMode_mouse_report);
1694 1740
1695 /* 1741 /*
1696 * VT window processing of button press 1742 * VT window processing of button press
1697 */ 1743 */
1698 if (ev.window == TermWin.vt) 1744 if (ev.window == vt)
1699 { 1745 {
1700#if ISO_14755 1746#if ISO_14755
1701 // 5.4 1747 // 5.4
1702 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1703 { 1749 {
… …
1751 { 1797 {
1752 case Button1: 1798 case Button1:
1753 /* allow meta + click to select rectangular areas */ 1799 /* allow meta + click to select rectangular areas */
1754 /* should be done in screen.C */ 1800 /* should be done in screen.C */
1755#if ENABLE_FRILLS 1801#if ENABLE_FRILLS
1756 selection.rect = !! (ev.state & ModMetaMask); 1802 selection.rect = !!(ev.state & ModMetaMask);
1757#else 1803#else
1758 selection.rect = false; 1804 selection.rect = false;
1759#endif 1805#endif
1760 1806
1761 /* allow shift+left click to extend selection */ 1807 /* allow shift+left click to extend selection */
… …
1908 case Button3: 1954 case Button3:
1909 if (scrollBar.style != R_SB_XTERM) 1955 if (scrollBar.style != R_SB_XTERM)
1910 { 1956 {
1911 if (scrollbar_above_slider (ev.y)) 1957 if (scrollbar_above_slider (ev.y))
1912# ifdef RXVT_SCROLL_FULL 1958# ifdef RXVT_SCROLL_FULL
1913 scr_page (UP, TermWin.nrow - 1); 1959 scr_page (UP, nrow - 1);
1914# else 1960# else
1915 scr_page (UP, TermWin.nrow / 4); 1961 scr_page (UP, nrow / 4);
1916# endif 1962# endif
1917 else if (scrollbar_below_slider (ev.y)) 1963 else if (scrollbar_below_slider (ev.y))
1918# ifdef RXVT_SCROLL_FULL 1964# ifdef RXVT_SCROLL_FULL
1919 scr_page (DN, TermWin.nrow - 1); 1965 scr_page (DN, nrow - 1);
1920# else 1966# else
1921 scr_page (DN, TermWin.nrow / 4); 1967 scr_page (DN, nrow / 4);
1922# endif 1968# endif
1923 else 1969 else
1924 scrollBar.setMotion (); 1970 scrollBar.setMotion ();
1925 } 1971 }
1926 else 1972 else
1927 { 1973 {
1928 scr_page ((ev.button == Button1 ? DN : UP), 1974 scr_page ((ev.button == Button1 ? DN : UP),
1929 (TermWin.nrow 1975 (nrow
1930 * scrollbar_position (ev.y) 1976 * scrollbar_position (ev.y)
1931 / scrollbar_size ())); 1977 / scrollbar_size ()));
1932 } 1978 }
1933 1979
1934 break; 1980 break;
… …
1966#ifdef SELECTION_SCROLLING 2012#ifdef SELECTION_SCROLLING
1967 if (sel_scroll_ev.active) 2013 if (sel_scroll_ev.active)
1968 sel_scroll_ev.stop(); 2014 sel_scroll_ev.stop();
1969#endif 2015#endif
1970 2016
1971 if (ev.window == TermWin.vt) 2017 if (ev.window == vt)
1972 { 2018 {
1973#if ISO_14755 2019#if ISO_14755
1974 // 5.4 2020 // 5.4
1975 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1976 return; 2022 return;
… …
2027 v = ev.button == Button4 ? UP : DN; 2073 v = ev.button == Button4 ? UP : DN;
2028 2074
2029 if (ev.state & ShiftMask) 2075 if (ev.state & ShiftMask)
2030 i = 1; 2076 i = 1;
2031 else if (options & Opt_mouseWheelScrollPage) 2077 else if (options & Opt_mouseWheelScrollPage)
2032 i = TermWin.nrow - 1; 2078 i = nrow - 1;
2033 else 2079 else
2034 i = 5; 2080 i = 5;
2035 2081
2036# ifdef MOUSE_SLIP_WHEELING 2082# ifdef MOUSE_SLIP_WHEELING
2037 if (ev.state & ControlMask) 2083 if (ev.state & ControlMask)
2038 { 2084 {
2039 mouse_slip_wheel_speed += v ? -1 : 1; 2085 mouse_slip_wheel_speed += v ? -1 : 1;
2040 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2086 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2041 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2087 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2042 2088
2043 if (slip_wheel_ev.at < NOW) 2089 if (slip_wheel_ev.at < NOW)
2044 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2090 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2045 2091
2046 slip_wheel_ev.start (); 2092 slip_wheel_ev.start ();
… …
2087 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2133 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2088 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2134 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2089 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2135 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2090 int i; 2136 int i;
2091 2137
2092 Visual* visual = display->visual; 2138 Visual *visual = display->visual;
2093 2139
2094 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2140 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2095 2141
2096 /* for convenience */ 2142 /* for convenience */
2097 mask_r = visual->red_mask; 2143 mask_r = visual->red_mask;
… …
2318 Atom atype; 2364 Atom atype;
2319 unsigned char *prop = NULL; 2365 unsigned char *prop = NULL;
2320 Window root, oldp, *list; 2366 Window root, oldp, *list;
2321 Pixmap rootpixmap = None; 2367 Pixmap rootpixmap = None;
2322 XWindowAttributes wattr, wrootattr; 2368 XWindowAttributes wattr, wrootattr;
2369 dDisp;
2323 2370
2324 pchanged = 0; 2371 pchanged = 0;
2325 2372
2326 if (!(options & Opt_transparent)) 2373 if (!(options & Opt_transparent))
2327 return pchanged; /* Don't try any more */ 2374 return pchanged; /* Don't try any more */
2328 2375
2329 XGetWindowAttributes (display->display, display->root, &wrootattr); 2376 XGetWindowAttributes (disp, display->root, &wrootattr);
2330 rootdepth = wrootattr.depth; 2377 rootdepth = wrootattr.depth;
2331 2378
2332 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2379 XGetWindowAttributes (disp, parent[0], &wattr);
2333 2380
2334 if (rootdepth != wattr.depth) 2381 if (rootdepth != wattr.depth)
2335 { 2382 {
2336 if (am_transparent) 2383 if (am_transparent)
2337 { 2384 {
2338 pchanged = 1; 2385 pchanged = 1;
2339 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2386 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2340 am_transparent = am_pixmap_trans = 0; 2387 am_transparent = am_pixmap_trans = 0;
2341 } 2388 }
2342 2389
2343 return pchanged; /* Don't try any more */ 2390 return pchanged; /* Don't try any more */
2344 } 2391 }
2345 2392
2346 /* Get all X ops out of the queue so that our information is up-to-date. */ 2393 /* Get all X ops out of the queue so that our information is up-to-date. */
2347 XSync (display->display, False); 2394 XSync (disp, False);
2348 2395
2349 /* 2396 /*
2350 * Make the frame window set by the window manager have 2397 * Make the frame window set by the window manager have
2351 * the root background. Some window managers put multiple nested frame 2398 * the root background. Some window managers put multiple nested frame
2352 * windows for each client, so we have to take care about that. 2399 * windows for each client, so we have to take care about that.
2353 */ 2400 */
2354 i = (xa[XA_XROOTPMAP_ID] 2401 i = (xa[XA_XROOTPMAP_ID]
2355 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2402 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2403 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357 &nitems, &bytes_after, &prop) == Success); 2404 &nitems, &bytes_after, &prop) == Success);
2358 2405
2359 if (!i || prop == NULL) 2406 if (!i || prop == NULL)
2360 i = (xa[XA_ESETROOT_PMAP_ID] 2407 i = (xa[XA_ESETROOT_PMAP_ID]
2361 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2408 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2362 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2409 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2363 &nitems, &bytes_after, &prop) == Success); 2410 &nitems, &bytes_after, &prop) == Success);
2364 2411
2365 if (!i || prop == NULL 2412 if (!i || prop == NULL
2366#if TINTING 2413#if TINTING
… …
2385 Window cr; 2432 Window cr;
2386 XImage *image; 2433 XImage *image;
2387 GC gc; 2434 GC gc;
2388 XGCValues gcvalue; 2435 XGCValues gcvalue;
2389 2436
2390 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2437 XTranslateCoordinates (disp, parent[0], display->root,
2391 0, 0, &sx, &sy, &cr); 2438 0, 0, &sx, &sy, &cr);
2392 nw = (unsigned int)szHint.width; 2439 nw = (unsigned int)szHint.width;
2393 nh = (unsigned int)szHint.height; 2440 nh = (unsigned int)szHint.height;
2394 nx = ny = 0; 2441 nx = ny = 0;
2395 2442
… …
2408 } 2455 }
2409 2456
2410 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2411 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2412 2459
2413 XSync (display->display, False); 2460 XSync (disp, False);
2414 allowedxerror = -1; 2461 allowedxerror = -1;
2415 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2416 2463
2417 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2464 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2418 /* XXX: may need a delay here? */ 2465 /* XXX: may need a delay here? */
2419 allowedxerror = 0; 2466 allowedxerror = 0;
2420 2467
2421 if (image == NULL) 2468 if (image == NULL)
2422 { 2469 {
2423 if (am_transparent && am_pixmap_trans) 2470 if (am_transparent && am_pixmap_trans)
2424 { 2471 {
2425 pchanged = 1; 2472 pchanged = 1;
2426 if (TermWin.pixmap != None) 2473 if (pixmap != None)
2427 { 2474 {
2428 XFreePixmap (display->display, TermWin.pixmap); 2475 XFreePixmap (disp, pixmap);
2429 TermWin.pixmap = None; 2476 pixmap = None;
2430 } 2477 }
2431 } 2478 }
2432 2479
2433 am_pixmap_trans = 0; 2480 am_pixmap_trans = 0;
2434 } 2481 }
2435 else 2482 else
2436 { 2483 {
2437 if (TermWin.pixmap != None) 2484 if (pixmap != None)
2438 XFreePixmap (display->display, TermWin.pixmap); 2485 XFreePixmap (disp, pixmap);
2439 2486
2440#if TINTING 2487#if TINTING
2441 if (ISSET_PIXCOLOR (Color_tint)) 2488 if (ISSET_PIXCOLOR (Color_tint))
2442 { 2489 {
2443 unsigned short rm, gm, bm; 2490 unsigned short rm, gm, bm;
… …
2447 2494
2448 ShadeXImage (display, image, shade, rm, gm, bm); 2495 ShadeXImage (display, image, shade, rm, gm, bm);
2449 } 2496 }
2450#endif 2497#endif
2451 2498
2452 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2499 pixmap = XCreatePixmap (disp, vt,
2453 szHint.width, szHint.height, image->depth); 2500 szHint.width, szHint.height, image->depth);
2454 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2501 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2455 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2502 XPutImage (disp, pixmap, gc, image, 0, 0,
2456 nx, ny, image->width, image->height); 2503 nx, ny, image->width, image->height);
2457 XFreeGC (display->display, gc); 2504 XFreeGC (disp, gc);
2458 XDestroyImage (image); 2505 XDestroyImage (image);
2459 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2506 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2460 XClearWindow (display->display, TermWin.parent[0]); 2507 XClearWindow (disp, parent[0]);
2461 2508
2462 if (!am_transparent || !am_pixmap_trans) 2509 if (!am_transparent || !am_pixmap_trans)
2463 pchanged = 1; 2510 pchanged = 1;
2464 2511
2465 am_transparent = am_pixmap_trans = 1; 2512 am_transparent = am_pixmap_trans = 1;
2466 } 2513 }
2467 } 2514 }
2468 2515
2469 if (am_pixmap_trans) 2516 if (am_pixmap_trans)
2470 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2517 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2471 else 2518 else
2472 { 2519 {
2473 unsigned int n; 2520 unsigned int n;
2474 /* 2521 /*
2475 * InheritPixmap transparency 2522 * InheritPixmap transparency
2476 */ 2523 */
2477 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2524 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2478 { 2525 {
2479 oldp = TermWin.parent[i]; 2526 oldp = parent[i];
2480 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2527 XQueryTree (disp, parent[i - 1], &root,
2481 &TermWin.parent[i], &list, &n); 2528 &parent[i], &list, &n);
2482 XFree (list); 2529 XFree (list);
2483 2530
2484 if (TermWin.parent[i] == display->root) 2531 if (parent[i] == display->root)
2485 { 2532 {
2486 if (oldp != None) 2533 if (oldp != None)
2487 pchanged = 1; 2534 pchanged = 1;
2488 2535
2489 break; 2536 break;
2490 } 2537 }
2491 2538
2492 if (oldp != TermWin.parent[i]) 2539 if (oldp != parent[i])
2493 pchanged = 1; 2540 pchanged = 1;
2494 } 2541 }
2495 2542
2496 n = 0; 2543 n = 0;
2497 2544
2498 if (pchanged) 2545 if (pchanged)
2499 { 2546 {
2500 for (; n < (unsigned int)i; n++) 2547 for (; n < (unsigned int)i; n++)
2501 { 2548 {
2502 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2549 XGetWindowAttributes (disp, parent[n], &wattr);
2503 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2504 { 2551 {
2505 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2552 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2506 break; 2553 break;
2507 } 2554 }
2508 } 2555 }
2509 } 2556 }
2510 2557
2511 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2558 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2512 { 2559 {
2513 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2560 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2514 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2561 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2515 am_transparent = 0; 2562 am_transparent = 0;
2516 /* XXX: also turn off Opt_transparent? */ 2563 /* XXX: also turn off Opt_transparent? */
2517 } 2564 }
2518 else 2565 else
2519 { 2566 {
… …
2522 * needed for fvwm2.2.2 (and before?) */ 2569 * needed for fvwm2.2.2 (and before?) */
2523 sleep (1); 2570 sleep (1);
2524#endif 2571#endif
2525 for (n = 0; n < (unsigned int)i; n++) 2572 for (n = 0; n < (unsigned int)i; n++)
2526 { 2573 {
2527 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2574 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2528 XClearWindow (display->display, TermWin.parent[n]); 2575 XClearWindow (disp, parent[n]);
2529 } 2576 }
2530 2577
2531 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2532 am_transparent = 1; 2579 am_transparent = 1;
2533 } 2580 }
2534 2581
2535 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2582 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2536 TermWin.parent[i] = None; 2583 parent[i] = None;
2537 } 2584 }
2538 2585
2539 if (scrollBar.win) 2586 if (scrollBar.win)
2540 { 2587 {
2541 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2542 scrollBar.setIdle (); 2589 scrollBar.setIdle ();
2543 scrollbar_show (0); 2590 scrollbar_show (0);
2544 } 2591 }
2545 2592
2546 if (am_transparent) 2593 if (am_transparent)
… …
2584 // some window managers resize the window early, and these programs 2631 // some window managers resize the window early, and these programs
2585 // then sometimes get the size wrong. 2632 // then sometimes get the size wrong.
2586 // unfortunately other programs are even more buggy and dislike 2633 // unfortunately other programs are even more buggy and dislike
2587 // being sent SIGWINCH, so only do it when we were in fact being 2634 // being sent SIGWINCH, so only do it when we were in fact being
2588 // resized. 2635 // resized.
2589 if (seen_resize) 2636 if (seen_resize && cmd_pid)
2590 kill (-cmd_pid, SIGWINCH); 2637 kill (-cmd_pid, SIGWINCH);
2591 } 2638 }
2592 2639
2593 /* Read a text string from the input buffer */ 2640 /* Read a text string from the input buffer */
2594 unicode_t buf[UBUFSIZ]; 2641 unicode_t buf[UBUFSIZ];
2595 bool refreshnow = false; 2642 bool refreshnow = false;
2596 int nlines = 0; 2643 int nlines = 0;
2597 unicode_t *str = buf; 2644 unicode_t *str = buf;
2645 unicode_t *eol = str + min (ncol, UBUFSIZ);
2598 2646
2599 for (;;) 2647 for (;;)
2600 { 2648 {
2601 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2649 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2602 break; 2650 break;
2603 2651
2604 *str++ = ch; 2652 *str++ = ch;
2605 2653
2606 if (ch == C0_LF) 2654 if (ch == C0_LF || str >= eol)
2607 { 2655 {
2656 if (ch == C0_LF)
2608 nlines++; 2657 nlines++;
2658
2609 refresh_count++; 2659 refresh_count++;
2610 2660
2611 if (!(options & Opt_jumpScroll) 2661 if (!(options & Opt_jumpScroll)
2612 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2662 || (refresh_count >= refresh_limit * (nrow - 1)))
2613 { 2663 {
2614 refreshnow = true; 2664 refreshnow = true;
2615 ch = NOCHAR; 2665 ch = NOCHAR;
2616 break; 2666 break;
2617 } 2667 }
2618 2668
2619 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2669 // scr_add_lines only works for nlines <= nrow - 1.
2620 if (nlines >= TermWin.nrow - 1) 2670 if (nlines >= nrow - 1)
2621 { 2671 {
2622 scr_add_lines (buf, nlines, str - buf); 2672 scr_add_lines (buf, nlines, str - buf);
2623 nlines = 0; 2673 nlines = 0;
2624 str = buf; 2674 str = buf;
2675 eol = str + min (ncol, UBUFSIZ);
2625 } 2676 }
2626 }
2627 2677
2628 if (str >= buf + UBUFSIZ) 2678 if (str >= eol)
2629 { 2679 {
2680 if (eol >= buf + UBUFSIZ)
2681 {
2630 ch = NOCHAR; 2682 ch = NOCHAR;
2631 break; 2683 break;
2684 }
2685 else
2686 eol = min (eol + ncol, buf + UBUFSIZ);
2687 }
2688
2632 } 2689 }
2633 2690
2634 seq_begin = cmdbuf_ptr; 2691 seq_begin = cmdbuf_ptr;
2635 ch = next_char (); 2692 ch = next_char ();
2636 } 2693 }
… …
2707 if (len == (size_t)-1) 2764 if (len == (size_t)-1)
2708 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2765 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2709 2766
2710 // assume wchar == unicode 2767 // assume wchar == unicode
2711 cmdbuf_ptr += len; 2768 cmdbuf_ptr += len;
2712 return wc; 2769 return wc & UNICODE_MASK;
2713 } 2770 }
2714 2771
2715 return NOCHAR; 2772 return NOCHAR;
2716} 2773}
2717 2774
… …
3180 { 3237 {
3181 switch (priv) 3238 switch (priv)
3182 { 3239 {
3183 case '>': 3240 case '>':
3184 if (ch == CSI_DA) /* secondary device attributes */ 3241 if (ch == CSI_DA) /* secondary device attributes */
3185 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3242 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3186 break; 3243 break;
3187 case '?': 3244 case '?':
3188 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3245 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3189 process_terminal_mode (ch, priv, nargs, arg); 3246 process_terminal_mode (ch, priv, nargs, arg);
3190 break; 3247 break;
… …
3419rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3476rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3420{ 3477{
3421 int x, y; 3478 int x, y;
3422 XWindowAttributes wattr; 3479 XWindowAttributes wattr;
3423 Window wdummy; 3480 Window wdummy;
3481 dDisp;
3424 3482
3425 if (nargs == 0) 3483 if (nargs == 0)
3426 return; 3484 return;
3427 3485
3428 switch (args[0]) 3486 switch (args[0])
3429 { 3487 {
3430 /* 3488 /*
3431 * commands 3489 * commands
3432 */ 3490 */
3433 case 1: /* deiconify window */ 3491 case 1: /* deiconify window */
3434 XMapWindow (display->display, TermWin.parent[0]); 3492 XMapWindow (disp, parent[0]);
3435 break; 3493 break;
3436 case 2: /* iconify window */ 3494 case 2: /* iconify window */
3437 XIconifyWindow (display->display, TermWin.parent[0], 3495 XIconifyWindow (disp, parent[0], display->screen);
3438 DefaultScreen (display->display));
3439 break; 3496 break;
3440 case 3: /* set position (pixels) */ 3497 case 3: /* set position (pixels) */
3441 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3498 XMoveWindow (disp, parent[0], args[1], args[2]);
3442 break; 3499 break;
3443 case 4: /* set size (pixels) */ 3500 case 4: /* set size (pixels) */
3444 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3501 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3445 break; 3502 break;
3446 case 5: /* raise window */ 3503 case 5: /* raise window */
3447 XRaiseWindow (display->display, TermWin.parent[0]); 3504 XRaiseWindow (disp, parent[0]);
3448 break; 3505 break;
3449 case 6: /* lower window */ 3506 case 6: /* lower window */
3450 XLowerWindow (display->display, TermWin.parent[0]); 3507 XLowerWindow (disp, parent[0]);
3451 break; 3508 break;
3452 case 7: /* refresh window */ 3509 case 7: /* refresh window */
3453 scr_touch (true); 3510 scr_touch (true);
3454 break; 3511 break;
3455 case 8: /* set size (chars) */ 3512 case 8: /* set size (chars) */
3456 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3513 set_widthheight ((unsigned int) (args[2] * fwidth),
3457 (unsigned int) (args[1] * TermWin.fheight)); 3514 (unsigned int) (args[1] * fheight));
3458 break; 3515 break;
3459 3516
3460 //case 9: NYI, TODO, restore maximized window or maximize window 3517 //case 9: NYI, TODO, restore maximized window or maximize window
3461 default: 3518 default:
3462 if (args[0] >= 24) /* set height (chars) */ 3519 if (args[0] >= 24) /* set height (chars) */
3463 set_widthheight ((unsigned int)TermWin.width, 3520 set_widthheight ((unsigned int)width,
3464 (unsigned int) (args[1] * TermWin.fheight)); 3521 (unsigned int) (args[1] * fheight));
3465 break; 3522 break;
3466 3523
3467 3524
3468 /* 3525 /*
3469 * reports - some output format copied from XTerm 3526 * reports - some output format copied from XTerm
3470 */ 3527 */
3471 case 11: /* report window state */ 3528 case 11: /* report window state */
3472 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3529 XGetWindowAttributes (disp, parent[0], &wattr);
3473 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3530 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3474 break; 3531 break;
3475 case 13: /* report window position */ 3532 case 13: /* report window position */
3476 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3533 XGetWindowAttributes (disp, parent[0], &wattr);
3477 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3534 XTranslateCoordinates (disp, parent[0], wattr.root,
3478 -wattr.border_width, -wattr.border_width, 3535 -wattr.border_width, -wattr.border_width,
3479 &x, &y, &wdummy); 3536 &x, &y, &wdummy);
3480 tt_printf ("\033[3;%d;%dt", x, y); 3537 tt_printf ("\033[3;%d;%dt", x, y);
3481 break; 3538 break;
3482 case 14: /* report window size (pixels) */ 3539 case 14: /* report window size (pixels) */
3483 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3540 XGetWindowAttributes (disp, parent[0], &wattr);
3484 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3541 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3485 break; 3542 break;
3486 case 18: /* report text area size (chars) */ 3543 case 18: /* report text area size (chars) */
3487 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3544 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3488 break; 3545 break;
3489 case 19: /* report window size (chars) */ 3546 case 19: /* report window size (chars) */
3490 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3547 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3491 break; 3548 break;
3492 case 20: /* report icon label */ 3549 case 20: /* report icon label */
3493 { 3550 {
3494 char *s; 3551 char *s;
3495 XGetIconName (display->display, TermWin.parent[0], &s); 3552 XGetIconName (disp, parent[0], &s);
3496 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3553 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3497 XFree (s); 3554 XFree (s);
3498 } 3555 }
3499 break; 3556 break;
3500 case 21: /* report window title */ 3557 case 21: /* report window title */
3501 { 3558 {
3502 char *s; 3559 char *s;
3503 XFetchName (display->display, TermWin.parent[0], &s); 3560 XFetchName (disp, parent[0], &s);
3504 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3561 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3505 XFree (s); 3562 XFree (s);
3506 } 3563 }
3507 break; 3564 break;
3508 } 3565 }
… …
3541 else if (ch < 0x20) 3598 else if (ch < 0x20)
3542 return NULL; /* other control character - exit */ 3599 return NULL; /* other control character - exit */
3543 3600
3544 seen_esc = false; 3601 seen_esc = false;
3545 3602
3546 if (n >= sizeof (string) - 1) 3603 if (n >= STRING_MAX - 1)
3547 // stop at some sane length 3604 // stop at some sane length
3548 return NULL; 3605 return NULL;
3549 3606
3550 if (ch == C0_SYN) 3607 if (ch == C0_SYN)
3551 string[n++] = cmd_get8 (); 3608 string[n++] = cmd_get8 ();
… …
3619 set_window_color (color, str); 3676 set_window_color (color, str);
3620} 3677}
3621 3678
3622/* 3679/*
3623 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3680 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3624 * 0 = change iconName/title
3625 * 1 = change iconName
3626 * 2 = change title
3627 * 4 = change color
3628 * 10 = change fg color
3629 * 11 = change bg color
3630 * 12 = change text color
3631 * 13 = change mouse foreground color
3632 * 17 = change highlight character colour
3633 * 18 = change bold character color
3634 * 19 = change underlined character color
3635 * 46 = change logfile (not implemented)
3636 * 50 = change font
3637 *
3638 * rxvt extensions:
3639 * 20 = bg pixmap
3640 * 39 = change default fg color
3641 * 49 = change default bg color
3642 * 55 = dump scrollback buffer and all of screen
3643 * 701 = change locale
3644 * 702 = find font
3645 * 703 = menu
3646 */ 3681 */
3647void 3682void
3648rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3683rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3649{ 3684{
3650 int changed = 0; 3685 int changed = 0;
3651 int color; 3686 int color;
3652 char *buf, *name; 3687 char *buf, *name;
3653 bool query = str[0] == '?' && !str[1]; 3688 bool query = str[0] == '?' && !str[1];
3654 int saveop = op; 3689 int saveop = op;
3690 dDisp;
3655 3691
3656 assert (str != NULL); 3692 assert (str != NULL);
3657 switch (op) 3693 switch (op)
3658 { 3694 {
3659 case XTerm_name: 3695 case XTerm_name:
… …
3675 unsigned long bytes_after; 3711 unsigned long bytes_after;
3676 unsigned char *value = 0; 3712 unsigned char *value = 0;
3677 const char *str = ""; 3713 const char *str = "";
3678 3714
3679 if (prop 3715 if (prop
3680 && XGetWindowProperty (display->display, TermWin.parent[0], 3716 && XGetWindowProperty (disp, parent[0],
3681 prop, 0, 1<<16, 0, AnyPropertyType, 3717 prop, 0, 1<<16, 0, AnyPropertyType,
3682 &actual_type, &actual_format, 3718 &actual_type, &actual_format,
3683 &nitems, &bytes_after, &value) == Success 3719 &nitems, &bytes_after, &value) == Success
3684 && actual_type != None 3720 && actual_type != None
3685 && actual_format == 8) 3721 && actual_format == 8)
… …
3697 { 3733 {
3698 *eq = 0; 3734 *eq = 0;
3699 set_utf8_property (display->atom (str), eq + 1); 3735 set_utf8_property (display->atom (str), eq + 1);
3700 } 3736 }
3701 else 3737 else
3702 XDeleteProperty (display->display, TermWin.parent[0], 3738 XDeleteProperty (disp, parent[0],
3703 display->atom (str)); 3739 display->atom (str));
3704 } 3740 }
3705 break; 3741 break;
3706 3742
3707 case XTerm_Color: 3743 case XTerm_Color:
… …
3748 break; 3784 break;
3749#ifndef NO_BOLD_UNDERLINE_REVERSE 3785#ifndef NO_BOLD_UNDERLINE_REVERSE
3750 case XTerm_Color_BD: 3786 case XTerm_Color_BD:
3751 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3787 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3752 break; 3788 break;
3753 case XTerm_Color_IT:
3754 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3755 break;
3756 case XTerm_Color_UL: 3789 case XTerm_Color_UL:
3757 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3790 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3758 break; 3791 break;
3759 case XTerm_Color_RV: 3792 case XTerm_Color_RV:
3760 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3793 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3761 break; 3794 break;
3795 case URxvt_Color_IT:
3796 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3797 break;
3762#endif 3798#endif
3763#if TRANSPARENT && TINTING 3799#if TRANSPARENT && TINTING
3764 case XTerm_Color_tint: 3800 case URxvt_Color_tint:
3765 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3801 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3766 check_our_parents (); 3802 check_our_parents ();
3767 if (am_transparent) 3803 if (am_transparent)
3768 want_full_refresh = want_refresh = 1; 3804 want_full_refresh = want_refresh = 1;
3769 break; 3805 break;
3770#endif 3806#endif
… …
3782 { 3818 {
3783 str++; 3819 str++;
3784#if XPM_BACKGROUND 3820#if XPM_BACKGROUND
3785 changed += scale_pixmap (str); 3821 changed += scale_pixmap (str);
3786#endif 3822#endif
3787
3788 } 3823 }
3824
3789 if (changed) 3825 if (changed)
3790 { 3826 {
3791#ifdef XPM_BACKGROUND 3827#ifdef XPM_BACKGROUND
3792 resize_pixmap (); 3828 resize_pixmap ();
3793#endif 3829#endif
… …
3804 3840
3805 case XTerm_logfile: 3841 case XTerm_logfile:
3806 // TODO, when secure mode? 3842 // TODO, when secure mode?
3807 break; 3843 break;
3808 3844
3845#ifdef MENUBAR
3846 case URxvt_Menu:
3847 if (options & Opt_insecure)
3848 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3849 break;
3850#endif
3851#if 0
3852 case XTerm_dumpscreen: /* no error notices */
3853 {
3854 int fd;
3855 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3856 {
3857 scr_dump (fd);
3858 close (fd);
3859 }
3860 }
3861 break;
3862#endif
3809 case XTerm_font: 3863 case XTerm_font:
3810 op = URxvt_font; 3864 op = URxvt_font;
3811 case URxvt_font: 3865 case URxvt_font:
3812#if ENABLE_STYLES 3866#if ENABLE_STYLES
3813 case URxvt_boldFont: 3867 case URxvt_boldFont:
3814 case URxvt_italicFont: 3868 case URxvt_italicFont:
3815 case URxvt_boldItalicFont: 3869 case URxvt_boldItalicFont:
3816#endif 3870#endif
3817 if (query) 3871 if (query)
3818 tt_printf ("\33]%d;%-.250s%c", saveop, 3872 tt_printf ("\33]%d;%-.250s%c", saveop,
3819 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3873 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3820 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3874 ? fontset[op - URxvt_font]->fontdesc : "",
3821 resp); 3875 resp);
3822 else 3876 else
3823 { 3877 {
3824 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3878 const char *&res = rs[Rs_font + (op - URxvt_font)];
3825 3879
… …
3828 set_fonts (); 3882 set_fonts ();
3829 } 3883 }
3830 break; 3884 break;
3831 3885
3832#if ENABLE_FRILLS 3886#if ENABLE_FRILLS
3833 case XTerm_locale: 3887 case URxvt_locale:
3834 if (query) 3888 if (query)
3835 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3889 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3836 else 3890 else
3837 { 3891 {
3838 set_locale (str); 3892 set_locale (str);
3839# ifdef USE_XIM 3893 pty.set_utf8_mode (enc_utf8);
3840 im_cb (); 3894 init_xlocale ();
3841# endif
3842 } 3895 }
3843 break; 3896 break;
3844#endif
3845 3897
3846#ifdef MENUBAR 3898 case URxvt_view_up:
3847 case XTerm_Menu: 3899 case URxvt_view_down:
3848 if (options & Opt_insecure) 3900 int lines = atoi (str);
3849 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3901
3850 break; 3902 if (lines)
3851#endif 3903 scr_page (op == URxvt_view_up ? UP : DN, lines);
3852#if 0
3853 case XTerm_dumpscreen: /* no error notices */
3854 { 3904 else
3855 int fd;
3856 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3857 { 3905 {
3858 scr_dump (fd); 3906 scr_erase_savelines ();
3859 close (fd);
3860 } 3907 }
3861 } 3908
3862 break; 3909 break;
3863#endif 3910#endif
3864 } 3911 }
3865} 3912}
3866/*----------------------------------------------------------------------*/ 3913/*----------------------------------------------------------------------*/
… …
3999 */ 4046 */
4000 PrivMode (1, PrivMode_vt52); 4047 PrivMode (1, PrivMode_vt52);
4001 break; 4048 break;
4002 case 3: /* 80/132 */ 4049 case 3: /* 80/132 */
4003 if (priv_modes & PrivMode_132OK) 4050 if (priv_modes & PrivMode_132OK)
4004 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4051 set_widthheight (((state ? 132 : 80) * fwidth), height);
4005 break; 4052 break;
4006 case 4: /* smooth scrolling */ 4053 case 4: /* smooth scrolling */
4007 if (state) 4054 if (state)
4008 options &= ~Opt_jumpScroll; 4055 options &= ~Opt_jumpScroll;
4009 else 4056 else

Diff Legend

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