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.254 by root, Wed Jan 11 02:13:56 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_INT, keysym, 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 int end_row = row + nrow;
979
980 while (row > -nsaved && ROW (row - 1).is_longer ())
981 --row;
982
983 do
984 {
985 int start_row = row;
986 line_t *l;
987
988 do
989 {
990 l = &ROW (row);
991
992 if (l->f & LINE_FILTERED)
993 row++;
994 else
995 {
996 // line not filtered, mark it as filtered
997 l->f |= LINE_FILTERED;
998 while (l->is_longer ())
999 {
1000 l = &ROW (++row);
1001 l->f |= LINE_FILTERED;
1002 }
1003
1004 // and filter it
1005 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1006
1007 break;
1008 }
1009 }
1010 while (l->is_longer () && row < end_row);
1011 }
1012 while (++row < end_row);
1013 }
1014
672 scr_refresh (refresh_type); 1015 scr_refresh (refresh_type);
673 scrollbar_show (1); 1016 scrollbar_show (1);
674#ifdef USE_XIM 1017#ifdef USE_XIM
675 IMSendSpot (); 1018 IMSendSpot ();
676#endif 1019#endif
677
678 } 1020 }
679 1021
680 display->flush (); 1022 display->flush ();
681} 1023}
682 1024
… …
684rxvt_term::check_cb (check_watcher &w) 1026rxvt_term::check_cb (check_watcher &w)
685{ 1027{
686 SET_R (this); 1028 SET_R (this);
687 SET_LOCALE (locale); 1029 SET_LOCALE (locale);
688 1030
1031 display->flush ();
1032
1033 if (want_refresh && !flush_ev.active)
1034 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1035}
1036
1037void
1038rxvt_term::flush_cb (time_watcher &w)
1039{
1040 SET_R (this);
1041 SET_LOCALE (locale);
1042
1043 refresh_limit = 1;
1044 refresh_count = 0;
689 flush (); 1045 flush ();
690} 1046}
691 1047
692#ifdef CURSOR_BLINK 1048#ifdef CURSOR_BLINK
693void 1049void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 1067 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 1068 }
713} 1069}
714#endif 1070#endif
715 1071
1072#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1073void
1074rxvt_term::cont_scroll_cb (time_watcher &w)
1075{
1076 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1077 scr_page (scrollbar_isUp() ? UP : DN, 1))
1078 {
1079 refresh_type |= SMOOTH_REFRESH;
1080 want_refresh = 1;
1081 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1082 }
1083}
1084#endif
1085
1086#ifdef SELECTION_SCROLLING
1087void
1088rxvt_term::sel_scroll_cb (time_watcher &w)
1089{
1090 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1091 {
1092 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1093 refresh_type |= SMOOTH_REFRESH;
1094 want_refresh = 1;
1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1096 }
1097}
1098#endif
1099
1100#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1101void
1102rxvt_term::slip_wheel_cb (time_watcher &w)
1103{
1104 if (mouse_slip_wheel_speed == 0
1105 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1106 : scr_page (UP, mouse_slip_wheel_speed))
1107 {
1108 if (view_start == nsaved ||
1109 view_start == 0)
1110 mouse_slip_wheel_speed = 0;
1111
1112 refresh_type |= SMOOTH_REFRESH;
1113 want_refresh = 1;
1114 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1115 }
1116}
1117#endif
1118
1119#if HAVE_SCHED_YIELD
1120static struct event_handler
1121{
1122 check_watcher cw_yield;
1123
1124 void yield (check_watcher &w)
1125 {
1126 sched_yield ();
1127 w.stop ();
1128 }
1129
1130 event_handler ()
1131 : cw_yield (this, &event_handler::yield)
1132 {
1133 }
1134} event_handler;
1135#endif
1136
716bool 1137bool
717rxvt_term::pty_fill () 1138rxvt_term::pty_fill ()
718{ 1139{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1140 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1141
1142 if (CBUFSIZ == n)
1143 {
1144 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1145 n = 0;
1146 }
720 1147
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1148 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1149 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1150 cmdbuf_endp = cmdbuf_ptr + n;
724 1151
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1152 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
726 1153
727 if (n > 0) 1154 if (r > 0)
728 { 1155 {
729 cmdbuf_endp += n; 1156 cmdbuf_endp += r;
730 return true; 1157 return true;
731 } 1158 }
732 else if (n < 0 && errno != EAGAIN) 1159 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1160 {
1161#if HAVE_SCHED_YIELD
1162 if (display->is_local)
1163 event_handler.cw_yield.start ();
1164#endif
1165 }
1166 else
1167 {
1168 pty_ev.stop ();
1169
1170 if (!OPTION (Opt_hold))
733 destroy (); 1171 destroy ();
1172 }
734 1173
735 return false; 1174 return false;
736} 1175}
737 1176
738void 1177void
739rxvt_term::pty_cb (io_watcher &w, short revents) 1178rxvt_term::pty_cb (io_watcher &w, short revents)
740{ 1179{
741 SET_R (this); 1180 SET_R (this);
742 SET_LOCALE (locale); 1181 SET_LOCALE (locale);
743 1182
1183 if (revents & EVENT_READ)
1184 // loop, but don't allow a single term to monopolize us
1185 while (pty_fill ())
1186 if (cmd_parse ())
1187 break;
1188
744 if (revents & EVENT_WRITE) 1189 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1190 pty_write ();
746 else if (revents & EVENT_READ) 1191}
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 1192
760 if (cmd_parse ()) 1193void
761 break; 1194rxvt_term::pointer_unblank ()
762 } 1195{
763 } 1196 XDefineCursor (display->display, vt, TermWin_cursor);
1197 recolour_cursor ();
1198
1199#ifdef POINTER_BLANK
1200 hidden_pointer = 0;
1201
1202 if (OPTION (Opt_pointerBlank))
1203 pointer_ev.start (NOW + pointerBlankDelay);
1204#endif
764} 1205}
765 1206
766#ifdef POINTER_BLANK 1207#ifdef POINTER_BLANK
767void 1208void
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 () 1209rxvt_term::pointer_blank ()
781{ 1210{
782 if (! (Options & Opt_pointerBlank)) 1211 if (!OPTION (Opt_pointerBlank))
783 return; 1212 return;
784 1213
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1214 XDefineCursor (display->display, vt, display->blank_cursor);
786 XFlush (display->display); 1215 XFlush (display->display);
787 1216
788 hidden_pointer = 1; 1217 hidden_pointer = 1;
789} 1218}
790 1219
… …
807 x = ev.x; 1236 x = ev.x;
808 y = ev.y; 1237 y = ev.y;
809 pixel_position (&x, &y); 1238 pixel_position (&x, &y);
810 1239
811 if (MEvent.button == AnyButton) 1240 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1241 button_number = 3;
814 }
815 else 1242 else
816 { 1243 {
817 button_number = MEvent.button - Button1; 1244 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1245 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1246 if (button_number >= 3)
820 button_number += (64 - 3); 1247 button_number += (64 - 3);
821 } 1248 }
822 1249
823 if (PrivateModes & PrivMode_MouseX10) 1250 if (priv_modes & PrivMode_MouseX10)
824 { 1251 {
825 /* 1252 /*
826 * do not report ButtonRelease 1253 * do not report ButtonRelease
827 * no state info allowed 1254 * no state info allowed
828 */ 1255 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1270 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1271 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1272#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1273 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1274#endif
848
849 } 1275 }
850 1276
851#ifdef DEBUG_MOUSEREPORT 1277#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1278 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1279 if (key_state & 16)
854 fputc ('C', stderr); 1280 fputc ('C', stderr);
855 if (key_state & 4) 1281 if (key_state & 4)
856 fputc ('S', stderr); 1282 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1286 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1287 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1288 button_number,
863 x + 1, 1289 x + 1,
864 y + 1); 1290 y + 1);
865#else 1291#endif
1292
866 tt_printf ("\033[M%c%c%c", 1293 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1294 (32 + button_number + key_state),
868 (32 + x + 1), 1295 (32 + x + 1),
869 (32 + y + 1)); 1296 (32 + y + 1));
870#endif
871} 1297}
872 1298
873#ifdef USING_W11LIB 1299#ifdef USING_W11LIB
874void 1300void
875rxvt_W11_process_x_event (XEvent *ev) 1301rxvt_W11_process_x_event (XEvent *ev)
… …
882 1308
883/*{{{ process an X event */ 1309/*{{{ process an X event */
884void 1310void
885rxvt_term::x_cb (XEvent &ev) 1311rxvt_term::x_cb (XEvent &ev)
886{ 1312{
1313 dDisp;
1314
887 SET_R (this); 1315 SET_R (this);
888 SET_LOCALE (locale); 1316 SET_LOCALE (locale);
889 1317
890#if defined(CURSOR_BLINK)
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
892 {
893 if (hidden_cursor)
894 {
895 hidden_cursor = 0;
896 want_refresh = 1;
897 }
898
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
900 }
901#endif
902
903#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
905 {
906 if (ev.type == MotionNotify
907 || ev.type == ButtonPress
908 || ev.type == ButtonRelease)
909 if (hidden_pointer)
910 pointer_unblank ();
911
912 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank ();
914 }
915#endif
916
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return;
920#endif
921
922 Window unused_root, unused_child; 1318 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1319 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1320 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 1321
975 switch (ev.type) 1322 switch (ev.type)
976 { 1323 {
977 case KeyPress: 1324 case KeyPress:
1325#if ISO_14755
1326 if (!(iso14755buf & ISO_14755_52))
1327#endif
978 lookup_key (ev.xkey); 1328 lookup_key (ev.xkey);
1329
1330 break;
1331
1332 case KeyRelease:
1333 {
1334#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1335 KeySym keysym;
1336
1337 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1338#endif
1339
1340#if ENABLE_FRILLS || ISO_14755
1341 // ISO 14755 support
1342 if (iso14755buf)
1343 if (iso14755buf & ISO_14755_52)
1344 {
1345# if ENABLE_OVERLAY
1346 scr_overlay_off ();
1347# endif
1348# if ISO_14755
1349 // iso14755 part 5.2 handling: release time
1350 // first: controls
1351 if ((ev.xkey.state & ControlMask)
1352 && ((keysym >= 0x40 && keysym <= 0x5f)
1353 || (keysym >= 0x61 && keysym <= 0x7f)))
1354 {
1355 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1356 commit_iso14755 ();
1357 goto skip_switch;
1358 }
1359
1360 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1361 if (i[0] == keysym)
1362 {
1363 iso14755buf = ISO_14755_51 | i[1];
1364 commit_iso14755 ();
1365 goto skip_switch;
1366 }
1367
1368 scr_bell ();
1369# endif
1370 iso14755buf = 0;
1371 break;
1372 }
1373 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1374 {
1375# if ENABLE_OVERLAY
1376 scr_overlay_off ();
1377# endif
1378 if (iso14755buf & ISO_14755_51)
1379 commit_iso14755 ();
1380#if ISO_14755
1381 else if (iso14755buf & ISO_14755_STARTED)
1382 {
1383 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1384
1385 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1386 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1387 }
1388# endif
1389 else
1390 iso14755buf = 0;
1391 }
1392#endif
1393
1394 if (ev.xany.window == vt
1395 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
979 break; 1396 break;
980 1397
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1398#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 if (! (ev.xkey.state & ControlMask)) 1399 if (!(ev.xkey.state & ControlMask))
1400 slip_wheel_ev.stop ();
1401 else if (keysym == XK_Control_L || keysym == XK_Control_R)
985 mouse_slip_wheel_speed = 0; 1402 mouse_slip_wheel_speed = 0;
986 else 1403#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; 1404 break;
995 } 1405 }
996#endif
997 1406
998 case ButtonPress: 1407 case ButtonPress:
999 button_press (ev.xbutton); 1408 button_press (ev.xbutton);
1000 break; 1409 break;
1001 1410
… …
1003 button_release (ev.xbutton); 1412 button_release (ev.xbutton);
1004 break; 1413 break;
1005 1414
1006 case ClientMessage: 1415 case ClientMessage:
1007 if (ev.xclient.format == 32 1416 if (ev.xclient.format == 32
1417 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1418 {
1008 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1419 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1009 destroy (); 1420 destroy ();
1421#if ENABLE_EWMH
1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1423 XSendEvent (disp, ev.xclient.window = display->root,
1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1425 &ev);
1426#endif
1427 }
1428#if ENABLE_XEMBED
1429 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1430 {
1431 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1432 focus_in ();
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out ();
1435 }
1436#endif
1010#ifdef OFFIX_DND 1437#ifdef OFFIX_DND
1011 /* OffiX Dnd (drag 'n' drop) protocol */ 1438 /* OffiX Dnd (drag 'n' drop) protocol */
1012 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1439 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1013 && (ev.xclient.data.l[0] == DndFile 1440 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1441 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1442 || ev.xclient.data.l[0] == DndLink))
1016 { 1443 {
1017 /* Get Dnd data */ 1444 /* Get Dnd data */
1018 Atom ActualType; 1445 Atom ActualType;
1019 int ActualFormat; 1446 int ActualFormat;
1020 unsigned char *data; 1447 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1448 unsigned long Size, RemainingBytes;
1022 1449
1023 XGetWindowProperty (display->display, display->root, 1450 XGetWindowProperty (disp, display->root,
1024 xa[XA_DNDSELECTION], 1451 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1452 0L, 1000000L,
1026 False, AnyPropertyType, 1453 False, AnyPropertyType,
1027 &ActualType, &ActualFormat, 1454 &ActualType, &ActualFormat,
1028 &Size, &RemainingBytes, 1455 &Size, &RemainingBytes,
1029 &data); 1456 &data);
1030 XChangeProperty (display->display, display->root, 1457 set_string_property (XA_CUT_BUFFER0, data);
1031 XA_CUT_BUFFER0, XA_STRING, 1458 XFree (data);
1032 8, PropModeReplace,
1033 data, STRLEN (data));
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1459 selection_paste (display->root, XA_CUT_BUFFER0, true);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1460 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1036 } 1461 }
1037#endif /* OFFIX_DND */ 1462#endif /* OFFIX_DND */
1038 break; 1463 break;
1039 1464
1040 case MappingNotify: 1465 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1466 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1467 break;
1043 1468
1044 /* 1469 /*
1045 * XXX: this is not the _current_ arrangement 1470 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1471 * Here's my conclusion:
… …
1065 break; 1490 break;
1066 } 1491 }
1067 break; 1492 break;
1068 1493
1069 case FocusIn: 1494 case FocusIn:
1070 if (!TermWin.focus) 1495 focus_in ();
1496 break;
1497
1498 case FocusOut:
1499 focus_out ();
1500 break;
1501
1502 case ConfigureNotify:
1503 if (ev.xconfigure.window == parent[0])
1071 { 1504 {
1072 TermWin.focus = 1; 1505 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1073 want_refresh = 1; 1506 ;
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 1507
1508 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1509 {
1510 seen_resize = 1;
1511 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1512 }
1513
1514#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1515 if (OPTION (Opt_transparent))
1516 check_our_parents ();
1517#endif
1083 } 1518 }
1084 break; 1519 break;
1085 1520
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: 1521 case PropertyNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1522 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1106 { 1523 && ev.xproperty.state == PropertyNewValue)
1107 int height, width; 1524 selection_property (ev.xproperty.window, ev.xproperty.atom);
1108 1525
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; 1526 break;
1139 1527
1140 case SelectionClear: 1528 case SelectionClear:
1141 selection_clear (); 1529 selection_clear ();
1142 break; 1530 break;
1143 1531
1144 case SelectionNotify: 1532 case SelectionNotify:
1145 if (selection_wait == Sel_normal) 1533 if (selection_wait == Sel_normal)
1146 selection_paste (ev.xselection.requestor, 1534 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1147 ev.xselection.property, True);
1148 break; 1535 break;
1149 1536
1150 case SelectionRequest: 1537 case SelectionRequest:
1151 selection_send (ev.xselectionrequest); 1538 selection_send (ev.xselectionrequest);
1152 break; 1539 break;
1153 1540
1541 case MapNotify:
1542 mapped = 1;
1543#ifdef TEXT_BLINK
1544 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1545#endif
1546 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break;
1548
1154 case UnmapNotify: 1549 case UnmapNotify:
1155 TermWin.mapped = 0; 1550 mapped = 0;
1156#ifdef TEXT_BLINK 1551#ifdef TEXT_BLINK
1157 text_blink_ev.stop (); 1552 text_blink_ev.stop ();
1158#endif 1553#endif
1159 break; 1554 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1160
1161 case MapNotify:
1162 TermWin.mapped = 1;
1163#ifdef TEXT_BLINK
1164 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1165#endif
1166 break; 1555 break;
1167 1556
1168#ifdef TRANSPARENT 1557#ifdef TRANSPARENT
1169 case ReparentNotify: 1558 case ReparentNotify:
1170 rootwin_cb (ev); 1559 rootwin_cb (ev);
1171 break; 1560 break;
1172#endif /* TRANSPARENT */ 1561#endif /* TRANSPARENT */
1173 1562
1174 case GraphicsExpose: 1563 case GraphicsExpose:
1175 case Expose: 1564 case Expose:
1176 if (ev.xany.window == TermWin.vt) 1565 if (ev.xany.window == vt)
1177 { 1566 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1567 do
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1568 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1569 ev.xexpose.width, ev.xexpose.height, False);
1181#else 1570 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1182 // don't understand this, so commented it out 1571
1572 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1573
1574 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1575 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1576 ev.xexpose.width, ev.xexpose.height, False);
1185 //scr_expose (ev.xexpose.x, 0, 1577
1186 // ev.xexpose.width, TermWin.height, False);
1187#endif
1188 want_refresh = 1; 1578 want_refresh = 1;
1189 } 1579 }
1190 else 1580 else
1191 { 1581 {
1192 XEvent unused_event; 1582 XEvent unused_event;
1193 1583
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1584 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1195 Expose, 1585 ;
1196 &unused_event)) ; 1586 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1587 ;
1198 GraphicsExpose, 1588
1199 &unused_event)) ;
1200 if (isScrollbarWindow (ev.xany.window)) 1589 if (isScrollbarWindow (ev.xany.window))
1201 { 1590 {
1202 scrollBar.setIdle (); 1591 scrollBar.setIdle ();
1203 scrollbar_show (0); 1592 scrollbar_show (0);
1204 } 1593 }
1205#ifdef MENUBAR 1594#ifdef MENUBAR
1206 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1595 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1207 menubar_expose (); 1596 menubar_expose ();
1208#endif 1597#endif
1598
1599#ifdef TRANSPARENT
1600 if (am_transparent && ev.xany.window == parent[0])
1601 XClearWindow (disp, ev.xany.window);
1602#endif
1209 } 1603 }
1210 break; 1604 break;
1211 1605
1212 case MotionNotify: 1606 case MotionNotify:
1213#ifdef POINTER_BLANK 1607#ifdef POINTER_BLANK
… …
1219 { 1613 {
1220 menubar_control (ev.xbutton); 1614 menubar_control (ev.xbutton);
1221 break; 1615 break;
1222 } 1616 }
1223#endif 1617#endif
1224 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1618 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1225 break; 1619 break;
1226 1620
1227 if (ev.xany.window == TermWin.vt) 1621 if (ev.xany.window == vt)
1228 { 1622 {
1623 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1624 ; // nop
1229 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1625 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1230 { 1626 {
1231 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1627 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1232 ; 1628 ;
1233 1629
1234 XQueryPointer (display->display, TermWin.vt, 1630 XQueryPointer (disp, vt,
1235 &unused_root, &unused_child, 1631 &unused_root, &unused_child,
1236 &unused_root_x, &unused_root_y, 1632 &unused_root_x, &unused_root_y,
1237 & (ev.xbutton.x), & (ev.xbutton.y), 1633 &ev.xbutton.x, &ev.xbutton.y,
1238 &unused_mask); 1634 &ev.xbutton.state);
1239#ifdef MOUSE_THRESHOLD 1635#ifdef MOUSE_THRESHOLD
1240 /* deal with a `jumpy' mouse */ 1636 /* deal with a `jumpy' mouse */
1241 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1637 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1242 { 1638 {
1243#endif 1639#endif
1640#if ISO_14755
1641 // 5.4
1642 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1643 {
1644 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1645 break;
1646 }
1647#endif
1244 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1648 selection_extend (ev.xbutton.x, ev.xbutton.y,
1245 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1649 ev.xbutton.state & Button3Mask ? 2 : 0);
1650
1246#ifdef SELECTION_SCROLLING 1651#ifdef SELECTION_SCROLLING
1247 if (ev.xbutton.y < TermWin.int_bwidth 1652 if (ev.xbutton.y < int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1653 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1249 { 1654 {
1250 int dist; 1655 int dist;
1251
1252 pending_scroll_selection=1;
1253 1656
1254 /* don't clobber the current delay if we are 1657 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1658 * already in the middle of scrolling.
1256 */ 1659 */
1257 if (scroll_selection_delay<=0) 1660 if (!sel_scroll_ev.active)
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1661 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1259 1662
1260 /* save the event params so we can highlight 1663 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1664 * the selection in the pending-scroll loop
1262 */ 1665 */
1263 selection_save_x=ev.xbutton.x; 1666 selection_save_x = ev.xbutton.x;
1264 selection_save_y=ev.xbutton.y; 1667 selection_save_y = ev.xbutton.y;
1265 selection_save_state=
1266 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1668 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1267 1669
1268 /* calc number of lines to scroll */ 1670 /* calc number of lines to scroll */
1269 if (ev.xbutton.y<TermWin.int_bwidth) 1671 if (ev.xbutton.y < int_bwidth)
1270 { 1672 {
1271 scroll_selection_dir = UP; 1673 scroll_selection_dir = UP;
1272 dist = TermWin.int_bwidth - ev.xbutton.y; 1674 dist = int_bwidth - ev.xbutton.y;
1273 } 1675 }
1274 else 1676 else
1275 { 1677 {
1276 scroll_selection_dir = DN; 1678 scroll_selection_dir = DN;
1277 dist = ev.xbutton.y - 1679 dist = ev.xbutton.y - (int_bwidth + height);
1278 (TermWin.int_bwidth + TermWin.height);
1279 } 1680 }
1681
1280 scroll_selection_lines= (Pixel2Height (dist)/ 1682 scroll_selection_lines = Pixel2Height (dist)
1281 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1683 / SELECTION_SCROLL_LINE_SPEEDUP
1684 + 1;
1282 MIN_IT (scroll_selection_lines, 1685 min_it (scroll_selection_lines,
1283 SELECTION_SCROLL_MAX_LINES); 1686 SELECTION_SCROLL_MAX_LINES);
1284 } 1687 }
1285 else 1688 else
1286 { 1689 {
1287 /* we are within the text window, so we 1690 /* we are within the text window, so we
1288 * shouldn't be scrolling 1691 * shouldn't be scrolling
1289 */ 1692 */
1290 pending_scroll_selection = 0; 1693 if (sel_scroll_ev.active)
1694 sel_scroll_ev.stop();
1291 } 1695 }
1292#endif 1696#endif
1293#ifdef MOUSE_THRESHOLD 1697#ifdef MOUSE_THRESHOLD
1294
1295 } 1698 }
1296#endif 1699#endif
1297
1298 } 1700 }
1299 } 1701 }
1300 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1702 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1301 { 1703 {
1302 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1704 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1303 MotionNotify, &ev)) ; 1705 MotionNotify, &ev))
1706 ;
1707
1304 XQueryPointer (display->display, scrollBar.win, 1708 XQueryPointer (disp, scrollBar.win,
1305 &unused_root, &unused_child, 1709 &unused_root, &unused_child,
1306 &unused_root_x, &unused_root_y, 1710 &unused_root_x, &unused_root_y,
1307 & (ev.xbutton.x), & (ev.xbutton.y), 1711 &ev.xbutton.x, &ev.xbutton.y,
1308 &unused_mask); 1712 &unused_mask);
1309 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1713 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1310 scrollbar_size ()); 1714 scrollbar_size ());
1311 scr_refresh (refresh_type); 1715 want_refresh = 1;
1312 refresh_limit = 0; 1716 refresh_limit = 0;
1313 scrollbar_show (1); 1717 scrollbar_show (1);
1314 } 1718 }
1315 break; 1719 break;
1316 } 1720 }
1317}
1318 1721
1722skip_switch: ;
1723
1724#if defined(CURSOR_BLINK)
1725 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1726 {
1727 if (hidden_cursor)
1728 {
1729 hidden_cursor = 0;
1730 want_refresh = 1;
1731 }
1732
1733 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1734 }
1735#endif
1736
1737#if defined(POINTER_BLANK)
1738 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1739 {
1740 if (ev.type == MotionNotify
1741 || ev.type == ButtonPress
1742 || ev.type == ButtonRelease)
1743 if (hidden_pointer)
1744 pointer_unblank ();
1745
1746 if (ev.type == KeyPress && hidden_pointer == 0)
1747 pointer_blank ();
1748 }
1749#endif
1750}
1751
1752void
1753rxvt_term::focus_in ()
1754{
1755 if (!focus)
1756 {
1757 focus = 1;
1758 want_refresh = 1;
1759
1760 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1761
1762#if USE_XIM
1763 if (Input_Context != NULL)
1764 {
1765 IMSetStatusPosition ();
1766 XSetICFocus (Input_Context);
1767 }
1768#endif
1769#if CURSOR_BLINK
1770 if (OPTION (Opt_cursorBlink))
1771 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1772#endif
1773#if OFF_FOCUS_FADING
1774 if (rs[Rs_fade])
1775 {
1776 pix_colors = pix_colors_focused;
1777 scr_recolour ();
1778 }
1779#endif
1780 }
1781}
1782
1783void
1784rxvt_term::focus_out ()
1785{
1786 if (focus)
1787 {
1788 focus = 0;
1789 want_refresh = 1;
1790
1791 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1792
1793#if ENABLE_FRILLS || ISO_14755
1794 if (iso14755buf)
1795 {
1796 iso14755buf = 0;
1797# if ENABLE_OVERLAY
1798 scr_overlay_off ();
1799# endif
1800 }
1801#endif
1802#if USE_XIM
1803 if (Input_Context != NULL)
1804 XUnsetICFocus (Input_Context);
1805#endif
1806#if CURSOR_BLINK
1807 if (OPTION (Opt_cursorBlink))
1808 cursor_blink_ev.stop ();
1809 hidden_cursor = 0;
1810#endif
1811#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade])
1813 {
1814 pix_colors = pix_colors_unfocused;
1815 scr_recolour ();
1816 }
1817#endif
1818 }
1819}
1820
1821#if TRANSPARENT
1319void 1822void
1320rxvt_term::rootwin_cb (XEvent &ev) 1823rxvt_term::rootwin_cb (XEvent &ev)
1321{ 1824{
1322 SET_R (this); 1825 SET_R (this);
1323 SET_LOCALE (locale); 1826 SET_LOCALE (locale);
1324 1827
1325 switch (ev.type) 1828 switch (ev.type)
1326 { 1829 {
1327 case PropertyNotify: 1830 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 /* 1831 /*
1338 * if user used some Esetroot compatible prog to set the root bg, 1832 * 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. 1833 * use the property to determine the pixmap. We use it later on.
1340 */ 1834 */
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]) 1835 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1836 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1345 return; 1837 return;
1346 }
1347 1838
1348 /* FALLTHROUGH */ 1839 /* FALLTHROUGH */
1349 case ReparentNotify: 1840 case ReparentNotify:
1350 if ((Options & Opt_transparent) && check_our_parents ()) 1841 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1351 if (am_transparent)
1352 want_full_refresh = 1; 1842 want_refresh = want_full_refresh = 1;
1353 break; 1843 break;
1354#endif
1355 } 1844 }
1356} 1845}
1846#endif
1357 1847
1358void 1848void
1359rxvt_term::button_press (XButtonEvent &ev) 1849rxvt_term::button_press (XButtonEvent &ev)
1360{ 1850{
1361 int reportmode = 0, clickintime; 1851 int reportmode = 0, clickintime;
1362 1852
1363 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1853 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1854
1364 if (!bypass_keystate) 1855 if (!bypass_keystate)
1365 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1856 reportmode = !! (priv_modes & PrivMode_mouse_report);
1857
1366 /* 1858 /*
1367 * VT window processing of button press 1859 * VT window processing of button press
1368 */ 1860 */
1369 if (ev.window == TermWin.vt) 1861 if (ev.window == vt)
1370 { 1862 {
1863#if ISO_14755
1864 // 5.4
1865 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1866 {
1867 iso14755_54 (ev.x, ev.y);
1868 return;
1869 }
1870#endif
1871
1371 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1872 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1873
1372 if (reportmode) 1874 if (reportmode)
1373 { 1875 {
1374 /* mouse report from vt window */ 1876 /* mouse report from vt window */
1375 /* save the xbutton state (for ButtonRelease) */ 1877 /* save the xbutton state (for ButtonRelease) */
1376 MEvent.state = ev.state; 1878 MEvent.state = ev.state;
1377#ifdef MOUSE_REPORT_DOUBLECLICK 1879#ifdef MOUSE_REPORT_DOUBLECLICK
1378 if (ev.button == MEvent.button && clickintime) 1880 if (ev.button == MEvent.button && clickintime)
1379 { 1881 {
1380 /* same button, within alloted time */ 1882 /* same button, within alloted time */
1381 MEvent.clicks++; 1883 MEvent.clicks++;
1884
1382 if (MEvent.clicks > 1) 1885 if (MEvent.clicks > 1)
1383 { 1886 {
1384 /* only report double clicks */ 1887 /* only report double clicks */
1385 MEvent.clicks = 2; 1888 MEvent.clicks = 2;
1386 mouse_report (ev); 1889 mouse_report (ev);
… …
1405 } 1908 }
1406 else 1909 else
1407 { 1910 {
1408 if (ev.button != MEvent.button) 1911 if (ev.button != MEvent.button)
1409 MEvent.clicks = 0; 1912 MEvent.clicks = 0;
1913
1914 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1410 switch (ev.button) 1915 switch (ev.button)
1411 { 1916 {
1412 case Button1: 1917 case Button1:
1918 /* allow meta + click to select rectangular areas */
1919 /* should be done in screen.C */
1920#if ENABLE_FRILLS
1921 selection.rect = !!(ev.state & ModMetaMask);
1922#else
1923 selection.rect = false;
1924#endif
1925
1413 /* allow shift+left click to extend selection */ 1926 /* allow shift+left click to extend selection */
1414 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1927 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1415 { 1928 {
1416 if (MEvent.button == Button1 && clickintime) 1929 if (MEvent.button == Button1 && clickintime)
1417 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1418 else 1931 else
1419 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
1420 } 1933 }
1421 else 1934 else
1422 { 1935 {
1423 if (MEvent.button == Button1 && clickintime) 1936 if (MEvent.button == Button1 && clickintime)
1424 MEvent.clicks++; 1937 MEvent.clicks++;
1425 else 1938 else
1426 MEvent.clicks = 1; 1939 MEvent.clicks = 1;
1427 1940
1428 selection_click (MEvent.clicks, ev.x, ev.y); 1941 selection_click (MEvent.clicks, ev.x, ev.y);
1429 } 1942 }
1430 1943
1431 MEvent.button = Button1; 1944 MEvent.button = Button1;
1432 break; 1945 break;
1433 1946
1434 case Button3: 1947 case Button3:
1435 if (MEvent.button == Button3 && clickintime) 1948 if (MEvent.button == Button3 && clickintime)
1436 selection_rotate (ev.x, ev.y); 1949 selection_rotate (ev.x, ev.y);
1437 else 1950 else
1438 selection_extend (ev.x, ev.y, 1); 1951 selection_extend (ev.x, ev.y, 1);
1952
1439 MEvent.button = Button3; 1953 MEvent.button = Button3;
1440 break; 1954 break;
1441 } 1955 }
1442 } 1956 }
1957
1443 MEvent.time = ev.time; 1958 MEvent.time = ev.time;
1444 return; 1959 return;
1445 } 1960 }
1446 1961
1447 /* 1962 /*
… …
1513 upordown = 1; /* down */ 2028 upordown = 1; /* down */
1514 } 2029 }
1515 if (upordown) 2030 if (upordown)
1516 { 2031 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2032#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2033 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1519#endif 2034#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 2035 if (scr_page (upordown < 0 ? UP : DN, 1))
1521 { 2036 {
1522 if (upordown < 0) 2037 if (upordown < 0)
1523 scrollBar.setUp (); 2038 scrollBar.setUp ();
… …
1539 break; 2054 break;
1540 case R_SB_ALIGN_BOTTOM: 2055 case R_SB_ALIGN_BOTTOM:
1541 csrO = scrollBar.bot - scrollBar.top; 2056 csrO = scrollBar.bot - scrollBar.top;
1542 break; 2057 break;
1543 } 2058 }
2059
1544 if (scrollBar.style == R_SB_XTERM 2060 if (scrollBar.style == R_SB_XTERM
1545 || scrollbar_above_slider (ev.y) 2061 || scrollbar_above_slider (ev.y)
1546 || scrollbar_below_slider (ev.y)) 2062 || scrollbar_below_slider (ev.y))
1547 scr_move_to ( scrollbar_position (ev.y) - csrO, 2063 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1548 scrollbar_size ()); 2064
1549 scrollBar.setMotion (); 2065 scrollBar.setMotion ();
1550 break; 2066 break;
1551 2067
1552 case Button1: 2068 case Button1:
1553 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2069 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1557 case Button3: 2073 case Button3:
1558 if (scrollBar.style != R_SB_XTERM) 2074 if (scrollBar.style != R_SB_XTERM)
1559 { 2075 {
1560 if (scrollbar_above_slider (ev.y)) 2076 if (scrollbar_above_slider (ev.y))
1561# ifdef RXVT_SCROLL_FULL 2077# ifdef RXVT_SCROLL_FULL
1562 scr_page (UP, TermWin.nrow - 1); 2078 scr_page (UP, nrow - 1);
1563# else 2079# else
1564 scr_page (UP, TermWin.nrow / 4); 2080 scr_page (UP, nrow / 4);
1565# endif 2081# endif
1566 else if (scrollbar_below_slider (ev.y)) 2082 else if (scrollbar_below_slider (ev.y))
1567# ifdef RXVT_SCROLL_FULL 2083# ifdef RXVT_SCROLL_FULL
1568 scr_page (DN, TermWin.nrow - 1); 2084 scr_page (DN, nrow - 1);
1569# else 2085# else
1570 scr_page (DN, TermWin.nrow / 4); 2086 scr_page (DN, nrow / 4);
1571# endif 2087# endif
1572 else 2088 else
1573 scrollBar.setMotion (); 2089 scrollBar.setMotion ();
1574 } 2090 }
1575 else 2091 else
1576 { 2092 {
1577 scr_page ((ev.button == Button1 ? DN : UP), 2093 scr_page ((ev.button == Button1 ? DN : UP),
1578 (TermWin.nrow 2094 (nrow
1579 * scrollbar_position (ev.y) 2095 * scrollbar_position (ev.y)
1580 / scrollbar_size ())); 2096 / scrollbar_size ()));
1581 } 2097 }
2098
1582 break; 2099 break;
1583 } 2100 }
1584 } 2101 }
2102
1585 return; 2103 return;
1586 } 2104 }
2105
1587#if MENUBAR 2106#if MENUBAR
1588 /* 2107 /*
1589 * Menubar window processing of button press 2108 * Menubar window processing of button press
1590 */ 2109 */
1591 if (isMenuBarWindow (ev.window)) 2110 if (isMenuBarWindow (ev.window))
… …
1598{ 2117{
1599 int reportmode = 0; 2118 int reportmode = 0;
1600 2119
1601 csrO = 0; /* reset csr Offset */ 2120 csrO = 0; /* reset csr Offset */
1602 if (!bypass_keystate) 2121 if (!bypass_keystate)
1603 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2122 reportmode = !! (priv_modes & PrivMode_mouse_report);
1604 2123
1605 if (scrollbar_isUpDn ()) 2124 if (scrollbar_isUpDn ())
1606 { 2125 {
1607 scrollBar.setIdle (); 2126 scrollBar.setIdle ();
1608 scrollbar_show (0); 2127 scrollbar_show (0);
1609#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2128#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1610 refresh_type &= ~SMOOTH_REFRESH; 2129 refresh_type &= ~SMOOTH_REFRESH;
1611#endif 2130#endif
1612
1613 } 2131 }
2132
1614#ifdef SELECTION_SCROLLING 2133#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 2134 if (sel_scroll_ev.active)
2135 sel_scroll_ev.stop();
1616#endif 2136#endif
2137
1617 if (ev.window == TermWin.vt) 2138 if (ev.window == vt)
1618 { 2139 {
2140#if ISO_14755
2141 // 5.4
2142 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2143 return;
2144#endif
1619 if (reportmode) 2145 if (reportmode)
1620 { 2146 {
1621 /* mouse report from vt window */ 2147 /* mouse report from vt window */
1622 /* don't report release of wheel "buttons" */ 2148 /* don't report release of wheel "buttons" */
1623 if (ev.button >= 4) 2149 if (ev.button >= 4)
… …
1637 MEvent.button = AnyButton; 2163 MEvent.button = AnyButton;
1638 mouse_report (ev); 2164 mouse_report (ev);
1639#endif /* MOUSE_REPORT_DOUBLECLICK */ 2165#endif /* MOUSE_REPORT_DOUBLECLICK */
1640 return; 2166 return;
1641 } 2167 }
2168
1642 /* 2169 /*
1643 * dumb hack to compensate for the failure of click-and-drag 2170 * dumb hack to compensate for the failure of click-and-drag
1644 * when overriding mouse reporting 2171 * when overriding mouse reporting
1645 */ 2172 */
1646 if (PrivateModes & PrivMode_mouse_report 2173 if (priv_modes & PrivMode_mouse_report
1647 && bypass_keystate 2174 && bypass_keystate
1648 && ev.button == Button1 && MEvent.clicks <= 1) 2175 && ev.button == Button1 && MEvent.clicks <= 1)
1649 selection_extend (ev.x, ev.y, 0); 2176 selection_extend (ev.x, ev.y, 0);
2177
2178 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2179 return;
1650 2180
1651 switch (ev.button) 2181 switch (ev.button)
1652 { 2182 {
1653 case Button1: 2183 case Button1:
1654 case Button3: 2184 case Button3:
… …
1662 case Button5: 2192 case Button5:
1663 { 2193 {
1664 int i; 2194 int i;
1665 page_dirn v; 2195 page_dirn v;
1666 2196
1667 v = (ev.button == Button4) ? UP : DN; 2197 v = ev.button == Button4 ? UP : DN;
2198
1668 if (ev.state & ShiftMask) 2199 if (ev.state & ShiftMask)
1669 i = 1; 2200 i = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 2201 else if (OPTION (Opt_mouseWheelScrollPage))
1671 i = TermWin.nrow - 1; 2202 i = nrow - 1;
1672 else 2203 else
1673 i = 5; 2204 i = 5;
2205
1674# ifdef MOUSE_SLIP_WHEELING 2206# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 2207 if (ev.state & ControlMask)
1676 { 2208 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 2209 mouse_slip_wheel_speed += v ? -1 : 1;
2210 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2211 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2212
2213 if (slip_wheel_ev.at < NOW)
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2214 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2215
2216 slip_wheel_ev.start ();
2217 }
2218 else
2219 {
2220# endif
2221 scr_page (v, i);
2222 scrollbar_show (1);
2223# ifdef MOUSE_SLIP_WHEELING
1679 } 2224 }
1680# endif 2225# endif
1681# 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);
1689 scr_refresh (SMOOTH_REFRESH);
1690 scrollbar_show (1);
1691 }
1692# endif
1693
1694 } 2226 }
1695 break; 2227 break;
1696#endif 2228#endif
1697
1698 } 2229 }
1699 } 2230 }
1700#ifdef MENUBAR 2231#ifdef MENUBAR
1701 else if (isMenuBarWindow (ev.window)) 2232 else if (isMenuBarWindow (ev.window))
1702 menubar_control (ev); 2233 menubar_control (ev);
1703#endif 2234#endif
1704} 2235}
1705 2236
1706
1707#ifdef TRANSPARENT 2237#ifdef TRANSPARENT
2238#if TINTING
2239/* taken from aterm-0.4.2 */
2240
2241typedef uint32_t RUINT32T;
2242
2243void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2244{
2245 int sh_r, sh_g, sh_b;
2246 RUINT32T mask_r, mask_g, mask_b;
2247 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2248 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2249 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2250 int i;
2251
2252 Visual *visual = display->visual;
2253
2254 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2255
2256 /* for convenience */
2257 mask_r = visual->red_mask;
2258 mask_g = visual->green_mask;
2259 mask_b = visual->blue_mask;
2260
2261 /* boring lookup table pre-initialization */
2262 switch (srcImage->bits_per_pixel) {
2263 case 15:
2264 if ((mask_r != 0x7c00) ||
2265 (mask_g != 0x03e0) ||
2266 (mask_b != 0x001f))
2267 return;
2268 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2269 lookup_r = lookup;
2270 lookup_g = lookup+32;
2271 lookup_b = lookup+32+32;
2272 sh_r = 10;
2273 sh_g = 5;
2274 sh_b = 0;
2275 break;
2276 case 16:
2277 if ((mask_r != 0xf800) ||
2278 (mask_g != 0x07e0) ||
2279 (mask_b != 0x001f))
2280 return;
2281 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2282 lookup_r = lookup;
2283 lookup_g = lookup+32;
2284 lookup_b = lookup+32+64;
2285 sh_r = 11;
2286 sh_g = 5;
2287 sh_b = 0;
2288 break;
2289 case 24:
2290 if ((mask_r != 0xff0000) ||
2291 (mask_g != 0x00ff00) ||
2292 (mask_b != 0x0000ff))
2293 return;
2294 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2295 lookup_r = lookup;
2296 lookup_g = lookup+256;
2297 lookup_b = lookup+256+256;
2298 sh_r = 16;
2299 sh_g = 8;
2300 sh_b = 0;
2301 break;
2302 case 32:
2303 if ((mask_r != 0xff0000) ||
2304 (mask_g != 0x00ff00) ||
2305 (mask_b != 0x0000ff))
2306 return;
2307 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2308 lookup_r = lookup;
2309 lookup_g = lookup+256;
2310 lookup_b = lookup+256+256;
2311 sh_r = 16;
2312 sh_g = 8;
2313 sh_b = 0;
2314 break;
2315 default:
2316 return; /* we do not support this color depth */
2317 }
2318
2319 /* prepare limits for color transformation (each channel is handled separately) */
2320 if (shade < 0) {
2321 shade = -shade;
2322 if (shade < 0) shade = 0;
2323 if (shade > 100) shade = 100;
2324
2325 lower_lim_r = 65535-rm;
2326 lower_lim_g = 65535-gm;
2327 lower_lim_b = 65535-bm;
2328
2329 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2330 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2331 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2332
2333 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2334 } else {
2335 if (shade < 0) shade = 0;
2336 if (shade > 100) shade = 100;
2337
2338 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2339
2340 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2341 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2342 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2343 }
2344
2345 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2346 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2347 {
2348 unsigned int tmp;
2349
2350 tmp = lower_lim_r;
2351 lower_lim_r = lower_lim_b;
2352 lower_lim_b = tmp;
2353
2354 tmp = upper_lim_r;
2355 upper_lim_r = upper_lim_b;
2356 upper_lim_b = tmp;
2357 }
2358
2359 /* fill our lookup tables */
2360 for (i = 0; i <= mask_r>>sh_r; i++)
2361 {
2362 RUINT32T tmp;
2363 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2364 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2365 lookup_r[i] = (tmp/65535)<<sh_r;
2366 }
2367 for (i = 0; i <= mask_g>>sh_g; i++)
2368 {
2369 RUINT32T tmp;
2370 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2371 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2372 lookup_g[i] = (tmp/65535)<<sh_g;
2373 }
2374 for (i = 0; i <= mask_b>>sh_b; i++)
2375 {
2376 RUINT32T tmp;
2377 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2378 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2379 lookup_b[i] = (tmp/65535)<<sh_b;
2380 }
2381
2382 /* apply table to input image (replacing colors by newly calculated ones) */
2383 switch (srcImage->bits_per_pixel)
2384 {
2385 case 15:
2386 {
2387 unsigned short *p1, *pf, *p, *pl;
2388 p1 = (unsigned short *) srcImage->data;
2389 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2390 while (p1 < pf)
2391 {
2392 p = p1;
2393 pl = p1 + srcImage->width;
2394 for (; p < pl; p++)
2395 {
2396 *p = lookup_r[(*p & 0x7c00)>>10] |
2397 lookup_g[(*p & 0x03e0)>> 5] |
2398 lookup_b[(*p & 0x001f)];
2399 }
2400 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2401 }
2402 break;
2403 }
2404 case 16:
2405 {
2406 unsigned short *p1, *pf, *p, *pl;
2407 p1 = (unsigned short *) srcImage->data;
2408 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2409 while (p1 < pf)
2410 {
2411 p = p1;
2412 pl = p1 + srcImage->width;
2413 for (; p < pl; p++)
2414 {
2415 *p = lookup_r[(*p & 0xf800)>>11] |
2416 lookup_g[(*p & 0x07e0)>> 5] |
2417 lookup_b[(*p & 0x001f)];
2418 }
2419 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2420 }
2421 break;
2422 }
2423 case 24:
2424 {
2425 unsigned char *p1, *pf, *p, *pl;
2426 p1 = (unsigned char *) srcImage->data;
2427 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2428 while (p1 < pf)
2429 {
2430 p = p1;
2431 pl = p1 + srcImage->width * 3;
2432 for (; p < pl; p += 3)
2433 {
2434 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2435 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2436 p[2] = lookup_r[(p[2] & 0x0000ff)];
2437 }
2438 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2439 }
2440 break;
2441 }
2442 case 32:
2443 {
2444 RUINT32T *p1, *pf, *p, *pl;
2445 p1 = (RUINT32T *) srcImage->data;
2446 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2447
2448 while (p1 < pf)
2449 {
2450 p = p1;
2451 pl = p1 + srcImage->width;
2452 for (; p < pl; p++)
2453 {
2454 *p = lookup_r[(*p & 0xff0000)>>16] |
2455 lookup_g[(*p & 0x00ff00)>> 8] |
2456 lookup_b[(*p & 0x0000ff)] |
2457 (*p & ~0xffffff);
2458 }
2459 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2460 }
2461 break;
2462 }
2463 }
2464
2465 free (lookup);
2466}
2467#endif
2468
1708/* 2469/*
1709 * Check our parents are still who we think they are. 2470 * Check our parents are still who we think they are.
1710 * Do transparency updates if required 2471 * Do transparency updates if required
1711 */ 2472 */
1712int 2473int
1713rxvt_term::check_our_parents () 2474rxvt_term::check_our_parents ()
1714{ 2475{
1715 int i, pchanged, aformat, have_pixmap, rootdepth; 2476 int i, pchanged, aformat, have_pixmap, rootdepth;
1716 unsigned long nitems, bytes_after; 2477 unsigned long nitems, bytes_after;
1717 Atom atype; 2478 Atom atype;
1718 unsigned char *prop = NULL; 2479 unsigned char *prop = NULL;
1719 Window root, oldp, *list; 2480 Window root, oldp, *list;
1720 Pixmap rootpixmap = None; 2481 Pixmap rootpixmap = None;
1721 XWindowAttributes wattr, wrootattr; 2482 XWindowAttributes wattr, wrootattr;
2483 dDisp;
1722 2484
1723 pchanged = 0; 2485 pchanged = 0;
1724 2486
1725 if (! (Options & Opt_transparent)) 2487 if (!OPTION (Opt_transparent))
1726 return pchanged; /* Don't try any more */ 2488 return pchanged; /* Don't try any more */
1727 2489
1728 XGetWindowAttributes (display->display, display->root, &wrootattr); 2490 XGetWindowAttributes (disp, display->root, &wrootattr);
1729 rootdepth = wrootattr.depth; 2491 rootdepth = wrootattr.depth;
1730 2492
1731 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2493 XGetWindowAttributes (disp, parent[0], &wattr);
2494
1732 if (rootdepth != wattr.depth) 2495 if (rootdepth != wattr.depth)
1733 { 2496 {
1734 if (am_transparent) 2497 if (am_transparent)
1735 { 2498 {
1736 pchanged = 1; 2499 pchanged = 1;
1737 XSetWindowBackground (display->display, TermWin.vt, 2500 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
1738 PixColors[Color_bg]);
1739 am_transparent = am_pixmap_trans = 0; 2501 am_transparent = am_pixmap_trans = 0;
1740 } 2502 }
2503
1741 return pchanged; /* Don't try any more */ 2504 return pchanged; /* Don't try any more */
1742 } 2505 }
1743 2506
1744 /* Get all X ops out of the queue so that our information is up-to-date. */ 2507 /* Get all X ops out of the queue so that our information is up-to-date. */
1745 XSync (display->display, False); 2508 XSync (disp, False);
1746 2509
1747 /* 2510 /*
1748 * Make the frame window set by the window manager have 2511 * Make the frame window set by the window manager have
1749 * the root background. Some window managers put multiple nested frame 2512 * the root background. Some window managers put multiple nested frame
1750 * windows for each client, so we have to take care about that. 2513 * windows for each client, so we have to take care about that.
1751 */ 2514 */
1752 i = (xa[XA_XROOTPMAPID] != 0 2515 i = (xa[XA_XROOTPMAP_ID]
1753 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2516 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1754 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2517 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1755 &nitems, &bytes_after, &prop) == Success)); 2518 &nitems, &bytes_after, &prop) == Success);
2519
1756 if (!i || prop == NULL) 2520 if (!i || prop == NULL)
2521 i = (xa[XA_ESETROOT_PMAP_ID]
2522 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2523 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2524 &nitems, &bytes_after, &prop) == Success);
2525
2526 if (!i || prop == NULL
2527#if TINTING
2528 || !rs[Rs_color + Color_tint]
2529#endif
2530 )
1757 have_pixmap = 0; 2531 have_pixmap = 0;
1758 else 2532 else
1759 { 2533 {
1760 have_pixmap = 1; 2534 have_pixmap = 1;
1761 rootpixmap = * ((Pixmap *)prop); 2535 rootpixmap = *(Pixmap *)prop;
1762 XFree (prop); 2536 XFree (prop);
1763 } 2537 }
2538
1764 if (have_pixmap) 2539 if (have_pixmap)
1765 { 2540 {
1766 /* 2541 /*
1767 * Copy display->root pixmap transparency 2542 * Copy display->root pixmap transparency
1768 */ 2543 */
… …
1771 Window cr; 2546 Window cr;
1772 XImage *image; 2547 XImage *image;
1773 GC gc; 2548 GC gc;
1774 XGCValues gcvalue; 2549 XGCValues gcvalue;
1775 2550
1776 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2551 XTranslateCoordinates (disp, parent[0], display->root,
1777 0, 0, &sx, &sy, &cr); 2552 0, 0, &sx, &sy, &cr);
1778 nw = (unsigned int)szHint.width; 2553 nw = (unsigned int)szHint.width;
1779 nh = (unsigned int)szHint.height; 2554 nh = (unsigned int)szHint.height;
1780 nx = ny = 0; 2555 nx = ny = 0;
1781 2556
1782 if (sx < 0) 2557 if (sx < 0)
… …
1791 nh += sy; 2566 nh += sy;
1792 ny = -sy; 2567 ny = -sy;
1793 sy = 0; 2568 sy = 0;
1794 } 2569 }
1795 2570
1796 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2571 min_it (nw, (unsigned int) (wrootattr.width - sx));
1797 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2572 min_it (nh, (unsigned int) (wrootattr.height - sy));
2573
2574 XSync (disp, False);
1798 allowedxerror = -1; 2575 allowedxerror = -1;
1799 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2576 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1800 ZPixmap); 2577
1801 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2578 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1802 /* XXX: may need a delay here? */ 2579 /* XXX: may need a delay here? */
1803 allowedxerror = 0; 2580 allowedxerror = 0;
2581
1804 if (image == NULL) 2582 if (image == NULL)
1805 { 2583 {
1806 if (am_transparent && am_pixmap_trans) 2584 if (am_transparent && am_pixmap_trans)
1807 { 2585 {
1808 pchanged = 1; 2586 pchanged = 1;
1809 if (TermWin.pixmap != None) 2587 if (pixmap != None)
1810 { 2588 {
1811 XFreePixmap (display->display, TermWin.pixmap); 2589 XFreePixmap (disp, pixmap);
1812 TermWin.pixmap = None; 2590 pixmap = None;
1813 } 2591 }
1814 } 2592 }
2593
1815 am_pixmap_trans = 0; 2594 am_pixmap_trans = 0;
1816 } 2595 }
1817 else 2596 else
1818 { 2597 {
1819 if (TermWin.pixmap != None) 2598 if (pixmap != None)
1820 XFreePixmap (display->display, TermWin.pixmap); 2599 XFreePixmap (disp, pixmap);
2600
2601#if TINTING
2602 if (ISSET_PIXCOLOR (Color_tint))
2603 {
2604 unsigned short rm, gm, bm;
2605 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2606
2607 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2608
2609 ShadeXImage (display, image, shade, rm, gm, bm);
2610 }
2611#endif
2612
1821 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2613 pixmap = XCreatePixmap (disp, vt,
1822 (unsigned int)szHint.width,
1823 (unsigned int)szHint.height, 2614 szHint.width, szHint.height, image->depth);
1824 (unsigned int)image->depth);
1825 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2615 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
1826 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2616 XPutImage (disp, pixmap, gc, image, 0, 0,
1827 nx, ny, (unsigned int)image->width,
1828 (unsigned int)image->height); 2617 nx, ny, image->width, image->height);
1829 XFreeGC (display->display, gc); 2618 XFreeGC (disp, gc);
1830 XDestroyImage (image); 2619 XDestroyImage (image);
1831 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2620 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
1832 TermWin.pixmap); 2621 XClearWindow (disp, parent[0]);
2622
1833 if (!am_transparent || !am_pixmap_trans) 2623 if (!am_transparent || !am_pixmap_trans)
1834 pchanged = 1; 2624 pchanged = 1;
2625
1835 am_transparent = am_pixmap_trans = 1; 2626 am_transparent = am_pixmap_trans = 1;
1836 } 2627 }
1837 } 2628 }
1838 2629
1839 if (!am_pixmap_trans) 2630 if (am_pixmap_trans)
2631 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2632 else
1840 { 2633 {
1841 unsigned int n; 2634 unsigned int n;
1842 /* 2635 /*
1843 * InheritPixmap transparency 2636 * InheritPixmap transparency
1844 */ 2637 */
1845 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1846 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2638 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
1847 i++)
1848 { 2639 {
1849 oldp = TermWin.parent[i]; 2640 oldp = parent[i];
1850 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2641 XQueryTree (disp, parent[i - 1], &root,
1851 &TermWin.parent[i], &list, &n); 2642 &parent[i], &list, &n);
1852 XFree (list); 2643 XFree (list);
1853 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2644
1854 if (TermWin.parent[i] == display->root) 2645 if (parent[i] == display->root)
1855 { 2646 {
1856 if (oldp != None) 2647 if (oldp != None)
1857 pchanged = 1; 2648 pchanged = 1;
2649
1858 break; 2650 break;
1859 } 2651 }
2652
1860 if (oldp != TermWin.parent[i]) 2653 if (oldp != parent[i])
1861 pchanged = 1; 2654 pchanged = 1;
1862 } 2655 }
1863 2656
1864 n = 0; 2657 n = 0;
1865 2658
1866 if (pchanged) 2659 if (pchanged)
1867 { 2660 {
1868 for (; n < (unsigned int)i; n++) 2661 for (; n < (unsigned int)i; n++)
1869 { 2662 {
1870 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2663 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) 2664 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
1873 { 2665 {
1874 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2666 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
1875 break; 2667 break;
1876 } 2668 }
1877 } 2669 }
1878 } 2670 }
1879 2671
1880 if (n > (int) (sizeof (TermWin.parent) 2672 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
1881 / sizeof (TermWin.parent[0])))
1882 { 2673 {
1883 D_X ((stderr, "InheritPixmap Turning off")); 2674 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
1884 XSetWindowBackground (display->display, TermWin.parent[0], 2675 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; 2676 am_transparent = 0;
1889 /* XXX: also turn off Opt_transparent? */ 2677 /* XXX: also turn off Opt_transparent? */
1890 } 2678 }
1891 else 2679 else
1892 { 2680 {
2681#if WAIT_FOR_WM
1893 /* wait (an arbitrary period) for the WM to do its thing 2682 /* wait (an arbitrary period) for the WM to do its thing
1894 * needed for fvwm2.2.2 (and before?) */ 2683 * 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); 2684 sleep (1);
1903# endif 2685#endif
1904 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
1905 for (n = 0; n < (unsigned int)i; n++) 2686 for (n = 0; n < (unsigned int)i; n++)
1906 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2687 {
1907 ParentRelative); 2688 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
1908 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2689 XClearWindow (disp, parent[n]);
1909 ParentRelative); 2690 }
2691
2692 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
1910 am_transparent = 1; 2693 am_transparent = 1;
1911 } 2694 }
1912 2695
1913 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2696 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
1914 TermWin.parent[i] = None; 2697 parent[i] = None;
2698 }
2699
2700 if (scrollBar.win)
1915 } 2701 {
2702 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2703 scrollBar.setIdle ();
2704 scrollbar_show (0);
2705 }
2706
2707 if (am_transparent)
2708 {
2709 want_refresh = want_full_refresh = 1;
2710 if (am_pixmap_trans)
2711 flush ();
2712 }
2713
1916 return pchanged; 2714 return pchanged;
1917} 2715}
1918#endif 2716#endif
1919 2717
1920/*}}} */ 2718/*}}} */
1921 2719
1922bool 2720bool
1923rxvt_term::cmd_parse () 2721rxvt_term::cmd_parse ()
1924{ 2722{
1925 bool flag = false; 2723 bool flag = false;
1926 unicode_t ch = NOCHAR; 2724 wchar_t ch = NOCHAR;
1927 unsigned char *seq_begin; // remember start of esc-sequence here 2725 char *seq_begin; // remember start of esc-sequence here
1928 2726
1929 for (;;) 2727 for (;;)
1930 { 2728 {
1931 if (ch == NOCHAR) 2729 if (ch == NOCHAR)
1932 { 2730 {
1933 seq_begin = cmdbuf_ptr; 2731 seq_begin = cmdbuf_ptr;
1934 ch = next_char (); 2732 ch = next_char ();
1935 }
1936 2733
1937 if (ch == NOCHAR) // TODO: improve 2734 if (ch == NOCHAR)
1938 break; 2735 break;
1939
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r')
1941 { 2736 }
2737
2738 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2739 {
2740 if (!seen_input)
2741 {
2742 seen_input = 1;
2743 // many badly-written programs (e.g. jed) contain a race condition:
2744 // they first read the screensize and then install a SIGWINCH handler.
2745 // some window managers resize the window early, and these programs
2746 // then sometimes get the size wrong.
2747 // unfortunately other programs are even more buggy and dislike
2748 // being sent SIGWINCH, so only do it when we were in fact being
2749 // resized.
2750 if (seen_resize && cmd_pid)
2751 kill (-cmd_pid, SIGWINCH);
2752 }
2753
1942 /* Read a text string from the input buffer */ 2754 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2755 wchar_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2756 bool refreshnow = false;
1945 int nlines = 0; 2757 int nlines = 0;
1946 unicode_t *str = buf; 2758 wchar_t *str = buf;
1947 2759 wchar_t *eol = str + min (ncol, UBUFSIZ);
1948 *str++ = ch;
1949 2760
1950 for (;;) 2761 for (;;)
1951 { 2762 {
1952 seq_begin = cmdbuf_ptr;
1953 ch = next_char ();
1954
1955 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2763 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
1956 break; 2764 break;
1957 2765
1958 *str++ = ch; 2766 *str++ = ch;
1959 2767
1960 if (ch == '\n') 2768 if (ch == C0_LF || str >= eol)
1961 { 2769 {
2770 if (ch == C0_LF)
1962 nlines++; 2771 nlines++;
2772
1963 refresh_count++; 2773 refresh_count++;
1964 2774
1965 if (! (Options & Opt_jumpScroll) 2775 if (!OPTION (Opt_jumpScroll)
1966 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2776 || (refresh_count >= refresh_limit * (nrow - 1)))
1967 { 2777 {
1968 refreshnow = true; 2778 refreshnow = true;
1969 flag = true; 2779 refresh_count = 0;
1970 ch = NOCHAR; 2780 ch = NOCHAR;
1971 break; 2781 break;
1972 } 2782 }
1973 2783
1974 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2784 // scr_add_lines only works for nlines <= nrow - 1.
1975 if (nlines >= TermWin.nrow - 1) 2785 if (nlines >= nrow - 1)
1976 { 2786 {
2787 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
1977 scr_add_lines (buf, nlines, str - buf); 2788 scr_add_lines (buf, str - buf, nlines);
2789
1978 nlines = 0; 2790 nlines = 0;
1979 str = buf; 2791 str = buf;
2792 eol = str + min (ncol, UBUFSIZ);
1980 } 2793 }
2794
2795 if (str >= eol)
2796 {
2797 if (eol >= buf + UBUFSIZ)
2798 {
2799 ch = NOCHAR;
2800 break;
2801 }
2802 else
2803 eol = min (eol + ncol, buf + UBUFSIZ);
2804 }
2805
1981 } 2806 }
1982 2807
1983 if (str >= buf + UBUFSIZ) 2808 seq_begin = cmdbuf_ptr;
1984 { 2809 ch = next_char ();
1985 ch = NOCHAR;
1986 break;
1987 }
1988 } 2810 }
1989 2811
2812 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
1990 scr_add_lines (buf, nlines, str - buf); 2813 scr_add_lines (buf, str - buf, nlines);
1991 2814
1992 /* 2815 /*
1993 * If there have been a lot of new lines, then update the screen 2816 * 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. 2817 * 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 2818 * the number of pages between refreshes is refresh_limit, which
1996 * is incremented here because we must be doing flat-out scrolling. 2819 * 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 */ 2820 */
2001 if (refreshnow) 2821 if (refreshnow)
2002 { 2822 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2823 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2004 refresh_limit++; 2824 refresh_limit++;
2005 2825 else
2826 {
2827 flag = true;
2006 scr_refresh (refresh_type); 2828 scr_refresh (refresh_type);
2829 want_refresh = 1;
2830 }
2007 } 2831 }
2008 2832
2009 } 2833 }
2010 else 2834 else
2011 { 2835 {
… …
2026 2850
2027 return flag; 2851 return flag;
2028} 2852}
2029 2853
2030// read the next character 2854// read the next character
2031unicode_t 2855wchar_t
2032rxvt_term::next_char () 2856rxvt_term::next_char ()
2033{ 2857{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2858 while (cmdbuf_ptr < cmdbuf_endp)
2035 { 2859 {
2036 // assume 7-bit to be ascii ALWAYS 2860 // assume 7-bit to be ascii ALWAYS
2037 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2861 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2038 return *cmdbuf_ptr++; 2862 return *cmdbuf_ptr++;
2039 2863
2040 wchar_t wc; 2864 wchar_t wc;
2041 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2865 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2042 2866
2043 if (len == (size_t)-2) 2867 if (len == (size_t)-2)
2044 { 2868 {
2045 // the mbstate stores incomplete sequences. didn't know this :/ 2869 // the mbstate stores incomplete sequences. didn't know this :/
2046 cmdbuf_ptr = cmdbuf_endp; 2870 cmdbuf_ptr = cmdbuf_endp;
2047 break; 2871 break;
2048 } 2872 }
2049 2873
2050 if (len == (size_t)-1) 2874 if (len == (size_t)-1)
2051 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2875 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2052 2876
2053 // assume wchar == unicode 2877 // assume wchar == unicode
2054 cmdbuf_ptr += len; 2878 cmdbuf_ptr += len;
2055 return wc; 2879 return wc & UNICODE_MASK;
2056 } 2880 }
2057 2881
2058 return NOCHAR; 2882 return NOCHAR;
2883}
2884
2885// read the next octet
2886uint32_t
2887rxvt_term::next_octet ()
2888{
2889 return cmdbuf_ptr < cmdbuf_endp
2890 ? (unsigned char)*cmdbuf_ptr++
2891 : NOCHAR;
2059} 2892}
2060 2893
2061/* rxvt_cmd_getc () - Return next input character */ 2894/* rxvt_cmd_getc () - Return next input character */
2062/* 2895/*
2063 * Return the next input character after first passing any keyboard input 2896 * Return the next input character after first passing any keyboard input
2064 * to the command. 2897 * to the command.
2065 */ 2898 */
2066unicode_t 2899wchar_t
2067rxvt_term::cmd_getc () 2900rxvt_term::cmd_getc ()
2068{ 2901{
2069 unicode_t c = next_char (); 2902 wchar_t c = next_char ();
2903
2904 if (c == NOCHAR)
2905 throw out_of_input;
2906
2907 return c;
2908}
2909
2910uint32_t
2911rxvt_term::cmd_get8 ()
2912{
2913 uint32_t c = next_octet ();
2070 2914
2071 if (c == NOCHAR) 2915 if (c == NOCHAR)
2072 throw out_of_input; 2916 throw out_of_input;
2073 2917
2074 return c; 2918 return c;
… …
2156/*}}} */ 3000/*}}} */
2157 3001
2158/* *INDENT-OFF* */ 3002/* *INDENT-OFF* */
2159enum { 3003enum {
2160 C1_40 = 0x40, 3004 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 3005 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, 3006 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, 3007 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 3008 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 3009};
2166/* *INDENT-ON* */ 3010/* *INDENT-ON* */
2167 3011
2168/*{{{ process non-printing single characters */ 3012/*{{{ process non-printing single characters */
2169void 3013void
… …
2174 case C0_ESC: 3018 case C0_ESC:
2175 process_escape_seq (); 3019 process_escape_seq ();
2176 break; 3020 break;
2177 case C0_ENQ: /* terminal Status */ 3021 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 3022 if (rs[Rs_answerbackstring])
2179 tt_write ( 3023 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 3024 else
2183 tt_write ((unsigned char *)VT100_ANS, 3025 tt_write (VT100_ANS, strlen (VT100_ANS));
2184 (unsigned int)STRLEN (VT100_ANS));
2185 break; 3026 break;
2186 case C0_BEL: /* bell */ 3027 case C0_BEL: /* bell */
2187 scr_bell (); 3028 scr_bell ();
2188 break; 3029 break;
2189 case C0_BS: /* backspace */ 3030 case C0_BS: /* backspace */
… …
2205 break; 3046 break;
2206 case C0_SI: /* shift in - acs */ 3047 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 3048 scr_charset_choose (0);
2208 break; 3049 break;
2209 3050
3051#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 3052 // 8-bit controls
2211 case 0x90: /* DCS */ 3053 case 0x90: /* DCS */
2212 process_dcs_seq (); 3054 process_dcs_seq ();
2213 break; 3055 break;
2214 case 0x9b: /* CSI */ 3056 case 0x9b: /* CSI */
2215 process_csi_seq (); 3057 process_csi_seq ();
2216 break; 3058 break;
2217 case 0x9d: /* CSI */ 3059 case 0x9d: /* CSI */
2218 process_osc_seq (); 3060 process_osc_seq ();
2219 break; 3061 break;
3062#endif
2220 } 3063 }
2221} 3064}
2222/*}}} */ 3065/*}}} */
2223 3066
2224 3067
… …
2286void 3129void
2287rxvt_term::process_escape_seq () 3130rxvt_term::process_escape_seq ()
2288{ 3131{
2289 unicode_t ch = cmd_getc (); 3132 unicode_t ch = cmd_getc ();
2290 3133
2291 if (PrivateModes & PrivMode_vt52) 3134 if (priv_modes & PrivMode_vt52)
2292 { 3135 {
2293 process_escape_vt52 (ch); 3136 process_escape_vt52 (ch);
2294 return; 3137 return;
2295 } 3138 }
2296 3139
… …
2311 scr_charset_set (2, (unsigned int)cmd_getc ()); 3154 scr_charset_set (2, (unsigned int)cmd_getc ());
2312 break; 3155 break;
2313 case '+': 3156 case '+':
2314 scr_charset_set (3, (unsigned int)cmd_getc ()); 3157 scr_charset_set (3, (unsigned int)cmd_getc ());
2315 break; 3158 break;
2316#ifndef NO_FRILLS 3159#if ENABLE_FRILLS
2317 case '6': 3160 case '6':
2318 scr_backindex (); 3161 scr_backindex ();
2319 break; 3162 break;
2320#endif 3163#endif
2321 case '7': 3164 case '7':
2322 scr_cursor (SAVE); 3165 scr_cursor (SAVE);
2323 break; 3166 break;
2324 case '8': 3167 case '8':
2325 scr_cursor (RESTORE); 3168 scr_cursor (RESTORE);
2326 break; 3169 break;
2327#ifndef NO_FRILLS 3170#if ENABLE_FRILLS
2328 case '9': 3171 case '9':
2329 scr_forwardindex (); 3172 scr_forwardindex ();
2330 break; 3173 break;
2331#endif 3174#endif
2332 case '=': 3175 case '=':
… …
2342 break; 3185 break;
2343 3186
2344 /* 8.3.87: NEXT LINE */ 3187 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 3188 case C1_NEL: /* ESC E */
2346 { 3189 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 3190 wchar_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 3191 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2349 } 3192 }
2350 break; 3193 break;
2351 3194
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 3195 /* kidnapped escape sequence: Should be 8.3.48 */
2353 case C1_ESA: /* ESC G */ 3196 case C1_ESA: /* ESC G */
… …
2363 case C1_RI: /* ESC M */ 3206 case C1_RI: /* ESC M */
2364 scr_index (DN); 3207 scr_index (DN);
2365 break; 3208 break;
2366 3209
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 3210 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 3211 /*case C1_SS2: scr_single_shift (2); break; */
2369 3212
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 3213 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 3214 /*case C1_SS3: scr_single_shift (3); break; */
2372 3215
2373 /* 8.3.27: DEVICE CONTROL STRING */ 3216 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 3217 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 3218 process_dcs_seq ();
2376 break; 3219 break;
2377 3220
2378 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3221 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2379 case C1_SCI: /* ESC Z */ 3222 case C1_SCI: /* ESC Z */
2380 tt_write ((const unsigned char *)ESCZ_ANSWER, 3223 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2381 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2382 break; /* steal obsolete ESC [ c */ 3224 break; /* steal obsolete ESC [ c */
2383 3225
2384 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3226 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2385 case C1_CSI: /* ESC [ */ 3227 case C1_CSI: /* ESC [ */
2386 process_csi_seq (); 3228 process_csi_seq ();
… …
2391 process_osc_seq (); 3233 process_osc_seq ();
2392 break; 3234 break;
2393 3235
2394 /* 8.3.106: RESET TO INITIAL STATE */ 3236 /* 8.3.106: RESET TO INITIAL STATE */
2395 case 'c': 3237 case 'c':
3238 mbstate.reset ();
2396 scr_poweron (); 3239 scr_poweron ();
2397 scrollbar_show (1); 3240 scrollbar_show (1);
2398 break; 3241 break;
2399 3242
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3243 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2412 3255
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3256/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */ 3257/* *INDENT-OFF* */
2415enum { 3258enum {
2416 CSI_ICH = 0x40, 3259 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3260 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 , 3261 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, 3262 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, 3263 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, 3264 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, 3265 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, */ 3280 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, [, \, ], ^, _, */ 3281 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, */ 3282 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, */ 3283 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, */ 3284 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, {, |, }, ~, */ 3285 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 3286 };
2444/* *INDENT-ON* */ 3287/* *INDENT-ON* */
2445 3288
2446void 3289void
2447rxvt_term::process_csi_seq () 3290rxvt_term::process_csi_seq ()
… …
2510 { 3353 {
2511 switch (priv) 3354 switch (priv)
2512 { 3355 {
2513 case '>': 3356 case '>':
2514 if (ch == CSI_DA) /* secondary device attributes */ 3357 if (ch == CSI_DA) /* secondary device attributes */
2515 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3358 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2516 break; 3359 break;
2517 case '?': 3360 case '?':
2518 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3361 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2519 process_terminal_mode (ch, priv, nargs, arg); 3362 process_terminal_mode (ch, priv, nargs, arg);
2520 break; 3363 break;
… …
2625 3468
2626 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3469 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2627 arg[0] = -arg[0]; 3470 arg[0] = -arg[0];
2628 /* FALLTHROUGH */ 3471 /* FALLTHROUGH */
2629 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3472 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2630 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3473 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2631 break; 3474 break;
2632 3475
2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3476 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2634 tt_write ((const unsigned char *)VT100_ANS, 3477 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2635 (unsigned int) (sizeof (VT100_ANS) - 1));
2636 break; 3478 break;
2637 3479
2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3480 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2639 process_sgr_mode (nargs, arg); 3481 process_sgr_mode (nargs, arg);
2640 break; 3482 break;
… …
2646 tt_printf ("\033[0n"); 3488 tt_printf ("\033[0n");
2647 break; 3489 break;
2648 case 6: /* CPR requested */ 3490 case 6: /* CPR requested */
2649 scr_report_position (); 3491 scr_report_position ();
2650 break; 3492 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 3493 case 7: /* unofficial extension */
3494 if (OPTION (Opt_insecure))
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3495 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2654 break; 3496 break;
2655#endif
2656 case 8: /* unofficial extension */ 3497 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3498 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 3499 break;
2659 } 3500 }
2660 break; 3501 break;
2661 3502
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3503 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2695 break; 3536 break;
2696 3537
2697 case CSI_RM: /* 8.3.107: RESET MODE */ 3538 case CSI_RM: /* 8.3.107: RESET MODE */
2698 if (arg[0] == 4) 3539 if (arg[0] == 4)
2699 scr_insert_mode (0); 3540 scr_insert_mode (0);
3541 else if (arg[0] == 20)
3542 priv_modes &= ~PrivMode_LFNL;
2700 break; 3543 break;
2701 3544
2702 case CSI_SM: /* 8.3.126: SET MODE */ 3545 case CSI_SM: /* 8.3.126: SET MODE */
2703 if (arg[0] == 4) 3546 if (arg[0] == 4)
2704 scr_insert_mode (1); 3547 scr_insert_mode (1);
3548 else if (arg[0] == 20)
3549 priv_modes |= PrivMode_LFNL;
2705 break; 3550 break;
2706 3551
2707 /* 3552 /*
2708 * PRIVATE USE beyond this point. All CSI_7? sequences here 3553 * PRIVATE USE beyond this point. All CSI_7? sequences here
2709 */ 3554 */
… …
2721 break; 3566 break;
2722 case CSI_75: 3567 case CSI_75:
2723 scr_cursor (RESTORE); 3568 scr_cursor (RESTORE);
2724 break; 3569 break;
2725 3570
2726#ifndef NO_FRILLS 3571#if ENABLE_FRILLS
2727 case CSI_74: 3572 case CSI_74:
2728 process_window_ops (arg, nargs); 3573 process_window_ops (arg, nargs);
2729 break; 3574 break;
2730#endif 3575#endif
2731 3576
… …
2738 break; 3583 break;
2739 } 3584 }
2740} 3585}
2741/*}}} */ 3586/*}}} */
2742 3587
2743#ifndef NO_FRILLS 3588#if ENABLE_FRILLS
2744/* ARGSUSED */ 3589/* ARGSUSED */
2745void 3590void
2746rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3591rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2747{ 3592{
2748 int x, y; 3593 int x, y;
2749 XWindowAttributes wattr; 3594 XWindowAttributes wattr;
2750 Window wdummy; 3595 Window wdummy;
3596 dDisp;
2751 3597
2752 if (nargs == 0) 3598 if (nargs == 0)
2753 return; 3599 return;
2754 3600
2755 switch (args[0]) 3601 switch (args[0])
2756 { 3602 {
2757 /* 3603 /*
2758 * commands 3604 * commands
2759 */ 3605 */
2760 case 1: /* deiconify window */ 3606 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3607 XMapWindow (disp, parent[0]);
2762 break; 3608 break;
2763 case 2: /* iconify window */ 3609 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3610 XIconifyWindow (disp, parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3611 break;
2767 case 3: /* set position (pixels) */ 3612 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3613 XMoveWindow (disp, parent[0], args[1], args[2]);
2769 break; 3614 break;
2770 case 4: /* set size (pixels) */ 3615 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3616 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3617 break;
2773 case 5: /* raise window */ 3618 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3619 XRaiseWindow (disp, parent[0]);
2775 break; 3620 break;
2776 case 6: /* lower window */ 3621 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3622 XLowerWindow (disp, parent[0]);
2778 break; 3623 break;
2779 case 7: /* refresh window */ 3624 case 7: /* refresh window */
2780 scr_touch (true); 3625 scr_touch (true);
2781 break; 3626 break;
2782 case 8: /* set size (chars) */ 3627 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3628 set_widthheight ((unsigned int) (args[2] * fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3629 (unsigned int) (args[1] * fheight));
2785 break; 3630 break;
2786 3631
2787 //case 9: NYI, TODO, restore maximized window or maximize window 3632 //case 9: NYI, TODO, restore maximized window or maximize window
2788 default: 3633 default:
2789 if (args[0] >= 24) /* set height (chars) */ 3634 if (args[0] >= 24) /* set height (chars) */
2790 set_widthheight ((unsigned int)TermWin.width, 3635 set_widthheight ((unsigned int)width,
2791 (unsigned int) (args[1] * TermWin.fheight)); 3636 (unsigned int) (args[1] * fheight));
2792 break; 3637 break;
2793 3638
2794 3639
2795 /* 3640 /*
2796 * reports - some output format copied from XTerm 3641 * reports - some output format copied from XTerm
2797 */ 3642 */
2798 case 11: /* report window state */ 3643 case 11: /* report window state */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3644 XGetWindowAttributes (disp, parent[0], &wattr);
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3645 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3646 break;
2802 case 13: /* report window position */ 3647 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3648 XGetWindowAttributes (disp, parent[0], &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3649 XTranslateCoordinates (disp, parent[0], wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3650 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3651 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3652 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3653 break;
2809 case 14: /* report window size (pixels) */ 3654 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3655 XGetWindowAttributes (disp, parent[0], &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3656 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2812 break; 3657 break;
2813 case 18: /* report text area size (chars) */ 3658 case 18: /* report text area size (chars) */
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3659 tt_printf ("\033[8;%d;%dt", nrow, ncol);
2815 break; 3660 break;
2816 case 19: /* report window size (chars) */ 3661 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3662 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2818 break; 3663 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3664 case 20: /* report icon label */
3665 {
3666 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3667 XGetIconName (disp, parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3668 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3669 XFree (s);
3670 }
2823 break; 3671 break;
2824 case 21: /* report window title */ 3672 case 21: /* report window title */
3673 {
3674 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3675 XFetchName (disp, parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3676 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3677 XFree (s);
3678 }
2827 break; 3679 break;
2828#endif
2829 } 3680 }
2830} 3681}
2831#endif 3682#endif
2832 3683
2833/*----------------------------------------------------------------------*/ 3684/*----------------------------------------------------------------------*/
2834/* 3685/*
2835 * get input up until STRING TERMINATOR (or BEL) 3686 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3687 * ends_how is terminator used. returned input must be free()'d
2837 */ 3688 */
2838unsigned char * 3689char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3690rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3691{
2841 int seen_esc = 0; /* seen escape? */ 3692 unicode_t ch;
3693 bool seen_esc = false;
2842 unsigned int n = 0; 3694 unsigned int n = 0;
2843 unsigned char *s;
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX]; 3695 wchar_t string[STRING_MAX];
2846 3696
2847 while ((ch = cmd_getc ())) 3697 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3698 {
2849 if (ch == C0_BEL 3699 if (seen_esc)
2850 || ch == CHAR_ST 3700 {
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3701 if (ch == 0x5c) /* 7bit ST */
2852 break; 3702 break;
2853 3703 else
3704 return NULL;
3705 }
2854 if (ch == C0_ESC) 3706 else if (ch == C0_ESC)
2855 { 3707 {
2856 seen_esc = 1; 3708 seen_esc = true;
2857 continue; 3709 continue;
2858 } 3710 }
2859 else if (ch == '\t') 3711 else if (ch == C0_BEL || ch == CHAR_ST)
2860 ch = ' '; /* translate '\t' to space */ 3712 break;
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3713 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3714 return NULL; /* other control character - exit */
2863 3715
2864 if (n < sizeof (string) - 1) 3716 seen_esc = false;
3717
3718 if (n >= STRING_MAX - 1)
3719 // stop at some sane length
3720 return NULL;
3721
3722 if (ch == C0_SYN)
3723 string[n++] = cmd_get8 ();
3724 else
2865 string[n++] = ch; 3725 string[n++] = ch;
2866
2867 seen_esc = 0;
2868 } 3726 }
2869 3727
2870 string[n++] = '\0'; 3728 string[n++] = '\0';
2871 3729
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2873 return NULL;
2874
2875 ends_how = (ch == 0x5c ? C0_ESC : ch); 3730 ends_how = (ch == 0x5c ? C0_ESC : ch);
2876 STRNCPY (s, string, n); 3731
2877 return s; 3732 return rxvt_wcstombs (string);
2878} 3733}
2879 3734
2880/*----------------------------------------------------------------------*/ 3735/*----------------------------------------------------------------------*/
2881/* 3736/*
2882 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3737 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2883 */ 3738 */
2884void 3739void
2885rxvt_term::process_dcs_seq () 3740rxvt_term::process_dcs_seq ()
2886{ 3741{
2887 unsigned char *s; 3742 char *s;
2888 unicode_t eh; 3743 unicode_t eh;
2889 3744
2890 /* 3745 /*
2891 * Not handled yet 3746 * Not handled yet
2892 */ 3747 */
… …
2911 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3766 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2912 arg = arg * 10 + (ch - '0'); 3767 arg = arg * 10 + (ch - '0');
2913 3768
2914 if (ch == ';') 3769 if (ch == ';')
2915 { 3770 {
2916 unsigned char *s = get_to_st (eh); 3771 char *s = get_to_st (eh);
2917 3772
2918 if (s) 3773 if (s)
2919 { 3774 {
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); 3775 process_xterm_seq (arg, s, eh);
2932
2933 free (s); 3776 free (s);
2934 } 3777 }
2935 } 3778 }
2936} 3779}
3780
3781void
3782rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3783{
3784 if (str[0] == '?' && !str[1])
3785 {
3786 unsigned short r, g, b;
3787 pix_colors_focused[color].get (display, r, g, b);
3788 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3789 }
3790 else
3791 set_window_color (color, str);
3792}
3793
2937/* 3794/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3795 * 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 */ 3796 */
2960void 3797void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3798rxvt_term::process_xterm_seq (int op, const char *str, char resp)
2962{ 3799{
2963 int changed = 0; 3800 int changed = 0;
2964 int color; 3801 int color;
2965 char *buf, *name; 3802 char *buf, *name;
3803 bool query = str[0] == '?' && !str[1];
3804 int saveop = op;
3805 dDisp;
2966 3806
2967 assert (str != NULL); 3807 assert (str != NULL);
2968 switch (op) 3808 switch (op)
2969 { 3809 {
2970 case XTerm_name: 3810 case XTerm_name:
… …
2974 set_icon_name (str); 3814 set_icon_name (str);
2975 break; 3815 break;
2976 case XTerm_title: 3816 case XTerm_title:
2977 set_title (str); 3817 set_title (str);
2978 break; 3818 break;
3819 case XTerm_property:
3820 if (str[0] == '?')
3821 {
3822 Atom prop = display->atom (str + 1);
3823 Atom actual_type;
3824 int actual_format;
3825 unsigned long nitems;
3826 unsigned long bytes_after;
3827 unsigned char *value = 0;
3828 const char *str = "";
3829
3830 if (prop
3831 && XGetWindowProperty (disp, parent[0],
3832 prop, 0, 1<<16, 0, AnyPropertyType,
3833 &actual_type, &actual_format,
3834 &nitems, &bytes_after, &value) == Success
3835 && actual_type != None
3836 && actual_format == 8)
3837 str = (const char *)(value);
3838
3839 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3840
3841 XFree (value);
3842 }
3843 else
3844 {
3845 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3846
3847 if (eq)
3848 {
3849 *eq = 0;
3850 set_utf8_property (display->atom (str), eq + 1);
3851 }
3852 else
3853 XDeleteProperty (disp, parent[0],
3854 display->atom (str));
3855 }
3856 break;
3857
2979 case XTerm_Color: 3858 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3859 for (buf = (char *)str; buf && *buf;)
2981 { 3860 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3861 if ((name = strchr (buf, ';')) == NULL)
2983 break; 3862 break;
2984 3863
2985 *name++ = '\0'; 3864 *name++ = '\0';
2986 color = atoi (buf); 3865 color = atoi (buf);
2987 3866
2988 if (color < 0 || color >= TOTAL_COLORS) 3867 if (color < 0 || color >= TOTAL_COLORS)
2989 break; 3868 break;
2990 3869
2991 if ((buf = STRCHR (name, ';')) != NULL) 3870 if ((buf = strchr (name, ';')) != NULL)
2992 *buf++ = '\0'; 3871 *buf++ = '\0';
2993 3872
3873 if (name[0] == '?' && !name[1])
3874 {
3875 unsigned short r, g, b;
3876 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3877 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3878 }
3879 else
2994 set_window_color (color + minCOLOR, name); 3880 set_window_color (color + minCOLOR, name);
2995 } 3881 }
3882 break;
3883 case XTerm_Color00:
3884 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3885 break;
3886 case XTerm_Color01:
3887 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2996 break; 3888 break;
2997#ifndef NO_CURSORCOLOR 3889#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3890 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3891 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3000 break; 3892 break;
3001#endif 3893#endif
3002 case XTerm_Color_pointer: 3894 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3895 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3896 break;
3897 case XTerm_Color_pointer_bg:
3898 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3004 break; 3899 break;
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3900#ifndef NO_BOLD_UNDERLINE_REVERSE
3006 case XTerm_Color_BD: 3901 case XTerm_Color_BD:
3007 set_window_color (Color_BD, str); 3902 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3008 break; 3903 break;
3009 case XTerm_Color_UL: 3904 case XTerm_Color_UL:
3010 set_window_color (Color_UL, str); 3905 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3011 break; 3906 break;
3012 case XTerm_Color_RV: 3907 case XTerm_Color_RV:
3013 set_window_color (Color_RV, str); 3908 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3014 break; 3909 break;
3015#endif 3910 case URxvt_Color_IT:
3016 3911 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; 3912 break;
3913#endif
3914#if TRANSPARENT && TINTING
3915 case URxvt_Color_tint:
3916 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3917 check_our_parents ();
3918 if (am_transparent)
3919 want_full_refresh = want_refresh = 1;
3920 break;
3921#endif
3922
3023 case XTerm_Pixmap: 3923 case XTerm_Pixmap:
3024 if (*str != ';') 3924 if (*str != ';')
3025 { 3925 {
3026#if XPM_BACKGROUND 3926#if XPM_BACKGROUND
3027 scale_pixmap (""); /* reset to default scaling */ 3927 scale_pixmap (""); /* reset to default scaling */
3028 set_bgPixmap (str); /* change pixmap */ 3928 set_bgPixmap (str); /* change pixmap */
3029#endif 3929#endif
3030 scr_touch (true); 3930 scr_touch (true);
3031 } 3931 }
3032 while ((str = STRCHR (str, ';')) != NULL) 3932 while ((str = strchr (str, ';')) != NULL)
3033 { 3933 {
3034 str++; 3934 str++;
3035#if XPM_BACKGROUND 3935#if XPM_BACKGROUND
3036 changed += scale_pixmap (str); 3936 changed += scale_pixmap (str);
3037#endif 3937#endif
3038
3039 } 3938 }
3939
3040 if (changed) 3940 if (changed)
3041 { 3941 {
3042#ifdef XPM_BACKGROUND 3942#ifdef XPM_BACKGROUND
3043 resize_pixmap (); 3943 resize_pixmap ();
3044#endif 3944#endif
… …
3050 set_window_color (Color_fg, str); 3950 set_window_color (Color_fg, str);
3051 break; 3951 break;
3052 case XTerm_restoreBG: 3952 case XTerm_restoreBG:
3053 set_window_color (Color_bg, str); 3953 set_window_color (Color_bg, str);
3054 break; 3954 break;
3955
3055 case XTerm_logfile: 3956 case XTerm_logfile:
3056 // TODO, when secure mode? 3957 // TODO, when secure mode?
3057 break; 3958 break;
3058 case XTerm_font: 3959
3059 change_font (str); 3960#ifdef MENUBAR
3961 case URxvt_Menu:
3962 if (OPTION (Opt_insecure))
3963 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3060 break; 3964 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 3965#endif
3080#if 0 3966#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3967 case XTerm_dumpscreen: /* no error notices */
3082 { 3968 {
3083 int fd; 3969 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3970 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3971 {
3086 scr_dump (fd); 3972 scr_dump (fd);
3087 close (fd); 3973 close (fd);
3088 } 3974 }
3089 } 3975 }
3976 break;
3977#endif
3978 case XTerm_font:
3979 op = URxvt_font;
3980 case URxvt_font:
3981#if ENABLE_STYLES
3982 case URxvt_boldFont:
3983 case URxvt_italicFont:
3984 case URxvt_boldItalicFont:
3985#endif
3986 if (query)
3987 tt_printf ("\33]%d;%-.250s%c", saveop,
3988 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3989 ? fontset[op - URxvt_font]->fontdesc : "",
3990 resp);
3991 else
3992 {
3993 const char *&res = rs[Rs_font + (op - URxvt_font)];
3994
3995 res = strdup (str);
3996 allocated.push_back ((void *)res);
3997 set_fonts ();
3998 }
3999 break;
4000
4001#if ENABLE_FRILLS
4002 case URxvt_locale:
4003 if (query)
4004 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4005 else
4006 {
4007 set_locale (str);
4008 pty.set_utf8_mode (enc_utf8);
4009 init_xlocale ();
4010 }
4011 break;
4012
4013 case URxvt_view_up:
4014 case URxvt_view_down:
4015 {
4016 int lines = atoi (str);
4017
4018 if (lines)
4019 scr_page (op == URxvt_view_up ? UP : DN, lines);
4020 else
4021 scr_erase_savelines ();
4022 }
4023
4024 break;
4025#endif
4026
4027#if ENABLE_PERL
4028 case URxvt_perl:
4029 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4030 ; // no responses yet
3090 break; 4031 break;
3091#endif 4032#endif
3092 } 4033 }
3093} 4034}
3094/*----------------------------------------------------------------------*/ 4035/*----------------------------------------------------------------------*/
… …
3108{ 4049{
3109 int state; 4050 int state;
3110 4051
3111 if (mode == 's') 4052 if (mode == 's')
3112 { 4053 {
3113 SavedModes |= (PrivateModes & bit); 4054 SavedModes |= (priv_modes & bit);
3114 return -1; 4055 return -1;
3115 } 4056 }
3116 else 4057 else
3117 { 4058 {
3118 if (mode == 'r') 4059 if (mode == 'r')
3119 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4060 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3120 else 4061 else
3121 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4062 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3122 PrivMode (state, bit); 4063 PrivMode (state, bit);
3123 } 4064 }
3124 4065
3125 return state; 4066 return state;
3126} 4067}
… …
3144 { 3, PrivMode_132 }, 4085 { 3, PrivMode_132 },
3145 { 4, PrivMode_smoothScroll }, 4086 { 4, PrivMode_smoothScroll },
3146 { 5, PrivMode_rVideo }, 4087 { 5, PrivMode_rVideo },
3147 { 6, PrivMode_relOrigin }, 4088 { 6, PrivMode_relOrigin },
3148 { 7, PrivMode_Autowrap }, 4089 { 7, PrivMode_Autowrap },
4090 // 8, bi-directional support mode
3149 { 9, PrivMode_MouseX10 }, 4091 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 4092#ifdef menuBar_esc
3151 { menuBar_esc, PrivMode_menuBar }, 4093 { menuBar_esc, PrivMode_menuBar },
3152#endif 4094#endif
4095 // 18, 19 printing-related
4096 { 25, PrivMode_VisibleCursor },
3153#ifdef scrollBar_esc 4097#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 4098 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 4099#endif
3156 // 18, 19 printing-related
3157 { 25, PrivMode_VisibleCursor },
3158 // 30 show scrollbar rxvt. extension
3159 { 35, PrivMode_ShiftKeys }, // rxvt extension 4100 { 35, PrivMode_ShiftKeys }, // rxvt extension
3160 { 40, PrivMode_132OK }, 4101 { 40, PrivMode_132OK },
3161 // 41 xterm more fixes NYI 4102 // 41 xterm more fixes NYI
3162 // 45 margin bell NYI 4103 // 45 margin bell NYI
3163 // 46 start logging 4104 // 46 start logging
… …
3175 // 1035 enable modifiers for alt, numlock NYI 4116 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 4117 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 4118 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 4119 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 4120 // 1048 save and restore cursor
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 4121 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 4122 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 4123 };
3183 4124
3184 if (nargs == 0) 4125 if (nargs == 0)
3185 return; 4126 return;
… …
3203 } 4144 }
3204 4145
3205 /* extra handling for values with state unkept */ 4146 /* extra handling for values with state unkept */
3206 switch (arg[i]) 4147 switch (arg[i])
3207 { 4148 {
4149#if ENABLE_STYLES
4150 case 1021:
4151 set_option (Opt_intensityStyles, mode);
4152
4153 scr_touch (true);
4154 break;
4155#endif
3208 case 1048: /* alternative cursor save */ 4156 case 1048: /* alternative cursor save */
3209 case 1049: 4157 case 1049:
4158 if (OPTION (Opt_secondaryScreen))
3210 if (mode == 0) 4159 if (mode == 0)
3211 scr_cursor (RESTORE); 4160 scr_cursor (RESTORE);
3212 else if (mode == 1) 4161 else if (mode == 1)
3213 scr_cursor (SAVE); 4162 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 4163 break;
3215 } 4164 }
3216 4165
3217 if (state >= 0) 4166 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 4167 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 4168 switch (arg[i])
… …
3225 * within VT52 mode 4174 * within VT52 mode
3226 */ 4175 */
3227 PrivMode (1, PrivMode_vt52); 4176 PrivMode (1, PrivMode_vt52);
3228 break; 4177 break;
3229 case 3: /* 80/132 */ 4178 case 3: /* 80/132 */
3230 if (PrivateModes & PrivMode_132OK) 4179 if (priv_modes & PrivMode_132OK)
3231 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4180 set_widthheight (((state ? 132 : 80) * fwidth), height);
3232 break; 4181 break;
3233 case 4: /* smooth scrolling */ 4182 case 4: /* smooth scrolling */
3234 if (state) 4183 set_option (Opt_jumpScroll, !state);
3235 Options &= ~Opt_jumpScroll;
3236 else
3237 Options |= Opt_jumpScroll;
3238 break; 4184 break;
3239 case 5: /* reverse video */ 4185 case 5: /* reverse video */
3240 scr_rvideo_mode (state); 4186 scr_rvideo_mode (state);
3241 break; 4187 break;
3242 case 6: /* relative/absolute origins */ 4188 case 6: /* relative/absolute origins */
3243 scr_relative_origin (state); 4189 scr_relative_origin (state);
3244 break; 4190 break;
3245 case 7: /* autowrap */ 4191 case 7: /* autowrap */
3246 scr_autowrap (state); 4192 scr_autowrap (state);
3247 break; 4193 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 4194 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 4195 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 4196 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 4197 priv_modes &= ~PrivMode_MouseX11;
3252 break; 4198 break;
3253#ifdef menuBar_esc 4199#ifdef menuBar_esc
3254 case menuBar_esc: 4200 case menuBar_esc:
3255#ifdef MENUBAR 4201#ifdef MENUBAR
3256 map_menuBar (state); 4202 map_menuBar (state);
… …
3267 break; 4213 break;
3268#endif 4214#endif
3269 case 25: /* visible/invisible cursor */ 4215 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 4216 scr_cursor_visible (state);
3271 break; 4217 break;
3272 /* case 35: - shift keys */ 4218 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 4219 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 4220 case 47: /* secondary screen */
3275 scr_change_screen (state); 4221 scr_change_screen (state);
3276 break; 4222 break;
3277 /* case 66: - application key pad */ 4223 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 4224 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 4225 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 4226 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 4227 priv_modes &= ~PrivMode_MouseX10;
3282 break; 4228 break;
3283#if 0 4229#if 0
3284 case 1001: 4230 case 1001:
3285 break; /* X11 mouse highlighting */ 4231 break; /* X11 mouse highlighting */
3286#endif 4232#endif
3287 case 1010: /* scroll to bottom on TTY output inhibit */ 4233 case 1010: /* scroll to bottom on TTY output inhibit */
3288 if (state)
3289 Options &= ~Opt_scrollTtyOutput;
3290 else
3291 Options |= Opt_scrollTtyOutput; 4234 set_option (Opt_scrollTtyOutput, !state);
3292 break; 4235 break;
3293 case 1011: /* scroll to bottom on key press */ 4236 case 1011: /* scroll to bottom on key press */
3294 if (state)
3295 Options |= Opt_scrollTtyKeypress; 4237 set_option (Opt_scrollTtyKeypress, state);
3296 else
3297 Options &= ~Opt_scrollTtyKeypress;
3298 break; 4238 break;
3299 case 1047: /* secondary screen w/ clearing */ 4239 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4240 if (OPTION (Opt_secondaryScreen))
3301 if (current_screen != PRIMARY) 4241 if (current_screen != PRIMARY)
3302 scr_erase_screen (2); 4242 scr_erase_screen (2);
3303
3304 scr_change_screen (state); 4243 scr_change_screen (state);
3305 /* FALLTHROUGH */ 4244 break;
4245 case 1049: /* secondary screen w/ clearing first */
4246 scr_change_screen (state);
4247 if (OPTION (Opt_secondaryScreen))
4248 if (current_screen != PRIMARY)
4249 scr_erase_screen (2);
4250 break;
3306 default: 4251 default:
3307 break; 4252 break;
3308 } 4253 }
3309 } 4254 }
3310} 4255}
… …
3333 rendset = 0, rendstyle = ~RS_None; 4278 rendset = 0, rendstyle = ~RS_None;
3334 break; 4279 break;
3335 case 1: 4280 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 4281 rendset = 1, rendstyle = RS_Bold;
3337 break; 4282 break;
4283 //case 2: // low intensity
4284 case 3:
4285 rendset = 1, rendstyle = RS_Italic;
4286 break;
3338 case 4: 4287 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 4288 rendset = 1, rendstyle = RS_Uline;
3340 break; 4289 break;
3341 case 5: 4290 case 5: // slowly blinking
4291 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 4292 rendset = 1, rendstyle = RS_Blink;
3343 break; 4293 break;
4294 //case 6: // scoansi light background
3344 case 7: 4295 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 4296 rendset = 1, rendstyle = RS_RVid;
3346 break; 4297 break;
3347 case 8: 4298 case 8:
3348 // invisible. NYI 4299 // invisible. NYI
3349 break; 4300 break;
3350 case 22: 4301 //case 9: // crossed out
4302 //case 10: // scoansi acs off, primary font
4303 //case 11: // scoansi acs on, first alt font
4304 //case 12: // scoansi acs on, |0x80, second alt font
4305 //...
4306 //case 19: // ninth alt font
4307 //case 20: // gothic
4308 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3351 rendset = 0, rendstyle = RS_Bold; 4309 rendset = 0, rendstyle = RS_Bold;
4310 break;
4311 case 22: // normal intensity
4312 rendset = 0, rendstyle = RS_Bold;
4313 break;
4314 case 23: // disable italic
4315 rendset = 0, rendstyle = RS_Italic;
3352 break; 4316 break;
3353 case 24: 4317 case 24:
3354 rendset = 0, rendstyle = RS_Uline; 4318 rendset = 0, rendstyle = RS_Uline;
3355 break; 4319 break;
3356 case 25: 4320 case 25:
3357 rendset = 0, rendstyle = RS_Blink; 4321 rendset = 0, rendstyle = RS_Blink;
3358 break; 4322 break;
4323 case 26: // variable spacing (iso 8613)
4324 rendset = 0, rendstyle = RS_Blink;
4325 break;
3359 case 27: 4326 case 27:
3360 rendset = 0, rendstyle = RS_RVid; 4327 rendset = 0, rendstyle = RS_RVid;
3361 break; 4328 break;
3362 case 28:
3363 // visible. NYI 4329 //case 28: // visible. NYI
3364 break; 4330 //case 29: // not crossed-out
3365 } 4331 }
3366 4332
3367 if (rendset != -1) 4333 if (rendset != -1)
3368 { 4334 {
3369 scr_rendition (rendset, rendstyle); 4335 scr_rendition (rendset, rendstyle);
… …
3380 case 35: 4346 case 35:
3381 case 36: 4347 case 36:
3382 case 37: 4348 case 37:
3383 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4349 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3384 break; 4350 break;
3385#ifdef TTY_256COLOR 4351 case 38: // set fg color, ISO 8613-6
3386 case 38:
3387 if (nargs > i + 2 && arg[i + 1] == 5) 4352 if (nargs > i + 2 && arg[i + 1] == 5)
3388 { 4353 {
3389 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4354 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3390 i += 2; 4355 i += 2;
3391 } 4356 }
3392 break; 4357 break;
3393#endif
3394 case 39: /* default fg */ 4358 case 39: /* default fg */
3395 scr_color (Color_fg, Color_fg); 4359 scr_color (Color_fg, Color_fg);
3396 break; 4360 break;
3397 4361
3398 case 40: 4362 case 40:
… …
3403 case 45: 4367 case 45:
3404 case 46: 4368 case 46:
3405 case 47: 4369 case 47:
3406 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4370 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3407 break; 4371 break;
3408#ifdef TTY_256COLOR 4372 case 48: // set bg color, ISO 8613-6
3409 case 48:
3410 if (nargs > i + 2 && arg[i + 1] == 5) 4373 if (nargs > i + 2 && arg[i + 1] == 5)
3411 { 4374 {
3412 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4375 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3413 i += 2; 4376 i += 2;
3414 } 4377 }
3415 break; 4378 break;
3416#endif
3417 case 49: /* default bg */ 4379 case 49: /* default bg */
3418 scr_color (Color_bg, Color_bg); 4380 scr_color (Color_bg, Color_bg);
3419 break; 4381 break;
3420 4382
3421#ifndef NO_BRIGHTCOLOR 4383 //case 50: // not variable spacing
4384
4385#if ENABLE_FRILLS
3422 case 90: 4386 case 90:
3423 case 91: /* set bright fg color */ 4387 case 91: /* set bright fg color */
3424 case 92: 4388 case 92:
3425 case 93: 4389 case 93:
3426 case 94: 4390 case 94:
3427 case 95: 4391 case 95:
3428 case 96: 4392 case 96:
3429 case 97: 4393 case 97:
3430 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4394 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3431 Color_fg);
3432 break; 4395 break;
3433 case 100: 4396 case 100:
3434 case 101: /* set bright bg color */ 4397 case 101: /* set bright bg color */
3435 case 102: 4398 case 102:
3436 case 103: 4399 case 103:
3437 case 104: 4400 case 104:
3438 case 105: 4401 case 105:
3439 case 106: 4402 case 106:
3440 case 107: 4403 case 107:
3441 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4404 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3442 Color_bg);
3443 break; 4405 break;
3444#endif 4406#endif
3445
3446 } 4407 }
3447 } 4408 }
3448} 4409}
3449/*}}} */ 4410/*}}} */
3450 4411
3451/*{{{ process Rob Nation's own graphics mode sequences */ 4412/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3452void 4413void
3453rxvt_term::process_graphics () 4414rxvt_term::process_graphics ()
3454{ 4415{
3455 unicode_t ch, cmd = cmd_getc (); 4416 unicode_t ch, cmd = cmd_getc ();
3456 4417
3457 if (cmd == 'Q') 4418 if (cmd == 'Q')
3458 { /* query graphics */ 4419 { /* query graphics */
3459 tt_printf ("\033G0\n"); /* no graphics */ 4420 tt_printf ("\033G0\012"); /* no graphics */
3460 return; 4421 return;
3461 } 4422 }
3462 /* swallow other graphics sequences until terminating ':' */ 4423 /* swallow other graphics sequences until terminating ':' */
3463 do 4424 do
3464 ch = cmd_getc (); 4425 ch = cmd_getc ();
… …
3474 */ 4435 */
3475void 4436void
3476rxvt_term::tt_printf (const char *fmt,...) 4437rxvt_term::tt_printf (const char *fmt,...)
3477{ 4438{
3478 va_list arg_ptr; 4439 va_list arg_ptr;
3479 unsigned char buf[256]; 4440 char buf[256];
3480 4441
3481 va_start (arg_ptr, fmt); 4442 va_start (arg_ptr, fmt);
3482 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4443 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3483 va_end (arg_ptr); 4444 va_end (arg_ptr);
3484 tt_write (buf, STRLEN (buf)); 4445 tt_write (buf, strlen (buf));
3485} 4446}
3486 4447
3487/* ---------------------------------------------------------------------- */ 4448/* ---------------------------------------------------------------------- */
3488/* Write data to the pty as typed by the user, pasted with the mouse, 4449/* 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. 4450 * or generated by us in response to a query ESC sequence.
3490 */ 4451 */
4452const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4453
3491void 4454void
3492rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4455rxvt_term::tt_write (const char *data, unsigned int len)
3493{ 4456{
3494 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4457 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4458 return;
3495 4459
3496 if (len) 4460 if (pty.pty < 0)
4461 return;
4462
4463 if (v_buflen == 0)
4464 {
4465 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4466
4467 if ((unsigned int)written == len)
4468 return;
4469
4470 data += written;
4471 len -= written;
3497 { 4472 }
4473
4474 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4475
4476 memcpy (v_buffer + v_buflen, data, len);
4477 v_buflen += len;
4478
4479 pty_ev.set (EVENT_READ | EVENT_WRITE);
4480}
4481
4482void rxvt_term::pty_write ()
4483{
4484 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4485
4486 if (written > 0)
4487 {
4488 v_buflen -= written;
4489
3498 if (v_buflen == 0) 4490 if (v_buflen == 0)
3499 { 4491 {
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); 4492 free (v_buffer);
3527 v_buffer = 0; 4493 v_buffer = 0;
3528 v_buflen = 0; 4494 v_buflen = 0;
3529 4495
3530 pty_ev.set (EVENT_READ); 4496 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; 4497 return;
3543 } 4498 }
4499
4500 memmove (v_buffer, v_buffer + written, v_buflen);
3544 } 4501 }
4502 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4503 pty_ev.set (EVENT_READ);
3545} 4504}
3546 4505
3547/*----------------------- end-of-file (C source) -----------------------*/ 4506/*----------------------- end-of-file (C source) -----------------------*/
3548 4507

Diff Legend

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