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.208 by root, Sun Dec 18 00:59:42 2005 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
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 (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:
… …
785 case XK_F35: /* "\033[49~" */ 797 case XK_F35: /* "\033[49~" */
786 FKEY (31, XK_F17); 798 FKEY (31, XK_F17);
787 break; 799 break;
788#undef FKEY 800#undef FKEY
789 default: 801 default:
790 if (len == 0 802 newlen = 0;
791 && (keysym & 0xfff0) != 0xff70 803 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 } 804 }
796 805
797 if (newlen) 806 if (newlen)
798 len = strlen (kbuf); 807 len = strlen (kbuf);
799 } 808 }
… …
815 else if (keysym == XK_ISO_Left_Tab) 824 else if (keysym == XK_ISO_Left_Tab)
816 { 825 {
817 strcpy (kbuf, "\033[Z"); 826 strcpy (kbuf, "\033[Z");
818 len = 3; 827 len = 3;
819 } 828 }
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 829 else
828 { 830 {
829#ifdef META8_OPTION 831#ifdef META8_OPTION
830 /* set 8-bit on */ 832 /* set 8-bit on */
831 if (meta && (meta_char == 0x80)) 833 if (meta && (meta_char == 0x80))
… …
844 846
845 if (len <= 0) 847 if (len <= 0)
846 return; /* not mapped */ 848 return; /* not mapped */
847 849
848 if (options & Opt_scrollTtyKeypress) 850 if (options & Opt_scrollTtyKeypress)
849 if (TermWin.view_start) 851 if (view_start)
850 { 852 {
851 TermWin.view_start = 0; 853 view_start = 0;
852 want_refresh = 1; 854 want_refresh = 1;
853 } 855 }
854 856
855 /* 857 /*
856 * these modifications only affect the static keybuffer 858 * these modifications only affect the static keybuffer
… …
889#endif /* DEBUG_CMD */ 891#endif /* DEBUG_CMD */
890 tt_write (kbuf, (unsigned int)len); 892 tt_write (kbuf, (unsigned int)len);
891} 893}
892/*}}} */ 894/*}}} */
893 895
894#if (MENUBAR_MAX) 896#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
895/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 897/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
896/* attempt to `write' count to the input buffer */ 898/* attempt to `write' count to the input buffer */
897unsigned int 899unsigned int
898rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 900rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
899{ 901{
… …
922 924
923 cmd_parse (); 925 cmd_parse ();
924 926
925 return 0; 927 return 0;
926} 928}
927#endif /* MENUBAR_MAX */ 929#endif
928 930
929void 931void
930rxvt_term::flush () 932rxvt_term::flush ()
931{ 933{
932 flush_ev.stop (); 934 flush_ev.stop ();
… …
1033{ 1035{
1034 if (mouse_slip_wheel_speed == 0 1036 if (mouse_slip_wheel_speed == 0
1035 || 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)
1036 : scr_page (UP, mouse_slip_wheel_speed)) 1038 : scr_page (UP, mouse_slip_wheel_speed))
1037 { 1039 {
1040 if (view_start == nscrolled ||
1041 view_start == 0)
1042 mouse_slip_wheel_speed = 0;
1043
1038 refresh_type |= SMOOTH_REFRESH; 1044 refresh_type |= SMOOTH_REFRESH;
1039 want_refresh = 1; 1045 want_refresh = 1;
1040 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1046 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1041 } 1047 }
1042} 1048}
… …
1087} 1093}
1088 1094
1089void 1095void
1090rxvt_term::pointer_unblank () 1096rxvt_term::pointer_unblank ()
1091{ 1097{
1092 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1098 XDefineCursor (display->display, vt, TermWin_cursor);
1093 recolour_cursor (); 1099 recolour_cursor ();
1094 1100
1095#ifdef POINTER_BLANK 1101#ifdef POINTER_BLANK
1096 hidden_pointer = 0; 1102 hidden_pointer = 0;
1097 1103
… …
1105rxvt_term::pointer_blank () 1111rxvt_term::pointer_blank ()
1106{ 1112{
1107 if (! (options & Opt_pointerBlank)) 1113 if (! (options & Opt_pointerBlank))
1108 return; 1114 return;
1109 1115
1110 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1116 XDefineCursor (display->display, vt, display->blank_cursor);
1111 XFlush (display->display); 1117 XFlush (display->display);
1112 1118
1113 hidden_pointer = 1; 1119 hidden_pointer = 1;
1114} 1120}
1115 1121
… …
1204 1210
1205/*{{{ process an X event */ 1211/*{{{ process an X event */
1206void 1212void
1207rxvt_term::x_cb (XEvent &ev) 1213rxvt_term::x_cb (XEvent &ev)
1208{ 1214{
1215 dDisp;
1216
1209 SET_R (this); 1217 SET_R (this);
1210 SET_LOCALE (locale); 1218 SET_LOCALE (locale);
1211 1219
1212#if defined(CURSOR_BLINK) 1220#if defined(CURSOR_BLINK)
1213 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1221 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
… …
1329 button_release (ev.xbutton); 1337 button_release (ev.xbutton);
1330 break; 1338 break;
1331 1339
1332 case ClientMessage: 1340 case ClientMessage:
1333 if (ev.xclient.format == 32 1341 if (ev.xclient.format == 32
1342 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1343 {
1334 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1344 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1335 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
1336#ifdef OFFIX_DND 1362#ifdef OFFIX_DND
1337 /* OffiX Dnd (drag 'n' drop) protocol */ 1363 /* OffiX Dnd (drag 'n' drop) protocol */
1338 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1364 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1339 && (ev.xclient.data.l[0] == DndFile 1365 && (ev.xclient.data.l[0] == DndFile
1340 || ev.xclient.data.l[0] == DndDir 1366 || ev.xclient.data.l[0] == DndDir
1341 || ev.xclient.data.l[0] == DndLink)) 1367 || ev.xclient.data.l[0] == DndLink))
1342 { 1368 {
1343 /* Get Dnd data */ 1369 /* Get Dnd data */
1344 Atom ActualType; 1370 Atom ActualType;
1345 int ActualFormat; 1371 int ActualFormat;
1346 unsigned char *data; 1372 unsigned char *data;
1347 unsigned long Size, RemainingBytes; 1373 unsigned long Size, RemainingBytes;
1348 1374
1349 XGetWindowProperty (display->display, display->root, 1375 XGetWindowProperty (disp, display->root,
1350 xa[XA_DNDSELECTION], 1376 xa[XA_DNDSELECTION],
1351 0L, 1000000L, 1377 0L, 1000000L,
1352 False, AnyPropertyType, 1378 False, AnyPropertyType,
1353 &ActualType, &ActualFormat, 1379 &ActualType, &ActualFormat,
1354 &Size, &RemainingBytes, 1380 &Size, &RemainingBytes,
1355 &data); 1381 &data);
1356 set_string_property (XA_CUT_BUFFER0, data); 1382 set_string_property (XA_CUT_BUFFER0, data);
1357 XFree (data); 1383 XFree (data);
1358 selection_paste (display->root, XA_CUT_BUFFER0, true); 1384 selection_paste (display->root, XA_CUT_BUFFER0, true);
1359 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1385 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1360 } 1386 }
1361#endif /* OFFIX_DND */ 1387#endif /* OFFIX_DND */
1362 break; 1388 break;
1363 1389
1364 case MappingNotify: 1390 case MappingNotify:
… …
1389 break; 1415 break;
1390 } 1416 }
1391 break; 1417 break;
1392 1418
1393 case FocusIn: 1419 case FocusIn:
1394 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])
1395 { 1429 {
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)); 1430 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1431 ;
1463 1432
1464 if (szHint.width != width || szHint.height != height) 1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1465 { 1434 {
1466 seen_resize = 1; 1435 seen_resize = 1;
1467 resize_all_windows (width, height, 1); 1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1468 } 1437 }
1469 1438
1470#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1439#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1471 if (options & Opt_transparent) 1440 if (options & Opt_transparent)
1472 check_our_parents (); 1441 check_our_parents ();
… …
1493 case SelectionRequest: 1462 case SelectionRequest:
1494 selection_send (ev.xselectionrequest); 1463 selection_send (ev.xselectionrequest);
1495 break; 1464 break;
1496 1465
1497 case UnmapNotify: 1466 case UnmapNotify:
1498 TermWin.mapped = 0; 1467 mapped = 0;
1499#ifdef TEXT_BLINK 1468#ifdef TEXT_BLINK
1500 text_blink_ev.stop (); 1469 text_blink_ev.stop ();
1501#endif 1470#endif
1502 break; 1471 break;
1503 1472
1504 case MapNotify: 1473 case MapNotify:
1505 TermWin.mapped = 1; 1474 mapped = 1;
1506#ifdef TEXT_BLINK 1475#ifdef TEXT_BLINK
1507 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1476 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1508#endif 1477#endif
1509 break; 1478 break;
1510 1479
… …
1514 break; 1483 break;
1515#endif /* TRANSPARENT */ 1484#endif /* TRANSPARENT */
1516 1485
1517 case GraphicsExpose: 1486 case GraphicsExpose:
1518 case Expose: 1487 case Expose:
1519 if (ev.xany.window == TermWin.vt) 1488 if (ev.xany.window == vt)
1520 { 1489 {
1521 do 1490 do
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1491 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1492 ev.xexpose.width, ev.xexpose.height, False);
1524 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1493 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1525 1494
1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1495 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527 1496
1528 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1497 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1529 scr_expose (ev.xexpose.x, ev.xexpose.y, 1498 scr_expose (ev.xexpose.x, ev.xexpose.y,
1530 ev.xexpose.width, ev.xexpose.height, False); 1499 ev.xexpose.width, ev.xexpose.height, False);
1531 1500
1532 scr_refresh (refresh_type); 1501 scr_refresh (refresh_type);
1533 } 1502 }
1534 else 1503 else
1535 { 1504 {
1536 XEvent unused_event; 1505 XEvent unused_event;
1537 1506
1538 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1507 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1539 ; 1508 ;
1540 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1509 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1541 ; 1510 ;
1542 1511
1543 if (isScrollbarWindow (ev.xany.window)) 1512 if (isScrollbarWindow (ev.xany.window))
1544 { 1513 {
1545 scrollBar.setIdle (); 1514 scrollBar.setIdle ();
… …
1549 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1518 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1550 menubar_expose (); 1519 menubar_expose ();
1551#endif 1520#endif
1552 1521
1553#ifdef TRANSPARENT 1522#ifdef TRANSPARENT
1554 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1523 if (am_transparent && ev.xany.window == parent[0])
1555 XClearWindow (display->display, ev.xany.window); 1524 XClearWindow (disp, ev.xany.window);
1556#endif 1525#endif
1557 } 1526 }
1558 break; 1527 break;
1559 1528
1560 case MotionNotify: 1529 case MotionNotify:
… …
1570 } 1539 }
1571#endif 1540#endif
1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1573 break; 1542 break;
1574 1543
1575 if (ev.xany.window == TermWin.vt) 1544 if (ev.xany.window == vt)
1576 { 1545 {
1577 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1546 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1578 { 1547 {
1579 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1548 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1580 ; 1549 ;
1581 1550
1582 XQueryPointer (display->display, TermWin.vt, 1551 XQueryPointer (disp, vt,
1583 &unused_root, &unused_child, 1552 &unused_root, &unused_child,
1584 &unused_root_x, &unused_root_y, 1553 &unused_root_x, &unused_root_y,
1585 &ev.xbutton.x, &ev.xbutton.y, 1554 &ev.xbutton.x, &ev.xbutton.y,
1586 &ev.xbutton.state); 1555 &ev.xbutton.state);
1587#ifdef MOUSE_THRESHOLD 1556#ifdef MOUSE_THRESHOLD
… …
1599#endif 1568#endif
1600 selection_extend (ev.xbutton.x, ev.xbutton.y, 1569 selection_extend (ev.xbutton.x, ev.xbutton.y,
1601 ev.xbutton.state & Button3Mask ? 2 : 0); 1570 ev.xbutton.state & Button3Mask ? 2 : 0);
1602 1571
1603#ifdef SELECTION_SCROLLING 1572#ifdef SELECTION_SCROLLING
1604 if (ev.xbutton.y < TermWin.int_bwidth 1573 if (ev.xbutton.y < int_bwidth
1605 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1574 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1606 { 1575 {
1607 int dist; 1576 int dist;
1608 1577
1609 /* don't clobber the current delay if we are 1578 /* don't clobber the current delay if we are
1610 * already in the middle of scrolling. 1579 * already in the middle of scrolling.
… …
1618 selection_save_x = ev.xbutton.x; 1587 selection_save_x = ev.xbutton.x;
1619 selection_save_y = ev.xbutton.y; 1588 selection_save_y = ev.xbutton.y;
1620 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1589 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1621 1590
1622 /* calc number of lines to scroll */ 1591 /* calc number of lines to scroll */
1623 if (ev.xbutton.y < TermWin.int_bwidth) 1592 if (ev.xbutton.y < int_bwidth)
1624 { 1593 {
1625 scroll_selection_dir = UP; 1594 scroll_selection_dir = UP;
1626 dist = TermWin.int_bwidth - ev.xbutton.y; 1595 dist = int_bwidth - ev.xbutton.y;
1627 } 1596 }
1628 else 1597 else
1629 { 1598 {
1630 scroll_selection_dir = DN; 1599 scroll_selection_dir = DN;
1631 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1600 dist = ev.xbutton.y - (int_bwidth + height);
1632 } 1601 }
1633 1602
1634 scroll_selection_lines = Pixel2Height (dist) 1603 scroll_selection_lines = Pixel2Height (dist)
1635 / SELECTION_SCROLL_LINE_SPEEDUP 1604 / SELECTION_SCROLL_LINE_SPEEDUP
1636 + 1; 1605 + 1;
… …
1651#endif 1620#endif
1652 } 1621 }
1653 } 1622 }
1654 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1655 { 1624 {
1656 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1625 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1657 MotionNotify, &ev)) 1626 MotionNotify, &ev))
1658 ; 1627 ;
1659 1628
1660 XQueryPointer (display->display, scrollBar.win, 1629 XQueryPointer (disp, scrollBar.win,
1661 &unused_root, &unused_child, 1630 &unused_root, &unused_child,
1662 &unused_root_x, &unused_root_y, 1631 &unused_root_x, &unused_root_y,
1663 &ev.xbutton.x, &ev.xbutton.y, 1632 &ev.xbutton.x, &ev.xbutton.y,
1664 &unused_mask); 1633 &unused_mask);
1665 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1670 } 1639 }
1671 break; 1640 break;
1672 } 1641 }
1673} 1642}
1674 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
1675#if TRANSPARENT 1705#if TRANSPARENT
1676void 1706void
1677rxvt_term::rootwin_cb (XEvent &ev) 1707rxvt_term::rootwin_cb (XEvent &ev)
1678{ 1708{
1679 SET_R (this); 1709 SET_R (this);
… …
1709 reportmode = !! (priv_modes & PrivMode_mouse_report); 1739 reportmode = !! (priv_modes & PrivMode_mouse_report);
1710 1740
1711 /* 1741 /*
1712 * VT window processing of button press 1742 * VT window processing of button press
1713 */ 1743 */
1714 if (ev.window == TermWin.vt) 1744 if (ev.window == vt)
1715 { 1745 {
1716#if ISO_14755 1746#if ISO_14755
1717 // 5.4 1747 // 5.4
1718 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1748 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1719 { 1749 {
… …
1767 { 1797 {
1768 case Button1: 1798 case Button1:
1769 /* allow meta + click to select rectangular areas */ 1799 /* allow meta + click to select rectangular areas */
1770 /* should be done in screen.C */ 1800 /* should be done in screen.C */
1771#if ENABLE_FRILLS 1801#if ENABLE_FRILLS
1772 selection.rect = !! (ev.state & ModMetaMask); 1802 selection.rect = !!(ev.state & ModMetaMask);
1773#else 1803#else
1774 selection.rect = false; 1804 selection.rect = false;
1775#endif 1805#endif
1776 1806
1777 /* allow shift+left click to extend selection */ 1807 /* allow shift+left click to extend selection */
… …
1924 case Button3: 1954 case Button3:
1925 if (scrollBar.style != R_SB_XTERM) 1955 if (scrollBar.style != R_SB_XTERM)
1926 { 1956 {
1927 if (scrollbar_above_slider (ev.y)) 1957 if (scrollbar_above_slider (ev.y))
1928# ifdef RXVT_SCROLL_FULL 1958# ifdef RXVT_SCROLL_FULL
1929 scr_page (UP, TermWin.nrow - 1); 1959 scr_page (UP, nrow - 1);
1930# else 1960# else
1931 scr_page (UP, TermWin.nrow / 4); 1961 scr_page (UP, nrow / 4);
1932# endif 1962# endif
1933 else if (scrollbar_below_slider (ev.y)) 1963 else if (scrollbar_below_slider (ev.y))
1934# ifdef RXVT_SCROLL_FULL 1964# ifdef RXVT_SCROLL_FULL
1935 scr_page (DN, TermWin.nrow - 1); 1965 scr_page (DN, nrow - 1);
1936# else 1966# else
1937 scr_page (DN, TermWin.nrow / 4); 1967 scr_page (DN, nrow / 4);
1938# endif 1968# endif
1939 else 1969 else
1940 scrollBar.setMotion (); 1970 scrollBar.setMotion ();
1941 } 1971 }
1942 else 1972 else
1943 { 1973 {
1944 scr_page ((ev.button == Button1 ? DN : UP), 1974 scr_page ((ev.button == Button1 ? DN : UP),
1945 (TermWin.nrow 1975 (nrow
1946 * scrollbar_position (ev.y) 1976 * scrollbar_position (ev.y)
1947 / scrollbar_size ())); 1977 / scrollbar_size ()));
1948 } 1978 }
1949 1979
1950 break; 1980 break;
… …
1982#ifdef SELECTION_SCROLLING 2012#ifdef SELECTION_SCROLLING
1983 if (sel_scroll_ev.active) 2013 if (sel_scroll_ev.active)
1984 sel_scroll_ev.stop(); 2014 sel_scroll_ev.stop();
1985#endif 2015#endif
1986 2016
1987 if (ev.window == TermWin.vt) 2017 if (ev.window == vt)
1988 { 2018 {
1989#if ISO_14755 2019#if ISO_14755
1990 // 5.4 2020 // 5.4
1991 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2021 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1992 return; 2022 return;
… …
2043 v = ev.button == Button4 ? UP : DN; 2073 v = ev.button == Button4 ? UP : DN;
2044 2074
2045 if (ev.state & ShiftMask) 2075 if (ev.state & ShiftMask)
2046 i = 1; 2076 i = 1;
2047 else if (options & Opt_mouseWheelScrollPage) 2077 else if (options & Opt_mouseWheelScrollPage)
2048 i = TermWin.nrow - 1; 2078 i = nrow - 1;
2049 else 2079 else
2050 i = 5; 2080 i = 5;
2051 2081
2052# ifdef MOUSE_SLIP_WHEELING 2082# ifdef MOUSE_SLIP_WHEELING
2053 if (ev.state & ControlMask) 2083 if (ev.state & ControlMask)
2054 { 2084 {
2055 mouse_slip_wheel_speed += v ? -1 : 1; 2085 mouse_slip_wheel_speed += v ? -1 : 1;
2056 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;
2057 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;
2058 2088
2059 if (slip_wheel_ev.at < NOW) 2089 if (slip_wheel_ev.at < NOW)
2060 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2090 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2061 2091
2062 slip_wheel_ev.start (); 2092 slip_wheel_ev.start ();
… …
2103 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2133 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2104 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2134 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2105 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2135 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2106 int i; 2136 int i;
2107 2137
2108 Visual* visual = display->visual; 2138 Visual *visual = display->visual;
2109 2139
2110 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2140 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2111 2141
2112 /* for convenience */ 2142 /* for convenience */
2113 mask_r = visual->red_mask; 2143 mask_r = visual->red_mask;
… …
2334 Atom atype; 2364 Atom atype;
2335 unsigned char *prop = NULL; 2365 unsigned char *prop = NULL;
2336 Window root, oldp, *list; 2366 Window root, oldp, *list;
2337 Pixmap rootpixmap = None; 2367 Pixmap rootpixmap = None;
2338 XWindowAttributes wattr, wrootattr; 2368 XWindowAttributes wattr, wrootattr;
2369 dDisp;
2339 2370
2340 pchanged = 0; 2371 pchanged = 0;
2341 2372
2342 if (!(options & Opt_transparent)) 2373 if (!(options & Opt_transparent))
2343 return pchanged; /* Don't try any more */ 2374 return pchanged; /* Don't try any more */
2344 2375
2345 XGetWindowAttributes (display->display, display->root, &wrootattr); 2376 XGetWindowAttributes (disp, display->root, &wrootattr);
2346 rootdepth = wrootattr.depth; 2377 rootdepth = wrootattr.depth;
2347 2378
2348 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2379 XGetWindowAttributes (disp, parent[0], &wattr);
2349 2380
2350 if (rootdepth != wattr.depth) 2381 if (rootdepth != wattr.depth)
2351 { 2382 {
2352 if (am_transparent) 2383 if (am_transparent)
2353 { 2384 {
2354 pchanged = 1; 2385 pchanged = 1;
2355 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2386 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2356 am_transparent = am_pixmap_trans = 0; 2387 am_transparent = am_pixmap_trans = 0;
2357 } 2388 }
2358 2389
2359 return pchanged; /* Don't try any more */ 2390 return pchanged; /* Don't try any more */
2360 } 2391 }
2361 2392
2362 /* 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. */
2363 XSync (display->display, False); 2394 XSync (disp, False);
2364 2395
2365 /* 2396 /*
2366 * Make the frame window set by the window manager have 2397 * Make the frame window set by the window manager have
2367 * the root background. Some window managers put multiple nested frame 2398 * the root background. Some window managers put multiple nested frame
2368 * 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.
2369 */ 2400 */
2370 i = (xa[XA_XROOTPMAP_ID] 2401 i = (xa[XA_XROOTPMAP_ID]
2371 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2402 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2372 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2403 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2373 &nitems, &bytes_after, &prop) == Success); 2404 &nitems, &bytes_after, &prop) == Success);
2374 2405
2375 if (!i || prop == NULL) 2406 if (!i || prop == NULL)
2376 i = (xa[XA_ESETROOT_PMAP_ID] 2407 i = (xa[XA_ESETROOT_PMAP_ID]
2377 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2408 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2378 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2409 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2379 &nitems, &bytes_after, &prop) == Success); 2410 &nitems, &bytes_after, &prop) == Success);
2380 2411
2381 if (!i || prop == NULL 2412 if (!i || prop == NULL
2382#if TINTING 2413#if TINTING
… …
2401 Window cr; 2432 Window cr;
2402 XImage *image; 2433 XImage *image;
2403 GC gc; 2434 GC gc;
2404 XGCValues gcvalue; 2435 XGCValues gcvalue;
2405 2436
2406 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2437 XTranslateCoordinates (disp, parent[0], display->root,
2407 0, 0, &sx, &sy, &cr); 2438 0, 0, &sx, &sy, &cr);
2408 nw = (unsigned int)szHint.width; 2439 nw = (unsigned int)szHint.width;
2409 nh = (unsigned int)szHint.height; 2440 nh = (unsigned int)szHint.height;
2410 nx = ny = 0; 2441 nx = ny = 0;
2411 2442
… …
2424 } 2455 }
2425 2456
2426 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2457 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2427 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2458 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2428 2459
2429 XSync (display->display, False); 2460 XSync (disp, False);
2430 allowedxerror = -1; 2461 allowedxerror = -1;
2431 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2462 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2432 2463
2433 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2464 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2434 /* XXX: may need a delay here? */ 2465 /* XXX: may need a delay here? */
2435 allowedxerror = 0; 2466 allowedxerror = 0;
2436 2467
2437 if (image == NULL) 2468 if (image == NULL)
2438 { 2469 {
2439 if (am_transparent && am_pixmap_trans) 2470 if (am_transparent && am_pixmap_trans)
2440 { 2471 {
2441 pchanged = 1; 2472 pchanged = 1;
2442 if (TermWin.pixmap != None) 2473 if (pixmap != None)
2443 { 2474 {
2444 XFreePixmap (display->display, TermWin.pixmap); 2475 XFreePixmap (disp, pixmap);
2445 TermWin.pixmap = None; 2476 pixmap = None;
2446 } 2477 }
2447 } 2478 }
2448 2479
2449 am_pixmap_trans = 0; 2480 am_pixmap_trans = 0;
2450 } 2481 }
2451 else 2482 else
2452 { 2483 {
2453 if (TermWin.pixmap != None) 2484 if (pixmap != None)
2454 XFreePixmap (display->display, TermWin.pixmap); 2485 XFreePixmap (disp, pixmap);
2455 2486
2456#if TINTING 2487#if TINTING
2457 if (ISSET_PIXCOLOR (Color_tint)) 2488 if (ISSET_PIXCOLOR (Color_tint))
2458 { 2489 {
2459 unsigned short rm, gm, bm; 2490 unsigned short rm, gm, bm;
… …
2463 2494
2464 ShadeXImage (display, image, shade, rm, gm, bm); 2495 ShadeXImage (display, image, shade, rm, gm, bm);
2465 } 2496 }
2466#endif 2497#endif
2467 2498
2468 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2499 pixmap = XCreatePixmap (disp, vt,
2469 szHint.width, szHint.height, image->depth); 2500 szHint.width, szHint.height, image->depth);
2470 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2501 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2471 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2502 XPutImage (disp, pixmap, gc, image, 0, 0,
2472 nx, ny, image->width, image->height); 2503 nx, ny, image->width, image->height);
2473 XFreeGC (display->display, gc); 2504 XFreeGC (disp, gc);
2474 XDestroyImage (image); 2505 XDestroyImage (image);
2475 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2506 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2476 XClearWindow (display->display, TermWin.parent[0]); 2507 XClearWindow (disp, parent[0]);
2477 2508
2478 if (!am_transparent || !am_pixmap_trans) 2509 if (!am_transparent || !am_pixmap_trans)
2479 pchanged = 1; 2510 pchanged = 1;
2480 2511
2481 am_transparent = am_pixmap_trans = 1; 2512 am_transparent = am_pixmap_trans = 1;
2482 } 2513 }
2483 } 2514 }
2484 2515
2485 if (am_pixmap_trans) 2516 if (am_pixmap_trans)
2486 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2517 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2487 else 2518 else
2488 { 2519 {
2489 unsigned int n; 2520 unsigned int n;
2490 /* 2521 /*
2491 * InheritPixmap transparency 2522 * InheritPixmap transparency
2492 */ 2523 */
2493 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2524 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2494 { 2525 {
2495 oldp = TermWin.parent[i]; 2526 oldp = parent[i];
2496 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2527 XQueryTree (disp, parent[i - 1], &root,
2497 &TermWin.parent[i], &list, &n); 2528 &parent[i], &list, &n);
2498 XFree (list); 2529 XFree (list);
2499 2530
2500 if (TermWin.parent[i] == display->root) 2531 if (parent[i] == display->root)
2501 { 2532 {
2502 if (oldp != None) 2533 if (oldp != None)
2503 pchanged = 1; 2534 pchanged = 1;
2504 2535
2505 break; 2536 break;
2506 } 2537 }
2507 2538
2508 if (oldp != TermWin.parent[i]) 2539 if (oldp != parent[i])
2509 pchanged = 1; 2540 pchanged = 1;
2510 } 2541 }
2511 2542
2512 n = 0; 2543 n = 0;
2513 2544
2514 if (pchanged) 2545 if (pchanged)
2515 { 2546 {
2516 for (; n < (unsigned int)i; n++) 2547 for (; n < (unsigned int)i; n++)
2517 { 2548 {
2518 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2549 XGetWindowAttributes (disp, parent[n], &wattr);
2519 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2550 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2520 { 2551 {
2521 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2552 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2522 break; 2553 break;
2523 } 2554 }
2524 } 2555 }
2525 } 2556 }
2526 2557
2527 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2558 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2528 { 2559 {
2529 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2560 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2530 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2561 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2531 am_transparent = 0; 2562 am_transparent = 0;
2532 /* XXX: also turn off Opt_transparent? */ 2563 /* XXX: also turn off Opt_transparent? */
2533 } 2564 }
2534 else 2565 else
2535 { 2566 {
… …
2538 * needed for fvwm2.2.2 (and before?) */ 2569 * needed for fvwm2.2.2 (and before?) */
2539 sleep (1); 2570 sleep (1);
2540#endif 2571#endif
2541 for (n = 0; n < (unsigned int)i; n++) 2572 for (n = 0; n < (unsigned int)i; n++)
2542 { 2573 {
2543 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2574 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2544 XClearWindow (display->display, TermWin.parent[n]); 2575 XClearWindow (disp, parent[n]);
2545 } 2576 }
2546 2577
2547 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2548 am_transparent = 1; 2579 am_transparent = 1;
2549 } 2580 }
2550 2581
2551 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2582 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2552 TermWin.parent[i] = None; 2583 parent[i] = None;
2553 } 2584 }
2554 2585
2555 if (scrollBar.win) 2586 if (scrollBar.win)
2556 { 2587 {
2557 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2588 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2558 scrollBar.setIdle (); 2589 scrollBar.setIdle ();
2559 scrollbar_show (0); 2590 scrollbar_show (0);
2560 } 2591 }
2561 2592
2562 if (am_transparent) 2593 if (am_transparent)
… …
2600 // some window managers resize the window early, and these programs 2631 // some window managers resize the window early, and these programs
2601 // then sometimes get the size wrong. 2632 // then sometimes get the size wrong.
2602 // unfortunately other programs are even more buggy and dislike 2633 // unfortunately other programs are even more buggy and dislike
2603 // 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
2604 // resized. 2635 // resized.
2605 if (seen_resize) 2636 if (seen_resize && cmd_pid)
2606 kill (-cmd_pid, SIGWINCH); 2637 kill (-cmd_pid, SIGWINCH);
2607 } 2638 }
2608 2639
2609 /* Read a text string from the input buffer */ 2640 /* Read a text string from the input buffer */
2610 unicode_t buf[UBUFSIZ]; 2641 unicode_t buf[UBUFSIZ];
2611 bool refreshnow = false; 2642 bool refreshnow = false;
2612 int nlines = 0; 2643 int nlines = 0;
2613 unicode_t *str = buf; 2644 unicode_t *str = buf;
2645 unicode_t *eol = str + min (ncol, UBUFSIZ);
2614 2646
2615 for (;;) 2647 for (;;)
2616 { 2648 {
2617 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))
2618 break; 2650 break;
2619 2651
2620 *str++ = ch; 2652 *str++ = ch;
2621 2653
2622 if (ch == C0_LF) 2654 if (ch == C0_LF || str >= eol)
2623 { 2655 {
2656 if (ch == C0_LF)
2624 nlines++; 2657 nlines++;
2658
2625 refresh_count++; 2659 refresh_count++;
2626 2660
2627 if (!(options & Opt_jumpScroll) 2661 if (!(options & Opt_jumpScroll)
2628 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2662 || (refresh_count >= refresh_limit * (nrow - 1)))
2629 { 2663 {
2630 refreshnow = true; 2664 refreshnow = true;
2631 ch = NOCHAR; 2665 ch = NOCHAR;
2632 break; 2666 break;
2633 } 2667 }
2634 2668
2635 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2669 // scr_add_lines only works for nlines <= nrow - 1.
2636 if (nlines >= TermWin.nrow - 1) 2670 if (nlines >= nrow - 1)
2637 { 2671 {
2638 scr_add_lines (buf, nlines, str - buf); 2672 scr_add_lines (buf, nlines, str - buf);
2639 nlines = 0; 2673 nlines = 0;
2640 str = buf; 2674 str = buf;
2675 eol = str + min (ncol, UBUFSIZ);
2641 } 2676 }
2642 }
2643 2677
2644 if (str >= buf + UBUFSIZ) 2678 if (str >= eol)
2645 { 2679 {
2680 if (eol >= buf + UBUFSIZ)
2681 {
2646 ch = NOCHAR; 2682 ch = NOCHAR;
2647 break; 2683 break;
2684 }
2685 else
2686 eol = min (eol + ncol, buf + UBUFSIZ);
2687 }
2688
2648 } 2689 }
2649 2690
2650 seq_begin = cmdbuf_ptr; 2691 seq_begin = cmdbuf_ptr;
2651 ch = next_char (); 2692 ch = next_char ();
2652 } 2693 }
… …
3196 { 3237 {
3197 switch (priv) 3238 switch (priv)
3198 { 3239 {
3199 case '>': 3240 case '>':
3200 if (ch == CSI_DA) /* secondary device attributes */ 3241 if (ch == CSI_DA) /* secondary device attributes */
3201 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3242 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3202 break; 3243 break;
3203 case '?': 3244 case '?':
3204 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3245 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3205 process_terminal_mode (ch, priv, nargs, arg); 3246 process_terminal_mode (ch, priv, nargs, arg);
3206 break; 3247 break;
… …
3435rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3476rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3436{ 3477{
3437 int x, y; 3478 int x, y;
3438 XWindowAttributes wattr; 3479 XWindowAttributes wattr;
3439 Window wdummy; 3480 Window wdummy;
3481 dDisp;
3440 3482
3441 if (nargs == 0) 3483 if (nargs == 0)
3442 return; 3484 return;
3443 3485
3444 switch (args[0]) 3486 switch (args[0])
3445 { 3487 {
3446 /* 3488 /*
3447 * commands 3489 * commands
3448 */ 3490 */
3449 case 1: /* deiconify window */ 3491 case 1: /* deiconify window */
3450 XMapWindow (display->display, TermWin.parent[0]); 3492 XMapWindow (disp, parent[0]);
3451 break; 3493 break;
3452 case 2: /* iconify window */ 3494 case 2: /* iconify window */
3453 XIconifyWindow (display->display, TermWin.parent[0], 3495 XIconifyWindow (disp, parent[0], display->screen);
3454 DefaultScreen (display->display));
3455 break; 3496 break;
3456 case 3: /* set position (pixels) */ 3497 case 3: /* set position (pixels) */
3457 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3498 XMoveWindow (disp, parent[0], args[1], args[2]);
3458 break; 3499 break;
3459 case 4: /* set size (pixels) */ 3500 case 4: /* set size (pixels) */
3460 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3501 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3461 break; 3502 break;
3462 case 5: /* raise window */ 3503 case 5: /* raise window */
3463 XRaiseWindow (display->display, TermWin.parent[0]); 3504 XRaiseWindow (disp, parent[0]);
3464 break; 3505 break;
3465 case 6: /* lower window */ 3506 case 6: /* lower window */
3466 XLowerWindow (display->display, TermWin.parent[0]); 3507 XLowerWindow (disp, parent[0]);
3467 break; 3508 break;
3468 case 7: /* refresh window */ 3509 case 7: /* refresh window */
3469 scr_touch (true); 3510 scr_touch (true);
3470 break; 3511 break;
3471 case 8: /* set size (chars) */ 3512 case 8: /* set size (chars) */
3472 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3513 set_widthheight ((unsigned int) (args[2] * fwidth),
3473 (unsigned int) (args[1] * TermWin.fheight)); 3514 (unsigned int) (args[1] * fheight));
3474 break; 3515 break;
3475 3516
3476 //case 9: NYI, TODO, restore maximized window or maximize window 3517 //case 9: NYI, TODO, restore maximized window or maximize window
3477 default: 3518 default:
3478 if (args[0] >= 24) /* set height (chars) */ 3519 if (args[0] >= 24) /* set height (chars) */
3479 set_widthheight ((unsigned int)TermWin.width, 3520 set_widthheight ((unsigned int)width,
3480 (unsigned int) (args[1] * TermWin.fheight)); 3521 (unsigned int) (args[1] * fheight));
3481 break; 3522 break;
3482 3523
3483 3524
3484 /* 3525 /*
3485 * reports - some output format copied from XTerm 3526 * reports - some output format copied from XTerm
3486 */ 3527 */
3487 case 11: /* report window state */ 3528 case 11: /* report window state */
3488 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3529 XGetWindowAttributes (disp, parent[0], &wattr);
3489 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3530 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3490 break; 3531 break;
3491 case 13: /* report window position */ 3532 case 13: /* report window position */
3492 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3533 XGetWindowAttributes (disp, parent[0], &wattr);
3493 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3534 XTranslateCoordinates (disp, parent[0], wattr.root,
3494 -wattr.border_width, -wattr.border_width, 3535 -wattr.border_width, -wattr.border_width,
3495 &x, &y, &wdummy); 3536 &x, &y, &wdummy);
3496 tt_printf ("\033[3;%d;%dt", x, y); 3537 tt_printf ("\033[3;%d;%dt", x, y);
3497 break; 3538 break;
3498 case 14: /* report window size (pixels) */ 3539 case 14: /* report window size (pixels) */
3499 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3540 XGetWindowAttributes (disp, parent[0], &wattr);
3500 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3541 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3501 break; 3542 break;
3502 case 18: /* report text area size (chars) */ 3543 case 18: /* report text area size (chars) */
3503 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3544 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3504 break; 3545 break;
3505 case 19: /* report window size (chars) */ 3546 case 19: /* report window size (chars) */
3506 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3547 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3507 break; 3548 break;
3508 case 20: /* report icon label */ 3549 case 20: /* report icon label */
3509 { 3550 {
3510 char *s; 3551 char *s;
3511 XGetIconName (display->display, TermWin.parent[0], &s); 3552 XGetIconName (disp, parent[0], &s);
3512 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 */
3513 XFree (s); 3554 XFree (s);
3514 } 3555 }
3515 break; 3556 break;
3516 case 21: /* report window title */ 3557 case 21: /* report window title */
3517 { 3558 {
3518 char *s; 3559 char *s;
3519 XFetchName (display->display, TermWin.parent[0], &s); 3560 XFetchName (disp, parent[0], &s);
3520 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 */
3521 XFree (s); 3562 XFree (s);
3522 } 3563 }
3523 break; 3564 break;
3524 } 3565 }
… …
3557 else if (ch < 0x20) 3598 else if (ch < 0x20)
3558 return NULL; /* other control character - exit */ 3599 return NULL; /* other control character - exit */
3559 3600
3560 seen_esc = false; 3601 seen_esc = false;
3561 3602
3562 if (n >= sizeof (string) - 1) 3603 if (n >= STRING_MAX - 1)
3563 // stop at some sane length 3604 // stop at some sane length
3564 return NULL; 3605 return NULL;
3565 3606
3566 if (ch == C0_SYN) 3607 if (ch == C0_SYN)
3567 string[n++] = cmd_get8 (); 3608 string[n++] = cmd_get8 ();
… …
3635 set_window_color (color, str); 3676 set_window_color (color, str);
3636} 3677}
3637 3678
3638/* 3679/*
3639 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3680 * 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 */ 3681 */
3663void 3682void
3664rxvt_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)
3665{ 3684{
3666 int changed = 0; 3685 int changed = 0;
3667 int color; 3686 int color;
3668 char *buf, *name; 3687 char *buf, *name;
3669 bool query = str[0] == '?' && !str[1]; 3688 bool query = str[0] == '?' && !str[1];
3670 int saveop = op; 3689 int saveop = op;
3690 dDisp;
3671 3691
3672 assert (str != NULL); 3692 assert (str != NULL);
3673 switch (op) 3693 switch (op)
3674 { 3694 {
3675 case XTerm_name: 3695 case XTerm_name:
… …
3691 unsigned long bytes_after; 3711 unsigned long bytes_after;
3692 unsigned char *value = 0; 3712 unsigned char *value = 0;
3693 const char *str = ""; 3713 const char *str = "";
3694 3714
3695 if (prop 3715 if (prop
3696 && XGetWindowProperty (display->display, TermWin.parent[0], 3716 && XGetWindowProperty (disp, parent[0],
3697 prop, 0, 1<<16, 0, AnyPropertyType, 3717 prop, 0, 1<<16, 0, AnyPropertyType,
3698 &actual_type, &actual_format, 3718 &actual_type, &actual_format,
3699 &nitems, &bytes_after, &value) == Success 3719 &nitems, &bytes_after, &value) == Success
3700 && actual_type != None 3720 && actual_type != None
3701 && actual_format == 8) 3721 && actual_format == 8)
… …
3713 { 3733 {
3714 *eq = 0; 3734 *eq = 0;
3715 set_utf8_property (display->atom (str), eq + 1); 3735 set_utf8_property (display->atom (str), eq + 1);
3716 } 3736 }
3717 else 3737 else
3718 XDeleteProperty (display->display, TermWin.parent[0], 3738 XDeleteProperty (disp, parent[0],
3719 display->atom (str)); 3739 display->atom (str));
3720 } 3740 }
3721 break; 3741 break;
3722 3742
3723 case XTerm_Color: 3743 case XTerm_Color:
… …
3764 break; 3784 break;
3765#ifndef NO_BOLD_UNDERLINE_REVERSE 3785#ifndef NO_BOLD_UNDERLINE_REVERSE
3766 case XTerm_Color_BD: 3786 case XTerm_Color_BD:
3767 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3787 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3768 break; 3788 break;
3769 case XTerm_Color_IT:
3770 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3771 break;
3772 case XTerm_Color_UL: 3789 case XTerm_Color_UL:
3773 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3790 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3774 break; 3791 break;
3775 case XTerm_Color_RV: 3792 case XTerm_Color_RV:
3776 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3793 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3777 break; 3794 break;
3795 case URxvt_Color_IT:
3796 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3797 break;
3778#endif 3798#endif
3779#if TRANSPARENT && TINTING 3799#if TRANSPARENT && TINTING
3780 case XTerm_Color_tint: 3800 case URxvt_Color_tint:
3781 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3801 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3782 check_our_parents (); 3802 check_our_parents ();
3783 if (am_transparent) 3803 if (am_transparent)
3784 want_full_refresh = want_refresh = 1; 3804 want_full_refresh = want_refresh = 1;
3785 break; 3805 break;
3786#endif 3806#endif
… …
3798 { 3818 {
3799 str++; 3819 str++;
3800#if XPM_BACKGROUND 3820#if XPM_BACKGROUND
3801 changed += scale_pixmap (str); 3821 changed += scale_pixmap (str);
3802#endif 3822#endif
3803
3804 } 3823 }
3824
3805 if (changed) 3825 if (changed)
3806 { 3826 {
3807#ifdef XPM_BACKGROUND 3827#ifdef XPM_BACKGROUND
3808 resize_pixmap (); 3828 resize_pixmap ();
3809#endif 3829#endif
… …
3820 3840
3821 case XTerm_logfile: 3841 case XTerm_logfile:
3822 // TODO, when secure mode? 3842 // TODO, when secure mode?
3823 break; 3843 break;
3824 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
3825 case XTerm_font: 3863 case XTerm_font:
3826 op = URxvt_font; 3864 op = URxvt_font;
3827 case URxvt_font: 3865 case URxvt_font:
3828#if ENABLE_STYLES 3866#if ENABLE_STYLES
3829 case URxvt_boldFont: 3867 case URxvt_boldFont:
3830 case URxvt_italicFont: 3868 case URxvt_italicFont:
3831 case URxvt_boldItalicFont: 3869 case URxvt_boldItalicFont:
3832#endif 3870#endif
3833 if (query) 3871 if (query)
3834 tt_printf ("\33]%d;%-.250s%c", saveop, 3872 tt_printf ("\33]%d;%-.250s%c", saveop,
3835 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3873 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3836 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3874 ? fontset[op - URxvt_font]->fontdesc : "",
3837 resp); 3875 resp);
3838 else 3876 else
3839 { 3877 {
3840 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3878 const char *&res = rs[Rs_font + (op - URxvt_font)];
3841 3879
… …
3844 set_fonts (); 3882 set_fonts ();
3845 } 3883 }
3846 break; 3884 break;
3847 3885
3848#if ENABLE_FRILLS 3886#if ENABLE_FRILLS
3849 case XTerm_locale: 3887 case URxvt_locale:
3850 if (query) 3888 if (query)
3851 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);
3852 else 3890 else
3853 { 3891 {
3854 set_locale (str); 3892 set_locale (str);
3855# ifdef USE_XIM 3893 pty.set_utf8_mode (enc_utf8);
3856 im_cb (); 3894 init_xlocale ();
3857# endif
3858 } 3895 }
3859 break; 3896 break;
3860#endif
3861 3897
3862#ifdef MENUBAR 3898 case URxvt_view_up:
3863 case XTerm_Menu: 3899 case URxvt_view_down:
3864 if (options & Opt_insecure) 3900 int lines = atoi (str);
3865 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3901
3866 break; 3902 if (lines)
3867#endif 3903 scr_page (op == URxvt_view_up ? UP : DN, lines);
3868#if 0
3869 case XTerm_dumpscreen: /* no error notices */
3870 { 3904 else
3871 int fd;
3872 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3873 { 3905 {
3874 scr_dump (fd); 3906 scr_erase_savelines ();
3875 close (fd);
3876 } 3907 }
3877 } 3908
3878 break; 3909 break;
3879#endif 3910#endif
3880 } 3911 }
3881} 3912}
3882/*----------------------------------------------------------------------*/ 3913/*----------------------------------------------------------------------*/
… …
4015 */ 4046 */
4016 PrivMode (1, PrivMode_vt52); 4047 PrivMode (1, PrivMode_vt52);
4017 break; 4048 break;
4018 case 3: /* 80/132 */ 4049 case 3: /* 80/132 */
4019 if (priv_modes & PrivMode_132OK) 4050 if (priv_modes & PrivMode_132OK)
4020 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4051 set_widthheight (((state ? 132 : 80) * fwidth), height);
4021 break; 4052 break;
4022 case 4: /* smooth scrolling */ 4053 case 4: /* smooth scrolling */
4023 if (state) 4054 if (state)
4024 options &= ~Opt_jumpScroll; 4055 options &= ~Opt_jumpScroll;
4025 else 4056 else

Diff Legend

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