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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines