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.225 by root, Sun Jan 1 13:35:14 2006 UTC vs.
Revision 1.603 by root, Mon Jun 5 13:39:34 2023 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
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
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
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-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2021 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * 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 34 * 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 35 * the Free Software Foundation; either version 3 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
36 * 37 *
37 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
38 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
39 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
43 * along with this program; if not, write to the Free Software 44 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 45 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 46 *----------------------------------------------------------------------*/
46 47
47/*{{{ includes: */ 48/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 49#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 50#include "rxvt.h"
51#include "rxvtperl.h"
50#include "version.h" 52#include "version.h"
51#include "command.h" 53#include "command.h"
52 54
53#if HAVE_SCHED_YIELD
54# include <sched.h>
55#endif
56
57#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
58# include "keyboard.h" 56# include "keyboard.h"
59#endif 57#endif
60 58
61#include <csignal> 59#include <signal.h>
60
61#if LINUX_YIELD_HACK
62# include <time.h>
63#endif
62 64
63/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
64 66
65#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
66
67// exception thrown when the command parser runs out of input data
68class out_of_input { } out_of_input;
69 68
70#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
71 70
72#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
73#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
85 XK_Right, 0x2192, 84 XK_Right, 0x2192,
86 XK_KP_Right, 0x2192, 85 XK_KP_Right, 0x2192,
87 XK_Down, 0x2193, 86 XK_Down, 0x2193,
88 XK_KP_Down, 0x2193, 87 XK_KP_Down, 0x2193,
89 XK_Linefeed, 0x21b4, 88 XK_Linefeed, 0x21b4,
90 XK_Return, 0x21b5,
91 XK_KP_Enter, 0x21b5,
92 89
93 XK_Prior, 0x21de, 90 XK_Prior, 0x21de,
94 XK_Next, 0x21df, 91 XK_Next, 0x21df,
95 XK_Tab, 0x21e5, 92 XK_Tab, 0x21e5,
96 XK_ISO_Left_Tab, 0x21e6, 93 XK_ISO_Left_Tab, 0x21e6,
97 XK_Shift_L, 0x21e7, 94 XK_Shift_L, 0x21e7,
98 XK_Shift_R, 0x21e7, 95 XK_Shift_R, 0x21e7,
99 96
100 XK_Shift_Lock, 0x21eb, 97 XK_Shift_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_ISO_Lock, 0x21eb, 98 XK_ISO_Lock, 0x21eb,
103 XK_Caps_Lock, 0x21ec, 99 XK_Caps_Lock, 0x21ec,
104 XK_Num_Lock, 0x21ed, 100 XK_Num_Lock, 0x21ed,
105 XK_ISO_Level3_Shift, 0x21ee, 101 XK_ISO_Level3_Shift, 0x21ee,
106 XK_ISO_Level3_Lock, 0x21ef, 102 XK_ISO_Level3_Lock, 0x21ef,
… …
112 XK_Begin, 0x2320, 108 XK_Begin, 0x2320,
113 XK_Delete, 0x2326, 109 XK_Delete, 0x2326,
114 XK_Clear, 0x2327, 110 XK_Clear, 0x2327,
115 XK_BackSpace, 0x232b, 111 XK_BackSpace, 0x232b,
116 XK_Insert, 0x2380, 112 XK_Insert, 0x2380,
113 XK_KP_Enter, 0x2386,
114 XK_Alt_L, 0x2387,
115 XK_Alt_R, 0x2387,
117 XK_Control_L, 0x2388, 116 XK_Control_L, 0x2388,
118 XK_Control_R, 0x2388, 117 XK_Control_R, 0x2388,
119 XK_Pause, 0x2389, 118 XK_Pause, 0x2389,
120 XK_Break, 0x238a, 119 XK_Break, 0x238a,
121 XK_Escape, 0x238b, 120 XK_Escape, 0x238b,
122 XK_Undo, 0x238c, 121 XK_Undo, 0x238c,
123 XK_Print, 0x2399, 122 XK_Print, 0x2399,
123 XK_Return, 0x23ce,
124 124
125 XK_space, 0x2423, 125 XK_space, 0x2423,
126 126
127#ifdef XK_KP_Begin 127#ifdef XK_KP_Begin
128 XK_KP_Prior, 0x21de, 128 XK_KP_Prior, 0x21de,
… …
133 XK_KP_Space, 0x2422, 133 XK_KP_Space, 0x2422,
134#endif 134#endif
135 0, 135 0,
136}; 136};
137 137
138void 138void ecb_cold
139rxvt_term::iso14755_54 (int x, int y) 139rxvt_term::iso14755_54 (int x, int y)
140{ 140{
141 x = Pixel2Col (x); 141 x = Pixel2Col (x);
142 y = Pixel2Row (y); 142 y = Pixel2Row (y);
143 143
… …
145 || !IN_RANGE_EXC (y, 0, nrow)) 145 || !IN_RANGE_EXC (y, 0, nrow))
146 return; 146 return;
147 147
148 for (;;) 148 for (;;)
149 { 149 {
150 const line_t &l = ROW(y - view_start); 150 const line_t &l = ROW(y + view_start);
151 151
152 text_t t = l.t[x]; 152 text_t t = l.t[x];
153 153
154 if (t != NOCHAR || !x) 154 if (t != NOCHAR || !x)
155 { 155 {
156 iso14755_51 (l.t[x], l.r[x], x, y); 156 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
157 iso14755buf = ISO_14755_54; 157 iso14755buf = ISO_14755_54;
158 break; 158 break;
159 } 159 }
160 160
161 x--; 161 x--;
162 } 162 }
163} 163}
164 164
165void 165void ecb_cold
166rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 166rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
167{ 167{
168 rxvt_fontset *fs = FONTSET (r); 168 rxvt_fontset *fs = FONTSET (r);
169 rxvt_font *f = (*fs)[fs->find_font (ch)];
170 wchar_t *chr, *alloc, ch2, *fname; 169 wchar_t *chr, *alloc, ch2, **fname;
171 int len; 170 int len;
172
173 fname = rxvt_utf8towcs (f->name);
174 171
175# if ENABLE_COMBINING 172# if ENABLE_COMBINING
176 if (IS_COMPOSE (ch)) 173 if (IS_COMPOSE (ch))
177 { 174 {
178 len = rxvt_composite.expand (ch, 0); 175 len = rxvt_composite.expand (ch);
179 alloc = chr = new wchar_t[len]; 176 alloc = chr = new wchar_t[len];
180 rxvt_composite.expand (ch, chr); 177 rxvt_composite.expand (ch, chr);
181 } 178 }
182 else 179 else
183# endif 180# endif
… …
186 183
187 alloc = 0; 184 alloc = 0;
188 chr = &ch2; 185 chr = &ch2;
189 len = 1; 186 len = 1;
190 } 187 }
188
189 char rowcol[40];
190 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
191 191
192 char attr[80]; // plenty 192 char attr[80]; // plenty
193 193
194 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 194 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
195 (int)r, 195 (int)r,
… …
199 r & RS_Blink ? " blink" : "", 199 r & RS_Blink ? " blink" : "",
200 r & RS_RVid ? " rvid" : "", 200 r & RS_RVid ? " rvid" : "",
201 r & RS_Uline ? " uline" : "", 201 r & RS_Uline ? " uline" : "",
202 r & RS_Careful ? " careful" : ""); 202 r & RS_Careful ? " careful" : "");
203 203
204 int width = 0;
205 fname = rxvt_temp_buf<wchar_t *> (len);
206 for (int i = 0; i < len; i++)
207 {
208 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
209 fname[i] = rxvt_utf8towcs (f->name);
204 int width = wcswidth (fname, wcslen (fname)); 210 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
211 }
205 212
206 max_it (width, 8+5); // for char + hey
207 max_it (width, strlen (attr)); 213 max_it (width, strlen (attr));
208 214
209 if (y >= 0) 215 if (y >= 0)
210 { 216 {
211 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 217 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
212 x = 0; 218 x = 0;
213 } 219 }
214 220
215 scr_overlay_new (x, y, width, len + 2); 221 scr_overlay_new (x, y, width, len * 2 + 2);
222
223 scr_overlay_set (0, 0, rowcol);
216 224
217 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 225 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
218 226
219 for (int y = 0; y < len; y++) 227 for (int y = 0; y < len; y++)
220 { 228 {
221 char buf[9]; 229 char buf[9];
222 230
223 ch = *chr++; 231 ch = *chr++;
224 232
225 sprintf (buf, "%8x", ch); 233 sprintf (buf, "%8x", ch);
226 scr_overlay_set (0, y, buf); 234 scr_overlay_set (0, y + 1, buf);
227 scr_overlay_set (9, y, '='); 235 scr_overlay_set (9, y + 1, '=');
228# if !UNICODE3 236# if !UNICODE_3
229 if (ch >= 0x10000) 237 if (ch >= 0x10000)
230 ch = 0xfffd; 238 ch = 0xfffd;
231# endif 239# endif
232 scr_overlay_set (11, y, ch, r); 240 scr_overlay_set (11, y + 1, ch, r);
241
242 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r); 243 scr_overlay_set (12, y + 1, NOCHAR, r);
234 } 244 }
235 245
246// {
247// char buf[4+4+3+1];
248// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
249// scr_overlay_set (0, 0, buf);
250// }
236 scr_overlay_set (0, len , attr); 251 scr_overlay_set (0, len + 1, attr);
252 for (int i = 0; i < len; i++)
253 {
237 scr_overlay_set (0, len + 1, fname); 254 scr_overlay_set (0, len + 2 + i, fname[i]);
238
239 free (fname); 255 free (fname[i]);
256 }
240 257
241# if ENABLE_COMBINING 258# if ENABLE_COMBINING
242 if (alloc) 259 if (alloc)
243 delete [] alloc; 260 delete [] alloc;
244# endif 261# endif
245} 262}
246#endif 263#endif
247 264
248void 265void ecb_cold
249rxvt_term::commit_iso14755 () 266rxvt_term::commit_iso14755 ()
250{ 267{
251 wchar_t ch[2];
252
253 ch[0] = iso14755buf & ISO_14755_MASK; 268 wchar_t ch = iso14755buf & ISO_14755_MASK;
254 ch[1] = 0;
255 269
256 if (iso14755buf & ISO_14755_51) 270 if (iso14755buf & ISO_14755_51)
257 { 271 {
258 char mb[16]; 272 char mb[MB_LEN_MAX];
259 int len; 273 int len;
260 274
261 // allow verbatim 0-bytes and control-bytes to be entered 275 // allow verbatim 0-bytes and control-bytes to be entered
262 if (ch[0] >= 0x20) 276 if (ch >= 0x20)
263 len = wcstombs (mb, ch, 16); 277 len = wctomb (mb, ch);
264 else 278 else
265 { 279 {
266 mb[0] = ch[0]; 280 mb[0] = ch;
267 len = 1; 281 len = 1;
268 } 282 }
269 283
270 if (len > 0) 284 if (len > 0)
271 tt_write ((unsigned char *)mb, len); 285 tt_write (mb, len);
272 else 286 else
273 scr_bell (); 287 scr_bell ();
274 } 288 }
275 289
276 iso14755buf = 0; 290 iso14755buf = 0;
277} 291}
278 292
279int 293static int ecb_cold
280rxvt_term::hex_keyval (XKeyEvent &ev) 294hex_keyval (XKeyEvent &ev)
281{ 295{
282 // check wether this event corresponds to a hex digit 296 // check whether this event corresponds to a hex digit
283 // if the modifiers had not been pressed. 297 // if the modifiers had not been pressed.
284 for (int index = 0; index < 8; index++) 298 for (int index = 0; index < 8; index++)
285 { 299 {
286 KeySym k = XLookupKeysym (&ev, index); 300 KeySym k = XLookupKeysym (&ev, index);
287 301
… …
293 307
294 return -1; 308 return -1;
295} 309}
296#endif 310#endif
297 311
298/*{{{ Convert the keypress event into a string */ 312static inline KeySym ecb_cold
299void 313translate_keypad (KeySym keysym, bool kp)
314{
315#ifdef XK_KP_Home
316 static const KeySym keypadtrans[] = {
317 XK_KP_7, // XK_KP_Home
318 XK_KP_4, // XK_KP_Left
319 XK_KP_8, // XK_KP_Up
320 XK_KP_6, // XK_KP_Right
321 XK_KP_2, // XK_KP_Down
322 XK_KP_9, // XK_KP_Prior
323 XK_KP_3, // XK_KP_Next
324 XK_KP_1, // XK_KP_End
325 XK_KP_5, // XK_KP_Begin
326 };
327
328 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
329 {
330 unsigned int index = keysym - XK_KP_Home;
331 keysym = kp ? keypadtrans[index] : XK_Home + index;
332 }
333 else if (keysym == XK_KP_Insert)
334 keysym = kp ? XK_KP_0 : XK_Insert;
335# ifndef NO_DELETE_KEY
336 else if (keysym == XK_KP_Delete)
337 keysym = kp ? XK_KP_Decimal : XK_Delete;
338# endif
339#endif
340 return keysym;
341}
342
343static inline int ecb_cold
344map_function_key (KeySym keysym)
345{
346 int param = 0;
347
348 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
349 {
350 param = 11 + keysym - XK_F1;
351 if (keysym >= XK_F17)
352 param += 4;
353 else if (keysym >= XK_F15)
354 param += 3;
355 else if (keysym >= XK_F11)
356 param += 2;
357 else if (keysym >= XK_F6)
358 param += 1;
359 }
360 else
361 switch (keysym)
362 {
363 case XK_Find:
364 param = 1;
365 break;
366 case XK_Insert:
367 param = 2;
368 break;
369#ifdef DXK_Remove
370 case DXK_Remove:
371#endif
372 case XK_Execute:
373 param = 3;
374 break;
375 case XK_Select:
376 param = 4;
377 break;
378 case XK_Prior:
379 param = 5;
380 break;
381 case XK_Next:
382 param = 6;
383 break;
384 case XK_Home:
385 param = 7;
386 break;
387 case XK_End:
388 param = 8;
389 break;
390 case XK_Help:
391 param = 28;
392 break;
393 case XK_Menu:
394 param = 29;
395 break;
396 }
397 return param;
398}
399
400static inline wchar_t *
401rxvt_wcsdup (const wchar_t *str, int len)
402{
403 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
404 memcpy (r, str, len * sizeof (wchar_t));
405 r[len] = 0;
406 return r;
407}
408
409void ecb_cold
300rxvt_term::lookup_key (XKeyEvent &ev) 410rxvt_term::key_press (XKeyEvent &ev)
301{ 411{
302 int ctrl, meta, shft, len; 412 int ctrl, meta, shft, len;
303 unsigned int newlen; 413 KeySym keysym = NoSymbol;
304 KeySym keysym; 414 char rkbuf[KBUFSZ + 1];
305#ifdef DEBUG_CMD 415 char *kbuf = rkbuf + 1;
306 static int debug_key = 1; /* accessible by a debugger only */ 416
417#if ISO_14755
418 if (iso14755buf & ISO_14755_52)
419 return;
307#endif 420#endif
308 int valid_keysym;
309 unsigned char kbuf[KBUFSZ];
310 421
311 /* 422 /*
312 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 423 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
313 * escape sequence to toggle the Keypad. 424 * escape sequence to toggle the Keypad.
314 * 425 *
… …
316 */ 427 */
317 shft = ev.state & ShiftMask; 428 shft = ev.state & ShiftMask;
318 ctrl = ev.state & ControlMask; 429 ctrl = ev.state & ControlMask;
319 meta = ev.state & ModMetaMask; 430 meta = ev.state & ModMetaMask;
320 431
321 if (numlock_state || (ev.state & ModNumLockMask))
322 {
323 numlock_state = (ev.state & ModNumLockMask);
324 PrivMode ((!numlock_state), PrivMode_aplKP);
325 }
326
327 kbuf[0] = 0; 432 kbuf[0] = 0;
328 433
329#ifdef USE_XIM 434#if USE_XIM
330 if (Input_Context) 435 if (Input_Context)
331 { 436 {
332 Status status_return; 437 Status status_return;
333 438
334#if 0 439#if 0
335#ifdef X_HAVE_UTF8_STRING 440#ifdef X_HAVE_UTF8_STRING
336 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 441 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
337 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 442 len = Xutf8LookupString (Input_Context, &ev, kbuf,
338 KBUFSZ, &keysym, &status_return); 443 KBUFSZ, &keysym, &status_return);
339 else 444 else
340#endif 445#endif
341#endif 446#endif
342 { 447 {
… …
372 } 477 }
373 } 478 }
374 else 479 else
375 len = 0; 480 len = 0;
376 } 481 }
377
378 valid_keysym = status_return == XLookupKeySym
379 || status_return == XLookupBoth;
380 } 482 }
381 else 483 else
382#endif 484#endif
383 { 485 {
384 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 486 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
385 valid_keysym = keysym != NoSymbol; 487 }
488
489 if (keysym != NoSymbol)
386 } 490 {
491 KeySym orig_keysym = keysym;
387 492
388 if (valid_keysym) 493 /* Shift + F1 - F10 generates F11 - F20 */
494 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
495 {
496 keysym += (XK_F11 - XK_F1);
497 shft = 0; /* turn off Shift */
498 }
499
500 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
501 {
502 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
503 unsigned int newlen = 1;
504
505 if (ev.state & ModNumLockMask)
506 kp = false;
507
508 keysym = translate_keypad (keysym, kp);
509
510 switch (keysym)
511 {
512#ifndef NO_BACKSPACE_KEY
513 case XK_BackSpace:
514 if (priv_modes & PrivMode_HaveBackSpace)
515 {
516 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
517 ^ !!ctrl) ? '\b' : '\177';
518 kbuf[1] = '\0';
519 }
520 else
521 strcpy (kbuf, rs[Rs_backspace_key]);
522 break;
523#endif
524#ifndef NO_DELETE_KEY
525 case XK_Delete:
526 strcpy (kbuf, rs[Rs_delete_key]);
527 break;
528#endif
529 case XK_Tab:
530 if (shft)
531 strcpy (kbuf, "\033[Z");
532 else
533 {
534#ifdef CTRL_TAB_MAKES_META
535 if (ctrl)
536 meta = 1;
537#endif
538#ifdef MOD4_TAB_MAKES_META
539 if (ev.state & Mod4Mask)
540 meta = 1;
541#endif
542 newlen = 0;
543 }
544 break;
545
546 case XK_Up: /* "\033[A" */
547 case XK_Down: /* "\033[B" */
548 case XK_Right: /* "\033[C" */
549 case XK_Left: /* "\033[D" */
550 strcpy (kbuf, "\033[Z");
551 kbuf[2] = "DACB"[keysym - XK_Left];
552 /* do Shift first */
553 if (shft)
554 kbuf[2] = "dacb"[keysym - XK_Left];
555 else if (ctrl)
556 {
557 kbuf[1] = 'O';
558 kbuf[2] = "dacb"[keysym - XK_Left];
559 }
560 else if (priv_modes & PrivMode_aplCUR)
561 kbuf[1] = 'O';
562 break;
563
564 case XK_KP_Enter:
565 /* allow shift to override */
566 if (kp)
567 {
568 strcpy (kbuf, "\033OM");
569 break;
570 }
571
572 /* FALLTHROUGH */
573
574 case XK_Return:
575 if (priv_modes & PrivMode_LFNL)
576 {
577 kbuf[0] = '\015';
578 kbuf[1] = '\012';
579 kbuf[2] = '\0';
580 }
581 else
582 {
583 kbuf[0] = '\015';
584 kbuf[1] = '\0';
585 }
586 break;
587
588 case XK_KP_F1: /* "\033OP" */
589 case XK_KP_F2: /* "\033OQ" */
590 case XK_KP_F3: /* "\033OR" */
591 case XK_KP_F4: /* "\033OS" */
592 strcpy (kbuf, "\033OP");
593 kbuf[2] += (keysym - XK_KP_F1);
594 break;
595
596 case XK_KP_Multiply: /* "\033Oj" : "*" */
597 case XK_KP_Add: /* "\033Ok" : "+" */
598 case XK_KP_Separator: /* "\033Ol" : "," */
599 case XK_KP_Subtract: /* "\033Om" : "-" */
600 case XK_KP_Decimal: /* "\033On" : "." */
601 case XK_KP_Divide: /* "\033Oo" : "/" */
602 case XK_KP_0: /* "\033Op" : "0" */
603 case XK_KP_1: /* "\033Oq" : "1" */
604 case XK_KP_2: /* "\033Or" : "2" */
605 case XK_KP_3: /* "\033Os" : "3" */
606 case XK_KP_4: /* "\033Ot" : "4" */
607 case XK_KP_5: /* "\033Ou" : "5" */
608 case XK_KP_6: /* "\033Ov" : "6" */
609 case XK_KP_7: /* "\033Ow" : "7" */
610 case XK_KP_8: /* "\033Ox" : "8" */
611 case XK_KP_9: /* "\033Oy" : "9" */
612 /* allow shift to override */
613 if (kp)
614 {
615 strcpy (kbuf, "\033Oj");
616 kbuf[2] += (keysym - XK_KP_Multiply);
617 }
618 else
619 {
620 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
621 kbuf[1] = '\0';
622 }
623 break;
624
625 default:
626 {
627 int param = map_function_key (keysym);
628 if (param > 0)
629 sprintf (kbuf,"\033[%d~", param);
630 else
631 newlen = 0;
632 }
633 break;
634 }
635
636 if (newlen)
637 len = strlen (kbuf);
638
639 if (len > 0)
640 {
641 /*
642 * pass Shift/Control indicators for function keys ending with `~'
643 *
644 * eg,
645 * Prior = "ESC[5~"
646 * Shift+Prior = "ESC[5$"
647 * Ctrl+Prior = "ESC[5^"
648 * Ctrl+Shift+Prior = "ESC[5@"
649 */
650 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
651 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
652
653 /*
654 * Pass meta for all function keys, if 'meta' option set
655 */
656#ifdef META8_OPTION
657 if (meta && (meta_char == 0x80))
658 kbuf[len - 1] |= 0x80;
659#endif
660 }
661
662 }
663 else if (ctrl && keysym == XK_minus)
664 {
665 len = 1;
666 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
667 }
668 else if (keysym == XK_ISO_Left_Tab)
669 {
670 strcpy (kbuf, "\033[Z");
671 len = 3;
672 }
673 else
674 {
675#ifdef META8_OPTION
676 /* set 8-bit on */
677 if (meta && (meta_char == 0x80))
678 {
679 char *ch;
680
681 for (ch = kbuf; ch < kbuf + len; ch++)
682 *ch |= 0x80;
683 }
684#endif
685 /* nil */ ;
686 }
687
688 keysym = orig_keysym;
689 }
690
691 /* escape prefix */
692 if (len && meta
693#ifdef META8_OPTION
694 && meta_char == C0_ESC
695#endif
696 )
697 {
698 *--kbuf = C0_ESC;
699 len++;
700 }
701
702 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
703 return;
704
705 if (keysym != NoSymbol)
389 { 706 {
390#ifdef KEYSYM_RESOURCE 707#ifdef KEYSYM_RESOURCE
391 if (keyboard->dispatch (this, keysym, ev.state)) 708 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
392 return; 709 return;
393#endif 710#endif
394 711
395 if (saveLines) 712 if (saveLines)
396 { 713 {
… …
405#ifdef PAGING_CONTEXT_LINES 722#ifdef PAGING_CONTEXT_LINES
406 lnsppg = nrow - PAGING_CONTEXT_LINES; 723 lnsppg = nrow - PAGING_CONTEXT_LINES;
407#else 724#else
408 lnsppg = nrow * 4 / 5; 725 lnsppg = nrow * 4 / 5;
409#endif 726#endif
727 max_it (lnsppg, 1);
728
410 if (keysym == XK_Prior) 729 if (keysym == XK_Prior)
411 { 730 {
412 scr_page (UP, lnsppg); 731 scr_page (lnsppg);
413 return; 732 return;
414 } 733 }
415 else if (keysym == XK_Next) 734 else if (keysym == XK_Next)
416 { 735 {
417 scr_page (DN, lnsppg); 736 scr_page (-lnsppg);
418 return; 737 return;
419 } 738 }
420 } 739 }
421#ifdef SCROLL_ON_UPDOWN_KEYS 740#ifdef SCROLL_ON_UPDOWN_KEYS
422 if (IS_SCROLL_MOD) 741 if (IS_SCROLL_MOD)
423 { 742 {
424 if (keysym == XK_Up) 743 if (keysym == XK_Up)
425 { 744 {
426 scr_page (UP, 1); 745 scr_page (1);
427 return; 746 return;
428 } 747 }
429 else if (keysym == XK_Down) 748 else if (keysym == XK_Down)
430 { 749 {
431 scr_page (DN, 1); 750 scr_page (-1);
432 return; 751 return;
433 } 752 }
434 } 753 }
435#endif 754#endif
436#ifdef SCROLL_ON_HOMEEND_KEYS 755#ifdef SCROLL_ON_HOMEEND_KEYS
437 if (IS_SCROLL_MOD) 756 if (IS_SCROLL_MOD)
438 { 757 {
439 if (keysym == XK_Home) 758 if (keysym == XK_Home)
440 { 759 {
441 scr_move_to (0, 1); 760 scr_changeview (top_row);
442 return; 761 return;
443 } 762 }
444 else if (keysym == XK_End) 763 else if (keysym == XK_End)
445 { 764 {
446 scr_move_to (1, 0); 765 scr_changeview (0);
447 return; 766 return;
448 } 767 }
449 } 768 }
450#endif 769#endif
451 } 770 }
452 771
453 if (shft) 772 if (shft)
454 { 773 {
455 /* Shift + F1 - F10 generates F11 - F20 */
456 if (keysym >= XK_F1 && keysym <= XK_F10)
457 {
458 keysym += (XK_F11 - XK_F1);
459 shft = 0; /* turn off Shift */
460 }
461 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 774 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
462 { 775 {
463 switch (keysym) 776 switch (keysym)
464 { 777 {
465 /* normal XTerm key bindings */ 778 /* normal XTerm key bindings */
466 case XK_Insert: /* Shift+Insert = paste mouse selection */ 779 case XK_Insert: /* Shift+Insert = paste mouse selection */
467 selection_request (ev.time, 0, 0); 780 selection_request (ev.time);
468 return; 781 return;
469#if TODO 782#if TODO
470 /* rxvt extras */ 783 /* rxvt extras */
471 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 784 case XK_KP_Add: /* Shift+KP_Add = bigger font */
472 change_font (FONT_UP);
473 return; 785 return;
474 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 786 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
475 change_font (FONT_DN);
476 return; 787 return;
477#endif 788#endif
478 } 789 }
479 } 790 }
480 } 791 }
481 792
793 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
794 {
795 if (keysym == XK_v)
796 selection_request (ev.time, Sel_Clipboard);
797 else if (selection.len > 0)
798 {
799 free (selection.clip_text);
800 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
801 selection.clip_len = selection.len;
802 selection_grab (CurrentTime, true);
803 }
804
805 return;
806 }
807
482#if ENABLE_FRILLS || ISO_14755 808#if ENABLE_FRILLS || ISO_14755
483 // ISO 14755 support 809 // ISO 14755 support
484 if (shft && ctrl) 810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
485 { 811 {
486 int hv; 812 int hv;
487 813
488 if (iso14755buf & ISO_14755_51 814 if (iso14755buf & ISO_14755_51
489 && (keysym == XK_space || keysym == XK_KP_Space 815 && (keysym == XK_space || keysym == XK_KP_Space
… …
491 { 817 {
492 commit_iso14755 (); 818 commit_iso14755 ();
493 iso14755buf = ISO_14755_51; 819 iso14755buf = ISO_14755_51;
494# if ISO_14755 820# if ISO_14755
495 iso14755_51 (0); 821 iso14755_51 (0);
822# endif
823 return;
824 }
825 else if (keysym == XK_BackSpace)
826 {
827 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
828# if ISO_14755
829 iso14755_51 (iso14755buf & ISO_14755_MASK);
496# endif 830# endif
497 return; 831 return;
498 } 832 }
499 else if ((hv = hex_keyval (ev)) >= 0) 833 else if ((hv = hex_keyval (ev)) >= 0)
500 { 834 {
… …
505# endif 839# endif
506 return; 840 return;
507 } 841 }
508 else 842 else
509 { 843 {
510# if ENABLE_OVERLAY 844# if ISO_14755
511 scr_overlay_off (); 845 scr_overlay_off ();
512# endif 846# endif
513 iso14755buf = 0; 847 iso14755buf = 0;
514 } 848 }
515 } 849 }
850 else if (option (Opt_iso14755) &&
516 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 851 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
517 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 852 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
518 if (!(iso14755buf & ISO_14755_STARTED)) 853 if (!(iso14755buf & ISO_14755_STARTED))
519 { 854 {
520 iso14755buf |= ISO_14755_STARTED; 855 iso14755buf |= ISO_14755_STARTED;
521# if ENABLE_OVERLAY 856# if ISO_14755
522 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 857 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
523 scr_overlay_set (0, 0, "ISO 14755 mode"); 858 scr_overlay_set (0, 0, "ISO 14755 mode");
524# endif 859# endif
525 } 860 }
526#endif 861#endif
527 862
528#ifdef PRINTPIPE 863#ifdef PRINTPIPE
529 if (keysym == XK_Print) 864 if (keysym == XK_Print)
530 { 865 {
531 scr_printscreen (ctrl | shft); 866 scr_printscreen (ctrl | shft);
532 return; 867 return;
533 } 868 }
534#endif 869#endif
535
536 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
537 {
538 {
539 newlen = 1;
540 switch (keysym)
541 {
542#ifndef NO_BACKSPACE_KEY
543 case XK_BackSpace:
544 if (priv_modes & PrivMode_HaveBackSpace)
545 {
546 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
547 ^ !!ctrl) ? '\b' : '\177';
548 kbuf[1] = '\0';
549 }
550 else
551 strcpy (kbuf, key_backspace);
552 break;
553#endif
554#ifndef NO_DELETE_KEY
555# ifdef XK_KP_Prior
556 case XK_KP_Delete:
557 /* allow shift to override */
558 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
559 {
560 strcpy (kbuf, "\033On");
561 break;
562 }
563 /* FALLTHROUGH */
564# endif
565 case XK_Delete:
566 strcpy (kbuf, key_delete);
567 break;
568#endif
569 case XK_Tab:
570 if (shft)
571 strcpy (kbuf, "\033[Z");
572 else
573 {
574#ifdef CTRL_TAB_MAKES_META
575 if (ctrl)
576 meta = 1;
577#endif
578#ifdef MOD4_TAB_MAKES_META
579 if (ev.state & Mod4Mask)
580 meta = 1;
581#endif
582 newlen = 0;
583 }
584 break;
585
586#ifdef XK_KP_Left
587 case XK_KP_Up: /* \033Ox or standard */
588 case XK_KP_Down: /* \033Or or standard */
589 case XK_KP_Right: /* \033Ov or standard */
590 case XK_KP_Left: /* \033Ot or standard */
591 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
592 {
593 strcpy (kbuf, "\033OZ");
594 kbuf[2] = "txvr"[keysym - XK_KP_Left];
595 break;
596 }
597 else
598 /* translate to std. cursor key */
599 keysym = XK_Left + (keysym - XK_KP_Left);
600 /* FALLTHROUGH */
601#endif
602 case XK_Up: /* "\033[A" */
603 case XK_Down: /* "\033[B" */
604 case XK_Right: /* "\033[C" */
605 case XK_Left: /* "\033[D" */
606 strcpy (kbuf, "\033[Z");
607 kbuf[2] = "DACB"[keysym - XK_Left];
608 /* do Shift first */
609 if (shft)
610 kbuf[2] = "dacb"[keysym - XK_Left];
611 else if (ctrl)
612 {
613 kbuf[1] = 'O';
614 kbuf[2] = "dacb"[keysym - XK_Left];
615 }
616 else if (priv_modes & PrivMode_aplCUR)
617 kbuf[1] = 'O';
618 break;
619
620#ifndef UNSHIFTED_SCROLLKEYS
621# ifdef XK_KP_Prior
622 case XK_KP_Prior:
623 /* allow shift to override */
624 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
625 {
626 strcpy (kbuf, "\033Oy");
627 break;
628 }
629 /* FALLTHROUGH */
630# endif
631 case XK_Prior:
632 strcpy (kbuf, "\033[5~");
633 break;
634# ifdef XK_KP_Next
635 case XK_KP_Next:
636 /* allow shift to override */
637 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
638 {
639 strcpy (kbuf, "\033Os");
640 break;
641 }
642 /* FALLTHROUGH */
643# endif
644 case XK_Next:
645 strcpy (kbuf, "\033[6~");
646 break;
647#endif
648 case XK_KP_Enter:
649 /* allow shift to override */
650 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
651 {
652 strcpy (kbuf, "\033OM");
653 break;
654 }
655
656 /* FALLTHROUGH */
657
658 case XK_Return:
659 if (priv_modes & PrivMode_LFNL)
660 {
661 kbuf[0] = '\015';
662 kbuf[1] = '\012';
663 kbuf[2] = '\0';
664 }
665 else
666 {
667 kbuf[0] = '\015';
668 kbuf[1] = '\0';
669 }
670 break;
671
672#ifdef XK_KP_Begin
673 case XK_KP_Begin:
674 strcpy (kbuf, "\033Ou");
675 break;
676
677#endif
678 case XK_KP_F1: /* "\033OP" */
679 case XK_KP_F2: /* "\033OQ" */
680 case XK_KP_F3: /* "\033OR" */
681 case XK_KP_F4: /* "\033OS" */
682 strcpy (kbuf, "\033OP");
683 kbuf[2] += (keysym - XK_KP_F1);
684 break;
685
686 case XK_KP_Multiply: /* "\033Oj" : "*" */
687 case XK_KP_Add: /* "\033Ok" : "+" */
688 case XK_KP_Separator: /* "\033Ol" : "," */
689 case XK_KP_Subtract: /* "\033Om" : "-" */
690 case XK_KP_Decimal: /* "\033On" : "." */
691 case XK_KP_Divide: /* "\033Oo" : "/" */
692 case XK_KP_0: /* "\033Op" : "0" */
693 case XK_KP_1: /* "\033Oq" : "1" */
694 case XK_KP_2: /* "\033Or" : "2" */
695 case XK_KP_3: /* "\033Os" : "3" */
696 case XK_KP_4: /* "\033Ot" : "4" */
697 case XK_KP_5: /* "\033Ou" : "5" */
698 case XK_KP_6: /* "\033Ov" : "6" */
699 case XK_KP_7: /* "\033Ow" : "7" */
700 case XK_KP_8: /* "\033Ox" : "8" */
701 case XK_KP_9: /* "\033Oy" : "9" */
702 /* allow shift to override */
703 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
704 {
705 strcpy (kbuf, "\033Oj");
706 kbuf[2] += (keysym - XK_KP_Multiply);
707 }
708 else
709 {
710 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
711 kbuf[1] = '\0';
712 }
713 break;
714
715 case XK_Find:
716 strcpy (kbuf, "\033[1~");
717 break;
718
719#ifdef XK_KP_End
720 case XK_KP_Insert:
721 /* allow shift to override */
722 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
723 {
724 strcpy (kbuf, "\033Op");
725 break;
726 }
727 /* FALLTHROUGH */
728#endif
729 case XK_Insert:
730 strcpy (kbuf, "\033[2~");
731 break;
732#ifdef DXK_Remove /* support for DEC remove like key */
733 case DXK_Remove:
734 /* FALLTHROUGH */
735#endif
736 case XK_Execute:
737 strcpy (kbuf, "\033[3~");
738 break;
739 case XK_Select:
740 strcpy (kbuf, "\033[4~");
741 break;
742#ifdef XK_KP_End
743 case XK_KP_End:
744 /* allow shift to override */
745 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
746 {
747 strcpy (kbuf, "\033Oq");
748 break;
749 }
750 /* FALLTHROUGH */
751#endif
752 case XK_End:
753 strcpy (kbuf, KS_END);
754 break;
755#ifdef XK_KP_Home
756 case XK_KP_Home:
757 /* allow shift to override */
758 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
759 {
760 strcpy (kbuf, "\033Ow");
761 break;
762 }
763 /* FALLTHROUGH */
764#endif
765 case XK_Home:
766 strcpy (kbuf, KS_HOME);
767 break;
768
769#define FKEY(n, fkey) \
770 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
771
772 case XK_F1: /* "\033[11~" */
773 case XK_F2: /* "\033[12~" */
774 case XK_F3: /* "\033[13~" */
775 case XK_F4: /* "\033[14~" */
776 case XK_F5: /* "\033[15~" */
777 FKEY (11, XK_F1);
778 break;
779 case XK_F6: /* "\033[17~" */
780 case XK_F7: /* "\033[18~" */
781 case XK_F8: /* "\033[19~" */
782 case XK_F9: /* "\033[20~" */
783 case XK_F10: /* "\033[21~" */
784 FKEY (17, XK_F6);
785 break;
786 case XK_F11: /* "\033[23~" */
787 case XK_F12: /* "\033[24~" */
788 case XK_F13: /* "\033[25~" */
789 case XK_F14: /* "\033[26~" */
790 FKEY (23, XK_F11);
791 break;
792 case XK_F15: /* "\033[28~" */
793 case XK_F16: /* "\033[29~" */
794 FKEY (28, XK_F15);
795 break;
796 case XK_Help: /* "\033[28~" */
797 FKEY (28, XK_Help);
798 break;
799 case XK_Menu: /* "\033[29~" */
800 FKEY (29, XK_Menu);
801 break;
802 case XK_F17: /* "\033[31~" */
803 case XK_F18: /* "\033[32~" */
804 case XK_F19: /* "\033[33~" */
805 case XK_F20: /* "\033[34~" */
806 case XK_F21: /* "\033[35~" */
807 case XK_F22: /* "\033[36~" */
808 case XK_F23: /* "\033[37~" */
809 case XK_F24: /* "\033[38~" */
810 case XK_F25: /* "\033[39~" */
811 case XK_F26: /* "\033[40~" */
812 case XK_F27: /* "\033[41~" */
813 case XK_F28: /* "\033[42~" */
814 case XK_F29: /* "\033[43~" */
815 case XK_F30: /* "\033[44~" */
816 case XK_F31: /* "\033[45~" */
817 case XK_F32: /* "\033[46~" */
818 case XK_F33: /* "\033[47~" */
819 case XK_F34: /* "\033[48~" */
820 case XK_F35: /* "\033[49~" */
821 FKEY (31, XK_F17);
822 break;
823#undef FKEY
824 default:
825 newlen = 0;
826 break;
827 }
828
829 if (newlen)
830 len = strlen (kbuf);
831 }
832
833 /*
834 * Pass meta for all function keys, if 'meta' option set
835 */
836#ifdef META8_OPTION
837 if (meta && (meta_char == 0x80) && len > 0)
838 kbuf[len - 1] |= 0x80;
839#endif
840
841 }
842 else if (ctrl && keysym == XK_minus)
843 {
844 len = 1;
845 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
846 }
847 else if (keysym == XK_ISO_Left_Tab)
848 {
849 strcpy (kbuf, "\033[Z");
850 len = 3;
851 }
852 else
853 {
854#ifdef META8_OPTION
855 /* set 8-bit on */
856 if (meta && (meta_char == 0x80))
857 {
858 unsigned char *ch;
859
860 for (ch = kbuf; ch < kbuf + len; ch++)
861 *ch |= 0x80;
862
863 meta = 0;
864 }
865#endif
866 /* nil */ ;
867 }
868 } 870 }
869 871
870 if (len <= 0) 872 if (len <= 0)
871 return; /* not mapped */ 873 return; /* not mapped */
872 874
873 if (OPTION (Opt_scrollTtyKeypress)) 875 tt_write_user_input (kbuf, (unsigned int)len);
874 if (view_start) 876}
877
878void ecb_cold
879rxvt_term::key_release (XKeyEvent &ev)
880{
881#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
882 KeySym keysym;
883
884 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
885#endif
886
887#if ENABLE_FRILLS || ISO_14755
888 // ISO 14755 support
889 if (iso14755buf)
890 if (iso14755buf & ISO_14755_52)
875 { 891 {
876 view_start = 0; 892# if ISO_14755
877 want_refresh = 1; 893 scr_overlay_off ();
894# endif
895# if ISO_14755
896 // iso14755 part 5.2 handling: release time
897 // first: controls
898 if ((ev.state & ControlMask)
899 && ((keysym >= 0x40 && keysym <= 0x5f)
900 || (keysym >= 0x61 && keysym <= 0x7f)))
901 {
902 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
903 commit_iso14755 ();
904
905 return;
906 }
907
908 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
909 if (i[0] == keysym)
910 {
911 iso14755buf = ISO_14755_51 | i[1];
912 commit_iso14755 ();
913
914 return;
915 }
916
917 scr_bell ();
918# endif
919 iso14755buf = 0;
920
921 return;
878 } 922 }
879 923 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
880 /* 924 {
881 * these modifications only affect the static keybuffer 925# if ISO_14755
882 * pass Shift/Control indicators for function keys ending with `~' 926 scr_overlay_off ();
883 *
884 * eg,
885 * Prior = "ESC[5~"
886 * Shift+Prior = "ESC[5$"
887 * Ctrl+Prior = "ESC[5^"
888 * Ctrl+Shift+Prior = "ESC[5@"
889 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
890 */
891 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
892 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
893
894 /* escape prefix */
895 if (meta
896#ifdef META8_OPTION
897 && meta_char == C0_ESC
898#endif 927# endif
899 ) 928 if (iso14755buf & ISO_14755_51)
900 { 929 commit_iso14755 ();
901 const unsigned char ch = C0_ESC; 930#if ISO_14755
902 tt_write (&ch, 1); 931 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
903 } 932 {
933 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
904 934
905#if defined(DEBUG_CMD) 935 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
906 /* Display keyboard buffer contents */ 936 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
907 unsigned char *p; 937 }
908 int i;
909
910 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
911 for (i = 0, p = kbuf; i < len; i++, p++)
912 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
913 fprintf (stderr, "'\n");
914#endif /* DEBUG_CMD */
915 tt_write (kbuf, (unsigned int)len);
916}
917/*}}} */
918
919#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
920/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
921/* attempt to `write' count to the input buffer */
922unsigned int
923rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
924{
925 unsigned int n, s;
926
927 n = cmdbuf_ptr - cmdbuf_base;
928 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
929
930 if (n > 0 && s < count)
931 {
932 memmove (cmdbuf_base, cmdbuf_ptr,
933 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
934 cmdbuf_ptr = cmdbuf_base;
935 cmdbuf_endp -= n;
936 s += n;
937 }
938
939 if (count > s)
940 {
941 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
942 count = s;
943 }
944
945 for (; count--;)
946 *cmdbuf_endp++ = *str++;
947
948 cmd_parse ();
949
950 return 0;
951}
952#endif 938# endif
939 else
940 iso14755buf = 0;
941 }
942#endif
943
944 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
945 return;
946
947#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
948 if (!(ev.state & ControlMask))
949 slip_wheel_ev.stop ();
950 else if (keysym == XK_Control_L || keysym == XK_Control_R)
951 mouse_slip_wheel_speed = 0;
952#endif
953}
953 954
954void 955void
955rxvt_term::flush () 956rxvt_term::flush ()
956{ 957{
957 flush_ev.stop (); 958 flush_ev.stop ();
958 959
959#ifdef TRANSPARENT 960#ifdef HAVE_IMG
960 if (want_full_refresh) 961 if (bg_flags & BG_NEEDS_REFRESH)
961 { 962 {
962 want_full_refresh = 0; 963 bg_flags &= ~BG_NEEDS_REFRESH;
963 scr_clear ();
964 scr_touch (false); 964 scr_touch (false);
965 } 965 }
966#endif 966#endif
967 967
968 if (want_refresh) 968 if (want_refresh)
969 { 969 {
970 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
971 {
972 int row = view_start;
973 int end_row = row + nrow;
974
975 while (row > top_row && ROW (row - 1).is_longer ())
976 --row;
977
978 do
979 {
980 int start_row = row;
981 line_t *l;
982
983 do
984 {
985 l = &ROW (row++);
986
987 if (!(l->f & LINE_FILTERED))
988 {
989 // line not filtered, mark it as filtered
990 l->f |= LINE_FILTERED;
991 while (l->is_longer ())
992 {
993 l = &ROW (row++);
994 l->f |= LINE_FILTERED;
995 }
996
997 // and filter it
998 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
999
1000 break;
1001 }
1002 }
1003 while (l->is_longer () && row < end_row);
1004 }
1005 while (row < end_row);
1006 }
1007
970 scr_refresh (refresh_type); 1008 scr_refresh ();
971 scrollbar_show (1); 1009 scrollBar.show (1);
972#ifdef USE_XIM 1010#if USE_XIM
973 IMSendSpot (); 1011 im_send_spot ();
974#endif 1012#endif
975 } 1013 }
976 1014
977 display->flush (); 1015 display->flush ();
978} 1016}
979 1017
1018/* checks whether a refresh is requested and starts the refresh timer */
980void 1019void
981rxvt_term::check_cb (check_watcher &w) 1020rxvt_term::refresh_check ()
982{ 1021{
983 SET_R (this); 1022 if (want_refresh && !flush_ev.is_active ())
984 SET_LOCALE (locale); 1023 flush_ev.start ();
985 1024
986 display->flush (); 1025 display->flush ();
987
988 if (want_refresh && !flush_ev.active)
989 flush_ev.start (NOW + 0.01);
990} 1026}
991 1027
992void 1028void
993rxvt_term::flush_cb (time_watcher &w) 1029rxvt_term::flush_cb (ev::timer &w, int revents)
994{ 1030{
995 SET_R (this); 1031 make_current ();
996 SET_LOCALE (locale);
997 1032
998 refresh_limit = 1;
999 refresh_count = 0; 1033 refresh_count = 0;
1000 flush (); 1034 flush ();
1001} 1035}
1002 1036
1003#ifdef CURSOR_BLINK 1037#ifdef CURSOR_BLINK
1004void 1038void
1039rxvt_term::cursor_blink_reset ()
1040{
1041 if (!focus)
1042 return;
1043
1044 if (hidden_cursor)
1045 {
1046 hidden_cursor = 0;
1047 want_refresh = 1;
1048 }
1049
1050 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1051 cursor_blink_ev.again ();
1052 else
1053 cursor_blink_ev.stop ();
1054}
1055
1056void
1005rxvt_term::cursor_blink_cb (time_watcher &w) 1057rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1006{ 1058{
1007 hidden_cursor = !hidden_cursor; 1059 hidden_cursor = !hidden_cursor;
1008 want_refresh = 1; 1060 want_refresh = 1;
1009 1061 refresh_check ();
1010 w.start (w.at + BLINK_INTERVAL);
1011} 1062}
1012#endif 1063#endif
1013 1064
1014#ifdef TEXT_BLINK 1065#ifdef TEXT_BLINK
1015void 1066void
1016rxvt_term::text_blink_cb (time_watcher &w) 1067rxvt_term::text_blink_cb (ev::timer &w, int revents)
1017{ 1068{
1018 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1069 if (scr_refresh_rend (RS_Blink, RS_Blink))
1019 { 1070 {
1020 hidden_text = !hidden_text; 1071 hidden_text = !hidden_text;
1021 want_refresh = 1; 1072 want_refresh = 1;
1022 w.start (w.at + TEXT_BLINK_INTERVAL); 1073 refresh_check ();
1023 } 1074 }
1075 else
1076 w.stop ();
1024} 1077}
1025#endif 1078#endif
1026 1079
1027#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1080#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1028void 1081void
1029rxvt_term::cont_scroll_cb (time_watcher &w) 1082rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1030{ 1083{
1031 if ((scrollbar_isUp() || scrollbar_isDn()) && 1084 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1032 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1085 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1033 { 1086 {
1034 refresh_type |= SMOOTH_REFRESH;
1035 want_refresh = 1; 1087 want_refresh = 1;
1036 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1088 refresh_check ();
1037 } 1089 }
1090 else
1091 w.stop ();
1038} 1092}
1039#endif 1093#endif
1040 1094
1041#ifdef SELECTION_SCROLLING 1095#ifdef SELECTION_SCROLLING
1042void 1096void
1043rxvt_term::sel_scroll_cb (time_watcher &w) 1097rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1044{ 1098{
1045 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1099 if (scr_page (scroll_selection_lines))
1046 { 1100 {
1047 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1101 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1048 refresh_type |= SMOOTH_REFRESH;
1049 want_refresh = 1; 1102 want_refresh = 1;
1050 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1103 refresh_check ();
1051 } 1104 }
1105 else
1106 w.stop ();
1052} 1107}
1053#endif 1108#endif
1054 1109
1055#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1110#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1056void 1111void
1057rxvt_term::slip_wheel_cb (time_watcher &w) 1112rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1058{ 1113{
1059 if (mouse_slip_wheel_speed == 0 1114 if (scr_page (mouse_slip_wheel_speed))
1060 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1061 : scr_page (UP, mouse_slip_wheel_speed))
1062 { 1115 {
1063 if (view_start == nsaved ||
1064 view_start == 0)
1065 mouse_slip_wheel_speed = 0;
1066
1067 refresh_type |= SMOOTH_REFRESH;
1068 want_refresh = 1; 1116 want_refresh = 1;
1069 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1117 refresh_check ();
1118 }
1119
1120 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1070 } 1121 {
1122 mouse_slip_wheel_speed = 0;
1123 w.stop ();
1124 }
1125}
1126#endif
1127
1128#if LINUX_YIELD_HACK
1129static struct event_handler
1130{
1131 ev::prepare yield_ev;
1132
1133 void yield_cb (ev::prepare &w, int revents)
1134 {
1135 // this should really be sched_yield(), but the linux guys thought
1136 // that giving a process calling sched_yield () less cpu time than
1137 // ones with high nice levels is a useful thing to do. It surely is is
1138 // allowed by the sus... as is returning ENOSYS.
1139 // since the linux guys additionally thought that breaking the only
1140 // known workaround against their unusable sched_yield hack is cool,
1141 // we just nanosleep a bit and hope for the best.
1142
1143 struct timespec ts = { 0, 1000 };
1144 nanosleep (&ts, 0);
1145
1146 w.stop ();
1147 }
1148
1149 event_handler ()
1150 : yield_ev (this, &event_handler::yield_cb)
1151 {
1152 }
1153} event_handler;
1154#endif
1155
1156/* make sure all the cmd data is at beginning of cmdbuf */
1157void
1158rxvt_term::cmdbuf_reify ()
1159{
1160 if (cmdbuf_ptr == cmdbuf_base)
1161 return;
1162
1163 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1164
1165 memmove (cmdbuf_base, cmdbuf_ptr, used);
1166 cmdbuf_ptr = cmdbuf_base;
1167 cmdbuf_endp = cmdbuf_ptr + used;
1168
1169}
1170
1171#if defined (KEYSYM_RESOURCE)
1172void
1173rxvt_term::cmdbuf_append (const char *str, size_t count)
1174{
1175 cmdbuf_reify ();
1176
1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1178
1179 if (count > avail)
1180 return;
1181
1182 memcpy (cmdbuf_endp, str, count);
1183 cmdbuf_endp += count;
1184
1185 cmd_parse ();
1071} 1186}
1072#endif 1187#endif
1073 1188
1074bool 1189bool
1075rxvt_term::pty_fill () 1190rxvt_term::pty_fill ()
1076{ 1191{
1077 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1192 cmdbuf_reify ();
1078 1193
1079 if (CBUFSIZ == n) 1194 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1080 { 1195
1081 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1196 if (!avail)
1082 n = 0;
1083 } 1197 {
1084 1198 // normally this indicates a "too long" command sequence - just drop the data we have
1085 memmove (cmdbuf_base, cmdbuf_ptr, n);
1086 cmdbuf_ptr = cmdbuf_base; 1199 cmdbuf_ptr = cmdbuf_base;
1087 cmdbuf_endp = cmdbuf_ptr + n; 1200 cmdbuf_endp = cmdbuf_ptr;
1201 avail = CBUFSIZ;
1202 }
1088 1203
1089 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1204 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1090 1205
1091 if (r > 0) 1206 if (r > 0)
1092 { 1207 {
1093 cmdbuf_endp += r; 1208 cmdbuf_endp += r;
1094 return true; 1209 return true;
1095 } 1210 }
1096 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1211 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1097 { 1212 {
1098#if HAVE_SCHED_YIELD 1213#if LINUX_YIELD_HACK
1099 sched_yield (); 1214 if (display->is_local)
1215 event_handler.yield_ev.start ();
1100#endif 1216#endif
1101 } 1217 }
1102 else 1218 else
1103 { 1219 {
1104 pty_ev.stop (); 1220 pty_ev.stop ();
1105 1221
1106 if (!OPTION (Opt_hold)) 1222 if (!option (Opt_hold))
1107 destroy (); 1223 destroy ();
1108 } 1224 }
1109 1225
1110 return false; 1226 return false;
1111} 1227}
1112 1228
1113void 1229void
1114rxvt_term::pty_cb (io_watcher &w, short revents) 1230rxvt_term::pty_cb (ev::io &w, int revents)
1115{ 1231{
1116 SET_R (this); 1232 make_current ();
1117 SET_LOCALE (locale);
1118 1233
1119 if (revents & EVENT_READ) 1234 if (revents & ev::READ)
1120 // loop, but don't allow a single term to monopolize us 1235 // loop, but don't allow a single term to monopolize us
1121 while (pty_fill ()) 1236 for (int i = CBUFCNT; i-- && pty_fill (); )
1122 if (cmd_parse ()) 1237 cmd_parse ();
1123 break;
1124 1238
1125 if (revents & EVENT_WRITE) 1239 if (revents & ev::WRITE)
1126 pty_write (); 1240 pty_write ();
1127}
1128 1241
1129void 1242 refresh_check ();
1243}
1244
1245void ecb_cold
1130rxvt_term::pointer_unblank () 1246rxvt_term::pointer_unblank ()
1131{ 1247{
1132 XDefineCursor (display->display, vt, TermWin_cursor); 1248 XDefineCursor (dpy, vt, TermWin_cursor);
1133 recolour_cursor (); 1249 recolor_cursor ();
1134 1250
1135#ifdef POINTER_BLANK 1251#ifdef POINTER_BLANK
1136 hidden_pointer = 0; 1252 hidden_pointer = 0;
1137 1253
1138 if (OPTION (Opt_pointerBlank)) 1254 if (option (Opt_pointerBlank))
1139 pointer_ev.start (NOW + pointerBlankDelay); 1255 pointer_ev.start (pointerBlankDelay);
1140#endif 1256#endif
1141} 1257}
1142 1258
1143#ifdef POINTER_BLANK 1259#ifdef POINTER_BLANK
1144void 1260void ecb_cold
1145rxvt_term::pointer_blank () 1261rxvt_term::pointer_blank ()
1146{ 1262{
1147 if (! OPTION (Opt_pointerBlank)) 1263 if (!option (Opt_pointerBlank))
1148 return; 1264 return;
1149 1265
1150 XDefineCursor (display->display, vt, display->blank_cursor); 1266 XDefineCursor (dpy, vt, display->blank_cursor);
1151 XFlush (display->display); 1267 XFlush (dpy);
1152 1268
1153 hidden_pointer = 1; 1269 hidden_pointer = 1;
1154} 1270}
1155 1271
1156void 1272void ecb_cold
1157rxvt_term::pointer_cb (time_watcher &w) 1273rxvt_term::pointer_cb (ev::timer &w, int revents)
1158{ 1274{
1159 SET_R (this); 1275 make_current ();
1160 SET_LOCALE (locale);
1161 1276
1162 pointer_blank (); 1277 pointer_blank ();
1163} 1278}
1164#endif 1279#endif
1165 1280
1166void 1281void
1167rxvt_term::mouse_report (XButtonEvent &ev) 1282rxvt_term::mouse_report (XButtonEvent &ev)
1168{ 1283{
1169 int button_number, key_state = 0; 1284 int button_number, state = 0;
1170 int x, y; 1285 int x, y;
1286 bool release = ev.type == ButtonRelease;
1171 1287
1172 x = ev.x; 1288 x = 1 + clamp (Pixel2Col (ev.x), 0, ncol - 1);
1173 y = ev.y; 1289 y = 1 + clamp (Pixel2Row (ev.y), 0, nrow - 1);
1174 pixel_position (&x, &y);
1175 1290
1176 if (MEvent.button == AnyButton) 1291 if (ev.type == MotionNotify)
1177 button_number = 3; 1292 {
1178 else 1293 if (x == mouse_row && y == mouse_col)
1294 return;
1295
1296 mouse_row = x;
1297 mouse_col = y;
1298 state += 32;
1179 { 1299 }
1300
1180 button_number = MEvent.button - Button1; 1301 button_number = MEvent.button - Button1;
1181 /* add 0x3D for wheel events, like xterm does */ 1302 if (button_number > 10)
1303 return;
1304 else if (button_number >= 7)
1305 button_number += 128 - 7;
1182 if (button_number >= 3) 1306 else if (button_number >= 3)
1183 button_number += (64 - 3); 1307 button_number += 64 - 3;
1184 }
1185 1308
1186 if (priv_modes & PrivMode_MouseX10) 1309 if (priv_modes & PrivMode_MouseX10)
1187 { 1310 {
1188 /* 1311 /*
1189 * do not report ButtonRelease 1312 * do not report ButtonRelease
1190 * no state info allowed 1313 * no state info allowed
1191 */ 1314 */
1192 key_state = 0; 1315 if (release)
1193 if (button_number == 3)
1194 return; 1316 return;
1195 } 1317 }
1196 else 1318 else
1197 { 1319 {
1198 /* XTerm mouse reporting needs these values: 1320 /* XTerm mouse reporting needs these values:
… …
1200 * 8 = Meta 1322 * 8 = Meta
1201 * 16 = Control 1323 * 16 = Control
1202 * plus will add in our own Double-Click reporting 1324 * plus will add in our own Double-Click reporting
1203 * 32 = Double Click 1325 * 32 = Double Click
1204 */ 1326 */
1205 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1327 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1206 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1328 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1207 + ((MEvent.state & ControlMask) ? 16 : 0); 1329 + ((MEvent.state & ControlMask) ? 16 : 0);
1208#ifdef MOUSE_REPORT_DOUBLECLICK 1330#ifdef MOUSE_REPORT_DOUBLECLICK
1209 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1331 state += ((MEvent.clicks > 1) ? 32 : 0);
1210#endif 1332#endif
1211 } 1333 }
1334
1335 int code = 32 + (release ? 3 : button_number) + state;
1212 1336
1213#if DEBUG_MOUSEREPORT 1337#if DEBUG_MOUSEREPORT
1214 fprintf (stderr, "Mouse ["); 1338 fprintf (stderr, "Mouse [");
1215 if (key_state & 16) 1339 if (state & 16)
1216 fputc ('C', stderr); 1340 fputc ('C', stderr);
1217 if (key_state & 4) 1341 if (state & 4)
1218 fputc ('S', stderr); 1342 fputc ('S', stderr);
1219 if (key_state & 8) 1343 if (state & 8)
1220 fputc ('A', stderr); 1344 fputc ('A', stderr);
1221 if (key_state & 32) 1345 if (state & 32)
1222 fputc ('2', stderr); 1346 fputc ('2', stderr);
1223 fprintf (stderr, "]: <%d>, %d/%d\n", 1347 fprintf (stderr, "]: <%d>, %d/%d\n",
1224 button_number, 1348 button_number,
1225 x + 1, 1349 x,
1226 y + 1); 1350 y);
1227#endif 1351#endif
1228 1352
1353#if ENABLE_FRILLS
1354 if (priv_modes & PrivMode_ExtMouseSGR)
1355 tt_printf ("\033[<%d;%d;%d%c",
1356 button_number + state,
1357 x,
1358 y,
1359 release ? 'm' : 'M');
1360 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1361 tt_printf ("\033[%d;%d;%dM",
1362 code,
1363 x,
1364 y);
1365 else if (priv_modes & PrivMode_ExtMouseUTF8)
1366 if (code < 128)
1367 tt_printf ("\033[M%c%lc%lc",
1368 code,
1369 wint_t (32 + x),
1370 wint_t (32 + y));
1371 else
1372 tt_printf ("\033[M%c%c%lc%lc",
1373 0xc0 + (code >> 6),
1374 0x80 + (code & 0x3f),
1375 wint_t (32 + x),
1376 wint_t (32 + y));
1377 else
1378#endif
1229 tt_printf ("\033[M%c%c%c", 1379 tt_printf ("\033[M%c%c%c",
1230 (32 + button_number + key_state), 1380 code,
1231 (32 + x + 1), 1381 32 + x,
1232 (32 + y + 1)); 1382 32 + y);
1233} 1383}
1234
1235#ifdef USING_W11LIB
1236void
1237rxvt_W11_process_x_event (XEvent *ev)
1238{
1239 rxvt_t *r = rxvt_get_r ();
1240
1241 x_cb (*ev);
1242}
1243#endif
1244 1384
1245/*{{{ process an X event */ 1385/*{{{ process an X event */
1246void 1386void ecb_hot
1247rxvt_term::x_cb (XEvent &ev) 1387rxvt_term::x_cb (XEvent &ev)
1248{ 1388{
1249 dDisp; 1389 make_current ();
1250 1390
1251 SET_R (this); 1391 dLocal (Display *, dpy);
1252 SET_LOCALE (locale);
1253 1392
1254#if defined(CURSOR_BLINK) 1393 if (ev.xany.window == vt
1255 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1394 && SHOULD_INVOKE (HOOK_X_EVENT)
1256 { 1395 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1257 if (hidden_cursor) 1396 return;
1258 {
1259 hidden_cursor = 0;
1260 want_refresh = 1;
1261 }
1262 1397
1263 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1398 // for XQueryPointer
1264 }
1265#endif
1266
1267#if defined(POINTER_BLANK)
1268 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1269 {
1270 if (ev.type == MotionNotify
1271 || ev.type == ButtonPress
1272 || ev.type == ButtonRelease)
1273 if (hidden_pointer)
1274 pointer_unblank ();
1275
1276 if (ev.type == KeyPress && hidden_pointer == 0)
1277 pointer_blank ();
1278 }
1279#endif
1280
1281 Window unused_root, unused_child; 1399 Window unused_root, unused_child;
1282 int unused_root_x, unused_root_y; 1400 int unused_root_x, unused_root_y;
1283 unsigned int unused_mask; 1401 unsigned int unused_mask;
1284 1402
1285 switch (ev.type) 1403 switch (ev.type)
1286 { 1404 {
1287 case KeyPress: 1405 case KeyPress:
1288#if ISO_14755 1406 key_press (ev.xkey);
1289 if (!(iso14755buf & ISO_14755_52))
1290#endif
1291 lookup_key (ev.xkey);
1292
1293 break; 1407 break;
1294 1408
1295 case KeyRelease: 1409 case KeyRelease:
1296 { 1410 key_release (ev.xkey);
1297#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1298 KeySym ks;
1299
1300 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1301#endif
1302
1303#if ENABLE_FRILLS || ISO_14755
1304 // ISO 14755 support
1305 if (iso14755buf)
1306 if (iso14755buf & ISO_14755_52)
1307 {
1308# if ENABLE_OVERLAY
1309 scr_overlay_off ();
1310# endif
1311# if ISO_14755
1312 // iso14755 part 5.2 handling: release time
1313 // first: controls
1314 if ((ev.xkey.state & ControlMask)
1315 && ((ks >= 0x40 && ks <= 0x5f)
1316 || (ks >= 0x61 && ks <= 0x7f)))
1317 {
1318 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1319 commit_iso14755 ();
1320 return; // case-break;
1321 }
1322
1323 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1324 if (i[0] == ks)
1325 {
1326 iso14755buf = ISO_14755_51 | i[1];
1327 commit_iso14755 ();
1328 return; // case-break;
1329 }
1330
1331 scr_bell ();
1332# endif
1333 iso14755buf = 0;
1334 break;
1335 }
1336 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1337 {
1338# if ENABLE_OVERLAY
1339 scr_overlay_off ();
1340# endif
1341 if (iso14755buf & ISO_14755_51)
1342 commit_iso14755 ();
1343#if ISO_14755
1344 else if (iso14755buf & ISO_14755_STARTED)
1345 {
1346 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1347
1348 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1349 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1350 }
1351# endif
1352 else
1353 iso14755buf = 0;
1354 }
1355#endif
1356
1357#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1358 if (!(ev.xkey.state & ControlMask))
1359 slip_wheel_ev.stop ();
1360 else if (ks == XK_Control_L || ks == XK_Control_R)
1361 mouse_slip_wheel_speed = 0;
1362#endif
1363 break; 1411 break;
1364 }
1365 1412
1366 case ButtonPress: 1413 case ButtonPress:
1367 button_press (ev.xbutton); 1414 button_press (ev.xbutton);
1368 break; 1415 break;
1369 1416
… …
1371 button_release (ev.xbutton); 1418 button_release (ev.xbutton);
1372 break; 1419 break;
1373 1420
1374 case ClientMessage: 1421 case ClientMessage:
1375 if (ev.xclient.format == 32 1422 if (ev.xclient.format == 32
1376 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1423 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1377 { 1424 {
1425 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1426 {
1427 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1428 {
1378 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1429 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1430 {
1431 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1379 destroy (); 1432 destroy ();
1433 }
1380#if ENABLE_EWMH 1434#if ENABLE_EWMH
1381 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1435 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1382 XSendEvent (disp, ev.xclient.window = display->root, 1436 XSendEvent (dpy, ev.xclient.window = display->root,
1383 False, SubstructureRedirectMask | SubstructureNotifyMask, 1437 False, SubstructureRedirectMask | SubstructureNotifyMask,
1384 &ev); 1438 &ev);
1439#endif
1440 }
1441 }
1442#if ENABLE_XEMBED
1443 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1444 {
1445 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1446 focus_in ();
1447 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1448 focus_out ();
1449 }
1385#endif 1450#endif
1386 } 1451 }
1387#if ENABLE_XEMBED
1388 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1389 {
1390 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1391 focus_in ();
1392 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1393 focus_out ();
1394 }
1395#endif
1396#ifdef OFFIX_DND
1397 /* OffiX Dnd (drag 'n' drop) protocol */
1398 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1399 && (ev.xclient.data.l[0] == DndFile
1400 || ev.xclient.data.l[0] == DndDir
1401 || ev.xclient.data.l[0] == DndLink))
1402 {
1403 /* Get Dnd data */
1404 Atom ActualType;
1405 int ActualFormat;
1406 unsigned char *data;
1407 unsigned long Size, RemainingBytes;
1408
1409 XGetWindowProperty (disp, display->root,
1410 xa[XA_DNDSELECTION],
1411 0L, 1000000L,
1412 False, AnyPropertyType,
1413 &ActualType, &ActualFormat,
1414 &Size, &RemainingBytes,
1415 &data);
1416 set_string_property (XA_CUT_BUFFER0, data);
1417 XFree (data);
1418 selection_paste (display->root, XA_CUT_BUFFER0, true);
1419 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1420 }
1421#endif /* OFFIX_DND */
1422 break;
1423
1424 case MappingNotify:
1425 XRefreshKeyboardMapping (&ev.xmapping);
1426 break; 1452 break;
1427 1453
1428 /* 1454 /*
1429 * XXX: this is not the _current_ arrangement 1455 * XXX: this is not the _current_ arrangement
1430 * Here's my conclusion: 1456 * Here's my conclusion:
… …
1449 break; 1475 break;
1450 } 1476 }
1451 break; 1477 break;
1452 1478
1453 case FocusIn: 1479 case FocusIn:
1480 if (ev.xfocus.detail != NotifyInferior
1481 && ev.xfocus.detail != NotifyPointer
1482 && ev.xfocus.mode != NotifyGrab)
1454 focus_in (); 1483 focus_in ();
1455 break; 1484 break;
1456 1485
1457 case FocusOut: 1486 case FocusOut:
1487 if (ev.xfocus.detail != NotifyInferior
1488 && ev.xfocus.detail != NotifyPointer
1489 && ev.xfocus.mode != NotifyGrab)
1458 focus_out (); 1490 focus_out ();
1459 break; 1491 break;
1460 1492
1461 case ConfigureNotify: 1493 case ConfigureNotify:
1462 if (ev.xconfigure.window == parent[0]) 1494 if (ev.xconfigure.window == parent)
1463 { 1495 {
1464 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1496 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1465 ; 1497 ;
1498
1499 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1500
1501 if (want_position_change)
1502 {
1503 int x, y;
1504
1505 if (ev.xconfigure.send_event)
1506 {
1507 x = ev.xconfigure.x;
1508 y = ev.xconfigure.y;
1509 }
1510 else
1511 get_window_origin (x, y);
1512
1513 if (x != parent_x || y != parent_y)
1514 {
1515 parent_x = x;
1516 parent_y = y;
1517 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1518 }
1519 }
1466 1520
1467 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1521 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1468 { 1522 {
1469 seen_resize = 1; 1523 seen_resize = 1;
1470 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1524 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1471 } 1525 }
1472 1526
1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1527 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1474 if (OPTION (Opt_transparent))
1475 check_our_parents ();
1476#endif
1477 } 1528 }
1478 break; 1529 break;
1479 1530
1480 case PropertyNotify: 1531 case PropertyNotify:
1481 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1532 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1482 && ev.xproperty.state == PropertyNewValue)
1483 selection_property (ev.xproperty.window, ev.xproperty.atom);
1484
1485 break; 1533 break;
1486 1534
1487 case SelectionClear: 1535 case SelectionClear:
1488 selection_clear (); 1536 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1489 break;
1490
1491 case SelectionNotify:
1492 if (selection_wait == Sel_normal)
1493 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1494 break; 1537 break;
1495 1538
1496 case SelectionRequest: 1539 case SelectionRequest:
1497 selection_send (ev.xselectionrequest); 1540 selection_send (ev.xselectionrequest);
1541 break;
1542
1543 case MapNotify:
1544 mapped = 1;
1545#ifdef TEXT_BLINK
1546 text_blink_ev.start ();
1547#endif
1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1498 break; 1549 break;
1499 1550
1500 case UnmapNotify: 1551 case UnmapNotify:
1501 mapped = 0; 1552 mapped = 0;
1502#ifdef TEXT_BLINK 1553#ifdef TEXT_BLINK
1503 text_blink_ev.stop (); 1554 text_blink_ev.stop ();
1504#endif 1555#endif
1556 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1505 break; 1557 break;
1506
1507 case MapNotify:
1508 mapped = 1;
1509#ifdef TEXT_BLINK
1510 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1511#endif
1512 break;
1513
1514#ifdef TRANSPARENT
1515 case ReparentNotify:
1516 rootwin_cb (ev);
1517 break;
1518#endif /* TRANSPARENT */
1519 1558
1520 case GraphicsExpose: 1559 case GraphicsExpose:
1521 case Expose: 1560 case Expose:
1522 if (ev.xany.window == vt) 1561 if (ev.xany.window == vt)
1523 { 1562 {
1524 do 1563 do
1564 {
1525 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1526 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, false);
1567 }
1527 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1568 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1528 1569
1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1530 1571
1531 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1573 {
1532 scr_expose (ev.xexpose.x, ev.xexpose.y, 1574 scr_expose (ev.xexpose.x, ev.xexpose.y,
1533 ev.xexpose.width, ev.xexpose.height, False); 1575 ev.xexpose.width, ev.xexpose.height, false);
1576 }
1534 1577
1535 scr_refresh (refresh_type); 1578 want_refresh = 1;
1536 } 1579 }
1537 else 1580 else
1538 { 1581 {
1539 XEvent unused_event; 1582 XEvent unused_event;
1540 1583
1541 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1584 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1542 ; 1585 ;
1543 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1544 ; 1587 ;
1545 1588
1546 if (isScrollbarWindow (ev.xany.window)) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1547 { 1590 {
1548 scrollBar.setIdle (); 1591 scrollBar.state = SB_STATE_IDLE;
1549 scrollbar_show (0); 1592 scrollBar.show (0);
1550 } 1593 }
1551#ifdef MENUBAR
1552 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1553 menubar_expose ();
1554#endif
1555
1556#ifdef TRANSPARENT
1557 if (am_transparent && ev.xany.window == parent[0])
1558 XClearWindow (disp, ev.xany.window);
1559#endif
1560 } 1594 }
1561 break; 1595 break;
1562 1596
1563 case MotionNotify: 1597 case MotionNotify:
1564#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1565 if (hidden_pointer) 1599 if (hidden_pointer)
1566 pointer_unblank (); 1600 pointer_unblank ();
1567#endif 1601#endif
1568#if MENUBAR 1602 if (!bypass_keystate
1569 if (isMenuBarWindow (ev.xany.window)) 1603 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1570 { 1604 || priv_modes & PrivMode_MouseAnyEvent))
1571 menubar_control (ev.xbutton); 1605 mouse_report (ev.xbutton);
1572 break;
1573 }
1574#endif
1575 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1606 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1576 break; 1607 break;
1577 1608
1578 if (ev.xany.window == vt) 1609 if (ev.xany.window == vt)
1579 { 1610 {
1611 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1612 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1613 ; // nop
1580 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1614 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1581 { 1615 {
1582 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1616 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1583 ; 1617 ;
1584 1618
1585 XQueryPointer (disp, vt, 1619 XQueryPointer (dpy, vt,
1586 &unused_root, &unused_child, 1620 &unused_root, &unused_child,
1587 &unused_root_x, &unused_root_y, 1621 &unused_root_x, &unused_root_y,
1588 &ev.xbutton.x, &ev.xbutton.y, 1622 &ev.xbutton.x, &ev.xbutton.y,
1589 &ev.xbutton.state); 1623 &ev.xbutton.state);
1590#ifdef MOUSE_THRESHOLD 1624#ifdef MOUSE_THRESHOLD
1591 /* deal with a `jumpy' mouse */ 1625 /* deal with a `jumpy' mouse */
1592 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1626 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1627#endif
1593 { 1628 {
1594#endif
1595#if ISO_14755 1629#if ISO_14755
1596 // 5.4 1630 // 5.4
1597 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1631 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1598 { 1632 {
1599 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1633 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1605 1639
1606#ifdef SELECTION_SCROLLING 1640#ifdef SELECTION_SCROLLING
1607 if (ev.xbutton.y < int_bwidth 1641 if (ev.xbutton.y < int_bwidth
1608 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1642 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1609 { 1643 {
1644 page_dirn scroll_selection_dir;
1610 int dist; 1645 int dist;
1611 1646
1612 /* don't clobber the current delay if we are 1647 /* don't clobber the current delay if we are
1613 * already in the middle of scrolling. 1648 * already in the middle of scrolling.
1614 */ 1649 */
1615 if (!sel_scroll_ev.active) 1650 if (!sel_scroll_ev.is_active ())
1616 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1651 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1617 1652
1618 /* save the event params so we can highlight 1653 /* save the event params so we can highlight
1619 * the selection in the pending-scroll loop 1654 * the selection in the pending-scroll loop
1620 */ 1655 */
1621 selection_save_x = ev.xbutton.x; 1656 selection_save_x = ev.xbutton.x;
… …
1629 dist = int_bwidth - ev.xbutton.y; 1664 dist = int_bwidth - ev.xbutton.y;
1630 } 1665 }
1631 else 1666 else
1632 { 1667 {
1633 scroll_selection_dir = DN; 1668 scroll_selection_dir = DN;
1634 dist = ev.xbutton.y - (int_bwidth + height); 1669 dist = ev.xbutton.y - (int_bwidth + vt_height);
1635 } 1670 }
1636 1671
1637 scroll_selection_lines = Pixel2Height (dist) 1672 scroll_selection_lines = Pixel2Height (dist)
1638 / SELECTION_SCROLL_LINE_SPEEDUP 1673 / SELECTION_SCROLL_LINE_SPEEDUP
1639 + 1; 1674 + 1;
1640 min_it (scroll_selection_lines, 1675 min_it (scroll_selection_lines,
1641 SELECTION_SCROLL_MAX_LINES); 1676 SELECTION_SCROLL_MAX_LINES);
1677 scroll_selection_lines *= scroll_selection_dir;
1642 } 1678 }
1643 else 1679 else
1644 { 1680 {
1645 /* we are within the text window, so we 1681 /* we are within the text window, so we
1646 * shouldn't be scrolling 1682 * shouldn't be scrolling
1647 */ 1683 */
1648 if (sel_scroll_ev.active)
1649 sel_scroll_ev.stop(); 1684 sel_scroll_ev.stop();
1650 } 1685 }
1651#endif 1686#endif
1652#ifdef MOUSE_THRESHOLD
1653 } 1687 }
1654#endif
1655 } 1688 }
1656 } 1689 }
1657 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1658 { 1691 {
1659 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1660 MotionNotify, &ev)) 1693 MotionNotify, &ev))
1661 ; 1694 ;
1662 1695
1663 XQueryPointer (disp, scrollBar.win, 1696 XQueryPointer (dpy, scrollBar.win,
1664 &unused_root, &unused_child, 1697 &unused_root, &unused_child,
1665 &unused_root_x, &unused_root_y, 1698 &unused_root_x, &unused_root_y,
1666 &ev.xbutton.x, &ev.xbutton.y, 1699 &ev.xbutton.x, &ev.xbutton.y,
1667 &unused_mask); 1700 &unused_mask);
1668 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1701 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1669 scrollbar_size ()); 1702 scrollBar.size ());
1670 scr_refresh (refresh_type);
1671 refresh_limit = 0; 1703 want_refresh = 1;
1672 scrollbar_show (1); 1704 scrollBar.show (1);
1673 } 1705 }
1674 break; 1706 break;
1675 } 1707 }
1676}
1677 1708
1678void 1709#if defined(CURSOR_BLINK)
1710 if (ev.type == KeyPress)
1711 cursor_blink_reset ();
1712#endif
1713
1714#if defined(POINTER_BLANK)
1715 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1716 {
1717 if (ev.type == MotionNotify
1718 || ev.type == ButtonPress
1719 || ev.type == ButtonRelease)
1720 if (hidden_pointer)
1721 pointer_unblank ();
1722
1723 if (ev.type == KeyPress && hidden_pointer == 0)
1724 pointer_blank ();
1725 }
1726#endif
1727
1728 refresh_check ();
1729}
1730
1731#if ENABLE_FRILLS
1732void ecb_cold
1733rxvt_term::set_urgency (bool enable)
1734{
1735 if (enable == urgency_hint)
1736 return;
1737
1738 if (XWMHints *h = XGetWMHints (dpy, parent))
1739 {
1740 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1741 XSetWMHints (dpy, parent, h);
1742 urgency_hint = enable;
1743 XFree (h);
1744 }
1745}
1746#endif
1747
1748void ecb_cold
1679rxvt_term::focus_in () 1749rxvt_term::focus_in ()
1680{ 1750{
1681 if (!focus) 1751 if (!focus)
1682 { 1752 {
1683 focus = 1; 1753 focus = 1;
1684 want_refresh = 1; 1754 want_refresh = 1;
1755
1685#if USE_XIM 1756#if USE_XIM
1686 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1687 { 1758 {
1688 IMSetStatusPosition (); 1759 im_set_position ();
1689 XSetICFocus (Input_Context); 1760 XSetICFocus (Input_Context);
1690 } 1761 }
1691#endif 1762#endif
1692#if CURSOR_BLINK 1763#if CURSOR_BLINK
1693 if (OPTION (Opt_cursorBlink)) 1764 if (option (Opt_cursorBlink))
1694 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1765 cursor_blink_ev.again ();
1695#endif 1766#endif
1696#if OFF_FOCUS_FADING 1767#if OFF_FOCUS_FADING
1697 if (rs[Rs_fade]) 1768 if (rs[Rs_fade])
1698 { 1769 {
1699 pix_colors = pix_colors_focused; 1770 pix_colors = pix_colors_focused;
1700 scr_recolour (); 1771 scr_recolor ();
1701 } 1772 }
1702#endif 1773#endif
1703 } 1774#if ENABLE_FRILLS
1704} 1775 if (option (Opt_urgentOnBell))
1776 set_urgency (0);
1705 1777
1706void 1778 if (priv_modes & PrivMode_FocusEvent)
1779 tt_printf ("\x1b[I");
1780#endif
1781
1782 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1783 }
1784}
1785
1786void ecb_cold
1707rxvt_term::focus_out () 1787rxvt_term::focus_out ()
1708{ 1788{
1709 if (focus) 1789 if (focus)
1710 { 1790 {
1711 focus = 0; 1791 focus = 0;
1712 want_refresh = 1; 1792 want_refresh = 1;
1713 1793
1794#if ENABLE_FRILLS
1795 if (option (Opt_urgentOnBell))
1796 set_urgency (0);
1797
1798 if (priv_modes & PrivMode_FocusEvent)
1799 tt_printf ("\x1b[O");
1800#endif
1714#if ENABLE_FRILLS || ISO_14755 1801#if ENABLE_FRILLS || ISO_14755
1802 if (iso14755buf)
1803 {
1715 iso14755buf = 0; 1804 iso14755buf = 0;
1716#endif 1805# if ISO_14755
1717#if ENABLE_OVERLAY
1718 scr_overlay_off (); 1806 scr_overlay_off ();
1807# endif
1808 }
1719#endif 1809#endif
1720#if USE_XIM 1810#if USE_XIM
1721 if (Input_Context != NULL) 1811 if (Input_Context != NULL)
1722 XUnsetICFocus (Input_Context); 1812 XUnsetICFocus (Input_Context);
1723#endif 1813#endif
1724#if CURSOR_BLINK 1814#if CURSOR_BLINK
1725 if (OPTION (Opt_cursorBlink)) 1815 if (option (Opt_cursorBlink))
1726 cursor_blink_ev.stop (); 1816 cursor_blink_ev.stop ();
1817
1727 hidden_cursor = 0; 1818 hidden_cursor = 0;
1728#endif 1819#endif
1729#if OFF_FOCUS_FADING 1820#if OFF_FOCUS_FADING
1730 if (rs[Rs_fade]) 1821 if (rs[Rs_fade])
1731 { 1822 {
1732 pix_colors = pix_colors_unfocused; 1823 pix_colors = pix_colors_unfocused;
1733 scr_recolour (); 1824 scr_recolor ();
1734 } 1825 }
1735#endif 1826#endif
1827
1828 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1829 }
1830}
1831
1832void ecb_cold
1833rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1834{
1835#if OFF_FOCUS_FADING
1836 if (rs[Rs_fade])
1736 } 1837 {
1737} 1838 if (!first_time)
1839 pix_colors_focused [idx].free (this);
1738 1840
1739#if TRANSPARENT 1841 rgba c;
1740void 1842 pix_colors [Color_fade].get (c);
1843 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1844 }
1845#endif
1846}
1847
1848#if ENABLE_PERL
1849void ecb_hot
1741rxvt_term::rootwin_cb (XEvent &ev) 1850rxvt_term::rootwin_cb (XEvent &ev)
1742{ 1851{
1743 SET_R (this); 1852 make_current ();
1744 SET_LOCALE (locale); 1853
1854 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1855 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1856 return;
1745 1857
1746 switch (ev.type) 1858 switch (ev.type)
1747 { 1859 {
1748 case PropertyNotify: 1860 case PropertyNotify:
1749 /* 1861 /*
1750 * if user used some Esetroot compatible prog to set the root bg, 1862 * if user used some Esetroot compatible prog to set the root bg,
1751 * use the property to determine the pixmap. We use it later on. 1863 * use the property to determine the pixmap. We use it later on.
1752 */ 1864 */
1753 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1865 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1754 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1866 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1755 return; 1867 {
1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1869 }
1756 1870
1757 /* FALLTHROUGH */
1758 case ReparentNotify:
1759 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1760 want_refresh = want_full_refresh = 1;
1761 break; 1871 break;
1762 } 1872 }
1873
1874 refresh_check ();
1763} 1875}
1764#endif 1876#endif
1765 1877
1766void 1878void
1767rxvt_term::button_press (XButtonEvent &ev) 1879rxvt_term::button_press (XButtonEvent &ev)
1768{ 1880{
1769 int reportmode = 0, clickintime; 1881 int reportmode = 0, clickintime;
1770 1882
1771 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1883 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1884
1772 if (!bypass_keystate) 1885 if (!bypass_keystate)
1773 reportmode = !! (priv_modes & PrivMode_mouse_report); 1886 reportmode = !! (priv_modes & PrivMode_mouse_report);
1774 1887
1775 /* 1888 /*
1776 * VT window processing of button press 1889 * VT window processing of button press
1777 */ 1890 */
1778 if (ev.window == vt) 1891 if (ev.window == vt)
1779 { 1892 {
1893 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1894 return;
1895
1780#if ISO_14755 1896#if ISO_14755
1781 // 5.4 1897 // 5.4
1782 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1898 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1783 { 1899 {
1784 iso14755_54 (ev.x, ev.y); 1900 iso14755_54 (ev.x, ev.y);
1785 return; 1901 return;
1786 } 1902 }
1787#endif 1903#endif
1788 1904
1789 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1905 clickintime = ev.time - MEvent.time < multiClickTime;
1790 1906
1791 if (reportmode) 1907 if (reportmode)
1792 { 1908 {
1793 /* mouse report from vt window */ 1909 /* mouse report from vt window */
1794 /* save the xbutton state (for ButtonRelease) */ 1910 /* save the xbutton state (for ButtonRelease) */
1795 MEvent.state = ev.state; 1911 MEvent.state = ev.state;
1796#ifdef MOUSE_REPORT_DOUBLECLICK 1912#ifdef MOUSE_REPORT_DOUBLECLICK
1797 if (ev.button == MEvent.button && clickintime) 1913 if (ev.button == MEvent.button && clickintime)
1798 { 1914 {
1799 /* same button, within alloted time */ 1915 /* same button, within allowed time */
1800 MEvent.clicks++; 1916 MEvent.clicks++;
1917
1801 if (MEvent.clicks > 1) 1918 if (MEvent.clicks > 1)
1802 { 1919 {
1803 /* only report double clicks */ 1920 /* only report double clicks */
1804 MEvent.clicks = 2; 1921 MEvent.clicks = 2;
1805 mouse_report (ev); 1922 mouse_report (ev);
… …
1817 mouse_report (ev); 1934 mouse_report (ev);
1818 } 1935 }
1819#else 1936#else
1820 MEvent.button = ev.button; 1937 MEvent.button = ev.button;
1821 mouse_report (ev); 1938 mouse_report (ev);
1822#endif /* MOUSE_REPORT_DOUBLECLICK */ 1939#endif /* MOUSE_REPORT_DOUBLECLICK */
1823 1940
1824 } 1941 }
1825 else 1942 else
1826 { 1943 {
1827 if (ev.button != MEvent.button) 1944 if (ev.button != MEvent.button)
… …
1837#else 1954#else
1838 selection.rect = false; 1955 selection.rect = false;
1839#endif 1956#endif
1840 1957
1841 /* allow shift+left click to extend selection */ 1958 /* allow shift+left click to extend selection */
1842 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1959 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1843 { 1960 {
1844 if (MEvent.button == Button1 && clickintime) 1961 if (MEvent.button == Button1 && clickintime)
1845 selection_rotate (ev.x, ev.y); 1962 selection_rotate (ev.x, ev.y);
1846 else 1963 else
1847 selection_extend (ev.x, ev.y, 1); 1964 selection_extend (ev.x, ev.y, 1);
… …
1875 } 1992 }
1876 1993
1877 /* 1994 /*
1878 * Scrollbar window processing of button press 1995 * Scrollbar window processing of button press
1879 */ 1996 */
1880 if (isScrollbarWindow (ev.window)) 1997 if (scrollBar.state && ev.window == scrollBar.win)
1881 { 1998 {
1882 scrollBar.setIdle (); 1999 page_dirn direction = NO_DIR;
2000
2001 if (scrollBar.upButton (ev.y))
2002 direction = UP; /* up */
2003 else if (scrollBar.dnButton (ev.y))
2004 direction = DN; /* down */
2005
2006 scrollBar.state = SB_STATE_IDLE;
1883 /* 2007 /*
1884 * Rxvt-style scrollbar: 2008 * Rxvt-style scrollbar:
1885 * move up if mouse is above slider 2009 * move up if mouse is above slider
1886 * move dn if mouse is below slider 2010 * move dn if mouse is below slider
1887 * 2011 *
… …
1896 /* 2020 /*
1897 * Mouse report disabled scrollbar: 2021 * Mouse report disabled scrollbar:
1898 * arrow buttons - send up/down 2022 * arrow buttons - send up/down
1899 * click on scrollbar - send pageup/down 2023 * click on scrollbar - send pageup/down
1900 */ 2024 */
1901 if ((scrollBar.style == R_SB_NEXT 2025 if (direction == UP)
1902 && scrollbarnext_upButton (ev.y))
1903 || (scrollBar.style == R_SB_RXVT
1904 && scrollbarrxvt_upButton (ev.y)))
1905 tt_printf ("\033[A"); 2026 tt_printf ("\033[A");
1906 else if ((scrollBar.style == R_SB_NEXT 2027 else if (direction == DN)
1907 && scrollbarnext_dnButton (ev.y))
1908 || (scrollBar.style == R_SB_RXVT
1909 && scrollbarrxvt_dnButton (ev.y)))
1910 tt_printf ("\033[B"); 2028 tt_printf ("\033[B");
1911 else 2029 else
1912 switch (ev.button) 2030 switch (ev.button)
1913 { 2031 {
1914 case Button2: 2032 case Button2:
… …
1921 tt_printf ("\033[5~"); 2039 tt_printf ("\033[5~");
1922 break; 2040 break;
1923 } 2041 }
1924 } 2042 }
1925 else 2043 else
1926#endif /* NO_SCROLLBAR_REPORT */ 2044#endif /* NO_SCROLLBAR_REPORT */
1927
1928 {
1929 char upordown = 0;
1930
1931 if (scrollBar.style == R_SB_NEXT)
1932 { 2045 {
1933 if (scrollbarnext_upButton (ev.y)) 2046 if (direction != NO_DIR)
1934 upordown = -1; /* up */
1935 else if (scrollbarnext_dnButton (ev.y))
1936 upordown = 1; /* down */
1937 }
1938 else if (scrollBar.style == R_SB_RXVT)
1939 {
1940 if (scrollbarrxvt_upButton (ev.y))
1941 upordown = -1; /* up */
1942 else if (scrollbarrxvt_dnButton (ev.y))
1943 upordown = 1; /* down */
1944 }
1945 if (upordown)
1946 { 2047 {
1947#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2048#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2049 if (!cont_scroll_ev.is_active ())
1948 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2050 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1949#endif 2051#endif
1950 if (scr_page (upordown < 0 ? UP : DN, 1)) 2052 if (scr_page (direction, 1))
1951 { 2053 {
1952 if (upordown < 0) 2054 if (direction == UP)
1953 scrollBar.setUp (); 2055 scrollBar.state = SB_STATE_UP;
1954 else 2056 else
1955 scrollBar.setDn (); 2057 scrollBar.state = SB_STATE_DOWN;
1956 } 2058 }
1957 } 2059 }
1958 else 2060 else
1959 switch (ev.button) 2061 switch (ev.button)
1960 { 2062 {
1961 case Button2: 2063 case Button2:
1962 switch (scrollbar_align) 2064 switch (scrollBar.align)
1963 { 2065 {
1964 case R_SB_ALIGN_TOP: 2066 case SB_ALIGN_TOP:
1965 csrO = 0; 2067 csrO = 0;
1966 break; 2068 break;
1967 case R_SB_ALIGN_CENTRE: 2069 case SB_ALIGN_CENTRE:
1968 csrO = (scrollBar.bot - scrollBar.top) / 2; 2070 csrO = (scrollBar.bot - scrollBar.top) / 2;
1969 break; 2071 break;
1970 case R_SB_ALIGN_BOTTOM: 2072 case SB_ALIGN_BOTTOM:
1971 csrO = scrollBar.bot - scrollBar.top; 2073 csrO = scrollBar.bot - scrollBar.top;
1972 break; 2074 break;
1973 } 2075 }
1974 2076
1975 if (scrollBar.style == R_SB_XTERM 2077 if (scrollBar.style == SB_STYLE_XTERM
1976 || scrollbar_above_slider (ev.y) 2078 || scrollBar.above_slider (ev.y)
1977 || scrollbar_below_slider (ev.y)) 2079 || scrollBar.below_slider (ev.y))
1978 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2080 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
1979 2081
1980 scrollBar.setMotion (); 2082 scrollBar.state = SB_STATE_MOTION;
1981 break; 2083 break;
1982 2084
1983 case Button1: 2085 case Button1:
1984 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2086 if (scrollBar.align == SB_ALIGN_CENTRE)
1985 csrO = ev.y - scrollBar.top; 2087 csrO = ev.y - scrollBar.top;
1986 /* FALLTHROUGH */ 2088 /* FALLTHROUGH */
1987 2089
1988 case Button3: 2090 case Button3:
1989 if (scrollBar.style != R_SB_XTERM) 2091 if (scrollBar.style != SB_STYLE_XTERM)
1990 { 2092 {
1991 if (scrollbar_above_slider (ev.y)) 2093 if (scrollBar.above_slider (ev.y))
1992# ifdef RXVT_SCROLL_FULL 2094# ifdef RXVT_SCROLL_FULL
1993 scr_page (UP, nrow - 1); 2095 scr_page (UP, nrow - 1);
1994# else 2096# else
1995 scr_page (UP, nrow / 4); 2097 scr_page (UP, nrow / 4);
1996# endif 2098# endif
1997 else if (scrollbar_below_slider (ev.y)) 2099 else if (scrollBar.below_slider (ev.y))
1998# ifdef RXVT_SCROLL_FULL 2100# ifdef RXVT_SCROLL_FULL
1999 scr_page (DN, nrow - 1); 2101 scr_page (DN, nrow - 1);
2000# else 2102# else
2001 scr_page (DN, nrow / 4); 2103 scr_page (DN, nrow / 4);
2002# endif 2104# endif
2003 else 2105 else
2004 scrollBar.setMotion (); 2106 scrollBar.state = SB_STATE_MOTION;
2005 } 2107 }
2006 else 2108 else
2007 { 2109 {
2008 scr_page ((ev.button == Button1 ? DN : UP), 2110 scr_page ((ev.button == Button1 ? DN : UP),
2009 (nrow 2111 (nrow
2010 * scrollbar_position (ev.y) 2112 * scrollBar.position (ev.y)
2011 / scrollbar_size ())); 2113 / scrollBar.size ()));
2012 } 2114 }
2013 2115
2014 break; 2116 break;
2015 } 2117 }
2016 } 2118 }
2119
2017 return; 2120 return;
2018 } 2121 }
2019#if MENUBAR
2020 /*
2021 * Menubar window processing of button press
2022 */
2023 if (isMenuBarWindow (ev.window))
2024 menubar_control (ev);
2025#endif
2026} 2122}
2027 2123
2028void 2124void
2029rxvt_term::button_release (XButtonEvent &ev) 2125rxvt_term::button_release (XButtonEvent &ev)
2030{ 2126{
… …
2032 2128
2033 csrO = 0; /* reset csr Offset */ 2129 csrO = 0; /* reset csr Offset */
2034 if (!bypass_keystate) 2130 if (!bypass_keystate)
2035 reportmode = !! (priv_modes & PrivMode_mouse_report); 2131 reportmode = !! (priv_modes & PrivMode_mouse_report);
2036 2132
2037 if (scrollbar_isUpDn ()) 2133 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2038 { 2134 {
2039 scrollBar.setIdle (); 2135 scrollBar.state = SB_STATE_IDLE;
2040 scrollbar_show (0); 2136 scrollBar.show (0);
2041#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2042 refresh_type &= ~SMOOTH_REFRESH;
2043#endif
2044 } 2137 }
2045 2138
2046#ifdef SELECTION_SCROLLING 2139#ifdef SELECTION_SCROLLING
2047 if (sel_scroll_ev.active)
2048 sel_scroll_ev.stop(); 2140 sel_scroll_ev.stop();
2049#endif 2141#endif
2050 2142
2051 if (ev.window == vt) 2143 if (ev.window == vt)
2052 { 2144 {
2145 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2146 return;
2147
2053#if ISO_14755 2148#if ISO_14755
2054 // 5.4 2149 // 5.4
2055 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2150 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2056 return; 2151 return;
2057#endif 2152#endif
2153
2058 if (reportmode) 2154 if (reportmode)
2059 { 2155 {
2060 /* mouse report from vt window */ 2156 /* mouse report from vt window */
2061 /* don't report release of wheel "buttons" */ 2157 /* don't report release of wheel "buttons" */
2062 if (ev.button >= 4) 2158 if (ev.button >= 4 && ev.button <= 7)
2063 return; 2159 return;
2064#ifdef MOUSE_REPORT_DOUBLECLICK 2160#ifdef MOUSE_REPORT_DOUBLECLICK
2065 /* only report the release of 'slow' single clicks */ 2161 /* only report the release of 'slow' single clicks */
2066 if (MEvent.button != AnyButton 2162 if (MEvent.button != AnyButton
2067 && (ev.button != MEvent.button 2163 && (ev.button != MEvent.button
2068 || (ev.time - MEvent.time 2164 || (ev.time - MEvent.time
2069 > MULTICLICK_TIME / 2))) 2165 > multiClickTime / 2)))
2070 { 2166 {
2071 MEvent.clicks = 0; 2167 MEvent.clicks = 0;
2072 MEvent.button = AnyButton; 2168 MEvent.button = ev.button;
2073 mouse_report (ev); 2169 mouse_report (ev);
2074 } 2170 }
2075#else /* MOUSE_REPORT_DOUBLECLICK */ 2171#else /* MOUSE_REPORT_DOUBLECLICK */
2076 MEvent.button = AnyButton; 2172 MEvent.button = ev.button;
2077 mouse_report (ev); 2173 mouse_report (ev);
2078#endif /* MOUSE_REPORT_DOUBLECLICK */ 2174#endif /* MOUSE_REPORT_DOUBLECLICK */
2079 return; 2175 return;
2080 } 2176 }
2081 2177
2082 /* 2178 /*
2083 * dumb hack to compensate for the failure of click-and-drag 2179 * dumb hack to compensate for the failure of click-and-drag
… …
2092 { 2188 {
2093 case Button1: 2189 case Button1:
2094 case Button3: 2190 case Button3:
2095 selection_make (ev.time); 2191 selection_make (ev.time);
2096 break; 2192 break;
2193
2097 case Button2: 2194 case Button2:
2098 selection_request (ev.time, ev.x, ev.y); 2195 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2196 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2099 break; 2197 break;
2198
2100#ifdef MOUSE_WHEEL 2199#ifdef MOUSE_WHEEL
2101 case Button4: 2200 case Button4:
2102 case Button5: 2201 case Button5:
2103 { 2202 {
2104 int i; 2203 int lines;
2105 page_dirn v; 2204 page_dirn dirn;
2106 2205
2107 v = ev.button == Button4 ? UP : DN; 2206 dirn = ev.button == Button4 ? UP : DN;
2108 2207
2109 if (ev.state & ShiftMask) 2208 if (ev.state & ShiftMask)
2110 i = 1; 2209 lines = 1;
2111 else if (OPTION (Opt_mouseWheelScrollPage)) 2210 else if (option (Opt_mouseWheelScrollPage))
2112 i = nrow - 1; 2211 lines = nrow - 1;
2113 else 2212 else
2114 i = 5; 2213 lines = 5;
2115 2214
2116# ifdef MOUSE_SLIP_WHEELING 2215# ifdef MOUSE_SLIP_WHEELING
2117 if (ev.state & ControlMask) 2216 if (ev.state & ControlMask)
2118 { 2217 {
2119 mouse_slip_wheel_speed += v ? -1 : 1; 2218 mouse_slip_wheel_speed += dirn;
2120 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2219 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2121 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2122 2220
2123 if (slip_wheel_ev.at < NOW) 2221 if (!slip_wheel_ev.is_active ())
2124 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2222 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2125
2126 slip_wheel_ev.start ();
2127 } 2223 }
2128 else 2224 else
2225# endif
2129 { 2226 {
2130# endif
2131# ifdef JUMP_MOUSE_WHEEL
2132 scr_page (v, i); 2227 scr_page (dirn, lines);
2133 scr_refresh (SMOOTH_REFRESH);
2134 scrollbar_show (1); 2228 scrollBar.show (1);
2135# else
2136 while (i--)
2137 {
2138 scr_page (v, 1);
2139 scr_refresh (SMOOTH_REFRESH);
2140 scrollbar_show (1);
2141 }
2142# endif
2143# ifdef MOUSE_SLIP_WHEELING
2144 } 2229 }
2145#endif
2146 } 2230 }
2147 break; 2231 break;
2148#endif 2232#endif
2149 } 2233 }
2150 } 2234 }
2151#ifdef MENUBAR
2152 else if (isMenuBarWindow (ev.window))
2153 menubar_control (ev);
2154#endif
2155} 2235}
2156
2157#ifdef TRANSPARENT
2158#if TINTING
2159/* taken from aterm-0.4.2 */
2160
2161typedef uint32_t RUINT32T;
2162
2163void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2164{
2165 int sh_r, sh_g, sh_b;
2166 RUINT32T mask_r, mask_g, mask_b;
2167 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2168 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2169 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2170 int i;
2171
2172 Visual *visual = display->visual;
2173
2174 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2175
2176 /* for convenience */
2177 mask_r = visual->red_mask;
2178 mask_g = visual->green_mask;
2179 mask_b = visual->blue_mask;
2180
2181 /* boring lookup table pre-initialization */
2182 switch (srcImage->bits_per_pixel) {
2183 case 15:
2184 if ((mask_r != 0x7c00) ||
2185 (mask_g != 0x03e0) ||
2186 (mask_b != 0x001f))
2187 return;
2188 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2189 lookup_r = lookup;
2190 lookup_g = lookup+32;
2191 lookup_b = lookup+32+32;
2192 sh_r = 10;
2193 sh_g = 5;
2194 sh_b = 0;
2195 break;
2196 case 16:
2197 if ((mask_r != 0xf800) ||
2198 (mask_g != 0x07e0) ||
2199 (mask_b != 0x001f))
2200 return;
2201 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2202 lookup_r = lookup;
2203 lookup_g = lookup+32;
2204 lookup_b = lookup+32+64;
2205 sh_r = 11;
2206 sh_g = 5;
2207 sh_b = 0;
2208 break;
2209 case 24:
2210 if ((mask_r != 0xff0000) ||
2211 (mask_g != 0x00ff00) ||
2212 (mask_b != 0x0000ff))
2213 return;
2214 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2215 lookup_r = lookup;
2216 lookup_g = lookup+256;
2217 lookup_b = lookup+256+256;
2218 sh_r = 16;
2219 sh_g = 8;
2220 sh_b = 0;
2221 break;
2222 case 32:
2223 if ((mask_r != 0xff0000) ||
2224 (mask_g != 0x00ff00) ||
2225 (mask_b != 0x0000ff))
2226 return;
2227 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2228 lookup_r = lookup;
2229 lookup_g = lookup+256;
2230 lookup_b = lookup+256+256;
2231 sh_r = 16;
2232 sh_g = 8;
2233 sh_b = 0;
2234 break;
2235 default:
2236 return; /* we do not support this color depth */
2237 }
2238
2239 /* prepare limits for color transformation (each channel is handled separately) */
2240 if (shade < 0) {
2241 shade = -shade;
2242 if (shade < 0) shade = 0;
2243 if (shade > 100) shade = 100;
2244
2245 lower_lim_r = 65535-rm;
2246 lower_lim_g = 65535-gm;
2247 lower_lim_b = 65535-bm;
2248
2249 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2250 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2251 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2252
2253 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2254 } else {
2255 if (shade < 0) shade = 0;
2256 if (shade > 100) shade = 100;
2257
2258 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2259
2260 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2261 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2262 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2263 }
2264
2265 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2266 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2267 {
2268 unsigned int tmp;
2269
2270 tmp = lower_lim_r;
2271 lower_lim_r = lower_lim_b;
2272 lower_lim_b = tmp;
2273
2274 tmp = upper_lim_r;
2275 upper_lim_r = upper_lim_b;
2276 upper_lim_b = tmp;
2277 }
2278
2279 /* fill our lookup tables */
2280 for (i = 0; i <= mask_r>>sh_r; i++)
2281 {
2282 RUINT32T tmp;
2283 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2284 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2285 lookup_r[i] = (tmp/65535)<<sh_r;
2286 }
2287 for (i = 0; i <= mask_g>>sh_g; i++)
2288 {
2289 RUINT32T tmp;
2290 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2291 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2292 lookup_g[i] = (tmp/65535)<<sh_g;
2293 }
2294 for (i = 0; i <= mask_b>>sh_b; i++)
2295 {
2296 RUINT32T tmp;
2297 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2298 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2299 lookup_b[i] = (tmp/65535)<<sh_b;
2300 }
2301
2302 /* apply table to input image (replacing colors by newly calculated ones) */
2303 switch (srcImage->bits_per_pixel)
2304 {
2305 case 15:
2306 {
2307 unsigned short *p1, *pf, *p, *pl;
2308 p1 = (unsigned short *) srcImage->data;
2309 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2310 while (p1 < pf)
2311 {
2312 p = p1;
2313 pl = p1 + srcImage->width;
2314 for (; p < pl; p++)
2315 {
2316 *p = lookup_r[(*p & 0x7c00)>>10] |
2317 lookup_g[(*p & 0x03e0)>> 5] |
2318 lookup_b[(*p & 0x001f)];
2319 }
2320 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2321 }
2322 break;
2323 }
2324 case 16:
2325 {
2326 unsigned short *p1, *pf, *p, *pl;
2327 p1 = (unsigned short *) srcImage->data;
2328 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2329 while (p1 < pf)
2330 {
2331 p = p1;
2332 pl = p1 + srcImage->width;
2333 for (; p < pl; p++)
2334 {
2335 *p = lookup_r[(*p & 0xf800)>>11] |
2336 lookup_g[(*p & 0x07e0)>> 5] |
2337 lookup_b[(*p & 0x001f)];
2338 }
2339 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2340 }
2341 break;
2342 }
2343 case 24:
2344 {
2345 unsigned char *p1, *pf, *p, *pl;
2346 p1 = (unsigned char *) srcImage->data;
2347 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2348 while (p1 < pf)
2349 {
2350 p = p1;
2351 pl = p1 + srcImage->width * 3;
2352 for (; p < pl; p += 3)
2353 {
2354 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2355 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2356 p[2] = lookup_r[(p[2] & 0x0000ff)];
2357 }
2358 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2359 }
2360 break;
2361 }
2362 case 32:
2363 {
2364 RUINT32T *p1, *pf, *p, *pl;
2365 p1 = (RUINT32T *) srcImage->data;
2366 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2367
2368 while (p1 < pf)
2369 {
2370 p = p1;
2371 pl = p1 + srcImage->width;
2372 for (; p < pl; p++)
2373 {
2374 *p = lookup_r[(*p & 0xff0000)>>16] |
2375 lookup_g[(*p & 0x00ff00)>> 8] |
2376 lookup_b[(*p & 0x0000ff)] |
2377 (*p & ~0xffffff);
2378 }
2379 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2380 }
2381 break;
2382 }
2383 }
2384
2385 free (lookup);
2386}
2387#endif
2388
2389/*
2390 * Check our parents are still who we think they are.
2391 * Do transparency updates if required
2392 */
2393int
2394rxvt_term::check_our_parents ()
2395{
2396 int i, pchanged, aformat, have_pixmap, rootdepth;
2397 unsigned long nitems, bytes_after;
2398 Atom atype;
2399 unsigned char *prop = NULL;
2400 Window root, oldp, *list;
2401 Pixmap rootpixmap = None;
2402 XWindowAttributes wattr, wrootattr;
2403 dDisp;
2404
2405 pchanged = 0;
2406
2407 if (!OPTION (Opt_transparent))
2408 return pchanged; /* Don't try any more */
2409
2410 XGetWindowAttributes (disp, display->root, &wrootattr);
2411 rootdepth = wrootattr.depth;
2412
2413 XGetWindowAttributes (disp, parent[0], &wattr);
2414
2415 if (rootdepth != wattr.depth)
2416 {
2417 if (am_transparent)
2418 {
2419 pchanged = 1;
2420 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2421 am_transparent = am_pixmap_trans = 0;
2422 }
2423
2424 return pchanged; /* Don't try any more */
2425 }
2426
2427 /* Get all X ops out of the queue so that our information is up-to-date. */
2428 XSync (disp, False);
2429
2430 /*
2431 * Make the frame window set by the window manager have
2432 * the root background. Some window managers put multiple nested frame
2433 * windows for each client, so we have to take care about that.
2434 */
2435 i = (xa[XA_XROOTPMAP_ID]
2436 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2437 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2438 &nitems, &bytes_after, &prop) == Success);
2439
2440 if (!i || prop == NULL)
2441 i = (xa[XA_ESETROOT_PMAP_ID]
2442 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2443 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2444 &nitems, &bytes_after, &prop) == Success);
2445
2446 if (!i || prop == NULL
2447#if TINTING
2448 || !rs[Rs_color + Color_tint]
2449#endif
2450 )
2451 have_pixmap = 0;
2452 else
2453 {
2454 have_pixmap = 1;
2455 rootpixmap = *(Pixmap *)prop;
2456 XFree (prop);
2457 }
2458
2459 if (have_pixmap)
2460 {
2461 /*
2462 * Copy display->root pixmap transparency
2463 */
2464 int sx, sy, nx, ny;
2465 unsigned int nw, nh;
2466 Window cr;
2467 XImage *image;
2468 GC gc;
2469 XGCValues gcvalue;
2470
2471 XTranslateCoordinates (disp, parent[0], display->root,
2472 0, 0, &sx, &sy, &cr);
2473 nw = (unsigned int)szHint.width;
2474 nh = (unsigned int)szHint.height;
2475 nx = ny = 0;
2476
2477 if (sx < 0)
2478 {
2479 nw += sx;
2480 nx = -sx;
2481 sx = 0;
2482 }
2483
2484 if (sy < 0)
2485 {
2486 nh += sy;
2487 ny = -sy;
2488 sy = 0;
2489 }
2490
2491 min_it (nw, (unsigned int) (wrootattr.width - sx));
2492 min_it (nh, (unsigned int) (wrootattr.height - sy));
2493
2494 XSync (disp, False);
2495 allowedxerror = -1;
2496 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2497
2498 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2499 /* XXX: may need a delay here? */
2500 allowedxerror = 0;
2501
2502 if (image == NULL)
2503 {
2504 if (am_transparent && am_pixmap_trans)
2505 {
2506 pchanged = 1;
2507 if (pixmap != None)
2508 {
2509 XFreePixmap (disp, pixmap);
2510 pixmap = None;
2511 }
2512 }
2513
2514 am_pixmap_trans = 0;
2515 }
2516 else
2517 {
2518 if (pixmap != None)
2519 XFreePixmap (disp, pixmap);
2520
2521#if TINTING
2522 if (ISSET_PIXCOLOR (Color_tint))
2523 {
2524 unsigned short rm, gm, bm;
2525 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2526
2527 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2528
2529 ShadeXImage (display, image, shade, rm, gm, bm);
2530 }
2531#endif
2532
2533 pixmap = XCreatePixmap (disp, vt,
2534 szHint.width, szHint.height, image->depth);
2535 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2536 XPutImage (disp, pixmap, gc, image, 0, 0,
2537 nx, ny, image->width, image->height);
2538 XFreeGC (disp, gc);
2539 XDestroyImage (image);
2540 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2541 XClearWindow (disp, parent[0]);
2542
2543 if (!am_transparent || !am_pixmap_trans)
2544 pchanged = 1;
2545
2546 am_transparent = am_pixmap_trans = 1;
2547 }
2548 }
2549
2550 if (am_pixmap_trans)
2551 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2552 else
2553 {
2554 unsigned int n;
2555 /*
2556 * InheritPixmap transparency
2557 */
2558 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2559 {
2560 oldp = parent[i];
2561 XQueryTree (disp, parent[i - 1], &root,
2562 &parent[i], &list, &n);
2563 XFree (list);
2564
2565 if (parent[i] == display->root)
2566 {
2567 if (oldp != None)
2568 pchanged = 1;
2569
2570 break;
2571 }
2572
2573 if (oldp != parent[i])
2574 pchanged = 1;
2575 }
2576
2577 n = 0;
2578
2579 if (pchanged)
2580 {
2581 for (; n < (unsigned int)i; n++)
2582 {
2583 XGetWindowAttributes (disp, parent[n], &wattr);
2584 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2585 {
2586 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2587 break;
2588 }
2589 }
2590 }
2591
2592 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2593 {
2594 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2595 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2596 am_transparent = 0;
2597 /* XXX: also turn off Opt_transparent? */
2598 }
2599 else
2600 {
2601#if WAIT_FOR_WM
2602 /* wait (an arbitrary period) for the WM to do its thing
2603 * needed for fvwm2.2.2 (and before?) */
2604 sleep (1);
2605#endif
2606 for (n = 0; n < (unsigned int)i; n++)
2607 {
2608 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2609 XClearWindow (disp, parent[n]);
2610 }
2611
2612 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2613 am_transparent = 1;
2614 }
2615
2616 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2617 parent[i] = None;
2618 }
2619
2620 if (scrollBar.win)
2621 {
2622 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2623 scrollBar.setIdle ();
2624 scrollbar_show (0);
2625 }
2626
2627 if (am_transparent)
2628 {
2629 want_refresh = want_full_refresh = 1;
2630 if (am_pixmap_trans)
2631 flush ();
2632 }
2633
2634 return pchanged;
2635}
2636#endif
2637 2236
2638/*}}} */ 2237/*}}} */
2639 2238
2640bool 2239void ecb_hot
2641rxvt_term::cmd_parse () 2240rxvt_term::cmd_parse ()
2642{ 2241{
2643 bool flag = false;
2644 unicode_t ch = NOCHAR; 2242 wchar_t ch = NOCHAR;
2645 unsigned char *seq_begin; // remember start of esc-sequence here 2243 char *seq_begin; // remember start of esc-sequence here
2646 2244
2647 for (;;) 2245 for (;;)
2648 { 2246 {
2649 if (ch == NOCHAR) 2247 if (ecb_unlikely (ch == NOCHAR))
2650 { 2248 {
2651 seq_begin = cmdbuf_ptr; 2249 seq_begin = cmdbuf_ptr;
2652 ch = next_char (); 2250 ch = next_char ();
2653 }
2654 2251
2655 if (ch == NOCHAR) // TODO: improve 2252 if (ch == NOCHAR)
2656 break; 2253 break;
2254 }
2657 2255
2658 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2256 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2659 { 2257 {
2660 if (!seen_input) 2258 if (ecb_unlikely (!seen_input))
2661 { 2259 {
2662 seen_input = 1; 2260 seen_input = 1;
2663 // many badly-written programs (e.g. jed) contain a race condition: 2261 // many badly-written programs (e.g. jed) contain a race condition:
2664 // they first read the screensize and then install a SIGWINCH handler. 2262 // they first read the screensize and then install a SIGWINCH handler.
2665 // some window managers resize the window early, and these programs 2263 // some window managers resize the window early, and these programs
… …
2670 if (seen_resize && cmd_pid) 2268 if (seen_resize && cmd_pid)
2671 kill (-cmd_pid, SIGWINCH); 2269 kill (-cmd_pid, SIGWINCH);
2672 } 2270 }
2673 2271
2674 /* Read a text string from the input buffer */ 2272 /* Read a text string from the input buffer */
2675 unicode_t buf[UBUFSIZ]; 2273 wchar_t buf[UBUFSIZ];
2676 bool refreshnow = false; 2274 bool refreshnow = false;
2677 int nlines = 0; 2275 int nlines = 0;
2678 unicode_t *str = buf; 2276 wchar_t *str = buf;
2679 unicode_t *eol = str + min (ncol, UBUFSIZ); 2277 wchar_t *eol = str + min (ncol, UBUFSIZ);
2680 2278
2681 for (;;) 2279 for (;;)
2682 { 2280 {
2683 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2281 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2684 break; 2282 break;
2685 2283
2686 *str++ = ch; 2284 *str++ = ch;
2687 2285
2688 if (ch == C0_LF || str >= eol) 2286 if (ecb_unlikely (ch == C0_LF || str >= eol))
2689 { 2287 {
2690 if (ch == C0_LF) 2288 if (ch == C0_LF)
2691 nlines++; 2289 nlines++;
2692 2290
2693 refresh_count++; 2291 refresh_count++;
2694 2292
2695 if (!OPTION (Opt_jumpScroll) 2293 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2696 || (refresh_count >= refresh_limit * (nrow - 1)))
2697 { 2294 {
2295 refresh_count = 0;
2296
2297 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2298 {
2698 refreshnow = true; 2299 refreshnow = true;
2699 ch = NOCHAR; 2300 ch = NOCHAR;
2700 break; 2301 break;
2302 }
2701 } 2303 }
2702 2304
2703 // scr_add_lines only works for nlines <= nrow - 1. 2305 // scr_add_lines only works for nlines <= nrow - 1.
2704 if (nlines >= nrow - 1) 2306 if (nlines >= nrow - 1)
2705 { 2307 {
2308 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2309 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2706 scr_add_lines (buf, nlines, str - buf); 2310 scr_add_lines (buf, str - buf, nlines);
2311
2707 nlines = 0; 2312 nlines = 0;
2708 str = buf; 2313 str = buf;
2709 eol = str + min (ncol, UBUFSIZ); 2314 eol = str + min (ncol, UBUFSIZ);
2710 } 2315 }
2711 2316
… …
2724 2329
2725 seq_begin = cmdbuf_ptr; 2330 seq_begin = cmdbuf_ptr;
2726 ch = next_char (); 2331 ch = next_char ();
2727 } 2332 }
2728 2333
2334 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2335 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2729 scr_add_lines (buf, nlines, str - buf); 2336 scr_add_lines (buf, str - buf, nlines);
2730 2337
2731 /* 2338 /*
2732 * If there have been a lot of new lines, then update the screen 2339 * If there have been a lot of new lines, then update the screen
2733 * What the heck I'll cheat and only refresh less than every page-full. 2340 * What the heck we'll cheat and only refresh less than every page-full.
2734 * the number of pages between refreshes is refresh_limit, which 2341 * if skipScroll is enabled.
2735 * is incremented here because we must be doing flat-out scrolling.
2736 */ 2342 */
2737 if (refreshnow) 2343 if (refreshnow)
2738 { 2344 {
2739 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2740 refresh_limit++;
2741 else
2742 {
2743 flag = true;
2744 scr_refresh (refresh_type); 2345 scr_refresh ();
2745 } 2346 want_refresh = 1;
2746 } 2347 }
2747
2748 } 2348 }
2749 else 2349 else
2750 { 2350 {
2751 try 2351 try
2752 { 2352 {
… …
2760 } 2360 }
2761 2361
2762 ch = NOCHAR; 2362 ch = NOCHAR;
2763 } 2363 }
2764 } 2364 }
2765
2766 return flag;
2767}
2768
2769// read the next octet
2770unicode_t
2771rxvt_term::next_octet ()
2772{
2773 return cmdbuf_ptr < cmdbuf_endp
2774 ? *cmdbuf_ptr++
2775 : NOCHAR;
2776} 2365}
2777 2366
2778// read the next character 2367// read the next character
2779unicode_t 2368wchar_t ecb_hot
2780rxvt_term::next_char () 2369rxvt_term::next_char () noexcept
2781{ 2370{
2782 while (cmdbuf_ptr < cmdbuf_endp) 2371 while (cmdbuf_ptr < cmdbuf_endp)
2783 { 2372 {
2784 // assume 7-bit to be ascii ALWAYS 2373 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2785 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2374 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2786 return *cmdbuf_ptr++; 2375 return *cmdbuf_ptr++;
2787 2376
2788 wchar_t wc; 2377 wchar_t wc;
2789 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2378 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2790 2379
2791 if (len == (size_t)-2) 2380 if (len == (size_t)-2)
2792 { 2381 {
2793 // the mbstate stores incomplete sequences. didn't know this :/ 2382 // the mbstate stores incomplete sequences. didn't know this :/
2794 cmdbuf_ptr = cmdbuf_endp; 2383 cmdbuf_ptr = cmdbuf_endp;
2795 break; 2384 break;
2796 } 2385 }
2797 2386
2798 if (len == (size_t)-1) 2387 if (len == (size_t)-1)
2388 {
2389 mbstate.reset (); // reset now undefined conversion state
2390 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2391 // in which case we "erroneously" return the next byte which might be valid.
2799 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2392 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2393 }
2800 2394
2801 // assume wchar == unicode 2395 // assume wchar == unicode
2802 cmdbuf_ptr += len; 2396 cmdbuf_ptr += len;
2803 return wc & UNICODE_MASK; 2397 return wc & UNICODE_MASK;
2804 } 2398 }
2805 2399
2806 return NOCHAR; 2400 return NOCHAR;
2807} 2401}
2808 2402
2809/* rxvt_cmd_getc () - Return next input character */ 2403// read the next octet
2810/* 2404uint32_t ecb_hot
2811 * Return the next input character after first passing any keyboard input 2405rxvt_term::next_octet () noexcept
2812 * to the command. 2406{
2813 */ 2407 return cmdbuf_ptr < cmdbuf_endp
2814unicode_t 2408 ? (unsigned char)*cmdbuf_ptr++
2409 : NOCHAR;
2410}
2411
2412static class out_of_input out_of_input;
2413
2414wchar_t ecb_hot
2815rxvt_term::cmd_getc () 2415rxvt_term::cmd_getc ()
2816{ 2416{
2817 unicode_t c = next_char (); 2417 wchar_t c = next_char ();
2818 2418
2819 if (c == NOCHAR) 2419 if (c == NOCHAR)
2820 throw out_of_input; 2420 throw out_of_input;
2821 2421
2822 return c; 2422 return c;
2823} 2423}
2824 2424
2825unicode_t 2425uint32_t ecb_hot
2826rxvt_term::cmd_get8 () 2426rxvt_term::cmd_get8 ()
2827{ 2427{
2828 unicode_t c = next_octet (); 2428 uint32_t c = next_octet ();
2829 2429
2830 if (c == NOCHAR) 2430 if (c == NOCHAR)
2831 throw out_of_input; 2431 throw out_of_input;
2832 2432
2833 return c; 2433 return c;
2834} 2434}
2835 2435
2836/*{{{ print pipe */ 2436/*{{{ print pipe */
2837/*----------------------------------------------------------------------*/ 2437/*----------------------------------------------------------------------*/
2838#ifdef PRINTPIPE 2438#ifdef PRINTPIPE
2839FILE * 2439FILE * ecb_cold
2840rxvt_term::popen_printer () 2440rxvt_term::popen_printer ()
2841{ 2441{
2842 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2442 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2843 2443
2844 if (stream == NULL) 2444 if (stream == NULL)
2845 rxvt_warn ("can't open printer pipe, not printing.\n"); 2445 rxvt_warn ("can't open printer pipe, not printing.\n");
2846 2446
2847 return stream; 2447 return stream;
2848} 2448}
2849 2449
2850int 2450int ecb_cold
2851rxvt_term::pclose_printer (FILE *stream) 2451rxvt_term::pclose_printer (FILE *stream)
2852{ 2452{
2853 fflush (stream); 2453 fflush (stream);
2854 return pclose (stream); 2454 return pclose (stream);
2855} 2455}
2856 2456
2857/* 2457/*
2858 * simulate attached vt100 printer 2458 * simulate attached vt100 printer
2859 */ 2459 */
2860void 2460void ecb_cold
2861rxvt_term::process_print_pipe () 2461rxvt_term::process_print_pipe ()
2862{ 2462{
2863 int done; 2463 FILE *fd = popen_printer ();
2864 FILE *fd;
2865 2464
2866 if ((fd = popen_printer ()) == NULL) 2465 if (!fd)
2867 return; 2466 return;
2868 2467
2869 /* 2468 /*
2870 * Send all input to the printer until either ESC[4i or ESC[?4i 2469 * Send all input to the printer until either ESC[4i or ESC[?4i
2871 * is received. 2470 * is received.
2872 */ 2471 */
2873 for (done = 0; !done;) 2472 for (int done = 0; !done; )
2874 { 2473 {
2875 unsigned char buf[8]; 2474 unsigned char buf[8];
2876 unicode_t ch; 2475 unicode_t ch;
2877 unsigned int i, len; 2476 unsigned int i, len;
2878 2477
… …
2897 { 2496 {
2898 if ((buf[len++] = cmd_getc ()) == 'i') 2497 if ((buf[len++] = cmd_getc ()) == 'i')
2899 break; /* done = 1 */ 2498 break; /* done = 1 */
2900 } 2499 }
2901 } 2500 }
2902 2501
2903 for (i = 0; i < len; i++) 2502 for (i = 0; i < len; i++)
2904 if (putc (buf[i], fd) == EOF) 2503 if (putc (buf[i], fd) == EOF)
2905 { 2504 {
2906 done = 1; 2505 done = 1;
2907 break; 2506 break;
… …
2909 } 2508 }
2910 } 2509 }
2911 2510
2912 pclose_printer (fd); 2511 pclose_printer (fd);
2913} 2512}
2914#endif /* PRINTPIPE */ 2513#endif /* PRINTPIPE */
2915/*}}} */ 2514/*}}} */
2916 2515
2917/* *INDENT-OFF* */
2918enum { 2516enum {
2919 C1_40 = 0x40, 2517 C1_40 = 0x40,
2920 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2518 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2921 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2519 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2922 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2520 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2923 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2521 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2924}; 2522};
2925/* *INDENT-ON* */
2926 2523
2927/*{{{ process non-printing single characters */ 2524/*{{{ process non-printing single characters */
2928void 2525void ecb_hot
2929rxvt_term::process_nonprinting (unicode_t ch) 2526rxvt_term::process_nonprinting (unicode_t ch)
2930{ 2527{
2931 switch (ch) 2528 switch (ch)
2932 { 2529 {
2933 case C0_ESC: 2530 case C0_ESC:
2934 process_escape_seq (); 2531 process_escape_seq ();
2935 break; 2532 break;
2936 case C0_ENQ: /* terminal Status */ 2533 case C0_ENQ: /* terminal Status */
2937 if (rs[Rs_answerbackstring]) 2534 if (rs[Rs_answerbackstring])
2938 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2535 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2939 (unsigned int)strlen (rs[Rs_answerbackstring]));
2940 else 2536 else
2941 tt_write ((unsigned char *)VT100_ANS, 2537 tt_write (VT100_ANS, strlen (VT100_ANS));
2942 (unsigned int)strlen (VT100_ANS));
2943 break; 2538 break;
2944 case C0_BEL: /* bell */ 2539 case C0_BEL: /* bell */
2945 scr_bell (); 2540 scr_bell ();
2946 break; 2541 break;
2947 case C0_BS: /* backspace */ 2542 case C0_BS: /* backspace */
… …
2965 scr_charset_choose (0); 2560 scr_charset_choose (0);
2966 break; 2561 break;
2967 2562
2968#ifdef EIGHT_BIT_CONTROLS 2563#ifdef EIGHT_BIT_CONTROLS
2969 // 8-bit controls 2564 // 8-bit controls
2970 case 0x90: /* DCS */ 2565 case 0x90: /* DCS */
2971 process_dcs_seq (); 2566 process_dcs_seq ();
2972 break; 2567 break;
2973 case 0x9b: /* CSI */ 2568 case 0x9b: /* CSI */
2974 process_csi_seq (); 2569 process_csi_seq ();
2975 break; 2570 break;
2976 case 0x9d: /* CSI */ 2571 case 0x9d: /* OSC */
2977 process_osc_seq (); 2572 process_osc_seq ();
2978 break; 2573 break;
2979#endif 2574#endif
2980 } 2575 }
2981} 2576}
2982/*}}} */ 2577/*}}} */
2983 2578
2984 2579
2985/*{{{ process VT52 escape sequences */ 2580/*{{{ process VT52 escape sequences */
2986void 2581void ecb_cold
2987rxvt_term::process_escape_vt52 (unicode_t ch) 2582rxvt_term::process_escape_vt52 (unicode_t ch)
2988{ 2583{
2989 int row, col; 2584 int row, col;
2990 2585
2991 switch (ch) 2586 switch (ch)
… …
3025 break; 2620 break;
3026 case 'Z': /* identify the terminal type */ 2621 case 'Z': /* identify the terminal type */
3027 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2622 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3028 break; 2623 break;
3029 case '<': /* turn off VT52 mode */ 2624 case '<': /* turn off VT52 mode */
3030 PrivMode (0, PrivMode_vt52); 2625 priv_modes &= ~PrivMode_vt52;
3031 break; 2626 break;
3032 case 'F': /* use special graphics character set */ 2627 case 'F': /* use special graphics character set */
3033 case 'G': /* use regular character set */ 2628 case 'G': /* use regular character set */
3034 /* unimplemented */ 2629 /* unimplemented */
3035 break; 2630 break;
… …
3041} 2636}
3042/*}}} */ 2637/*}}} */
3043 2638
3044 2639
3045/*{{{ process escape sequences */ 2640/*{{{ process escape sequences */
3046void 2641void ecb_hot
3047rxvt_term::process_escape_seq () 2642rxvt_term::process_escape_seq ()
3048{ 2643{
3049 unicode_t ch = cmd_getc (); 2644 unicode_t ch = cmd_getc ();
3050 2645
3051 if (priv_modes & PrivMode_vt52) 2646 if (priv_modes & PrivMode_vt52)
… …
3054 return; 2649 return;
3055 } 2650 }
3056 2651
3057 switch (ch) 2652 switch (ch)
3058 { 2653 {
3059 /* case 1: do_tek_mode (); break; */
3060 case '#': 2654 case '#':
3061 if (cmd_getc () == '8') 2655 if (cmd_getc () == '8')
3062 scr_E (); 2656 scr_E ();
3063 break; 2657 break;
3064 case '(': 2658 case '(':
… …
3071 scr_charset_set (2, (unsigned int)cmd_getc ()); 2665 scr_charset_set (2, (unsigned int)cmd_getc ());
3072 break; 2666 break;
3073 case '+': 2667 case '+':
3074 scr_charset_set (3, (unsigned int)cmd_getc ()); 2668 scr_charset_set (3, (unsigned int)cmd_getc ());
3075 break; 2669 break;
3076#if ENABLE_FRILLS 2670#if !ENABLE_MINIMAL
3077 case '6': 2671 case '6':
3078 scr_backindex (); 2672 scr_backindex ();
3079 break; 2673 break;
3080#endif 2674#endif
3081 case '7': 2675 case '7':
3082 scr_cursor (SAVE); 2676 scr_cursor (SAVE);
3083 break; 2677 break;
3084 case '8': 2678 case '8':
3085 scr_cursor (RESTORE); 2679 scr_cursor (RESTORE);
3086 break; 2680 break;
3087#if ENABLE_FRILLS 2681#if !ENABLE_MINIMAL
3088 case '9': 2682 case '9':
3089 scr_forwardindex (); 2683 scr_forwardindex ();
3090 break; 2684 break;
3091#endif 2685#endif
2686 // DECPAM/DECPNM
3092 case '=': 2687 case '=':
2688 priv_modes |= PrivMode_aplKP;
2689 break;
3093 case '>': 2690 case '>':
3094 PrivMode ((ch == '='), PrivMode_aplKP); 2691 priv_modes &= ~PrivMode_aplKP;
3095 break; 2692 break;
3096 2693
3097 case C1_40: 2694 case C1_40:
3098 cmd_getc (); 2695 cmd_getc ();
3099 break; 2696 break;
… …
3102 break; 2699 break;
3103 2700
3104 /* 8.3.87: NEXT LINE */ 2701 /* 8.3.87: NEXT LINE */
3105 case C1_NEL: /* ESC E */ 2702 case C1_NEL: /* ESC E */
3106 { 2703 {
3107 unicode_t nlcr[] = { C0_LF, C0_CR }; 2704 wchar_t nlcr[] = { C0_LF, C0_CR };
3108 scr_add_lines (nlcr, 1, 2); 2705 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3109 } 2706 }
3110 break; 2707 break;
3111 2708
2709#if 0 // disabled because embedded newlines can make exploits easier
3112 /* kidnapped escape sequence: Should be 8.3.48 */ 2710 /* kidnapped escape sequence: Should be 8.3.48 */
3113 case C1_ESA: /* ESC G */ 2711 case C1_ESA: /* ESC G */
3114 process_graphics (); 2712 // used by original rxvt for rob nations own graphics mode
2713 if (cmd_getc () == 'Q' && option (Opt_insecure))
2714 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3115 break; 2715 break;
2716#endif
3116 2717
3117 /* 8.3.63: CHARACTER TABULATION SET */ 2718 /* 8.3.63: CHARACTER TABULATION SET */
3118 case C1_HTS: /* ESC H */ 2719 case C1_HTS: /* ESC H */
3119 scr_set_tab (1); 2720 scr_set_tab (1);
3120 break; 2721 break;
… …
3123 case C1_RI: /* ESC M */ 2724 case C1_RI: /* ESC M */
3124 scr_index (DN); 2725 scr_index (DN);
3125 break; 2726 break;
3126 2727
3127 /* 8.3.142: SINGLE-SHIFT TWO */ 2728 /* 8.3.142: SINGLE-SHIFT TWO */
3128 /*case C1_SS2: scr_single_shift (2); break; */ 2729 /* case C1_SS2: break; */
3129 2730
3130 /* 8.3.143: SINGLE-SHIFT THREE */ 2731 /* 8.3.143: SINGLE-SHIFT THREE */
3131 /*case C1_SS3: scr_single_shift (3); break; */ 2732 /* case C1_SS3: break; */
3132 2733
3133 /* 8.3.27: DEVICE CONTROL STRING */ 2734 /* 8.3.27: DEVICE CONTROL STRING */
3134 case C1_DCS: /* ESC P */ 2735 case C1_DCS: /* ESC P */
3135 process_dcs_seq (); 2736 process_dcs_seq ();
3136 break; 2737 break;
3137 2738
3138 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2739 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3139 case C1_SCI: /* ESC Z */ 2740 case C1_SCI: /* ESC Z */
3140 tt_write ((const unsigned char *)ESCZ_ANSWER, 2741 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3141 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3142 break; /* steal obsolete ESC [ c */ 2742 break; /* steal obsolete ESC [ c */
3143 2743
3144 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2744 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3145 case C1_CSI: /* ESC [ */ 2745 case C1_CSI: /* ESC [ */
3146 process_csi_seq (); 2746 process_csi_seq ();
3147 break; 2747 break;
3148 2748
3149 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2749 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3150 case C1_OSC: /* ESC ] */ 2750 case C1_OSC: /* ESC ] */
3151 process_osc_seq (); 2751 process_osc_seq ();
3152 break; 2752 break;
3153 2753
3154 /* 8.3.106: RESET TO INITIAL STATE */ 2754 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3155 case 'c': 2755 case 'c':
3156 mbstate.reset (); 2756 mbstate.reset ();
3157 scr_poweron (); 2757 scr_poweron ();
3158 scrollbar_show (1); 2758 scrollBar.show (1);
3159 break; 2759 break;
3160 2760
3161 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2761 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3162 case 'n': 2762 case 'n':
3163 scr_charset_choose (2); 2763 scr_charset_choose (2);
… …
3170 } 2770 }
3171} 2771}
3172/*}}} */ 2772/*}}} */
3173 2773
3174/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2774/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3175/* *INDENT-OFF* */
3176enum { 2775enum {
3177 CSI_ICH = 0x40, 2776 CSI_ICH = 0x40,
3178 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2777 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3179 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2778 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3180 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2779 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3183 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2782 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3184 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2783 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3185 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2784 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3186}; 2785};
3187 2786
3188#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2787#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3189 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2788 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3190 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2789 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3191#define get_byte_array_bit(array, bit) \ 2790#define get_byte_array_bit(array, bit) \
3192 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2791 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3193 2792
3194const unsigned char csi_defaults[] = 2793static const unsigned char csi_defaults[] =
3195 { 2794 {
3196 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2795 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3197 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2796 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3198 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2797 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3199 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2798 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3200 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2799 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3201 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2800 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3202 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2801 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3203 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2802 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3204 }; 2803 };
3205/* *INDENT-ON* */
3206 2804
3207void 2805void ecb_hot
3208rxvt_term::process_csi_seq () 2806rxvt_term::process_csi_seq ()
3209{ 2807{
3210 unicode_t ch, priv, i; 2808 unicode_t ch, priv, prev_ch, i;
3211 unsigned int nargs, p; 2809 unsigned int nargs, p;
3212 int n, ndef; 2810 int n, ndef;
3213 int arg[ESC_ARGS]; 2811 int arg[ESC_ARGS] = { };
3214 2812
3215 for (nargs = ESC_ARGS; nargs > 0;) 2813 nargs = 0;
3216 arg[--nargs] = 0;
3217 2814
3218 priv = 0; 2815 priv = 0;
3219 ch = cmd_getc (); 2816 ch = cmd_getc ();
3220 if (ch >= '<' && ch <= '?') 2817 if ((ch >= '<' && ch <= '?') || ch == '!')
2818 {
3221 { /* '<' '=' '>' '?' */ 2819 /* '<' '=' '>' '?' '!' */
3222 priv = ch; 2820 priv = ch;
3223 ch = cmd_getc (); 2821 ch = cmd_getc ();
3224 } 2822 }
3225 2823
2824 prev_ch = 0;
3226 /* read any numerical arguments */ 2825 /* read any numerical arguments */
3227 for (n = -1; ch < CSI_ICH; ) 2826 for (n = -1; ch < CSI_ICH; )
3228 { 2827 {
3229 if (isdigit (ch)) 2828 if (isdigit (ch))
3230 { 2829 {
… …
3240 n = -1; 2839 n = -1;
3241 } 2840 }
3242 else if (IS_CONTROL (ch)) 2841 else if (IS_CONTROL (ch))
3243 process_nonprinting (ch); 2842 process_nonprinting (ch);
3244 2843
2844 prev_ch = ch;
3245 ch = cmd_getc (); 2845 ch = cmd_getc ();
3246 } 2846 }
3247 2847
3248 if (ch > CSI_7F) 2848 if (ch > CSI_7F)
3249 return; 2849 return;
… …
3255 ndef = get_byte_array_bit (csi_defaults, i); 2855 ndef = get_byte_array_bit (csi_defaults, i);
3256 for (p = 0; p < nargs; p++) 2856 for (p = 0; p < nargs; p++)
3257 if (arg[p] == -1) 2857 if (arg[p] == -1)
3258 arg[p] = ndef; 2858 arg[p] = ndef;
3259 2859
3260#ifdef DEBUG_CMD
3261 fprintf (stderr, "CSI ");
3262 for (p = 0; p < nargs; p++)
3263 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3264 fprintf (stderr, "%c\n", ch);
3265#endif
3266
3267 /* 2860 /*
3268 * private mode handling 2861 * private mode handling
3269 */ 2862 */
3270 if (priv) 2863 if (priv)
3271 { 2864 {
3272 switch (priv) 2865 switch (priv)
3273 { 2866 {
3274 case '>': 2867 case '>':
3275 if (ch == CSI_DA) /* secondary device attributes */ 2868 if (ch == CSI_DA) /* secondary device attributes */
3276 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2869 {
2870 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2871 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2872 //
2873 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2874 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2875 // versions.
2876 //
2877 tt_printf ("\033[>%d;95;0c", 'U');
2878 }
3277 break; 2879 break;
2880
3278 case '?': 2881 case '?':
3279 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2882 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3280 process_terminal_mode (ch, priv, nargs, arg); 2883 process_terminal_mode (ch, priv, nargs, arg);
2884 if (prev_ch == '$' && ch == 'p')
2885 process_terminal_mode (ch, priv, nargs, arg);
3281 break; 2886 break;
2887
2888 case '!':
2889 if (ch == CSI_70)
2890 {
2891 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2892 scr_soft_reset ();
2893
2894 static const int pm_h[] = { 7, 25 };
2895 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2896
2897 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2898 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3282 } 2899 }
2900 break;
2901 }
2902
3283 return; 2903 return;
3284 } 2904 }
3285 2905
3286 switch (ch) 2906 switch (ch)
3287 { 2907 {
… …
3301 } 2921 }
3302 break; 2922 break;
3303#endif 2923#endif
3304 2924
3305 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2925 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
3306 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2926 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
3307 arg[0] = -arg[0]; 2927 arg[0] = -arg[0];
3308 /* FALLTHROUGH */ 2928 /* FALLTHROUGH */
3309 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2929 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
3310 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2930 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
3311 scr_gotorc (arg[0], 0, RELATIVE); 2931 scr_gotorc (arg[0], 0, RELATIVE);
3312 break; 2932 break;
3313 2933
3314 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2934 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
3315 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2935 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
3316#ifdef ISO6429 2936#ifdef ISO6429
3317 arg[0] = -arg[0]; 2937 arg[0] = -arg[0];
3318#else /* emulate common DEC VTs */ 2938#else /* emulate common DEC VTs */
3319 arg[0] = arg[0] ? -arg[0] : -1; 2939 arg[0] = arg[0] ? -arg[0] : -1;
3320#endif 2940#endif
… …
3390 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3010 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3391 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3011 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3392 break; 3012 break;
3393 3013
3394 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3014 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3395 tt_write ((const unsigned char *)VT100_ANS, 3015 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3396 (unsigned int) (sizeof (VT100_ANS) - 1));
3397 break; 3016 break;
3398 3017
3399 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3018 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3400 process_sgr_mode (nargs, arg); 3019 process_sgr_mode (nargs, arg);
3401 break; 3020 break;
… …
3408 break; 3027 break;
3409 case 6: /* CPR requested */ 3028 case 6: /* CPR requested */
3410 scr_report_position (); 3029 scr_report_position ();
3411 break; 3030 break;
3412 case 7: /* unofficial extension */ 3031 case 7: /* unofficial extension */
3413 if (OPTION (Opt_insecure)) 3032 if (option (Opt_insecure))
3414 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3033 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3415 break; 3034 break;
3416 case 8: /* unofficial extension */ 3035 case 8: /* unofficial extension */
3036 {
3037 string_term st;
3038 st.v[0] = CHAR_ST;
3039 st.v[1] = '\0';
3417 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3040 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
3418 break; 3041 break;
3042 }
3419 } 3043 }
3420 break; 3044 break;
3421 3045
3422 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3046 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
3423 switch (arg[0]) 3047 switch (arg[0])
… …
3466 scr_insert_mode (1); 3090 scr_insert_mode (1);
3467 else if (arg[0] == 20) 3091 else if (arg[0] == 20)
3468 priv_modes |= PrivMode_LFNL; 3092 priv_modes |= PrivMode_LFNL;
3469 break; 3093 break;
3470 3094
3095 case CSI_71: // DECSCUSR: set cursor style
3096 if (prev_ch == ' ')
3097 set_cursor_style (arg[0]);
3098 break;
3099
3471 /* 3100 /*
3472 * PRIVATE USE beyond this point. All CSI_7? sequences here 3101 * PRIVATE USE beyond this point. All CSI_7? sequences here
3473 */ 3102 */
3474 case CSI_72: /* DECSTBM: set top and bottom margins */ 3103 case CSI_72: /* DECSTBM: set top and bottom margins */
3475 if (nargs == 1) 3104 if (nargs == 1)
… …
3485 break; 3114 break;
3486 case CSI_75: 3115 case CSI_75:
3487 scr_cursor (RESTORE); 3116 scr_cursor (RESTORE);
3488 break; 3117 break;
3489 3118
3490#if ENABLE_FRILLS 3119#if !ENABLE_MINIMAL
3491 case CSI_74: 3120 case CSI_74:
3492 process_window_ops (arg, nargs); 3121 process_window_ops (arg, nargs);
3493 break; 3122 break;
3494#endif 3123#endif
3495 3124
… …
3502 break; 3131 break;
3503 } 3132 }
3504} 3133}
3505/*}}} */ 3134/*}}} */
3506 3135
3507#if ENABLE_FRILLS 3136#if !ENABLE_MINIMAL
3508/* ARGSUSED */
3509void 3137void
3510rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3138rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3511{ 3139{
3512 int x, y; 3140 int x, y;
3513 XWindowAttributes wattr; 3141 XWindowAttributes wattr;
3514 Window wdummy; 3142 Window wdummy;
3515 dDisp; 3143
3144 dLocal (Display *, dpy);
3516 3145
3517 if (nargs == 0) 3146 if (nargs == 0)
3518 return; 3147 return;
3519 3148
3520 switch (args[0]) 3149 switch (args[0])
3521 { 3150 {
3522 /* 3151 /*
3523 * commands 3152 * commands
3524 */ 3153 */
3525 case 1: /* deiconify window */ 3154 case 1: /* deiconify window */
3526 XMapWindow (disp, parent[0]); 3155 XMapWindow (dpy, parent);
3527 break; 3156 break;
3528 case 2: /* iconify window */ 3157 case 2: /* iconify window */
3529 XIconifyWindow (disp, parent[0], display->screen); 3158 XIconifyWindow (dpy, parent, display->screen);
3530 break; 3159 break;
3531 case 3: /* set position (pixels) */ 3160 case 3: /* set position (pixels) */
3532 XMoveWindow (disp, parent[0], args[1], args[2]); 3161 XMoveWindow (dpy, parent, args[1], args[2]);
3533 break; 3162 break;
3534 case 4: /* set size (pixels) */ 3163 case 4: /* set size (pixels) */
3535 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3164 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3536 break; 3165 break;
3537 case 5: /* raise window */ 3166 case 5: /* raise window */
3538 XRaiseWindow (disp, parent[0]); 3167 XRaiseWindow (dpy, parent);
3539 break; 3168 break;
3540 case 6: /* lower window */ 3169 case 6: /* lower window */
3541 XLowerWindow (disp, parent[0]); 3170 XLowerWindow (dpy, parent);
3542 break; 3171 break;
3543 case 7: /* refresh window */ 3172 case 7: /* refresh window */
3544 scr_touch (true); 3173 scr_touch (true);
3545 break; 3174 break;
3546 case 8: /* set size (chars) */ 3175 case 8: /* set size (chars) */
… …
3549 break; 3178 break;
3550 3179
3551 //case 9: NYI, TODO, restore maximized window or maximize window 3180 //case 9: NYI, TODO, restore maximized window or maximize window
3552 default: 3181 default:
3553 if (args[0] >= 24) /* set height (chars) */ 3182 if (args[0] >= 24) /* set height (chars) */
3554 set_widthheight ((unsigned int)width, 3183 set_widthheight ((unsigned int)vt_width,
3555 (unsigned int) (args[1] * fheight)); 3184 (unsigned int) (args[1] * fheight));
3556 break; 3185 break;
3557
3558 3186
3559 /* 3187 /*
3560 * reports - some output format copied from XTerm 3188 * reports - some output format copied from XTerm
3561 */ 3189 */
3562 case 11: /* report window state */ 3190 case 11: /* report window state */
3563 XGetWindowAttributes (disp, parent[0], &wattr); 3191 XGetWindowAttributes (dpy, parent, &wattr);
3564 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3192 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3565 break; 3193 break;
3566 case 13: /* report window position */ 3194 case 13: /* report window position */
3567 XGetWindowAttributes (disp, parent[0], &wattr); 3195 XGetWindowAttributes (dpy, parent, &wattr);
3568 XTranslateCoordinates (disp, parent[0], wattr.root, 3196 XTranslateCoordinates (dpy, parent, wattr.root,
3569 -wattr.border_width, -wattr.border_width, 3197 -wattr.border_width, -wattr.border_width,
3570 &x, &y, &wdummy); 3198 &x, &y, &wdummy);
3571 tt_printf ("\033[3;%d;%dt", x, y); 3199 tt_printf ("\033[3;%d;%dt", x, y);
3572 break; 3200 break;
3573 case 14: /* report window size (pixels) */ 3201 case 14: /* report window size (pixels) */
3574 XGetWindowAttributes (disp, parent[0], &wattr); 3202 XGetWindowAttributes (dpy, parent, &wattr);
3575 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3203 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3576 break; 3204 break;
3577 case 18: /* report text area size (chars) */ 3205 case 18: /* report text area size (chars) */
3578 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3206 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3579 break; 3207 break;
… …
3581 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3209 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3582 break; 3210 break;
3583 case 20: /* report icon label */ 3211 case 20: /* report icon label */
3584 { 3212 {
3585 char *s; 3213 char *s;
3586 XGetIconName (disp, parent[0], &s); 3214 XGetIconName (dpy, parent, &s);
3587 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3215 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3588 XFree (s); 3216 XFree (s);
3589 } 3217 }
3590 break; 3218 break;
3591 case 21: /* report window title */ 3219 case 21: /* report window title */
3592 { 3220 {
3593 char *s; 3221 char *s;
3594 XFetchName (disp, parent[0], &s); 3222 XFetchName (dpy, parent, &s);
3595 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3223 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3596 XFree (s); 3224 XFree (s);
3597 } 3225 }
3598 break; 3226 break;
3599 } 3227 }
3600} 3228}
… …
3603/*----------------------------------------------------------------------*/ 3231/*----------------------------------------------------------------------*/
3604/* 3232/*
3605 * get input up until STRING TERMINATOR (or BEL) 3233 * get input up until STRING TERMINATOR (or BEL)
3606 * ends_how is terminator used. returned input must be free()'d 3234 * ends_how is terminator used. returned input must be free()'d
3607 */ 3235 */
3608unsigned char * 3236char *
3609rxvt_term::get_to_st (unicode_t &ends_how) 3237rxvt_term::get_to_st (string_term &st)
3610{ 3238{
3611 unicode_t ch; 3239 unicode_t ch;
3612 bool seen_esc = false; 3240 bool seen_esc = false;
3613 unsigned int n = 0; 3241 unsigned int n = 0;
3614 wchar_t string[STRING_MAX]; 3242 wchar_t string[CBUFSIZ];
3615 3243
3616 while ((ch = cmd_getc ()) != NOCHAR) 3244 while ((ch = cmd_getc ()) != NOCHAR)
3617 { 3245 {
3618 if (seen_esc) 3246 if (seen_esc)
3619 { 3247 {
… …
3627 seen_esc = true; 3255 seen_esc = true;
3628 continue; 3256 continue;
3629 } 3257 }
3630 else if (ch == C0_BEL || ch == CHAR_ST) 3258 else if (ch == C0_BEL || ch == CHAR_ST)
3631 break; 3259 break;
3260 else if (ch == C0_SYN)
3261 ch = cmd_get8 ();
3632 else if (ch < 0x20) 3262 else if (ch < 0x20)
3633 return NULL; /* other control character - exit */ 3263 return NULL; /* other control character - exit */
3634 3264
3635 seen_esc = false; 3265 seen_esc = false;
3636 3266
3637 if (n >= STRING_MAX - 1) 3267 if (n >= sizeof (string) - 1)
3638 // stop at some sane length 3268 // stop at some sane length
3639 return NULL; 3269 return NULL;
3640 3270
3641 if (ch == C0_SYN)
3642 string[n++] = cmd_get8 ();
3643 else
3644 string[n++] = ch; 3271 string[n++] = ch;
3645 } 3272 }
3646 3273
3647 string[n++] = '\0'; 3274 string[n++] = '\0';
3648 3275
3649 ends_how = (ch == 0x5c ? C0_ESC : ch); 3276 n = 0;
3277 if (ch == 0x5c)
3278 st.v[n++] = C0_ESC;
3279 st.v[n++] = ch;
3280 st.v[n] = '\0';
3650 3281
3651 return (unsigned char *)rxvt_wcstombs (string); 3282 return rxvt_wcstombs (string);
3652} 3283}
3653 3284
3654/*----------------------------------------------------------------------*/ 3285/*----------------------------------------------------------------------*/
3655/* 3286/*
3656 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3287 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3657 */ 3288 */
3658void 3289void
3659rxvt_term::process_dcs_seq () 3290rxvt_term::process_dcs_seq ()
3660{ 3291{
3661 unsigned char *s;
3662 unicode_t eh;
3663
3664 /* 3292 /*
3665 * Not handled yet 3293 * Not handled yet
3666 */ 3294 */
3295
3296 string_term st;
3667 s = get_to_st (eh); 3297 char *s = get_to_st (st);
3668 if (s) 3298 if (s)
3669 free (s); 3299 free (s);
3670 3300
3671 return; 3301 return;
3672} 3302}
… …
3676 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3306 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3677 */ 3307 */
3678void 3308void
3679rxvt_term::process_osc_seq () 3309rxvt_term::process_osc_seq ()
3680{ 3310{
3681 unicode_t ch, eh;
3682 int arg; 3311 int arg;
3683 3312
3684 ch = cmd_getc (); 3313 unicode_t ch = cmd_getc ();
3685 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3314 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3686 arg = arg * 10 + (ch - '0'); 3315 arg = arg * 10 + (ch - '0');
3687 3316
3688 if (ch == ';') 3317 if (ch == ';')
3689 { 3318 {
3319 string_term st;
3690 unsigned char *s = get_to_st (eh); 3320 char *s = get_to_st (st);
3691 3321
3692 if (s) 3322 if (s)
3693 { 3323 {
3694 process_xterm_seq (arg, (char *)s, eh); 3324 process_xterm_seq (arg, s, st);
3695 free (s); 3325 free (s);
3696 } 3326 }
3697 } 3327 }
3698} 3328}
3699 3329
3330static unsigned int
3331colorcube_index (unsigned int idx_r,
3332 unsigned int idx_g,
3333 unsigned int idx_b)
3334{
3335 assert (idx_r < Red_levels);
3336 assert (idx_g < Green_levels);
3337 assert (idx_b < Blue_levels);
3338
3339 return idx_r * Blue_levels * Green_levels +
3340 idx_g * Blue_levels +
3341 idx_b;
3342}
3343
3344/*
3345 * Find the nearest color slot in the hidden color cube,
3346 * adapt its value to the 32bit RGBA color.
3347 */
3348unsigned int
3349rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3350{
3351 r &= 0xff;
3352 g &= 0xff;
3353 b &= 0xff;
3354 a &= 0xff;
3355
3356 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3357
3358 /* we allow one of the 6 closest neighbouring colours */
3359 /* to replace the current color, if they not used recently */
3360 #if 0
3361 static const unsigned char dxyz[][3] = {
3362 0, 0, 0,
3363 0, 0, 4,
3364 0, 4, 4,
3365 4, 4, 0,
3366 4, 0, 4,
3367 0, 4, 0,
3368 4, 0, 0,
3369 };
3370 #else
3371 // silly compressed verlapping triplets version of above
3372 static const unsigned char dxyz[] = {
3373 0, 0, 0, 4, 4, 0, 4, 0, 0,
3374 };
3375 #endif
3376
3377 static const unsigned char color_level[8][32] = {
3378 // neighbour index
3379 {0, 0, 1, 0, 0, 1, 1, 2, 2, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3380 {0, 1, 0, 1, 1, 2, 1, 1, 2, 2, 3, 3, 2, 2, 2, 3, 3, 3, 4, 4, 4, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4},
3381 {0, 0, 1, 2, 1, 1, 2, 3, 3, 2, 2, 3, 3, 4, 4, 3, 3, 3, 4, 4, 5, 5, 5, 4, 4, 4, 5, 5, 5, 5, 5, 5},
3382 {0, 0, 2, 1, 2, 3, 2, 2, 3, 4, 4, 3, 3, 4, 4, 5, 5, 4, 4, 5, 5, 5, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6},
3383 // Red_levels/Green_levels/Blue_levels index
3384 {0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3385 {0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4},
3386 {0, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5},
3387 {0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6},
3388 };
3389
3390 unsigned int idx;
3391
3392 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3393 {
3394 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3395 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3396 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3397 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3398
3399 if (n == 0)
3400 idx = index;
3401
3402 if (rgb24_color[index] == color)
3403 {
3404 rgb24_seqno[index] = ++rgb24_sequence;
3405 return index + minTermCOLOR24;
3406 }
3407
3408 // minor issue: could update index 0 few more times
3409 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3410 {
3411 idx = index;
3412 goto update;
3413 }
3414
3415 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3416 // but also handles wrap around values well enough
3417 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3418 idx = index;
3419 }
3420
3421update:
3422 rgb24_color[idx] = color;
3423 rgb24_seqno[idx] = ++rgb24_sequence;
3424
3425 idx += minTermCOLOR24;
3426 pix_colors_focused [idx].free (this);
3427 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3428 update_fade_color (idx, false);
3429
3430 return idx;
3431}
3432
3700void 3433void
3701rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3434rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
3702{ 3435{
3703 if (str[0] == '?' && !str[1]) 3436 if (str[0] == '?' && !str[1])
3704 { 3437 {
3705 unsigned short r, g, b; 3438 rgba c;
3706 pix_colors_focused[color].get (display, r, g, b); 3439 pix_colors_focused[color].get (c);
3707 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3440 char rgba_str[32];
3441
3442#if XFT
3443 if (c.a != rgba::MAX_CC)
3444 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3445 else
3446#endif
3447 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3448
3449 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3450 tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
3451 else
3452 tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
3708 } 3453 }
3709 else 3454 else
3710 set_window_color (color, str); 3455 set_window_color (color, str);
3711} 3456}
3712 3457
3713/* 3458/*
3714 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3459 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3715 */ 3460 */
3716void 3461void
3717rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3462rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3718{ 3463{
3719 int changed = 0;
3720 int color; 3464 int color;
3721 char *buf, *name; 3465 char *buf, *name;
3722 bool query = str[0] == '?' && !str[1]; 3466 bool query = str[0] == '?' && !str[1];
3723 int saveop = op; 3467 int saveop = op;
3724 dDisp; 3468
3469 dLocal (Display *, dpy);
3725 3470
3726 assert (str != NULL); 3471 assert (str != NULL);
3472
3473 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3474 return;
3475
3727 switch (op) 3476 switch (op)
3728 { 3477 {
3729 case XTerm_name: 3478 case XTerm_name:
3730 set_title (str); 3479 set_title (str);
3731 /* FALLTHROUGH */ 3480 /* FALLTHROUGH */
… …
3745 unsigned long bytes_after; 3494 unsigned long bytes_after;
3746 unsigned char *value = 0; 3495 unsigned char *value = 0;
3747 const char *str = ""; 3496 const char *str = "";
3748 3497
3749 if (prop 3498 if (prop
3750 && XGetWindowProperty (disp, parent[0], 3499 && XGetWindowProperty (dpy, parent,
3751 prop, 0, 1<<16, 0, AnyPropertyType, 3500 prop, 0, 1<<16, 0, AnyPropertyType,
3752 &actual_type, &actual_format, 3501 &actual_type, &actual_format,
3753 &nitems, &bytes_after, &value) == Success 3502 &nitems, &bytes_after, &value) == Success
3754 && actual_type != None 3503 && actual_type != None
3755 && actual_format == 8) 3504 && actual_format == 8)
3756 str = (const char *)(value); 3505 str = (const char *)(value);
3757 3506
3758 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3507 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3759 3508
3760 XFree (value); 3509 XFree (value);
3761 } 3510 }
3762 else 3511 else
3763 { 3512 {
3764 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3513 char *eq = strchr (str, '=');
3765 3514
3766 if (eq) 3515 if (eq)
3767 { 3516 {
3768 *eq = 0; 3517 *eq = 0;
3769 set_utf8_property (display->atom (str), eq + 1); 3518 set_utf8_property (display->atom (str), eq + 1);
3770 } 3519 }
3771 else 3520 else
3772 XDeleteProperty (disp, parent[0], 3521 XDeleteProperty (dpy, parent,
3773 display->atom (str)); 3522 display->atom (str));
3774 } 3523 }
3775 break; 3524 break;
3776 3525
3777 case XTerm_Color: 3526 case XTerm_Color:
… …
3779 { 3528 {
3780 if ((name = strchr (buf, ';')) == NULL) 3529 if ((name = strchr (buf, ';')) == NULL)
3781 break; 3530 break;
3782 3531
3783 *name++ = '\0'; 3532 *name++ = '\0';
3784 color = atoi (buf); 3533 color = atoi (buf) + minCOLOR;
3785 3534
3786 if (color < 0 || color >= TOTAL_COLORS) 3535 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3787 break; 3536 break;
3788 3537
3789 if ((buf = strchr (name, ';')) != NULL) 3538 if ((buf = strchr (name, ';')) != NULL)
3790 *buf++ = '\0'; 3539 *buf++ = '\0';
3791 3540
3792 if (name[0] == '?' && !name[1]) 3541 process_color_seq (op, color, name, st);
3793 {
3794 unsigned short r, g, b;
3795 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3796 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3797 }
3798 else
3799 set_window_color (color + minCOLOR, name);
3800 } 3542 }
3801 break; 3543 break;
3544 case Rxvt_restoreFG:
3802 case XTerm_Color00: 3545 case XTerm_Color00:
3803 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3546 process_color_seq (op, Color_fg, str, st);
3804 break; 3547 break;
3548 case Rxvt_restoreBG:
3805 case XTerm_Color01: 3549 case XTerm_Color01:
3806 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3550 process_color_seq (op, Color_bg, str, st);
3807 break; 3551 break;
3808#ifndef NO_CURSORCOLOR 3552#ifndef NO_CURSORCOLOR
3809 case XTerm_Color_cursor: 3553 case XTerm_Color_cursor:
3810 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3554 process_color_seq (op, Color_cursor, str, st);
3811 break; 3555 break;
3812#endif 3556#endif
3813 case XTerm_Color_pointer_fg: 3557 case XTerm_Color_pointer_fg:
3814 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3558 process_color_seq (op, Color_pointer_fg, str, st);
3815 break; 3559 break;
3816 case XTerm_Color_pointer_bg: 3560 case XTerm_Color_pointer_bg:
3817 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3561 process_color_seq (op, Color_pointer_bg, str, st);
3818 break; 3562 break;
3563#ifdef OPTION_HC
3564 case XTerm_Color_HC:
3565 process_color_seq (op, Color_HC, str, st);
3566 break;
3567 case XTerm_Color_HTC:
3568 process_color_seq (op, Color_HTC, str, st);
3569 break;
3570#endif
3819#ifndef NO_BOLD_UNDERLINE_REVERSE 3571#ifndef NO_BOLD_UNDERLINE_REVERSE
3820 case XTerm_Color_BD: 3572 case URxvt_Color_BD:
3821 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3573 process_color_seq (op, Color_BD, str, st);
3822 break; 3574 break;
3823 case XTerm_Color_UL: 3575 case URxvt_Color_UL:
3824 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3576 process_color_seq (op, Color_UL, str, st);
3825 break;
3826 case XTerm_Color_RV:
3827 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3828 break; 3577 break;
3829 case URxvt_Color_IT: 3578 case URxvt_Color_IT:
3830 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3579 process_color_seq (op, Color_IT, str, st);
3831 break; 3580 break;
3832#endif 3581#endif
3833#if TRANSPARENT && TINTING
3834 case URxvt_Color_tint: 3582 case URxvt_Color_border:
3835 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3583 process_color_seq (op, Color_border, str, st);
3836 check_our_parents ();
3837 if (am_transparent)
3838 want_full_refresh = want_refresh = 1;
3839 break;
3840#endif
3841
3842 case XTerm_Pixmap:
3843 if (*str != ';')
3844 {
3845#if XPM_BACKGROUND
3846 scale_pixmap (""); /* reset to default scaling */
3847 set_bgPixmap (str); /* change pixmap */
3848#endif
3849 scr_touch (true);
3850 }
3851 while ((str = strchr (str, ';')) != NULL)
3852 {
3853 str++;
3854#if XPM_BACKGROUND
3855 changed += scale_pixmap (str);
3856#endif
3857 }
3858
3859 if (changed)
3860 {
3861#ifdef XPM_BACKGROUND
3862 resize_pixmap ();
3863#endif
3864 scr_touch (true);
3865 }
3866 break;
3867
3868 case XTerm_restoreFG:
3869 set_window_color (Color_fg, str);
3870 break;
3871 case XTerm_restoreBG:
3872 set_window_color (Color_bg, str);
3873 break; 3584 break;
3874 3585
3875 case XTerm_logfile: 3586 case XTerm_logfile:
3876 // TODO, when secure mode? 3587 // TODO, when secure mode?
3877 break; 3588 break;
3878 3589
3879#ifdef MENUBAR
3880 case URxvt_Menu:
3881 if (OPTION (Opt_insecure))
3882 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3883 break;
3884#endif
3885#if 0 3590#if 0
3886 case XTerm_dumpscreen: /* no error notices */ 3591 case Rxvt_dumpscreen: /* no error notices */
3887 { 3592 {
3888 int fd; 3593 int fd;
3889 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3594 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3890 { 3595 {
3891 scr_dump (fd); 3596 scr_dump (fd);
… …
3901 case URxvt_boldFont: 3606 case URxvt_boldFont:
3902 case URxvt_italicFont: 3607 case URxvt_italicFont:
3903 case URxvt_boldItalicFont: 3608 case URxvt_boldItalicFont:
3904#endif 3609#endif
3905 if (query) 3610 if (query)
3906 tt_printf ("\33]%d;%-.250s%c", saveop, 3611 tt_printf ("\33]%d;%-.250s%s", saveop,
3907 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3612 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3908 ? fontset[op - URxvt_font]->fontdesc : "", 3613 ? fontset[op - URxvt_font]->fontdesc : "",
3909 resp); 3614 st.v);
3910 else 3615 else
3911 { 3616 {
3912 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3617 const char *&res = rs[Rs_font + (op - URxvt_font)];
3913 3618
3914 res = strdup (str); 3619 res = strdup (str);
3915 allocated.push_back ((void *)res); 3620 allocated.push_back ((void *)res);
3916 set_fonts (); 3621 set_fonts ();
3917 } 3622 }
3918 break; 3623 break;
3919 3624
3920#if ENABLE_FRILLS 3625 case URxvt_version:
3626 if (query)
3627 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3628 op,
3629 rs[Rs_name], VERSION[0], VERSION[2],
3630 st.v);
3631 break;
3632
3633#if !ENABLE_MINIMAL
3634 case URxvt_cellinfo:
3635 if (query)
3636 tt_printf ("\33]%d;%d;%d;%d%s", saveop,
3637 fwidth, fheight, fbase,
3638 st.v);
3639 break;
3640
3921 case URxvt_locale: 3641 case URxvt_locale:
3922 if (query) 3642 if (query)
3923 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3643 tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
3924 else 3644 else
3925 { 3645 {
3926 set_locale (str); 3646 set_locale (str);
3927 pty.set_utf8_mode (enc_utf8); 3647 pty->set_utf8_mode (enc_utf8);
3928 init_xlocale (); 3648 init_xlocale ();
3929 } 3649 }
3930 break; 3650 break;
3931 3651
3932 case URxvt_view_up: 3652 case URxvt_view_up:
3933 case URxvt_view_down: 3653 case URxvt_view_down:
3654 {
3934 int lines = atoi (str); 3655 int lines = atoi (str);
3935 3656
3936 if (lines) 3657 if (lines)
3937 scr_page (op == URxvt_view_up ? UP : DN, lines); 3658 scr_page (op == URxvt_view_up ? UP : DN, lines);
3938 else 3659 else
3939 {
3940 scr_erase_savelines (); 3660 scr_erase_savelines ();
3941 } 3661 }
3942 3662
3663 break;
3664#endif
3665
3666#if ENABLE_PERL
3667 case URxvt_perl:
3668 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
3943 break; 3669 break;
3944#endif 3670#endif
3945 } 3671 }
3946} 3672}
3947/*----------------------------------------------------------------------*/ 3673/*----------------------------------------------------------------------*/
… …
3954 * 's' = save 3680 * 's' = save
3955 * 'r' = restore 3681 * 'r' = restore
3956 * 't' = toggle 3682 * 't' = toggle
3957 * so no need for fancy checking 3683 * so no need for fancy checking
3958 */ 3684 */
3959int 3685int ecb_cold
3960rxvt_term::privcases (int mode, unsigned long bit) 3686rxvt_term::privcases (int mode, unsigned long bit)
3961{ 3687{
3962 int state; 3688 int state;
3963 3689
3964 if (mode == 's') 3690 if (mode == 's')
3965 { 3691 {
3966 SavedModes |= (priv_modes & bit); 3692 if (priv_modes & bit)
3693 SavedModes |= bit;
3694 else
3695 SavedModes &= ~bit;
3967 return -1; 3696 return -1;
3968 } 3697 }
3969 else 3698 else
3970 { 3699 {
3971 if (mode == 'r') 3700 if (mode == 'r')
3972 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3701 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3973 else 3702 else
3974 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3703 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3975 PrivMode (state, bit); 3704
3705 if (state)
3706 priv_modes |= bit;
3707 else
3708 priv_modes &= ~bit;
3976 } 3709 }
3977 3710
3978 return state; 3711 return state;
3979} 3712}
3980 3713
3981/* we're not using priv _yet_ */ 3714/* we're not using priv _yet_ */
3982void 3715void
3983rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3716rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3984{ 3717{
3985 unsigned int i, j; 3718 unsigned int i, j;
3986 int state; 3719 int state;
3987 3720
3988 static const struct 3721 static const struct
3989 { 3722 {
3990 const int argval; 3723 const int argval;
3991 const unsigned long bit; 3724 const unsigned long bit;
3992 }
3993
3994 argtopriv[] = { 3725 } argtopriv[] = {
3995 { 1, PrivMode_aplCUR }, 3726 { 1, PrivMode_aplCUR }, // DECCKM
3996 { 2, PrivMode_vt52 }, 3727 { 2, PrivMode_vt52 }, // DECANM
3997 { 3, PrivMode_132 }, 3728 { 3, PrivMode_132 }, // DECCOLM
3998 { 4, PrivMode_smoothScroll }, 3729 { 4, PrivMode_smoothScroll }, // DECSCLM
3999 { 5, PrivMode_rVideo }, 3730 { 5, PrivMode_rVideo }, // DECSCNM
4000 { 6, PrivMode_relOrigin }, 3731 { 6, PrivMode_relOrigin }, // DECOM
4001 { 7, PrivMode_Autowrap }, 3732 { 7, PrivMode_Autowrap }, // DECAWM
4002 // 8, bi-directional support mode 3733 // 8, auto-repeat keys // DECARM
4003 { 9, PrivMode_MouseX10 }, 3734 { 9, PrivMode_MouseX10 },
4004#ifdef menuBar_esc
4005 { menuBar_esc, PrivMode_menuBar },
4006#endif
4007 // 18, 19 printing-related
4008 { 25, PrivMode_VisibleCursor }, 3735 { 12, PrivMode_BlinkingCursor },
3736 // 18 end FF to printer after print screen
3737 // 19 Print screen prints full screen/scroll region
3738 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
4009#ifdef scrollBar_esc 3739#ifdef scrollBar_esc
4010 { scrollBar_esc, PrivMode_scrollBar }, 3740 { scrollBar_esc, PrivMode_scrollBar },
4011#endif 3741#endif
4012 { 35, PrivMode_ShiftKeys }, // rxvt extension 3742 { 35, PrivMode_ShiftKeys }, // rxvt extension
3743 // 38, tektronix mode // DECTEK
4013 { 40, PrivMode_132OK }, 3744 { 40, PrivMode_132OK },
4014 // 41 xterm more fixes NYI 3745 // 41 xterm more fixes NYI
4015 // 45 margin bell NYI 3746 // 45 margin bell NYI
4016 // 46 start logging 3747 // 46 start logging
4017 { 47, PrivMode_Screen }, 3748 { 47, PrivMode_Screen },
4018 { 66, PrivMode_aplKP }, 3749 { 66, PrivMode_aplKP }, // DECNKM
4019#ifndef NO_BACKSPACE_KEY 3750#ifndef NO_BACKSPACE_KEY
4020 { 67, PrivMode_BackSpace }, 3751 { 67, PrivMode_BackSpace }, // DECBKM
4021#endif 3752#endif
4022 { 1000, PrivMode_MouseX11 }, 3753 { 1000, PrivMode_MouseX11 },
4023 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3754 { 1002, PrivMode_MouseBtnEvent },
4024 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3755 { 1003, PrivMode_MouseAnyEvent },
4025 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3756#if ENABLE_FRILLS
3757 { 1004, PrivMode_FocusEvent },
3758 { 1005, PrivMode_ExtMouseUTF8 },
3759 { 1006, PrivMode_ExtMouseSGR },
3760#endif
4026 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3761 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4027 { 1011, PrivMode_Keypress }, // rxvt extension 3762 { 1011, PrivMode_Keypress }, // rxvt extension
3763#if ENABLE_FRILLS
3764 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3765#endif
4028 // 1035 enable modifiers for alt, numlock NYI 3766 // 1035 enable modifiers for alt, numlock NYI
4029 // 1036 send ESC for meta keys NYI 3767 // 1036 send ESC for meta keys NYI
4030 // 1037 send DEL for keypad delete NYI 3768 // 1037 send DEL for keypad delete NYI
4031 { 1047, PrivMode_Screen }, 3769 { 1047, PrivMode_Screen },
4032 // 1048 save and restore cursor 3770 // 1048 save and restore cursor, implemented in code
4033 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3771 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4034 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3772 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3773#if ENABLE_FRILLS
3774 { 2004, PrivMode_BracketPaste },
3775#endif
4035 }; 3776 };
4036 3777
4037 if (nargs == 0) 3778 if (nargs == 0)
4038 return; 3779 return;
3780
3781 // DECRQM
3782 if (mode == 'p')
3783 {
3784 int status = 0;
3785 if (nargs != 1)
3786 return;
3787
3788 for (j = 0; j < ecb_array_length (argtopriv); j++)
3789 if (argtopriv[j].argval == arg[0])
3790 {
3791 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3792 break;
3793 }
3794
3795 tt_printf ("\33[?%d;%d$y", arg[0], status);
3796 return;
3797 }
4039 3798
4040 /* make lo/hi boolean */ 3799 /* make lo/hi boolean */
4041 if (mode == 'l') 3800 if (mode == 'l')
4042 mode = 0; /* reset */ 3801 mode = 0; /* reset */
4043 else if (mode == 'h') 3802 else if (mode == 'h')
… …
4046 for (i = 0; i < nargs; i++) 3805 for (i = 0; i < nargs; i++)
4047 { 3806 {
4048 state = -1; 3807 state = -1;
4049 3808
4050 /* basic handling */ 3809 /* basic handling */
4051 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3810 for (j = 0; j < ecb_array_length (argtopriv); j++)
4052 if (argtopriv[j].argval == arg[i]) 3811 if (argtopriv[j].argval == arg[i])
4053 { 3812 {
4054 state = privcases (mode, argtopriv[j].bit); 3813 state = privcases (mode, argtopriv[j].bit);
4055 break; 3814 break;
4056 } 3815 }
… …
4058 /* extra handling for values with state unkept */ 3817 /* extra handling for values with state unkept */
4059 switch (arg[i]) 3818 switch (arg[i])
4060 { 3819 {
4061#if ENABLE_STYLES 3820#if ENABLE_STYLES
4062 case 1021: 3821 case 1021:
4063 if (mode) 3822 set_option (Opt_intensityStyles, mode);
4064 SET_OPTION (Opt_intensityStyles);
4065 else
4066 CLR_OPTION (Opt_intensityStyles);
4067 3823
4068 scr_touch (true); 3824 scr_touch (true);
4069 break; 3825 break;
4070#endif 3826#endif
4071 case 1048: /* alternative cursor save */ 3827 case 1048: /* alternative cursor save */
4072 case 1049:
4073 if (OPTION (Opt_secondaryScreen)) 3828 if (option (Opt_secondaryScreen))
4074 if (mode == 0) 3829 if (mode == 0)
4075 scr_cursor (RESTORE); 3830 scr_cursor (RESTORE);
4076 else if (mode == 1) 3831 else if (mode == 1)
4077 scr_cursor (SAVE); 3832 scr_cursor (SAVE);
4078 break; 3833 break;
… …
4086 case 2: /* VT52 mode */ 3841 case 2: /* VT52 mode */
4087 /* oddball mode. should be set regardless of set/reset 3842 /* oddball mode. should be set regardless of set/reset
4088 * parameter. Return from VT52 mode with an ESC < from 3843 * parameter. Return from VT52 mode with an ESC < from
4089 * within VT52 mode 3844 * within VT52 mode
4090 */ 3845 */
4091 PrivMode (1, PrivMode_vt52); 3846 priv_modes |= PrivMode_vt52;
4092 break; 3847 break;
4093 case 3: /* 80/132 */ 3848 case 3: /* 80/132 */
4094 if (priv_modes & PrivMode_132OK) 3849 if (priv_modes & PrivMode_132OK)
4095 set_widthheight (((state ? 132 : 80) * fwidth), height); 3850 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4096 break; 3851 break;
4097 case 4: /* smooth scrolling */ 3852 case 4: /* smooth scrolling */
4098 if (!state) 3853 set_option (Opt_jumpScroll, !state);
4099 SET_OPTION (Opt_jumpScroll);
4100 else
4101 CLR_OPTION (Opt_jumpScroll);
4102 break; 3854 break;
4103 case 5: /* reverse video */ 3855 case 5: /* reverse video */
4104 scr_rvideo_mode (state); 3856 scr_rvideo_mode (state);
4105 break; 3857 break;
4106 case 6: /* relative/absolute origins */ 3858 case 6: /* relative/absolute origins */
… …
4110 scr_autowrap (state); 3862 scr_autowrap (state);
4111 break; 3863 break;
4112 /* case 8: - auto repeat, can't do on a per window basis */ 3864 /* case 8: - auto repeat, can't do on a per window basis */
4113 case 9: /* X10 mouse reporting */ 3865 case 9: /* X10 mouse reporting */
4114 if (state) /* orthogonal */ 3866 if (state) /* orthogonal */
4115 priv_modes &= ~PrivMode_MouseX11; 3867 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4116 break; 3868 break;
4117#ifdef menuBar_esc
4118 case menuBar_esc:
4119#ifdef MENUBAR
4120 map_menuBar (state);
4121#endif
4122 break;
4123#endif
4124#ifdef scrollBar_esc 3869#ifdef scrollBar_esc
4125 case scrollBar_esc: 3870 case scrollBar_esc:
4126 if (scrollbar_mapping (state)) 3871 scrollBar.map (state);
4127 {
4128 resize_all_windows (0, 0, 0); 3872 resize_all_windows (0, 0, 0);
4129 scr_touch (true); 3873 scr_touch (true);
4130 } 3874 break;
3875#endif
3876#ifdef CURSOR_BLINK
3877 case 12:
3878 cursor_blink_reset ();
4131 break; 3879 break;
4132#endif 3880#endif
4133 case 25: /* visible/invisible cursor */ 3881 case 25: /* visible/invisible cursor */
4134 scr_cursor_visible (state); 3882 scr_cursor_visible (state);
4135 break; 3883 break;
… …
4140 break; 3888 break;
4141 /* case 66: - application key pad */ 3889 /* case 66: - application key pad */
4142 /* case 67: - backspace key */ 3890 /* case 67: - backspace key */
4143 case 1000: /* X11 mouse reporting */ 3891 case 1000: /* X11 mouse reporting */
4144 if (state) /* orthogonal */ 3892 if (state) /* orthogonal */
4145 priv_modes &= ~PrivMode_MouseX10; 3893 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4146 break; 3894 break;
4147#if 0
4148 case 1001: 3895 case 1002:
4149 break; /* X11 mouse highlighting */ 3896 case 1003:
4150#endif 3897 if (state)
3898 {
3899 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3900 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3901 mouse_row = mouse_col = 0;
3902 vt_emask_mouse = PointerMotionMask;
3903 }
3904 else
3905 vt_emask_mouse = NoEventMask;
3906
3907 vt_select_input ();
3908 break;
4151 case 1010: /* scroll to bottom on TTY output inhibit */ 3909 case 1010: /* scroll to bottom on TTY output inhibit */
4152 if (!state) 3910 set_option (Opt_scrollTtyOutput, !state);
4153 SET_OPTION (Opt_scrollTtyOutput);
4154 else
4155 CLR_OPTION (Opt_scrollTtyOutput);
4156 break; 3911 break;
4157 case 1011: /* scroll to bottom on key press */ 3912 case 1011: /* scroll to bottom on key press */
4158 if (state) 3913 set_option (Opt_scrollTtyKeypress, state);
4159 SET_OPTION (Opt_scrollTtyKeypress);
4160 else
4161 CLR_OPTION (Opt_scrollTtyKeypress);
4162 break; 3914 break;
4163 case 1047: /* secondary screen w/ clearing last */ 3915 case 1047: /* secondary screen w/ clearing last */
4164 if (OPTION (Opt_secondaryScreen)) 3916 if (option (Opt_secondaryScreen))
4165 if (current_screen != PRIMARY) 3917 if (!state)
4166 scr_erase_screen (2); 3918 scr_erase_screen (2);
3919
4167 scr_change_screen (state); 3920 scr_change_screen (state);
4168 break; 3921 break;
4169 case 1049: /* secondary screen w/ clearing first */ 3922 case 1049: /* secondary screen w/ clearing first */
3923 if (option (Opt_secondaryScreen))
3924 if (state)
3925 scr_cursor (SAVE);
3926
4170 scr_change_screen (state); 3927 scr_change_screen (state);
3928
4171 if (OPTION (Opt_secondaryScreen)) 3929 if (option (Opt_secondaryScreen))
4172 if (current_screen != PRIMARY) 3930 if (state)
4173 scr_erase_screen (2); 3931 scr_erase_screen (2);
3932 else
3933 scr_cursor (RESTORE);
4174 break; 3934 break;
4175 default: 3935 default:
4176 break; 3936 break;
4177 } 3937 }
4178 } 3938 }
4179} 3939}
4180/*}}} */ 3940/*}}} */
4181 3941
4182/*{{{ process sgr sequences */ 3942/*{{{ process sgr sequences */
4183void 3943void ecb_hot
4184rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3944rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
4185{ 3945{
4186 unsigned int i; 3946 unsigned int i;
4187 short rendset; 3947 short rendset;
4188 int rendstyle; 3948 int rendstyle;
… …
4230 //case 19: // ninth alt font 3990 //case 19: // ninth alt font
4231 //case 20: // gothic 3991 //case 20: // gothic
4232 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3992 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
4233 rendset = 0, rendstyle = RS_Bold; 3993 rendset = 0, rendstyle = RS_Bold;
4234 break; 3994 break;
4235 case 22: // normal intensity 3995 case 22: // bold off (vt220)
4236 rendset = 0, rendstyle = RS_Bold; 3996 rendset = 0, rendstyle = RS_Bold;
4237 break; 3997 break;
4238 case 23: // disable italic 3998 case 23: // disable italic
4239 rendset = 0, rendstyle = RS_Italic; 3999 rendset = 0, rendstyle = RS_Italic;
4240 break; 4000 break;
4241 case 24: 4001 case 24: // underline off (vt220)
4242 rendset = 0, rendstyle = RS_Uline; 4002 rendset = 0, rendstyle = RS_Uline;
4243 break; 4003 break;
4244 case 25: 4004 case 25: // blink off (vt220)
4245 rendset = 0, rendstyle = RS_Blink; 4005 rendset = 0, rendstyle = RS_Blink;
4246 break; 4006 break;
4247 case 26: // variable spacing (iso 8613) 4007 case 26: // variable spacing (iso 8613)
4248 rendset = 0, rendstyle = RS_Blink; 4008 rendset = 0, rendstyle = RS_Blink;
4249 break; 4009 break;
4250 case 27: 4010 case 27: // reverse off (vt220)
4251 rendset = 0, rendstyle = RS_RVid; 4011 rendset = 0, rendstyle = RS_RVid;
4252 break; 4012 break;
4253 //case 28: // visible. NYI 4013 //case 28: // visible. NYI
4254 //case 29: // not crossed-out 4014 //case 29: // not crossed-out
4255 } 4015 }
… …
4270 case 35: 4030 case 35:
4271 case 36: 4031 case 36:
4272 case 37: 4032 case 37:
4273 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4033 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4274 break; 4034 break;
4275 case 38: // set fg color, ISO 8613-6
4276 if (nargs > i + 2 && arg[i + 1] == 5)
4277 {
4278 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4279 i += 2;
4280 }
4281 break;
4282 case 39: /* default fg */ 4035 case 39: /* default fg */
4283 scr_color (Color_fg, Color_fg); 4036 scr_color (Color_fg, Color_fg);
4284 break; 4037 break;
4285 4038
4286 case 40: 4039 case 40:
… …
4291 case 45: 4044 case 45:
4292 case 46: 4045 case 46:
4293 case 47: 4046 case 47:
4294 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4047 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4295 break; 4048 break;
4296 case 48: // set bg color, ISO 8613-6
4297 if (nargs > i + 2 && arg[i + 1] == 5)
4298 {
4299 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4300 i += 2;
4301 }
4302 break;
4303 case 49: /* default bg */ 4049 case 49: /* default bg */
4304 scr_color (Color_bg, Color_bg); 4050 scr_color (Color_bg, Color_bg);
4305 break; 4051 break;
4306 4052
4053 case 38: // set fg color, ISO 8613-6
4054 case 48: // set bg color, ISO 8613-6
4055 {
4056 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4057 unsigned int idx;
4058
4059 if (nargs > i + 2 && arg[i + 1] == 5)
4060 {
4061 idx = minCOLOR + arg[i + 2];
4062 i += 2;
4063
4064 scr_color (idx, fgbg);
4065 }
4066 else if (nargs > i + 4 && arg[i + 1] == 2)
4067 {
4068 unsigned int r = arg[i + 2];
4069 unsigned int g = arg[i + 3];
4070 unsigned int b = arg[i + 4];
4071 unsigned int a = 0xff;
4072
4073 idx = map_rgb24_color (r, g, b, a);
4074
4075 i += 4;
4076
4077 scr_color (idx, fgbg);
4078 }
4079 }
4080 break;
4081
4307 //case 50: // not variable spacing 4082 //case 50: // not variable spacing
4308 4083
4309#ifndef NO_BRIGHTCOLOR 4084#if !ENABLE_MINIMAL
4310 case 90: 4085 case 90:
4311 case 91: /* set bright fg color */ 4086 case 91: /* set bright fg color */
4312 case 92: 4087 case 92:
4313 case 93: 4088 case 93:
4314 case 94: 4089 case 94:
… …
4329 break; 4104 break;
4330#endif 4105#endif
4331 } 4106 }
4332 } 4107 }
4333} 4108}
4109
4110void
4111rxvt_term::set_cursor_style (int style)
4112{
4113 if (!IN_RANGE_INC (style, 0, 6))
4114 return;
4115
4116 if (style == 0)
4117 style = 1;
4118
4119 cursor_type = (style - 1) / 2;
4120 set_option (Opt_cursorUnderline, cursor_type == 1);
4121
4122#ifdef CURSOR_BLINK
4123 set_option (Opt_cursorBlink, style & 1);
4124 cursor_blink_reset ();
4125#endif
4126
4127 want_refresh = 1;
4128}
4334/*}}} */ 4129/*}}} */
4335 4130
4336/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4337void
4338rxvt_term::process_graphics ()
4339{
4340 unicode_t ch, cmd = cmd_getc ();
4341
4342 if (cmd == 'Q')
4343 { /* query graphics */
4344 tt_printf ("\033G0\012"); /* no graphics */
4345 return;
4346 }
4347 /* swallow other graphics sequences until terminating ':' */
4348 do
4349 ch = cmd_getc ();
4350 while (ch != ':');
4351}
4352/*}}} */
4353
4354/* ------------------------------------------------------------------------- */ 4131/* ---------------------------------------------------------------------- */
4132/* Write data to the pty as typed by the user, pasted with the mouse,
4133 * or generated by us in response to a query ESC sequence.
4134 */
4355 4135
4356/* 4136/*
4357 * Send printf () formatted output to the command. 4137 * Send printf () formatted output to the command.
4358 * Only use for small amounts of data. 4138 * Only use for small amounts of data.
4359 */ 4139 */
4360void 4140void
4361rxvt_term::tt_printf (const char *fmt,...) 4141rxvt_term::tt_printf (const char *fmt,...)
4362{ 4142{
4363 va_list arg_ptr; 4143 va_list arg_ptr;
4364 unsigned char buf[256]; 4144 char buf[256];
4365 4145
4366 va_start (arg_ptr, fmt); 4146 va_start (arg_ptr, fmt);
4367 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4147 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4368 va_end (arg_ptr); 4148 va_end (arg_ptr);
4369 tt_write (buf, strlen (buf)); 4149 tt_write (buf, strlen (buf));
4370} 4150}
4371 4151
4372/* ---------------------------------------------------------------------- */
4373/* Write data to the pty as typed by the user, pasted with the mouse, 4152/* Write data to the pty as typed by the user. */
4374 * or generated by us in response to a query ESC sequence.
4375 */
4376const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4377
4378void 4153void
4379rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4154rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4380{ 4155{
4156 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4157 return;
4158
4159 if (option (Opt_scrollTtyKeypress))
4160 if (view_start)
4161 {
4162 view_start = 0;
4163 want_refresh = 1;
4164 }
4165
4166 tt_write_ (data, len);
4167}
4168
4169void
4170rxvt_term::tt_write (const char *data, unsigned int len)
4171{
4172 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4173 return;
4174
4175 tt_write_ (data, len);
4176}
4177
4178static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4179
4180void
4181rxvt_term::tt_write_ (const char *data, unsigned int len)
4182{
4183 if (pty->pty < 0)
4184 return;
4185
4381 if (v_buflen == 0) 4186 if (v_buflen == 0)
4382 { 4187 {
4383 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4188 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4384 4189
4190 max_it (written, 0);
4191
4385 if ((unsigned int)written == len) 4192 if (written == len)
4386 return; 4193 return;
4387 4194
4388 data += written; 4195 data += written;
4389 len -= written; 4196 len -= written;
4390 } 4197 }
4391 4198
4392 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4199 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4393 4200
4394 memcpy (v_buffer + v_buflen, data, len); 4201 memcpy (v_buffer + v_buflen, data, len);
4395 v_buflen += len; 4202 v_buflen += len;
4396 4203
4397 pty_ev.set (EVENT_READ | EVENT_WRITE); 4204 pty_ev.set (ev::READ | ev::WRITE);
4398} 4205}
4399 4206
4400void rxvt_term::pty_write () 4207void rxvt_term::pty_write ()
4401{ 4208{
4402 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4209 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4403 4210
4404 if (written > 0) 4211 if (written > 0)
4405 { 4212 {
4406 v_buflen -= written; 4213 v_buflen -= written;
4407 4214
4408 if (v_buflen == 0) 4215 if (v_buflen == 0)
4409 { 4216 {
4410 free (v_buffer); 4217 free (v_buffer);
4411 v_buffer = 0; 4218 v_buffer = 0;
4412 v_buflen = 0;
4413 4219
4414 pty_ev.set (EVENT_READ); 4220 pty_ev.set (ev::READ);
4415 return; 4221 return;
4416 } 4222 }
4417 4223
4418 memmove (v_buffer, v_buffer + written, v_buflen); 4224 memmove (v_buffer, v_buffer + written, v_buflen);
4419 } 4225 }
4420 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4226 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4421 pty_ev.set (EVENT_READ); 4227 pty_ev.set (ev::READ);
4422} 4228}
4423 4229
4424/*----------------------- end-of-file (C source) -----------------------*/ 4230/*----------------------- end-of-file (C source) -----------------------*/
4425 4231

Diff Legend

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