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.81 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.245 by root, Fri Jan 6 18:33:30 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: command.c 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
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-2006 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
53#include <wchar.h> 56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE
60# include "keyboard.h"
61#endif
62
63#include <csignal>
54 64
55/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
56 66
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 68
59// exception thrown when the command parser runs out of input data 69// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input; 70class out_of_input { } out_of_input;
71
72#if ENABLE_FRILLS || ISO_14755
73
74#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
77#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
78#define ISO_14755_MASK 0x0fffffffUL
79
80#if ISO_14755
81static unsigned short iso14755_symtab[] = {
82 // keysym, unicode
83 XK_Left, 0x2190,
84 XK_KP_Left, 0x2190,
85 XK_Up, 0x2191,
86 XK_KP_Up, 0x2191,
87 XK_Right, 0x2192,
88 XK_KP_Right, 0x2192,
89 XK_Down, 0x2193,
90 XK_KP_Down, 0x2193,
91 XK_Linefeed, 0x21b4,
92 XK_Return, 0x21b5,
93 XK_KP_Enter, 0x21b5,
94
95 XK_Prior, 0x21de,
96 XK_Next, 0x21df,
97 XK_Tab, 0x21e5,
98 XK_ISO_Left_Tab, 0x21e6,
99 XK_Shift_L, 0x21e7,
100 XK_Shift_R, 0x21e7,
101
102 XK_Shift_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb,
104 XK_ISO_Lock, 0x21eb,
105 XK_Caps_Lock, 0x21ec,
106 XK_Num_Lock, 0x21ed,
107 XK_ISO_Level3_Shift, 0x21ee,
108 XK_ISO_Level3_Lock, 0x21ef,
109 XK_ISO_Group_Lock, 0x21f0,
110 XK_Home, 0x21f1,
111 XK_End, 0x21f2,
112
113 XK_Execute, 0x2318,
114 XK_Begin, 0x2320,
115 XK_Delete, 0x2326,
116 XK_Clear, 0x2327,
117 XK_BackSpace, 0x232b,
118 XK_Insert, 0x2380,
119 XK_Control_L, 0x2388,
120 XK_Control_R, 0x2388,
121 XK_Pause, 0x2389,
122 XK_Break, 0x238a,
123 XK_Escape, 0x238b,
124 XK_Undo, 0x238c,
125 XK_Print, 0x2399,
126
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,
135 XK_KP_Space, 0x2422,
136#endif
137 0,
138};
139
140void
141rxvt_term::iso14755_54 (int x, int y)
142{
143 x = Pixel2Col (x);
144 y = Pixel2Row (y);
145
146 if (!IN_RANGE_EXC (x, 0, ncol)
147 || !IN_RANGE_EXC (y, 0, nrow))
148 return;
149
150 for (;;)
151 {
152 const line_t &l = ROW(y - view_start);
153
154 text_t t = l.t[x];
155
156 if (t != NOCHAR || !x)
157 {
158 iso14755_51 (l.t[x], l.r[x], x, y);
159 iso14755buf = ISO_14755_54;
160 break;
161 }
162
163 x--;
164 }
165}
166
167void
168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
169{
170 rxvt_fontset *fs = FONTSET (r);
171 rxvt_font *f = (*fs)[fs->find_font (ch)];
172 wchar_t *chr, *alloc, ch2, *fname;
173 int len;
174
175 fname = rxvt_utf8towcs (f->name);
176
177# if ENABLE_COMBINING
178 if (IS_COMPOSE (ch))
179 {
180 len = rxvt_composite.expand (ch, 0);
181 alloc = chr = new wchar_t[len];
182 rxvt_composite.expand (ch, chr);
183 }
184 else
185# endif
186 {
187 ch2 = ch;
188
189 alloc = 0;
190 chr = &ch2;
191 len = 1;
192 }
193
194 char attr[80]; // plenty
195
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);
218
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220
221 for (int y = 0; y < len; y++)
222 {
223 char buf[9];
224
225 ch = *chr++;
226
227 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf);
229 scr_overlay_set (9, y, '=');
230# if !UNICODE3
231 if (ch >= 0x10000)
232 ch = 0xfffd;
233# endif
234 scr_overlay_set (11, y, ch, r);
235 scr_overlay_set (12, y, NOCHAR, r);
236 }
237
238 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname);
240
241 free (fname);
242
243# if ENABLE_COMBINING
244 if (alloc)
245 delete [] alloc;
246# endif
247}
248#endif
249
250void
251rxvt_term::commit_iso14755 ()
252{
253 wchar_t ch[2];
254
255 ch[0] = iso14755buf & ISO_14755_MASK;
256 ch[1] = 0;
257
258 if (iso14755buf & ISO_14755_51)
259 {
260 char mb[16];
261 int len;
262
263 // allow verbatim 0-bytes and control-bytes to be entered
264 if (ch[0] >= 0x20)
265 len = wcstombs (mb, ch, 16);
266 else
267 {
268 mb[0] = ch[0];
269 len = 1;
270 }
271
272 if (len > 0)
273 tt_write (mb, len);
274 else
275 scr_bell ();
276 }
277
278 iso14755buf = 0;
279}
280
281int
282rxvt_term::hex_keyval (XKeyEvent &ev)
283{
284 // check wether this event corresponds to a hex digit
285 // if the modifiers had not been pressed.
286 for (int index = 0; index < 8; index++)
287 {
288 KeySym k = XLookupKeysym (&ev, index);
289
290 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
291 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
292 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
293 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
294 }
295
296 return -1;
297}
298#endif
61 299
62/*{{{ Convert the keypress event into a string */ 300/*{{{ Convert the keypress event into a string */
63void 301void
64rxvt_term::lookup_key (XKeyEvent &ev) 302rxvt_term::lookup_key (XKeyEvent &ev)
65{ 303{
… …
68 KeySym keysym; 306 KeySym keysym;
69#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
70 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
71#endif 309#endif
72 int valid_keysym; 310 int valid_keysym;
73 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
74 312
75 /* 313 /*
76 * 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
77 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
78 * 316 *
79 * Always permit `shift' to override the current setting 317 * Always permit `shift' to override the current setting
80 */ 318 */
81 shft = (ev.state & ShiftMask); 319 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 320 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 321 meta = ev.state & ModMetaMask;
84 322
85 if (numlock_state || (ev.state & ModNumLockMask)) 323 if (numlock_state || (ev.state & ModNumLockMask))
86 { 324 {
87 numlock_state = (ev.state & ModNumLockMask); 325 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 326 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
96 Status status_return; 334 Status status_return;
97 335
98#if 0 336#if 0
99#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
102 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
103 else 341 else
104#endif 342#endif
105#endif 343#endif
106 { 344 {
… …
108 346
109 // the XOpenIM manpage lies about hardcoding the locale 347 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 348 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 349 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 350 SET_LOCALE (rs[Rs_imLocale]);
351
113 // assume wchar_t == unicode or better 352 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 353 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 354 KBUFSZ, &keysym, &status_return);
355
116 if (rs[Rs_imLocale]) 356 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 357 SET_LOCALE (locale);
118 358
119 if (status_return == XLookupChars 359 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 360 || status_return == XLookupBoth)
… …
141 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
142 } 382 }
143 else 383 else
144#endif 384#endif
145 { 385 {
146 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
147 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
148 } 388 }
149 389
150 if (valid_keysym) 390 if (valid_keysym)
151 { 391 {
392#ifdef KEYSYM_RESOURCE
393 if (keyboard->dispatch (this, keysym, ev.state))
394 return;
395#endif
396
152 if (TermWin.saveLines) 397 if (saveLines)
153 { 398 {
154#ifdef UNSHIFTED_SCROLLKEYS 399#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 400 if (!ctrl && !meta)
156 {
157#else 401#else
158 if (IS_SCROLL_MOD) 402 if (IS_SCROLL_MOD)
403#endif
159 { 404 {
160#endif
161 int lnsppg; 405 int lnsppg;
162 406
163#ifdef PAGING_CONTEXT_LINES 407#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 408 lnsppg = nrow - PAGING_CONTEXT_LINES;
165#else 409#else
166 lnsppg = TermWin.nrow * 4 / 5; 410 lnsppg = nrow * 4 / 5;
167#endif 411#endif
168 if (keysym == XK_Prior) 412 if (keysym == XK_Prior)
169 { 413 {
170 scr_page (UP, lnsppg); 414 scr_page (UP, lnsppg);
171 return; 415 return;
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 458 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 459 {
216 keysym += (XK_F11 - XK_F1); 460 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 461 shft = 0; /* turn off Shift */
218 } 462 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 463 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 464 {
221 switch (keysym) 465 switch (keysym)
222 { 466 {
223 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 469 selection_request (ev.time, 0, 0);
226 return; 470 return;
471#if TODO
227 /* rxvt extras */ 472 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 474 change_font (FONT_UP);
230 return; 475 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 476 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 477 change_font (FONT_DN);
233 return; 478 return;
479#endif
234 } 480 }
235 } 481 }
236 } 482 }
237#ifdef PRINTPIPE 483
238 if (keysym == XK_Print) 484#if ENABLE_FRILLS || ISO_14755
239 { 485 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 486 if (shft && ctrl)
241 return;
242 } 487 {
243#endif 488 int hv;
244 489
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 490 if (iso14755buf & ISO_14755_51
246 { 491 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 492 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 493 {
250 unsigned int l; 494 commit_iso14755 ();
251 const unsigned char *kbuf0; 495 iso14755buf = ISO_14755_51;
252 496# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 497 iso14755_51 (0);
254 l = (unsigned int)*kbuf0++;
255
256 /* escape prefix */
257 if (meta
258# ifdef META8_OPTION
259 && meta_char == C0_ESC
260# endif 498# endif
261 ) 499 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 500 }
266 501 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 502 {
503 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
504 | hv | ISO_14755_51;
505# if ISO_14755
506 iso14755_51 (iso14755buf & ISO_14755_MASK);
507# endif
268 return; 508 return;
269 } 509 }
270 else 510 else
511 {
512# if ENABLE_OVERLAY
513 scr_overlay_off ();
271#endif 514# endif
515 iso14755buf = 0;
516 }
517 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED))
521 {
522 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif
527 }
528#endif
529
530#ifdef PRINTPIPE
531 if (keysym == XK_Print)
532 {
533 scr_printscreen (ctrl | shft);
534 return;
535 }
536#endif
537
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 {
272 { 540 {
273 newlen = 1; 541 newlen = 1;
274 switch (keysym) 542 switch (keysym)
275 { 543 {
276#ifndef NO_BACKSPACE_KEY 544#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 545 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 546 if (priv_modes & PrivMode_HaveBackSpace)
279 { 547 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 549 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 550 kbuf[1] = '\0';
283 } 551 }
284 else 552 else
285 STRCPY (kbuf, key_backspace); 553 strcpy (kbuf, key_backspace);
286 break; 554 break;
287#endif 555#endif
288#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
289 case XK_Delete: 567 case XK_Delete:
290 STRCPY (kbuf, key_delete); 568 strcpy (kbuf, key_delete);
291 break; 569 break;
292#endif 570#endif
293 case XK_Tab: 571 case XK_Tab:
294 if (shft) 572 if (shft)
295 STRCPY (kbuf, "\033[Z"); 573 strcpy (kbuf, "\033[Z");
296 else 574 else
297 { 575 {
298#ifdef CTRL_TAB_MAKES_META 576#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 577 if (ctrl)
300 meta = 1; 578 meta = 1;
… …
306 newlen = 0; 584 newlen = 0;
307 } 585 }
308 break; 586 break;
309 587
310#ifdef XK_KP_Left 588#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 589 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 590 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 591 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 592 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 594 {
317 STRCPY (kbuf, "\033OZ"); 595 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 596 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 597 break;
320 } 598 }
321 else 599 else
322 /* translate to std. cursor key */ 600 /* translate to std. cursor key */
… …
325#endif 603#endif
326 case XK_Up: /* "\033[A" */ 604 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 605 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 606 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 607 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 608 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 609 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 610 /* do Shift first */
333 if (shft) 611 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 612 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 613 else if (ctrl)
336 { 614 {
337 kbuf[1] = 'O'; 615 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 616 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 617 }
340 else if (PrivateModes & PrivMode_aplCUR) 618 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 619 kbuf[1] = 'O';
342 break; 620 break;
343 621
344#ifndef UNSHIFTED_SCROLLKEYS 622#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 623# ifdef XK_KP_Prior
346 case XK_KP_Prior: 624 case XK_KP_Prior:
347 /* allow shift to override */ 625 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 627 {
350 STRCPY (kbuf, "\033Oy"); 628 strcpy (kbuf, "\033Oy");
351 break; 629 break;
352 } 630 }
353 /* FALLTHROUGH */ 631 /* FALLTHROUGH */
354# endif 632# endif
355 case XK_Prior: 633 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 634 strcpy (kbuf, "\033[5~");
357 break; 635 break;
358# ifdef XK_KP_Next 636# ifdef XK_KP_Next
359 case XK_KP_Next: 637 case XK_KP_Next:
360 /* allow shift to override */ 638 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 640 {
363 STRCPY (kbuf, "\033Os"); 641 strcpy (kbuf, "\033Os");
364 break; 642 break;
365 } 643 }
366 /* FALLTHROUGH */ 644 /* FALLTHROUGH */
367# endif 645# endif
368 case XK_Next: 646 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 647 strcpy (kbuf, "\033[6~");
370 break; 648 break;
371#endif 649#endif
372 case XK_KP_Enter: 650 case XK_KP_Enter:
373 /* allow shift to override */ 651 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 653 {
376 STRCPY (kbuf, "\033OM"); 654 strcpy (kbuf, "\033OM");
655 break;
656 }
657
658 /* FALLTHROUGH */
659
660 case XK_Return:
661 if (priv_modes & PrivMode_LFNL)
662 {
663 kbuf[0] = '\015';
664 kbuf[1] = '\012';
665 kbuf[2] = '\0';
377 } 666 }
378 else 667 else
379 { 668 {
380 kbuf[0] = '\r'; 669 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 670 kbuf[1] = '\0';
382 } 671 }
383 break; 672 break;
384 673
385#ifdef XK_KP_Begin 674#ifdef XK_KP_Begin
386 case XK_KP_Begin: 675 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 676 strcpy (kbuf, "\033Ou");
388 break; 677 break;
389 678
390 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op");
392 break;
393
394 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On");
396 break;
397#endif 679#endif
398 case XK_KP_F1: /* "\033OP" */ 680 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 681 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 682 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 683 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 684 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 685 kbuf[2] += (keysym - XK_KP_F1);
404 break; 686 break;
405 687
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 688 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 689 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 700 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 701 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 702 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 703 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 704 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 706 {
425 STRCPY (kbuf, "\033Oj"); 707 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 708 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 709 }
428 else 710 else
429 { 711 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 712 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 713 kbuf[1] = '\0';
432 } 714 }
433 break; 715 break;
434 716
435 case XK_Find: 717 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 718 strcpy (kbuf, "\033[1~");
437 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
438 case XK_Insert: 731 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 732 strcpy (kbuf, "\033[2~");
440 break; 733 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 734#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 735 case DXK_Remove:
443 /* FALLTHROUGH */ 736 /* FALLTHROUGH */
444#endif 737#endif
445 case XK_Execute: 738 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 739 strcpy (kbuf, "\033[3~");
447 break; 740 break;
448 case XK_Select: 741 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 742 strcpy (kbuf, "\033[4~");
450 break; 743 break;
451#ifdef XK_KP_End 744#ifdef XK_KP_End
452 case XK_KP_End: 745 case XK_KP_End:
453 /* allow shift to override */ 746 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 748 {
456 STRCPY (kbuf, "\033Oq"); 749 strcpy (kbuf, "\033Oq");
457 break; 750 break;
458 } 751 }
459 /* FALLTHROUGH */ 752 /* FALLTHROUGH */
460#endif 753#endif
461 case XK_End: 754 case XK_End:
462 STRCPY (kbuf, KS_END); 755 strcpy (kbuf, KS_END);
463 break; 756 break;
464#ifdef XK_KP_Home 757#ifdef XK_KP_Home
465 case XK_KP_Home: 758 case XK_KP_Home:
466 /* allow shift to override */ 759 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 761 {
469 STRCPY (kbuf, "\033Ow"); 762 strcpy (kbuf, "\033Ow");
470 break; 763 break;
471 } 764 }
472 /* FALLTHROUGH */ 765 /* FALLTHROUGH */
473#endif 766#endif
474 case XK_Home: 767 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 768 strcpy (kbuf, KS_HOME);
476 break; 769 break;
477 770
478#define FKEY(n, fkey) \ 771#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 772 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 773
… …
532#undef FKEY 825#undef FKEY
533 default: 826 default:
534 newlen = 0; 827 newlen = 0;
535 break; 828 break;
536 } 829 }
830
537 if (newlen) 831 if (newlen)
538 len = STRLEN (kbuf); 832 len = strlen (kbuf);
539 } 833 }
540 834
541 /* 835 /*
542 * Pass meta for all function keys, if 'meta' option set 836 * Pass meta for all function keys, if 'meta' option set
543 */ 837 */
… …
550 else if (ctrl && keysym == XK_minus) 844 else if (ctrl && keysym == XK_minus)
551 { 845 {
552 len = 1; 846 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 847 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 848 }
849 else if (keysym == XK_ISO_Left_Tab)
850 {
851 strcpy (kbuf, "\033[Z");
852 len = 3;
853 }
555 else 854 else
556 { 855 {
557#ifdef META8_OPTION 856#ifdef META8_OPTION
558 /* set 8-bit on */ 857 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
560 { 859 {
561 unsigned char *ch; 860 char *ch;
562 861
563 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
564 *ch |= 0x80; 863 *ch |= 0x80;
565 864
566 meta = 0; 865 meta = 0;
… …
568#endif 867#endif
569 /* nil */ ; 868 /* nil */ ;
570 } 869 }
571 } 870 }
572 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874
573 if (len <= 0) 875 if (len <= 0)
574 return; /* not mapped */ 876 return; /* not mapped */
575 877
576 if (Options & Opt_scrollTtyKeypress) 878 if (OPTION (Opt_scrollTtyKeypress))
577 if (TermWin.view_start) 879 if (view_start)
578 { 880 {
579 TermWin.view_start = 0; 881 view_start = 0;
580 want_refresh = 1; 882 want_refresh = 1;
581 } 883 }
582 884
583 /* 885 /*
584 * these modifications only affect the static keybuffer 886 * these modifications only affect the static keybuffer
… …
599#ifdef META8_OPTION 901#ifdef META8_OPTION
600 && meta_char == C0_ESC 902 && meta_char == C0_ESC
601#endif 903#endif
602 ) 904 )
603 { 905 {
604 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
605 tt_write (&ch, 1); 907 tt_write (&ch, 1);
606 } 908 }
607 909
608#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
609 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
617#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
618 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
619} 921}
620/*}}} */ 922/*}}} */
621 923
622#if (MENUBAR_MAX) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
625unsigned int 927unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
627{ 929{
628 unsigned int n, s; 930 unsigned int n, s;
629 931
630 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 934
633 if (n > 0 && s < count) 935 if (n > 0 && s < count)
634 { 936 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 937 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 938 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 939 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 940 cmdbuf_endp -= n;
639 s += n; 941 s += n;
640 } 942 }
… …
650 952
651 cmd_parse (); 953 cmd_parse ();
652 954
653 return 0; 955 return 0;
654} 956}
655#endif /* MENUBAR_MAX */ 957#endif
656 958
657void 959void
658rxvt_term::flush () 960rxvt_term::flush ()
659{ 961{
962 flush_ev.stop ();
963
660#ifdef TRANSPARENT 964#ifdef TRANSPARENT
661 if (want_full_refresh) 965 if (want_full_refresh)
662 { 966 {
663 want_full_refresh = 0; 967 want_full_refresh = 0;
664 scr_clear (); 968 scr_clear ();
665 scr_touch (false); 969 scr_touch (false);
666 want_refresh = 1;
667 } 970 }
668#endif 971#endif
669 972
670 if (want_refresh) 973 if (want_refresh)
671 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = -view_start;
978
979 while (row > -nsaved && ROW (row - 1).is_longer ())
980 --row;
981
982 while (row < -view_start + nrow)
983 {
984 int start_row = row;
985 line_t *l;
986
987 do
988 {
989 l = &ROW (row);
990
991 if (!(l->f & LINE_FILTERED))
992 {
993 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED;
995 while (l->is_longer ())
996 {
997 l = &ROW (++row);
998 l->f |= LINE_FILTERED;
999 }
1000
1001 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003
1004 break;
1005 }
1006 }
1007 while (l->is_longer ());
1008
1009 row++;
1010 }
1011
1012 }
1013
672 scr_refresh (refresh_type); 1014 scr_refresh (refresh_type);
673 scrollbar_show (1); 1015 scrollbar_show (1);
674#ifdef USE_XIM 1016#ifdef USE_XIM
675 IMSendSpot (); 1017 IMSendSpot ();
676#endif 1018#endif
677
678 } 1019 }
679 1020
680 display->flush (); 1021 display->flush ();
681} 1022}
682 1023
… …
684rxvt_term::check_cb (check_watcher &w) 1025rxvt_term::check_cb (check_watcher &w)
685{ 1026{
686 SET_R (this); 1027 SET_R (this);
687 SET_LOCALE (locale); 1028 SET_LOCALE (locale);
688 1029
1030 display->flush ();
1031
1032 if (want_refresh && !flush_ev.active)
1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034}
1035
1036void
1037rxvt_term::flush_cb (time_watcher &w)
1038{
1039 SET_R (this);
1040 SET_LOCALE (locale);
1041
1042 refresh_limit = 1;
1043 refresh_count = 0;
689 flush (); 1044 flush ();
690} 1045}
691 1046
692#ifdef CURSOR_BLINK 1047#ifdef CURSOR_BLINK
693void 1048void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 1066 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 1067 }
713} 1068}
714#endif 1069#endif
715 1070
1071#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1072void
1073rxvt_term::cont_scroll_cb (time_watcher &w)
1074{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076 scr_page (scrollbar_isUp() ? UP : DN, 1))
1077 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081 }
1082}
1083#endif
1084
1085#ifdef SELECTION_SCROLLING
1086void
1087rxvt_term::sel_scroll_cb (time_watcher &w)
1088{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 }
1096}
1097#endif
1098
1099#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1100void
1101rxvt_term::slip_wheel_cb (time_watcher &w)
1102{
1103 if (mouse_slip_wheel_speed == 0
1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105 : scr_page (UP, mouse_slip_wheel_speed))
1106 {
1107 if (view_start == nsaved ||
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0;
1110
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114 }
1115}
1116#endif
1117
1118#if HAVE_SCHED_YIELD
1119static struct event_handler
1120{
1121 check_watcher cw_yield;
1122
1123 void yield (check_watcher &w)
1124 {
1125 sched_yield ();
1126 w.stop ();
1127 }
1128
1129 event_handler ()
1130 : cw_yield (this, &event_handler::yield)
1131 {
1132 }
1133} event_handler;
1134#endif
1135
716bool 1136bool
717rxvt_term::pty_fill () 1137rxvt_term::pty_fill ()
718{ 1138{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1139 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1140
1141 if (CBUFSIZ == n)
1142 {
1143 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1144 n = 0;
1145 }
720 1146
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1147 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1148 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1149 cmdbuf_endp = cmdbuf_ptr + n;
724 1150
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
726 1152
727 if (n > 0) 1153 if (r > 0)
728 { 1154 {
729 cmdbuf_endp += n; 1155 cmdbuf_endp += r;
730 return true; 1156 return true;
731 } 1157 }
732 else if (n < 0 && errno != EAGAIN) 1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 {
1160#if HAVE_SCHED_YIELD
1161 if (display->is_local)
1162 event_handler.cw_yield.start ();
1163#endif
1164 }
1165 else
1166 {
1167 pty_ev.stop ();
1168
1169 if (!OPTION (Opt_hold))
733 destroy (); 1170 destroy ();
1171 }
734 1172
735 return false; 1173 return false;
736} 1174}
737 1175
738void 1176void
739rxvt_term::pty_cb (io_watcher &w, short revents) 1177rxvt_term::pty_cb (io_watcher &w, short revents)
740{ 1178{
741 SET_R (this); 1179 SET_R (this);
742 SET_LOCALE (locale); 1180 SET_LOCALE (locale);
743 1181
1182 if (revents & EVENT_READ)
1183 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ())
1185 if (cmd_parse ())
1186 break;
1187
744 if (revents & EVENT_WRITE) 1188 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1189 pty_write ();
746 else if (revents & EVENT_READ) 1190}
747 {
748 // loop, but don't allow a single term to monopolize us
749 // the number of loops is fully arbitrary, and thus wrong
750 while (pty_fill ())
751 {
752 if (!seen_input)
753 {
754 seen_input = 1;
755 /* once we know the shell is running, send the screen size. Again! */
756 // I don't know why, btw.
757 tt_winch ();
758 }
759 1191
760 if (cmd_parse ()) 1192void
761 break; 1193rxvt_term::pointer_unblank ()
762 } 1194{
763 } 1195 XDefineCursor (display->display, vt, TermWin_cursor);
1196 recolour_cursor ();
1197
1198#ifdef POINTER_BLANK
1199 hidden_pointer = 0;
1200
1201 if (OPTION (Opt_pointerBlank))
1202 pointer_ev.start (NOW + pointerBlankDelay);
1203#endif
764} 1204}
765 1205
766#ifdef POINTER_BLANK 1206#ifdef POINTER_BLANK
767void 1207void
768rxvt_term::pointer_unblank ()
769{
770 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
771 recolour_cursor ();
772
773 hidden_pointer = 0;
774
775 if (Options & Opt_pointerBlank)
776 pointer_ev.start (NOW + pointerBlankDelay);
777}
778
779void
780rxvt_term::pointer_blank () 1208rxvt_term::pointer_blank ()
781{ 1209{
782 if (! (Options & Opt_pointerBlank)) 1210 if (!OPTION (Opt_pointerBlank))
783 return; 1211 return;
784 1212
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1213 XDefineCursor (display->display, vt, display->blank_cursor);
786 XFlush (display->display); 1214 XFlush (display->display);
787 1215
788 hidden_pointer = 1; 1216 hidden_pointer = 1;
789} 1217}
790 1218
… …
807 x = ev.x; 1235 x = ev.x;
808 y = ev.y; 1236 y = ev.y;
809 pixel_position (&x, &y); 1237 pixel_position (&x, &y);
810 1238
811 if (MEvent.button == AnyButton) 1239 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1240 button_number = 3;
814 }
815 else 1241 else
816 { 1242 {
817 button_number = MEvent.button - Button1; 1243 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1244 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1245 if (button_number >= 3)
820 button_number += (64 - 3); 1246 button_number += (64 - 3);
821 } 1247 }
822 1248
823 if (PrivateModes & PrivMode_MouseX10) 1249 if (priv_modes & PrivMode_MouseX10)
824 { 1250 {
825 /* 1251 /*
826 * do not report ButtonRelease 1252 * do not report ButtonRelease
827 * no state info allowed 1253 * no state info allowed
828 */ 1254 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1269 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1270 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1271#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1272 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1273#endif
848
849 } 1274 }
850 1275
851#ifdef DEBUG_MOUSEREPORT 1276#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1277 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1278 if (key_state & 16)
854 fputc ('C', stderr); 1279 fputc ('C', stderr);
855 if (key_state & 4) 1280 if (key_state & 4)
856 fputc ('S', stderr); 1281 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1285 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1286 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1287 button_number,
863 x + 1, 1288 x + 1,
864 y + 1); 1289 y + 1);
865#else 1290#endif
1291
866 tt_printf ("\033[M%c%c%c", 1292 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1293 (32 + button_number + key_state),
868 (32 + x + 1), 1294 (32 + x + 1),
869 (32 + y + 1)); 1295 (32 + y + 1));
870#endif
871} 1296}
872 1297
873#ifdef USING_W11LIB 1298#ifdef USING_W11LIB
874void 1299void
875rxvt_W11_process_x_event (XEvent *ev) 1300rxvt_W11_process_x_event (XEvent *ev)
… …
882 1307
883/*{{{ process an X event */ 1308/*{{{ process an X event */
884void 1309void
885rxvt_term::x_cb (XEvent &ev) 1310rxvt_term::x_cb (XEvent &ev)
886{ 1311{
1312 dDisp;
1313
887 SET_R (this); 1314 SET_R (this);
888 SET_LOCALE (locale); 1315 SET_LOCALE (locale);
889 1316
890#if defined(CURSOR_BLINK) 1317#if defined(CURSOR_BLINK)
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
892 { 1319 {
893 if (hidden_cursor) 1320 if (hidden_cursor)
894 { 1321 {
895 hidden_cursor = 0; 1322 hidden_cursor = 0;
896 want_refresh = 1; 1323 want_refresh = 1;
… …
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
900 } 1327 }
901#endif 1328#endif
902 1329
903#if defined(POINTER_BLANK) 1330#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
905 { 1332 {
906 if (ev.type == MotionNotify 1333 if (ev.type == MotionNotify
907 || ev.type == ButtonPress 1334 || ev.type == ButtonPress
908 || ev.type == ButtonRelease) 1335 || ev.type == ButtonRelease)
909 if (hidden_pointer) 1336 if (hidden_pointer)
… …
912 if (ev.type == KeyPress && hidden_pointer == 0) 1339 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank (); 1340 pointer_blank ();
914 } 1341 }
915#endif 1342#endif
916 1343
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return;
920#endif
921
922 Window unused_root, unused_child; 1344 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1345 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1346 unsigned int unused_mask;
925
926#ifdef DEBUG_X
927 const char *const eventnames[] =
928 { /* mason - this matches my system */
929 "",
930 "",
931 "KeyPress",
932 "KeyRelease",
933 "ButtonPress",
934 "ButtonRelease",
935 "MotionNotify",
936 "EnterNotify",
937 "LeaveNotify",
938 "FocusIn",
939 "FocusOut",
940 "KeymapNotify",
941 "Expose",
942 "GraphicsExpose",
943 "NoExpose",
944 "VisibilityNotify",
945 "CreateNotify",
946 "DestroyNotify",
947 "UnmapNotify",
948 "MapNotify",
949 "MapRequest",
950 "ReparentNotify",
951 "ConfigureNotify",
952 "ConfigureRequest",
953 "GravityNotify",
954 "ResizeRequest",
955 "CirculateNotify",
956 "CirculateRequest",
957 "PropertyNotify",
958 "SelectionClear",
959 "SelectionRequest",
960 "SelectionNotify",
961 "ColormapNotify",
962 "ClientMessage",
963 "MappingNotify"
964 };
965#endif
966
967#ifdef DEBUG_X
968 struct timeval tp;
969 struct tm *ltt;
970 (void)gettimeofday (&tp, NULL);
971 ltt = localtime (& (tp.tv_sec));
972 D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial));
973#endif
974 1347
975 switch (ev.type) 1348 switch (ev.type)
976 { 1349 {
977 case KeyPress: 1350 case KeyPress:
1351#if ISO_14755
1352 if (!(iso14755buf & ISO_14755_52))
1353#endif
978 lookup_key (ev.xkey); 1354 lookup_key (ev.xkey);
1355
1356 break;
1357
1358 case KeyRelease:
1359 {
1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1361 KeySym ks;
1362
1363 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364#endif
1365
1366#if ENABLE_FRILLS || ISO_14755
1367 // ISO 14755 support
1368 if (iso14755buf)
1369 if (iso14755buf & ISO_14755_52)
1370 {
1371# if ENABLE_OVERLAY
1372 scr_overlay_off ();
1373# endif
1374# if ISO_14755
1375 // iso14755 part 5.2 handling: release time
1376 // first: controls
1377 if ((ev.xkey.state & ControlMask)
1378 && ((ks >= 0x40 && ks <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f)))
1380 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1382 commit_iso14755 ();
1383 return; // case-break;
1384 }
1385
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks)
1388 {
1389 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 ();
1391 return; // case-break;
1392 }
1393
1394 scr_bell ();
1395# endif
1396 iso14755buf = 0;
1397 break;
1398 }
1399 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1400 {
1401# if ENABLE_OVERLAY
1402 scr_overlay_off ();
1403# endif
1404 if (iso14755buf & ISO_14755_51)
1405 commit_iso14755 ();
1406#if ISO_14755
1407 else if (iso14755buf & ISO_14755_STARTED)
1408 {
1409 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1410
1411 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1412 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1413 }
1414# endif
1415 else
1416 iso14755buf = 0;
1417 }
1418#endif
1419
1420 if (ev.xany.window == vt
1421 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
979 break; 1422 break;
980 1423
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1424#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 if (! (ev.xkey.state & ControlMask)) 1425 if (!(ev.xkey.state & ControlMask))
1426 slip_wheel_ev.stop ();
1427 else if (ks == XK_Control_L || ks == XK_Control_R)
985 mouse_slip_wheel_speed = 0; 1428 mouse_slip_wheel_speed = 0;
986 else 1429#endif
987 {
988 KeySym ks;
989
990 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
991 if (ks == XK_Control_L || ks == XK_Control_R)
992 mouse_slip_wheel_speed = 0;
993 }
994 break; 1430 break;
995 } 1431 }
996#endif
997 1432
998 case ButtonPress: 1433 case ButtonPress:
999 button_press (ev.xbutton); 1434 button_press (ev.xbutton);
1000 break; 1435 break;
1001 1436
… …
1003 button_release (ev.xbutton); 1438 button_release (ev.xbutton);
1004 break; 1439 break;
1005 1440
1006 case ClientMessage: 1441 case ClientMessage:
1007 if (ev.xclient.format == 32 1442 if (ev.xclient.format == 32
1443 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1444 {
1008 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1445 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1009 destroy (); 1446 destroy ();
1447#if ENABLE_EWMH
1448 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1449 XSendEvent (disp, ev.xclient.window = display->root,
1450 False, SubstructureRedirectMask | SubstructureNotifyMask,
1451 &ev);
1452#endif
1453 }
1454#if ENABLE_XEMBED
1455 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1456 {
1457 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1458 focus_in ();
1459 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1460 focus_out ();
1461 }
1462#endif
1010#ifdef OFFIX_DND 1463#ifdef OFFIX_DND
1011 /* OffiX Dnd (drag 'n' drop) protocol */ 1464 /* OffiX Dnd (drag 'n' drop) protocol */
1012 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1465 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1013 && (ev.xclient.data.l[0] == DndFile 1466 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1467 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1468 || ev.xclient.data.l[0] == DndLink))
1016 { 1469 {
1017 /* Get Dnd data */ 1470 /* Get Dnd data */
1018 Atom ActualType; 1471 Atom ActualType;
1019 int ActualFormat; 1472 int ActualFormat;
1020 unsigned char *data; 1473 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1474 unsigned long Size, RemainingBytes;
1022 1475
1023 XGetWindowProperty (display->display, display->root, 1476 XGetWindowProperty (disp, display->root,
1024 xa[XA_DNDSELECTION], 1477 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1478 0L, 1000000L,
1026 False, AnyPropertyType, 1479 False, AnyPropertyType,
1027 &ActualType, &ActualFormat, 1480 &ActualType, &ActualFormat,
1028 &Size, &RemainingBytes, 1481 &Size, &RemainingBytes,
1029 &data); 1482 &data);
1030 XChangeProperty (display->display, display->root, 1483 set_string_property (XA_CUT_BUFFER0, data);
1031 XA_CUT_BUFFER0, XA_STRING, 1484 XFree (data);
1032 8, PropModeReplace,
1033 data, STRLEN (data));
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1485 selection_paste (display->root, XA_CUT_BUFFER0, true);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1486 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1036 } 1487 }
1037#endif /* OFFIX_DND */ 1488#endif /* OFFIX_DND */
1038 break; 1489 break;
1039 1490
1040 case MappingNotify: 1491 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1492 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1493 break;
1043 1494
1044 /* 1495 /*
1045 * XXX: this is not the _current_ arrangement 1496 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1497 * Here's my conclusion:
… …
1065 break; 1516 break;
1066 } 1517 }
1067 break; 1518 break;
1068 1519
1069 case FocusIn: 1520 case FocusIn:
1070 if (!TermWin.focus) 1521 focus_in ();
1522 break;
1523
1524 case FocusOut:
1525 focus_out ();
1526 break;
1527
1528 case ConfigureNotify:
1529 if (ev.xconfigure.window == parent[0])
1071 { 1530 {
1072 TermWin.focus = 1; 1531 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1073 want_refresh = 1; 1532 ;
1074#ifdef USE_XIM
1075 if (Input_Context != NULL)
1076 XSetICFocus (Input_Context);
1077#endif
1078#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1081#endif
1082 1533
1534 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1535 {
1536 seen_resize = 1;
1537 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1538 }
1539
1540#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1541 if (OPTION (Opt_transparent))
1542 check_our_parents ();
1543#endif
1083 } 1544 }
1084 break; 1545 break;
1085 1546
1086 case FocusOut:
1087 if (TermWin.focus)
1088 {
1089 TermWin.focus = 0;
1090 want_refresh = 1;
1091#ifdef USE_XIM
1092 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context);
1094#endif
1095#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink)
1097 cursor_blink_ev.stop ();
1098 hidden_cursor = 0;
1099#endif
1100
1101 }
1102 break;
1103
1104 case ConfigureNotify: 1547 case PropertyNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1548 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1106 { 1549 && ev.xproperty.state == PropertyNewValue)
1107 int height, width; 1550 selection_property (ev.xproperty.window, ev.xproperty.atom);
1108 1551
1109 do
1110 { /* Wrap lots of configures into one */
1111 width = ev.xconfigure.width;
1112 height = ev.xconfigure.height;
1113 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1114 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1116
1117 if (szHint.width != width || szHint.height != height)
1118 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1120 resize_all_windows (width, height, 1);
1121 }
1122#ifdef DEBUG_SIZE
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent)
1130 {
1131 check_our_parents ();
1132 if (am_transparent)
1133 want_full_refresh = 1;
1134 }
1135#endif
1136
1137 }
1138 break; 1552 break;
1139 1553
1140 case SelectionClear: 1554 case SelectionClear:
1141 selection_clear (); 1555 selection_clear ();
1142 break; 1556 break;
1143 1557
1144 case SelectionNotify: 1558 case SelectionNotify:
1145 if (selection_wait == Sel_normal) 1559 if (selection_wait == Sel_normal)
1146 selection_paste (ev.xselection.requestor, 1560 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1147 ev.xselection.property, True);
1148 break; 1561 break;
1149 1562
1150 case SelectionRequest: 1563 case SelectionRequest:
1151 selection_send (ev.xselectionrequest); 1564 selection_send (ev.xselectionrequest);
1152 break; 1565 break;
1153 1566
1154 case UnmapNotify: 1567 case UnmapNotify:
1155 TermWin.mapped = 0; 1568 mapped = 0;
1156#ifdef TEXT_BLINK 1569#ifdef TEXT_BLINK
1157 text_blink_ev.stop (); 1570 text_blink_ev.stop ();
1158#endif 1571#endif
1159 break; 1572 break;
1160 1573
1161 case MapNotify: 1574 case MapNotify:
1162 TermWin.mapped = 1; 1575 mapped = 1;
1163#ifdef TEXT_BLINK 1576#ifdef TEXT_BLINK
1164 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1577 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1165#endif 1578#endif
1166 break; 1579 break;
1167 1580
… …
1171 break; 1584 break;
1172#endif /* TRANSPARENT */ 1585#endif /* TRANSPARENT */
1173 1586
1174 case GraphicsExpose: 1587 case GraphicsExpose:
1175 case Expose: 1588 case Expose:
1176 if (ev.xany.window == TermWin.vt) 1589 if (ev.xany.window == vt)
1177 { 1590 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1591 do
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1592 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1593 ev.xexpose.width, ev.xexpose.height, False);
1181#else 1594 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1182 // don't understand this, so commented it out 1595
1596 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1597
1598 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1599 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1600 ev.xexpose.width, ev.xexpose.height, False);
1185 //scr_expose (ev.xexpose.x, 0, 1601
1186 // ev.xexpose.width, TermWin.height, False); 1602 scr_refresh (refresh_type);
1187#endif
1188 want_refresh = 1;
1189 } 1603 }
1190 else 1604 else
1191 { 1605 {
1192 XEvent unused_event; 1606 XEvent unused_event;
1193 1607
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1608 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1195 Expose, 1609 ;
1196 &unused_event)) ; 1610 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1611 ;
1198 GraphicsExpose, 1612
1199 &unused_event)) ;
1200 if (isScrollbarWindow (ev.xany.window)) 1613 if (isScrollbarWindow (ev.xany.window))
1201 { 1614 {
1202 scrollBar.setIdle (); 1615 scrollBar.setIdle ();
1203 scrollbar_show (0); 1616 scrollbar_show (0);
1204 } 1617 }
1205#ifdef MENUBAR 1618#ifdef MENUBAR
1206 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1619 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1207 menubar_expose (); 1620 menubar_expose ();
1208#endif 1621#endif
1622
1623#ifdef TRANSPARENT
1624 if (am_transparent && ev.xany.window == parent[0])
1625 XClearWindow (disp, ev.xany.window);
1626#endif
1209 } 1627 }
1210 break; 1628 break;
1211 1629
1212 case MotionNotify: 1630 case MotionNotify:
1213#ifdef POINTER_BLANK 1631#ifdef POINTER_BLANK
… …
1219 { 1637 {
1220 menubar_control (ev.xbutton); 1638 menubar_control (ev.xbutton);
1221 break; 1639 break;
1222 } 1640 }
1223#endif 1641#endif
1224 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1642 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1225 break; 1643 break;
1226 1644
1227 if (ev.xany.window == TermWin.vt) 1645 if (ev.xany.window == vt)
1228 { 1646 {
1647 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1648 ; // nop
1229 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1649 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1230 { 1650 {
1231 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1651 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1232 ; 1652 ;
1233 1653
1234 XQueryPointer (display->display, TermWin.vt, 1654 XQueryPointer (disp, vt,
1235 &unused_root, &unused_child, 1655 &unused_root, &unused_child,
1236 &unused_root_x, &unused_root_y, 1656 &unused_root_x, &unused_root_y,
1237 & (ev.xbutton.x), & (ev.xbutton.y), 1657 &ev.xbutton.x, &ev.xbutton.y,
1238 &unused_mask); 1658 &ev.xbutton.state);
1239#ifdef MOUSE_THRESHOLD 1659#ifdef MOUSE_THRESHOLD
1240 /* deal with a `jumpy' mouse */ 1660 /* deal with a `jumpy' mouse */
1241 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1661 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1242 { 1662 {
1243#endif 1663#endif
1664#if ISO_14755
1665 // 5.4
1666 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1667 {
1668 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1669 break;
1670 }
1671#endif
1244 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1672 selection_extend (ev.xbutton.x, ev.xbutton.y,
1245 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1673 ev.xbutton.state & Button3Mask ? 2 : 0);
1674
1246#ifdef SELECTION_SCROLLING 1675#ifdef SELECTION_SCROLLING
1247 if (ev.xbutton.y < TermWin.int_bwidth 1676 if (ev.xbutton.y < int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1677 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1249 { 1678 {
1250 int dist; 1679 int dist;
1251
1252 pending_scroll_selection=1;
1253 1680
1254 /* don't clobber the current delay if we are 1681 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1682 * already in the middle of scrolling.
1256 */ 1683 */
1257 if (scroll_selection_delay<=0) 1684 if (!sel_scroll_ev.active)
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1685 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1259 1686
1260 /* save the event params so we can highlight 1687 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1688 * the selection in the pending-scroll loop
1262 */ 1689 */
1263 selection_save_x=ev.xbutton.x; 1690 selection_save_x = ev.xbutton.x;
1264 selection_save_y=ev.xbutton.y; 1691 selection_save_y = ev.xbutton.y;
1265 selection_save_state=
1266 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1692 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1267 1693
1268 /* calc number of lines to scroll */ 1694 /* calc number of lines to scroll */
1269 if (ev.xbutton.y<TermWin.int_bwidth) 1695 if (ev.xbutton.y < int_bwidth)
1270 { 1696 {
1271 scroll_selection_dir = UP; 1697 scroll_selection_dir = UP;
1272 dist = TermWin.int_bwidth - ev.xbutton.y; 1698 dist = int_bwidth - ev.xbutton.y;
1273 } 1699 }
1274 else 1700 else
1275 { 1701 {
1276 scroll_selection_dir = DN; 1702 scroll_selection_dir = DN;
1277 dist = ev.xbutton.y - 1703 dist = ev.xbutton.y - (int_bwidth + height);
1278 (TermWin.int_bwidth + TermWin.height);
1279 } 1704 }
1705
1280 scroll_selection_lines= (Pixel2Height (dist)/ 1706 scroll_selection_lines = Pixel2Height (dist)
1281 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1707 / SELECTION_SCROLL_LINE_SPEEDUP
1708 + 1;
1282 MIN_IT (scroll_selection_lines, 1709 min_it (scroll_selection_lines,
1283 SELECTION_SCROLL_MAX_LINES); 1710 SELECTION_SCROLL_MAX_LINES);
1284 } 1711 }
1285 else 1712 else
1286 { 1713 {
1287 /* we are within the text window, so we 1714 /* we are within the text window, so we
1288 * shouldn't be scrolling 1715 * shouldn't be scrolling
1289 */ 1716 */
1290 pending_scroll_selection = 0; 1717 if (sel_scroll_ev.active)
1718 sel_scroll_ev.stop();
1291 } 1719 }
1292#endif 1720#endif
1293#ifdef MOUSE_THRESHOLD 1721#ifdef MOUSE_THRESHOLD
1294
1295 } 1722 }
1296#endif 1723#endif
1297
1298 } 1724 }
1299 } 1725 }
1300 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1726 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1301 { 1727 {
1302 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1728 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1303 MotionNotify, &ev)) ; 1729 MotionNotify, &ev))
1730 ;
1731
1304 XQueryPointer (display->display, scrollBar.win, 1732 XQueryPointer (disp, scrollBar.win,
1305 &unused_root, &unused_child, 1733 &unused_root, &unused_child,
1306 &unused_root_x, &unused_root_y, 1734 &unused_root_x, &unused_root_y,
1307 & (ev.xbutton.x), & (ev.xbutton.y), 1735 &ev.xbutton.x, &ev.xbutton.y,
1308 &unused_mask); 1736 &unused_mask);
1309 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1737 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1310 scrollbar_size ()); 1738 scrollbar_size ());
1311 scr_refresh (refresh_type); 1739 scr_refresh (refresh_type);
1312 refresh_limit = 0; 1740 refresh_limit = 0;
… …
1315 break; 1743 break;
1316 } 1744 }
1317} 1745}
1318 1746
1319void 1747void
1748rxvt_term::focus_in ()
1749{
1750 if (!focus)
1751 {
1752 focus = 1;
1753 want_refresh = 1;
1754
1755 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1756
1757#if USE_XIM
1758 if (Input_Context != NULL)
1759 {
1760 IMSetStatusPosition ();
1761 XSetICFocus (Input_Context);
1762 }
1763#endif
1764#if CURSOR_BLINK
1765 if (OPTION (Opt_cursorBlink))
1766 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1767#endif
1768#if OFF_FOCUS_FADING
1769 if (rs[Rs_fade])
1770 {
1771 pix_colors = pix_colors_focused;
1772 scr_recolour ();
1773 }
1774#endif
1775 }
1776}
1777
1778void
1779rxvt_term::focus_out ()
1780{
1781 if (focus)
1782 {
1783 focus = 0;
1784 want_refresh = 1;
1785
1786 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1787
1788#if ENABLE_FRILLS || ISO_14755
1789 if (iso14755buf)
1790 {
1791 iso14755buf = 0;
1792# if ENABLE_OVERLAY
1793 scr_overlay_off ();
1794# endif
1795 }
1796#endif
1797#if USE_XIM
1798 if (Input_Context != NULL)
1799 XUnsetICFocus (Input_Context);
1800#endif
1801#if CURSOR_BLINK
1802 if (OPTION (Opt_cursorBlink))
1803 cursor_blink_ev.stop ();
1804 hidden_cursor = 0;
1805#endif
1806#if OFF_FOCUS_FADING
1807 if (rs[Rs_fade])
1808 {
1809 pix_colors = pix_colors_unfocused;
1810 scr_recolour ();
1811 }
1812#endif
1813 }
1814}
1815
1816#if TRANSPARENT
1817void
1320rxvt_term::rootwin_cb (XEvent &ev) 1818rxvt_term::rootwin_cb (XEvent &ev)
1321{ 1819{
1322 SET_R (this); 1820 SET_R (this);
1323 SET_LOCALE (locale); 1821 SET_LOCALE (locale);
1324 1822
1325 switch (ev.type) 1823 switch (ev.type)
1326 { 1824 {
1327 case PropertyNotify: 1825 case PropertyNotify:
1328 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1329 {
1330 if (ev.xproperty.state == PropertyNewValue)
1331 selection_property (ev.xproperty.window, ev.xproperty.atom);
1332 break;
1333 }
1334#ifdef TRANSPARENT
1335 else
1336 {
1337 /* 1826 /*
1338 * if user used some Esetroot compatible prog to set the root bg, 1827 * if user used some Esetroot compatible prog to set the root bg,
1339 * use the property to determine the pixmap. We use it later on. 1828 * use the property to determine the pixmap. We use it later on.
1340 */ 1829 */
1341 if (xa[XA_XROOTPMAPID] == 0)
1342 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1343
1344 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1830 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1831 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1345 return; 1832 return;
1346 }
1347 1833
1348 /* FALLTHROUGH */ 1834 /* FALLTHROUGH */
1349 case ReparentNotify: 1835 case ReparentNotify:
1350 if ((Options & Opt_transparent) && check_our_parents ()) 1836 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1351 if (am_transparent)
1352 want_full_refresh = 1; 1837 want_refresh = want_full_refresh = 1;
1353 break; 1838 break;
1354#endif
1355 } 1839 }
1356} 1840}
1841#endif
1357 1842
1358void 1843void
1359rxvt_term::button_press (XButtonEvent &ev) 1844rxvt_term::button_press (XButtonEvent &ev)
1360{ 1845{
1361 int reportmode = 0, clickintime; 1846 int reportmode = 0, clickintime;
1362 1847
1363 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1848 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1849
1364 if (!bypass_keystate) 1850 if (!bypass_keystate)
1365 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1851 reportmode = !! (priv_modes & PrivMode_mouse_report);
1852
1366 /* 1853 /*
1367 * VT window processing of button press 1854 * VT window processing of button press
1368 */ 1855 */
1369 if (ev.window == TermWin.vt) 1856 if (ev.window == vt)
1370 { 1857 {
1858#if ISO_14755
1859 // 5.4
1860 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1861 {
1862 iso14755_54 (ev.x, ev.y);
1863 return;
1864 }
1865#endif
1866
1371 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1867 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1868
1372 if (reportmode) 1869 if (reportmode)
1373 { 1870 {
1374 /* mouse report from vt window */ 1871 /* mouse report from vt window */
1375 /* save the xbutton state (for ButtonRelease) */ 1872 /* save the xbutton state (for ButtonRelease) */
1376 MEvent.state = ev.state; 1873 MEvent.state = ev.state;
1377#ifdef MOUSE_REPORT_DOUBLECLICK 1874#ifdef MOUSE_REPORT_DOUBLECLICK
1378 if (ev.button == MEvent.button && clickintime) 1875 if (ev.button == MEvent.button && clickintime)
1379 { 1876 {
1380 /* same button, within alloted time */ 1877 /* same button, within alloted time */
1381 MEvent.clicks++; 1878 MEvent.clicks++;
1879
1382 if (MEvent.clicks > 1) 1880 if (MEvent.clicks > 1)
1383 { 1881 {
1384 /* only report double clicks */ 1882 /* only report double clicks */
1385 MEvent.clicks = 2; 1883 MEvent.clicks = 2;
1386 mouse_report (ev); 1884 mouse_report (ev);
… …
1405 } 1903 }
1406 else 1904 else
1407 { 1905 {
1408 if (ev.button != MEvent.button) 1906 if (ev.button != MEvent.button)
1409 MEvent.clicks = 0; 1907 MEvent.clicks = 0;
1908
1909 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1410 switch (ev.button) 1910 switch (ev.button)
1411 { 1911 {
1412 case Button1: 1912 case Button1:
1913 /* allow meta + click to select rectangular areas */
1914 /* should be done in screen.C */
1915#if ENABLE_FRILLS
1916 selection.rect = !!(ev.state & ModMetaMask);
1917#else
1918 selection.rect = false;
1919#endif
1920
1413 /* allow shift+left click to extend selection */ 1921 /* allow shift+left click to extend selection */
1414 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1922 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1415 { 1923 {
1416 if (MEvent.button == Button1 && clickintime) 1924 if (MEvent.button == Button1 && clickintime)
1417 selection_rotate (ev.x, ev.y); 1925 selection_rotate (ev.x, ev.y);
1418 else 1926 else
1419 selection_extend (ev.x, ev.y, 1); 1927 selection_extend (ev.x, ev.y, 1);
1420 } 1928 }
1421 else 1929 else
1422 { 1930 {
1423 if (MEvent.button == Button1 && clickintime) 1931 if (MEvent.button == Button1 && clickintime)
1424 MEvent.clicks++; 1932 MEvent.clicks++;
1425 else 1933 else
1426 MEvent.clicks = 1; 1934 MEvent.clicks = 1;
1427 1935
1428 selection_click (MEvent.clicks, ev.x, ev.y); 1936 selection_click (MEvent.clicks, ev.x, ev.y);
1429 } 1937 }
1430 1938
1431 MEvent.button = Button1; 1939 MEvent.button = Button1;
1432 break; 1940 break;
1433 1941
1434 case Button3: 1942 case Button3:
1435 if (MEvent.button == Button3 && clickintime) 1943 if (MEvent.button == Button3 && clickintime)
1436 selection_rotate (ev.x, ev.y); 1944 selection_rotate (ev.x, ev.y);
1437 else 1945 else
1438 selection_extend (ev.x, ev.y, 1); 1946 selection_extend (ev.x, ev.y, 1);
1947
1439 MEvent.button = Button3; 1948 MEvent.button = Button3;
1440 break; 1949 break;
1441 } 1950 }
1442 } 1951 }
1952
1443 MEvent.time = ev.time; 1953 MEvent.time = ev.time;
1444 return; 1954 return;
1445 } 1955 }
1446 1956
1447 /* 1957 /*
… …
1513 upordown = 1; /* down */ 2023 upordown = 1; /* down */
1514 } 2024 }
1515 if (upordown) 2025 if (upordown)
1516 { 2026 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2027#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2028 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1519#endif 2029#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 2030 if (scr_page (upordown < 0 ? UP : DN, 1))
1521 { 2031 {
1522 if (upordown < 0) 2032 if (upordown < 0)
1523 scrollBar.setUp (); 2033 scrollBar.setUp ();
… …
1539 break; 2049 break;
1540 case R_SB_ALIGN_BOTTOM: 2050 case R_SB_ALIGN_BOTTOM:
1541 csrO = scrollBar.bot - scrollBar.top; 2051 csrO = scrollBar.bot - scrollBar.top;
1542 break; 2052 break;
1543 } 2053 }
2054
1544 if (scrollBar.style == R_SB_XTERM 2055 if (scrollBar.style == R_SB_XTERM
1545 || scrollbar_above_slider (ev.y) 2056 || scrollbar_above_slider (ev.y)
1546 || scrollbar_below_slider (ev.y)) 2057 || scrollbar_below_slider (ev.y))
1547 scr_move_to ( scrollbar_position (ev.y) - csrO, 2058 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1548 scrollbar_size ()); 2059
1549 scrollBar.setMotion (); 2060 scrollBar.setMotion ();
1550 break; 2061 break;
1551 2062
1552 case Button1: 2063 case Button1:
1553 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2064 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1557 case Button3: 2068 case Button3:
1558 if (scrollBar.style != R_SB_XTERM) 2069 if (scrollBar.style != R_SB_XTERM)
1559 { 2070 {
1560 if (scrollbar_above_slider (ev.y)) 2071 if (scrollbar_above_slider (ev.y))
1561# ifdef RXVT_SCROLL_FULL 2072# ifdef RXVT_SCROLL_FULL
1562 scr_page (UP, TermWin.nrow - 1); 2073 scr_page (UP, nrow - 1);
1563# else 2074# else
1564 scr_page (UP, TermWin.nrow / 4); 2075 scr_page (UP, nrow / 4);
1565# endif 2076# endif
1566 else if (scrollbar_below_slider (ev.y)) 2077 else if (scrollbar_below_slider (ev.y))
1567# ifdef RXVT_SCROLL_FULL 2078# ifdef RXVT_SCROLL_FULL
1568 scr_page (DN, TermWin.nrow - 1); 2079 scr_page (DN, nrow - 1);
1569# else 2080# else
1570 scr_page (DN, TermWin.nrow / 4); 2081 scr_page (DN, nrow / 4);
1571# endif 2082# endif
1572 else 2083 else
1573 scrollBar.setMotion (); 2084 scrollBar.setMotion ();
1574 } 2085 }
1575 else 2086 else
1576 { 2087 {
1577 scr_page ((ev.button == Button1 ? DN : UP), 2088 scr_page ((ev.button == Button1 ? DN : UP),
1578 (TermWin.nrow 2089 (nrow
1579 * scrollbar_position (ev.y) 2090 * scrollbar_position (ev.y)
1580 / scrollbar_size ())); 2091 / scrollbar_size ()));
1581 } 2092 }
2093
1582 break; 2094 break;
1583 } 2095 }
1584 } 2096 }
2097
1585 return; 2098 return;
1586 } 2099 }
2100
1587#if MENUBAR 2101#if MENUBAR
1588 /* 2102 /*
1589 * Menubar window processing of button press 2103 * Menubar window processing of button press
1590 */ 2104 */
1591 if (isMenuBarWindow (ev.window)) 2105 if (isMenuBarWindow (ev.window))
… …
1598{ 2112{
1599 int reportmode = 0; 2113 int reportmode = 0;
1600 2114
1601 csrO = 0; /* reset csr Offset */ 2115 csrO = 0; /* reset csr Offset */
1602 if (!bypass_keystate) 2116 if (!bypass_keystate)
1603 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2117 reportmode = !! (priv_modes & PrivMode_mouse_report);
1604 2118
1605 if (scrollbar_isUpDn ()) 2119 if (scrollbar_isUpDn ())
1606 { 2120 {
1607 scrollBar.setIdle (); 2121 scrollBar.setIdle ();
1608 scrollbar_show (0); 2122 scrollbar_show (0);
1609#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2123#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1610 refresh_type &= ~SMOOTH_REFRESH; 2124 refresh_type &= ~SMOOTH_REFRESH;
1611#endif 2125#endif
1612
1613 } 2126 }
2127
1614#ifdef SELECTION_SCROLLING 2128#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 2129 if (sel_scroll_ev.active)
2130 sel_scroll_ev.stop();
1616#endif 2131#endif
2132
1617 if (ev.window == TermWin.vt) 2133 if (ev.window == vt)
1618 { 2134 {
2135#if ISO_14755
2136 // 5.4
2137 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2138 return;
2139#endif
1619 if (reportmode) 2140 if (reportmode)
1620 { 2141 {
1621 /* mouse report from vt window */ 2142 /* mouse report from vt window */
1622 /* don't report release of wheel "buttons" */ 2143 /* don't report release of wheel "buttons" */
1623 if (ev.button >= 4) 2144 if (ev.button >= 4)
… …
1637 MEvent.button = AnyButton; 2158 MEvent.button = AnyButton;
1638 mouse_report (ev); 2159 mouse_report (ev);
1639#endif /* MOUSE_REPORT_DOUBLECLICK */ 2160#endif /* MOUSE_REPORT_DOUBLECLICK */
1640 return; 2161 return;
1641 } 2162 }
2163
1642 /* 2164 /*
1643 * dumb hack to compensate for the failure of click-and-drag 2165 * dumb hack to compensate for the failure of click-and-drag
1644 * when overriding mouse reporting 2166 * when overriding mouse reporting
1645 */ 2167 */
1646 if (PrivateModes & PrivMode_mouse_report 2168 if (priv_modes & PrivMode_mouse_report
1647 && bypass_keystate 2169 && bypass_keystate
1648 && ev.button == Button1 && MEvent.clicks <= 1) 2170 && ev.button == Button1 && MEvent.clicks <= 1)
1649 selection_extend (ev.x, ev.y, 0); 2171 selection_extend (ev.x, ev.y, 0);
2172
2173 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2174 return;
1650 2175
1651 switch (ev.button) 2176 switch (ev.button)
1652 { 2177 {
1653 case Button1: 2178 case Button1:
1654 case Button3: 2179 case Button3:
… …
1662 case Button5: 2187 case Button5:
1663 { 2188 {
1664 int i; 2189 int i;
1665 page_dirn v; 2190 page_dirn v;
1666 2191
1667 v = (ev.button == Button4) ? UP : DN; 2192 v = ev.button == Button4 ? UP : DN;
2193
1668 if (ev.state & ShiftMask) 2194 if (ev.state & ShiftMask)
1669 i = 1; 2195 i = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 2196 else if (OPTION (Opt_mouseWheelScrollPage))
1671 i = TermWin.nrow - 1; 2197 i = nrow - 1;
1672 else 2198 else
1673 i = 5; 2199 i = 5;
2200
1674# ifdef MOUSE_SLIP_WHEELING 2201# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 2202 if (ev.state & ControlMask)
1676 { 2203 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 2204 mouse_slip_wheel_speed += v ? -1 : 1;
2205 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2206 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2207
2208 if (slip_wheel_ev.at < NOW)
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2209 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2210
2211 slip_wheel_ev.start ();
1679 } 2212 }
2213 else
2214 {
1680# endif 2215# endif
1681# ifdef JUMP_MOUSE_WHEEL 2216# ifdef JUMP_MOUSE_WHEEL
1682 scr_page (v, i);
1683 scr_refresh (SMOOTH_REFRESH);
1684 scrollbar_show (1);
1685# else
1686 while (i--)
1687 {
1688 scr_page (v, 1); 2217 scr_page (v, i);
1689 scr_refresh (SMOOTH_REFRESH); 2218 scr_refresh (SMOOTH_REFRESH);
1690 scrollbar_show (1); 2219 scrollbar_show (1);
2220# else
2221 while (i--)
2222 {
2223 scr_page (v, 1);
2224 scr_refresh (SMOOTH_REFRESH);
2225 scrollbar_show (1);
2226 }
2227# endif
2228# ifdef MOUSE_SLIP_WHEELING
1691 } 2229 }
1692# endif 2230#endif
1693
1694 } 2231 }
1695 break; 2232 break;
1696#endif 2233#endif
1697
1698 } 2234 }
1699 } 2235 }
1700#ifdef MENUBAR 2236#ifdef MENUBAR
1701 else if (isMenuBarWindow (ev.window)) 2237 else if (isMenuBarWindow (ev.window))
1702 menubar_control (ev); 2238 menubar_control (ev);
1703#endif 2239#endif
1704} 2240}
1705 2241
1706
1707#ifdef TRANSPARENT 2242#ifdef TRANSPARENT
2243#if TINTING
2244/* taken from aterm-0.4.2 */
2245
2246typedef uint32_t RUINT32T;
2247
2248void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2249{
2250 int sh_r, sh_g, sh_b;
2251 RUINT32T mask_r, mask_g, mask_b;
2252 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2253 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2254 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2255 int i;
2256
2257 Visual *visual = display->visual;
2258
2259 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2260
2261 /* for convenience */
2262 mask_r = visual->red_mask;
2263 mask_g = visual->green_mask;
2264 mask_b = visual->blue_mask;
2265
2266 /* boring lookup table pre-initialization */
2267 switch (srcImage->bits_per_pixel) {
2268 case 15:
2269 if ((mask_r != 0x7c00) ||
2270 (mask_g != 0x03e0) ||
2271 (mask_b != 0x001f))
2272 return;
2273 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2274 lookup_r = lookup;
2275 lookup_g = lookup+32;
2276 lookup_b = lookup+32+32;
2277 sh_r = 10;
2278 sh_g = 5;
2279 sh_b = 0;
2280 break;
2281 case 16:
2282 if ((mask_r != 0xf800) ||
2283 (mask_g != 0x07e0) ||
2284 (mask_b != 0x001f))
2285 return;
2286 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2287 lookup_r = lookup;
2288 lookup_g = lookup+32;
2289 lookup_b = lookup+32+64;
2290 sh_r = 11;
2291 sh_g = 5;
2292 sh_b = 0;
2293 break;
2294 case 24:
2295 if ((mask_r != 0xff0000) ||
2296 (mask_g != 0x00ff00) ||
2297 (mask_b != 0x0000ff))
2298 return;
2299 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2300 lookup_r = lookup;
2301 lookup_g = lookup+256;
2302 lookup_b = lookup+256+256;
2303 sh_r = 16;
2304 sh_g = 8;
2305 sh_b = 0;
2306 break;
2307 case 32:
2308 if ((mask_r != 0xff0000) ||
2309 (mask_g != 0x00ff00) ||
2310 (mask_b != 0x0000ff))
2311 return;
2312 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2313 lookup_r = lookup;
2314 lookup_g = lookup+256;
2315 lookup_b = lookup+256+256;
2316 sh_r = 16;
2317 sh_g = 8;
2318 sh_b = 0;
2319 break;
2320 default:
2321 return; /* we do not support this color depth */
2322 }
2323
2324 /* prepare limits for color transformation (each channel is handled separately) */
2325 if (shade < 0) {
2326 shade = -shade;
2327 if (shade < 0) shade = 0;
2328 if (shade > 100) shade = 100;
2329
2330 lower_lim_r = 65535-rm;
2331 lower_lim_g = 65535-gm;
2332 lower_lim_b = 65535-bm;
2333
2334 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2335 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2336 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2337
2338 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2339 } else {
2340 if (shade < 0) shade = 0;
2341 if (shade > 100) shade = 100;
2342
2343 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2344
2345 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2346 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2347 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2348 }
2349
2350 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2351 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2352 {
2353 unsigned int tmp;
2354
2355 tmp = lower_lim_r;
2356 lower_lim_r = lower_lim_b;
2357 lower_lim_b = tmp;
2358
2359 tmp = upper_lim_r;
2360 upper_lim_r = upper_lim_b;
2361 upper_lim_b = tmp;
2362 }
2363
2364 /* fill our lookup tables */
2365 for (i = 0; i <= mask_r>>sh_r; i++)
2366 {
2367 RUINT32T tmp;
2368 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2369 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2370 lookup_r[i] = (tmp/65535)<<sh_r;
2371 }
2372 for (i = 0; i <= mask_g>>sh_g; i++)
2373 {
2374 RUINT32T tmp;
2375 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2376 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2377 lookup_g[i] = (tmp/65535)<<sh_g;
2378 }
2379 for (i = 0; i <= mask_b>>sh_b; i++)
2380 {
2381 RUINT32T tmp;
2382 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2383 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2384 lookup_b[i] = (tmp/65535)<<sh_b;
2385 }
2386
2387 /* apply table to input image (replacing colors by newly calculated ones) */
2388 switch (srcImage->bits_per_pixel)
2389 {
2390 case 15:
2391 {
2392 unsigned short *p1, *pf, *p, *pl;
2393 p1 = (unsigned short *) srcImage->data;
2394 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2395 while (p1 < pf)
2396 {
2397 p = p1;
2398 pl = p1 + srcImage->width;
2399 for (; p < pl; p++)
2400 {
2401 *p = lookup_r[(*p & 0x7c00)>>10] |
2402 lookup_g[(*p & 0x03e0)>> 5] |
2403 lookup_b[(*p & 0x001f)];
2404 }
2405 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2406 }
2407 break;
2408 }
2409 case 16:
2410 {
2411 unsigned short *p1, *pf, *p, *pl;
2412 p1 = (unsigned short *) srcImage->data;
2413 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2414 while (p1 < pf)
2415 {
2416 p = p1;
2417 pl = p1 + srcImage->width;
2418 for (; p < pl; p++)
2419 {
2420 *p = lookup_r[(*p & 0xf800)>>11] |
2421 lookup_g[(*p & 0x07e0)>> 5] |
2422 lookup_b[(*p & 0x001f)];
2423 }
2424 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2425 }
2426 break;
2427 }
2428 case 24:
2429 {
2430 unsigned char *p1, *pf, *p, *pl;
2431 p1 = (unsigned char *) srcImage->data;
2432 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2433 while (p1 < pf)
2434 {
2435 p = p1;
2436 pl = p1 + srcImage->width * 3;
2437 for (; p < pl; p += 3)
2438 {
2439 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2440 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2441 p[2] = lookup_r[(p[2] & 0x0000ff)];
2442 }
2443 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2444 }
2445 break;
2446 }
2447 case 32:
2448 {
2449 RUINT32T *p1, *pf, *p, *pl;
2450 p1 = (RUINT32T *) srcImage->data;
2451 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2452
2453 while (p1 < pf)
2454 {
2455 p = p1;
2456 pl = p1 + srcImage->width;
2457 for (; p < pl; p++)
2458 {
2459 *p = lookup_r[(*p & 0xff0000)>>16] |
2460 lookup_g[(*p & 0x00ff00)>> 8] |
2461 lookup_b[(*p & 0x0000ff)] |
2462 (*p & ~0xffffff);
2463 }
2464 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2465 }
2466 break;
2467 }
2468 }
2469
2470 free (lookup);
2471}
2472#endif
2473
1708/* 2474/*
1709 * Check our parents are still who we think they are. 2475 * Check our parents are still who we think they are.
1710 * Do transparency updates if required 2476 * Do transparency updates if required
1711 */ 2477 */
1712int 2478int
1713rxvt_term::check_our_parents () 2479rxvt_term::check_our_parents ()
1714{ 2480{
1715 int i, pchanged, aformat, have_pixmap, rootdepth; 2481 int i, pchanged, aformat, have_pixmap, rootdepth;
1716 unsigned long nitems, bytes_after; 2482 unsigned long nitems, bytes_after;
1717 Atom atype; 2483 Atom atype;
1718 unsigned char *prop = NULL; 2484 unsigned char *prop = NULL;
1719 Window root, oldp, *list; 2485 Window root, oldp, *list;
1720 Pixmap rootpixmap = None; 2486 Pixmap rootpixmap = None;
1721 XWindowAttributes wattr, wrootattr; 2487 XWindowAttributes wattr, wrootattr;
2488 dDisp;
1722 2489
1723 pchanged = 0; 2490 pchanged = 0;
1724 2491
1725 if (! (Options & Opt_transparent)) 2492 if (!OPTION (Opt_transparent))
1726 return pchanged; /* Don't try any more */ 2493 return pchanged; /* Don't try any more */
1727 2494
1728 XGetWindowAttributes (display->display, display->root, &wrootattr); 2495 XGetWindowAttributes (disp, display->root, &wrootattr);
1729 rootdepth = wrootattr.depth; 2496 rootdepth = wrootattr.depth;
1730 2497
1731 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2498 XGetWindowAttributes (disp, parent[0], &wattr);
2499
1732 if (rootdepth != wattr.depth) 2500 if (rootdepth != wattr.depth)
1733 { 2501 {
1734 if (am_transparent) 2502 if (am_transparent)
1735 { 2503 {
1736 pchanged = 1; 2504 pchanged = 1;
1737 XSetWindowBackground (display->display, TermWin.vt, 2505 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1738 PixColors[Color_bg]);
1739 am_transparent = am_pixmap_trans = 0; 2506 am_transparent = am_pixmap_trans = 0;
1740 } 2507 }
2508
1741 return pchanged; /* Don't try any more */ 2509 return pchanged; /* Don't try any more */
1742 } 2510 }
1743 2511
1744 /* Get all X ops out of the queue so that our information is up-to-date. */ 2512 /* Get all X ops out of the queue so that our information is up-to-date. */
1745 XSync (display->display, False); 2513 XSync (disp, False);
1746 2514
1747 /* 2515 /*
1748 * Make the frame window set by the window manager have 2516 * Make the frame window set by the window manager have
1749 * the root background. Some window managers put multiple nested frame 2517 * the root background. Some window managers put multiple nested frame
1750 * windows for each client, so we have to take care about that. 2518 * windows for each client, so we have to take care about that.
1751 */ 2519 */
1752 i = (xa[XA_XROOTPMAPID] != 0 2520 i = (xa[XA_XROOTPMAP_ID]
1753 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2521 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1754 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2522 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1755 &nitems, &bytes_after, &prop) == Success)); 2523 &nitems, &bytes_after, &prop) == Success);
2524
1756 if (!i || prop == NULL) 2525 if (!i || prop == NULL)
2526 i = (xa[XA_ESETROOT_PMAP_ID]
2527 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2528 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2529 &nitems, &bytes_after, &prop) == Success);
2530
2531 if (!i || prop == NULL
2532#if TINTING
2533 || !rs[Rs_color + Color_tint]
2534#endif
2535 )
1757 have_pixmap = 0; 2536 have_pixmap = 0;
1758 else 2537 else
1759 { 2538 {
1760 have_pixmap = 1; 2539 have_pixmap = 1;
1761 rootpixmap = * ((Pixmap *)prop); 2540 rootpixmap = *(Pixmap *)prop;
1762 XFree (prop); 2541 XFree (prop);
1763 } 2542 }
2543
1764 if (have_pixmap) 2544 if (have_pixmap)
1765 { 2545 {
1766 /* 2546 /*
1767 * Copy display->root pixmap transparency 2547 * Copy display->root pixmap transparency
1768 */ 2548 */
… …
1771 Window cr; 2551 Window cr;
1772 XImage *image; 2552 XImage *image;
1773 GC gc; 2553 GC gc;
1774 XGCValues gcvalue; 2554 XGCValues gcvalue;
1775 2555
1776 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2556 XTranslateCoordinates (disp, parent[0], display->root,
1777 0, 0, &sx, &sy, &cr); 2557 0, 0, &sx, &sy, &cr);
1778 nw = (unsigned int)szHint.width; 2558 nw = (unsigned int)szHint.width;
1779 nh = (unsigned int)szHint.height; 2559 nh = (unsigned int)szHint.height;
1780 nx = ny = 0; 2560 nx = ny = 0;
1781 2561
1782 if (sx < 0) 2562 if (sx < 0)
… …
1791 nh += sy; 2571 nh += sy;
1792 ny = -sy; 2572 ny = -sy;
1793 sy = 0; 2573 sy = 0;
1794 } 2574 }
1795 2575
1796 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2576 min_it (nw, (unsigned int) (wrootattr.width - sx));
1797 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2577 min_it (nh, (unsigned int) (wrootattr.height - sy));
2578
2579 XSync (disp, False);
1798 allowedxerror = -1; 2580 allowedxerror = -1;
1799 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2581 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1800 ZPixmap); 2582
1801 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2583 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1802 /* XXX: may need a delay here? */ 2584 /* XXX: may need a delay here? */
1803 allowedxerror = 0; 2585 allowedxerror = 0;
2586
1804 if (image == NULL) 2587 if (image == NULL)
1805 { 2588 {
1806 if (am_transparent && am_pixmap_trans) 2589 if (am_transparent && am_pixmap_trans)
1807 { 2590 {
1808 pchanged = 1; 2591 pchanged = 1;
1809 if (TermWin.pixmap != None) 2592 if (pixmap != None)
1810 { 2593 {
1811 XFreePixmap (display->display, TermWin.pixmap); 2594 XFreePixmap (disp, pixmap);
1812 TermWin.pixmap = None; 2595 pixmap = None;
1813 } 2596 }
1814 } 2597 }
2598
1815 am_pixmap_trans = 0; 2599 am_pixmap_trans = 0;
1816 } 2600 }
1817 else 2601 else
1818 { 2602 {
1819 if (TermWin.pixmap != None) 2603 if (pixmap != None)
1820 XFreePixmap (display->display, TermWin.pixmap); 2604 XFreePixmap (disp, pixmap);
2605
2606#if TINTING
2607 if (ISSET_PIXCOLOR (Color_tint))
2608 {
2609 unsigned short rm, gm, bm;
2610 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2611
2612 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2613
2614 ShadeXImage (display, image, shade, rm, gm, bm);
2615 }
2616#endif
2617
1821 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2618 pixmap = XCreatePixmap (disp, vt,
1822 (unsigned int)szHint.width,
1823 (unsigned int)szHint.height, 2619 szHint.width, szHint.height, image->depth);
1824 (unsigned int)image->depth);
1825 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2620 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
1826 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2621 XPutImage (disp, pixmap, gc, image, 0, 0,
1827 nx, ny, (unsigned int)image->width,
1828 (unsigned int)image->height); 2622 nx, ny, image->width, image->height);
1829 XFreeGC (display->display, gc); 2623 XFreeGC (disp, gc);
1830 XDestroyImage (image); 2624 XDestroyImage (image);
1831 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2625 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
1832 TermWin.pixmap); 2626 XClearWindow (disp, parent[0]);
2627
1833 if (!am_transparent || !am_pixmap_trans) 2628 if (!am_transparent || !am_pixmap_trans)
1834 pchanged = 1; 2629 pchanged = 1;
2630
1835 am_transparent = am_pixmap_trans = 1; 2631 am_transparent = am_pixmap_trans = 1;
1836 } 2632 }
1837 } 2633 }
1838 2634
1839 if (!am_pixmap_trans) 2635 if (am_pixmap_trans)
2636 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2637 else
1840 { 2638 {
1841 unsigned int n; 2639 unsigned int n;
1842 /* 2640 /*
1843 * InheritPixmap transparency 2641 * InheritPixmap transparency
1844 */ 2642 */
1845 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1846 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2643 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
1847 i++)
1848 { 2644 {
1849 oldp = TermWin.parent[i]; 2645 oldp = parent[i];
1850 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2646 XQueryTree (disp, parent[i - 1], &root,
1851 &TermWin.parent[i], &list, &n); 2647 &parent[i], &list, &n);
1852 XFree (list); 2648 XFree (list);
1853 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2649
1854 if (TermWin.parent[i] == display->root) 2650 if (parent[i] == display->root)
1855 { 2651 {
1856 if (oldp != None) 2652 if (oldp != None)
1857 pchanged = 1; 2653 pchanged = 1;
2654
1858 break; 2655 break;
1859 } 2656 }
2657
1860 if (oldp != TermWin.parent[i]) 2658 if (oldp != parent[i])
1861 pchanged = 1; 2659 pchanged = 1;
1862 } 2660 }
1863 2661
1864 n = 0; 2662 n = 0;
1865 2663
1866 if (pchanged) 2664 if (pchanged)
1867 { 2665 {
1868 for (; n < (unsigned int)i; n++) 2666 for (; n < (unsigned int)i; n++)
1869 { 2667 {
1870 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2668 XGetWindowAttributes (disp, parent[n], &wattr);
1871 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
1872 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2669 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
1873 { 2670 {
1874 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2671 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
1875 break; 2672 break;
1876 } 2673 }
1877 } 2674 }
1878 } 2675 }
1879 2676
1880 if (n > (int) (sizeof (TermWin.parent) 2677 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
1881 / sizeof (TermWin.parent[0])))
1882 { 2678 {
1883 D_X ((stderr, "InheritPixmap Turning off")); 2679 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
1884 XSetWindowBackground (display->display, TermWin.parent[0], 2680 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1885 PixColors[Color_fg]);
1886 XSetWindowBackground (display->display, TermWin.vt,
1887 PixColors[Color_bg]);
1888 am_transparent = 0; 2681 am_transparent = 0;
1889 /* XXX: also turn off Opt_transparent? */ 2682 /* XXX: also turn off Opt_transparent? */
1890 } 2683 }
1891 else 2684 else
1892 { 2685 {
2686#if WAIT_FOR_WM
1893 /* wait (an arbitrary period) for the WM to do its thing 2687 /* wait (an arbitrary period) for the WM to do its thing
1894 * needed for fvwm2.2.2 (and before?) */ 2688 * needed for fvwm2.2.2 (and before?) */
1895# ifdef HAVE_NANOSLEEP
1896 struct timespec rqt;
1897
1898 rqt.tv_sec = 1;
1899 rqt.tv_nsec = 0;
1900 nanosleep (&rqt, NULL);
1901# else
1902 sleep (1); 2689 sleep (1);
1903# endif 2690#endif
1904 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
1905 for (n = 0; n < (unsigned int)i; n++) 2691 for (n = 0; n < (unsigned int)i; n++)
1906 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2692 {
1907 ParentRelative); 2693 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
1908 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2694 XClearWindow (disp, parent[n]);
1909 ParentRelative); 2695 }
2696
2697 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
1910 am_transparent = 1; 2698 am_transparent = 1;
1911 } 2699 }
1912 2700
1913 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2701 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
1914 TermWin.parent[i] = None; 2702 parent[i] = None;
2703 }
2704
2705 if (scrollBar.win)
1915 } 2706 {
2707 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2708 scrollBar.setIdle ();
2709 scrollbar_show (0);
2710 }
2711
2712 if (am_transparent)
2713 {
2714 want_refresh = want_full_refresh = 1;
2715 if (am_pixmap_trans)
2716 flush ();
2717 }
2718
1916 return pchanged; 2719 return pchanged;
1917} 2720}
1918#endif 2721#endif
1919 2722
1920/*}}} */ 2723/*}}} */
1921 2724
1922bool 2725bool
1923rxvt_term::cmd_parse () 2726rxvt_term::cmd_parse ()
1924{ 2727{
1925 bool flag = false; 2728 bool flag = false;
1926 unicode_t ch = NOCHAR; 2729 wchar_t ch = NOCHAR;
1927 unsigned char *seq_begin; // remember start of esc-sequence here 2730 char *seq_begin; // remember start of esc-sequence here
1928 2731
1929 for (;;) 2732 for (;;)
1930 { 2733 {
1931 if (ch == NOCHAR) 2734 if (ch == NOCHAR)
1932 { 2735 {
1933 seq_begin = cmdbuf_ptr; 2736 seq_begin = cmdbuf_ptr;
1934 ch = next_char (); 2737 ch = next_char ();
1935 }
1936 2738
1937 if (ch == NOCHAR) // TODO: improve 2739 if (ch == NOCHAR)
1938 break; 2740 break;
1939
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r')
1941 { 2741 }
2742
2743 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2744 {
2745 if (!seen_input)
2746 {
2747 seen_input = 1;
2748 // many badly-written programs (e.g. jed) contain a race condition:
2749 // they first read the screensize and then install a SIGWINCH handler.
2750 // some window managers resize the window early, and these programs
2751 // then sometimes get the size wrong.
2752 // unfortunately other programs are even more buggy and dislike
2753 // being sent SIGWINCH, so only do it when we were in fact being
2754 // resized.
2755 if (seen_resize && cmd_pid)
2756 kill (-cmd_pid, SIGWINCH);
2757 }
2758
1942 /* Read a text string from the input buffer */ 2759 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2760 wchar_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2761 bool refreshnow = false;
1945 int nlines = 0; 2762 int nlines = 0;
1946 unicode_t *str = buf; 2763 wchar_t *str = buf;
1947 2764 wchar_t *eol = str + min (ncol, UBUFSIZ);
1948 *str++ = ch;
1949 2765
1950 for (;;) 2766 for (;;)
1951 { 2767 {
1952 seq_begin = cmdbuf_ptr;
1953 ch = next_char ();
1954
1955 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2768 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
1956 break; 2769 break;
1957 2770
1958 *str++ = ch; 2771 *str++ = ch;
1959 2772
1960 if (ch == '\n') 2773 if (ch == C0_LF || str >= eol)
1961 { 2774 {
2775 if (ch == C0_LF)
1962 nlines++; 2776 nlines++;
2777
1963 refresh_count++; 2778 refresh_count++;
1964 2779
1965 if (! (Options & Opt_jumpScroll) 2780 if (!OPTION (Opt_jumpScroll)
1966 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2781 || (refresh_count >= refresh_limit * (nrow - 1)))
1967 { 2782 {
1968 refreshnow = true; 2783 refreshnow = true;
1969 flag = true; 2784 refresh_count = 0;
1970 ch = NOCHAR; 2785 ch = NOCHAR;
1971 break; 2786 break;
1972 } 2787 }
1973 2788
1974 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2789 // scr_add_lines only works for nlines <= nrow - 1.
1975 if (nlines >= TermWin.nrow - 1) 2790 if (nlines >= nrow - 1)
1976 { 2791 {
2792 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
1977 scr_add_lines (buf, nlines, str - buf); 2793 scr_add_lines (buf, str - buf, nlines);
2794
1978 nlines = 0; 2795 nlines = 0;
1979 str = buf; 2796 str = buf;
2797 eol = str + min (ncol, UBUFSIZ);
1980 } 2798 }
2799
2800 if (str >= eol)
2801 {
2802 if (eol >= buf + UBUFSIZ)
2803 {
2804 ch = NOCHAR;
2805 break;
2806 }
2807 else
2808 eol = min (eol + ncol, buf + UBUFSIZ);
2809 }
2810
1981 } 2811 }
1982 2812
1983 if (str >= buf + UBUFSIZ) 2813 seq_begin = cmdbuf_ptr;
1984 { 2814 ch = next_char ();
1985 ch = NOCHAR;
1986 break;
1987 }
1988 } 2815 }
1989 2816
2817 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
1990 scr_add_lines (buf, nlines, str - buf); 2818 scr_add_lines (buf, str - buf, nlines);
1991 2819
1992 /* 2820 /*
1993 * If there have been a lot of new lines, then update the screen 2821 * If there have been a lot of new lines, then update the screen
1994 * What the heck I'll cheat and only refresh less than every page-full. 2822 * What the heck I'll cheat and only refresh less than every page-full.
1995 * the number of pages between refreshes is refresh_limit, which 2823 * the number of pages between refreshes is refresh_limit, which
1996 * is incremented here because we must be doing flat-out scrolling. 2824 * is incremented here because we must be doing flat-out scrolling.
1997 *
1998 * refreshing should be correct for small scrolls, because of the
1999 * time-out
2000 */ 2825 */
2001 if (refreshnow) 2826 if (refreshnow)
2002 { 2827 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2828 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2004 refresh_limit++; 2829 refresh_limit++;
2005 2830 else
2831 {
2832 flag = true;
2006 scr_refresh (refresh_type); 2833 scr_refresh (refresh_type);
2834 flush_ev.stop ();
2835 }
2007 } 2836 }
2008 2837
2009 } 2838 }
2010 else 2839 else
2011 { 2840 {
… …
2026 2855
2027 return flag; 2856 return flag;
2028} 2857}
2029 2858
2030// read the next character 2859// read the next character
2031unicode_t 2860wchar_t
2032rxvt_term::next_char () 2861rxvt_term::next_char ()
2033{ 2862{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2863 while (cmdbuf_ptr < cmdbuf_endp)
2035 { 2864 {
2036 // assume 7-bit to be ascii ALWAYS 2865 // assume 7-bit to be ascii ALWAYS
2037 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2866 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2038 return *cmdbuf_ptr++; 2867 return *cmdbuf_ptr++;
2039 2868
2040 wchar_t wc; 2869 wchar_t wc;
2041 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2870 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2042 2871
2043 if (len == (size_t)-2) 2872 if (len == (size_t)-2)
2044 { 2873 {
2045 // the mbstate stores incomplete sequences. didn't know this :/ 2874 // the mbstate stores incomplete sequences. didn't know this :/
2046 cmdbuf_ptr = cmdbuf_endp; 2875 cmdbuf_ptr = cmdbuf_endp;
2047 break; 2876 break;
2048 } 2877 }
2049 2878
2050 if (len == (size_t)-1) 2879 if (len == (size_t)-1)
2051 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2880 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2052 2881
2053 // assume wchar == unicode 2882 // assume wchar == unicode
2054 cmdbuf_ptr += len; 2883 cmdbuf_ptr += len;
2055 return wc; 2884 return wc & UNICODE_MASK;
2056 } 2885 }
2057 2886
2058 return NOCHAR; 2887 return NOCHAR;
2888}
2889
2890// read the next octet
2891uint32_t
2892rxvt_term::next_octet ()
2893{
2894 return cmdbuf_ptr < cmdbuf_endp
2895 ? *cmdbuf_ptr++
2896 : NOCHAR;
2059} 2897}
2060 2898
2061/* rxvt_cmd_getc () - Return next input character */ 2899/* rxvt_cmd_getc () - Return next input character */
2062/* 2900/*
2063 * Return the next input character after first passing any keyboard input 2901 * Return the next input character after first passing any keyboard input
2064 * to the command. 2902 * to the command.
2065 */ 2903 */
2066unicode_t 2904wchar_t
2067rxvt_term::cmd_getc () 2905rxvt_term::cmd_getc ()
2068{ 2906{
2069 unicode_t c = next_char (); 2907 wchar_t c = next_char ();
2908
2909 if (c == NOCHAR)
2910 throw out_of_input;
2911
2912 return c;
2913}
2914
2915uint32_t
2916rxvt_term::cmd_get8 ()
2917{
2918 uint32_t c = next_octet ();
2070 2919
2071 if (c == NOCHAR) 2920 if (c == NOCHAR)
2072 throw out_of_input; 2921 throw out_of_input;
2073 2922
2074 return c; 2923 return c;
… …
2156/*}}} */ 3005/*}}} */
2157 3006
2158/* *INDENT-OFF* */ 3007/* *INDENT-OFF* */
2159enum { 3008enum {
2160 C1_40 = 0x40, 3009 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 3010 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2162 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 3011 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2163 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 3012 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2164 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 3013 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 3014};
2166/* *INDENT-ON* */ 3015/* *INDENT-ON* */
2167 3016
2168/*{{{ process non-printing single characters */ 3017/*{{{ process non-printing single characters */
2169void 3018void
… …
2174 case C0_ESC: 3023 case C0_ESC:
2175 process_escape_seq (); 3024 process_escape_seq ();
2176 break; 3025 break;
2177 case C0_ENQ: /* terminal Status */ 3026 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 3027 if (rs[Rs_answerbackstring])
2179 tt_write ( 3028 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2180 (const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2182 else 3029 else
2183 tt_write ((unsigned char *)VT100_ANS, 3030 tt_write (VT100_ANS, strlen (VT100_ANS));
2184 (unsigned int)STRLEN (VT100_ANS));
2185 break; 3031 break;
2186 case C0_BEL: /* bell */ 3032 case C0_BEL: /* bell */
2187 scr_bell (); 3033 scr_bell ();
2188 break; 3034 break;
2189 case C0_BS: /* backspace */ 3035 case C0_BS: /* backspace */
… …
2205 break; 3051 break;
2206 case C0_SI: /* shift in - acs */ 3052 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 3053 scr_charset_choose (0);
2208 break; 3054 break;
2209 3055
3056#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 3057 // 8-bit controls
2211 case 0x90: /* DCS */ 3058 case 0x90: /* DCS */
2212 process_dcs_seq (); 3059 process_dcs_seq ();
2213 break; 3060 break;
2214 case 0x9b: /* CSI */ 3061 case 0x9b: /* CSI */
2215 process_csi_seq (); 3062 process_csi_seq ();
2216 break; 3063 break;
2217 case 0x9d: /* CSI */ 3064 case 0x9d: /* CSI */
2218 process_osc_seq (); 3065 process_osc_seq ();
2219 break; 3066 break;
3067#endif
2220 } 3068 }
2221} 3069}
2222/*}}} */ 3070/*}}} */
2223 3071
2224 3072
… …
2286void 3134void
2287rxvt_term::process_escape_seq () 3135rxvt_term::process_escape_seq ()
2288{ 3136{
2289 unicode_t ch = cmd_getc (); 3137 unicode_t ch = cmd_getc ();
2290 3138
2291 if (PrivateModes & PrivMode_vt52) 3139 if (priv_modes & PrivMode_vt52)
2292 { 3140 {
2293 process_escape_vt52 (ch); 3141 process_escape_vt52 (ch);
2294 return; 3142 return;
2295 } 3143 }
2296 3144
… …
2311 scr_charset_set (2, (unsigned int)cmd_getc ()); 3159 scr_charset_set (2, (unsigned int)cmd_getc ());
2312 break; 3160 break;
2313 case '+': 3161 case '+':
2314 scr_charset_set (3, (unsigned int)cmd_getc ()); 3162 scr_charset_set (3, (unsigned int)cmd_getc ());
2315 break; 3163 break;
2316#ifndef NO_FRILLS 3164#if ENABLE_FRILLS
2317 case '6': 3165 case '6':
2318 scr_backindex (); 3166 scr_backindex ();
2319 break; 3167 break;
2320#endif 3168#endif
2321 case '7': 3169 case '7':
2322 scr_cursor (SAVE); 3170 scr_cursor (SAVE);
2323 break; 3171 break;
2324 case '8': 3172 case '8':
2325 scr_cursor (RESTORE); 3173 scr_cursor (RESTORE);
2326 break; 3174 break;
2327#ifndef NO_FRILLS 3175#if ENABLE_FRILLS
2328 case '9': 3176 case '9':
2329 scr_forwardindex (); 3177 scr_forwardindex ();
2330 break; 3178 break;
2331#endif 3179#endif
2332 case '=': 3180 case '=':
… …
2342 break; 3190 break;
2343 3191
2344 /* 8.3.87: NEXT LINE */ 3192 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 3193 case C1_NEL: /* ESC E */
2346 { 3194 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 3195 wchar_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 3196 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2349 } 3197 }
2350 break; 3198 break;
2351 3199
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 3200 /* kidnapped escape sequence: Should be 8.3.48 */
2353 case C1_ESA: /* ESC G */ 3201 case C1_ESA: /* ESC G */
… …
2363 case C1_RI: /* ESC M */ 3211 case C1_RI: /* ESC M */
2364 scr_index (DN); 3212 scr_index (DN);
2365 break; 3213 break;
2366 3214
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 3215 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 3216 /*case C1_SS2: scr_single_shift (2); break; */
2369 3217
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 3218 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 3219 /*case C1_SS3: scr_single_shift (3); break; */
2372 3220
2373 /* 8.3.27: DEVICE CONTROL STRING */ 3221 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 3222 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 3223 process_dcs_seq ();
2376 break; 3224 break;
2377 3225
2378 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3226 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2379 case C1_SCI: /* ESC Z */ 3227 case C1_SCI: /* ESC Z */
2380 tt_write ((const unsigned char *)ESCZ_ANSWER, 3228 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2381 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2382 break; /* steal obsolete ESC [ c */ 3229 break; /* steal obsolete ESC [ c */
2383 3230
2384 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3231 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2385 case C1_CSI: /* ESC [ */ 3232 case C1_CSI: /* ESC [ */
2386 process_csi_seq (); 3233 process_csi_seq ();
… …
2391 process_osc_seq (); 3238 process_osc_seq ();
2392 break; 3239 break;
2393 3240
2394 /* 8.3.106: RESET TO INITIAL STATE */ 3241 /* 8.3.106: RESET TO INITIAL STATE */
2395 case 'c': 3242 case 'c':
3243 mbstate.reset ();
2396 scr_poweron (); 3244 scr_poweron ();
2397 scrollbar_show (1); 3245 scrollbar_show (1);
2398 break; 3246 break;
2399 3247
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3248 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2412 3260
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3261/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */ 3262/* *INDENT-OFF* */
2415enum { 3263enum {
2416 CSI_ICH = 0x40, 3264 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3265 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2418 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3266 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2419 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3267 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2420 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3268 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2421 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3269 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2422 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3270 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2437 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 3285 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2438 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 3286 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2439 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 3287 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2440 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 3288 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2441 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 3289 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2442 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 3290 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 3291 };
2444/* *INDENT-ON* */ 3292/* *INDENT-ON* */
2445 3293
2446void 3294void
2447rxvt_term::process_csi_seq () 3295rxvt_term::process_csi_seq ()
… …
2510 { 3358 {
2511 switch (priv) 3359 switch (priv)
2512 { 3360 {
2513 case '>': 3361 case '>':
2514 if (ch == CSI_DA) /* secondary device attributes */ 3362 if (ch == CSI_DA) /* secondary device attributes */
2515 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3363 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2516 break; 3364 break;
2517 case '?': 3365 case '?':
2518 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3366 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2519 process_terminal_mode (ch, priv, nargs, arg); 3367 process_terminal_mode (ch, priv, nargs, arg);
2520 break; 3368 break;
… …
2625 3473
2626 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3474 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2627 arg[0] = -arg[0]; 3475 arg[0] = -arg[0];
2628 /* FALLTHROUGH */ 3476 /* FALLTHROUGH */
2629 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3477 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2630 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3478 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2631 break; 3479 break;
2632 3480
2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3481 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2634 tt_write ((const unsigned char *)VT100_ANS, 3482 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2635 (unsigned int) (sizeof (VT100_ANS) - 1));
2636 break; 3483 break;
2637 3484
2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3485 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2639 process_sgr_mode (nargs, arg); 3486 process_sgr_mode (nargs, arg);
2640 break; 3487 break;
… …
2646 tt_printf ("\033[0n"); 3493 tt_printf ("\033[0n");
2647 break; 3494 break;
2648 case 6: /* CPR requested */ 3495 case 6: /* CPR requested */
2649 scr_report_position (); 3496 scr_report_position ();
2650 break; 3497 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 3498 case 7: /* unofficial extension */
3499 if (OPTION (Opt_insecure))
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3500 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2654 break; 3501 break;
2655#endif
2656 case 8: /* unofficial extension */ 3502 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3503 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 3504 break;
2659 } 3505 }
2660 break; 3506 break;
2661 3507
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3508 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2695 break; 3541 break;
2696 3542
2697 case CSI_RM: /* 8.3.107: RESET MODE */ 3543 case CSI_RM: /* 8.3.107: RESET MODE */
2698 if (arg[0] == 4) 3544 if (arg[0] == 4)
2699 scr_insert_mode (0); 3545 scr_insert_mode (0);
3546 else if (arg[0] == 20)
3547 priv_modes &= ~PrivMode_LFNL;
2700 break; 3548 break;
2701 3549
2702 case CSI_SM: /* 8.3.126: SET MODE */ 3550 case CSI_SM: /* 8.3.126: SET MODE */
2703 if (arg[0] == 4) 3551 if (arg[0] == 4)
2704 scr_insert_mode (1); 3552 scr_insert_mode (1);
3553 else if (arg[0] == 20)
3554 priv_modes |= PrivMode_LFNL;
2705 break; 3555 break;
2706 3556
2707 /* 3557 /*
2708 * PRIVATE USE beyond this point. All CSI_7? sequences here 3558 * PRIVATE USE beyond this point. All CSI_7? sequences here
2709 */ 3559 */
… …
2721 break; 3571 break;
2722 case CSI_75: 3572 case CSI_75:
2723 scr_cursor (RESTORE); 3573 scr_cursor (RESTORE);
2724 break; 3574 break;
2725 3575
2726#ifndef NO_FRILLS 3576#if ENABLE_FRILLS
2727 case CSI_74: 3577 case CSI_74:
2728 process_window_ops (arg, nargs); 3578 process_window_ops (arg, nargs);
2729 break; 3579 break;
2730#endif 3580#endif
2731 3581
… …
2738 break; 3588 break;
2739 } 3589 }
2740} 3590}
2741/*}}} */ 3591/*}}} */
2742 3592
2743#ifndef NO_FRILLS 3593#if ENABLE_FRILLS
2744/* ARGSUSED */ 3594/* ARGSUSED */
2745void 3595void
2746rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3596rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2747{ 3597{
2748 int x, y; 3598 int x, y;
2749 XWindowAttributes wattr; 3599 XWindowAttributes wattr;
2750 Window wdummy; 3600 Window wdummy;
3601 dDisp;
2751 3602
2752 if (nargs == 0) 3603 if (nargs == 0)
2753 return; 3604 return;
2754 3605
2755 switch (args[0]) 3606 switch (args[0])
2756 { 3607 {
2757 /* 3608 /*
2758 * commands 3609 * commands
2759 */ 3610 */
2760 case 1: /* deiconify window */ 3611 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3612 XMapWindow (disp, parent[0]);
2762 break; 3613 break;
2763 case 2: /* iconify window */ 3614 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3615 XIconifyWindow (disp, parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3616 break;
2767 case 3: /* set position (pixels) */ 3617 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3618 XMoveWindow (disp, parent[0], args[1], args[2]);
2769 break; 3619 break;
2770 case 4: /* set size (pixels) */ 3620 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3621 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3622 break;
2773 case 5: /* raise window */ 3623 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3624 XRaiseWindow (disp, parent[0]);
2775 break; 3625 break;
2776 case 6: /* lower window */ 3626 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3627 XLowerWindow (disp, parent[0]);
2778 break; 3628 break;
2779 case 7: /* refresh window */ 3629 case 7: /* refresh window */
2780 scr_touch (true); 3630 scr_touch (true);
2781 break; 3631 break;
2782 case 8: /* set size (chars) */ 3632 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3633 set_widthheight ((unsigned int) (args[2] * fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3634 (unsigned int) (args[1] * fheight));
2785 break; 3635 break;
2786 3636
2787 //case 9: NYI, TODO, restore maximized window or maximize window 3637 //case 9: NYI, TODO, restore maximized window or maximize window
2788 default: 3638 default:
2789 if (args[0] >= 24) /* set height (chars) */ 3639 if (args[0] >= 24) /* set height (chars) */
2790 set_widthheight ((unsigned int)TermWin.width, 3640 set_widthheight ((unsigned int)width,
2791 (unsigned int) (args[1] * TermWin.fheight)); 3641 (unsigned int) (args[1] * fheight));
2792 break; 3642 break;
2793 3643
2794 3644
2795 /* 3645 /*
2796 * reports - some output format copied from XTerm 3646 * reports - some output format copied from XTerm
2797 */ 3647 */
2798 case 11: /* report window state */ 3648 case 11: /* report window state */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3649 XGetWindowAttributes (disp, parent[0], &wattr);
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3650 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3651 break;
2802 case 13: /* report window position */ 3652 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3653 XGetWindowAttributes (disp, parent[0], &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3654 XTranslateCoordinates (disp, parent[0], wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3655 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3656 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3657 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3658 break;
2809 case 14: /* report window size (pixels) */ 3659 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3660 XGetWindowAttributes (disp, parent[0], &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3661 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2812 break; 3662 break;
2813 case 18: /* report text area size (chars) */ 3663 case 18: /* report text area size (chars) */
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3664 tt_printf ("\033[8;%d;%dt", nrow, ncol);
2815 break; 3665 break;
2816 case 19: /* report window size (chars) */ 3666 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3667 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2818 break; 3668 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3669 case 20: /* report icon label */
3670 {
3671 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3672 XGetIconName (disp, parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3673 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3674 XFree (s);
3675 }
2823 break; 3676 break;
2824 case 21: /* report window title */ 3677 case 21: /* report window title */
3678 {
3679 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3680 XFetchName (disp, parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3681 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3682 XFree (s);
3683 }
2827 break; 3684 break;
2828#endif
2829 } 3685 }
2830} 3686}
2831#endif 3687#endif
2832 3688
2833/*----------------------------------------------------------------------*/ 3689/*----------------------------------------------------------------------*/
2834/* 3690/*
2835 * get input up until STRING TERMINATOR (or BEL) 3691 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3692 * ends_how is terminator used. returned input must be free()'d
2837 */ 3693 */
2838unsigned char * 3694char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3695rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3696{
2841 int seen_esc = 0; /* seen escape? */ 3697 unicode_t ch;
3698 bool seen_esc = false;
2842 unsigned int n = 0; 3699 unsigned int n = 0;
2843 unsigned char *s;
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX]; 3700 wchar_t string[STRING_MAX];
2846 3701
2847 while ((ch = cmd_getc ())) 3702 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3703 {
2849 if (ch == C0_BEL 3704 if (seen_esc)
2850 || ch == CHAR_ST 3705 {
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3706 if (ch == 0x5c) /* 7bit ST */
2852 break; 3707 break;
2853 3708 else
3709 return NULL;
3710 }
2854 if (ch == C0_ESC) 3711 else if (ch == C0_ESC)
2855 { 3712 {
2856 seen_esc = 1; 3713 seen_esc = true;
2857 continue; 3714 continue;
2858 } 3715 }
2859 else if (ch == '\t') 3716 else if (ch == C0_BEL || ch == CHAR_ST)
2860 ch = ' '; /* translate '\t' to space */ 3717 break;
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3718 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3719 return NULL; /* other control character - exit */
2863 3720
2864 if (n < sizeof (string) - 1) 3721 seen_esc = false;
3722
3723 if (n >= STRING_MAX - 1)
3724 // stop at some sane length
3725 return NULL;
3726
3727 if (ch == C0_SYN)
3728 string[n++] = cmd_get8 ();
3729 else
2865 string[n++] = ch; 3730 string[n++] = ch;
2866
2867 seen_esc = 0;
2868 } 3731 }
2869 3732
2870 string[n++] = '\0'; 3733 string[n++] = '\0';
2871 3734
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2873 return NULL;
2874
2875 ends_how = (ch == 0x5c ? C0_ESC : ch); 3735 ends_how = (ch == 0x5c ? C0_ESC : ch);
2876 STRNCPY (s, string, n); 3736
2877 return s; 3737 return rxvt_wcstombs (string);
2878} 3738}
2879 3739
2880/*----------------------------------------------------------------------*/ 3740/*----------------------------------------------------------------------*/
2881/* 3741/*
2882 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3742 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2883 */ 3743 */
2884void 3744void
2885rxvt_term::process_dcs_seq () 3745rxvt_term::process_dcs_seq ()
2886{ 3746{
2887 unsigned char *s; 3747 char *s;
2888 unicode_t eh; 3748 unicode_t eh;
2889 3749
2890 /* 3750 /*
2891 * Not handled yet 3751 * Not handled yet
2892 */ 3752 */
… …
2911 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3771 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2912 arg = arg * 10 + (ch - '0'); 3772 arg = arg * 10 + (ch - '0');
2913 3773
2914 if (ch == ';') 3774 if (ch == ';')
2915 { 3775 {
2916 unsigned char *s = get_to_st (eh); 3776 char *s = get_to_st (eh);
2917 3777
2918 if (s) 3778 if (s)
2919 { 3779 {
2920 /*
2921 * rxvt_menubar_dispatch () violates the constness of the string,
2922 * so do it here
2923 */
2924 if (arg == XTerm_Menu)
2925#if 0 /* XXX: currently disabled due to security concerns */
2926 menubar_dispatch ((char *)s);
2927#else
2928 (void)0;
2929#endif
2930 else
2931 xterm_seq (arg, (char *)s, eh); 3780 process_xterm_seq (arg, s, eh);
2932
2933 free (s); 3781 free (s);
2934 } 3782 }
2935 } 3783 }
2936} 3784}
3785
3786void
3787rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3788{
3789 if (str[0] == '?' && !str[1])
3790 {
3791 unsigned short r, g, b;
3792 pix_colors_focused[color].get (display, r, g, b);
3793 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3794 }
3795 else
3796 set_window_color (color, str);
3797}
3798
2937/* 3799/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3800 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2939 * 0 = change iconName/title
2940 * 1 = change iconName
2941 * 2 = change title
2942 * 4 = change color
2943 * 12 = change text color
2944 * 13 = change mouse foreground color
2945 * 17 = change highlight character colour
2946 * 18 = change bold character color
2947 * 19 = change underlined character color
2948 * 46 = change logfile (not implemented)
2949 * 50 = change font
2950 *
2951 * rxvt extensions:
2952 * 10 = menu (may change in future)
2953 * 20 = bg pixmap
2954 * 39 = change default fg color
2955 * 49 = change default bg color
2956 * 55 = dump scrollback buffer and all of screen
2957 * 701 = change locale
2958 * 702 = find font
2959 */ 3801 */
2960void 3802void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3803rxvt_term::process_xterm_seq (int op, const char *str, char resp)
2962{ 3804{
2963 int changed = 0; 3805 int changed = 0;
2964 int color; 3806 int color;
2965 char *buf, *name; 3807 char *buf, *name;
3808 bool query = str[0] == '?' && !str[1];
3809 int saveop = op;
3810 dDisp;
2966 3811
2967 assert (str != NULL); 3812 assert (str != NULL);
2968 switch (op) 3813 switch (op)
2969 { 3814 {
2970 case XTerm_name: 3815 case XTerm_name:
… …
2974 set_icon_name (str); 3819 set_icon_name (str);
2975 break; 3820 break;
2976 case XTerm_title: 3821 case XTerm_title:
2977 set_title (str); 3822 set_title (str);
2978 break; 3823 break;
3824 case XTerm_property:
3825 if (str[0] == '?')
3826 {
3827 Atom prop = display->atom (str + 1);
3828 Atom actual_type;
3829 int actual_format;
3830 unsigned long nitems;
3831 unsigned long bytes_after;
3832 unsigned char *value = 0;
3833 const char *str = "";
3834
3835 if (prop
3836 && XGetWindowProperty (disp, parent[0],
3837 prop, 0, 1<<16, 0, AnyPropertyType,
3838 &actual_type, &actual_format,
3839 &nitems, &bytes_after, &value) == Success
3840 && actual_type != None
3841 && actual_format == 8)
3842 str = (const char *)(value);
3843
3844 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3845
3846 XFree (value);
3847 }
3848 else
3849 {
3850 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3851
3852 if (eq)
3853 {
3854 *eq = 0;
3855 set_utf8_property (display->atom (str), eq + 1);
3856 }
3857 else
3858 XDeleteProperty (disp, parent[0],
3859 display->atom (str));
3860 }
3861 break;
3862
2979 case XTerm_Color: 3863 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3864 for (buf = (char *)str; buf && *buf;)
2981 { 3865 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3866 if ((name = strchr (buf, ';')) == NULL)
2983 break; 3867 break;
2984 3868
2985 *name++ = '\0'; 3869 *name++ = '\0';
2986 color = atoi (buf); 3870 color = atoi (buf);
2987 3871
2988 if (color < 0 || color >= TOTAL_COLORS) 3872 if (color < 0 || color >= TOTAL_COLORS)
2989 break; 3873 break;
2990 3874
2991 if ((buf = STRCHR (name, ';')) != NULL) 3875 if ((buf = strchr (name, ';')) != NULL)
2992 *buf++ = '\0'; 3876 *buf++ = '\0';
2993 3877
3878 if (name[0] == '?' && !name[1])
3879 {
3880 unsigned short r, g, b;
3881 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3882 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3883 }
3884 else
2994 set_window_color (color + minCOLOR, name); 3885 set_window_color (color + minCOLOR, name);
2995 } 3886 }
3887 break;
3888 case XTerm_Color00:
3889 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3890 break;
3891 case XTerm_Color01:
3892 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2996 break; 3893 break;
2997#ifndef NO_CURSORCOLOR 3894#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3895 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3896 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3000 break; 3897 break;
3001#endif 3898#endif
3002 case XTerm_Color_pointer: 3899 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3900 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3901 break;
3902 case XTerm_Color_pointer_bg:
3903 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3004 break; 3904 break;
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3905#ifndef NO_BOLD_UNDERLINE_REVERSE
3006 case XTerm_Color_BD: 3906 case XTerm_Color_BD:
3007 set_window_color (Color_BD, str); 3907 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3008 break; 3908 break;
3009 case XTerm_Color_UL: 3909 case XTerm_Color_UL:
3010 set_window_color (Color_UL, str); 3910 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3011 break; 3911 break;
3012 case XTerm_Color_RV: 3912 case XTerm_Color_RV:
3013 set_window_color (Color_RV, str); 3913 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3014 break; 3914 break;
3015#endif 3915 case URxvt_Color_IT:
3016 3916 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3017 case XTerm_Menu:
3018 /*
3019 * rxvt_menubar_dispatch () violates the constness of the string,
3020 * so DON'T do it here
3021 */
3022 break; 3917 break;
3918#endif
3919#if TRANSPARENT && TINTING
3920 case URxvt_Color_tint:
3921 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3922 check_our_parents ();
3923 if (am_transparent)
3924 want_full_refresh = want_refresh = 1;
3925 break;
3926#endif
3927
3023 case XTerm_Pixmap: 3928 case XTerm_Pixmap:
3024 if (*str != ';') 3929 if (*str != ';')
3025 { 3930 {
3026#if XPM_BACKGROUND 3931#if XPM_BACKGROUND
3027 scale_pixmap (""); /* reset to default scaling */ 3932 scale_pixmap (""); /* reset to default scaling */
3028 set_bgPixmap (str); /* change pixmap */ 3933 set_bgPixmap (str); /* change pixmap */
3029#endif 3934#endif
3030 scr_touch (true); 3935 scr_touch (true);
3031 } 3936 }
3032 while ((str = STRCHR (str, ';')) != NULL) 3937 while ((str = strchr (str, ';')) != NULL)
3033 { 3938 {
3034 str++; 3939 str++;
3035#if XPM_BACKGROUND 3940#if XPM_BACKGROUND
3036 changed += scale_pixmap (str); 3941 changed += scale_pixmap (str);
3037#endif 3942#endif
3038
3039 } 3943 }
3944
3040 if (changed) 3945 if (changed)
3041 { 3946 {
3042#ifdef XPM_BACKGROUND 3947#ifdef XPM_BACKGROUND
3043 resize_pixmap (); 3948 resize_pixmap ();
3044#endif 3949#endif
… …
3050 set_window_color (Color_fg, str); 3955 set_window_color (Color_fg, str);
3051 break; 3956 break;
3052 case XTerm_restoreBG: 3957 case XTerm_restoreBG:
3053 set_window_color (Color_bg, str); 3958 set_window_color (Color_bg, str);
3054 break; 3959 break;
3960
3055 case XTerm_logfile: 3961 case XTerm_logfile:
3056 // TODO, when secure mode? 3962 // TODO, when secure mode?
3057 break; 3963 break;
3058 case XTerm_font: 3964
3059 change_font (str); 3965#ifdef MENUBAR
3966 case URxvt_Menu:
3967 if (OPTION (Opt_insecure))
3968 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3060 break; 3969 break;
3061#ifndef NO_FRILLS
3062 case XTerm_locale:
3063 if (str[0] == '?' && !str[1])
3064 tt_printf ("%-.250s\n", locale);
3065 else
3066 {
3067 set_locale (str);
3068# ifdef USE_XIM
3069 im_cb ();
3070# endif
3071 }
3072 break;
3073 case XTerm_findfont:
3074 {
3075 int fid = TermWin.fontset->find_font (atoi (str));
3076 tt_printf ("%d %-.250s\n", fid, (*TermWin.fontset)[fid]->name);
3077 }
3078 break;
3079#endif 3970#endif
3080#if 0 3971#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3972 case XTerm_dumpscreen: /* no error notices */
3082 { 3973 {
3083 int fd; 3974 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3975 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3976 {
3086 scr_dump (fd); 3977 scr_dump (fd);
3087 close (fd); 3978 close (fd);
3088 } 3979 }
3089 } 3980 }
3981 break;
3982#endif
3983 case XTerm_font:
3984 op = URxvt_font;
3985 case URxvt_font:
3986#if ENABLE_STYLES
3987 case URxvt_boldFont:
3988 case URxvt_italicFont:
3989 case URxvt_boldItalicFont:
3990#endif
3991 if (query)
3992 tt_printf ("\33]%d;%-.250s%c", saveop,
3993 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3994 ? fontset[op - URxvt_font]->fontdesc : "",
3995 resp);
3996 else
3997 {
3998 const char *&res = rs[Rs_font + (op - URxvt_font)];
3999
4000 res = strdup (str);
4001 allocated.push_back ((void *)res);
4002 set_fonts ();
4003 }
4004 break;
4005
4006#if ENABLE_FRILLS
4007 case URxvt_locale:
4008 if (query)
4009 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4010 else
4011 {
4012 set_locale (str);
4013 pty.set_utf8_mode (enc_utf8);
4014 init_xlocale ();
4015 }
4016 break;
4017
4018 case URxvt_view_up:
4019 case URxvt_view_down:
4020 {
4021 int lines = atoi (str);
4022
4023 if (lines)
4024 scr_page (op == URxvt_view_up ? UP : DN, lines);
4025 else
4026 scr_erase_savelines ();
4027 }
4028
4029 break;
4030#endif
4031
4032#if ENABLE_PERL
4033 case URxvt_perl:
4034 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4035 ; // no responses yet
3090 break; 4036 break;
3091#endif 4037#endif
3092 } 4038 }
3093} 4039}
3094/*----------------------------------------------------------------------*/ 4040/*----------------------------------------------------------------------*/
… …
3108{ 4054{
3109 int state; 4055 int state;
3110 4056
3111 if (mode == 's') 4057 if (mode == 's')
3112 { 4058 {
3113 SavedModes |= (PrivateModes & bit); 4059 SavedModes |= (priv_modes & bit);
3114 return -1; 4060 return -1;
3115 } 4061 }
3116 else 4062 else
3117 { 4063 {
3118 if (mode == 'r') 4064 if (mode == 'r')
3119 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4065 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3120 else 4066 else
3121 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4067 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3122 PrivMode (state, bit); 4068 PrivMode (state, bit);
3123 } 4069 }
3124 4070
3125 return state; 4071 return state;
3126} 4072}
… …
3144 { 3, PrivMode_132 }, 4090 { 3, PrivMode_132 },
3145 { 4, PrivMode_smoothScroll }, 4091 { 4, PrivMode_smoothScroll },
3146 { 5, PrivMode_rVideo }, 4092 { 5, PrivMode_rVideo },
3147 { 6, PrivMode_relOrigin }, 4093 { 6, PrivMode_relOrigin },
3148 { 7, PrivMode_Autowrap }, 4094 { 7, PrivMode_Autowrap },
4095 // 8, bi-directional support mode
3149 { 9, PrivMode_MouseX10 }, 4096 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 4097#ifdef menuBar_esc
3151 { menuBar_esc, PrivMode_menuBar }, 4098 { menuBar_esc, PrivMode_menuBar },
3152#endif 4099#endif
4100 // 18, 19 printing-related
4101 { 25, PrivMode_VisibleCursor },
3153#ifdef scrollBar_esc 4102#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 4103 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 4104#endif
3156 // 18, 19 printing-related
3157 { 25, PrivMode_VisibleCursor },
3158 // 30 show scrollbar rxvt. extension
3159 { 35, PrivMode_ShiftKeys }, // rxvt extension 4105 { 35, PrivMode_ShiftKeys }, // rxvt extension
3160 { 40, PrivMode_132OK }, 4106 { 40, PrivMode_132OK },
3161 // 41 xterm more fixes NYI 4107 // 41 xterm more fixes NYI
3162 // 45 margin bell NYI 4108 // 45 margin bell NYI
3163 // 46 start logging 4109 // 46 start logging
… …
3175 // 1035 enable modifiers for alt, numlock NYI 4121 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 4122 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 4123 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 4124 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 4125 // 1048 save and restore cursor
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4126 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 4127 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 4128 };
3183 4129
3184 if (nargs == 0) 4130 if (nargs == 0)
3185 return; 4131 return;
… …
3203 } 4149 }
3204 4150
3205 /* extra handling for values with state unkept */ 4151 /* extra handling for values with state unkept */
3206 switch (arg[i]) 4152 switch (arg[i])
3207 { 4153 {
4154#if ENABLE_STYLES
4155 case 1021:
4156 if (mode)
4157 SET_OPTION (Opt_intensityStyles);
4158 else
4159 CLR_OPTION (Opt_intensityStyles);
4160
4161 scr_touch (true);
4162 break;
4163#endif
3208 case 1048: /* alternative cursor save */ 4164 case 1048: /* alternative cursor save */
3209 case 1049: 4165 case 1049:
4166 if (OPTION (Opt_secondaryScreen))
3210 if (mode == 0) 4167 if (mode == 0)
3211 scr_cursor (RESTORE); 4168 scr_cursor (RESTORE);
3212 else if (mode == 1) 4169 else if (mode == 1)
3213 scr_cursor (SAVE); 4170 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 4171 break;
3215 } 4172 }
3216 4173
3217 if (state >= 0) 4174 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 4175 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 4176 switch (arg[i])
… …
3225 * within VT52 mode 4182 * within VT52 mode
3226 */ 4183 */
3227 PrivMode (1, PrivMode_vt52); 4184 PrivMode (1, PrivMode_vt52);
3228 break; 4185 break;
3229 case 3: /* 80/132 */ 4186 case 3: /* 80/132 */
3230 if (PrivateModes & PrivMode_132OK) 4187 if (priv_modes & PrivMode_132OK)
3231 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4188 set_widthheight (((state ? 132 : 80) * fwidth), height);
3232 break; 4189 break;
3233 case 4: /* smooth scrolling */ 4190 case 4: /* smooth scrolling */
3234 if (state) 4191 if (!state)
3235 Options &= ~Opt_jumpScroll; 4192 SET_OPTION (Opt_jumpScroll);
3236 else 4193 else
3237 Options |= Opt_jumpScroll; 4194 CLR_OPTION (Opt_jumpScroll);
3238 break; 4195 break;
3239 case 5: /* reverse video */ 4196 case 5: /* reverse video */
3240 scr_rvideo_mode (state); 4197 scr_rvideo_mode (state);
3241 break; 4198 break;
3242 case 6: /* relative/absolute origins */ 4199 case 6: /* relative/absolute origins */
3243 scr_relative_origin (state); 4200 scr_relative_origin (state);
3244 break; 4201 break;
3245 case 7: /* autowrap */ 4202 case 7: /* autowrap */
3246 scr_autowrap (state); 4203 scr_autowrap (state);
3247 break; 4204 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 4205 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 4206 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 4207 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 4208 priv_modes &= ~PrivMode_MouseX11;
3252 break; 4209 break;
3253#ifdef menuBar_esc 4210#ifdef menuBar_esc
3254 case menuBar_esc: 4211 case menuBar_esc:
3255#ifdef MENUBAR 4212#ifdef MENUBAR
3256 map_menuBar (state); 4213 map_menuBar (state);
… …
3267 break; 4224 break;
3268#endif 4225#endif
3269 case 25: /* visible/invisible cursor */ 4226 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 4227 scr_cursor_visible (state);
3271 break; 4228 break;
3272 /* case 35: - shift keys */ 4229 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 4230 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 4231 case 47: /* secondary screen */
3275 scr_change_screen (state); 4232 scr_change_screen (state);
3276 break; 4233 break;
3277 /* case 66: - application key pad */ 4234 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 4235 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 4236 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 4237 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 4238 priv_modes &= ~PrivMode_MouseX10;
3282 break; 4239 break;
3283#if 0 4240#if 0
3284 case 1001: 4241 case 1001:
3285 break; /* X11 mouse highlighting */ 4242 break; /* X11 mouse highlighting */
3286#endif 4243#endif
3287 case 1010: /* scroll to bottom on TTY output inhibit */ 4244 case 1010: /* scroll to bottom on TTY output inhibit */
3288 if (state) 4245 if (!state)
3289 Options &= ~Opt_scrollTtyOutput; 4246 SET_OPTION (Opt_scrollTtyOutput);
3290 else 4247 else
3291 Options |= Opt_scrollTtyOutput; 4248 CLR_OPTION (Opt_scrollTtyOutput);
3292 break; 4249 break;
3293 case 1011: /* scroll to bottom on key press */ 4250 case 1011: /* scroll to bottom on key press */
3294 if (state) 4251 if (state)
3295 Options |= Opt_scrollTtyKeypress; 4252 SET_OPTION (Opt_scrollTtyKeypress);
3296 else 4253 else
3297 Options &= ~Opt_scrollTtyKeypress; 4254 CLR_OPTION (Opt_scrollTtyKeypress);
3298 break; 4255 break;
3299 case 1047: /* secondary screen w/ clearing */ 4256 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4257 if (OPTION (Opt_secondaryScreen))
3301 if (current_screen != PRIMARY) 4258 if (current_screen != PRIMARY)
3302 scr_erase_screen (2); 4259 scr_erase_screen (2);
3303
3304 scr_change_screen (state); 4260 scr_change_screen (state);
3305 /* FALLTHROUGH */ 4261 break;
4262 case 1049: /* secondary screen w/ clearing first */
4263 scr_change_screen (state);
4264 if (OPTION (Opt_secondaryScreen))
4265 if (current_screen != PRIMARY)
4266 scr_erase_screen (2);
4267 break;
3306 default: 4268 default:
3307 break; 4269 break;
3308 } 4270 }
3309 } 4271 }
3310} 4272}
… …
3333 rendset = 0, rendstyle = ~RS_None; 4295 rendset = 0, rendstyle = ~RS_None;
3334 break; 4296 break;
3335 case 1: 4297 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 4298 rendset = 1, rendstyle = RS_Bold;
3337 break; 4299 break;
4300 //case 2: // low intensity
4301 case 3:
4302 rendset = 1, rendstyle = RS_Italic;
4303 break;
3338 case 4: 4304 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 4305 rendset = 1, rendstyle = RS_Uline;
3340 break; 4306 break;
3341 case 5: 4307 case 5: // slowly blinking
4308 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 4309 rendset = 1, rendstyle = RS_Blink;
3343 break; 4310 break;
4311 //case 6: // scoansi light background
3344 case 7: 4312 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 4313 rendset = 1, rendstyle = RS_RVid;
3346 break; 4314 break;
3347 case 8: 4315 case 8:
3348 // invisible. NYI 4316 // invisible. NYI
3349 break; 4317 break;
3350 case 22: 4318 //case 9: // crossed out
4319 //case 10: // scoansi acs off, primary font
4320 //case 11: // scoansi acs on, first alt font
4321 //case 12: // scoansi acs on, |0x80, second alt font
4322 //...
4323 //case 19: // ninth alt font
4324 //case 20: // gothic
4325 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3351 rendset = 0, rendstyle = RS_Bold; 4326 rendset = 0, rendstyle = RS_Bold;
4327 break;
4328 case 22: // normal intensity
4329 rendset = 0, rendstyle = RS_Bold;
4330 break;
4331 case 23: // disable italic
4332 rendset = 0, rendstyle = RS_Italic;
3352 break; 4333 break;
3353 case 24: 4334 case 24:
3354 rendset = 0, rendstyle = RS_Uline; 4335 rendset = 0, rendstyle = RS_Uline;
3355 break; 4336 break;
3356 case 25: 4337 case 25:
3357 rendset = 0, rendstyle = RS_Blink; 4338 rendset = 0, rendstyle = RS_Blink;
3358 break; 4339 break;
4340 case 26: // variable spacing (iso 8613)
4341 rendset = 0, rendstyle = RS_Blink;
4342 break;
3359 case 27: 4343 case 27:
3360 rendset = 0, rendstyle = RS_RVid; 4344 rendset = 0, rendstyle = RS_RVid;
3361 break; 4345 break;
3362 case 28:
3363 // visible. NYI 4346 //case 28: // visible. NYI
3364 break; 4347 //case 29: // not crossed-out
3365 } 4348 }
3366 4349
3367 if (rendset != -1) 4350 if (rendset != -1)
3368 { 4351 {
3369 scr_rendition (rendset, rendstyle); 4352 scr_rendition (rendset, rendstyle);
… …
3380 case 35: 4363 case 35:
3381 case 36: 4364 case 36:
3382 case 37: 4365 case 37:
3383 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4366 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3384 break; 4367 break;
3385#ifdef TTY_256COLOR 4368 case 38: // set fg color, ISO 8613-6
3386 case 38:
3387 if (nargs > i + 2 && arg[i + 1] == 5) 4369 if (nargs > i + 2 && arg[i + 1] == 5)
3388 { 4370 {
3389 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4371 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3390 i += 2; 4372 i += 2;
3391 } 4373 }
3392 break; 4374 break;
3393#endif
3394 case 39: /* default fg */ 4375 case 39: /* default fg */
3395 scr_color (Color_fg, Color_fg); 4376 scr_color (Color_fg, Color_fg);
3396 break; 4377 break;
3397 4378
3398 case 40: 4379 case 40:
… …
3403 case 45: 4384 case 45:
3404 case 46: 4385 case 46:
3405 case 47: 4386 case 47:
3406 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4387 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3407 break; 4388 break;
3408#ifdef TTY_256COLOR 4389 case 48: // set bg color, ISO 8613-6
3409 case 48:
3410 if (nargs > i + 2 && arg[i + 1] == 5) 4390 if (nargs > i + 2 && arg[i + 1] == 5)
3411 { 4391 {
3412 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4392 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3413 i += 2; 4393 i += 2;
3414 } 4394 }
3415 break; 4395 break;
3416#endif
3417 case 49: /* default bg */ 4396 case 49: /* default bg */
3418 scr_color (Color_bg, Color_bg); 4397 scr_color (Color_bg, Color_bg);
3419 break; 4398 break;
3420 4399
3421#ifndef NO_BRIGHTCOLOR 4400 //case 50: // not variable spacing
4401
4402#if ENABLE_FRILLS
3422 case 90: 4403 case 90:
3423 case 91: /* set bright fg color */ 4404 case 91: /* set bright fg color */
3424 case 92: 4405 case 92:
3425 case 93: 4406 case 93:
3426 case 94: 4407 case 94:
3427 case 95: 4408 case 95:
3428 case 96: 4409 case 96:
3429 case 97: 4410 case 97:
3430 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4411 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3431 Color_fg);
3432 break; 4412 break;
3433 case 100: 4413 case 100:
3434 case 101: /* set bright bg color */ 4414 case 101: /* set bright bg color */
3435 case 102: 4415 case 102:
3436 case 103: 4416 case 103:
3437 case 104: 4417 case 104:
3438 case 105: 4418 case 105:
3439 case 106: 4419 case 106:
3440 case 107: 4420 case 107:
3441 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4421 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3442 Color_bg);
3443 break; 4422 break;
3444#endif 4423#endif
3445
3446 } 4424 }
3447 } 4425 }
3448} 4426}
3449/*}}} */ 4427/*}}} */
3450 4428
3451/*{{{ process Rob Nation's own graphics mode sequences */ 4429/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3452void 4430void
3453rxvt_term::process_graphics () 4431rxvt_term::process_graphics ()
3454{ 4432{
3455 unicode_t ch, cmd = cmd_getc (); 4433 unicode_t ch, cmd = cmd_getc ();
3456 4434
3457 if (cmd == 'Q') 4435 if (cmd == 'Q')
3458 { /* query graphics */ 4436 { /* query graphics */
3459 tt_printf ("\033G0\n"); /* no graphics */ 4437 tt_printf ("\033G0\012"); /* no graphics */
3460 return; 4438 return;
3461 } 4439 }
3462 /* swallow other graphics sequences until terminating ':' */ 4440 /* swallow other graphics sequences until terminating ':' */
3463 do 4441 do
3464 ch = cmd_getc (); 4442 ch = cmd_getc ();
… …
3474 */ 4452 */
3475void 4453void
3476rxvt_term::tt_printf (const char *fmt,...) 4454rxvt_term::tt_printf (const char *fmt,...)
3477{ 4455{
3478 va_list arg_ptr; 4456 va_list arg_ptr;
3479 unsigned char buf[256]; 4457 char buf[256];
3480 4458
3481 va_start (arg_ptr, fmt); 4459 va_start (arg_ptr, fmt);
3482 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4460 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3483 va_end (arg_ptr); 4461 va_end (arg_ptr);
3484 tt_write (buf, STRLEN (buf)); 4462 tt_write (buf, strlen (buf));
3485} 4463}
3486 4464
3487/* ---------------------------------------------------------------------- */ 4465/* ---------------------------------------------------------------------- */
3488/* Write data to the pty as typed by the user, pasted with the mouse, 4466/* Write data to the pty as typed by the user, pasted with the mouse,
3489 * or generated by us in response to a query ESC sequence. 4467 * or generated by us in response to a query ESC sequence.
3490 */ 4468 */
4469const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4470
3491void 4471void
3492rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4472rxvt_term::tt_write (const char *data, unsigned int len)
3493{ 4473{
3494 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4474 if (pty.pty < 0)
4475 return;
3495 4476
3496 if (len) 4477 if (v_buflen == 0)
4478 {
4479 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4480
4481 if ((unsigned int)written == len)
4482 return;
4483
4484 data += written;
4485 len -= written;
3497 { 4486 }
4487
4488 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4489
4490 memcpy (v_buffer + v_buflen, data, len);
4491 v_buflen += len;
4492
4493 pty_ev.set (EVENT_READ | EVENT_WRITE);
4494}
4495
4496void rxvt_term::pty_write ()
4497{
4498 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4499
4500 if (written > 0)
4501 {
4502 v_buflen -= written;
4503
3498 if (v_buflen == 0) 4504 if (v_buflen == 0)
3499 { 4505 {
3500 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3501
3502 if ((unsigned int)written == len)
3503 return;
3504
3505 data += written;
3506 len -= written;
3507 }
3508
3509
3510 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3511
3512 memcpy (v_buffer + v_buflen, data, len);
3513 v_buflen += len;
3514 }
3515
3516 for (;;)
3517 {
3518 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3519
3520 if (written > 0)
3521 {
3522 v_buflen -= written;
3523
3524 if (v_buflen == 0)
3525 {
3526 free (v_buffer); 4506 free (v_buffer);
3527 v_buffer = 0; 4507 v_buffer = 0;
3528 v_buflen = 0; 4508 v_buflen = 0;
3529 4509
3530 pty_ev.set (EVENT_READ); 4510 pty_ev.set (EVENT_READ);
3531 return;
3532 }
3533
3534 memmove (v_buffer, v_buffer + written, v_buflen);
3535 }
3536 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3537 // original code just ignores this...
3538 destroy ();
3539 else
3540 {
3541 pty_ev.set (EVENT_READ | EVENT_WRITE);
3542 return; 4511 return;
3543 } 4512 }
4513
4514 memmove (v_buffer, v_buffer + written, v_buflen);
3544 } 4515 }
4516 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4517 pty_ev.set (EVENT_READ);
3545} 4518}
3546 4519
3547/*----------------------- end-of-file (C source) -----------------------*/ 4520/*----------------------- end-of-file (C source) -----------------------*/
3548 4521

Diff Legend

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