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.192 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.233 by root, Wed Jan 4 01:16:34 2006 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.
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
57#include <cwchar>
58#include <csignal> 63#include <csignal>
59 64
60/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
61 66
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
118 XK_Escape, 0x238b, 123 XK_Escape, 0x238b,
119 XK_Undo, 0x238c, 124 XK_Undo, 0x238c,
120 XK_Print, 0x2399, 125 XK_Print, 0x2399,
121 126
122 XK_space, 0x2423, 127 XK_space, 0x2423,
128
129#ifdef XK_KP_Begin
130 XK_KP_Prior, 0x21de,
131 XK_KP_Next, 0x21df,
132 XK_KP_Begin, 0x2320,
133 XK_KP_Insert, 0x2380,
134 XK_KP_Delete, 0x2326,
123 XK_KP_Space, 0x2422, 135 XK_KP_Space, 0x2422,
136#endif
124 0, 137 0,
125}; 138};
126 139
127void 140void
128rxvt_term::iso14755_54 (int x, int y) 141rxvt_term::iso14755_54 (int x, int y)
129{ 142{
130 x = Pixel2Col (x); 143 x = Pixel2Col (x);
131 y = Pixel2Row (y); 144 y = Pixel2Row (y);
132 145
133 if (x < 0 || x >= TermWin.ncol 146 if (!IN_RANGE_EXC (x, 0, ncol)
134 || y < 0 || y >= TermWin.nrow) 147 || !IN_RANGE_EXC (y, 0, nrow))
135 return; 148 return;
136 149
137 for (;;) 150 for (;;)
138 { 151 {
139 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 152 const line_t &l = ROW(y - view_start);
153
154 text_t t = l.t[x];
140 155
141 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
142 { 157 {
143 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 158 iso14755_51 (l.t[x], l.r[x], x, y);
144 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
145 iso14755buf = ISO_14755_54; 159 iso14755buf = ISO_14755_54;
146 break; 160 break;
147 } 161 }
148 162
149 x--; 163 x--;
150 } 164 }
151
152} 165}
153#endif
154 166
155#if ENABLE_OVERLAY
156void 167void
157rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
158{ 169{
159 rxvt_fontset *fs = FONTSET (r); 170 rxvt_fontset *fs = FONTSET (r);
160 rxvt_font *f = (*fs)[fs->find_font (ch)]; 171 rxvt_font *f = (*fs)[fs->find_font (ch)];
161 wchar_t *chr, *alloc, ch2; 172 wchar_t *chr, *alloc, ch2, *fname;
162 int len; 173 int len;
163 174
175 fname = rxvt_utf8towcs (f->name);
176
164#if ENABLE_COMBINING 177# if ENABLE_COMBINING
165 if (IS_COMPOSE (ch)) 178 if (IS_COMPOSE (ch))
166 { 179 {
167 len = rxvt_composite.expand (ch, 0); 180 len = rxvt_composite.expand (ch, 0);
168 alloc = chr = new wchar_t[len]; 181 alloc = chr = new wchar_t[len];
169 rxvt_composite.expand (ch, chr); 182 rxvt_composite.expand (ch, chr);
170 } 183 }
171 else 184 else
172#endif 185# endif
173 { 186 {
174 ch2 = ch; 187 ch2 = ch;
175 188
176 alloc = 0; 189 alloc = 0;
177 chr = &ch2; 190 chr = &ch2;
178 len = 1; 191 len = 1;
179 } 192 }
180 193
181 int width = strlen (f->name); 194 char attr[80]; // plenty
182 195
183 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 196 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
197 (int)r,
198 fgcolor_of (r), bgcolor_of (r),
199 r & RS_Bold ? " bold" : "",
200 r & RS_Italic ? " italic" : "",
201 r & RS_Blink ? " blink" : "",
202 r & RS_RVid ? " rvid" : "",
203 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : "");
205
206 int width = wcswidth (fname, wcslen (fname));
207
208 max_it (width, 8+5); // for char + hey
209 max_it (width, strlen (attr));
210
211 if (y >= 0)
212 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0;
215 }
216
217 scr_overlay_new (x, y, width, len + 2);
184 218
185 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
186 220
187 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
188 { 222 {
191 ch = *chr++; 225 ch = *chr++;
192 226
193 sprintf (buf, "%8x", ch); 227 sprintf (buf, "%8x", ch);
194 scr_overlay_set (0, y, buf); 228 scr_overlay_set (0, y, buf);
195 scr_overlay_set (9, y, '='); 229 scr_overlay_set (9, y, '=');
196#if !UNICODE3 230# if !UNICODE3
197 if (ch >= 0x10000) 231 if (ch >= 0x10000)
198 ch = 0xfffd; 232 ch = 0xfffd;
199#endif 233# endif
200 scr_overlay_set (11, y, ch, r); 234 scr_overlay_set (11, y, ch, r);
201 scr_overlay_set (12, y, NOCHAR, r); 235 scr_overlay_set (12, y, NOCHAR, r);
202 } 236 }
203 237
238 scr_overlay_set (0, len , attr);
204 scr_overlay_set (0, len, f->name); 239 scr_overlay_set (0, len + 1, fname);
205 240
241 free (fname);
242
206#if ENABLE_COMBINING 243# if ENABLE_COMBINING
207 if (alloc) 244 if (alloc)
208 delete [] alloc; 245 delete [] alloc;
209#endif 246# endif
210} 247}
211#endif 248#endif
212 249
213void 250void
214rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
277 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
278 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
279 * 316 *
280 * Always permit `shift' to override the current setting 317 * Always permit `shift' to override the current setting
281 */ 318 */
282 shft = (ev.state & ShiftMask); 319 shft = ev.state & ShiftMask;
283 ctrl = (ev.state & ControlMask); 320 ctrl = ev.state & ControlMask;
284 meta = (ev.state & ModMetaMask); 321 meta = ev.state & ModMetaMask;
285 322
286 if (numlock_state || (ev.state & ModNumLockMask)) 323 if (numlock_state || (ev.state & ModNumLockMask))
287 { 324 {
288 numlock_state = (ev.state & ModNumLockMask); 325 numlock_state = (ev.state & ModNumLockMask);
289 PrivMode ((!numlock_state), PrivMode_aplKP); 326 PrivMode ((!numlock_state), PrivMode_aplKP);
309 346
310 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
311 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
312 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
313 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
314 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
315 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
316 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
317 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
318 SET_LOCALE (locale); 357 SET_LOCALE (locale);
319 358
320 if (status_return == XLookupChars 359 if (status_return == XLookupChars
321 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
353#ifdef KEYSYM_RESOURCE 392#ifdef KEYSYM_RESOURCE
354 if (keyboard->dispatch (this, keysym, ev.state)) 393 if (keyboard->dispatch (this, keysym, ev.state))
355 return; 394 return;
356#endif 395#endif
357 396
358 if (TermWin.saveLines) 397 if (saveLines)
359 { 398 {
360#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
361 if (!ctrl && !meta) 400 if (!ctrl && !meta)
362#else 401#else
363 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
364#endif 403#endif
365 { 404 {
366 int lnsppg; 405 int lnsppg;
367 406
368#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
369 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
370#else 409#else
371 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
372#endif 411#endif
373 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
374 { 413 {
375 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
376 return; 415 return;
513 else 552 else
514 strcpy (kbuf, key_backspace); 553 strcpy (kbuf, key_backspace);
515 break; 554 break;
516#endif 555#endif
517#ifndef NO_DELETE_KEY 556#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
518 case XK_Delete: 567 case XK_Delete:
519 strcpy (kbuf, key_delete); 568 strcpy (kbuf, key_delete);
520 break; 569 break;
521#endif 570#endif
522 case XK_Tab: 571 case XK_Tab:
625#ifdef XK_KP_Begin 674#ifdef XK_KP_Begin
626 case XK_KP_Begin: 675 case XK_KP_Begin:
627 strcpy (kbuf, "\033Ou"); 676 strcpy (kbuf, "\033Ou");
628 break; 677 break;
629 678
630 case XK_KP_Insert:
631 strcpy (kbuf, "\033Op");
632 break;
633
634 case XK_KP_Delete:
635 strcpy (kbuf, "\033On");
636 break;
637#endif 679#endif
638 case XK_KP_F1: /* "\033OP" */ 680 case XK_KP_F1: /* "\033OP" */
639 case XK_KP_F2: /* "\033OQ" */ 681 case XK_KP_F2: /* "\033OQ" */
640 case XK_KP_F3: /* "\033OR" */ 682 case XK_KP_F3: /* "\033OR" */
641 case XK_KP_F4: /* "\033OS" */ 683 case XK_KP_F4: /* "\033OS" */
673 break; 715 break;
674 716
675 case XK_Find: 717 case XK_Find:
676 strcpy (kbuf, "\033[1~"); 718 strcpy (kbuf, "\033[1~");
677 break; 719 break;
720
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
678 case XK_Insert: 731 case XK_Insert:
679 strcpy (kbuf, "\033[2~"); 732 strcpy (kbuf, "\033[2~");
680 break; 733 break;
681#ifdef DXK_Remove /* support for DEC remove like key */ 734#ifdef DXK_Remove /* support for DEC remove like key */
682 case DXK_Remove: 735 case DXK_Remove:
817 } 870 }
818 871
819 if (len <= 0) 872 if (len <= 0)
820 return; /* not mapped */ 873 return; /* not mapped */
821 874
822 if (options & Opt_scrollTtyKeypress) 875 if (OPTION (Opt_scrollTtyKeypress))
823 if (TermWin.view_start) 876 if (view_start)
824 { 877 {
825 TermWin.view_start = 0; 878 view_start = 0;
826 want_refresh = 1; 879 want_refresh = 1;
827 } 880 }
828 881
829 /* 882 /*
830 * these modifications only affect the static keybuffer 883 * these modifications only affect the static keybuffer
933 SET_LOCALE (locale); 986 SET_LOCALE (locale);
934 987
935 display->flush (); 988 display->flush ();
936 989
937 if (want_refresh && !flush_ev.active) 990 if (want_refresh && !flush_ev.active)
938 flush_ev.start (NOW + 0.01); 991 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
939} 992}
940 993
941void 994void
942rxvt_term::flush_cb (time_watcher &w) 995rxvt_term::flush_cb (time_watcher &w)
943{ 996{
1007{ 1060{
1008 if (mouse_slip_wheel_speed == 0 1061 if (mouse_slip_wheel_speed == 0
1009 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1062 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1010 : scr_page (UP, mouse_slip_wheel_speed)) 1063 : scr_page (UP, mouse_slip_wheel_speed))
1011 { 1064 {
1012 if (TermWin.view_start == TermWin.nscrolled || 1065 if (view_start == nsaved ||
1013 TermWin.view_start == 0) 1066 view_start == 0)
1014 mouse_slip_wheel_speed = 0; 1067 mouse_slip_wheel_speed = 0;
1015 1068
1016 refresh_type |= SMOOTH_REFRESH; 1069 refresh_type |= SMOOTH_REFRESH;
1017 want_refresh = 1; 1070 want_refresh = 1;
1018 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1019 } 1072 }
1020} 1073}
1021#endif 1074#endif
1022 1075
1076#if HAVE_SCHED_YIELD
1077static struct event_handler
1078{
1079 check_watcher cw_yield;
1080
1081 void yield (check_watcher &w)
1082 {
1083 sched_yield ();
1084 w.stop ();
1085 }
1086
1087 event_handler ()
1088 : cw_yield (this, &event_handler::yield)
1089 {
1090 }
1091} event_handler;
1092#endif
1093
1023bool 1094bool
1024rxvt_term::pty_fill () 1095rxvt_term::pty_fill ()
1025{ 1096{
1026 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1097 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1027 1098
1028 if (CBUFSIZ == n) 1099 if (CBUFSIZ == n)
1029 { 1100 {
1030 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1101 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1031 n = 0; 1102 n = 0;
1032 } 1103 }
1033 1104
1034 memmove (cmdbuf_base, cmdbuf_ptr, n); 1105 memmove (cmdbuf_base, cmdbuf_ptr, n);
1035 cmdbuf_ptr = cmdbuf_base; 1106 cmdbuf_ptr = cmdbuf_base;
1036 cmdbuf_endp = cmdbuf_ptr + n; 1107 cmdbuf_endp = cmdbuf_ptr + n;
1037 1108
1038 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1109 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1039 1110
1040 if (n > 0) 1111 if (r > 0)
1041 { 1112 {
1042 cmdbuf_endp += n; 1113 cmdbuf_endp += r;
1043 return true; 1114 return true;
1044 } 1115 }
1045 else if (n < 0 && errno != EAGAIN) 1116 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1117 {
1118#if HAVE_SCHED_YIELD
1119 if (display->is_local)
1120 event_handler.cw_yield.start ();
1121#endif
1122 }
1123 else
1124 {
1125 pty_ev.stop ();
1126
1127 if (!OPTION (Opt_hold))
1046 destroy (); 1128 destroy ();
1129 }
1047 1130
1048 return false; 1131 return false;
1049} 1132}
1050 1133
1051void 1134void
1065} 1148}
1066 1149
1067void 1150void
1068rxvt_term::pointer_unblank () 1151rxvt_term::pointer_unblank ()
1069{ 1152{
1070 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1153 XDefineCursor (display->display, vt, TermWin_cursor);
1071 recolour_cursor (); 1154 recolour_cursor ();
1072 1155
1073#ifdef POINTER_BLANK 1156#ifdef POINTER_BLANK
1074 hidden_pointer = 0; 1157 hidden_pointer = 0;
1075 1158
1076 if (options & Opt_pointerBlank) 1159 if (OPTION (Opt_pointerBlank))
1077 pointer_ev.start (NOW + pointerBlankDelay); 1160 pointer_ev.start (NOW + pointerBlankDelay);
1078#endif 1161#endif
1079} 1162}
1080 1163
1081#ifdef POINTER_BLANK 1164#ifdef POINTER_BLANK
1082void 1165void
1083rxvt_term::pointer_blank () 1166rxvt_term::pointer_blank ()
1084{ 1167{
1085 if (! (options & Opt_pointerBlank)) 1168 if (! OPTION (Opt_pointerBlank))
1086 return; 1169 return;
1087 1170
1088 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1171 XDefineCursor (display->display, vt, display->blank_cursor);
1089 XFlush (display->display); 1172 XFlush (display->display);
1090 1173
1091 hidden_pointer = 1; 1174 hidden_pointer = 1;
1092} 1175}
1093 1176
1188 1271
1189 SET_R (this); 1272 SET_R (this);
1190 SET_LOCALE (locale); 1273 SET_LOCALE (locale);
1191 1274
1192#if defined(CURSOR_BLINK) 1275#if defined(CURSOR_BLINK)
1193 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1194 { 1277 {
1195 if (hidden_cursor) 1278 if (hidden_cursor)
1196 { 1279 {
1197 hidden_cursor = 0; 1280 hidden_cursor = 0;
1198 want_refresh = 1; 1281 want_refresh = 1;
1201 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1202 } 1285 }
1203#endif 1286#endif
1204 1287
1205#if defined(POINTER_BLANK) 1288#if defined(POINTER_BLANK)
1206 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) 1289 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1207 { 1290 {
1208 if (ev.type == MotionNotify 1291 if (ev.type == MotionNotify
1209 || ev.type == ButtonPress 1292 || ev.type == ButtonPress
1210 || ev.type == ButtonRelease) 1293 || ev.type == ButtonRelease)
1211 if (hidden_pointer) 1294 if (hidden_pointer)
1309 button_release (ev.xbutton); 1392 button_release (ev.xbutton);
1310 break; 1393 break;
1311 1394
1312 case ClientMessage: 1395 case ClientMessage:
1313 if (ev.xclient.format == 32 1396 if (ev.xclient.format == 32
1397 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1398 {
1314 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1399 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1315 destroy (); 1400 destroy ();
1401#if ENABLE_EWMH
1402 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1403 XSendEvent (disp, ev.xclient.window = display->root,
1404 False, SubstructureRedirectMask | SubstructureNotifyMask,
1405 &ev);
1406#endif
1407 }
1408#if ENABLE_XEMBED
1409 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1410 {
1411 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1412 focus_in ();
1413 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1414 focus_out ();
1415 }
1416#endif
1316#ifdef OFFIX_DND 1417#ifdef OFFIX_DND
1317 /* OffiX Dnd (drag 'n' drop) protocol */ 1418 /* OffiX Dnd (drag 'n' drop) protocol */
1318 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1419 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1319 && (ev.xclient.data.l[0] == DndFile 1420 && (ev.xclient.data.l[0] == DndFile
1320 || ev.xclient.data.l[0] == DndDir 1421 || ev.xclient.data.l[0] == DndDir
1321 || ev.xclient.data.l[0] == DndLink)) 1422 || ev.xclient.data.l[0] == DndLink))
1322 { 1423 {
1323 /* Get Dnd data */ 1424 /* Get Dnd data */
1324 Atom ActualType; 1425 Atom ActualType;
1325 int ActualFormat; 1426 int ActualFormat;
1326 unsigned char *data; 1427 unsigned char *data;
1369 break; 1470 break;
1370 } 1471 }
1371 break; 1472 break;
1372 1473
1373 case FocusIn: 1474 case FocusIn:
1374 if (!TermWin.focus) 1475 focus_in ();
1476 break;
1477
1478 case FocusOut:
1479 focus_out ();
1480 break;
1481
1482 case ConfigureNotify:
1483 if (ev.xconfigure.window == parent[0])
1375 { 1484 {
1376 TermWin.focus = 1;
1377 want_refresh = 1;
1378#ifdef USE_XIM
1379 if (Input_Context != NULL)
1380 {
1381 IMSetStatusPosition ();
1382 XSetICFocus (Input_Context);
1383 }
1384#endif
1385#ifdef CURSOR_BLINK
1386 if (options & Opt_cursorBlink)
1387 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1388#endif
1389#ifdef OFF_FOCUS_FADING
1390 if (rs[Rs_fade])
1391 {
1392 pix_colors = pix_colors_focused;
1393 scr_recolour ();
1394 }
1395#endif
1396
1397 }
1398 break;
1399
1400 case FocusOut:
1401 if (TermWin.focus)
1402 {
1403 TermWin.focus = 0;
1404 want_refresh = 1;
1405
1406#if ENABLE_FRILLS || ISO_14755
1407 iso14755buf = 0;
1408#endif
1409#if ENABLE_OVERLAY
1410 scr_overlay_off ();
1411#endif
1412#ifdef USE_XIM
1413 if (Input_Context != NULL)
1414 XUnsetICFocus (Input_Context);
1415#endif
1416#ifdef CURSOR_BLINK
1417 if (options & Opt_cursorBlink)
1418 cursor_blink_ev.stop ();
1419 hidden_cursor = 0;
1420#endif
1421#ifdef OFF_FOCUS_FADING
1422 if (rs[Rs_fade])
1423 {
1424 pix_colors = pix_colors_unfocused;
1425 scr_recolour ();
1426 }
1427#endif
1428 }
1429 break;
1430
1431 case ConfigureNotify:
1432 if (ev.xconfigure.window == TermWin.parent[0])
1433 {
1434 int height, width;
1435
1436 do
1437 { /* Wrap lots of configures into one */
1438 width = ev.xconfigure.width;
1439 height = ev.xconfigure.height;
1440 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1441 }
1442 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1485 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1486 ;
1443 1487
1444 if (szHint.width != width || szHint.height != height) 1488 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1445 { 1489 {
1446 seen_resize = 1; 1490 seen_resize = 1;
1447 resize_all_windows (width, height, 1); 1491 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1448 } 1492 }
1449 1493
1450#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1494#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1451 if (options & Opt_transparent) 1495 if (OPTION (Opt_transparent))
1452 check_our_parents (); 1496 check_our_parents ();
1453#endif 1497#endif
1454 } 1498 }
1455 break; 1499 break;
1456 1500
1473 case SelectionRequest: 1517 case SelectionRequest:
1474 selection_send (ev.xselectionrequest); 1518 selection_send (ev.xselectionrequest);
1475 break; 1519 break;
1476 1520
1477 case UnmapNotify: 1521 case UnmapNotify:
1478 TermWin.mapped = 0; 1522 mapped = 0;
1479#ifdef TEXT_BLINK 1523#ifdef TEXT_BLINK
1480 text_blink_ev.stop (); 1524 text_blink_ev.stop ();
1481#endif 1525#endif
1482 break; 1526 break;
1483 1527
1484 case MapNotify: 1528 case MapNotify:
1485 TermWin.mapped = 1; 1529 mapped = 1;
1486#ifdef TEXT_BLINK 1530#ifdef TEXT_BLINK
1487 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1488#endif 1532#endif
1489 break; 1533 break;
1490 1534
1494 break; 1538 break;
1495#endif /* TRANSPARENT */ 1539#endif /* TRANSPARENT */
1496 1540
1497 case GraphicsExpose: 1541 case GraphicsExpose:
1498 case Expose: 1542 case Expose:
1499 if (ev.xany.window == TermWin.vt) 1543 if (ev.xany.window == vt)
1500 { 1544 {
1501 do 1545 do
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1504 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1548 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1505 1549
1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1507 1551
1508 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1511 1555
1512 scr_refresh (refresh_type); 1556 scr_refresh (refresh_type);
1513 } 1557 }
1529 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1573 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1530 menubar_expose (); 1574 menubar_expose ();
1531#endif 1575#endif
1532 1576
1533#ifdef TRANSPARENT 1577#ifdef TRANSPARENT
1534 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1578 if (am_transparent && ev.xany.window == parent[0])
1535 XClearWindow (disp, ev.xany.window); 1579 XClearWindow (disp, ev.xany.window);
1536#endif 1580#endif
1537 } 1581 }
1538 break; 1582 break;
1539 1583
1550 } 1594 }
1551#endif 1595#endif
1552 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1553 break; 1597 break;
1554 1598
1555 if (ev.xany.window == TermWin.vt) 1599 if (ev.xany.window == vt)
1556 { 1600 {
1557 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1601 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1558 { 1602 {
1559 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1560 ; 1604 ;
1561 1605
1562 XQueryPointer (disp, TermWin.vt, 1606 XQueryPointer (disp, vt,
1563 &unused_root, &unused_child, 1607 &unused_root, &unused_child,
1564 &unused_root_x, &unused_root_y, 1608 &unused_root_x, &unused_root_y,
1565 &ev.xbutton.x, &ev.xbutton.y, 1609 &ev.xbutton.x, &ev.xbutton.y,
1566 &ev.xbutton.state); 1610 &ev.xbutton.state);
1567#ifdef MOUSE_THRESHOLD 1611#ifdef MOUSE_THRESHOLD
1579#endif 1623#endif
1580 selection_extend (ev.xbutton.x, ev.xbutton.y, 1624 selection_extend (ev.xbutton.x, ev.xbutton.y,
1581 ev.xbutton.state & Button3Mask ? 2 : 0); 1625 ev.xbutton.state & Button3Mask ? 2 : 0);
1582 1626
1583#ifdef SELECTION_SCROLLING 1627#ifdef SELECTION_SCROLLING
1584 if (ev.xbutton.y < TermWin.int_bwidth 1628 if (ev.xbutton.y < int_bwidth
1585 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1629 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1586 { 1630 {
1587 int dist; 1631 int dist;
1588 1632
1589 /* don't clobber the current delay if we are 1633 /* don't clobber the current delay if we are
1590 * already in the middle of scrolling. 1634 * already in the middle of scrolling.
1598 selection_save_x = ev.xbutton.x; 1642 selection_save_x = ev.xbutton.x;
1599 selection_save_y = ev.xbutton.y; 1643 selection_save_y = ev.xbutton.y;
1600 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1644 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1601 1645
1602 /* calc number of lines to scroll */ 1646 /* calc number of lines to scroll */
1603 if (ev.xbutton.y < TermWin.int_bwidth) 1647 if (ev.xbutton.y < int_bwidth)
1604 { 1648 {
1605 scroll_selection_dir = UP; 1649 scroll_selection_dir = UP;
1606 dist = TermWin.int_bwidth - ev.xbutton.y; 1650 dist = int_bwidth - ev.xbutton.y;
1607 } 1651 }
1608 else 1652 else
1609 { 1653 {
1610 scroll_selection_dir = DN; 1654 scroll_selection_dir = DN;
1611 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1655 dist = ev.xbutton.y - (int_bwidth + height);
1612 } 1656 }
1613 1657
1614 scroll_selection_lines = Pixel2Height (dist) 1658 scroll_selection_lines = Pixel2Height (dist)
1615 / SELECTION_SCROLL_LINE_SPEEDUP 1659 / SELECTION_SCROLL_LINE_SPEEDUP
1616 + 1; 1660 + 1;
1617 MIN_IT (scroll_selection_lines, 1661 min_it (scroll_selection_lines,
1618 SELECTION_SCROLL_MAX_LINES); 1662 SELECTION_SCROLL_MAX_LINES);
1619 } 1663 }
1620 else 1664 else
1621 { 1665 {
1622 /* we are within the text window, so we 1666 /* we are within the text window, so we
1650 } 1694 }
1651 break; 1695 break;
1652 } 1696 }
1653} 1697}
1654 1698
1699void
1700rxvt_term::focus_in ()
1701{
1702 if (!focus)
1703 {
1704 focus = 1;
1705 want_refresh = 1;
1706
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1708
1709#if USE_XIM
1710 if (Input_Context != NULL)
1711 {
1712 IMSetStatusPosition ();
1713 XSetICFocus (Input_Context);
1714 }
1715#endif
1716#if CURSOR_BLINK
1717 if (OPTION (Opt_cursorBlink))
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1719#endif
1720#if OFF_FOCUS_FADING
1721 if (rs[Rs_fade])
1722 {
1723 pix_colors = pix_colors_focused;
1724 scr_recolour ();
1725 }
1726#endif
1727 }
1728}
1729
1730void
1731rxvt_term::focus_out ()
1732{
1733 if (focus)
1734 {
1735 focus = 0;
1736 want_refresh = 1;
1737
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739
1740#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf)
1742 {
1743 iso14755buf = 0;
1744# if ENABLE_OVERLAY
1745 scr_overlay_off ();
1746# endif
1747 }
1748#endif
1749#if USE_XIM
1750 if (Input_Context != NULL)
1751 XUnsetICFocus (Input_Context);
1752#endif
1753#if CURSOR_BLINK
1754 if (OPTION (Opt_cursorBlink))
1755 cursor_blink_ev.stop ();
1756 hidden_cursor = 0;
1757#endif
1758#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade])
1760 {
1761 pix_colors = pix_colors_unfocused;
1762 scr_recolour ();
1763 }
1764#endif
1765 }
1766}
1767
1655#if TRANSPARENT 1768#if TRANSPARENT
1656void 1769void
1657rxvt_term::rootwin_cb (XEvent &ev) 1770rxvt_term::rootwin_cb (XEvent &ev)
1658{ 1771{
1659 SET_R (this); 1772 SET_R (this);
1670 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1783 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1671 return; 1784 return;
1672 1785
1673 /* FALLTHROUGH */ 1786 /* FALLTHROUGH */
1674 case ReparentNotify: 1787 case ReparentNotify:
1675 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1788 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1676 want_refresh = want_full_refresh = 1; 1789 want_refresh = want_full_refresh = 1;
1677 break; 1790 break;
1678 } 1791 }
1679} 1792}
1680#endif 1793#endif
1683rxvt_term::button_press (XButtonEvent &ev) 1796rxvt_term::button_press (XButtonEvent &ev)
1684{ 1797{
1685 int reportmode = 0, clickintime; 1798 int reportmode = 0, clickintime;
1686 1799
1687 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1800 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1801
1688 if (!bypass_keystate) 1802 if (!bypass_keystate)
1689 reportmode = !! (priv_modes & PrivMode_mouse_report); 1803 reportmode = !! (priv_modes & PrivMode_mouse_report);
1690 1804
1691 /* 1805 /*
1692 * VT window processing of button press 1806 * VT window processing of button press
1693 */ 1807 */
1694 if (ev.window == TermWin.vt) 1808 if (ev.window == vt)
1695 { 1809 {
1696#if ISO_14755 1810#if ISO_14755
1697 // 5.4 1811 // 5.4
1698 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1699 { 1813 {
1741 else 1855 else
1742 { 1856 {
1743 if (ev.button != MEvent.button) 1857 if (ev.button != MEvent.button)
1744 MEvent.clicks = 0; 1858 MEvent.clicks = 0;
1745 1859
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1746 switch (ev.button) 1861 switch (ev.button)
1747 { 1862 {
1748 case Button1: 1863 case Button1:
1749 /* allow meta + click to select rectangular areas */ 1864 /* allow meta + click to select rectangular areas */
1750 /* should be done in screen.C */ 1865 /* should be done in screen.C */
1751#if ENABLE_FRILLS 1866#if ENABLE_FRILLS
1752 selection.rect = !!(ev.state & ModMetaMask); 1867 selection.rect = !!(ev.state & ModMetaMask);
1753#else 1868#else
1754 selection.rect = false; 1869 selection.rect = false;
1755#endif 1870#endif
1756 1871
1757 /* allow shift+left click to extend selection */ 1872 /* allow shift+left click to extend selection */
1758 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1759 { 1874 {
1760 if (MEvent.button == Button1 && clickintime) 1875 if (MEvent.button == Button1 && clickintime)
1761 selection_rotate (ev.x, ev.y); 1876 selection_rotate (ev.x, ev.y);
1762 else 1877 else
1763 selection_extend (ev.x, ev.y, 1); 1878 selection_extend (ev.x, ev.y, 1);
1764 } 1879 }
1765 else 1880 else
1766 { 1881 {
1767 if (MEvent.button == Button1 && clickintime) 1882 if (MEvent.button == Button1 && clickintime)
1768 MEvent.clicks++; 1883 MEvent.clicks++;
1769 else 1884 else
1770 MEvent.clicks = 1; 1885 MEvent.clicks = 1;
1771 1886
1772 selection_click (MEvent.clicks, ev.x, ev.y); 1887 selection_click (MEvent.clicks, ev.x, ev.y);
1773 } 1888 }
1774 1889
1775 MEvent.button = Button1; 1890 MEvent.button = Button1;
1776 break; 1891 break;
1777 1892
1778 case Button3: 1893 case Button3:
1779 if (MEvent.button == Button3 && clickintime) 1894 if (MEvent.button == Button3 && clickintime)
1780 selection_rotate (ev.x, ev.y); 1895 selection_rotate (ev.x, ev.y);
1781 else 1896 else
1782 selection_extend (ev.x, ev.y, 1); 1897 selection_extend (ev.x, ev.y, 1);
1783 1898
1784 MEvent.button = Button3; 1899 MEvent.button = Button3;
1785 break; 1900 break;
1786 } 1901 }
1787 } 1902 }
1788 1903
1789 MEvent.time = ev.time; 1904 MEvent.time = ev.time;
1790 return; 1905 return;
1791 } 1906 }
1792 1907
1904 case Button3: 2019 case Button3:
1905 if (scrollBar.style != R_SB_XTERM) 2020 if (scrollBar.style != R_SB_XTERM)
1906 { 2021 {
1907 if (scrollbar_above_slider (ev.y)) 2022 if (scrollbar_above_slider (ev.y))
1908# ifdef RXVT_SCROLL_FULL 2023# ifdef RXVT_SCROLL_FULL
1909 scr_page (UP, TermWin.nrow - 1); 2024 scr_page (UP, nrow - 1);
1910# else 2025# else
1911 scr_page (UP, TermWin.nrow / 4); 2026 scr_page (UP, nrow / 4);
1912# endif 2027# endif
1913 else if (scrollbar_below_slider (ev.y)) 2028 else if (scrollbar_below_slider (ev.y))
1914# ifdef RXVT_SCROLL_FULL 2029# ifdef RXVT_SCROLL_FULL
1915 scr_page (DN, TermWin.nrow - 1); 2030 scr_page (DN, nrow - 1);
1916# else 2031# else
1917 scr_page (DN, TermWin.nrow / 4); 2032 scr_page (DN, nrow / 4);
1918# endif 2033# endif
1919 else 2034 else
1920 scrollBar.setMotion (); 2035 scrollBar.setMotion ();
1921 } 2036 }
1922 else 2037 else
1923 { 2038 {
1924 scr_page ((ev.button == Button1 ? DN : UP), 2039 scr_page ((ev.button == Button1 ? DN : UP),
1925 (TermWin.nrow 2040 (nrow
1926 * scrollbar_position (ev.y) 2041 * scrollbar_position (ev.y)
1927 / scrollbar_size ())); 2042 / scrollbar_size ()));
1928 } 2043 }
1929 2044
1930 break; 2045 break;
1962#ifdef SELECTION_SCROLLING 2077#ifdef SELECTION_SCROLLING
1963 if (sel_scroll_ev.active) 2078 if (sel_scroll_ev.active)
1964 sel_scroll_ev.stop(); 2079 sel_scroll_ev.stop();
1965#endif 2080#endif
1966 2081
1967 if (ev.window == TermWin.vt) 2082 if (ev.window == vt)
1968 { 2083 {
1969#if ISO_14755 2084#if ISO_14755
1970 // 5.4 2085 // 5.4
1971 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2086 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1972 return; 2087 return;
2022 2137
2023 v = ev.button == Button4 ? UP : DN; 2138 v = ev.button == Button4 ? UP : DN;
2024 2139
2025 if (ev.state & ShiftMask) 2140 if (ev.state & ShiftMask)
2026 i = 1; 2141 i = 1;
2027 else if (options & Opt_mouseWheelScrollPage) 2142 else if (OPTION (Opt_mouseWheelScrollPage))
2028 i = TermWin.nrow - 1; 2143 i = nrow - 1;
2029 else 2144 else
2030 i = 5; 2145 i = 5;
2031 2146
2032# ifdef MOUSE_SLIP_WHEELING 2147# ifdef MOUSE_SLIP_WHEELING
2033 if (ev.state & ControlMask) 2148 if (ev.state & ControlMask)
2034 { 2149 {
2035 mouse_slip_wheel_speed += v ? -1 : 1; 2150 mouse_slip_wheel_speed += v ? -1 : 1;
2036 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2037 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2038 2153
2039 if (slip_wheel_ev.at < NOW) 2154 if (slip_wheel_ev.at < NOW)
2040 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2155 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2041 2156
2042 slip_wheel_ev.start (); 2157 slip_wheel_ev.start ();
2318 XWindowAttributes wattr, wrootattr; 2433 XWindowAttributes wattr, wrootattr;
2319 dDisp; 2434 dDisp;
2320 2435
2321 pchanged = 0; 2436 pchanged = 0;
2322 2437
2323 if (!(options & Opt_transparent)) 2438 if (!OPTION (Opt_transparent))
2324 return pchanged; /* Don't try any more */ 2439 return pchanged; /* Don't try any more */
2325 2440
2326 XGetWindowAttributes (disp, display->root, &wrootattr); 2441 XGetWindowAttributes (disp, display->root, &wrootattr);
2327 rootdepth = wrootattr.depth; 2442 rootdepth = wrootattr.depth;
2328 2443
2329 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2444 XGetWindowAttributes (disp, parent[0], &wattr);
2330 2445
2331 if (rootdepth != wattr.depth) 2446 if (rootdepth != wattr.depth)
2332 { 2447 {
2333 if (am_transparent) 2448 if (am_transparent)
2334 { 2449 {
2335 pchanged = 1; 2450 pchanged = 1;
2336 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2451 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2337 am_transparent = am_pixmap_trans = 0; 2452 am_transparent = am_pixmap_trans = 0;
2338 } 2453 }
2339 2454
2340 return pchanged; /* Don't try any more */ 2455 return pchanged; /* Don't try any more */
2341 } 2456 }
2382 Window cr; 2497 Window cr;
2383 XImage *image; 2498 XImage *image;
2384 GC gc; 2499 GC gc;
2385 XGCValues gcvalue; 2500 XGCValues gcvalue;
2386 2501
2387 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2502 XTranslateCoordinates (disp, parent[0], display->root,
2388 0, 0, &sx, &sy, &cr); 2503 0, 0, &sx, &sy, &cr);
2389 nw = (unsigned int)szHint.width; 2504 nw = (unsigned int)szHint.width;
2390 nh = (unsigned int)szHint.height; 2505 nh = (unsigned int)szHint.height;
2391 nx = ny = 0; 2506 nx = ny = 0;
2392 2507
2402 nh += sy; 2517 nh += sy;
2403 ny = -sy; 2518 ny = -sy;
2404 sy = 0; 2519 sy = 0;
2405 } 2520 }
2406 2521
2407 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2522 min_it (nw, (unsigned int) (wrootattr.width - sx));
2408 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2523 min_it (nh, (unsigned int) (wrootattr.height - sy));
2409 2524
2410 XSync (disp, False); 2525 XSync (disp, False);
2411 allowedxerror = -1; 2526 allowedxerror = -1;
2412 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2527 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2413 2528
2418 if (image == NULL) 2533 if (image == NULL)
2419 { 2534 {
2420 if (am_transparent && am_pixmap_trans) 2535 if (am_transparent && am_pixmap_trans)
2421 { 2536 {
2422 pchanged = 1; 2537 pchanged = 1;
2423 if (TermWin.pixmap != None) 2538 if (pixmap != None)
2424 { 2539 {
2425 XFreePixmap (disp, TermWin.pixmap); 2540 XFreePixmap (disp, pixmap);
2426 TermWin.pixmap = None; 2541 pixmap = None;
2427 } 2542 }
2428 } 2543 }
2429 2544
2430 am_pixmap_trans = 0; 2545 am_pixmap_trans = 0;
2431 } 2546 }
2432 else 2547 else
2433 { 2548 {
2434 if (TermWin.pixmap != None) 2549 if (pixmap != None)
2435 XFreePixmap (disp, TermWin.pixmap); 2550 XFreePixmap (disp, pixmap);
2436 2551
2437#if TINTING 2552#if TINTING
2438 if (ISSET_PIXCOLOR (Color_tint)) 2553 if (ISSET_PIXCOLOR (Color_tint))
2439 { 2554 {
2440 unsigned short rm, gm, bm; 2555 unsigned short rm, gm, bm;
2444 2559
2445 ShadeXImage (display, image, shade, rm, gm, bm); 2560 ShadeXImage (display, image, shade, rm, gm, bm);
2446 } 2561 }
2447#endif 2562#endif
2448 2563
2449 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2564 pixmap = XCreatePixmap (disp, vt,
2450 szHint.width, szHint.height, image->depth); 2565 szHint.width, szHint.height, image->depth);
2451 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2566 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2452 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2567 XPutImage (disp, pixmap, gc, image, 0, 0,
2453 nx, ny, image->width, image->height); 2568 nx, ny, image->width, image->height);
2454 XFreeGC (disp, gc); 2569 XFreeGC (disp, gc);
2455 XDestroyImage (image); 2570 XDestroyImage (image);
2456 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2571 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2457 XClearWindow (disp, TermWin.parent[0]); 2572 XClearWindow (disp, parent[0]);
2458 2573
2459 if (!am_transparent || !am_pixmap_trans) 2574 if (!am_transparent || !am_pixmap_trans)
2460 pchanged = 1; 2575 pchanged = 1;
2461 2576
2462 am_transparent = am_pixmap_trans = 1; 2577 am_transparent = am_pixmap_trans = 1;
2463 } 2578 }
2464 } 2579 }
2465 2580
2466 if (am_pixmap_trans) 2581 if (am_pixmap_trans)
2467 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2468 else 2583 else
2469 { 2584 {
2470 unsigned int n; 2585 unsigned int n;
2471 /* 2586 /*
2472 * InheritPixmap transparency 2587 * InheritPixmap transparency
2473 */ 2588 */
2474 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2589 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2475 { 2590 {
2476 oldp = TermWin.parent[i]; 2591 oldp = parent[i];
2477 XQueryTree (disp, TermWin.parent[i - 1], &root, 2592 XQueryTree (disp, parent[i - 1], &root,
2478 &TermWin.parent[i], &list, &n); 2593 &parent[i], &list, &n);
2479 XFree (list); 2594 XFree (list);
2480 2595
2481 if (TermWin.parent[i] == display->root) 2596 if (parent[i] == display->root)
2482 { 2597 {
2483 if (oldp != None) 2598 if (oldp != None)
2484 pchanged = 1; 2599 pchanged = 1;
2485 2600
2486 break; 2601 break;
2487 } 2602 }
2488 2603
2489 if (oldp != TermWin.parent[i]) 2604 if (oldp != parent[i])
2490 pchanged = 1; 2605 pchanged = 1;
2491 } 2606 }
2492 2607
2493 n = 0; 2608 n = 0;
2494 2609
2495 if (pchanged) 2610 if (pchanged)
2496 { 2611 {
2497 for (; n < (unsigned int)i; n++) 2612 for (; n < (unsigned int)i; n++)
2498 { 2613 {
2499 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2614 XGetWindowAttributes (disp, parent[n], &wattr);
2500 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2615 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2501 { 2616 {
2502 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2617 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2503 break; 2618 break;
2504 } 2619 }
2505 } 2620 }
2506 } 2621 }
2507 2622
2508 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2623 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2509 { 2624 {
2510 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2625 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2511 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2626 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2512 am_transparent = 0; 2627 am_transparent = 0;
2513 /* XXX: also turn off Opt_transparent? */ 2628 /* XXX: also turn off Opt_transparent? */
2514 } 2629 }
2515 else 2630 else
2516 { 2631 {
2519 * needed for fvwm2.2.2 (and before?) */ 2634 * needed for fvwm2.2.2 (and before?) */
2520 sleep (1); 2635 sleep (1);
2521#endif 2636#endif
2522 for (n = 0; n < (unsigned int)i; n++) 2637 for (n = 0; n < (unsigned int)i; n++)
2523 { 2638 {
2524 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2525 XClearWindow (disp, TermWin.parent[n]); 2640 XClearWindow (disp, parent[n]);
2526 } 2641 }
2527 2642
2528 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2529 am_transparent = 1; 2644 am_transparent = 1;
2530 } 2645 }
2531 2646
2532 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2533 TermWin.parent[i] = None; 2648 parent[i] = None;
2534 } 2649 }
2535 2650
2536 if (scrollBar.win) 2651 if (scrollBar.win)
2537 { 2652 {
2538 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2581 // some window managers resize the window early, and these programs 2696 // some window managers resize the window early, and these programs
2582 // then sometimes get the size wrong. 2697 // then sometimes get the size wrong.
2583 // unfortunately other programs are even more buggy and dislike 2698 // unfortunately other programs are even more buggy and dislike
2584 // being sent SIGWINCH, so only do it when we were in fact being 2699 // being sent SIGWINCH, so only do it when we were in fact being
2585 // resized. 2700 // resized.
2586 if (seen_resize) 2701 if (seen_resize && cmd_pid)
2587 kill (-cmd_pid, SIGWINCH); 2702 kill (-cmd_pid, SIGWINCH);
2588 } 2703 }
2589 2704
2590 /* Read a text string from the input buffer */ 2705 /* Read a text string from the input buffer */
2591 unicode_t buf[UBUFSIZ]; 2706 unicode_t buf[UBUFSIZ];
2592 bool refreshnow = false; 2707 bool refreshnow = false;
2593 int nlines = 0; 2708 int nlines = 0;
2594 unicode_t *str = buf; 2709 unicode_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ);
2595 2711
2596 for (;;) 2712 for (;;)
2597 { 2713 {
2598 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2599 break; 2715 break;
2600 2716
2601 *str++ = ch; 2717 *str++ = ch;
2602 2718
2603 if (ch == C0_LF) 2719 if (ch == C0_LF || str >= eol)
2604 { 2720 {
2721 if (ch == C0_LF)
2605 nlines++; 2722 nlines++;
2723
2606 refresh_count++; 2724 refresh_count++;
2607 2725
2608 if (!(options & Opt_jumpScroll) 2726 if (!OPTION (Opt_jumpScroll)
2609 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2727 || (refresh_count >= refresh_limit * (nrow - 1)))
2610 { 2728 {
2611 refreshnow = true; 2729 refreshnow = true;
2730 refresh_count = 0;
2612 ch = NOCHAR; 2731 ch = NOCHAR;
2613 break; 2732 break;
2614 } 2733 }
2615 2734
2616 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2735 // scr_add_lines only works for nlines <= nrow - 1.
2617 if (nlines >= TermWin.nrow - 1) 2736 if (nlines >= nrow - 1)
2618 { 2737 {
2619 scr_add_lines (buf, nlines, str - buf); 2738 scr_add_lines (buf, nlines, str - buf);
2620 nlines = 0; 2739 nlines = 0;
2621 str = buf; 2740 str = buf;
2741 eol = str + min (ncol, UBUFSIZ);
2622 } 2742 }
2623 }
2624 2743
2625 if (str >= buf + UBUFSIZ) 2744 if (str >= eol)
2626 { 2745 {
2746 if (eol >= buf + UBUFSIZ)
2747 {
2627 ch = NOCHAR; 2748 ch = NOCHAR;
2628 break; 2749 break;
2750 }
2751 else
2752 eol = min (eol + ncol, buf + UBUFSIZ);
2753 }
2754
2629 } 2755 }
2630 2756
2631 seq_begin = cmdbuf_ptr; 2757 seq_begin = cmdbuf_ptr;
2632 ch = next_char (); 2758 ch = next_char ();
2633 } 2759 }
2640 * the number of pages between refreshes is refresh_limit, which 2766 * the number of pages between refreshes is refresh_limit, which
2641 * is incremented here because we must be doing flat-out scrolling. 2767 * is incremented here because we must be doing flat-out scrolling.
2642 */ 2768 */
2643 if (refreshnow) 2769 if (refreshnow)
2644 { 2770 {
2645 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2771 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2646 refresh_limit++; 2772 refresh_limit++;
2647 else 2773 else
2648 { 2774 {
2649 flag = true; 2775 flag = true;
2650 scr_refresh (refresh_type); 2776 scr_refresh (refresh_type);
2777 flush_ev.stop ();
2651 } 2778 }
2652 } 2779 }
2653 2780
2654 } 2781 }
2655 else 2782 else
3177 { 3304 {
3178 switch (priv) 3305 switch (priv)
3179 { 3306 {
3180 case '>': 3307 case '>':
3181 if (ch == CSI_DA) /* secondary device attributes */ 3308 if (ch == CSI_DA) /* secondary device attributes */
3182 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3309 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3183 break; 3310 break;
3184 case '?': 3311 case '?':
3185 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3312 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3186 process_terminal_mode (ch, priv, nargs, arg); 3313 process_terminal_mode (ch, priv, nargs, arg);
3187 break; 3314 break;
3292 3419
3293 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3420 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3294 arg[0] = -arg[0]; 3421 arg[0] = -arg[0];
3295 /* FALLTHROUGH */ 3422 /* FALLTHROUGH */
3296 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3423 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3297 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3424 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3298 break; 3425 break;
3299 3426
3300 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3427 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3301 tt_write ((const unsigned char *)VT100_ANS, 3428 tt_write ((const unsigned char *)VT100_ANS,
3302 (unsigned int) (sizeof (VT100_ANS) - 1)); 3429 (unsigned int) (sizeof (VT100_ANS) - 1));
3314 break; 3441 break;
3315 case 6: /* CPR requested */ 3442 case 6: /* CPR requested */
3316 scr_report_position (); 3443 scr_report_position ();
3317 break; 3444 break;
3318 case 7: /* unofficial extension */ 3445 case 7: /* unofficial extension */
3319 if (options & Opt_insecure) 3446 if (OPTION (Opt_insecure))
3320 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3447 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3321 break; 3448 break;
3322 case 8: /* unofficial extension */ 3449 case 8: /* unofficial extension */
3323 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3450 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3324 break; 3451 break;
3427 { 3554 {
3428 /* 3555 /*
3429 * commands 3556 * commands
3430 */ 3557 */
3431 case 1: /* deiconify window */ 3558 case 1: /* deiconify window */
3432 XMapWindow (disp, TermWin.parent[0]); 3559 XMapWindow (disp, parent[0]);
3433 break; 3560 break;
3434 case 2: /* iconify window */ 3561 case 2: /* iconify window */
3435 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3562 XIconifyWindow (disp, parent[0], display->screen);
3436 break; 3563 break;
3437 case 3: /* set position (pixels) */ 3564 case 3: /* set position (pixels) */
3438 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3565 XMoveWindow (disp, parent[0], args[1], args[2]);
3439 break; 3566 break;
3440 case 4: /* set size (pixels) */ 3567 case 4: /* set size (pixels) */
3441 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3568 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3442 break; 3569 break;
3443 case 5: /* raise window */ 3570 case 5: /* raise window */
3444 XRaiseWindow (disp, TermWin.parent[0]); 3571 XRaiseWindow (disp, parent[0]);
3445 break; 3572 break;
3446 case 6: /* lower window */ 3573 case 6: /* lower window */
3447 XLowerWindow (disp, TermWin.parent[0]); 3574 XLowerWindow (disp, parent[0]);
3448 break; 3575 break;
3449 case 7: /* refresh window */ 3576 case 7: /* refresh window */
3450 scr_touch (true); 3577 scr_touch (true);
3451 break; 3578 break;
3452 case 8: /* set size (chars) */ 3579 case 8: /* set size (chars) */
3453 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3580 set_widthheight ((unsigned int) (args[2] * fwidth),
3454 (unsigned int) (args[1] * TermWin.fheight)); 3581 (unsigned int) (args[1] * fheight));
3455 break; 3582 break;
3456 3583
3457 //case 9: NYI, TODO, restore maximized window or maximize window 3584 //case 9: NYI, TODO, restore maximized window or maximize window
3458 default: 3585 default:
3459 if (args[0] >= 24) /* set height (chars) */ 3586 if (args[0] >= 24) /* set height (chars) */
3460 set_widthheight ((unsigned int)TermWin.width, 3587 set_widthheight ((unsigned int)width,
3461 (unsigned int) (args[1] * TermWin.fheight)); 3588 (unsigned int) (args[1] * fheight));
3462 break; 3589 break;
3463 3590
3464 3591
3465 /* 3592 /*
3466 * reports - some output format copied from XTerm 3593 * reports - some output format copied from XTerm
3467 */ 3594 */
3468 case 11: /* report window state */ 3595 case 11: /* report window state */
3469 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3596 XGetWindowAttributes (disp, parent[0], &wattr);
3470 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3597 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3471 break; 3598 break;
3472 case 13: /* report window position */ 3599 case 13: /* report window position */
3473 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3600 XGetWindowAttributes (disp, parent[0], &wattr);
3474 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3601 XTranslateCoordinates (disp, parent[0], wattr.root,
3475 -wattr.border_width, -wattr.border_width, 3602 -wattr.border_width, -wattr.border_width,
3476 &x, &y, &wdummy); 3603 &x, &y, &wdummy);
3477 tt_printf ("\033[3;%d;%dt", x, y); 3604 tt_printf ("\033[3;%d;%dt", x, y);
3478 break; 3605 break;
3479 case 14: /* report window size (pixels) */ 3606 case 14: /* report window size (pixels) */
3480 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3607 XGetWindowAttributes (disp, parent[0], &wattr);
3481 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3608 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3482 break; 3609 break;
3483 case 18: /* report text area size (chars) */ 3610 case 18: /* report text area size (chars) */
3484 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3611 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3485 break; 3612 break;
3486 case 19: /* report window size (chars) */ 3613 case 19: /* report window size (chars) */
3487 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3614 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3488 break; 3615 break;
3489 case 20: /* report icon label */ 3616 case 20: /* report icon label */
3490 { 3617 {
3491 char *s; 3618 char *s;
3492 XGetIconName (disp, TermWin.parent[0], &s); 3619 XGetIconName (disp, parent[0], &s);
3493 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3620 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3494 XFree (s); 3621 XFree (s);
3495 } 3622 }
3496 break; 3623 break;
3497 case 21: /* report window title */ 3624 case 21: /* report window title */
3498 { 3625 {
3499 char *s; 3626 char *s;
3500 XFetchName (disp, TermWin.parent[0], &s); 3627 XFetchName (disp, parent[0], &s);
3501 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3628 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3502 XFree (s); 3629 XFree (s);
3503 } 3630 }
3504 break; 3631 break;
3505 } 3632 }
3506} 3633}
3538 else if (ch < 0x20) 3665 else if (ch < 0x20)
3539 return NULL; /* other control character - exit */ 3666 return NULL; /* other control character - exit */
3540 3667
3541 seen_esc = false; 3668 seen_esc = false;
3542 3669
3543 if (n >= sizeof (string) - 1) 3670 if (n >= STRING_MAX - 1)
3544 // stop at some sane length 3671 // stop at some sane length
3545 return NULL; 3672 return NULL;
3546 3673
3547 if (ch == C0_SYN) 3674 if (ch == C0_SYN)
3548 string[n++] = cmd_get8 (); 3675 string[n++] = cmd_get8 ();
3616 set_window_color (color, str); 3743 set_window_color (color, str);
3617} 3744}
3618 3745
3619/* 3746/*
3620 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3621 * 0 = change iconName/title
3622 * 1 = change iconName
3623 * 2 = change title
3624 * 4 = change color
3625 * 10 = change fg color
3626 * 11 = change bg color
3627 * 12 = change text color
3628 * 13 = change mouse foreground color
3629 * 17 = change highlight character colour
3630 * 18 = change bold character color
3631 * 19 = change underlined character color
3632 * 46 = change logfile (not implemented)
3633 * 50 = change font
3634 *
3635 * rxvt extensions:
3636 * 20 = bg pixmap
3637 * 39 = change default fg color
3638 * 49 = change default bg color
3639 * 55 = dump scrollback buffer and all of screen
3640 * 701 = change locale
3641 * 702 = find font
3642 * 703 = menu
3643 */ 3748 */
3644void 3749void
3645rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3750rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3646{ 3751{
3647 int changed = 0; 3752 int changed = 0;
3673 unsigned long bytes_after; 3778 unsigned long bytes_after;
3674 unsigned char *value = 0; 3779 unsigned char *value = 0;
3675 const char *str = ""; 3780 const char *str = "";
3676 3781
3677 if (prop 3782 if (prop
3678 && XGetWindowProperty (disp, TermWin.parent[0], 3783 && XGetWindowProperty (disp, parent[0],
3679 prop, 0, 1<<16, 0, AnyPropertyType, 3784 prop, 0, 1<<16, 0, AnyPropertyType,
3680 &actual_type, &actual_format, 3785 &actual_type, &actual_format,
3681 &nitems, &bytes_after, &value) == Success 3786 &nitems, &bytes_after, &value) == Success
3682 && actual_type != None 3787 && actual_type != None
3683 && actual_format == 8) 3788 && actual_format == 8)
3695 { 3800 {
3696 *eq = 0; 3801 *eq = 0;
3697 set_utf8_property (display->atom (str), eq + 1); 3802 set_utf8_property (display->atom (str), eq + 1);
3698 } 3803 }
3699 else 3804 else
3700 XDeleteProperty (disp, TermWin.parent[0], 3805 XDeleteProperty (disp, parent[0],
3701 display->atom (str)); 3806 display->atom (str));
3702 } 3807 }
3703 break; 3808 break;
3704 3809
3705 case XTerm_Color: 3810 case XTerm_Color:
3746 break; 3851 break;
3747#ifndef NO_BOLD_UNDERLINE_REVERSE 3852#ifndef NO_BOLD_UNDERLINE_REVERSE
3748 case XTerm_Color_BD: 3853 case XTerm_Color_BD:
3749 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3854 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3750 break; 3855 break;
3751 case XTerm_Color_IT:
3752 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3753 break;
3754 case XTerm_Color_UL: 3856 case XTerm_Color_UL:
3755 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3857 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3756 break; 3858 break;
3757 case XTerm_Color_RV: 3859 case XTerm_Color_RV:
3758 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3860 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3759 break; 3861 break;
3862 case URxvt_Color_IT:
3863 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3864 break;
3760#endif 3865#endif
3761#if TRANSPARENT && TINTING 3866#if TRANSPARENT && TINTING
3762 case XTerm_Color_tint: 3867 case URxvt_Color_tint:
3763 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3868 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3764 check_our_parents (); 3869 check_our_parents ();
3765 if (am_transparent) 3870 if (am_transparent)
3766 want_full_refresh = want_refresh = 1; 3871 want_full_refresh = want_refresh = 1;
3767 break; 3872 break;
3768#endif 3873#endif
3802 3907
3803 case XTerm_logfile: 3908 case XTerm_logfile:
3804 // TODO, when secure mode? 3909 // TODO, when secure mode?
3805 break; 3910 break;
3806 3911
3912#ifdef MENUBAR
3913 case URxvt_Menu:
3914 if (OPTION (Opt_insecure))
3915 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3916 break;
3917#endif
3918#if 0
3919 case XTerm_dumpscreen: /* no error notices */
3920 {
3921 int fd;
3922 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3923 {
3924 scr_dump (fd);
3925 close (fd);
3926 }
3927 }
3928 break;
3929#endif
3807 case XTerm_font: 3930 case XTerm_font:
3808 op = URxvt_font; 3931 op = URxvt_font;
3809 case URxvt_font: 3932 case URxvt_font:
3810#if ENABLE_STYLES 3933#if ENABLE_STYLES
3811 case URxvt_boldFont: 3934 case URxvt_boldFont:
3812 case URxvt_italicFont: 3935 case URxvt_italicFont:
3813 case URxvt_boldItalicFont: 3936 case URxvt_boldItalicFont:
3814#endif 3937#endif
3815 if (query) 3938 if (query)
3816 tt_printf ("\33]%d;%-.250s%c", saveop, 3939 tt_printf ("\33]%d;%-.250s%c", saveop,
3817 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3940 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3818 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3941 ? fontset[op - URxvt_font]->fontdesc : "",
3819 resp); 3942 resp);
3820 else 3943 else
3821 { 3944 {
3822 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3945 const char *&res = rs[Rs_font + (op - URxvt_font)];
3823 3946
3826 set_fonts (); 3949 set_fonts ();
3827 } 3950 }
3828 break; 3951 break;
3829 3952
3830#if ENABLE_FRILLS 3953#if ENABLE_FRILLS
3831 case XTerm_locale: 3954 case URxvt_locale:
3832 if (query) 3955 if (query)
3833 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3956 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3834 else 3957 else
3835 { 3958 {
3836 set_locale (str); 3959 set_locale (str);
3837 pty.set_utf8_mode (enc_utf8); 3960 pty.set_utf8_mode (enc_utf8);
3838# ifdef USE_XIM
3839 im_cb (); 3961 init_xlocale ();
3840# endif
3841 } 3962 }
3842 break; 3963 break;
3843#endif
3844 3964
3845#ifdef MENUBAR 3965 case URxvt_view_up:
3846 case XTerm_Menu: 3966 case URxvt_view_down:
3847 if (options & Opt_insecure) 3967 {
3848 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3968 int lines = atoi (str);
3969
3970 if (lines)
3971 scr_page (op == URxvt_view_up ? UP : DN, lines);
3972 else
3973 scr_erase_savelines ();
3974 }
3975
3849 break; 3976 break;
3850#endif 3977#endif
3851#if 0 3978
3852 case XTerm_dumpscreen: /* no error notices */ 3979#if ENABLE_PERL
3853 { 3980 case URxvt_perl:
3854 int fd; 3981 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
3855 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3982 ; // no responses yet
3856 {
3857 scr_dump (fd);
3858 close (fd);
3859 }
3860 }
3861 break; 3983 break;
3862#endif 3984#endif
3863 } 3985 }
3864} 3986}
3865/*----------------------------------------------------------------------*/ 3987/*----------------------------------------------------------------------*/
3974 } 4096 }
3975 4097
3976 /* extra handling for values with state unkept */ 4098 /* extra handling for values with state unkept */
3977 switch (arg[i]) 4099 switch (arg[i])
3978 { 4100 {
4101#if ENABLE_STYLES
4102 case 1021:
4103 if (mode)
4104 SET_OPTION (Opt_intensityStyles);
4105 else
4106 CLR_OPTION (Opt_intensityStyles);
4107
4108 scr_touch (true);
4109 break;
4110#endif
3979 case 1048: /* alternative cursor save */ 4111 case 1048: /* alternative cursor save */
3980 case 1049: 4112 case 1049:
3981 if (options & Opt_secondaryScreen) 4113 if (OPTION (Opt_secondaryScreen))
3982 if (mode == 0) 4114 if (mode == 0)
3983 scr_cursor (RESTORE); 4115 scr_cursor (RESTORE);
3984 else if (mode == 1) 4116 else if (mode == 1)
3985 scr_cursor (SAVE); 4117 scr_cursor (SAVE);
3986 break; 4118 break;
3998 */ 4130 */
3999 PrivMode (1, PrivMode_vt52); 4131 PrivMode (1, PrivMode_vt52);
4000 break; 4132 break;
4001 case 3: /* 80/132 */ 4133 case 3: /* 80/132 */
4002 if (priv_modes & PrivMode_132OK) 4134 if (priv_modes & PrivMode_132OK)
4003 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4135 set_widthheight (((state ? 132 : 80) * fwidth), height);
4004 break; 4136 break;
4005 case 4: /* smooth scrolling */ 4137 case 4: /* smooth scrolling */
4006 if (state) 4138 if (!state)
4007 options &= ~Opt_jumpScroll; 4139 SET_OPTION (Opt_jumpScroll);
4008 else 4140 else
4009 options |= Opt_jumpScroll; 4141 CLR_OPTION (Opt_jumpScroll);
4010 break; 4142 break;
4011 case 5: /* reverse video */ 4143 case 5: /* reverse video */
4012 scr_rvideo_mode (state); 4144 scr_rvideo_mode (state);
4013 break; 4145 break;
4014 case 6: /* relative/absolute origins */ 4146 case 6: /* relative/absolute origins */
4055#if 0 4187#if 0
4056 case 1001: 4188 case 1001:
4057 break; /* X11 mouse highlighting */ 4189 break; /* X11 mouse highlighting */
4058#endif 4190#endif
4059 case 1010: /* scroll to bottom on TTY output inhibit */ 4191 case 1010: /* scroll to bottom on TTY output inhibit */
4060 if (state) 4192 if (!state)
4061 options &= ~Opt_scrollTtyOutput; 4193 SET_OPTION (Opt_scrollTtyOutput);
4062 else 4194 else
4063 options |= Opt_scrollTtyOutput; 4195 CLR_OPTION (Opt_scrollTtyOutput);
4064 break; 4196 break;
4065 case 1011: /* scroll to bottom on key press */ 4197 case 1011: /* scroll to bottom on key press */
4066 if (state) 4198 if (state)
4067 options |= Opt_scrollTtyKeypress; 4199 SET_OPTION (Opt_scrollTtyKeypress);
4068 else 4200 else
4069 options &= ~Opt_scrollTtyKeypress; 4201 CLR_OPTION (Opt_scrollTtyKeypress);
4070 break; 4202 break;
4071 case 1047: /* secondary screen w/ clearing last */ 4203 case 1047: /* secondary screen w/ clearing last */
4072 if (options & Opt_secondaryScreen) 4204 if (OPTION (Opt_secondaryScreen))
4073 if (current_screen != PRIMARY) 4205 if (current_screen != PRIMARY)
4074 scr_erase_screen (2); 4206 scr_erase_screen (2);
4075 scr_change_screen (state); 4207 scr_change_screen (state);
4076 break; 4208 break;
4077 case 1049: /* secondary screen w/ clearing first */ 4209 case 1049: /* secondary screen w/ clearing first */
4078 scr_change_screen (state); 4210 scr_change_screen (state);
4079 if (options & Opt_secondaryScreen) 4211 if (OPTION (Opt_secondaryScreen))
4080 if (current_screen != PRIMARY) 4212 if (current_screen != PRIMARY)
4081 scr_erase_screen (2); 4213 scr_erase_screen (2);
4082 break; 4214 break;
4083 default: 4215 default:
4084 break; 4216 break;
4234 case 106: 4366 case 106:
4235 case 107: 4367 case 107:
4236 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4368 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4237 break; 4369 break;
4238#endif 4370#endif
4239
4240 } 4371 }
4241 } 4372 }
4242} 4373}
4243/*}}} */ 4374/*}}} */
4244 4375
4325 } 4456 }
4326 4457
4327 memmove (v_buffer, v_buffer + written, v_buflen); 4458 memmove (v_buffer, v_buffer + written, v_buflen);
4328 } 4459 }
4329 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4460 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4330 // original code just ignores this... 4461 pty_ev.set (EVENT_READ);
4331 destroy ();
4332} 4462}
4333 4463
4334/*----------------------- end-of-file (C source) -----------------------*/ 4464/*----------------------- end-of-file (C source) -----------------------*/
4335 4465

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines