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.213 by root, Thu Dec 22 16:44:10 2005 UTC vs.
Revision 1.582 by sf-exg, Thu Jul 14 05:33:26 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(-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) 1209 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1210 {
1211#if LINUX_YIELD_HACK
1212 if (display->is_local)
1213 event_handler.yield_ev.start ();
1214#endif
1215 }
1216 else
1217 {
1073 pty_ev.stop (); 1218 pty_ev.stop ();
1074 1219
1220 if (!option (Opt_hold))
1221 destroy ();
1222 }
1223
1075 return false; 1224 return false;
1076} 1225}
1077 1226
1078void 1227void
1079rxvt_term::pty_cb (io_watcher &w, short revents) 1228rxvt_term::pty_cb (ev::io &w, int revents)
1080{ 1229{
1081 SET_R (this); 1230 make_current ();
1082 SET_LOCALE (locale);
1083 1231
1084 if (revents & EVENT_READ) 1232 if (revents & ev::READ)
1085 // loop, but don't allow a single term to monopolize us 1233 // loop, but don't allow a single term to monopolize us
1086 while (pty_fill ()) 1234 for (int i = CBUFCNT; i-- && pty_fill (); )
1087 if (cmd_parse ()) 1235 cmd_parse ();
1088 break;
1089 1236
1090 if (revents & EVENT_WRITE) 1237 if (revents & ev::WRITE)
1091 pty_write (); 1238 pty_write ();
1092}
1093 1239
1094void 1240 refresh_check ();
1241}
1242
1243void ecb_cold
1095rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1096{ 1245{
1097 XDefineCursor (display->display, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1098 recolour_cursor (); 1247 recolor_cursor ();
1099 1248
1100#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1101 hidden_pointer = 0; 1250 hidden_pointer = 0;
1102 1251
1103 if (options & Opt_pointerBlank) 1252 if (option (Opt_pointerBlank))
1104 pointer_ev.start (NOW + pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1105#endif 1254#endif
1106} 1255}
1107 1256
1108#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1109void 1258void ecb_cold
1110rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1111{ 1260{
1112 if (! (options & Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1113 return; 1262 return;
1114 1263
1115 XDefineCursor (display->display, vt, display->blank_cursor); 1264 XDefineCursor (dpy, vt, display->blank_cursor);
1116 XFlush (display->display); 1265 XFlush (dpy);
1117 1266
1118 hidden_pointer = 1; 1267 hidden_pointer = 1;
1119} 1268}
1120 1269
1121void 1270void ecb_cold
1122rxvt_term::pointer_cb (time_watcher &w) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1123{ 1272{
1124 SET_R (this); 1273 make_current ();
1125 SET_LOCALE (locale);
1126 1274
1127 pointer_blank (); 1275 pointer_blank ();
1128} 1276}
1129#endif 1277#endif
1130 1278
1131void 1279void
1132rxvt_term::mouse_report (XButtonEvent &ev) 1280rxvt_term::mouse_report (XButtonEvent &ev)
1133{ 1281{
1134 int button_number, key_state = 0; 1282 int button_number, key_state = 0;
1135 int x, y; 1283 int x, y;
1284 int code = 32;
1136 1285
1137 x = ev.x; 1286 x = Pixel2Col (ev.x) + 1;
1138 y = ev.y; 1287 y = Pixel2Row (ev.y) + 1;
1139 pixel_position (&x, &y); 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 }
1140 1298
1141 if (MEvent.button == AnyButton) 1299 if (MEvent.button == AnyButton)
1142 button_number = 3; 1300 button_number = 3;
1143 else 1301 else
1144 { 1302 {
1145 button_number = MEvent.button - Button1; 1303 button_number = MEvent.button - Button1;
1146 /* add 0x3D for wheel events, like xterm does */ 1304 /* add 0x3D for wheel events, like xterm does */
1147 if (button_number >= 3) 1305 if (button_number >= 3)
1148 button_number += (64 - 3); 1306 button_number += 64 - 3;
1149 } 1307 }
1150 1308
1151 if (priv_modes & PrivMode_MouseX10) 1309 if (priv_modes & PrivMode_MouseX10)
1152 { 1310 {
1153 /* 1311 /*
… …
1185 fputc ('A', stderr); 1343 fputc ('A', stderr);
1186 if (key_state & 32) 1344 if (key_state & 32)
1187 fputc ('2', stderr); 1345 fputc ('2', stderr);
1188 fprintf (stderr, "]: <%d>, %d/%d\n", 1346 fprintf (stderr, "]: <%d>, %d/%d\n",
1189 button_number, 1347 button_number,
1190 x + 1, 1348 x,
1191 y + 1); 1349 y);
1192#endif 1350#endif
1193 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
1194 tt_printf ("\033[M%c%c%c", 1365 tt_printf ("\033[M%c%c%c",
1195 (32 + button_number + key_state), 1366 code + button_number + key_state,
1196 (32 + x + 1), 1367 32 + x,
1197 (32 + y + 1)); 1368 32 + y);
1198} 1369}
1199
1200#ifdef USING_W11LIB
1201void
1202rxvt_W11_process_x_event (XEvent *ev)
1203{
1204 rxvt_t *r = rxvt_get_r ();
1205
1206 x_cb (*ev);
1207}
1208#endif
1209 1370
1210/*{{{ process an X event */ 1371/*{{{ process an X event */
1211void 1372void ecb_hot
1212rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1213{ 1374{
1214 dDisp; 1375 make_current ();
1215 1376
1216 SET_R (this); 1377 dLocal (Display *, dpy);
1217 SET_LOCALE (locale);
1218 1378
1219#if defined(CURSOR_BLINK) 1379 if (ev.xany.window == vt
1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1221 { 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1222 if (hidden_cursor) 1382 return;
1223 {
1224 hidden_cursor = 0;
1225 want_refresh = 1;
1226 }
1227 1383
1228 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1384 // for XQueryPointer
1229 }
1230#endif
1231
1232#if defined(POINTER_BLANK)
1233 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1234 {
1235 if (ev.type == MotionNotify
1236 || ev.type == ButtonPress
1237 || ev.type == ButtonRelease)
1238 if (hidden_pointer)
1239 pointer_unblank ();
1240
1241 if (ev.type == KeyPress && hidden_pointer == 0)
1242 pointer_blank ();
1243 }
1244#endif
1245
1246 Window unused_root, unused_child; 1385 Window unused_root, unused_child;
1247 int unused_root_x, unused_root_y; 1386 int unused_root_x, unused_root_y;
1248 unsigned int unused_mask; 1387 unsigned int unused_mask;
1249 1388
1250 switch (ev.type) 1389 switch (ev.type)
1251 { 1390 {
1252 case KeyPress: 1391 case KeyPress:
1253#if ISO_14755 1392 key_press (ev.xkey);
1254 if (!(iso14755buf & ISO_14755_52))
1255#endif
1256 lookup_key (ev.xkey);
1257
1258 break; 1393 break;
1259 1394
1260 case KeyRelease: 1395 case KeyRelease:
1261 { 1396 key_release (ev.xkey);
1262#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1263 KeySym ks;
1264
1265 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1266#endif
1267
1268#if ENABLE_FRILLS || ISO_14755
1269 // ISO 14755 support
1270 if (iso14755buf)
1271 if (iso14755buf & ISO_14755_52)
1272 {
1273# if ENABLE_OVERLAY
1274 scr_overlay_off ();
1275# endif
1276# if ISO_14755
1277 // iso14755 part 5.2 handling: release time
1278 // first: controls
1279 if ((ev.xkey.state & ControlMask)
1280 && ((ks >= 0x40 && ks <= 0x5f)
1281 || (ks >= 0x61 && ks <= 0x7f)))
1282 {
1283 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1284 commit_iso14755 ();
1285 return; // case-break;
1286 }
1287
1288 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1289 if (i[0] == ks)
1290 {
1291 iso14755buf = ISO_14755_51 | i[1];
1292 commit_iso14755 ();
1293 return; // case-break;
1294 }
1295
1296 scr_bell ();
1297# endif
1298 iso14755buf = 0;
1299 break;
1300 }
1301 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1302 {
1303# if ENABLE_OVERLAY
1304 scr_overlay_off ();
1305# endif
1306 if (iso14755buf & ISO_14755_51)
1307 commit_iso14755 ();
1308#if ISO_14755
1309 else if (iso14755buf & ISO_14755_STARTED)
1310 {
1311 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1312
1313 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1314 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1315 }
1316# endif
1317 else
1318 iso14755buf = 0;
1319 }
1320#endif
1321
1322#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1323 if (!(ev.xkey.state & ControlMask))
1324 slip_wheel_ev.stop ();
1325 else if (ks == XK_Control_L || ks == XK_Control_R)
1326 mouse_slip_wheel_speed = 0;
1327#endif
1328 break; 1397 break;
1329 }
1330 1398
1331 case ButtonPress: 1399 case ButtonPress:
1332 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1333 break; 1401 break;
1334 1402
… …
1336 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1337 break; 1405 break;
1338 1406
1339 case ClientMessage: 1407 case ClientMessage:
1340 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1409 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1342 { 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 {
1343 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)))
1344 destroy (); 1418 destroy ();
1419 }
1345#if ENABLE_EWMH 1420#if ENABLE_EWMH
1346 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])
1347 XSendEvent (disp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &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 }
1350#endif 1436#endif
1351 } 1437 }
1352#if ENABLE_XEMBED
1353 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1354 {
1355 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1356 focus_in ();
1357 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1358 focus_out ();
1359 }
1360#endif
1361#ifdef OFFIX_DND
1362 /* OffiX Dnd (drag 'n' drop) protocol */
1363 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1364 && (ev.xclient.data.l[0] == DndFile
1365 || ev.xclient.data.l[0] == DndDir
1366 || ev.xclient.data.l[0] == DndLink))
1367 {
1368 /* Get Dnd data */
1369 Atom ActualType;
1370 int ActualFormat;
1371 unsigned char *data;
1372 unsigned long Size, RemainingBytes;
1373
1374 XGetWindowProperty (disp, display->root,
1375 xa[XA_DNDSELECTION],
1376 0L, 1000000L,
1377 False, AnyPropertyType,
1378 &ActualType, &ActualFormat,
1379 &Size, &RemainingBytes,
1380 &data);
1381 set_string_property (XA_CUT_BUFFER0, data);
1382 XFree (data);
1383 selection_paste (display->root, XA_CUT_BUFFER0, true);
1384 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1385 }
1386#endif /* OFFIX_DND */
1387 break;
1388
1389 case MappingNotify:
1390 XRefreshKeyboardMapping (&ev.xmapping);
1391 break; 1438 break;
1392 1439
1393 /* 1440 /*
1394 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1395 * Here's my conclusion: 1442 * Here's my conclusion:
… …
1414 break; 1461 break;
1415 } 1462 }
1416 break; 1463 break;
1417 1464
1418 case FocusIn: 1465 case FocusIn:
1466 if (ev.xfocus.detail != NotifyInferior
1467 && ev.xfocus.detail != NotifyPointer
1468 && ev.xfocus.mode != NotifyGrab)
1419 focus_in (); 1469 focus_in ();
1420 break; 1470 break;
1421 1471
1422 case FocusOut: 1472 case FocusOut:
1473 if (ev.xfocus.detail != NotifyInferior
1474 && ev.xfocus.detail != NotifyPointer
1475 && ev.xfocus.mode != NotifyGrab)
1423 focus_out (); 1476 focus_out ();
1424 break; 1477 break;
1425 1478
1426 case ConfigureNotify: 1479 case ConfigureNotify:
1427 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent)
1428 { 1481 {
1429 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1430 ; 1483 ;
1484
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486
1487 if (want_position_change)
1488 {
1489 int x, y;
1490
1491 if (ev.xconfigure.send_event)
1492 {
1493 x = ev.xconfigure.x;
1494 y = ev.xconfigure.y;
1495 }
1496 else
1497 get_window_origin (x, y);
1498
1499 if (x != parent_x || y != parent_y)
1500 {
1501 parent_x = x;
1502 parent_y = y;
1503 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1504 }
1505 }
1431 1506
1432 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1507 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1433 { 1508 {
1434 seen_resize = 1; 1509 seen_resize = 1;
1435 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1510 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1436 } 1511 }
1437 1512
1438#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1513 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1439 if (options & Opt_transparent)
1440 check_our_parents ();
1441#endif
1442 } 1514 }
1443 break; 1515 break;
1444 1516
1445 case PropertyNotify: 1517 case PropertyNotify:
1446 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1518 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1447 && ev.xproperty.state == PropertyNewValue)
1448 selection_property (ev.xproperty.window, ev.xproperty.atom);
1449
1450 break; 1519 break;
1451 1520
1452 case SelectionClear: 1521 case SelectionClear:
1453 selection_clear (); 1522 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1454 break;
1455
1456 case SelectionNotify:
1457 if (selection_wait == Sel_normal)
1458 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1459 break; 1523 break;
1460 1524
1461 case SelectionRequest: 1525 case SelectionRequest:
1462 selection_send (ev.xselectionrequest); 1526 selection_send (ev.xselectionrequest);
1527 break;
1528
1529 case MapNotify:
1530 mapped = 1;
1531#ifdef TEXT_BLINK
1532 text_blink_ev.start ();
1533#endif
1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1463 break; 1535 break;
1464 1536
1465 case UnmapNotify: 1537 case UnmapNotify:
1466 mapped = 0; 1538 mapped = 0;
1467#ifdef TEXT_BLINK 1539#ifdef TEXT_BLINK
1468 text_blink_ev.stop (); 1540 text_blink_ev.stop ();
1469#endif 1541#endif
1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1470 break; 1543 break;
1471
1472 case MapNotify:
1473 mapped = 1;
1474#ifdef TEXT_BLINK
1475 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1476#endif
1477 break;
1478
1479#ifdef TRANSPARENT
1480 case ReparentNotify:
1481 rootwin_cb (ev);
1482 break;
1483#endif /* TRANSPARENT */
1484 1544
1485 case GraphicsExpose: 1545 case GraphicsExpose:
1486 case Expose: 1546 case Expose:
1487 if (ev.xany.window == vt) 1547 if (ev.xany.window == vt)
1488 { 1548 {
1489 do 1549 do
1550 {
1490 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1491 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, false);
1553 }
1492 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1554 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1493 1555
1494 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1556 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1495 1557
1496 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1559 {
1497 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1498 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, false);
1562 }
1499 1563
1500 scr_refresh (refresh_type); 1564 want_refresh = 1;
1501 } 1565 }
1502 else 1566 else
1503 { 1567 {
1504 XEvent unused_event; 1568 XEvent unused_event;
1505 1569
1506 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1570 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1507 ; 1571 ;
1508 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1572 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1509 ; 1573 ;
1510 1574
1511 if (isScrollbarWindow (ev.xany.window)) 1575 if (scrollBar.state && ev.xany.window == scrollBar.win)
1512 { 1576 {
1513 scrollBar.setIdle (); 1577 scrollBar.state = SB_STATE_IDLE;
1514 scrollbar_show (0); 1578 scrollBar.show (0);
1515 } 1579 }
1516#ifdef MENUBAR
1517 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1518 menubar_expose ();
1519#endif
1520
1521#ifdef TRANSPARENT
1522 if (am_transparent && ev.xany.window == parent[0])
1523 XClearWindow (disp, ev.xany.window);
1524#endif
1525 } 1580 }
1526 break; 1581 break;
1527 1582
1528 case MotionNotify: 1583 case MotionNotify:
1529#ifdef POINTER_BLANK 1584#ifdef POINTER_BLANK
1530 if (hidden_pointer) 1585 if (hidden_pointer)
1531 pointer_unblank (); 1586 pointer_unblank ();
1532#endif 1587#endif
1533#if MENUBAR 1588 if (!bypass_keystate
1534 if (isMenuBarWindow (ev.xany.window)) 1589 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1535 { 1590 || priv_modes & PrivMode_MouseAnyEvent))
1536 menubar_control (ev.xbutton); 1591 mouse_report (ev.xbutton);
1537 break;
1538 }
1539#endif
1540 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1541 break; 1593 break;
1542 1594
1543 if (ev.xany.window == vt) 1595 if (ev.xany.window == vt)
1544 { 1596 {
1597 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1598 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1599 ; // nop
1545 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1600 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1546 { 1601 {
1547 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1548 ; 1603 ;
1549 1604
1550 XQueryPointer (disp, vt, 1605 XQueryPointer (dpy, vt,
1551 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1552 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1553 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1554 &ev.xbutton.state); 1609 &ev.xbutton.state);
1555#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
1556 /* deal with a `jumpy' mouse */ 1611 /* deal with a `jumpy' mouse */
1557 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1612 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1613#endif
1558 { 1614 {
1559#endif
1560#if ISO_14755 1615#if ISO_14755
1561 // 5.4 1616 // 5.4
1562 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1617 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1563 { 1618 {
1564 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1619 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1570 1625
1571#ifdef SELECTION_SCROLLING 1626#ifdef SELECTION_SCROLLING
1572 if (ev.xbutton.y < int_bwidth 1627 if (ev.xbutton.y < int_bwidth
1573 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1628 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1574 { 1629 {
1630 page_dirn scroll_selection_dir;
1575 int dist; 1631 int dist;
1576 1632
1577 /* don't clobber the current delay if we are 1633 /* don't clobber the current delay if we are
1578 * already in the middle of scrolling. 1634 * already in the middle of scrolling.
1579 */ 1635 */
1580 if (!sel_scroll_ev.active) 1636 if (!sel_scroll_ev.is_active ())
1581 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1637 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1582 1638
1583 /* save the event params so we can highlight 1639 /* save the event params so we can highlight
1584 * the selection in the pending-scroll loop 1640 * the selection in the pending-scroll loop
1585 */ 1641 */
1586 selection_save_x = ev.xbutton.x; 1642 selection_save_x = ev.xbutton.x;
… …
1594 dist = int_bwidth - ev.xbutton.y; 1650 dist = int_bwidth - ev.xbutton.y;
1595 } 1651 }
1596 else 1652 else
1597 { 1653 {
1598 scroll_selection_dir = DN; 1654 scroll_selection_dir = DN;
1599 dist = ev.xbutton.y - (int_bwidth + height); 1655 dist = ev.xbutton.y - (int_bwidth + vt_height);
1600 } 1656 }
1601 1657
1602 scroll_selection_lines = Pixel2Height (dist) 1658 scroll_selection_lines = Pixel2Height (dist)
1603 / SELECTION_SCROLL_LINE_SPEEDUP 1659 / SELECTION_SCROLL_LINE_SPEEDUP
1604 + 1; 1660 + 1;
1605 min_it (scroll_selection_lines, 1661 min_it (scroll_selection_lines,
1606 SELECTION_SCROLL_MAX_LINES); 1662 SELECTION_SCROLL_MAX_LINES);
1663 scroll_selection_lines *= scroll_selection_dir;
1607 } 1664 }
1608 else 1665 else
1609 { 1666 {
1610 /* we are within the text window, so we 1667 /* we are within the text window, so we
1611 * shouldn't be scrolling 1668 * shouldn't be scrolling
1612 */ 1669 */
1613 if (sel_scroll_ev.active)
1614 sel_scroll_ev.stop(); 1670 sel_scroll_ev.stop();
1615 } 1671 }
1616#endif 1672#endif
1617#ifdef MOUSE_THRESHOLD
1618 } 1673 }
1619#endif
1620 } 1674 }
1621 } 1675 }
1622 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1676 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1623 { 1677 {
1624 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1625 MotionNotify, &ev)) 1679 MotionNotify, &ev))
1626 ; 1680 ;
1627 1681
1628 XQueryPointer (disp, scrollBar.win, 1682 XQueryPointer (dpy, scrollBar.win,
1629 &unused_root, &unused_child, 1683 &unused_root, &unused_child,
1630 &unused_root_x, &unused_root_y, 1684 &unused_root_x, &unused_root_y,
1631 &ev.xbutton.x, &ev.xbutton.y, 1685 &ev.xbutton.x, &ev.xbutton.y,
1632 &unused_mask); 1686 &unused_mask);
1633 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1687 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1634 scrollbar_size ()); 1688 scrollBar.size ());
1635 scr_refresh (refresh_type);
1636 refresh_limit = 0; 1689 want_refresh = 1;
1637 scrollbar_show (1); 1690 scrollBar.show (1);
1638 } 1691 }
1639 break; 1692 break;
1640 } 1693 }
1641}
1642 1694
1643void 1695#if defined(CURSOR_BLINK)
1696 if (ev.type == KeyPress)
1697 cursor_blink_reset ();
1698#endif
1699
1700#if defined(POINTER_BLANK)
1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1702 {
1703 if (ev.type == MotionNotify
1704 || ev.type == ButtonPress
1705 || ev.type == ButtonRelease)
1706 if (hidden_pointer)
1707 pointer_unblank ();
1708
1709 if (ev.type == KeyPress && hidden_pointer == 0)
1710 pointer_blank ();
1711 }
1712#endif
1713
1714 refresh_check ();
1715}
1716
1717#if ENABLE_FRILLS
1718void ecb_cold
1719rxvt_term::set_urgency (bool enable)
1720{
1721 if (enable == urgency_hint)
1722 return;
1723
1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1725 {
1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1727 XSetWMHints (dpy, parent, h);
1728 urgency_hint = enable;
1729 XFree (h);
1730 }
1731}
1732#endif
1733
1734void ecb_cold
1644rxvt_term::focus_in () 1735rxvt_term::focus_in ()
1645{ 1736{
1646 if (!focus) 1737 if (!focus)
1647 { 1738 {
1648 focus = 1; 1739 focus = 1;
1649 want_refresh = 1; 1740 want_refresh = 1;
1741
1650#if USE_XIM 1742#if USE_XIM
1651 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1652 { 1744 {
1653 IMSetStatusPosition (); 1745 im_set_position ();
1654 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1655 } 1747 }
1656#endif 1748#endif
1657#if CURSOR_BLINK 1749#if CURSOR_BLINK
1658 if (options & Opt_cursorBlink) 1750 if (option (Opt_cursorBlink))
1659 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1751 cursor_blink_ev.again ();
1660#endif 1752#endif
1661#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1662 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1663 { 1755 {
1664 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1665 scr_recolour (); 1757 scr_recolor ();
1666 } 1758 }
1667#endif 1759#endif
1668 } 1760#if ENABLE_FRILLS
1669} 1761 if (option (Opt_urgentOnBell))
1762 set_urgency (0);
1670 1763
1671void 1764 if (priv_modes & PrivMode_FocusEvent)
1765 tt_printf ("\x1b[I");
1766#endif
1767
1768 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1769 }
1770}
1771
1772void ecb_cold
1672rxvt_term::focus_out () 1773rxvt_term::focus_out ()
1673{ 1774{
1674 if (focus) 1775 if (focus)
1675 { 1776 {
1676 focus = 0; 1777 focus = 0;
1677 want_refresh = 1; 1778 want_refresh = 1;
1678 1779
1780#if ENABLE_FRILLS
1781 if (option (Opt_urgentOnBell))
1782 set_urgency (0);
1783
1784 if (priv_modes & PrivMode_FocusEvent)
1785 tt_printf ("\x1b[O");
1786#endif
1679#if ENABLE_FRILLS || ISO_14755 1787#if ENABLE_FRILLS || ISO_14755
1788 if (iso14755buf)
1789 {
1680 iso14755buf = 0; 1790 iso14755buf = 0;
1681#endif 1791# if ISO_14755
1682#if ENABLE_OVERLAY
1683 scr_overlay_off (); 1792 scr_overlay_off ();
1793# endif
1794 }
1684#endif 1795#endif
1685#if USE_XIM 1796#if USE_XIM
1686 if (Input_Context != NULL) 1797 if (Input_Context != NULL)
1687 XUnsetICFocus (Input_Context); 1798 XUnsetICFocus (Input_Context);
1688#endif 1799#endif
1689#if CURSOR_BLINK 1800#if CURSOR_BLINK
1690 if (options & Opt_cursorBlink) 1801 if (option (Opt_cursorBlink))
1691 cursor_blink_ev.stop (); 1802 cursor_blink_ev.stop ();
1803
1692 hidden_cursor = 0; 1804 hidden_cursor = 0;
1693#endif 1805#endif
1694#if OFF_FOCUS_FADING 1806#if OFF_FOCUS_FADING
1695 if (rs[Rs_fade]) 1807 if (rs[Rs_fade])
1696 { 1808 {
1697 pix_colors = pix_colors_unfocused; 1809 pix_colors = pix_colors_unfocused;
1698 scr_recolour (); 1810 scr_recolor ();
1699 } 1811 }
1700#endif 1812#endif
1813
1814 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1815 }
1816}
1817
1818void ecb_cold
1819rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1820{
1821#if OFF_FOCUS_FADING
1822 if (rs[Rs_fade])
1701 } 1823 {
1702} 1824 if (!first_time)
1825 pix_colors_focused [idx].free (this);
1703 1826
1704#if TRANSPARENT 1827 rgba c;
1705void 1828 pix_colors [Color_fade].get (c);
1829 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1830 }
1831#endif
1832}
1833
1834#if ENABLE_PERL
1835void ecb_hot
1706rxvt_term::rootwin_cb (XEvent &ev) 1836rxvt_term::rootwin_cb (XEvent &ev)
1707{ 1837{
1708 SET_R (this); 1838 make_current ();
1709 SET_LOCALE (locale); 1839
1840 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1841 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1842 return;
1710 1843
1711 switch (ev.type) 1844 switch (ev.type)
1712 { 1845 {
1713 case PropertyNotify: 1846 case PropertyNotify:
1714 /* 1847 /*
1715 * if user used some Esetroot compatible prog to set the root bg, 1848 * if user used some Esetroot compatible prog to set the root bg,
1716 * use the property to determine the pixmap. We use it later on. 1849 * use the property to determine the pixmap. We use it later on.
1717 */ 1850 */
1718 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1851 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1719 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1852 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1720 return; 1853 {
1854 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1855 }
1721 1856
1722 /* FALLTHROUGH */
1723 case ReparentNotify:
1724 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1725 want_refresh = want_full_refresh = 1;
1726 break; 1857 break;
1727 } 1858 }
1859
1860 refresh_check ();
1728} 1861}
1729#endif 1862#endif
1730 1863
1731void 1864void
1732rxvt_term::button_press (XButtonEvent &ev) 1865rxvt_term::button_press (XButtonEvent &ev)
1733{ 1866{
1734 int reportmode = 0, clickintime; 1867 int reportmode = 0, clickintime;
1735 1868
1736 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1869 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1870
1737 if (!bypass_keystate) 1871 if (!bypass_keystate)
1738 reportmode = !! (priv_modes & PrivMode_mouse_report); 1872 reportmode = !! (priv_modes & PrivMode_mouse_report);
1739 1873
1740 /* 1874 /*
1741 * VT window processing of button press 1875 * VT window processing of button press
1742 */ 1876 */
1743 if (ev.window == vt) 1877 if (ev.window == vt)
1744 { 1878 {
1879 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1880 return;
1881
1745#if ISO_14755 1882#if ISO_14755
1746 // 5.4 1883 // 5.4
1747 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1884 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1748 { 1885 {
1749 iso14755_54 (ev.x, ev.y); 1886 iso14755_54 (ev.x, ev.y);
1750 return; 1887 return;
1751 } 1888 }
1752#endif 1889#endif
1753 1890
1754 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1891 clickintime = ev.time - MEvent.time < multiClickTime;
1755 1892
1756 if (reportmode) 1893 if (reportmode)
1757 { 1894 {
1758 /* mouse report from vt window */ 1895 /* mouse report from vt window */
1759 /* save the xbutton state (for ButtonRelease) */ 1896 /* save the xbutton state (for ButtonRelease) */
1760 MEvent.state = ev.state; 1897 MEvent.state = ev.state;
1761#ifdef MOUSE_REPORT_DOUBLECLICK 1898#ifdef MOUSE_REPORT_DOUBLECLICK
1762 if (ev.button == MEvent.button && clickintime) 1899 if (ev.button == MEvent.button && clickintime)
1763 { 1900 {
1764 /* same button, within alloted time */ 1901 /* same button, within allowed time */
1765 MEvent.clicks++; 1902 MEvent.clicks++;
1903
1766 if (MEvent.clicks > 1) 1904 if (MEvent.clicks > 1)
1767 { 1905 {
1768 /* only report double clicks */ 1906 /* only report double clicks */
1769 MEvent.clicks = 2; 1907 MEvent.clicks = 2;
1770 mouse_report (ev); 1908 mouse_report (ev);
… …
1782 mouse_report (ev); 1920 mouse_report (ev);
1783 } 1921 }
1784#else 1922#else
1785 MEvent.button = ev.button; 1923 MEvent.button = ev.button;
1786 mouse_report (ev); 1924 mouse_report (ev);
1787#endif /* MOUSE_REPORT_DOUBLECLICK */ 1925#endif /* MOUSE_REPORT_DOUBLECLICK */
1788 1926
1789 } 1927 }
1790 else 1928 else
1791 { 1929 {
1792 if (ev.button != MEvent.button) 1930 if (ev.button != MEvent.button)
… …
1802#else 1940#else
1803 selection.rect = false; 1941 selection.rect = false;
1804#endif 1942#endif
1805 1943
1806 /* allow shift+left click to extend selection */ 1944 /* allow shift+left click to extend selection */
1807 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1945 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1808 { 1946 {
1809 if (MEvent.button == Button1 && clickintime) 1947 if (MEvent.button == Button1 && clickintime)
1810 selection_rotate (ev.x, ev.y); 1948 selection_rotate (ev.x, ev.y);
1811 else 1949 else
1812 selection_extend (ev.x, ev.y, 1); 1950 selection_extend (ev.x, ev.y, 1);
… …
1840 } 1978 }
1841 1979
1842 /* 1980 /*
1843 * Scrollbar window processing of button press 1981 * Scrollbar window processing of button press
1844 */ 1982 */
1845 if (isScrollbarWindow (ev.window)) 1983 if (scrollBar.state && ev.window == scrollBar.win)
1846 { 1984 {
1847 scrollBar.setIdle (); 1985 page_dirn direction = NO_DIR;
1986
1987 if (scrollBar.upButton (ev.y))
1988 direction = UP; /* up */
1989 else if (scrollBar.dnButton (ev.y))
1990 direction = DN; /* down */
1991
1992 scrollBar.state = SB_STATE_IDLE;
1848 /* 1993 /*
1849 * Rxvt-style scrollbar: 1994 * Rxvt-style scrollbar:
1850 * move up if mouse is above slider 1995 * move up if mouse is above slider
1851 * move dn if mouse is below slider 1996 * move dn if mouse is below slider
1852 * 1997 *
… …
1861 /* 2006 /*
1862 * Mouse report disabled scrollbar: 2007 * Mouse report disabled scrollbar:
1863 * arrow buttons - send up/down 2008 * arrow buttons - send up/down
1864 * click on scrollbar - send pageup/down 2009 * click on scrollbar - send pageup/down
1865 */ 2010 */
1866 if ((scrollBar.style == R_SB_NEXT 2011 if (direction == UP)
1867 && scrollbarnext_upButton (ev.y))
1868 || (scrollBar.style == R_SB_RXVT
1869 && scrollbarrxvt_upButton (ev.y)))
1870 tt_printf ("\033[A"); 2012 tt_printf ("\033[A");
1871 else if ((scrollBar.style == R_SB_NEXT 2013 else if (direction == DN)
1872 && scrollbarnext_dnButton (ev.y))
1873 || (scrollBar.style == R_SB_RXVT
1874 && scrollbarrxvt_dnButton (ev.y)))
1875 tt_printf ("\033[B"); 2014 tt_printf ("\033[B");
1876 else 2015 else
1877 switch (ev.button) 2016 switch (ev.button)
1878 { 2017 {
1879 case Button2: 2018 case Button2:
… …
1886 tt_printf ("\033[5~"); 2025 tt_printf ("\033[5~");
1887 break; 2026 break;
1888 } 2027 }
1889 } 2028 }
1890 else 2029 else
1891#endif /* NO_SCROLLBAR_REPORT */ 2030#endif /* NO_SCROLLBAR_REPORT */
1892
1893 {
1894 char upordown = 0;
1895
1896 if (scrollBar.style == R_SB_NEXT)
1897 { 2031 {
1898 if (scrollbarnext_upButton (ev.y)) 2032 if (direction != NO_DIR)
1899 upordown = -1; /* up */
1900 else if (scrollbarnext_dnButton (ev.y))
1901 upordown = 1; /* down */
1902 }
1903 else if (scrollBar.style == R_SB_RXVT)
1904 {
1905 if (scrollbarrxvt_upButton (ev.y))
1906 upordown = -1; /* up */
1907 else if (scrollbarrxvt_dnButton (ev.y))
1908 upordown = 1; /* down */
1909 }
1910 if (upordown)
1911 { 2033 {
1912#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2034#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2035 if (!cont_scroll_ev.is_active ())
1913 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2036 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1914#endif 2037#endif
1915 if (scr_page (upordown < 0 ? UP : DN, 1)) 2038 if (scr_page (direction, 1))
1916 { 2039 {
1917 if (upordown < 0) 2040 if (direction == UP)
1918 scrollBar.setUp (); 2041 scrollBar.state = SB_STATE_UP;
1919 else 2042 else
1920 scrollBar.setDn (); 2043 scrollBar.state = SB_STATE_DOWN;
1921 } 2044 }
1922 } 2045 }
1923 else 2046 else
1924 switch (ev.button) 2047 switch (ev.button)
1925 { 2048 {
1926 case Button2: 2049 case Button2:
1927 switch (scrollbar_align) 2050 switch (scrollBar.align)
1928 { 2051 {
1929 case R_SB_ALIGN_TOP: 2052 case SB_ALIGN_TOP:
1930 csrO = 0; 2053 csrO = 0;
1931 break; 2054 break;
1932 case R_SB_ALIGN_CENTRE: 2055 case SB_ALIGN_CENTRE:
1933 csrO = (scrollBar.bot - scrollBar.top) / 2; 2056 csrO = (scrollBar.bot - scrollBar.top) / 2;
1934 break; 2057 break;
1935 case R_SB_ALIGN_BOTTOM: 2058 case SB_ALIGN_BOTTOM:
1936 csrO = scrollBar.bot - scrollBar.top; 2059 csrO = scrollBar.bot - scrollBar.top;
1937 break; 2060 break;
1938 } 2061 }
1939 2062
1940 if (scrollBar.style == R_SB_XTERM 2063 if (scrollBar.style == SB_STYLE_XTERM
1941 || scrollbar_above_slider (ev.y) 2064 || scrollBar.above_slider (ev.y)
1942 || scrollbar_below_slider (ev.y)) 2065 || scrollBar.below_slider (ev.y))
1943 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2066 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
1944 2067
1945 scrollBar.setMotion (); 2068 scrollBar.state = SB_STATE_MOTION;
1946 break; 2069 break;
1947 2070
1948 case Button1: 2071 case Button1:
1949 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2072 if (scrollBar.align == SB_ALIGN_CENTRE)
1950 csrO = ev.y - scrollBar.top; 2073 csrO = ev.y - scrollBar.top;
1951 /* FALLTHROUGH */ 2074 /* FALLTHROUGH */
1952 2075
1953 case Button3: 2076 case Button3:
1954 if (scrollBar.style != R_SB_XTERM) 2077 if (scrollBar.style != SB_STYLE_XTERM)
1955 { 2078 {
1956 if (scrollbar_above_slider (ev.y)) 2079 if (scrollBar.above_slider (ev.y))
1957# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
1958 scr_page (UP, nrow - 1); 2081 scr_page (UP, nrow - 1);
1959# else 2082# else
1960 scr_page (UP, nrow / 4); 2083 scr_page (UP, nrow / 4);
1961# endif 2084# endif
1962 else if (scrollbar_below_slider (ev.y)) 2085 else if (scrollBar.below_slider (ev.y))
1963# ifdef RXVT_SCROLL_FULL 2086# ifdef RXVT_SCROLL_FULL
1964 scr_page (DN, nrow - 1); 2087 scr_page (DN, nrow - 1);
1965# else 2088# else
1966 scr_page (DN, nrow / 4); 2089 scr_page (DN, nrow / 4);
1967# endif 2090# endif
1968 else 2091 else
1969 scrollBar.setMotion (); 2092 scrollBar.state = SB_STATE_MOTION;
1970 } 2093 }
1971 else 2094 else
1972 { 2095 {
1973 scr_page ((ev.button == Button1 ? DN : UP), 2096 scr_page ((ev.button == Button1 ? DN : UP),
1974 (nrow 2097 (nrow
1975 * scrollbar_position (ev.y) 2098 * scrollBar.position (ev.y)
1976 / scrollbar_size ())); 2099 / scrollBar.size ()));
1977 } 2100 }
1978 2101
1979 break; 2102 break;
1980 } 2103 }
1981 } 2104 }
2105
1982 return; 2106 return;
1983 } 2107 }
1984#if MENUBAR
1985 /*
1986 * Menubar window processing of button press
1987 */
1988 if (isMenuBarWindow (ev.window))
1989 menubar_control (ev);
1990#endif
1991} 2108}
1992 2109
1993void 2110void
1994rxvt_term::button_release (XButtonEvent &ev) 2111rxvt_term::button_release (XButtonEvent &ev)
1995{ 2112{
… …
1997 2114
1998 csrO = 0; /* reset csr Offset */ 2115 csrO = 0; /* reset csr Offset */
1999 if (!bypass_keystate) 2116 if (!bypass_keystate)
2000 reportmode = !! (priv_modes & PrivMode_mouse_report); 2117 reportmode = !! (priv_modes & PrivMode_mouse_report);
2001 2118
2002 if (scrollbar_isUpDn ()) 2119 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2003 { 2120 {
2004 scrollBar.setIdle (); 2121 scrollBar.state = SB_STATE_IDLE;
2005 scrollbar_show (0); 2122 scrollBar.show (0);
2006#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2007 refresh_type &= ~SMOOTH_REFRESH;
2008#endif
2009 } 2123 }
2010 2124
2011#ifdef SELECTION_SCROLLING 2125#ifdef SELECTION_SCROLLING
2012 if (sel_scroll_ev.active)
2013 sel_scroll_ev.stop(); 2126 sel_scroll_ev.stop();
2014#endif 2127#endif
2015 2128
2016 if (ev.window == vt) 2129 if (ev.window == vt)
2017 { 2130 {
2131 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2132 return;
2133
2018#if ISO_14755 2134#if ISO_14755
2019 // 5.4 2135 // 5.4
2020 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2136 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2021 return; 2137 return;
2022#endif 2138#endif
2139
2023 if (reportmode) 2140 if (reportmode)
2024 { 2141 {
2025 /* mouse report from vt window */ 2142 /* mouse report from vt window */
2026 /* don't report release of wheel "buttons" */ 2143 /* don't report release of wheel "buttons" */
2027 if (ev.button >= 4) 2144 if (ev.button >= 4)
… …
2029#ifdef MOUSE_REPORT_DOUBLECLICK 2146#ifdef MOUSE_REPORT_DOUBLECLICK
2030 /* only report the release of 'slow' single clicks */ 2147 /* only report the release of 'slow' single clicks */
2031 if (MEvent.button != AnyButton 2148 if (MEvent.button != AnyButton
2032 && (ev.button != MEvent.button 2149 && (ev.button != MEvent.button
2033 || (ev.time - MEvent.time 2150 || (ev.time - MEvent.time
2034 > MULTICLICK_TIME / 2))) 2151 > multiClickTime / 2)))
2035 { 2152 {
2036 MEvent.clicks = 0; 2153 MEvent.clicks = 0;
2037 MEvent.button = AnyButton; 2154 MEvent.button = AnyButton;
2038 mouse_report (ev); 2155 mouse_report (ev);
2039 } 2156 }
2040#else /* MOUSE_REPORT_DOUBLECLICK */ 2157#else /* MOUSE_REPORT_DOUBLECLICK */
2041 MEvent.button = AnyButton; 2158 MEvent.button = AnyButton;
2042 mouse_report (ev); 2159 mouse_report (ev);
2043#endif /* MOUSE_REPORT_DOUBLECLICK */ 2160#endif /* MOUSE_REPORT_DOUBLECLICK */
2044 return; 2161 return;
2045 } 2162 }
2046 2163
2047 /* 2164 /*
2048 * dumb hack to compensate for the failure of click-and-drag 2165 * dumb hack to compensate for the failure of click-and-drag
… …
2057 { 2174 {
2058 case Button1: 2175 case Button1:
2059 case Button3: 2176 case Button3:
2060 selection_make (ev.time); 2177 selection_make (ev.time);
2061 break; 2178 break;
2179
2062 case Button2: 2180 case Button2:
2063 selection_request (ev.time, ev.x, ev.y); 2181 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2182 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2064 break; 2183 break;
2184
2065#ifdef MOUSE_WHEEL 2185#ifdef MOUSE_WHEEL
2066 case Button4: 2186 case Button4:
2067 case Button5: 2187 case Button5:
2068 { 2188 {
2069 int i; 2189 int lines;
2070 page_dirn v; 2190 page_dirn dirn;
2071 2191
2072 v = ev.button == Button4 ? UP : DN; 2192 dirn = ev.button == Button4 ? UP : DN;
2073 2193
2074 if (ev.state & ShiftMask) 2194 if (ev.state & ShiftMask)
2075 i = 1; 2195 lines = 1;
2076 else if (options & Opt_mouseWheelScrollPage) 2196 else if (option (Opt_mouseWheelScrollPage))
2077 i = nrow - 1; 2197 lines = nrow - 1;
2078 else 2198 else
2079 i = 5; 2199 lines = 5;
2080 2200
2081# ifdef MOUSE_SLIP_WHEELING 2201# ifdef MOUSE_SLIP_WHEELING
2082 if (ev.state & ControlMask) 2202 if (ev.state & ControlMask)
2083 { 2203 {
2084 mouse_slip_wheel_speed += v ? -1 : 1; 2204 mouse_slip_wheel_speed += dirn;
2085 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2205 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2086 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2087 2206
2088 if (slip_wheel_ev.at < NOW) 2207 if (!slip_wheel_ev.is_active ())
2089 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2208 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2090
2091 slip_wheel_ev.start ();
2092 } 2209 }
2093 else 2210 else
2211# endif
2094 { 2212 {
2095# endif
2096# ifdef JUMP_MOUSE_WHEEL
2097 scr_page (v, i); 2213 scr_page (dirn, lines);
2098 scr_refresh (SMOOTH_REFRESH);
2099 scrollbar_show (1); 2214 scrollBar.show (1);
2100# else
2101 while (i--)
2102 {
2103 scr_page (v, 1);
2104 scr_refresh (SMOOTH_REFRESH);
2105 scrollbar_show (1);
2106 }
2107# endif
2108# ifdef MOUSE_SLIP_WHEELING
2109 } 2215 }
2110#endif
2111 } 2216 }
2112 break; 2217 break;
2113#endif 2218#endif
2114 } 2219 }
2115 } 2220 }
2116#ifdef MENUBAR
2117 else if (isMenuBarWindow (ev.window))
2118 menubar_control (ev);
2119#endif
2120} 2221}
2121
2122#ifdef TRANSPARENT
2123#if TINTING
2124/* taken from aterm-0.4.2 */
2125
2126typedef uint32_t RUINT32T;
2127
2128void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2129{
2130 int sh_r, sh_g, sh_b;
2131 RUINT32T mask_r, mask_g, mask_b;
2132 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2133 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2134 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2135 int i;
2136
2137 Visual *visual = display->visual;
2138
2139 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2140
2141 /* for convenience */
2142 mask_r = visual->red_mask;
2143 mask_g = visual->green_mask;
2144 mask_b = visual->blue_mask;
2145
2146 /* boring lookup table pre-initialization */
2147 switch (srcImage->bits_per_pixel) {
2148 case 15:
2149 if ((mask_r != 0x7c00) ||
2150 (mask_g != 0x03e0) ||
2151 (mask_b != 0x001f))
2152 return;
2153 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2154 lookup_r = lookup;
2155 lookup_g = lookup+32;
2156 lookup_b = lookup+32+32;
2157 sh_r = 10;
2158 sh_g = 5;
2159 sh_b = 0;
2160 break;
2161 case 16:
2162 if ((mask_r != 0xf800) ||
2163 (mask_g != 0x07e0) ||
2164 (mask_b != 0x001f))
2165 return;
2166 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2167 lookup_r = lookup;
2168 lookup_g = lookup+32;
2169 lookup_b = lookup+32+64;
2170 sh_r = 11;
2171 sh_g = 5;
2172 sh_b = 0;
2173 break;
2174 case 24:
2175 if ((mask_r != 0xff0000) ||
2176 (mask_g != 0x00ff00) ||
2177 (mask_b != 0x0000ff))
2178 return;
2179 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2180 lookup_r = lookup;
2181 lookup_g = lookup+256;
2182 lookup_b = lookup+256+256;
2183 sh_r = 16;
2184 sh_g = 8;
2185 sh_b = 0;
2186 break;
2187 case 32:
2188 if ((mask_r != 0xff0000) ||
2189 (mask_g != 0x00ff00) ||
2190 (mask_b != 0x0000ff))
2191 return;
2192 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2193 lookup_r = lookup;
2194 lookup_g = lookup+256;
2195 lookup_b = lookup+256+256;
2196 sh_r = 16;
2197 sh_g = 8;
2198 sh_b = 0;
2199 break;
2200 default:
2201 return; /* we do not support this color depth */
2202 }
2203
2204 /* prepare limits for color transformation (each channel is handled separately) */
2205 if (shade < 0) {
2206 shade = -shade;
2207 if (shade < 0) shade = 0;
2208 if (shade > 100) shade = 100;
2209
2210 lower_lim_r = 65535-rm;
2211 lower_lim_g = 65535-gm;
2212 lower_lim_b = 65535-bm;
2213
2214 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2215 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2216 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2217
2218 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2219 } else {
2220 if (shade < 0) shade = 0;
2221 if (shade > 100) shade = 100;
2222
2223 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2224
2225 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2226 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2227 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2228 }
2229
2230 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2231 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2232 {
2233 unsigned int tmp;
2234
2235 tmp = lower_lim_r;
2236 lower_lim_r = lower_lim_b;
2237 lower_lim_b = tmp;
2238
2239 tmp = upper_lim_r;
2240 upper_lim_r = upper_lim_b;
2241 upper_lim_b = tmp;
2242 }
2243
2244 /* fill our lookup tables */
2245 for (i = 0; i <= mask_r>>sh_r; i++)
2246 {
2247 RUINT32T tmp;
2248 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2249 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2250 lookup_r[i] = (tmp/65535)<<sh_r;
2251 }
2252 for (i = 0; i <= mask_g>>sh_g; i++)
2253 {
2254 RUINT32T tmp;
2255 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2256 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2257 lookup_g[i] = (tmp/65535)<<sh_g;
2258 }
2259 for (i = 0; i <= mask_b>>sh_b; i++)
2260 {
2261 RUINT32T tmp;
2262 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2263 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2264 lookup_b[i] = (tmp/65535)<<sh_b;
2265 }
2266
2267 /* apply table to input image (replacing colors by newly calculated ones) */
2268 switch (srcImage->bits_per_pixel)
2269 {
2270 case 15:
2271 {
2272 unsigned short *p1, *pf, *p, *pl;
2273 p1 = (unsigned short *) srcImage->data;
2274 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2275 while (p1 < pf)
2276 {
2277 p = p1;
2278 pl = p1 + srcImage->width;
2279 for (; p < pl; p++)
2280 {
2281 *p = lookup_r[(*p & 0x7c00)>>10] |
2282 lookup_g[(*p & 0x03e0)>> 5] |
2283 lookup_b[(*p & 0x001f)];
2284 }
2285 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2286 }
2287 break;
2288 }
2289 case 16:
2290 {
2291 unsigned short *p1, *pf, *p, *pl;
2292 p1 = (unsigned short *) srcImage->data;
2293 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2294 while (p1 < pf)
2295 {
2296 p = p1;
2297 pl = p1 + srcImage->width;
2298 for (; p < pl; p++)
2299 {
2300 *p = lookup_r[(*p & 0xf800)>>11] |
2301 lookup_g[(*p & 0x07e0)>> 5] |
2302 lookup_b[(*p & 0x001f)];
2303 }
2304 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2305 }
2306 break;
2307 }
2308 case 24:
2309 {
2310 unsigned char *p1, *pf, *p, *pl;
2311 p1 = (unsigned char *) srcImage->data;
2312 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2313 while (p1 < pf)
2314 {
2315 p = p1;
2316 pl = p1 + srcImage->width * 3;
2317 for (; p < pl; p += 3)
2318 {
2319 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2320 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2321 p[2] = lookup_r[(p[2] & 0x0000ff)];
2322 }
2323 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2324 }
2325 break;
2326 }
2327 case 32:
2328 {
2329 RUINT32T *p1, *pf, *p, *pl;
2330 p1 = (RUINT32T *) srcImage->data;
2331 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2332
2333 while (p1 < pf)
2334 {
2335 p = p1;
2336 pl = p1 + srcImage->width;
2337 for (; p < pl; p++)
2338 {
2339 *p = lookup_r[(*p & 0xff0000)>>16] |
2340 lookup_g[(*p & 0x00ff00)>> 8] |
2341 lookup_b[(*p & 0x0000ff)] |
2342 (*p & ~0xffffff);
2343 }
2344 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2345 }
2346 break;
2347 }
2348 }
2349
2350 free (lookup);
2351}
2352#endif
2353
2354/*
2355 * Check our parents are still who we think they are.
2356 * Do transparency updates if required
2357 */
2358int
2359rxvt_term::check_our_parents ()
2360{
2361 int i, pchanged, aformat, have_pixmap, rootdepth;
2362 unsigned long nitems, bytes_after;
2363 Atom atype;
2364 unsigned char *prop = NULL;
2365 Window root, oldp, *list;
2366 Pixmap rootpixmap = None;
2367 XWindowAttributes wattr, wrootattr;
2368 dDisp;
2369
2370 pchanged = 0;
2371
2372 if (!(options & Opt_transparent))
2373 return pchanged; /* Don't try any more */
2374
2375 XGetWindowAttributes (disp, display->root, &wrootattr);
2376 rootdepth = wrootattr.depth;
2377
2378 XGetWindowAttributes (disp, parent[0], &wattr);
2379
2380 if (rootdepth != wattr.depth)
2381 {
2382 if (am_transparent)
2383 {
2384 pchanged = 1;
2385 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2386 am_transparent = am_pixmap_trans = 0;
2387 }
2388
2389 return pchanged; /* Don't try any more */
2390 }
2391
2392 /* Get all X ops out of the queue so that our information is up-to-date. */
2393 XSync (disp, False);
2394
2395 /*
2396 * Make the frame window set by the window manager have
2397 * the root background. Some window managers put multiple nested frame
2398 * windows for each client, so we have to take care about that.
2399 */
2400 i = (xa[XA_XROOTPMAP_ID]
2401 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2403 &nitems, &bytes_after, &prop) == Success);
2404
2405 if (!i || prop == NULL)
2406 i = (xa[XA_ESETROOT_PMAP_ID]
2407 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2408 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2409 &nitems, &bytes_after, &prop) == Success);
2410
2411 if (!i || prop == NULL
2412#if TINTING
2413 || !rs[Rs_color + Color_tint]
2414#endif
2415 )
2416 have_pixmap = 0;
2417 else
2418 {
2419 have_pixmap = 1;
2420 rootpixmap = *(Pixmap *)prop;
2421 XFree (prop);
2422 }
2423
2424 if (have_pixmap)
2425 {
2426 /*
2427 * Copy display->root pixmap transparency
2428 */
2429 int sx, sy, nx, ny;
2430 unsigned int nw, nh;
2431 Window cr;
2432 XImage *image;
2433 GC gc;
2434 XGCValues gcvalue;
2435
2436 XTranslateCoordinates (disp, parent[0], display->root,
2437 0, 0, &sx, &sy, &cr);
2438 nw = (unsigned int)szHint.width;
2439 nh = (unsigned int)szHint.height;
2440 nx = ny = 0;
2441
2442 if (sx < 0)
2443 {
2444 nw += sx;
2445 nx = -sx;
2446 sx = 0;
2447 }
2448
2449 if (sy < 0)
2450 {
2451 nh += sy;
2452 ny = -sy;
2453 sy = 0;
2454 }
2455
2456 min_it (nw, (unsigned int) (wrootattr.width - sx));
2457 min_it (nh, (unsigned int) (wrootattr.height - sy));
2458
2459 XSync (disp, False);
2460 allowedxerror = -1;
2461 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2462
2463 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2464 /* XXX: may need a delay here? */
2465 allowedxerror = 0;
2466
2467 if (image == NULL)
2468 {
2469 if (am_transparent && am_pixmap_trans)
2470 {
2471 pchanged = 1;
2472 if (pixmap != None)
2473 {
2474 XFreePixmap (disp, pixmap);
2475 pixmap = None;
2476 }
2477 }
2478
2479 am_pixmap_trans = 0;
2480 }
2481 else
2482 {
2483 if (pixmap != None)
2484 XFreePixmap (disp, pixmap);
2485
2486#if TINTING
2487 if (ISSET_PIXCOLOR (Color_tint))
2488 {
2489 unsigned short rm, gm, bm;
2490 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2491
2492 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2493
2494 ShadeXImage (display, image, shade, rm, gm, bm);
2495 }
2496#endif
2497
2498 pixmap = XCreatePixmap (disp, vt,
2499 szHint.width, szHint.height, image->depth);
2500 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2501 XPutImage (disp, pixmap, gc, image, 0, 0,
2502 nx, ny, image->width, image->height);
2503 XFreeGC (disp, gc);
2504 XDestroyImage (image);
2505 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2506 XClearWindow (disp, parent[0]);
2507
2508 if (!am_transparent || !am_pixmap_trans)
2509 pchanged = 1;
2510
2511 am_transparent = am_pixmap_trans = 1;
2512 }
2513 }
2514
2515 if (am_pixmap_trans)
2516 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2517 else
2518 {
2519 unsigned int n;
2520 /*
2521 * InheritPixmap transparency
2522 */
2523 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2524 {
2525 oldp = parent[i];
2526 XQueryTree (disp, parent[i - 1], &root,
2527 &parent[i], &list, &n);
2528 XFree (list);
2529
2530 if (parent[i] == display->root)
2531 {
2532 if (oldp != None)
2533 pchanged = 1;
2534
2535 break;
2536 }
2537
2538 if (oldp != parent[i])
2539 pchanged = 1;
2540 }
2541
2542 n = 0;
2543
2544 if (pchanged)
2545 {
2546 for (; n < (unsigned int)i; n++)
2547 {
2548 XGetWindowAttributes (disp, parent[n], &wattr);
2549 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2550 {
2551 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2552 break;
2553 }
2554 }
2555 }
2556
2557 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2558 {
2559 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2560 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2561 am_transparent = 0;
2562 /* XXX: also turn off Opt_transparent? */
2563 }
2564 else
2565 {
2566#if WAIT_FOR_WM
2567 /* wait (an arbitrary period) for the WM to do its thing
2568 * needed for fvwm2.2.2 (and before?) */
2569 sleep (1);
2570#endif
2571 for (n = 0; n < (unsigned int)i; n++)
2572 {
2573 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2574 XClearWindow (disp, parent[n]);
2575 }
2576
2577 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2578 am_transparent = 1;
2579 }
2580
2581 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 parent[i] = None;
2583 }
2584
2585 if (scrollBar.win)
2586 {
2587 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2588 scrollBar.setIdle ();
2589 scrollbar_show (0);
2590 }
2591
2592 if (am_transparent)
2593 {
2594 want_refresh = want_full_refresh = 1;
2595 if (am_pixmap_trans)
2596 flush ();
2597 }
2598
2599 return pchanged;
2600}
2601#endif
2602 2222
2603/*}}} */ 2223/*}}} */
2604 2224
2605bool 2225void ecb_hot
2606rxvt_term::cmd_parse () 2226rxvt_term::cmd_parse ()
2607{ 2227{
2608 bool flag = false;
2609 unicode_t ch = NOCHAR; 2228 wchar_t ch = NOCHAR;
2610 unsigned char *seq_begin; // remember start of esc-sequence here 2229 char *seq_begin; // remember start of esc-sequence here
2611 2230
2612 for (;;) 2231 for (;;)
2613 { 2232 {
2614 if (ch == NOCHAR) 2233 if (ecb_unlikely (ch == NOCHAR))
2615 { 2234 {
2616 seq_begin = cmdbuf_ptr; 2235 seq_begin = cmdbuf_ptr;
2617 ch = next_char (); 2236 ch = next_char ();
2618 }
2619 2237
2620 if (ch == NOCHAR) // TODO: improve 2238 if (ch == NOCHAR)
2621 break; 2239 break;
2240 }
2622 2241
2623 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2242 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2624 { 2243 {
2625 if (!seen_input) 2244 if (ecb_unlikely (!seen_input))
2626 { 2245 {
2627 seen_input = 1; 2246 seen_input = 1;
2628 // many badly-written programs (e.g. jed) contain a race condition: 2247 // many badly-written programs (e.g. jed) contain a race condition:
2629 // they first read the screensize and then install a SIGWINCH handler. 2248 // they first read the screensize and then install a SIGWINCH handler.
2630 // some window managers resize the window early, and these programs 2249 // some window managers resize the window early, and these programs
… …
2635 if (seen_resize && cmd_pid) 2254 if (seen_resize && cmd_pid)
2636 kill (-cmd_pid, SIGWINCH); 2255 kill (-cmd_pid, SIGWINCH);
2637 } 2256 }
2638 2257
2639 /* Read a text string from the input buffer */ 2258 /* Read a text string from the input buffer */
2640 unicode_t buf[UBUFSIZ]; 2259 wchar_t buf[UBUFSIZ];
2641 bool refreshnow = false; 2260 bool refreshnow = false;
2642 int nlines = 0; 2261 int nlines = 0;
2643 unicode_t *str = buf; 2262 wchar_t *str = buf;
2644 unicode_t *eol = str + min (ncol, UBUFSIZ); 2263 wchar_t *eol = str + min (ncol, UBUFSIZ);
2645 2264
2646 for (;;) 2265 for (;;)
2647 { 2266 {
2648 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2267 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2649 break; 2268 break;
2650 2269
2651 *str++ = ch; 2270 *str++ = ch;
2652 2271
2653 if (ch == C0_LF || str >= eol) 2272 if (ecb_unlikely (ch == C0_LF || str >= eol))
2654 { 2273 {
2655 if (ch == C0_LF) 2274 if (ch == C0_LF)
2656 nlines++; 2275 nlines++;
2657 2276
2658 refresh_count++; 2277 refresh_count++;
2659 2278
2660 if (!(options & Opt_jumpScroll) 2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2661 || (refresh_count >= refresh_limit * (nrow - 1)))
2662 { 2280 {
2281 refresh_count = 0;
2282
2283 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2284 {
2663 refreshnow = true; 2285 refreshnow = true;
2664 ch = NOCHAR; 2286 ch = NOCHAR;
2665 break; 2287 break;
2288 }
2666 } 2289 }
2667 2290
2668 // scr_add_lines only works for nlines <= nrow - 1. 2291 // scr_add_lines only works for nlines <= nrow - 1.
2669 if (nlines >= nrow - 1) 2292 if (nlines >= nrow - 1)
2670 { 2293 {
2294 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2295 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2671 scr_add_lines (buf, nlines, str - buf); 2296 scr_add_lines (buf, str - buf, nlines);
2297
2672 nlines = 0; 2298 nlines = 0;
2673 str = buf; 2299 str = buf;
2674 eol = str + min (ncol, UBUFSIZ); 2300 eol = str + min (ncol, UBUFSIZ);
2675 } 2301 }
2676 2302
… …
2689 2315
2690 seq_begin = cmdbuf_ptr; 2316 seq_begin = cmdbuf_ptr;
2691 ch = next_char (); 2317 ch = next_char ();
2692 } 2318 }
2693 2319
2320 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2321 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2694 scr_add_lines (buf, nlines, str - buf); 2322 scr_add_lines (buf, str - buf, nlines);
2695 2323
2696 /* 2324 /*
2697 * If there have been a lot of new lines, then update the screen 2325 * If there have been a lot of new lines, then update the screen
2698 * What the heck I'll cheat and only refresh less than every page-full. 2326 * What the heck we'll cheat and only refresh less than every page-full.
2699 * the number of pages between refreshes is refresh_limit, which 2327 * if skipScroll is enabled.
2700 * is incremented here because we must be doing flat-out scrolling.
2701 */ 2328 */
2702 if (refreshnow) 2329 if (refreshnow)
2703 { 2330 {
2704 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2705 refresh_limit++;
2706 else
2707 {
2708 flag = true;
2709 scr_refresh (refresh_type); 2331 scr_refresh ();
2710 } 2332 want_refresh = 1;
2711 } 2333 }
2712
2713 } 2334 }
2714 else 2335 else
2715 { 2336 {
2716 try 2337 try
2717 { 2338 {
… …
2725 } 2346 }
2726 2347
2727 ch = NOCHAR; 2348 ch = NOCHAR;
2728 } 2349 }
2729 } 2350 }
2730
2731 return flag;
2732}
2733
2734// read the next octet
2735unicode_t
2736rxvt_term::next_octet ()
2737{
2738 return cmdbuf_ptr < cmdbuf_endp
2739 ? *cmdbuf_ptr++
2740 : NOCHAR;
2741} 2351}
2742 2352
2743// read the next character 2353// read the next character
2744unicode_t 2354wchar_t ecb_hot
2745rxvt_term::next_char () 2355rxvt_term::next_char () NOTHROW
2746{ 2356{
2747 while (cmdbuf_ptr < cmdbuf_endp) 2357 while (cmdbuf_ptr < cmdbuf_endp)
2748 { 2358 {
2749 // assume 7-bit to be ascii ALWAYS 2359 // assume 7-bit to be ascii ALWAYS
2750 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2360 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2751 return *cmdbuf_ptr++; 2361 return *cmdbuf_ptr++;
2752 2362
2753 wchar_t wc; 2363 wchar_t wc;
2754 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2364 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2755 2365
2756 if (len == (size_t)-2) 2366 if (len == (size_t)-2)
2757 { 2367 {
2758 // the mbstate stores incomplete sequences. didn't know this :/ 2368 // the mbstate stores incomplete sequences. didn't know this :/
2759 cmdbuf_ptr = cmdbuf_endp; 2369 cmdbuf_ptr = cmdbuf_endp;
2760 break; 2370 break;
2761 } 2371 }
2762 2372
2763 if (len == (size_t)-1) 2373 if (len == (size_t)-1)
2374 {
2375 mbstate.reset (); // reset now undefined conversion state
2376 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2377 // in which case we "erroneously" return the next byte which might be valid.
2764 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2378 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2379 }
2765 2380
2766 // assume wchar == unicode 2381 // assume wchar == unicode
2767 cmdbuf_ptr += len; 2382 cmdbuf_ptr += len;
2768 return wc & UNICODE_MASK; 2383 return wc & UNICODE_MASK;
2769 } 2384 }
2770 2385
2771 return NOCHAR; 2386 return NOCHAR;
2772} 2387}
2773 2388
2774/* rxvt_cmd_getc () - Return next input character */ 2389// read the next octet
2775/* 2390uint32_t ecb_hot
2776 * Return the next input character after first passing any keyboard input 2391rxvt_term::next_octet () NOTHROW
2777 * to the command.
2778 */
2779unicode_t
2780rxvt_term::cmd_getc ()
2781{ 2392{
2393 return cmdbuf_ptr < cmdbuf_endp
2394 ? (unsigned char)*cmdbuf_ptr++
2395 : NOCHAR;
2396}
2397
2398static class out_of_input out_of_input;
2399
2400wchar_t ecb_hot
2401rxvt_term::cmd_getc () THROW ((class out_of_input))
2402{
2782 unicode_t c = next_char (); 2403 wchar_t c = next_char ();
2783 2404
2784 if (c == NOCHAR) 2405 if (c == NOCHAR)
2785 throw out_of_input; 2406 throw out_of_input;
2786 2407
2787 return c; 2408 return c;
2788} 2409}
2789 2410
2790unicode_t 2411uint32_t ecb_hot
2791rxvt_term::cmd_get8 () 2412rxvt_term::cmd_get8 () THROW ((class out_of_input))
2792{ 2413{
2793 unicode_t c = next_octet (); 2414 uint32_t c = next_octet ();
2794 2415
2795 if (c == NOCHAR) 2416 if (c == NOCHAR)
2796 throw out_of_input; 2417 throw out_of_input;
2797 2418
2798 return c; 2419 return c;
2799} 2420}
2800 2421
2801/*{{{ print pipe */ 2422/*{{{ print pipe */
2802/*----------------------------------------------------------------------*/ 2423/*----------------------------------------------------------------------*/
2803#ifdef PRINTPIPE 2424#ifdef PRINTPIPE
2804FILE * 2425FILE * ecb_cold
2805rxvt_term::popen_printer () 2426rxvt_term::popen_printer ()
2806{ 2427{
2807 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2428 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2808 2429
2809 if (stream == NULL) 2430 if (stream == NULL)
2810 rxvt_warn ("can't open printer pipe, not printing.\n"); 2431 rxvt_warn ("can't open printer pipe, not printing.\n");
2811 2432
2812 return stream; 2433 return stream;
2813} 2434}
2814 2435
2815int 2436int ecb_cold
2816rxvt_term::pclose_printer (FILE *stream) 2437rxvt_term::pclose_printer (FILE *stream)
2817{ 2438{
2818 fflush (stream); 2439 fflush (stream);
2819 return pclose (stream); 2440 return pclose (stream);
2820} 2441}
2821 2442
2822/* 2443/*
2823 * simulate attached vt100 printer 2444 * simulate attached vt100 printer
2824 */ 2445 */
2825void 2446void ecb_cold
2826rxvt_term::process_print_pipe () 2447rxvt_term::process_print_pipe ()
2827{ 2448{
2828 int done; 2449 FILE *fd = popen_printer ();
2829 FILE *fd;
2830 2450
2831 if ((fd = popen_printer ()) == NULL) 2451 if (!fd)
2832 return; 2452 return;
2833 2453
2834 /* 2454 /*
2835 * Send all input to the printer until either ESC[4i or ESC[?4i 2455 * Send all input to the printer until either ESC[4i or ESC[?4i
2836 * is received. 2456 * is received.
2837 */ 2457 */
2838 for (done = 0; !done;) 2458 for (int done = 0; !done; )
2839 { 2459 {
2840 unsigned char buf[8]; 2460 unsigned char buf[8];
2841 unicode_t ch; 2461 unicode_t ch;
2842 unsigned int i, len; 2462 unsigned int i, len;
2843 2463
… …
2862 { 2482 {
2863 if ((buf[len++] = cmd_getc ()) == 'i') 2483 if ((buf[len++] = cmd_getc ()) == 'i')
2864 break; /* done = 1 */ 2484 break; /* done = 1 */
2865 } 2485 }
2866 } 2486 }
2867 2487
2868 for (i = 0; i < len; i++) 2488 for (i = 0; i < len; i++)
2869 if (putc (buf[i], fd) == EOF) 2489 if (putc (buf[i], fd) == EOF)
2870 { 2490 {
2871 done = 1; 2491 done = 1;
2872 break; 2492 break;
… …
2874 } 2494 }
2875 } 2495 }
2876 2496
2877 pclose_printer (fd); 2497 pclose_printer (fd);
2878} 2498}
2879#endif /* PRINTPIPE */ 2499#endif /* PRINTPIPE */
2880/*}}} */ 2500/*}}} */
2881 2501
2882/* *INDENT-OFF* */
2883enum { 2502enum {
2884 C1_40 = 0x40, 2503 C1_40 = 0x40,
2885 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2504 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2886 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2505 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2887 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2506 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2888 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2507 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2889}; 2508};
2890/* *INDENT-ON* */
2891 2509
2892/*{{{ process non-printing single characters */ 2510/*{{{ process non-printing single characters */
2893void 2511void ecb_hot
2894rxvt_term::process_nonprinting (unicode_t ch) 2512rxvt_term::process_nonprinting (unicode_t ch)
2895{ 2513{
2896 switch (ch) 2514 switch (ch)
2897 { 2515 {
2898 case C0_ESC: 2516 case C0_ESC:
2899 process_escape_seq (); 2517 process_escape_seq ();
2900 break; 2518 break;
2901 case C0_ENQ: /* terminal Status */ 2519 case C0_ENQ: /* terminal Status */
2902 if (rs[Rs_answerbackstring]) 2520 if (rs[Rs_answerbackstring])
2903 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2521 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2904 (unsigned int)strlen (rs[Rs_answerbackstring]));
2905 else 2522 else
2906 tt_write ((unsigned char *)VT100_ANS, 2523 tt_write (VT100_ANS, strlen (VT100_ANS));
2907 (unsigned int)strlen (VT100_ANS));
2908 break; 2524 break;
2909 case C0_BEL: /* bell */ 2525 case C0_BEL: /* bell */
2910 scr_bell (); 2526 scr_bell ();
2911 break; 2527 break;
2912 case C0_BS: /* backspace */ 2528 case C0_BS: /* backspace */
… …
2930 scr_charset_choose (0); 2546 scr_charset_choose (0);
2931 break; 2547 break;
2932 2548
2933#ifdef EIGHT_BIT_CONTROLS 2549#ifdef EIGHT_BIT_CONTROLS
2934 // 8-bit controls 2550 // 8-bit controls
2935 case 0x90: /* DCS */ 2551 case 0x90: /* DCS */
2936 process_dcs_seq (); 2552 process_dcs_seq ();
2937 break; 2553 break;
2938 case 0x9b: /* CSI */ 2554 case 0x9b: /* CSI */
2939 process_csi_seq (); 2555 process_csi_seq ();
2940 break; 2556 break;
2941 case 0x9d: /* CSI */ 2557 case 0x9d: /* OSC */
2942 process_osc_seq (); 2558 process_osc_seq ();
2943 break; 2559 break;
2944#endif 2560#endif
2945 } 2561 }
2946} 2562}
2947/*}}} */ 2563/*}}} */
2948 2564
2949 2565
2950/*{{{ process VT52 escape sequences */ 2566/*{{{ process VT52 escape sequences */
2951void 2567void ecb_cold
2952rxvt_term::process_escape_vt52 (unicode_t ch) 2568rxvt_term::process_escape_vt52 (unicode_t ch)
2953{ 2569{
2954 int row, col; 2570 int row, col;
2955 2571
2956 switch (ch) 2572 switch (ch)
… …
2990 break; 2606 break;
2991 case 'Z': /* identify the terminal type */ 2607 case 'Z': /* identify the terminal type */
2992 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2608 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2993 break; 2609 break;
2994 case '<': /* turn off VT52 mode */ 2610 case '<': /* turn off VT52 mode */
2995 PrivMode (0, PrivMode_vt52); 2611 priv_modes &= ~PrivMode_vt52;
2996 break; 2612 break;
2997 case 'F': /* use special graphics character set */ 2613 case 'F': /* use special graphics character set */
2998 case 'G': /* use regular character set */ 2614 case 'G': /* use regular character set */
2999 /* unimplemented */ 2615 /* unimplemented */
3000 break; 2616 break;
… …
3006} 2622}
3007/*}}} */ 2623/*}}} */
3008 2624
3009 2625
3010/*{{{ process escape sequences */ 2626/*{{{ process escape sequences */
3011void 2627void ecb_hot
3012rxvt_term::process_escape_seq () 2628rxvt_term::process_escape_seq ()
3013{ 2629{
3014 unicode_t ch = cmd_getc (); 2630 unicode_t ch = cmd_getc ();
3015 2631
3016 if (priv_modes & PrivMode_vt52) 2632 if (priv_modes & PrivMode_vt52)
… …
3019 return; 2635 return;
3020 } 2636 }
3021 2637
3022 switch (ch) 2638 switch (ch)
3023 { 2639 {
3024 /* case 1: do_tek_mode (); break; */
3025 case '#': 2640 case '#':
3026 if (cmd_getc () == '8') 2641 if (cmd_getc () == '8')
3027 scr_E (); 2642 scr_E ();
3028 break; 2643 break;
3029 case '(': 2644 case '(':
… …
3036 scr_charset_set (2, (unsigned int)cmd_getc ()); 2651 scr_charset_set (2, (unsigned int)cmd_getc ());
3037 break; 2652 break;
3038 case '+': 2653 case '+':
3039 scr_charset_set (3, (unsigned int)cmd_getc ()); 2654 scr_charset_set (3, (unsigned int)cmd_getc ());
3040 break; 2655 break;
3041#if ENABLE_FRILLS 2656#if !ENABLE_MINIMAL
3042 case '6': 2657 case '6':
3043 scr_backindex (); 2658 scr_backindex ();
3044 break; 2659 break;
3045#endif 2660#endif
3046 case '7': 2661 case '7':
3047 scr_cursor (SAVE); 2662 scr_cursor (SAVE);
3048 break; 2663 break;
3049 case '8': 2664 case '8':
3050 scr_cursor (RESTORE); 2665 scr_cursor (RESTORE);
3051 break; 2666 break;
3052#if ENABLE_FRILLS 2667#if !ENABLE_MINIMAL
3053 case '9': 2668 case '9':
3054 scr_forwardindex (); 2669 scr_forwardindex ();
3055 break; 2670 break;
3056#endif 2671#endif
2672 // DECPAM/DECPNM
3057 case '=': 2673 case '=':
2674 priv_modes |= PrivMode_aplKP;
2675 break;
3058 case '>': 2676 case '>':
3059 PrivMode ((ch == '='), PrivMode_aplKP); 2677 priv_modes &= ~PrivMode_aplKP;
3060 break; 2678 break;
3061 2679
3062 case C1_40: 2680 case C1_40:
3063 cmd_getc (); 2681 cmd_getc ();
3064 break; 2682 break;
… …
3067 break; 2685 break;
3068 2686
3069 /* 8.3.87: NEXT LINE */ 2687 /* 8.3.87: NEXT LINE */
3070 case C1_NEL: /* ESC E */ 2688 case C1_NEL: /* ESC E */
3071 { 2689 {
3072 unicode_t nlcr[] = { C0_LF, C0_CR }; 2690 wchar_t nlcr[] = { C0_LF, C0_CR };
3073 scr_add_lines (nlcr, 1, 2); 2691 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3074 } 2692 }
3075 break; 2693 break;
3076 2694
3077 /* kidnapped escape sequence: Should be 8.3.48 */ 2695 /* kidnapped escape sequence: Should be 8.3.48 */
3078 case C1_ESA: /* ESC G */ 2696 case C1_ESA: /* ESC G */
3079 process_graphics (); 2697 // used by original rxvt for rob nations own graphics mode
2698 if (cmd_getc () == 'Q')
2699 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3080 break; 2700 break;
3081 2701
3082 /* 8.3.63: CHARACTER TABULATION SET */ 2702 /* 8.3.63: CHARACTER TABULATION SET */
3083 case C1_HTS: /* ESC H */ 2703 case C1_HTS: /* ESC H */
3084 scr_set_tab (1); 2704 scr_set_tab (1);
… …
3088 case C1_RI: /* ESC M */ 2708 case C1_RI: /* ESC M */
3089 scr_index (DN); 2709 scr_index (DN);
3090 break; 2710 break;
3091 2711
3092 /* 8.3.142: SINGLE-SHIFT TWO */ 2712 /* 8.3.142: SINGLE-SHIFT TWO */
3093 /*case C1_SS2: scr_single_shift (2); break; */ 2713 /* case C1_SS2: break; */
3094 2714
3095 /* 8.3.143: SINGLE-SHIFT THREE */ 2715 /* 8.3.143: SINGLE-SHIFT THREE */
3096 /*case C1_SS3: scr_single_shift (3); break; */ 2716 /* case C1_SS3: break; */
3097 2717
3098 /* 8.3.27: DEVICE CONTROL STRING */ 2718 /* 8.3.27: DEVICE CONTROL STRING */
3099 case C1_DCS: /* ESC P */ 2719 case C1_DCS: /* ESC P */
3100 process_dcs_seq (); 2720 process_dcs_seq ();
3101 break; 2721 break;
3102 2722
3103 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2723 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3104 case C1_SCI: /* ESC Z */ 2724 case C1_SCI: /* ESC Z */
3105 tt_write ((const unsigned char *)ESCZ_ANSWER, 2725 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3106 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3107 break; /* steal obsolete ESC [ c */ 2726 break; /* steal obsolete ESC [ c */
3108 2727
3109 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2728 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3110 case C1_CSI: /* ESC [ */ 2729 case C1_CSI: /* ESC [ */
3111 process_csi_seq (); 2730 process_csi_seq ();
3112 break; 2731 break;
3113 2732
3114 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2733 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3115 case C1_OSC: /* ESC ] */ 2734 case C1_OSC: /* ESC ] */
3116 process_osc_seq (); 2735 process_osc_seq ();
3117 break; 2736 break;
3118 2737
3119 /* 8.3.106: RESET TO INITIAL STATE */ 2738 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3120 case 'c': 2739 case 'c':
3121 mbstate.reset (); 2740 mbstate.reset ();
3122 scr_poweron (); 2741 scr_poweron ();
3123 scrollbar_show (1); 2742 scrollBar.show (1);
3124 break; 2743 break;
3125 2744
3126 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2745 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3127 case 'n': 2746 case 'n':
3128 scr_charset_choose (2); 2747 scr_charset_choose (2);
… …
3135 } 2754 }
3136} 2755}
3137/*}}} */ 2756/*}}} */
3138 2757
3139/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2758/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3140/* *INDENT-OFF* */
3141enum { 2759enum {
3142 CSI_ICH = 0x40, 2760 CSI_ICH = 0x40,
3143 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2761 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3144 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2762 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3145 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2763 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3148 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2766 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3149 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2767 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3150 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2768 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3151}; 2769};
3152 2770
3153#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2771#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3154 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2772 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3155 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2773 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3156#define get_byte_array_bit(array, bit) \ 2774#define get_byte_array_bit(array, bit) \
3157 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2775 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3158 2776
3159const unsigned char csi_defaults[] = 2777static const unsigned char csi_defaults[] =
3160 { 2778 {
3161 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2779 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3162 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2780 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3163 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2781 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3164 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2782 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3165 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2783 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3166 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2784 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3167 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2785 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3168 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2786 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3169 }; 2787 };
3170/* *INDENT-ON* */
3171 2788
3172void 2789void ecb_hot
3173rxvt_term::process_csi_seq () 2790rxvt_term::process_csi_seq ()
3174{ 2791{
3175 unicode_t ch, priv, i; 2792 unicode_t ch, priv, prev_ch, i;
3176 unsigned int nargs, p; 2793 unsigned int nargs, p;
3177 int n, ndef; 2794 int n, ndef;
3178 int arg[ESC_ARGS]; 2795 int arg[ESC_ARGS] = { };
3179 2796
3180 for (nargs = ESC_ARGS; nargs > 0;) 2797 nargs = 0;
3181 arg[--nargs] = 0;
3182 2798
3183 priv = 0; 2799 priv = 0;
3184 ch = cmd_getc (); 2800 ch = cmd_getc ();
3185 if (ch >= '<' && ch <= '?') 2801 if ((ch >= '<' && ch <= '?') || ch == '!')
2802 {
3186 { /* '<' '=' '>' '?' */ 2803 /* '<' '=' '>' '?' '!' */
3187 priv = ch; 2804 priv = ch;
3188 ch = cmd_getc (); 2805 ch = cmd_getc ();
3189 } 2806 }
3190 2807
2808 prev_ch = 0;
3191 /* read any numerical arguments */ 2809 /* read any numerical arguments */
3192 for (n = -1; ch < CSI_ICH; ) 2810 for (n = -1; ch < CSI_ICH; )
3193 { 2811 {
3194 if (isdigit (ch)) 2812 if (isdigit (ch))
3195 { 2813 {
… …
3205 n = -1; 2823 n = -1;
3206 } 2824 }
3207 else if (IS_CONTROL (ch)) 2825 else if (IS_CONTROL (ch))
3208 process_nonprinting (ch); 2826 process_nonprinting (ch);
3209 2827
2828 prev_ch = ch;
3210 ch = cmd_getc (); 2829 ch = cmd_getc ();
3211 } 2830 }
3212 2831
3213 if (ch > CSI_7F) 2832 if (ch > CSI_7F)
3214 return; 2833 return;
… …
3220 ndef = get_byte_array_bit (csi_defaults, i); 2839 ndef = get_byte_array_bit (csi_defaults, i);
3221 for (p = 0; p < nargs; p++) 2840 for (p = 0; p < nargs; p++)
3222 if (arg[p] == -1) 2841 if (arg[p] == -1)
3223 arg[p] = ndef; 2842 arg[p] = ndef;
3224 2843
3225#ifdef DEBUG_CMD
3226 fprintf (stderr, "CSI ");
3227 for (p = 0; p < nargs; p++)
3228 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3229 fprintf (stderr, "%c\n", ch);
3230#endif
3231
3232 /* 2844 /*
3233 * private mode handling 2845 * private mode handling
3234 */ 2846 */
3235 if (priv) 2847 if (priv)
3236 { 2848 {
3237 switch (priv) 2849 switch (priv)
3238 { 2850 {
3239 case '>': 2851 case '>':
3240 if (ch == CSI_DA) /* secondary device attributes */ 2852 if (ch == CSI_DA) /* secondary device attributes */
3241 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2853 {
2854 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2855 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2856 //
2857 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2858 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2859 // versions.
2860 //
2861 tt_printf ("\033[>%d;95;0c", 'U');
2862 }
3242 break; 2863 break;
2864
3243 case '?': 2865 case '?':
3244 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2866 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3245 process_terminal_mode (ch, priv, nargs, arg); 2867 process_terminal_mode (ch, priv, nargs, arg);
3246 break; 2868 break;
2869
2870 case '!':
2871 if (ch == CSI_70)
2872 {
2873 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2874 scr_soft_reset ();
2875
2876 static const int pm_h[] = { 7, 25 };
2877 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2878
2879 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2880 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3247 } 2881 }
2882 break;
2883 }
2884
3248 return; 2885 return;
3249 } 2886 }
3250 2887
3251 switch (ch) 2888 switch (ch)
3252 { 2889 {
… …
3266 } 2903 }
3267 break; 2904 break;
3268#endif 2905#endif
3269 2906
3270 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2907 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
3271 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2908 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
3272 arg[0] = -arg[0]; 2909 arg[0] = -arg[0];
3273 /* FALLTHROUGH */ 2910 /* FALLTHROUGH */
3274 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2911 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
3275 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2912 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
3276 scr_gotorc (arg[0], 0, RELATIVE); 2913 scr_gotorc (arg[0], 0, RELATIVE);
3277 break; 2914 break;
3278 2915
3279 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2916 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
3280 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2917 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3355 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2992 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3356 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 2993 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3357 break; 2994 break;
3358 2995
3359 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2996 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3360 tt_write ((const unsigned char *)VT100_ANS, 2997 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3361 (unsigned int) (sizeof (VT100_ANS) - 1));
3362 break; 2998 break;
3363 2999
3364 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3000 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3365 process_sgr_mode (nargs, arg); 3001 process_sgr_mode (nargs, arg);
3366 break; 3002 break;
… …
3373 break; 3009 break;
3374 case 6: /* CPR requested */ 3010 case 6: /* CPR requested */
3375 scr_report_position (); 3011 scr_report_position ();
3376 break; 3012 break;
3377 case 7: /* unofficial extension */ 3013 case 7: /* unofficial extension */
3378 if (options & Opt_insecure) 3014 if (option (Opt_insecure))
3379 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3015 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3380 break; 3016 break;
3381 case 8: /* unofficial extension */ 3017 case 8: /* unofficial extension */
3382 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3018 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3383 break; 3019 break;
… …
3431 scr_insert_mode (1); 3067 scr_insert_mode (1);
3432 else if (arg[0] == 20) 3068 else if (arg[0] == 20)
3433 priv_modes |= PrivMode_LFNL; 3069 priv_modes |= PrivMode_LFNL;
3434 break; 3070 break;
3435 3071
3072 case CSI_71: // DECSCUSR: set cursor style
3073 if (prev_ch == ' ')
3074 set_cursor_style (arg[0]);
3075 break;
3076
3436 /* 3077 /*
3437 * PRIVATE USE beyond this point. All CSI_7? sequences here 3078 * PRIVATE USE beyond this point. All CSI_7? sequences here
3438 */ 3079 */
3439 case CSI_72: /* DECSTBM: set top and bottom margins */ 3080 case CSI_72: /* DECSTBM: set top and bottom margins */
3440 if (nargs == 1) 3081 if (nargs == 1)
… …
3450 break; 3091 break;
3451 case CSI_75: 3092 case CSI_75:
3452 scr_cursor (RESTORE); 3093 scr_cursor (RESTORE);
3453 break; 3094 break;
3454 3095
3455#if ENABLE_FRILLS 3096#if !ENABLE_MINIMAL
3456 case CSI_74: 3097 case CSI_74:
3457 process_window_ops (arg, nargs); 3098 process_window_ops (arg, nargs);
3458 break; 3099 break;
3459#endif 3100#endif
3460 3101
… …
3467 break; 3108 break;
3468 } 3109 }
3469} 3110}
3470/*}}} */ 3111/*}}} */
3471 3112
3472#if ENABLE_FRILLS 3113#if !ENABLE_MINIMAL
3473/* ARGSUSED */
3474void 3114void
3475rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3115rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3476{ 3116{
3477 int x, y; 3117 int x, y;
3478 XWindowAttributes wattr; 3118 XWindowAttributes wattr;
3479 Window wdummy; 3119 Window wdummy;
3480 dDisp; 3120
3121 dLocal (Display *, dpy);
3481 3122
3482 if (nargs == 0) 3123 if (nargs == 0)
3483 return; 3124 return;
3484 3125
3485 switch (args[0]) 3126 switch (args[0])
3486 { 3127 {
3487 /* 3128 /*
3488 * commands 3129 * commands
3489 */ 3130 */
3490 case 1: /* deiconify window */ 3131 case 1: /* deiconify window */
3491 XMapWindow (disp, parent[0]); 3132 XMapWindow (dpy, parent);
3492 break; 3133 break;
3493 case 2: /* iconify window */ 3134 case 2: /* iconify window */
3494 XIconifyWindow (disp, parent[0], display->screen); 3135 XIconifyWindow (dpy, parent, display->screen);
3495 break; 3136 break;
3496 case 3: /* set position (pixels) */ 3137 case 3: /* set position (pixels) */
3497 XMoveWindow (disp, parent[0], args[1], args[2]); 3138 XMoveWindow (dpy, parent, args[1], args[2]);
3498 break; 3139 break;
3499 case 4: /* set size (pixels) */ 3140 case 4: /* set size (pixels) */
3500 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3141 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3501 break; 3142 break;
3502 case 5: /* raise window */ 3143 case 5: /* raise window */
3503 XRaiseWindow (disp, parent[0]); 3144 XRaiseWindow (dpy, parent);
3504 break; 3145 break;
3505 case 6: /* lower window */ 3146 case 6: /* lower window */
3506 XLowerWindow (disp, parent[0]); 3147 XLowerWindow (dpy, parent);
3507 break; 3148 break;
3508 case 7: /* refresh window */ 3149 case 7: /* refresh window */
3509 scr_touch (true); 3150 scr_touch (true);
3510 break; 3151 break;
3511 case 8: /* set size (chars) */ 3152 case 8: /* set size (chars) */
… …
3514 break; 3155 break;
3515 3156
3516 //case 9: NYI, TODO, restore maximized window or maximize window 3157 //case 9: NYI, TODO, restore maximized window or maximize window
3517 default: 3158 default:
3518 if (args[0] >= 24) /* set height (chars) */ 3159 if (args[0] >= 24) /* set height (chars) */
3519 set_widthheight ((unsigned int)width, 3160 set_widthheight ((unsigned int)vt_width,
3520 (unsigned int) (args[1] * fheight)); 3161 (unsigned int) (args[1] * fheight));
3521 break; 3162 break;
3522
3523 3163
3524 /* 3164 /*
3525 * reports - some output format copied from XTerm 3165 * reports - some output format copied from XTerm
3526 */ 3166 */
3527 case 11: /* report window state */ 3167 case 11: /* report window state */
3528 XGetWindowAttributes (disp, parent[0], &wattr); 3168 XGetWindowAttributes (dpy, parent, &wattr);
3529 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3169 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3530 break; 3170 break;
3531 case 13: /* report window position */ 3171 case 13: /* report window position */
3532 XGetWindowAttributes (disp, parent[0], &wattr); 3172 XGetWindowAttributes (dpy, parent, &wattr);
3533 XTranslateCoordinates (disp, parent[0], wattr.root, 3173 XTranslateCoordinates (dpy, parent, wattr.root,
3534 -wattr.border_width, -wattr.border_width, 3174 -wattr.border_width, -wattr.border_width,
3535 &x, &y, &wdummy); 3175 &x, &y, &wdummy);
3536 tt_printf ("\033[3;%d;%dt", x, y); 3176 tt_printf ("\033[3;%d;%dt", x, y);
3537 break; 3177 break;
3538 case 14: /* report window size (pixels) */ 3178 case 14: /* report window size (pixels) */
3539 XGetWindowAttributes (disp, parent[0], &wattr); 3179 XGetWindowAttributes (dpy, parent, &wattr);
3540 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3180 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3541 break; 3181 break;
3542 case 18: /* report text area size (chars) */ 3182 case 18: /* report text area size (chars) */
3543 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3183 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3544 break; 3184 break;
… …
3546 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3186 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3547 break; 3187 break;
3548 case 20: /* report icon label */ 3188 case 20: /* report icon label */
3549 { 3189 {
3550 char *s; 3190 char *s;
3551 XGetIconName (disp, parent[0], &s); 3191 XGetIconName (dpy, parent, &s);
3552 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3192 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3553 XFree (s); 3193 XFree (s);
3554 } 3194 }
3555 break; 3195 break;
3556 case 21: /* report window title */ 3196 case 21: /* report window title */
3557 { 3197 {
3558 char *s; 3198 char *s;
3559 XFetchName (disp, parent[0], &s); 3199 XFetchName (dpy, parent, &s);
3560 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3200 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3561 XFree (s); 3201 XFree (s);
3562 } 3202 }
3563 break; 3203 break;
3564 } 3204 }
3565} 3205}
… …
3568/*----------------------------------------------------------------------*/ 3208/*----------------------------------------------------------------------*/
3569/* 3209/*
3570 * get input up until STRING TERMINATOR (or BEL) 3210 * get input up until STRING TERMINATOR (or BEL)
3571 * ends_how is terminator used. returned input must be free()'d 3211 * ends_how is terminator used. returned input must be free()'d
3572 */ 3212 */
3573unsigned char * 3213char *
3574rxvt_term::get_to_st (unicode_t &ends_how) 3214rxvt_term::get_to_st (unicode_t &ends_how)
3575{ 3215{
3576 unicode_t ch; 3216 unicode_t ch;
3577 bool seen_esc = false; 3217 bool seen_esc = false;
3578 unsigned int n = 0; 3218 unsigned int n = 0;
3579 wchar_t string[STRING_MAX]; 3219 wchar_t string[CBUFSIZ];
3580 3220
3581 while ((ch = cmd_getc ()) != NOCHAR) 3221 while ((ch = cmd_getc ()) != NOCHAR)
3582 { 3222 {
3583 if (seen_esc) 3223 if (seen_esc)
3584 { 3224 {
… …
3592 seen_esc = true; 3232 seen_esc = true;
3593 continue; 3233 continue;
3594 } 3234 }
3595 else if (ch == C0_BEL || ch == CHAR_ST) 3235 else if (ch == C0_BEL || ch == CHAR_ST)
3596 break; 3236 break;
3237 else if (ch == C0_SYN)
3238 ch = cmd_get8 ();
3597 else if (ch < 0x20) 3239 else if (ch < 0x20)
3598 return NULL; /* other control character - exit */ 3240 return NULL; /* other control character - exit */
3599 3241
3600 seen_esc = false; 3242 seen_esc = false;
3601 3243
3602 if (n >= STRING_MAX - 1) 3244 if (n >= sizeof (string) - 1)
3603 // stop at some sane length 3245 // stop at some sane length
3604 return NULL; 3246 return NULL;
3605 3247
3606 if (ch == C0_SYN)
3607 string[n++] = cmd_get8 ();
3608 else
3609 string[n++] = ch; 3248 string[n++] = ch;
3610 } 3249 }
3611 3250
3612 string[n++] = '\0'; 3251 string[n++] = '\0';
3613 3252
3614 ends_how = (ch == 0x5c ? C0_ESC : ch); 3253 ends_how = (ch == 0x5c ? C0_ESC : ch);
3615 3254
3616 return (unsigned char *)rxvt_wcstombs (string); 3255 return rxvt_wcstombs (string);
3617} 3256}
3618 3257
3619/*----------------------------------------------------------------------*/ 3258/*----------------------------------------------------------------------*/
3620/* 3259/*
3621 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3260 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3622 */ 3261 */
3623void 3262void
3624rxvt_term::process_dcs_seq () 3263rxvt_term::process_dcs_seq ()
3625{ 3264{
3626 unsigned char *s;
3627 unicode_t eh;
3628
3629 /* 3265 /*
3630 * Not handled yet 3266 * Not handled yet
3631 */ 3267 */
3268
3269 unicode_t eh;
3632 s = get_to_st (eh); 3270 char *s = get_to_st (eh);
3633 if (s) 3271 if (s)
3634 free (s); 3272 free (s);
3635 3273
3636 return; 3274 return;
3637} 3275}
… …
3641 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3279 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3642 */ 3280 */
3643void 3281void
3644rxvt_term::process_osc_seq () 3282rxvt_term::process_osc_seq ()
3645{ 3283{
3646 unicode_t ch, eh;
3647 int arg; 3284 int arg;
3648 3285
3649 ch = cmd_getc (); 3286 unicode_t ch = cmd_getc ();
3650 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3287 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3651 arg = arg * 10 + (ch - '0'); 3288 arg = arg * 10 + (ch - '0');
3652 3289
3653 if (ch == ';') 3290 if (ch == ';')
3654 { 3291 {
3292 unicode_t eh;
3655 unsigned char *s = get_to_st (eh); 3293 char *s = get_to_st (eh);
3656 3294
3657 if (s) 3295 if (s)
3658 { 3296 {
3659 process_xterm_seq (arg, (char *)s, eh); 3297 process_xterm_seq (arg, s, eh);
3660 free (s); 3298 free (s);
3661 } 3299 }
3662 } 3300 }
3663} 3301}
3664 3302
3303static unsigned int
3304colorcube_index (unsigned int idx_r,
3305 unsigned int idx_g,
3306 unsigned int idx_b)
3307{
3308 assert (idx_r < Red_levels);
3309 assert (idx_g < Green_levels);
3310 assert (idx_b < Blue_levels);
3311
3312 return idx_r * Blue_levels * Green_levels +
3313 idx_g * Blue_levels +
3314 idx_b;
3315}
3316
3317/*
3318 * Find the nearest color slot in the hidden color cube,
3319 * adapt its value to the 32bit RGBA color.
3320 */
3321unsigned int
3322rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3323{
3324 r &= 0xff;
3325 g &= 0xff;
3326 b &= 0xff;
3327 a &= 0xff;
3328
3329 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3330
3331 unsigned int idx_r = r * (Red_levels - 1) / 0xff;
3332 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3333 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
3334 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3335
3336 /* we allow one of the 6 directly neighbouring colours */
3337 /* to replace the current color, if they not used recently */
3338 static const signed char dxyz[][3] = {
3339 0, 0, 0,
3340 0, 0, +1,
3341 0, 0, -1,
3342 0, +1, 0,
3343 0, -1, 0,
3344 +1, 0, 0,
3345 -1, 0, 0,
3346 };
3347
3348 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3349 {
3350 int r = idx_r + dxyz[n][0];
3351 int g = idx_g + dxyz[n][1];
3352 int b = idx_b + dxyz[n][2];
3353
3354 if (!IN_RANGE_EXC (r, 0, Red_levels )) continue;
3355 if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
3356 if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
3357
3358 unsigned int index = colorcube_index (r, g, b);
3359
3360 if (rgb24_color[index] == color)
3361 {
3362 rgb24_seqno[index] = ++rgb24_sequence;
3363 return index + minTermCOLOR24;
3364 }
3365
3366 // minor issue: could update index 0 few more times
3367 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3368 {
3369 idx = index;
3370 goto update;
3371 }
3372
3373 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3374 // but also handles wrap around values good enough
3375 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3376 idx = index;
3377 }
3378
3379update:
3380 rgb24_color[idx] = color;
3381 rgb24_seqno[idx] = ++rgb24_sequence;
3382
3383 idx += minTermCOLOR24;
3384 pix_colors_focused [idx].free (this);
3385 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3386 update_fade_color (idx, false);
3387
3388 return idx;
3389}
3390
3665void 3391void
3666rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3392rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3667{ 3393{
3668 if (str[0] == '?' && !str[1]) 3394 if (str[0] == '?' && !str[1])
3669 { 3395 {
3670 unsigned short r, g, b; 3396 rgba c;
3671 pix_colors_focused[color].get (display, r, g, b); 3397 pix_colors_focused[color].get (c);
3398
3399#if XFT
3400 if (c.a != rgba::MAX_CC)
3401 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3402 else
3403#endif
3672 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3404 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3673 } 3405 }
3674 else 3406 else
3675 set_window_color (color, str); 3407 set_window_color (color, str);
3676} 3408}
3677 3409
3678/* 3410/*
3679 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3411 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3680 */ 3412 */
3681void 3413void
3682rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3414rxvt_term::process_xterm_seq (int op, char *str, char resp)
3683{ 3415{
3684 int changed = 0;
3685 int color; 3416 int color;
3686 char *buf, *name; 3417 char *buf, *name;
3687 bool query = str[0] == '?' && !str[1]; 3418 bool query = str[0] == '?' && !str[1];
3688 int saveop = op; 3419 int saveop = op;
3689 dDisp; 3420
3421 dLocal (Display *, dpy);
3690 3422
3691 assert (str != NULL); 3423 assert (str != NULL);
3424
3425 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3426 return;
3427
3692 switch (op) 3428 switch (op)
3693 { 3429 {
3694 case XTerm_name: 3430 case XTerm_name:
3695 set_title (str); 3431 set_title (str);
3696 /* FALLTHROUGH */ 3432 /* FALLTHROUGH */
… …
3710 unsigned long bytes_after; 3446 unsigned long bytes_after;
3711 unsigned char *value = 0; 3447 unsigned char *value = 0;
3712 const char *str = ""; 3448 const char *str = "";
3713 3449
3714 if (prop 3450 if (prop
3715 && XGetWindowProperty (disp, parent[0], 3451 && XGetWindowProperty (dpy, parent,
3716 prop, 0, 1<<16, 0, AnyPropertyType, 3452 prop, 0, 1<<16, 0, AnyPropertyType,
3717 &actual_type, &actual_format, 3453 &actual_type, &actual_format,
3718 &nitems, &bytes_after, &value) == Success 3454 &nitems, &bytes_after, &value) == Success
3719 && actual_type != None 3455 && actual_type != None
3720 && actual_format == 8) 3456 && actual_format == 8)
3721 str = (const char *)(value); 3457 str = (const char *)(value);
3722 3458
3723 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3459 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3724 3460
3725 XFree (value); 3461 XFree (value);
3726 } 3462 }
3727 else 3463 else
3728 { 3464 {
3729 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3465 char *eq = strchr (str, '=');
3730 3466
3731 if (eq) 3467 if (eq)
3732 { 3468 {
3733 *eq = 0; 3469 *eq = 0;
3734 set_utf8_property (display->atom (str), eq + 1); 3470 set_utf8_property (display->atom (str), eq + 1);
3735 } 3471 }
3736 else 3472 else
3737 XDeleteProperty (disp, parent[0], 3473 XDeleteProperty (dpy, parent,
3738 display->atom (str)); 3474 display->atom (str));
3739 } 3475 }
3740 break; 3476 break;
3741 3477
3742 case XTerm_Color: 3478 case XTerm_Color:
… …
3744 { 3480 {
3745 if ((name = strchr (buf, ';')) == NULL) 3481 if ((name = strchr (buf, ';')) == NULL)
3746 break; 3482 break;
3747 3483
3748 *name++ = '\0'; 3484 *name++ = '\0';
3749 color = atoi (buf); 3485 color = atoi (buf) + minCOLOR;
3750 3486
3751 if (color < 0 || color >= TOTAL_COLORS) 3487 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3752 break; 3488 break;
3753 3489
3754 if ((buf = strchr (name, ';')) != NULL) 3490 if ((buf = strchr (name, ';')) != NULL)
3755 *buf++ = '\0'; 3491 *buf++ = '\0';
3756 3492
3757 if (name[0] == '?' && !name[1]) 3493 process_color_seq (op, color, name, resp);
3758 {
3759 unsigned short r, g, b;
3760 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3761 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3762 }
3763 else
3764 set_window_color (color + minCOLOR, name);
3765 } 3494 }
3766 break; 3495 break;
3496 case Rxvt_restoreFG:
3767 case XTerm_Color00: 3497 case XTerm_Color00:
3768 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3498 process_color_seq (op, Color_fg, str, resp);
3769 break; 3499 break;
3500 case Rxvt_restoreBG:
3770 case XTerm_Color01: 3501 case XTerm_Color01:
3771 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3502 process_color_seq (op, Color_bg, str, resp);
3772 break; 3503 break;
3773#ifndef NO_CURSORCOLOR 3504#ifndef NO_CURSORCOLOR
3774 case XTerm_Color_cursor: 3505 case XTerm_Color_cursor:
3775 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3506 process_color_seq (op, Color_cursor, str, resp);
3776 break; 3507 break;
3777#endif 3508#endif
3778 case XTerm_Color_pointer_fg: 3509 case XTerm_Color_pointer_fg:
3779 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3510 process_color_seq (op, Color_pointer_fg, str, resp);
3780 break; 3511 break;
3781 case XTerm_Color_pointer_bg: 3512 case XTerm_Color_pointer_bg:
3782 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3513 process_color_seq (op, Color_pointer_bg, str, resp);
3783 break; 3514 break;
3515#ifdef OPTION_HC
3516 case XTerm_Color_HC:
3517 process_color_seq (op, Color_HC, str, resp);
3518 break;
3519 case XTerm_Color_HTC:
3520 process_color_seq (op, Color_HTC, str, resp);
3521 break;
3522#endif
3784#ifndef NO_BOLD_UNDERLINE_REVERSE 3523#ifndef NO_BOLD_UNDERLINE_REVERSE
3785 case XTerm_Color_BD: 3524 case URxvt_Color_BD:
3786 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3525 process_color_seq (op, Color_BD, str, resp);
3787 break; 3526 break;
3788 case XTerm_Color_UL: 3527 case URxvt_Color_UL:
3789 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3528 process_color_seq (op, Color_UL, str, resp);
3790 break;
3791 case XTerm_Color_RV:
3792 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3793 break; 3529 break;
3794 case URxvt_Color_IT: 3530 case URxvt_Color_IT:
3795 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3531 process_color_seq (op, Color_IT, str, resp);
3796 break; 3532 break;
3797#endif 3533#endif
3798#if TRANSPARENT && TINTING
3799 case URxvt_Color_tint: 3534 case URxvt_Color_border:
3800 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3535 process_color_seq (op, Color_border, str, resp);
3801 check_our_parents ();
3802 if (am_transparent)
3803 want_full_refresh = want_refresh = 1;
3804 break;
3805#endif
3806
3807 case XTerm_Pixmap:
3808 if (*str != ';')
3809 {
3810#if XPM_BACKGROUND
3811 scale_pixmap (""); /* reset to default scaling */
3812 set_bgPixmap (str); /* change pixmap */
3813#endif
3814 scr_touch (true);
3815 }
3816 while ((str = strchr (str, ';')) != NULL)
3817 {
3818 str++;
3819#if XPM_BACKGROUND
3820 changed += scale_pixmap (str);
3821#endif
3822 }
3823
3824 if (changed)
3825 {
3826#ifdef XPM_BACKGROUND
3827 resize_pixmap ();
3828#endif
3829 scr_touch (true);
3830 }
3831 break;
3832
3833 case XTerm_restoreFG:
3834 set_window_color (Color_fg, str);
3835 break;
3836 case XTerm_restoreBG:
3837 set_window_color (Color_bg, str);
3838 break; 3536 break;
3839 3537
3840 case XTerm_logfile: 3538 case XTerm_logfile:
3841 // TODO, when secure mode? 3539 // TODO, when secure mode?
3842 break; 3540 break;
3843 3541
3844#ifdef MENUBAR
3845 case URxvt_Menu:
3846 if (options & Opt_insecure)
3847 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3848 break;
3849#endif
3850#if 0 3542#if 0
3851 case XTerm_dumpscreen: /* no error notices */ 3543 case Rxvt_dumpscreen: /* no error notices */
3852 { 3544 {
3853 int fd; 3545 int fd;
3854 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3546 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3855 { 3547 {
3856 scr_dump (fd); 3548 scr_dump (fd);
… …
3867 case URxvt_italicFont: 3559 case URxvt_italicFont:
3868 case URxvt_boldItalicFont: 3560 case URxvt_boldItalicFont:
3869#endif 3561#endif
3870 if (query) 3562 if (query)
3871 tt_printf ("\33]%d;%-.250s%c", saveop, 3563 tt_printf ("\33]%d;%-.250s%c", saveop,
3872 (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3564 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3873 ? fontset[op - URxvt_font]->fontdesc : "", 3565 ? fontset[op - URxvt_font]->fontdesc : "",
3874 resp); 3566 resp);
3875 else 3567 else
3876 { 3568 {
3877 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3569 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3880 allocated.push_back ((void *)res); 3572 allocated.push_back ((void *)res);
3881 set_fonts (); 3573 set_fonts ();
3882 } 3574 }
3883 break; 3575 break;
3884 3576
3885#if ENABLE_FRILLS 3577 case URxvt_version:
3578 if (query)
3579 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3580 op,
3581 rs[Rs_name], VERSION[0], VERSION[2],
3582 resp);
3583 break;
3584
3585#if !ENABLE_MINIMAL
3886 case URxvt_locale: 3586 case URxvt_locale:
3887 if (query) 3587 if (query)
3888 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); 3588 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3889 else 3589 else
3890 { 3590 {
3891 set_locale (str); 3591 set_locale (str);
3892 pty.set_utf8_mode (enc_utf8); 3592 pty->set_utf8_mode (enc_utf8);
3893 init_xlocale (); 3593 init_xlocale ();
3894 } 3594 }
3895 break; 3595 break;
3896 3596
3897 case URxvt_view_up: 3597 case URxvt_view_up:
3898 case URxvt_view_down: 3598 case URxvt_view_down:
3599 {
3899 int lines = atoi (str); 3600 int lines = atoi (str);
3900 3601
3901 if (lines) 3602 if (lines)
3902 scr_page (op == URxvt_view_up ? UP : DN, lines); 3603 scr_page (op == URxvt_view_up ? UP : DN, lines);
3903 else 3604 else
3904 {
3905 scr_erase_savelines (); 3605 scr_erase_savelines ();
3906 } 3606 }
3907 3607
3608 break;
3609#endif
3610
3611#if ENABLE_PERL
3612 case URxvt_perl:
3613 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3908 break; 3614 break;
3909#endif 3615#endif
3910 } 3616 }
3911} 3617}
3912/*----------------------------------------------------------------------*/ 3618/*----------------------------------------------------------------------*/
… …
3919 * 's' = save 3625 * 's' = save
3920 * 'r' = restore 3626 * 'r' = restore
3921 * 't' = toggle 3627 * 't' = toggle
3922 * so no need for fancy checking 3628 * so no need for fancy checking
3923 */ 3629 */
3924int 3630int ecb_cold
3925rxvt_term::privcases (int mode, unsigned long bit) 3631rxvt_term::privcases (int mode, unsigned long bit)
3926{ 3632{
3927 int state; 3633 int state;
3928 3634
3929 if (mode == 's') 3635 if (mode == 's')
3930 { 3636 {
3931 SavedModes |= (priv_modes & bit); 3637 if (priv_modes & bit)
3638 SavedModes |= bit;
3639 else
3640 SavedModes &= ~bit;
3932 return -1; 3641 return -1;
3933 } 3642 }
3934 else 3643 else
3935 { 3644 {
3936 if (mode == 'r') 3645 if (mode == 'r')
3937 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3646 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3938 else 3647 else
3939 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3648 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3940 PrivMode (state, bit); 3649
3650 if (state)
3651 priv_modes |= bit;
3652 else
3653 priv_modes &= ~bit;
3941 } 3654 }
3942 3655
3943 return state; 3656 return state;
3944} 3657}
3945 3658
3946/* we're not using priv _yet_ */ 3659/* we're not using priv _yet_ */
3947void 3660void
3948rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3661rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3949{ 3662{
3950 unsigned int i, j; 3663 unsigned int i, j;
3951 int state; 3664 int state;
3952 3665
3953 static const struct 3666 static const struct
3954 { 3667 {
3955 const int argval; 3668 const int argval;
3956 const unsigned long bit; 3669 const unsigned long bit;
3957 }
3958
3959 argtopriv[] = { 3670 } argtopriv[] = {
3960 { 1, PrivMode_aplCUR }, 3671 { 1, PrivMode_aplCUR }, // DECCKM
3961 { 2, PrivMode_vt52 }, 3672 { 2, PrivMode_vt52 }, // DECANM
3962 { 3, PrivMode_132 }, 3673 { 3, PrivMode_132 }, // DECCOLM
3963 { 4, PrivMode_smoothScroll }, 3674 { 4, PrivMode_smoothScroll }, // DECSCLM
3964 { 5, PrivMode_rVideo }, 3675 { 5, PrivMode_rVideo }, // DECSCNM
3965 { 6, PrivMode_relOrigin }, 3676 { 6, PrivMode_relOrigin }, // DECOM
3966 { 7, PrivMode_Autowrap }, 3677 { 7, PrivMode_Autowrap }, // DECAWM
3967 // 8, bi-directional support mode 3678 // 8, auto-repeat keys // DECARM
3968 { 9, PrivMode_MouseX10 }, 3679 { 9, PrivMode_MouseX10 },
3969#ifdef menuBar_esc
3970 { menuBar_esc, PrivMode_menuBar },
3971#endif
3972 // 18, 19 printing-related
3973 { 25, PrivMode_VisibleCursor }, 3680 { 12, PrivMode_BlinkingCursor },
3681 // 18 end FF to printer after print screen
3682 // 19 Print screen prints full screen/scroll region
3683 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3974#ifdef scrollBar_esc 3684#ifdef scrollBar_esc
3975 { scrollBar_esc, PrivMode_scrollBar }, 3685 { scrollBar_esc, PrivMode_scrollBar },
3976#endif 3686#endif
3977 { 35, PrivMode_ShiftKeys }, // rxvt extension 3687 { 35, PrivMode_ShiftKeys }, // rxvt extension
3688 // 38, tektronix mode // DECTEK
3978 { 40, PrivMode_132OK }, 3689 { 40, PrivMode_132OK },
3979 // 41 xterm more fixes NYI 3690 // 41 xterm more fixes NYI
3980 // 45 margin bell NYI 3691 // 45 margin bell NYI
3981 // 46 start logging 3692 // 46 start logging
3982 { 47, PrivMode_Screen }, 3693 { 47, PrivMode_Screen },
3983 { 66, PrivMode_aplKP }, 3694 { 66, PrivMode_aplKP }, // DECNKM
3984#ifndef NO_BACKSPACE_KEY 3695#ifndef NO_BACKSPACE_KEY
3985 { 67, PrivMode_BackSpace }, 3696 { 67, PrivMode_BackSpace }, // DECBKM
3986#endif 3697#endif
3987 { 1000, PrivMode_MouseX11 }, 3698 { 1000, PrivMode_MouseX11 },
3988 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3699 { 1002, PrivMode_MouseBtnEvent },
3989 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3700 { 1003, PrivMode_MouseAnyEvent },
3990 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3701#if ENABLE_FRILLS
3702 { 1004, PrivMode_FocusEvent },
3703 { 1005, PrivMode_ExtModeMouse },
3704#endif
3991 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3705 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3992 { 1011, PrivMode_Keypress }, // rxvt extension 3706 { 1011, PrivMode_Keypress }, // rxvt extension
3707#if ENABLE_FRILLS
3708 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3709#endif
3993 // 1035 enable modifiers for alt, numlock NYI 3710 // 1035 enable modifiers for alt, numlock NYI
3994 // 1036 send ESC for meta keys NYI 3711 // 1036 send ESC for meta keys NYI
3995 // 1037 send DEL for keypad delete NYI 3712 // 1037 send DEL for keypad delete NYI
3996 { 1047, PrivMode_Screen }, 3713 { 1047, PrivMode_Screen },
3997 // 1048 save and restore cursor 3714 // 1048 save and restore cursor, implemented in code
3998 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3715 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3999 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3716 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3717 { 2004, PrivMode_BracketPaste },
4000 }; 3718 };
4001 3719
4002 if (nargs == 0) 3720 if (nargs == 0)
4003 return; 3721 return;
4004 3722
… …
4011 for (i = 0; i < nargs; i++) 3729 for (i = 0; i < nargs; i++)
4012 { 3730 {
4013 state = -1; 3731 state = -1;
4014 3732
4015 /* basic handling */ 3733 /* basic handling */
4016 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3734 for (j = 0; j < ecb_array_length (argtopriv); j++)
4017 if (argtopriv[j].argval == arg[i]) 3735 if (argtopriv[j].argval == arg[i])
4018 { 3736 {
4019 state = privcases (mode, argtopriv[j].bit); 3737 state = privcases (mode, argtopriv[j].bit);
4020 break; 3738 break;
4021 } 3739 }
4022 3740
4023 /* extra handling for values with state unkept */ 3741 /* extra handling for values with state unkept */
4024 switch (arg[i]) 3742 switch (arg[i])
4025 { 3743 {
3744#if ENABLE_STYLES
3745 case 1021:
3746 set_option (Opt_intensityStyles, mode);
3747
3748 scr_touch (true);
3749 break;
3750#endif
4026 case 1048: /* alternative cursor save */ 3751 case 1048: /* alternative cursor save */
4027 case 1049:
4028 if (options & Opt_secondaryScreen) 3752 if (option (Opt_secondaryScreen))
4029 if (mode == 0) 3753 if (mode == 0)
4030 scr_cursor (RESTORE); 3754 scr_cursor (RESTORE);
4031 else if (mode == 1) 3755 else if (mode == 1)
4032 scr_cursor (SAVE); 3756 scr_cursor (SAVE);
4033 break; 3757 break;
… …
4041 case 2: /* VT52 mode */ 3765 case 2: /* VT52 mode */
4042 /* oddball mode. should be set regardless of set/reset 3766 /* oddball mode. should be set regardless of set/reset
4043 * parameter. Return from VT52 mode with an ESC < from 3767 * parameter. Return from VT52 mode with an ESC < from
4044 * within VT52 mode 3768 * within VT52 mode
4045 */ 3769 */
4046 PrivMode (1, PrivMode_vt52); 3770 priv_modes |= PrivMode_vt52;
4047 break; 3771 break;
4048 case 3: /* 80/132 */ 3772 case 3: /* 80/132 */
4049 if (priv_modes & PrivMode_132OK) 3773 if (priv_modes & PrivMode_132OK)
4050 set_widthheight (((state ? 132 : 80) * fwidth), height); 3774 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4051 break; 3775 break;
4052 case 4: /* smooth scrolling */ 3776 case 4: /* smooth scrolling */
4053 if (state)
4054 options &= ~Opt_jumpScroll;
4055 else
4056 options |= Opt_jumpScroll; 3777 set_option (Opt_jumpScroll, !state);
4057 break; 3778 break;
4058 case 5: /* reverse video */ 3779 case 5: /* reverse video */
4059 scr_rvideo_mode (state); 3780 scr_rvideo_mode (state);
4060 break; 3781 break;
4061 case 6: /* relative/absolute origins */ 3782 case 6: /* relative/absolute origins */
… …
4065 scr_autowrap (state); 3786 scr_autowrap (state);
4066 break; 3787 break;
4067 /* case 8: - auto repeat, can't do on a per window basis */ 3788 /* case 8: - auto repeat, can't do on a per window basis */
4068 case 9: /* X10 mouse reporting */ 3789 case 9: /* X10 mouse reporting */
4069 if (state) /* orthogonal */ 3790 if (state) /* orthogonal */
4070 priv_modes &= ~PrivMode_MouseX11; 3791 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4071 break; 3792 break;
4072#ifdef menuBar_esc
4073 case menuBar_esc:
4074#ifdef MENUBAR
4075 map_menuBar (state);
4076#endif
4077 break;
4078#endif
4079#ifdef scrollBar_esc 3793#ifdef scrollBar_esc
4080 case scrollBar_esc: 3794 case scrollBar_esc:
4081 if (scrollbar_mapping (state)) 3795 scrollBar.map (state);
4082 {
4083 resize_all_windows (0, 0, 0); 3796 resize_all_windows (0, 0, 0);
4084 scr_touch (true); 3797 scr_touch (true);
4085 } 3798 break;
3799#endif
3800#ifdef CURSOR_BLINK
3801 case 12:
3802 cursor_blink_reset ();
4086 break; 3803 break;
4087#endif 3804#endif
4088 case 25: /* visible/invisible cursor */ 3805 case 25: /* visible/invisible cursor */
4089 scr_cursor_visible (state); 3806 scr_cursor_visible (state);
4090 break; 3807 break;
… …
4095 break; 3812 break;
4096 /* case 66: - application key pad */ 3813 /* case 66: - application key pad */
4097 /* case 67: - backspace key */ 3814 /* case 67: - backspace key */
4098 case 1000: /* X11 mouse reporting */ 3815 case 1000: /* X11 mouse reporting */
4099 if (state) /* orthogonal */ 3816 if (state) /* orthogonal */
4100 priv_modes &= ~PrivMode_MouseX10; 3817 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4101 break; 3818 break;
4102#if 0
4103 case 1001: 3819 case 1002:
4104 break; /* X11 mouse highlighting */ 3820 case 1003:
4105#endif 3821 if (state)
3822 {
3823 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3824 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3825 mouse_row = mouse_col = 0;
3826 vt_emask_mouse = PointerMotionMask;
3827 }
3828 else
3829 vt_emask_mouse = NoEventMask;
3830
3831 vt_select_input ();
3832 break;
4106 case 1010: /* scroll to bottom on TTY output inhibit */ 3833 case 1010: /* scroll to bottom on TTY output inhibit */
4107 if (state)
4108 options &= ~Opt_scrollTtyOutput;
4109 else
4110 options |= Opt_scrollTtyOutput; 3834 set_option (Opt_scrollTtyOutput, !state);
4111 break; 3835 break;
4112 case 1011: /* scroll to bottom on key press */ 3836 case 1011: /* scroll to bottom on key press */
4113 if (state)
4114 options |= Opt_scrollTtyKeypress; 3837 set_option (Opt_scrollTtyKeypress, state);
4115 else
4116 options &= ~Opt_scrollTtyKeypress;
4117 break; 3838 break;
4118 case 1047: /* secondary screen w/ clearing last */ 3839 case 1047: /* secondary screen w/ clearing last */
4119 if (options & Opt_secondaryScreen) 3840 if (option (Opt_secondaryScreen))
4120 if (current_screen != PRIMARY) 3841 if (!state)
4121 scr_erase_screen (2); 3842 scr_erase_screen (2);
3843
4122 scr_change_screen (state); 3844 scr_change_screen (state);
4123 break; 3845 break;
4124 case 1049: /* secondary screen w/ clearing first */ 3846 case 1049: /* secondary screen w/ clearing first */
3847 if (option (Opt_secondaryScreen))
3848 if (state)
3849 scr_cursor (SAVE);
3850
4125 scr_change_screen (state); 3851 scr_change_screen (state);
3852
4126 if (options & Opt_secondaryScreen) 3853 if (option (Opt_secondaryScreen))
4127 if (current_screen != PRIMARY) 3854 if (state)
4128 scr_erase_screen (2); 3855 scr_erase_screen (2);
3856 else
3857 scr_cursor (RESTORE);
4129 break; 3858 break;
4130 default: 3859 default:
4131 break; 3860 break;
4132 } 3861 }
4133 } 3862 }
4134} 3863}
4135/*}}} */ 3864/*}}} */
4136 3865
4137/*{{{ process sgr sequences */ 3866/*{{{ process sgr sequences */
4138void 3867void ecb_hot
4139rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3868rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
4140{ 3869{
4141 unsigned int i; 3870 unsigned int i;
4142 short rendset; 3871 short rendset;
4143 int rendstyle; 3872 int rendstyle;
… …
4185 //case 19: // ninth alt font 3914 //case 19: // ninth alt font
4186 //case 20: // gothic 3915 //case 20: // gothic
4187 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3916 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
4188 rendset = 0, rendstyle = RS_Bold; 3917 rendset = 0, rendstyle = RS_Bold;
4189 break; 3918 break;
4190 case 22: // normal intensity 3919 case 22: // bold off (vt220)
4191 rendset = 0, rendstyle = RS_Bold; 3920 rendset = 0, rendstyle = RS_Bold;
4192 break; 3921 break;
4193 case 23: // disable italic 3922 case 23: // disable italic
4194 rendset = 0, rendstyle = RS_Italic; 3923 rendset = 0, rendstyle = RS_Italic;
4195 break; 3924 break;
4196 case 24: 3925 case 24: // underline off (vt220)
4197 rendset = 0, rendstyle = RS_Uline; 3926 rendset = 0, rendstyle = RS_Uline;
4198 break; 3927 break;
4199 case 25: 3928 case 25: // blink off (vt220)
4200 rendset = 0, rendstyle = RS_Blink; 3929 rendset = 0, rendstyle = RS_Blink;
4201 break; 3930 break;
4202 case 26: // variable spacing (iso 8613) 3931 case 26: // variable spacing (iso 8613)
4203 rendset = 0, rendstyle = RS_Blink; 3932 rendset = 0, rendstyle = RS_Blink;
4204 break; 3933 break;
4205 case 27: 3934 case 27: // reverse off (vt220)
4206 rendset = 0, rendstyle = RS_RVid; 3935 rendset = 0, rendstyle = RS_RVid;
4207 break; 3936 break;
4208 //case 28: // visible. NYI 3937 //case 28: // visible. NYI
4209 //case 29: // not crossed-out 3938 //case 29: // not crossed-out
4210 } 3939 }
… …
4225 case 35: 3954 case 35:
4226 case 36: 3955 case 36:
4227 case 37: 3956 case 37:
4228 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3957 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4229 break; 3958 break;
4230 case 38: // set fg color, ISO 8613-6
4231 if (nargs > i + 2 && arg[i + 1] == 5)
4232 {
4233 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4234 i += 2;
4235 }
4236 break;
4237 case 39: /* default fg */ 3959 case 39: /* default fg */
4238 scr_color (Color_fg, Color_fg); 3960 scr_color (Color_fg, Color_fg);
4239 break; 3961 break;
4240 3962
4241 case 40: 3963 case 40:
… …
4246 case 45: 3968 case 45:
4247 case 46: 3969 case 46:
4248 case 47: 3970 case 47:
4249 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3971 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4250 break; 3972 break;
4251 case 48: // set bg color, ISO 8613-6
4252 if (nargs > i + 2 && arg[i + 1] == 5)
4253 {
4254 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4255 i += 2;
4256 }
4257 break;
4258 case 49: /* default bg */ 3973 case 49: /* default bg */
4259 scr_color (Color_bg, Color_bg); 3974 scr_color (Color_bg, Color_bg);
4260 break; 3975 break;
4261 3976
3977 case 38: // set fg color, ISO 8613-6
3978 case 48: // set bg color, ISO 8613-6
3979 {
3980 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
3981 unsigned int idx;
3982
3983 if (nargs > i + 2 && arg[i + 1] == 5)
3984 {
3985 idx = minCOLOR + arg[i + 2];
3986 i += 2;
3987
3988 scr_color (idx, fgbg);
3989 }
3990 else if (nargs > i + 4 && arg[i + 1] == 2)
3991 {
3992 unsigned int r = arg[i + 2];
3993 unsigned int g = arg[i + 3];
3994 unsigned int b = arg[i + 4];
3995 unsigned int a = 0xff;
3996
3997 idx = map_rgb24_color (r, g, b, a);
3998
3999 i += 4;
4000
4001 scr_color (idx, fgbg);
4002 }
4003 }
4004 break;
4005
4262 //case 50: // not variable spacing 4006 //case 50: // not variable spacing
4263 4007
4264#ifndef NO_BRIGHTCOLOR 4008#if !ENABLE_MINIMAL
4265 case 90: 4009 case 90:
4266 case 91: /* set bright fg color */ 4010 case 91: /* set bright fg color */
4267 case 92: 4011 case 92:
4268 case 93: 4012 case 93:
4269 case 94: 4013 case 94:
… …
4281 case 106: 4025 case 106:
4282 case 107: 4026 case 107:
4283 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4027 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4284 break; 4028 break;
4285#endif 4029#endif
4286
4287 } 4030 }
4288 } 4031 }
4032}
4033
4034void
4035rxvt_term::set_cursor_style (int style)
4036{
4037 if (!IN_RANGE_INC (style, 0, 6))
4038 return;
4039
4040 if (style == 0)
4041 style = 1;
4042
4043 cursor_type = (style - 1) / 2;
4044 set_option (Opt_cursorUnderline, cursor_type == 1);
4045
4046#ifdef CURSOR_BLINK
4047 set_option (Opt_cursorBlink, style & 1);
4048 cursor_blink_reset ();
4049#endif
4050
4051 want_refresh = 1;
4289} 4052}
4290/*}}} */ 4053/*}}} */
4291 4054
4292/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4293void
4294rxvt_term::process_graphics ()
4295{
4296 unicode_t ch, cmd = cmd_getc ();
4297
4298 if (cmd == 'Q')
4299 { /* query graphics */
4300 tt_printf ("\033G0\012"); /* no graphics */
4301 return;
4302 }
4303 /* swallow other graphics sequences until terminating ':' */
4304 do
4305 ch = cmd_getc ();
4306 while (ch != ':');
4307}
4308/*}}} */
4309
4310/* ------------------------------------------------------------------------- */ 4055/* ---------------------------------------------------------------------- */
4056/* Write data to the pty as typed by the user, pasted with the mouse,
4057 * or generated by us in response to a query ESC sequence.
4058 */
4311 4059
4312/* 4060/*
4313 * Send printf () formatted output to the command. 4061 * Send printf () formatted output to the command.
4314 * Only use for small amounts of data. 4062 * Only use for small amounts of data.
4315 */ 4063 */
4316void 4064void
4317rxvt_term::tt_printf (const char *fmt,...) 4065rxvt_term::tt_printf (const char *fmt,...)
4318{ 4066{
4319 va_list arg_ptr; 4067 va_list arg_ptr;
4320 unsigned char buf[256]; 4068 char buf[256];
4321 4069
4322 va_start (arg_ptr, fmt); 4070 va_start (arg_ptr, fmt);
4323 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4071 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4324 va_end (arg_ptr); 4072 va_end (arg_ptr);
4325 tt_write (buf, strlen (buf)); 4073 tt_write (buf, strlen (buf));
4326} 4074}
4327 4075
4328/* ---------------------------------------------------------------------- */
4329/* Write data to the pty as typed by the user, pasted with the mouse, 4076/* Write data to the pty as typed by the user. */
4330 * or generated by us in response to a query ESC sequence.
4331 */
4332const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4333
4334void 4077void
4335rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4078rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4336{ 4079{
4080 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4081 return;
4082
4083 if (option (Opt_scrollTtyKeypress))
4084 if (view_start)
4085 {
4086 view_start = 0;
4087 want_refresh = 1;
4088 }
4089
4090 tt_write_ (data, len);
4091}
4092
4093void
4094rxvt_term::tt_write (const char *data, unsigned int len)
4095{
4096 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4097 return;
4098
4099 tt_write_ (data, len);
4100}
4101
4102static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4103
4104void
4105rxvt_term::tt_write_ (const char *data, unsigned int len)
4106{
4107 if (pty->pty < 0)
4108 return;
4109
4337 if (v_buflen == 0) 4110 if (v_buflen == 0)
4338 { 4111 {
4339 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4112 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4340 4113
4114 max_it (written, 0);
4115
4341 if ((unsigned int)written == len) 4116 if (written == len)
4342 return; 4117 return;
4343 4118
4344 data += written; 4119 data += written;
4345 len -= written; 4120 len -= written;
4346 } 4121 }
4347 4122
4348 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4123 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4349 4124
4350 memcpy (v_buffer + v_buflen, data, len); 4125 memcpy (v_buffer + v_buflen, data, len);
4351 v_buflen += len; 4126 v_buflen += len;
4352 4127
4353 pty_ev.set (EVENT_READ | EVENT_WRITE); 4128 pty_ev.set (ev::READ | ev::WRITE);
4354} 4129}
4355 4130
4356void rxvt_term::pty_write () 4131void rxvt_term::pty_write ()
4357{ 4132{
4358 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4133 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4359 4134
4360 if (written > 0) 4135 if (written > 0)
4361 { 4136 {
4362 v_buflen -= written; 4137 v_buflen -= written;
4363 4138
4364 if (v_buflen == 0) 4139 if (v_buflen == 0)
4365 { 4140 {
4366 free (v_buffer); 4141 free (v_buffer);
4367 v_buffer = 0; 4142 v_buffer = 0;
4368 v_buflen = 0;
4369 4143
4370 pty_ev.set (EVENT_READ); 4144 pty_ev.set (ev::READ);
4371 return; 4145 return;
4372 } 4146 }
4373 4147
4374 memmove (v_buffer, v_buffer + written, v_buflen); 4148 memmove (v_buffer, v_buffer + written, v_buflen);
4375 } 4149 }
4376 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4150 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4377 pty_ev.set (EVENT_READ); 4151 pty_ev.set (ev::READ);
4378} 4152}
4379 4153
4380/*----------------------- end-of-file (C source) -----------------------*/ 4154/*----------------------- end-of-file (C source) -----------------------*/
4381 4155

Diff Legend

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