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

Diff Legend

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