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

Diff Legend

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