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

Diff Legend

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