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

Diff Legend

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