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.215 by root, Fri Dec 23 14:46:34 2005 UTC vs.
Revision 1.575 by root, Thu Jun 30 16:56:41 2016 UTC

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

Diff Legend

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