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.245 by root, Fri Jan 6 18:33:30 2006 UTC vs.
Revision 1.565 by root, Tue Apr 28 12:38:19 2015 UTC

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

Diff Legend

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