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.359 by ayin, Mon Oct 15 14:56:06 2007 UTC vs.
Revision 1.597 by root, Sun Jun 26 15:45:48 2022 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2021 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
36 * 37 *
37 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
38 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
39 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
53 54
54#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
55# include "keyboard.h" 56# include "keyboard.h"
56#endif 57#endif
57 58
58#include <csignal> 59#include <signal.h>
59 60
60#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
61# include <ctime> 62# include <time.h>
62#endif 63#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
130 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
131#endif 132#endif
132 0, 133 0,
133}; 134};
134 135
135void 136void ecb_cold
136rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
137{ 138{
138 x = Pixel2Col (x); 139 x = Pixel2Col (x);
139 y = Pixel2Row (y); 140 y = Pixel2Row (y);
140 141
… …
148 149
149 text_t t = l.t[x]; 150 text_t t = l.t[x];
150 151
151 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
152 { 153 {
153 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
154 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
155 break; 156 break;
156 } 157 }
157 158
158 x--; 159 x--;
159 } 160 }
160} 161}
161 162
162void 163void ecb_cold
163rxvt_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)
164{ 165{
165 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
166 rxvt_font *f = (*fs)[fs->find_font (ch)];
167 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169
170 fname = rxvt_utf8towcs (f->name);
171 169
172# if ENABLE_COMBINING 170# if ENABLE_COMBINING
173 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
174 { 172 {
175 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch);
176 alloc = chr = new wchar_t[len]; 174 alloc = chr = new wchar_t[len];
177 rxvt_composite.expand (ch, chr); 175 rxvt_composite.expand (ch, chr);
178 } 176 }
179 else 177 else
180# endif 178# endif
… …
183 181
184 alloc = 0; 182 alloc = 0;
185 chr = &ch2; 183 chr = &ch2;
186 len = 1; 184 len = 1;
187 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
188 189
189 char attr[80]; // plenty 190 char attr[80]; // plenty
190 191
191 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",
192 (int)r, 193 (int)r,
… …
196 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
197 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
198 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
200 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);
201 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
202 210
203 max_it (width, 8+5); // for char + hey
204 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
205 212
206 if (y >= 0) 213 if (y >= 0)
207 { 214 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
209 x = 0; 216 x = 0;
210 } 217 }
211 218
212 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);
213 222
214 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
215 224
216 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
217 { 226 {
218 char buf[9]; 227 char buf[9];
219 228
220 ch = *chr++; 229 ch = *chr++;
221 230
222 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
224 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
225# if !UNICODE3 234# if !UNICODE_3
226 if (ch >= 0x10000) 235 if (ch >= 0x10000)
227 ch = 0xfffd; 236 ch = 0xfffd;
228# endif 237# endif
229 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
230 239
231 if (WCWIDTH (ch) >= 2) 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
235// { 244// {
236// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
239// } 248// }
240 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
241 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
242
243 free (fname); 253 free (fname[i]);
254 }
244 255
245# if ENABLE_COMBINING 256# if ENABLE_COMBINING
246 if (alloc) 257 if (alloc)
247 delete [] alloc; 258 delete [] alloc;
248# endif 259# endif
249} 260}
250#endif 261#endif
251 262
252void 263void ecb_cold
253rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
254{ 265{
255 wchar_t ch[2];
256
257 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
258 ch[1] = 0;
259 267
260 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
261 { 269 {
262 char mb[16]; 270 char mb[MB_LEN_MAX];
263 int len; 271 int len;
264 272
265 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
266 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
267 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
268 else 276 else
269 { 277 {
270 mb[0] = ch[0]; 278 mb[0] = ch;
271 len = 1; 279 len = 1;
272 } 280 }
273 281
274 if (len > 0) 282 if (len > 0)
275 tt_write (mb, len); 283 tt_write (mb, len);
… …
278 } 286 }
279 287
280 iso14755buf = 0; 288 iso14755buf = 0;
281} 289}
282 290
283int 291static int ecb_cold
284rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
285{ 293{
286 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
289 { 297 {
290 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
291 299
… …
297 305
298 return -1; 306 return -1;
299} 307}
300#endif 308#endif
301 309
302void 310static inline KeySym ecb_cold
311translate_keypad (KeySym keysym, bool kp)
312{
313#ifdef XK_KP_Home
314 static const KeySym keypadtrans[] = {
315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down
320 XK_KP_9, // XK_KP_Prior
321 XK_KP_3, // XK_KP_Next
322 XK_KP_1, // XK_KP_End
323 XK_KP_5, // XK_KP_Begin
324 };
325
326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
327 {
328 unsigned int index = keysym - XK_KP_Home;
329 keysym = kp ? keypadtrans[index] : XK_Home + index;
330 }
331 else if (keysym == XK_KP_Insert)
332 keysym = kp ? XK_KP_0 : XK_Insert;
333# ifndef NO_DELETE_KEY
334 else if (keysym == XK_KP_Delete)
335 keysym = kp ? XK_KP_Decimal : XK_Delete;
336# endif
337#endif
338 return keysym;
339}
340
341static inline int ecb_cold
342map_function_key (KeySym keysym)
343{
344 int param = 0;
345
346 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
347 {
348 param = 11 + keysym - XK_F1;
349 if (keysym >= XK_F17)
350 param += 4;
351 else if (keysym >= XK_F15)
352 param += 3;
353 else if (keysym >= XK_F11)
354 param += 2;
355 else if (keysym >= XK_F6)
356 param += 1;
357 }
358 else
359 switch (keysym)
360 {
361 case XK_Find:
362 param = 1;
363 break;
364 case XK_Insert:
365 param = 2;
366 break;
367#ifdef DXK_Remove
368 case DXK_Remove:
369#endif
370 case XK_Execute:
371 param = 3;
372 break;
373 case XK_Select:
374 param = 4;
375 break;
376 case XK_Prior:
377 param = 5;
378 break;
379 case XK_Next:
380 param = 6;
381 break;
382 case XK_Home:
383 param = 7;
384 break;
385 case XK_End:
386 param = 8;
387 break;
388 case XK_Help:
389 param = 28;
390 break;
391 case XK_Menu:
392 param = 29;
393 break;
394 }
395 return param;
396}
397
398static inline wchar_t *
399rxvt_wcsdup (const wchar_t *str, int len)
400{
401 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
402 memcpy (r, str, len * sizeof (wchar_t));
403 r[len] = 0;
404 return r;
405}
406
407void ecb_cold
303rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
304{ 409{
305 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
306 unsigned int newlen; 411 KeySym keysym = NoSymbol;
307 KeySym keysym;
308 int valid_keysym;
309 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
310 414
311#if ISO_14755 415#if ISO_14755
312 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
313 return; 417 return;
314#endif 418#endif
… …
321 */ 425 */
322 shft = ev.state & ShiftMask; 426 shft = ev.state & ShiftMask;
323 ctrl = ev.state & ControlMask; 427 ctrl = ev.state & ControlMask;
324 meta = ev.state & ModMetaMask; 428 meta = ev.state & ModMetaMask;
325 429
326 if (numlock_state || (ev.state & ModNumLockMask))
327 {
328 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP);
330 }
331
332 kbuf[0] = 0; 430 kbuf[0] = 0;
333 431
334#ifdef USE_XIM 432#if USE_XIM
335 if (Input_Context) 433 if (Input_Context)
336 { 434 {
337 Status status_return; 435 Status status_return;
338 436
339#if 0 437#if 0
… …
377 } 475 }
378 } 476 }
379 else 477 else
380 len = 0; 478 len = 0;
381 } 479 }
382
383 valid_keysym = status_return == XLookupKeySym
384 || status_return == XLookupBoth;
385 } 480 }
386 else 481 else
387#endif 482#endif
388 { 483 {
389 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
390 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
391 } 488 {
489 KeySym orig_keysym = keysym;
392 490
393 if (valid_keysym) 491 /* Shift + F1 - F10 generates F11 - F20 */
492 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
493 {
494 keysym += (XK_F11 - XK_F1);
495 shft = 0; /* turn off Shift */
496 }
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
500 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
501 unsigned int newlen = 1;
502
503 if (ev.state & ModNumLockMask)
504 kp = false;
505
506 keysym = translate_keypad (keysym, kp);
507
508 switch (keysym)
509 {
510#ifndef NO_BACKSPACE_KEY
511 case XK_BackSpace:
512 if (priv_modes & PrivMode_HaveBackSpace)
513 {
514 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
515 ^ !!ctrl) ? '\b' : '\177';
516 kbuf[1] = '\0';
517 }
518 else
519 strcpy (kbuf, rs[Rs_backspace_key]);
520 break;
521#endif
522#ifndef NO_DELETE_KEY
523 case XK_Delete:
524 strcpy (kbuf, rs[Rs_delete_key]);
525 break;
526#endif
527 case XK_Tab:
528 if (shft)
529 strcpy (kbuf, "\033[Z");
530 else
531 {
532#ifdef CTRL_TAB_MAKES_META
533 if (ctrl)
534 meta = 1;
535#endif
536#ifdef MOD4_TAB_MAKES_META
537 if (ev.state & Mod4Mask)
538 meta = 1;
539#endif
540 newlen = 0;
541 }
542 break;
543
544 case XK_Up: /* "\033[A" */
545 case XK_Down: /* "\033[B" */
546 case XK_Right: /* "\033[C" */
547 case XK_Left: /* "\033[D" */
548 strcpy (kbuf, "\033[Z");
549 kbuf[2] = "DACB"[keysym - XK_Left];
550 /* do Shift first */
551 if (shft)
552 kbuf[2] = "dacb"[keysym - XK_Left];
553 else if (ctrl)
554 {
555 kbuf[1] = 'O';
556 kbuf[2] = "dacb"[keysym - XK_Left];
557 }
558 else if (priv_modes & PrivMode_aplCUR)
559 kbuf[1] = 'O';
560 break;
561
562 case XK_KP_Enter:
563 /* allow shift to override */
564 if (kp)
565 {
566 strcpy (kbuf, "\033OM");
567 break;
568 }
569
570 /* FALLTHROUGH */
571
572 case XK_Return:
573 if (priv_modes & PrivMode_LFNL)
574 {
575 kbuf[0] = '\015';
576 kbuf[1] = '\012';
577 kbuf[2] = '\0';
578 }
579 else
580 {
581 kbuf[0] = '\015';
582 kbuf[1] = '\0';
583 }
584 break;
585
586 case XK_KP_F1: /* "\033OP" */
587 case XK_KP_F2: /* "\033OQ" */
588 case XK_KP_F3: /* "\033OR" */
589 case XK_KP_F4: /* "\033OS" */
590 strcpy (kbuf, "\033OP");
591 kbuf[2] += (keysym - XK_KP_F1);
592 break;
593
594 case XK_KP_Multiply: /* "\033Oj" : "*" */
595 case XK_KP_Add: /* "\033Ok" : "+" */
596 case XK_KP_Separator: /* "\033Ol" : "," */
597 case XK_KP_Subtract: /* "\033Om" : "-" */
598 case XK_KP_Decimal: /* "\033On" : "." */
599 case XK_KP_Divide: /* "\033Oo" : "/" */
600 case XK_KP_0: /* "\033Op" : "0" */
601 case XK_KP_1: /* "\033Oq" : "1" */
602 case XK_KP_2: /* "\033Or" : "2" */
603 case XK_KP_3: /* "\033Os" : "3" */
604 case XK_KP_4: /* "\033Ot" : "4" */
605 case XK_KP_5: /* "\033Ou" : "5" */
606 case XK_KP_6: /* "\033Ov" : "6" */
607 case XK_KP_7: /* "\033Ow" : "7" */
608 case XK_KP_8: /* "\033Ox" : "8" */
609 case XK_KP_9: /* "\033Oy" : "9" */
610 /* allow shift to override */
611 if (kp)
612 {
613 strcpy (kbuf, "\033Oj");
614 kbuf[2] += (keysym - XK_KP_Multiply);
615 }
616 else
617 {
618 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
619 kbuf[1] = '\0';
620 }
621 break;
622
623 default:
624 {
625 int param = map_function_key (keysym);
626 if (param > 0)
627 sprintf (kbuf,"\033[%d~", param);
628 else
629 newlen = 0;
630 }
631 break;
632 }
633
634 if (newlen)
635 len = strlen (kbuf);
636
637 if (len > 0)
638 {
639 /*
640 * pass Shift/Control indicators for function keys ending with `~'
641 *
642 * eg,
643 * Prior = "ESC[5~"
644 * Shift+Prior = "ESC[5$"
645 * Ctrl+Prior = "ESC[5^"
646 * Ctrl+Shift+Prior = "ESC[5@"
647 */
648 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
649 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
650
651 /*
652 * Pass meta for all function keys, if 'meta' option set
653 */
654#ifdef META8_OPTION
655 if (meta && (meta_char == 0x80))
656 kbuf[len - 1] |= 0x80;
657#endif
658 }
659
660 }
661 else if (ctrl && keysym == XK_minus)
662 {
663 len = 1;
664 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
665 }
666 else if (keysym == XK_ISO_Left_Tab)
667 {
668 strcpy (kbuf, "\033[Z");
669 len = 3;
670 }
671 else
672 {
673#ifdef META8_OPTION
674 /* set 8-bit on */
675 if (meta && (meta_char == 0x80))
676 {
677 char *ch;
678
679 for (ch = kbuf; ch < kbuf + len; ch++)
680 *ch |= 0x80;
681 }
682#endif
683 /* nil */ ;
684 }
685
686 keysym = orig_keysym;
687 }
688
689 /* escape prefix */
690 if (len && meta
691#ifdef META8_OPTION
692 && meta_char == C0_ESC
693#endif
694 )
695 {
696 *--kbuf = C0_ESC;
697 len++;
698 }
699
700 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
701 return;
702
703 if (keysym != NoSymbol)
394 { 704 {
395#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
396 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
397 return; 707 return;
398#endif 708#endif
399 709
400 if (saveLines) 710 if (saveLines)
401 { 711 {
… …
410#ifdef PAGING_CONTEXT_LINES 720#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 721 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 722#else
413 lnsppg = nrow * 4 / 5; 723 lnsppg = nrow * 4 / 5;
414#endif 724#endif
725 max_it (lnsppg, 1);
726
415 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
416 { 728 {
417 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
418 return; 730 return;
419 } 731 }
420 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
421 { 733 {
422 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
423 return; 735 return;
424 } 736 }
425 } 737 }
426#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
427 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
428 { 740 {
429 if (keysym == XK_Up) 741 if (keysym == XK_Up)
430 { 742 {
431 scr_page (UP, 1); 743 scr_page (1);
432 return; 744 return;
433 } 745 }
434 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
435 { 747 {
436 scr_page (DN, 1); 748 scr_page (-1);
437 return; 749 return;
438 } 750 }
439 } 751 }
440#endif 752#endif
441#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
442 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
443 { 755 {
444 if (keysym == XK_Home) 756 if (keysym == XK_Home)
445 { 757 {
446 scr_move_to (0, 1); 758 scr_changeview (top_row);
447 return; 759 return;
448 } 760 }
449 else if (keysym == XK_End) 761 else if (keysym == XK_End)
450 { 762 {
451 scr_move_to (1, 1); 763 scr_changeview (0);
452 return; 764 return;
453 } 765 }
454 } 766 }
455#endif 767#endif
456 } 768 }
457 769
458 if (shft) 770 if (shft)
459 { 771 {
460 /* Shift + F1 - F10 generates F11 - F20 */
461 if (keysym >= XK_F1 && keysym <= XK_F10)
462 {
463 keysym += (XK_F11 - XK_F1);
464 shft = 0; /* turn off Shift */
465 }
466 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
467 { 773 {
468 switch (keysym) 774 switch (keysym)
469 { 775 {
470 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
471 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
472 selection_request (ev.time); 778 selection_request (ev.time);
473 return; 779 return;
474#if TODO 780#if TODO
475 /* rxvt extras */ 781 /* rxvt extras */
476 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 782 case XK_KP_Add: /* Shift+KP_Add = bigger font */
477 change_font (FONT_UP);
478 return; 783 return;
479 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
480 change_font (FONT_DN);
481 return; 785 return;
482#endif 786#endif
483 } 787 }
484 } 788 }
485 } 789 }
486 790
791 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
792 {
793 if (keysym == XK_v)
794 selection_request (ev.time, Sel_Clipboard);
795 else if (selection.len > 0)
796 {
797 free (selection.clip_text);
798 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
799 selection.clip_len = selection.len;
800 selection_grab (CurrentTime, true);
801 }
802
803 return;
804 }
805
487#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 807 // ISO 14755 support
489 if (shft && ctrl) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 809 {
491 int hv; 810 int hv;
492 811
493 if (iso14755buf & ISO_14755_51 812 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 813 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 843 scr_overlay_off ();
525# endif 844# endif
526 iso14755buf = 0; 845 iso14755buf = 0;
527 } 846 }
528 } 847 }
848 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 849 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 850 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 851 if (!(iso14755buf & ISO_14755_STARTED))
532 { 852 {
533 iso14755buf |= ISO_14755_STARTED; 853 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 854# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 855 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
543 { 863 {
544 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
545 return; 865 return;
546 } 866 }
547#endif 867#endif
548
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 {
551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553 newlen = 1;
554 switch (keysym)
555 {
556#ifndef NO_BACKSPACE_KEY
557 case XK_BackSpace:
558 if (priv_modes & PrivMode_HaveBackSpace)
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else
565 strcpy (kbuf, rs[Rs_backspace_key]);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, rs[Rs_delete_key]);
581 break;
582#endif
583 case XK_Tab:
584 if (shft)
585 strcpy (kbuf, "\033[Z");
586 else
587 {
588#ifdef CTRL_TAB_MAKES_META
589 if (ctrl)
590 meta = 1;
591#endif
592#ifdef MOD4_TAB_MAKES_META
593 if (ev.state & Mod4Mask)
594 meta = 1;
595#endif
596 newlen = 0;
597 }
598 break;
599
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if (kp)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z");
621 kbuf[2] = "DACB"[keysym - XK_Left];
622 /* do Shift first */
623 if (shft)
624 kbuf[2] = "dacb"[keysym - XK_Left];
625 else if (ctrl)
626 {
627 kbuf[1] = 'O';
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 }
630 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O';
632 break;
633
634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if (kp)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if (kp)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next:
659 strcpy (kbuf, "\033[6~");
660 break;
661#endif
662 case XK_KP_Enter:
663 /* allow shift to override */
664 if (kp)
665 {
666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
678 }
679 else
680 {
681 kbuf[0] = '\015';
682 kbuf[1] = '\0';
683 }
684 break;
685
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP");
697 kbuf[2] += (keysym - XK_KP_F1);
698 break;
699
700 case XK_KP_Multiply: /* "\033Oj" : "*" */
701 case XK_KP_Add: /* "\033Ok" : "+" */
702 case XK_KP_Separator: /* "\033Ol" : "," */
703 case XK_KP_Subtract: /* "\033Om" : "-" */
704 case XK_KP_Decimal: /* "\033On" : "." */
705 case XK_KP_Divide: /* "\033Oo" : "/" */
706 case XK_KP_0: /* "\033Op" : "0" */
707 case XK_KP_1: /* "\033Oq" : "1" */
708 case XK_KP_2: /* "\033Or" : "2" */
709 case XK_KP_3: /* "\033Os" : "3" */
710 case XK_KP_4: /* "\033Ot" : "4" */
711 case XK_KP_5: /* "\033Ou" : "5" */
712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */
717 if (kp)
718 {
719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply);
721 }
722 else
723 {
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0';
726 }
727 break;
728
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if (kp)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert:
744 strcpy (kbuf, "\033[2~");
745 break;
746#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove:
748 /* FALLTHROUGH */
749#endif
750 case XK_Execute:
751 strcpy (kbuf, "\033[3~");
752 break;
753 case XK_Select:
754 strcpy (kbuf, "\033[4~");
755 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if (kp)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End:
767 strcpy (kbuf, KS_END);
768 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if (kp)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home:
780 strcpy (kbuf, KS_HOME);
781 break;
782
783#define FKEY(n, fkey) \
784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786 case XK_F1: /* "\033[11~" */
787 case XK_F2: /* "\033[12~" */
788 case XK_F3: /* "\033[13~" */
789 case XK_F4: /* "\033[14~" */
790 case XK_F5: /* "\033[15~" */
791 FKEY (11, XK_F1);
792 break;
793 case XK_F6: /* "\033[17~" */
794 case XK_F7: /* "\033[18~" */
795 case XK_F8: /* "\033[19~" */
796 case XK_F9: /* "\033[20~" */
797 case XK_F10: /* "\033[21~" */
798 FKEY (17, XK_F6);
799 break;
800 case XK_F11: /* "\033[23~" */
801 case XK_F12: /* "\033[24~" */
802 case XK_F13: /* "\033[25~" */
803 case XK_F14: /* "\033[26~" */
804 FKEY (23, XK_F11);
805 break;
806 case XK_F15: /* "\033[28~" */
807 case XK_F16: /* "\033[29~" */
808 FKEY (28, XK_F15);
809 break;
810 case XK_Help: /* "\033[28~" */
811 FKEY (28, XK_Help);
812 break;
813 case XK_Menu: /* "\033[29~" */
814 FKEY (29, XK_Menu);
815 break;
816 case XK_F17: /* "\033[31~" */
817 case XK_F18: /* "\033[32~" */
818 case XK_F19: /* "\033[33~" */
819 case XK_F20: /* "\033[34~" */
820 case XK_F21: /* "\033[35~" */
821 case XK_F22: /* "\033[36~" */
822 case XK_F23: /* "\033[37~" */
823 case XK_F24: /* "\033[38~" */
824 case XK_F25: /* "\033[39~" */
825 case XK_F26: /* "\033[40~" */
826 case XK_F27: /* "\033[41~" */
827 case XK_F28: /* "\033[42~" */
828 case XK_F29: /* "\033[43~" */
829 case XK_F30: /* "\033[44~" */
830 case XK_F31: /* "\033[45~" */
831 case XK_F32: /* "\033[46~" */
832 case XK_F33: /* "\033[47~" */
833 case XK_F34: /* "\033[48~" */
834 case XK_F35: /* "\033[49~" */
835 FKEY (31, XK_F17);
836 break;
837#undef FKEY
838 default:
839 newlen = 0;
840 break;
841 }
842
843 if (newlen)
844 len = strlen (kbuf);
845 }
846
847 /*
848 * Pass meta for all function keys, if 'meta' option set
849 */
850#ifdef META8_OPTION
851 if (meta && (meta_char == 0x80) && len > 0)
852 kbuf[len - 1] |= 0x80;
853#endif
854
855 }
856 else if (ctrl && keysym == XK_minus)
857 {
858 len = 1;
859 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
860 }
861 else if (keysym == XK_ISO_Left_Tab)
862 {
863 strcpy (kbuf, "\033[Z");
864 len = 3;
865 }
866 else
867 {
868#ifdef META8_OPTION
869 /* set 8-bit on */
870 if (meta && (meta_char == 0x80))
871 {
872 char *ch;
873
874 for (ch = kbuf; ch < kbuf + len; ch++)
875 *ch |= 0x80;
876
877 meta = 0;
878 }
879#endif
880 /* nil */ ;
881 }
882 } 868 }
883
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886 869
887 if (len <= 0) 870 if (len <= 0)
888 return; /* not mapped */ 871 return; /* not mapped */
889 872
890 if (option (Opt_scrollTtyKeypress))
891 if (view_start)
892 {
893 view_start = 0;
894 want_refresh = 1;
895 }
896
897 /*
898 * these modifications only affect the static keybuffer
899 * pass Shift/Control indicators for function keys ending with `~'
900 *
901 * eg,
902 * Prior = "ESC[5~"
903 * Shift+Prior = "ESC[5$"
904 * Ctrl+Prior = "ESC[5^"
905 * Ctrl+Shift+Prior = "ESC[5@"
906 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
907 */
908 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
909 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
910
911 /* escape prefix */
912 if (meta
913#ifdef META8_OPTION
914 && meta_char == C0_ESC
915#endif
916 )
917 {
918 const char ch = C0_ESC;
919 tt_write (&ch, 1);
920 }
921
922 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
923} 874}
924 875
925void 876void ecb_cold
926rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
927{ 878{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 879#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym; 880 KeySym keysym;
930 881
… …
950 commit_iso14755 (); 901 commit_iso14755 ();
951 902
952 return; 903 return;
953 } 904 }
954 905
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 906 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
956 if (i[0] == keysym) 907 if (i[0] == keysym)
957 { 908 {
958 iso14755buf = ISO_14755_51 | i[1]; 909 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 (); 910 commit_iso14755 ();
960 911
… …
997 else if (keysym == XK_Control_L || keysym == XK_Control_R) 948 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0; 949 mouse_slip_wheel_speed = 0;
999#endif 950#endif
1000} 951}
1001 952
1002#if defined (KEYSYM_RESOURCE)
1003unsigned int
1004rxvt_term::cmd_write (const char *str, unsigned int count)
1005{
1006 unsigned int n, s;
1007
1008 n = cmdbuf_ptr - cmdbuf_base;
1009 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
1010
1011 if (n > 0 && s < count)
1012 {
1013 memmove (cmdbuf_base, cmdbuf_ptr,
1014 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
1015 cmdbuf_ptr = cmdbuf_base;
1016 cmdbuf_endp -= n;
1017 s += n;
1018 }
1019
1020 if (count > s)
1021 {
1022 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
1023 count = s;
1024 }
1025
1026 for (; count--;)
1027 *cmdbuf_endp++ = *str++;
1028
1029 cmd_parse ();
1030
1031 return 0;
1032}
1033#endif
1034
1035void 953void
1036rxvt_term::flush () 954rxvt_term::flush ()
1037{ 955{
1038 flush_ev.stop (); 956 flush_ev.stop ();
1039 957
1040#ifdef HAVE_BG_PIXMAP 958#ifdef HAVE_IMG
1041 if (bgPixmap.check_clearChanged ()) 959 if (bg_flags & BG_NEEDS_REFRESH)
1042 { 960 {
1043// scr_clear (true); This needs to be researched further! 961 bg_flags &= ~BG_NEEDS_REFRESH;
1044 scr_touch (false); 962 scr_touch (false);
1045 } 963 }
1046#endif 964#endif
1047 965
1048 if (want_refresh) 966 if (want_refresh)
… …
1084 } 1002 }
1085 while (row < end_row); 1003 while (row < end_row);
1086 } 1004 }
1087 1005
1088 scr_refresh (); 1006 scr_refresh ();
1089 scrollbar_show (1); 1007 scrollBar.show (1);
1090#ifdef USE_XIM 1008#if USE_XIM
1091 IMSendSpot (); 1009 im_send_spot ();
1092#endif 1010#endif
1093 } 1011 }
1094 1012
1095 display->flush (); 1013 display->flush ();
1096} 1014}
1097 1015
1016/* checks whether a refresh is requested and starts the refresh timer */
1098void 1017void
1099rxvt_term::check_cb (check_watcher &w) 1018rxvt_term::refresh_check ()
1100{ 1019{
1101 make_current (); 1020 if (want_refresh && !flush_ev.is_active ())
1021 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102 1022
1103 display->flush (); 1023 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107} 1024}
1108 1025
1109void 1026void
1110rxvt_term::flush_cb (time_watcher &w) 1027rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1028{
1112 make_current (); 1029 make_current ();
1113 1030
1114 refresh_count = 0; 1031 refresh_count = 0;
1115 flush (); 1032 flush ();
1116} 1033}
1117 1034
1118#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1119void 1036void
1037rxvt_term::cursor_blink_reset ()
1038{
1039 if (!focus)
1040 return;
1041
1042 if (hidden_cursor)
1043 {
1044 hidden_cursor = 0;
1045 want_refresh = 1;
1046 }
1047
1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1049 cursor_blink_ev.again ();
1050 else
1051 cursor_blink_ev.stop ();
1052}
1053
1054void
1120rxvt_term::cursor_blink_cb (time_watcher &w) 1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1056{
1122 hidden_cursor = !hidden_cursor; 1057 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1058 want_refresh = 1;
1124 1059 refresh_check ();
1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1126} 1060}
1127#endif 1061#endif
1128 1062
1129#ifdef TEXT_BLINK 1063#ifdef TEXT_BLINK
1130void 1064void
1131rxvt_term::text_blink_cb (time_watcher &w) 1065rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132{ 1066{
1133 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1067 if (scr_refresh_rend (RS_Blink, RS_Blink))
1134 { 1068 {
1135 hidden_text = !hidden_text; 1069 hidden_text = !hidden_text;
1136 want_refresh = 1; 1070 want_refresh = 1;
1137 w.start (w.at + TEXT_BLINK_INTERVAL); 1071 refresh_check ();
1138 } 1072 }
1073 else
1074 w.stop ();
1139} 1075}
1140#endif 1076#endif
1141 1077
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void 1079void
1144rxvt_term::cont_scroll_cb (time_watcher &w) 1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145{ 1081{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) && 1082 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1147 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1083 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1148 { 1084 {
1149 want_refresh = 1; 1085 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1086 refresh_check ();
1151 } 1087 }
1088 else
1089 w.stop ();
1152} 1090}
1153#endif 1091#endif
1154 1092
1155#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1156void 1094void
1157rxvt_term::sel_scroll_cb (time_watcher &w) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158{ 1096{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1160 { 1098 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1; 1100 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 refresh_check ();
1164 } 1102 }
1103 else
1104 w.stop ();
1165} 1105}
1166#endif 1106#endif
1167 1107
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void 1109void
1170rxvt_term::slip_wheel_cb (time_watcher &w) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171{ 1111{
1172 if (mouse_slip_wheel_speed == 0 1112 if (scr_page (mouse_slip_wheel_speed))
1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174 : scr_page (UP, mouse_slip_wheel_speed))
1175 { 1113 {
1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
1179 want_refresh = 1; 1114 want_refresh = 1;
1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1115 refresh_check ();
1116 }
1117
1118 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1119 {
1120 mouse_slip_wheel_speed = 0;
1121 w.stop ();
1181 } 1122 }
1182} 1123}
1183#endif 1124#endif
1184 1125
1185#if LINUX_YIELD_HACK 1126#if LINUX_YIELD_HACK
1186static struct event_handler 1127static struct event_handler
1187{ 1128{
1188 check_watcher yield_ev; 1129 ev::prepare yield_ev;
1189 1130
1190 void yield_cb (check_watcher &w) 1131 void yield_cb (ev::prepare &w, int revents)
1191 { 1132 {
1192 // this should really be sched_yield(), but the linux guys thought 1133 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than 1134 // that giving a process calling sched_yield () less cpu time than
1194 // ones with high nice levels is a useful thing to do. It surely is is 1135 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS. 1136 // allowed by the sus... as is returning ENOSYS.
1137 // since the linux guys additionally thought that breaking the only
1138 // known workaround against their unusable sched_yield hack is cool,
1139 // we just nanosleep a bit and hope for the best.
1196 1140
1197 struct timespec ts = { 0, 0 }; 1141 struct timespec ts = { 0, 1000 };
1198 nanosleep (&ts, 0); 1142 nanosleep (&ts, 0);
1199 1143
1200 w.stop (); 1144 w.stop ();
1201 } 1145 }
1202 1146
… …
1205 { 1149 {
1206 } 1150 }
1207} event_handler; 1151} event_handler;
1208#endif 1152#endif
1209 1153
1154/* make sure all the cmd data is at beginning of cmdbuf */
1155void
1156rxvt_term::cmdbuf_reify ()
1157{
1158 if (cmdbuf_ptr == cmdbuf_base)
1159 return;
1160
1161 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1162
1163 memmove (cmdbuf_base, cmdbuf_ptr, used);
1164 cmdbuf_ptr = cmdbuf_base;
1165 cmdbuf_endp = cmdbuf_ptr + used;
1166
1167}
1168
1169#if defined (KEYSYM_RESOURCE)
1170void
1171rxvt_term::cmdbuf_append (const char *str, size_t count)
1172{
1173 cmdbuf_reify ();
1174
1175 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1176
1177 if (count > avail)
1178 return;
1179
1180 memcpy (cmdbuf_endp, str, count);
1181 cmdbuf_endp += count;
1182
1183 cmd_parse ();
1184}
1185#endif
1186
1210bool 1187bool
1211rxvt_term::pty_fill () 1188rxvt_term::pty_fill ()
1212{ 1189{
1213 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1190 cmdbuf_reify ();
1214 1191
1215 if (CBUFSIZ == n) 1192 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1216 { 1193
1217 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1194 if (!avail)
1218 n = 0;
1219 } 1195 {
1220 1196 // normally this indicates a "too long" command sequence - just drop the data we have
1221 memmove (cmdbuf_base, cmdbuf_ptr, n);
1222 cmdbuf_ptr = cmdbuf_base; 1197 cmdbuf_ptr = cmdbuf_base;
1223 cmdbuf_endp = cmdbuf_ptr + n; 1198 cmdbuf_endp = cmdbuf_ptr;
1199 avail = CBUFSIZ;
1200 }
1224 1201
1225 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1202 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1226 1203
1227 if (r > 0) 1204 if (r > 0)
1228 { 1205 {
1229 cmdbuf_endp += r; 1206 cmdbuf_endp += r;
1230 return true; 1207 return true;
… …
1246 1223
1247 return false; 1224 return false;
1248} 1225}
1249 1226
1250void 1227void
1251rxvt_term::pty_cb (io_watcher &w, short revents) 1228rxvt_term::pty_cb (ev::io &w, int revents)
1252{ 1229{
1253 make_current (); 1230 make_current ();
1254 1231
1255 if (revents & EVENT_READ) 1232 if (revents & ev::READ)
1256 // loop, but don't allow a single term to monopolize us 1233 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ()) 1234 for (int i = CBUFCNT; i-- && pty_fill (); )
1258 if (cmd_parse ()) 1235 cmd_parse ();
1259 break;
1260 1236
1261 if (revents & EVENT_WRITE) 1237 if (revents & ev::WRITE)
1262 pty_write (); 1238 pty_write ();
1263}
1264 1239
1265void 1240 refresh_check ();
1241}
1242
1243void ecb_cold
1266rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1267{ 1245{
1268 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1269 recolour_cursor (); 1247 recolor_cursor ();
1270 1248
1271#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1250 hidden_pointer = 0;
1273 1251
1274 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1276#endif 1254#endif
1277} 1255}
1278 1256
1279#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1280void 1258void ecb_cold
1281rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1282{ 1260{
1283 if (!option (Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1284 return; 1262 return;
1285 1263
… …
1287 XFlush (dpy); 1265 XFlush (dpy);
1288 1266
1289 hidden_pointer = 1; 1267 hidden_pointer = 1;
1290} 1268}
1291 1269
1292void 1270void ecb_cold
1293rxvt_term::pointer_cb (time_watcher &w) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1272{
1295 make_current (); 1273 make_current ();
1296 1274
1297 pointer_blank (); 1275 pointer_blank ();
1298} 1276}
1299#endif 1277#endif
1300 1278
1301void 1279void
1302rxvt_term::mouse_report (XButtonEvent &ev) 1280rxvt_term::mouse_report (XButtonEvent &ev)
1303{ 1281{
1304 int button_number, key_state = 0; 1282 int button_number, state = 0;
1305 int x, y; 1283 int x, y;
1284 bool release = ev.type == ButtonRelease;
1306 1285
1307 x = Pixel2Col (ev.x); 1286 x = Pixel2Col (ev.x) + 1;
1308 y = Pixel2Row (ev.y); 1287 y = Pixel2Row (ev.y) + 1;
1309 1288
1310 if (MEvent.button == AnyButton) 1289 if (ev.type == MotionNotify)
1311 button_number = 3; 1290 {
1312 else 1291 if (x == mouse_row && y == mouse_col)
1292 return;
1293
1294 mouse_row = x;
1295 mouse_col = y;
1296 state += 32;
1313 { 1297 }
1298
1314 button_number = MEvent.button - Button1; 1299 button_number = MEvent.button - Button1;
1315 /* add 0x3D for wheel events, like xterm does */ 1300 /* add 0x3D for wheel events, like xterm does */
1316 if (button_number >= 3) 1301 if (button_number >= 3)
1317 button_number += (64 - 3); 1302 button_number += 64 - 3;
1318 }
1319 1303
1320 if (priv_modes & PrivMode_MouseX10) 1304 if (priv_modes & PrivMode_MouseX10)
1321 { 1305 {
1322 /* 1306 /*
1323 * do not report ButtonRelease 1307 * do not report ButtonRelease
1324 * no state info allowed 1308 * no state info allowed
1325 */ 1309 */
1326 key_state = 0; 1310 if (release)
1327 if (button_number == 3)
1328 return; 1311 return;
1329 } 1312 }
1330 else 1313 else
1331 { 1314 {
1332 /* XTerm mouse reporting needs these values: 1315 /* XTerm mouse reporting needs these values:
… …
1334 * 8 = Meta 1317 * 8 = Meta
1335 * 16 = Control 1318 * 16 = Control
1336 * plus will add in our own Double-Click reporting 1319 * plus will add in our own Double-Click reporting
1337 * 32 = Double Click 1320 * 32 = Double Click
1338 */ 1321 */
1339 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1322 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1340 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1323 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1341 + ((MEvent.state & ControlMask) ? 16 : 0); 1324 + ((MEvent.state & ControlMask) ? 16 : 0);
1342#ifdef MOUSE_REPORT_DOUBLECLICK 1325#ifdef MOUSE_REPORT_DOUBLECLICK
1343 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1326 state += ((MEvent.clicks > 1) ? 32 : 0);
1344#endif 1327#endif
1345 } 1328 }
1329
1330 int code = 32 + (release ? 3 : button_number) + state;
1346 1331
1347#if DEBUG_MOUSEREPORT 1332#if DEBUG_MOUSEREPORT
1348 fprintf (stderr, "Mouse ["); 1333 fprintf (stderr, "Mouse [");
1349 if (key_state & 16) 1334 if (state & 16)
1350 fputc ('C', stderr); 1335 fputc ('C', stderr);
1351 if (key_state & 4) 1336 if (state & 4)
1352 fputc ('S', stderr); 1337 fputc ('S', stderr);
1353 if (key_state & 8) 1338 if (state & 8)
1354 fputc ('A', stderr); 1339 fputc ('A', stderr);
1355 if (key_state & 32) 1340 if (state & 32)
1356 fputc ('2', stderr); 1341 fputc ('2', stderr);
1357 fprintf (stderr, "]: <%d>, %d/%d\n", 1342 fprintf (stderr, "]: <%d>, %d/%d\n",
1358 button_number, 1343 button_number,
1359 x + 1, 1344 x,
1360 y + 1); 1345 y);
1361#endif 1346#endif
1362 1347
1348#if ENABLE_FRILLS
1349 if (priv_modes & PrivMode_ExtMouseSGR)
1350 tt_printf ("\033[<%d;%d;%d%c",
1351 button_number + state,
1352 x,
1353 y,
1354 release ? 'm' : 'M');
1355 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1356 tt_printf ("\033[%d;%d;%dM",
1357 code,
1358 x,
1359 y);
1360 else if (priv_modes & PrivMode_ExtMouseUTF8)
1361 tt_printf ("\033[M%c%lc%lc",
1362 code,
1363 wint_t (32 + x),
1364 wint_t (32 + y));
1365 else
1366#endif
1363 tt_printf ("\033[M%c%c%c", 1367 tt_printf ("\033[M%c%c%c",
1364 (32 + button_number + key_state), 1368 code,
1365 (32 + x + 1), 1369 32 + x,
1366 (32 + y + 1)); 1370 32 + y);
1367} 1371}
1368 1372
1369/*{{{ process an X event */ 1373/*{{{ process an X event */
1370void 1374void ecb_hot
1371rxvt_term::x_cb (XEvent &ev) 1375rxvt_term::x_cb (XEvent &ev)
1372{ 1376{
1373 make_current (); 1377 make_current ();
1374 1378
1375 dLocal (Display *, dpy); 1379 dLocal (Display *, dpy);
… …
1473 && ev.xfocus.mode != NotifyGrab) 1477 && ev.xfocus.mode != NotifyGrab)
1474 focus_out (); 1478 focus_out ();
1475 break; 1479 break;
1476 1480
1477 case ConfigureNotify: 1481 case ConfigureNotify:
1478 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1479 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1480 szHint.width, szHint.height); */
1481 if (ev.xconfigure.window == parent[0]) 1482 if (ev.xconfigure.window == parent)
1482 { 1483 {
1483 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1484 ; 1485 ;
1486
1487 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1488
1489 if (want_position_change)
1490 {
1491 int x, y;
1492
1493 if (ev.xconfigure.send_event)
1494 {
1495 x = ev.xconfigure.x;
1496 y = ev.xconfigure.y;
1497 }
1498 else
1499 get_window_origin (x, y);
1500
1501 if (x != parent_x || y != parent_y)
1502 {
1503 parent_x = x;
1504 parent_y = y;
1505 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1506 }
1507 }
1485 1508
1486 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1509 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1487 { 1510 {
1488 seen_resize = 1; 1511 seen_resize = 1;
1489 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1512 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1490 } 1513 }
1491 else 1514
1492 {
1493#ifdef HAVE_BG_PIXMAP
1494 if (bgPixmap.window_position_sensitive ())
1495 update_background ();
1496#endif
1497 }
1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499 } 1516 }
1500 break; 1517 break;
1501 1518
1502 case PropertyNotify: 1519 case PropertyNotify:
1503 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1520 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1504 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1505 && ev.xproperty.state == PropertyNewValue)
1506 selection_property (ev.xproperty.window, ev.xproperty.atom);
1507
1508 break; 1521 break;
1509 1522
1510 case SelectionClear: 1523 case SelectionClear:
1511 selection_clear (); 1524 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1512 break;
1513
1514 case SelectionNotify:
1515 if (selection_wait == Sel_normal)
1516 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1517 break; 1525 break;
1518 1526
1519 case SelectionRequest: 1527 case SelectionRequest:
1520 selection_send (ev.xselectionrequest); 1528 selection_send (ev.xselectionrequest);
1521 break; 1529 break;
1522 1530
1523 case MapNotify: 1531 case MapNotify:
1524 mapped = 1; 1532 mapped = 1;
1525#ifdef TEXT_BLINK 1533#ifdef TEXT_BLINK
1526 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1534 text_blink_ev.start ();
1527#endif 1535#endif
1528 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1536 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1529 break; 1537 break;
1530 1538
1531 case UnmapNotify: 1539 case UnmapNotify:
… …
1541 if (ev.xany.window == vt) 1549 if (ev.xany.window == vt)
1542 { 1550 {
1543 do 1551 do
1544 { 1552 {
1545 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1546 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, false);
1547 } 1555 }
1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1556 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1549 1557
1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1558 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1551 1559
1552 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1560 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1553 { 1561 {
1554 scr_expose (ev.xexpose.x, ev.xexpose.y, 1562 scr_expose (ev.xexpose.x, ev.xexpose.y,
1555 ev.xexpose.width, ev.xexpose.height, False); 1563 ev.xexpose.width, ev.xexpose.height, false);
1556 } 1564 }
1565
1557 want_refresh = 1; 1566 want_refresh = 1;
1558 } 1567 }
1559 else 1568 else
1560 { 1569 {
1561 XEvent unused_event; 1570 XEvent unused_event;
… …
1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1572 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1564 ; 1573 ;
1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1574 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1566 ; 1575 ;
1567 1576
1568 if (isScrollbarWindow (ev.xany.window)) 1577 if (scrollBar.state && ev.xany.window == scrollBar.win)
1569 { 1578 {
1570 scrollBar.setIdle (); 1579 scrollBar.state = SB_STATE_IDLE;
1571 scrollbar_show (0); 1580 scrollBar.show (0);
1572 } 1581 }
1573 } 1582 }
1574 break; 1583 break;
1575 1584
1576 case MotionNotify: 1585 case MotionNotify:
1577#ifdef POINTER_BLANK 1586#ifdef POINTER_BLANK
1578 if (hidden_pointer) 1587 if (hidden_pointer)
1579 pointer_unblank (); 1588 pointer_unblank ();
1580#endif 1589#endif
1590 if (!bypass_keystate
1591 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1592 || priv_modes & PrivMode_MouseAnyEvent))
1593 mouse_report (ev.xbutton);
1581 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1582 break; 1595 break;
1583 1596
1584 if (ev.xany.window == vt) 1597 if (ev.xany.window == vt)
1585 { 1598 {
… …
1596 &unused_root_x, &unused_root_y, 1609 &unused_root_x, &unused_root_y,
1597 &ev.xbutton.x, &ev.xbutton.y, 1610 &ev.xbutton.x, &ev.xbutton.y,
1598 &ev.xbutton.state); 1611 &ev.xbutton.state);
1599#ifdef MOUSE_THRESHOLD 1612#ifdef MOUSE_THRESHOLD
1600 /* deal with a `jumpy' mouse */ 1613 /* deal with a `jumpy' mouse */
1601 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1614 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1615#endif
1602 { 1616 {
1603#endif
1604#if ISO_14755 1617#if ISO_14755
1605 // 5.4 1618 // 5.4
1606 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1619 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1607 { 1620 {
1608 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1621 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1614 1627
1615#ifdef SELECTION_SCROLLING 1628#ifdef SELECTION_SCROLLING
1616 if (ev.xbutton.y < int_bwidth 1629 if (ev.xbutton.y < int_bwidth
1617 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1630 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1618 { 1631 {
1632 page_dirn scroll_selection_dir;
1619 int dist; 1633 int dist;
1620 1634
1621 /* don't clobber the current delay if we are 1635 /* don't clobber the current delay if we are
1622 * already in the middle of scrolling. 1636 * already in the middle of scrolling.
1623 */ 1637 */
1624 if (!sel_scroll_ev.active) 1638 if (!sel_scroll_ev.is_active ())
1625 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1639 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1626 1640
1627 /* save the event params so we can highlight 1641 /* save the event params so we can highlight
1628 * the selection in the pending-scroll loop 1642 * the selection in the pending-scroll loop
1629 */ 1643 */
1630 selection_save_x = ev.xbutton.x; 1644 selection_save_x = ev.xbutton.x;
… …
1638 dist = int_bwidth - ev.xbutton.y; 1652 dist = int_bwidth - ev.xbutton.y;
1639 } 1653 }
1640 else 1654 else
1641 { 1655 {
1642 scroll_selection_dir = DN; 1656 scroll_selection_dir = DN;
1643 dist = ev.xbutton.y - (int_bwidth + height); 1657 dist = ev.xbutton.y - (int_bwidth + vt_height);
1644 } 1658 }
1645 1659
1646 scroll_selection_lines = Pixel2Height (dist) 1660 scroll_selection_lines = Pixel2Height (dist)
1647 / SELECTION_SCROLL_LINE_SPEEDUP 1661 / SELECTION_SCROLL_LINE_SPEEDUP
1648 + 1; 1662 + 1;
1649 min_it (scroll_selection_lines, 1663 min_it (scroll_selection_lines,
1650 SELECTION_SCROLL_MAX_LINES); 1664 SELECTION_SCROLL_MAX_LINES);
1665 scroll_selection_lines *= scroll_selection_dir;
1651 } 1666 }
1652 else 1667 else
1653 { 1668 {
1654 /* we are within the text window, so we 1669 /* we are within the text window, so we
1655 * shouldn't be scrolling 1670 * shouldn't be scrolling
1656 */ 1671 */
1657 if (sel_scroll_ev.active)
1658 sel_scroll_ev.stop(); 1672 sel_scroll_ev.stop();
1659 } 1673 }
1660#endif 1674#endif
1661#ifdef MOUSE_THRESHOLD
1662 } 1675 }
1663#endif
1664 } 1676 }
1665 } 1677 }
1666 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1678 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1667 { 1679 {
1668 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1680 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1669 MotionNotify, &ev)) 1681 MotionNotify, &ev))
1670 ; 1682 ;
1671 1683
1672 XQueryPointer (dpy, scrollBar.win, 1684 XQueryPointer (dpy, scrollBar.win,
1673 &unused_root, &unused_child, 1685 &unused_root, &unused_child,
1674 &unused_root_x, &unused_root_y, 1686 &unused_root_x, &unused_root_y,
1675 &ev.xbutton.x, &ev.xbutton.y, 1687 &ev.xbutton.x, &ev.xbutton.y,
1676 &unused_mask); 1688 &unused_mask);
1677 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1689 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1678 scrollbar_size ()); 1690 scrollBar.size ());
1679 want_refresh = 1; 1691 want_refresh = 1;
1680 scrollbar_show (1); 1692 scrollBar.show (1);
1681 } 1693 }
1682 break; 1694 break;
1683 } 1695 }
1684 1696
1685#if defined(CURSOR_BLINK) 1697#if defined(CURSOR_BLINK)
1686 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1698 if (ev.type == KeyPress)
1687 { 1699 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 1700#endif
1697 1701
1698#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1699 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1700 { 1704 {
… …
1706 1710
1707 if (ev.type == KeyPress && hidden_pointer == 0) 1711 if (ev.type == KeyPress && hidden_pointer == 0)
1708 pointer_blank (); 1712 pointer_blank ();
1709 } 1713 }
1710#endif 1714#endif
1711}
1712 1715
1713void 1716 refresh_check ();
1717}
1718
1719#if ENABLE_FRILLS
1720void ecb_cold
1721rxvt_term::set_urgency (bool enable)
1722{
1723 if (enable == urgency_hint)
1724 return;
1725
1726 if (XWMHints *h = XGetWMHints (dpy, parent))
1727 {
1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1729 XSetWMHints (dpy, parent, h);
1730 urgency_hint = enable;
1731 XFree (h);
1732 }
1733}
1734#endif
1735
1736void ecb_cold
1714rxvt_term::focus_in () 1737rxvt_term::focus_in ()
1715{ 1738{
1716 if (!focus) 1739 if (!focus)
1717 { 1740 {
1718 focus = 1; 1741 focus = 1;
1719 want_refresh = 1; 1742 want_refresh = 1;
1720 1743
1721 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1722
1723#if USE_XIM 1744#if USE_XIM
1724 if (Input_Context != NULL) 1745 if (Input_Context != NULL)
1725 { 1746 {
1726 IMSetPosition (); 1747 im_set_position ();
1727 XSetICFocus (Input_Context); 1748 XSetICFocus (Input_Context);
1728 } 1749 }
1729#endif 1750#endif
1730#if CURSOR_BLINK 1751#if CURSOR_BLINK
1731 if (option (Opt_cursorBlink)) 1752 if (option (Opt_cursorBlink))
1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1753 cursor_blink_ev.again ();
1733#endif 1754#endif
1734#if OFF_FOCUS_FADING 1755#if OFF_FOCUS_FADING
1735 if (rs[Rs_fade]) 1756 if (rs[Rs_fade])
1736 { 1757 {
1737 pix_colors = pix_colors_focused; 1758 pix_colors = pix_colors_focused;
1738 scr_recolour (); 1759 scr_recolor ();
1739 } 1760 }
1740#endif 1761#endif
1741#if ENABLE_FRILLS 1762#if ENABLE_FRILLS
1742 if (option (Opt_urgentOnBell)) 1763 if (option (Opt_urgentOnBell))
1743 { 1764 set_urgency (0);
1744 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1745 {
1746 h->flags &= ~XUrgencyHint;
1747 XSetWMHints (dpy, parent[0], h);
1748 }
1749 }
1750#endif
1751 }
1752}
1753 1765
1754void 1766 if (priv_modes & PrivMode_FocusEvent)
1767 tt_printf ("\x1b[I");
1768#endif
1769
1770 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1771 }
1772}
1773
1774void ecb_cold
1755rxvt_term::focus_out () 1775rxvt_term::focus_out ()
1756{ 1776{
1757 if (focus) 1777 if (focus)
1758 { 1778 {
1759 focus = 0; 1779 focus = 0;
1760 want_refresh = 1; 1780 want_refresh = 1;
1761 1781
1762 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1782#if ENABLE_FRILLS
1783 if (option (Opt_urgentOnBell))
1784 set_urgency (0);
1763 1785
1786 if (priv_modes & PrivMode_FocusEvent)
1787 tt_printf ("\x1b[O");
1788#endif
1764#if ENABLE_FRILLS || ISO_14755 1789#if ENABLE_FRILLS || ISO_14755
1765 if (iso14755buf) 1790 if (iso14755buf)
1766 { 1791 {
1767 iso14755buf = 0; 1792 iso14755buf = 0;
1768# if ISO_14755 1793# if ISO_14755
… …
1775 XUnsetICFocus (Input_Context); 1800 XUnsetICFocus (Input_Context);
1776#endif 1801#endif
1777#if CURSOR_BLINK 1802#if CURSOR_BLINK
1778 if (option (Opt_cursorBlink)) 1803 if (option (Opt_cursorBlink))
1779 cursor_blink_ev.stop (); 1804 cursor_blink_ev.stop ();
1805
1780 hidden_cursor = 0; 1806 hidden_cursor = 0;
1781#endif 1807#endif
1782#if OFF_FOCUS_FADING 1808#if OFF_FOCUS_FADING
1783 if (rs[Rs_fade]) 1809 if (rs[Rs_fade])
1784 { 1810 {
1785 pix_colors = pix_colors_unfocused; 1811 pix_colors = pix_colors_unfocused;
1786 scr_recolour (); 1812 scr_recolor ();
1787 } 1813 }
1788#endif 1814#endif
1789 }
1790}
1791 1815
1792void 1816 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1817 }
1818}
1819
1820void ecb_cold
1793rxvt_term::update_fade_color (unsigned int idx) 1821rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1794{ 1822{
1795#if OFF_FOCUS_FADING 1823#if OFF_FOCUS_FADING
1796 if (rs[Rs_fade]) 1824 if (rs[Rs_fade])
1797 { 1825 {
1826 if (!first_time)
1827 pix_colors_focused [idx].free (this);
1828
1798 rgba c; 1829 rgba c;
1799 pix_colors [Color_fade].get (c); 1830 pix_colors [Color_fade].get (c);
1800 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1831 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1801 } 1832 }
1802#endif 1833#endif
1803} 1834}
1804 1835
1805#if ENABLE_TRANSPARENCY || ENABLE_PERL 1836#if ENABLE_PERL
1806void 1837void ecb_hot
1807rxvt_term::rootwin_cb (XEvent &ev) 1838rxvt_term::rootwin_cb (XEvent &ev)
1808{ 1839{
1809 make_current (); 1840 make_current ();
1810 1841
1811 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1842 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1812 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1843 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1813 return; 1844 return;
1814 1845
1815# if ENABLE_TRANSPARENCY
1816 switch (ev.type) 1846 switch (ev.type)
1817 { 1847 {
1818 case PropertyNotify: 1848 case PropertyNotify:
1819 /* 1849 /*
1820 * if user used some Esetroot compatible prog to set the root bg, 1850 * if user used some Esetroot compatible prog to set the root bg,
1821 * use the property to determine the pixmap. We use it later on. 1851 * use the property to determine the pixmap. We use it later on.
1822 */ 1852 */
1823 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1853 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1825 { 1855 {
1826 bgPixmap.set_root_pixmap (); 1856 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1827 update_background ();
1828 } 1857 }
1858
1829 break; 1859 break;
1830 } 1860 }
1831# endif 1861
1862 refresh_check ();
1832} 1863}
1833#endif 1864#endif
1834 1865
1835void 1866void
1836rxvt_term::button_press (XButtonEvent &ev) 1867rxvt_term::button_press (XButtonEvent &ev)
… …
1857 iso14755_54 (ev.x, ev.y); 1888 iso14755_54 (ev.x, ev.y);
1858 return; 1889 return;
1859 } 1890 }
1860#endif 1891#endif
1861 1892
1862 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1893 clickintime = ev.time - MEvent.time < multiClickTime;
1863 1894
1864 if (reportmode) 1895 if (reportmode)
1865 { 1896 {
1866 /* mouse report from vt window */ 1897 /* mouse report from vt window */
1867 /* save the xbutton state (for ButtonRelease) */ 1898 /* save the xbutton state (for ButtonRelease) */
1868 MEvent.state = ev.state; 1899 MEvent.state = ev.state;
1869#ifdef MOUSE_REPORT_DOUBLECLICK 1900#ifdef MOUSE_REPORT_DOUBLECLICK
1870 if (ev.button == MEvent.button && clickintime) 1901 if (ev.button == MEvent.button && clickintime)
1871 { 1902 {
1872 /* same button, within alloted time */ 1903 /* same button, within allowed time */
1873 MEvent.clicks++; 1904 MEvent.clicks++;
1874 1905
1875 if (MEvent.clicks > 1) 1906 if (MEvent.clicks > 1)
1876 { 1907 {
1877 /* only report double clicks */ 1908 /* only report double clicks */
… …
1891 mouse_report (ev); 1922 mouse_report (ev);
1892 } 1923 }
1893#else 1924#else
1894 MEvent.button = ev.button; 1925 MEvent.button = ev.button;
1895 mouse_report (ev); 1926 mouse_report (ev);
1896#endif /* MOUSE_REPORT_DOUBLECLICK */ 1927#endif /* MOUSE_REPORT_DOUBLECLICK */
1897 1928
1898 } 1929 }
1899 else 1930 else
1900 { 1931 {
1901 if (ev.button != MEvent.button) 1932 if (ev.button != MEvent.button)
… …
1949 } 1980 }
1950 1981
1951 /* 1982 /*
1952 * Scrollbar window processing of button press 1983 * Scrollbar window processing of button press
1953 */ 1984 */
1954 if (isScrollbarWindow (ev.window)) 1985 if (scrollBar.state && ev.window == scrollBar.win)
1955 { 1986 {
1956 scrollBar.setIdle (); 1987 page_dirn direction = NO_DIR;
1988
1989 if (scrollBar.upButton (ev.y))
1990 direction = UP; /* up */
1991 else if (scrollBar.dnButton (ev.y))
1992 direction = DN; /* down */
1993
1994 scrollBar.state = SB_STATE_IDLE;
1957 /* 1995 /*
1958 * Rxvt-style scrollbar: 1996 * Rxvt-style scrollbar:
1959 * move up if mouse is above slider 1997 * move up if mouse is above slider
1960 * move dn if mouse is below slider 1998 * move dn if mouse is below slider
1961 * 1999 *
… …
1970 /* 2008 /*
1971 * Mouse report disabled scrollbar: 2009 * Mouse report disabled scrollbar:
1972 * arrow buttons - send up/down 2010 * arrow buttons - send up/down
1973 * click on scrollbar - send pageup/down 2011 * click on scrollbar - send pageup/down
1974 */ 2012 */
1975 if ((scrollBar.style == R_SB_NEXT 2013 if (direction == UP)
1976 && scrollbarnext_upButton (ev.y))
1977 || (scrollBar.style == R_SB_RXVT
1978 && scrollbarrxvt_upButton (ev.y)))
1979 tt_printf ("\033[A"); 2014 tt_printf ("\033[A");
1980 else if ((scrollBar.style == R_SB_NEXT 2015 else if (direction == DN)
1981 && scrollbarnext_dnButton (ev.y))
1982 || (scrollBar.style == R_SB_RXVT
1983 && scrollbarrxvt_dnButton (ev.y)))
1984 tt_printf ("\033[B"); 2016 tt_printf ("\033[B");
1985 else 2017 else
1986 switch (ev.button) 2018 switch (ev.button)
1987 { 2019 {
1988 case Button2: 2020 case Button2:
… …
1995 tt_printf ("\033[5~"); 2027 tt_printf ("\033[5~");
1996 break; 2028 break;
1997 } 2029 }
1998 } 2030 }
1999 else 2031 else
2000#endif /* NO_SCROLLBAR_REPORT */ 2032#endif /* NO_SCROLLBAR_REPORT */
2001
2002 {
2003 char upordown = 0;
2004
2005 if (scrollBar.style == R_SB_NEXT)
2006 { 2033 {
2007 if (scrollbarnext_upButton (ev.y)) 2034 if (direction != NO_DIR)
2008 upordown = -1; /* up */
2009 else if (scrollbarnext_dnButton (ev.y))
2010 upordown = 1; /* down */
2011 }
2012 else if (scrollBar.style == R_SB_RXVT)
2013 {
2014 if (scrollbarrxvt_upButton (ev.y))
2015 upordown = -1; /* up */
2016 else if (scrollbarrxvt_dnButton (ev.y))
2017 upordown = 1; /* down */
2018 }
2019 if (upordown)
2020 { 2035 {
2021#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2036#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2037 if (!cont_scroll_ev.is_active ())
2022 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2038 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2023#endif 2039#endif
2024 if (scr_page (upordown < 0 ? UP : DN, 1)) 2040 if (scr_page (direction, 1))
2025 { 2041 {
2026 if (upordown < 0) 2042 if (direction == UP)
2027 scrollBar.setUp (); 2043 scrollBar.state = SB_STATE_UP;
2028 else 2044 else
2029 scrollBar.setDn (); 2045 scrollBar.state = SB_STATE_DOWN;
2030 } 2046 }
2031 } 2047 }
2032 else 2048 else
2033 switch (ev.button) 2049 switch (ev.button)
2034 { 2050 {
2035 case Button2: 2051 case Button2:
2036 switch (scrollbar_align) 2052 switch (scrollBar.align)
2037 { 2053 {
2038 case R_SB_ALIGN_TOP: 2054 case SB_ALIGN_TOP:
2039 csrO = 0; 2055 csrO = 0;
2040 break; 2056 break;
2041 case R_SB_ALIGN_CENTRE: 2057 case SB_ALIGN_CENTRE:
2042 csrO = (scrollBar.bot - scrollBar.top) / 2; 2058 csrO = (scrollBar.bot - scrollBar.top) / 2;
2043 break; 2059 break;
2044 case R_SB_ALIGN_BOTTOM: 2060 case SB_ALIGN_BOTTOM:
2045 csrO = scrollBar.bot - scrollBar.top; 2061 csrO = scrollBar.bot - scrollBar.top;
2046 break; 2062 break;
2047 } 2063 }
2048 2064
2049 if (scrollBar.style == R_SB_XTERM 2065 if (scrollBar.style == SB_STYLE_XTERM
2050 || scrollbar_above_slider (ev.y) 2066 || scrollBar.above_slider (ev.y)
2051 || scrollbar_below_slider (ev.y)) 2067 || scrollBar.below_slider (ev.y))
2052 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2068 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2053 2069
2054 scrollBar.setMotion (); 2070 scrollBar.state = SB_STATE_MOTION;
2055 break; 2071 break;
2056 2072
2057 case Button1: 2073 case Button1:
2058 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2074 if (scrollBar.align == SB_ALIGN_CENTRE)
2059 csrO = ev.y - scrollBar.top; 2075 csrO = ev.y - scrollBar.top;
2060 /* FALLTHROUGH */ 2076 /* FALLTHROUGH */
2061 2077
2062 case Button3: 2078 case Button3:
2063 if (scrollBar.style != R_SB_XTERM) 2079 if (scrollBar.style != SB_STYLE_XTERM)
2064 { 2080 {
2065 if (scrollbar_above_slider (ev.y)) 2081 if (scrollBar.above_slider (ev.y))
2066# ifdef RXVT_SCROLL_FULL 2082# ifdef RXVT_SCROLL_FULL
2067 scr_page (UP, nrow - 1); 2083 scr_page (UP, nrow - 1);
2068# else 2084# else
2069 scr_page (UP, nrow / 4); 2085 scr_page (UP, nrow / 4);
2070# endif 2086# endif
2071 else if (scrollbar_below_slider (ev.y)) 2087 else if (scrollBar.below_slider (ev.y))
2072# ifdef RXVT_SCROLL_FULL 2088# ifdef RXVT_SCROLL_FULL
2073 scr_page (DN, nrow - 1); 2089 scr_page (DN, nrow - 1);
2074# else 2090# else
2075 scr_page (DN, nrow / 4); 2091 scr_page (DN, nrow / 4);
2076# endif 2092# endif
2077 else 2093 else
2078 scrollBar.setMotion (); 2094 scrollBar.state = SB_STATE_MOTION;
2079 } 2095 }
2080 else 2096 else
2081 { 2097 {
2082 scr_page ((ev.button == Button1 ? DN : UP), 2098 scr_page ((ev.button == Button1 ? DN : UP),
2083 (nrow 2099 (nrow
2084 * scrollbar_position (ev.y) 2100 * scrollBar.position (ev.y)
2085 / scrollbar_size ())); 2101 / scrollBar.size ()));
2086 } 2102 }
2087 2103
2088 break; 2104 break;
2089 } 2105 }
2090 } 2106 }
… …
2100 2116
2101 csrO = 0; /* reset csr Offset */ 2117 csrO = 0; /* reset csr Offset */
2102 if (!bypass_keystate) 2118 if (!bypass_keystate)
2103 reportmode = !! (priv_modes & PrivMode_mouse_report); 2119 reportmode = !! (priv_modes & PrivMode_mouse_report);
2104 2120
2105 if (scrollbar_isUpDn ()) 2121 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2106 { 2122 {
2107 scrollBar.setIdle (); 2123 scrollBar.state = SB_STATE_IDLE;
2108 scrollbar_show (0); 2124 scrollBar.show (0);
2109 } 2125 }
2110 2126
2111#ifdef SELECTION_SCROLLING 2127#ifdef SELECTION_SCROLLING
2112 if (sel_scroll_ev.active)
2113 sel_scroll_ev.stop(); 2128 sel_scroll_ev.stop();
2114#endif 2129#endif
2115 2130
2116 if (ev.window == vt) 2131 if (ev.window == vt)
2117 { 2132 {
2118 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2133 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2133#ifdef MOUSE_REPORT_DOUBLECLICK 2148#ifdef MOUSE_REPORT_DOUBLECLICK
2134 /* only report the release of 'slow' single clicks */ 2149 /* only report the release of 'slow' single clicks */
2135 if (MEvent.button != AnyButton 2150 if (MEvent.button != AnyButton
2136 && (ev.button != MEvent.button 2151 && (ev.button != MEvent.button
2137 || (ev.time - MEvent.time 2152 || (ev.time - MEvent.time
2138 > MULTICLICK_TIME / 2))) 2153 > multiClickTime / 2)))
2139 { 2154 {
2140 MEvent.clicks = 0; 2155 MEvent.clicks = 0;
2141 MEvent.button = AnyButton; 2156 MEvent.button = ev.button;
2142 mouse_report (ev); 2157 mouse_report (ev);
2143 } 2158 }
2144#else /* MOUSE_REPORT_DOUBLECLICK */ 2159#else /* MOUSE_REPORT_DOUBLECLICK */
2145 MEvent.button = AnyButton; 2160 MEvent.button = ev.button;
2146 mouse_report (ev); 2161 mouse_report (ev);
2147#endif /* MOUSE_REPORT_DOUBLECLICK */ 2162#endif /* MOUSE_REPORT_DOUBLECLICK */
2148 return; 2163 return;
2149 } 2164 }
2150 2165
2151 /* 2166 /*
2152 * dumb hack to compensate for the failure of click-and-drag 2167 * dumb hack to compensate for the failure of click-and-drag
… …
2163 case Button3: 2178 case Button3:
2164 selection_make (ev.time); 2179 selection_make (ev.time);
2165 break; 2180 break;
2166 2181
2167 case Button2: 2182 case Button2:
2168 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2183 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2169 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2184 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2170 break; 2185 break;
2171 2186
2172#ifdef MOUSE_WHEEL 2187#ifdef MOUSE_WHEEL
2173 case Button4: 2188 case Button4:
2174 case Button5: 2189 case Button5:
2175 { 2190 {
2176 int i; 2191 int lines;
2177 page_dirn v; 2192 page_dirn dirn;
2178 2193
2179 v = ev.button == Button4 ? UP : DN; 2194 dirn = ev.button == Button4 ? UP : DN;
2180 2195
2181 if (ev.state & ShiftMask) 2196 if (ev.state & ShiftMask)
2182 i = 1; 2197 lines = 1;
2183 else if (option (Opt_mouseWheelScrollPage)) 2198 else if (option (Opt_mouseWheelScrollPage))
2184 i = nrow - 1; 2199 lines = nrow - 1;
2185 else 2200 else
2186 i = 5; 2201 lines = 5;
2187 2202
2188# ifdef MOUSE_SLIP_WHEELING 2203# ifdef MOUSE_SLIP_WHEELING
2189 if (ev.state & ControlMask) 2204 if (ev.state & ControlMask)
2190 { 2205 {
2191 mouse_slip_wheel_speed += v ? -1 : 1; 2206 mouse_slip_wheel_speed += dirn;
2192 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2207 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2193 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2194 2208
2195 if (slip_wheel_ev.at < NOW) 2209 if (!slip_wheel_ev.is_active ())
2196 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2210 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2197
2198 slip_wheel_ev.start ();
2199 } 2211 }
2200 else 2212 else
2213# endif
2201 { 2214 {
2202# endif
2203 scr_page (v, i); 2215 scr_page (dirn, lines);
2204 scrollbar_show (1); 2216 scrollBar.show (1);
2205# ifdef MOUSE_SLIP_WHEELING
2206 } 2217 }
2207# endif
2208 } 2218 }
2209 break; 2219 break;
2210#endif 2220#endif
2211 } 2221 }
2212 } 2222 }
2213} 2223}
2214 2224
2215/*}}} */ 2225/*}}} */
2216 2226
2217bool 2227void ecb_hot
2218rxvt_term::cmd_parse () 2228rxvt_term::cmd_parse ()
2219{ 2229{
2220 bool flag = false;
2221 wchar_t ch = NOCHAR; 2230 wchar_t ch = NOCHAR;
2222 char *seq_begin; // remember start of esc-sequence here 2231 char *seq_begin; // remember start of esc-sequence here
2223 2232
2224 for (;;) 2233 for (;;)
2225 { 2234 {
2226 if (ch == NOCHAR) 2235 if (ecb_unlikely (ch == NOCHAR))
2227 { 2236 {
2228 seq_begin = cmdbuf_ptr; 2237 seq_begin = cmdbuf_ptr;
2229 ch = next_char (); 2238 ch = next_char ();
2230 2239
2231 if (ch == NOCHAR) 2240 if (ch == NOCHAR)
2232 break; 2241 break;
2233 } 2242 }
2234 2243
2235 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2244 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2236 { 2245 {
2237 if (!seen_input) 2246 if (ecb_unlikely (!seen_input))
2238 { 2247 {
2239 seen_input = 1; 2248 seen_input = 1;
2240 // many badly-written programs (e.g. jed) contain a race condition: 2249 // many badly-written programs (e.g. jed) contain a race condition:
2241 // they first read the screensize and then install a SIGWINCH handler. 2250 // they first read the screensize and then install a SIGWINCH handler.
2242 // some window managers resize the window early, and these programs 2251 // some window managers resize the window early, and these programs
… …
2255 wchar_t *str = buf; 2264 wchar_t *str = buf;
2256 wchar_t *eol = str + min (ncol, UBUFSIZ); 2265 wchar_t *eol = str + min (ncol, UBUFSIZ);
2257 2266
2258 for (;;) 2267 for (;;)
2259 { 2268 {
2260 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2269 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2261 break; 2270 break;
2262 2271
2263 *str++ = ch; 2272 *str++ = ch;
2264 2273
2265 if (ch == C0_LF || str >= eol) 2274 if (ecb_unlikely (ch == C0_LF || str >= eol))
2266 { 2275 {
2267 if (ch == C0_LF) 2276 if (ch == C0_LF)
2268 nlines++; 2277 nlines++;
2269 2278
2270 refresh_count++; 2279 refresh_count++;
2271 2280
2272 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2281 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2273 { 2282 {
2274 refresh_count = 0; 2283 refresh_count = 0;
2275 2284
2276 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2285 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2277 { 2286 {
2278 refreshnow = true; 2287 refreshnow = true;
2279 ch = NOCHAR; 2288 ch = NOCHAR;
2280 break; 2289 break;
2281 } 2290 }
… …
2319 * What the heck we'll cheat and only refresh less than every page-full. 2328 * What the heck we'll cheat and only refresh less than every page-full.
2320 * if skipScroll is enabled. 2329 * if skipScroll is enabled.
2321 */ 2330 */
2322 if (refreshnow) 2331 if (refreshnow)
2323 { 2332 {
2324 flag = true;
2325 scr_refresh (); 2333 scr_refresh ();
2326 want_refresh = 1; 2334 want_refresh = 1;
2327 } 2335 }
2328
2329 } 2336 }
2330 else 2337 else
2331 { 2338 {
2332 try 2339 try
2333 { 2340 {
… …
2341 } 2348 }
2342 2349
2343 ch = NOCHAR; 2350 ch = NOCHAR;
2344 } 2351 }
2345 } 2352 }
2346
2347 return flag;
2348} 2353}
2349 2354
2350// read the next character 2355// read the next character
2351wchar_t 2356wchar_t ecb_hot
2352rxvt_term::next_char () NOTHROW 2357rxvt_term::next_char () noexcept
2353{ 2358{
2354 while (cmdbuf_ptr < cmdbuf_endp) 2359 while (cmdbuf_ptr < cmdbuf_endp)
2355 { 2360 {
2356 // assume 7-bit to be ascii ALWAYS 2361 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2357 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2362 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2358 return *cmdbuf_ptr++; 2363 return *cmdbuf_ptr++;
2359 2364
2360 wchar_t wc; 2365 wchar_t wc;
2361 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2366 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2362 2367
… …
2366 cmdbuf_ptr = cmdbuf_endp; 2371 cmdbuf_ptr = cmdbuf_endp;
2367 break; 2372 break;
2368 } 2373 }
2369 2374
2370 if (len == (size_t)-1) 2375 if (len == (size_t)-1)
2376 {
2377 mbstate.reset (); // reset now undefined conversion state
2378 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2379 // in which case we "erroneously" return the next byte which might be valid.
2371 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2380 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2381 }
2372 2382
2373 // assume wchar == unicode 2383 // assume wchar == unicode
2374 cmdbuf_ptr += len; 2384 cmdbuf_ptr += len;
2375 return wc & UNICODE_MASK; 2385 return wc & UNICODE_MASK;
2376 } 2386 }
2377 2387
2378 return NOCHAR; 2388 return NOCHAR;
2379} 2389}
2380 2390
2381// read the next octet 2391// read the next octet
2382uint32_t 2392uint32_t ecb_hot
2383rxvt_term::next_octet () NOTHROW 2393rxvt_term::next_octet () noexcept
2384{ 2394{
2385 return cmdbuf_ptr < cmdbuf_endp 2395 return cmdbuf_ptr < cmdbuf_endp
2386 ? (unsigned char)*cmdbuf_ptr++ 2396 ? (unsigned char)*cmdbuf_ptr++
2387 : NOCHAR; 2397 : NOCHAR;
2388} 2398}
2389 2399
2390static class out_of_input out_of_input; 2400static class out_of_input out_of_input;
2391 2401
2392/* rxvt_cmd_getc () - Return next input character */ 2402wchar_t ecb_hot
2393/* 2403rxvt_term::cmd_getc ()
2394 * Return the next input character after first passing any keyboard input
2395 * to the command.
2396 */
2397wchar_t
2398rxvt_term::cmd_getc () THROW ((class out_of_input))
2399{ 2404{
2400 wchar_t c = next_char (); 2405 wchar_t c = next_char ();
2401 2406
2402 if (c == NOCHAR) 2407 if (c == NOCHAR)
2403 throw out_of_input; 2408 throw out_of_input;
2404 2409
2405 return c; 2410 return c;
2406} 2411}
2407 2412
2408uint32_t 2413uint32_t ecb_hot
2409rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2414rxvt_term::cmd_get8 ()
2410{ 2415{
2411 uint32_t c = next_octet (); 2416 uint32_t c = next_octet ();
2412 2417
2413 if (c == NOCHAR) 2418 if (c == NOCHAR)
2414 throw out_of_input; 2419 throw out_of_input;
… …
2417} 2422}
2418 2423
2419/*{{{ print pipe */ 2424/*{{{ print pipe */
2420/*----------------------------------------------------------------------*/ 2425/*----------------------------------------------------------------------*/
2421#ifdef PRINTPIPE 2426#ifdef PRINTPIPE
2422FILE * 2427FILE * ecb_cold
2423rxvt_term::popen_printer () 2428rxvt_term::popen_printer ()
2424{ 2429{
2425 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2430 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2426 2431
2427 if (stream == NULL) 2432 if (stream == NULL)
2428 rxvt_warn ("can't open printer pipe, not printing.\n"); 2433 rxvt_warn ("can't open printer pipe, not printing.\n");
2429 2434
2430 return stream; 2435 return stream;
2431} 2436}
2432 2437
2433int 2438int ecb_cold
2434rxvt_term::pclose_printer (FILE *stream) 2439rxvt_term::pclose_printer (FILE *stream)
2435{ 2440{
2436 fflush (stream); 2441 fflush (stream);
2437 return pclose (stream); 2442 return pclose (stream);
2438} 2443}
2439 2444
2440/* 2445/*
2441 * simulate attached vt100 printer 2446 * simulate attached vt100 printer
2442 */ 2447 */
2443void 2448void ecb_cold
2444rxvt_term::process_print_pipe () 2449rxvt_term::process_print_pipe ()
2445{ 2450{
2446 int done; 2451 FILE *fd = popen_printer ();
2447 FILE *fd;
2448 2452
2449 if ((fd = popen_printer ()) == NULL) 2453 if (!fd)
2450 return; 2454 return;
2451 2455
2452 /* 2456 /*
2453 * Send all input to the printer until either ESC[4i or ESC[?4i 2457 * Send all input to the printer until either ESC[4i or ESC[?4i
2454 * is received. 2458 * is received.
2455 */ 2459 */
2456 for (done = 0; !done;) 2460 for (int done = 0; !done; )
2457 { 2461 {
2458 unsigned char buf[8]; 2462 unsigned char buf[8];
2459 unicode_t ch; 2463 unicode_t ch;
2460 unsigned int i, len; 2464 unsigned int i, len;
2461 2465
… …
2492 } 2496 }
2493 } 2497 }
2494 2498
2495 pclose_printer (fd); 2499 pclose_printer (fd);
2496} 2500}
2497#endif /* PRINTPIPE */ 2501#endif /* PRINTPIPE */
2498/*}}} */ 2502/*}}} */
2499 2503
2500/* *INDENT-OFF* */
2501enum { 2504enum {
2502 C1_40 = 0x40, 2505 C1_40 = 0x40,
2503 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2506 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2504 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2507 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2505 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2508 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2506 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2509 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2507}; 2510};
2508/* *INDENT-ON* */
2509 2511
2510/*{{{ process non-printing single characters */ 2512/*{{{ process non-printing single characters */
2511void 2513void ecb_hot
2512rxvt_term::process_nonprinting (unicode_t ch) 2514rxvt_term::process_nonprinting (unicode_t ch)
2513{ 2515{
2514 switch (ch) 2516 switch (ch)
2515 { 2517 {
2516 case C0_ESC: 2518 case C0_ESC:
… …
2546 scr_charset_choose (0); 2548 scr_charset_choose (0);
2547 break; 2549 break;
2548 2550
2549#ifdef EIGHT_BIT_CONTROLS 2551#ifdef EIGHT_BIT_CONTROLS
2550 // 8-bit controls 2552 // 8-bit controls
2551 case 0x90: /* DCS */ 2553 case 0x90: /* DCS */
2552 process_dcs_seq (); 2554 process_dcs_seq ();
2553 break; 2555 break;
2554 case 0x9b: /* CSI */ 2556 case 0x9b: /* CSI */
2555 process_csi_seq (); 2557 process_csi_seq ();
2556 break; 2558 break;
2557 case 0x9d: /* OSC */ 2559 case 0x9d: /* OSC */
2558 process_osc_seq (); 2560 process_osc_seq ();
2559 break; 2561 break;
2560#endif 2562#endif
2561 } 2563 }
2562} 2564}
2563/*}}} */ 2565/*}}} */
2564 2566
2565 2567
2566/*{{{ process VT52 escape sequences */ 2568/*{{{ process VT52 escape sequences */
2567void 2569void ecb_cold
2568rxvt_term::process_escape_vt52 (unicode_t ch) 2570rxvt_term::process_escape_vt52 (unicode_t ch)
2569{ 2571{
2570 int row, col; 2572 int row, col;
2571 2573
2572 switch (ch) 2574 switch (ch)
… …
2606 break; 2608 break;
2607 case 'Z': /* identify the terminal type */ 2609 case 'Z': /* identify the terminal type */
2608 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2610 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2609 break; 2611 break;
2610 case '<': /* turn off VT52 mode */ 2612 case '<': /* turn off VT52 mode */
2611 PrivMode (0, PrivMode_vt52); 2613 priv_modes &= ~PrivMode_vt52;
2612 break; 2614 break;
2613 case 'F': /* use special graphics character set */ 2615 case 'F': /* use special graphics character set */
2614 case 'G': /* use regular character set */ 2616 case 'G': /* use regular character set */
2615 /* unimplemented */ 2617 /* unimplemented */
2616 break; 2618 break;
… …
2622} 2624}
2623/*}}} */ 2625/*}}} */
2624 2626
2625 2627
2626/*{{{ process escape sequences */ 2628/*{{{ process escape sequences */
2627void 2629void ecb_hot
2628rxvt_term::process_escape_seq () 2630rxvt_term::process_escape_seq ()
2629{ 2631{
2630 unicode_t ch = cmd_getc (); 2632 unicode_t ch = cmd_getc ();
2631 2633
2632 if (priv_modes & PrivMode_vt52) 2634 if (priv_modes & PrivMode_vt52)
… …
2635 return; 2637 return;
2636 } 2638 }
2637 2639
2638 switch (ch) 2640 switch (ch)
2639 { 2641 {
2640 /* case 1: do_tek_mode (); break; */
2641 case '#': 2642 case '#':
2642 if (cmd_getc () == '8') 2643 if (cmd_getc () == '8')
2643 scr_E (); 2644 scr_E ();
2644 break; 2645 break;
2645 case '(': 2646 case '(':
… …
2668#if !ENABLE_MINIMAL 2669#if !ENABLE_MINIMAL
2669 case '9': 2670 case '9':
2670 scr_forwardindex (); 2671 scr_forwardindex ();
2671 break; 2672 break;
2672#endif 2673#endif
2674 // DECPAM/DECPNM
2673 case '=': 2675 case '=':
2676 priv_modes |= PrivMode_aplKP;
2677 break;
2674 case '>': 2678 case '>':
2675 PrivMode ((ch == '='), PrivMode_aplKP); 2679 priv_modes &= ~PrivMode_aplKP;
2676 break; 2680 break;
2677 2681
2678 case C1_40: 2682 case C1_40:
2679 cmd_getc (); 2683 cmd_getc ();
2680 break; 2684 break;
… …
2684 2688
2685 /* 8.3.87: NEXT LINE */ 2689 /* 8.3.87: NEXT LINE */
2686 case C1_NEL: /* ESC E */ 2690 case C1_NEL: /* ESC E */
2687 { 2691 {
2688 wchar_t nlcr[] = { C0_LF, C0_CR }; 2692 wchar_t nlcr[] = { C0_LF, C0_CR };
2689 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2693 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2690 } 2694 }
2691 break; 2695 break;
2692 2696
2697#if 0 // disabled because embedded newlines can make exploits easier
2693 /* kidnapped escape sequence: Should be 8.3.48 */ 2698 /* kidnapped escape sequence: Should be 8.3.48 */
2694 case C1_ESA: /* ESC G */ 2699 case C1_ESA: /* ESC G */
2695 process_graphics (); 2700 // used by original rxvt for rob nations own graphics mode
2701 if (cmd_getc () == 'Q' && option (Opt_insecure))
2702 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2696 break; 2703 break;
2704#endif
2697 2705
2698 /* 8.3.63: CHARACTER TABULATION SET */ 2706 /* 8.3.63: CHARACTER TABULATION SET */
2699 case C1_HTS: /* ESC H */ 2707 case C1_HTS: /* ESC H */
2700 scr_set_tab (1); 2708 scr_set_tab (1);
2701 break; 2709 break;
… …
2704 case C1_RI: /* ESC M */ 2712 case C1_RI: /* ESC M */
2705 scr_index (DN); 2713 scr_index (DN);
2706 break; 2714 break;
2707 2715
2708 /* 8.3.142: SINGLE-SHIFT TWO */ 2716 /* 8.3.142: SINGLE-SHIFT TWO */
2709 /*case C1_SS2: scr_single_shift (2); break; */ 2717 /* case C1_SS2: break; */
2710 2718
2711 /* 8.3.143: SINGLE-SHIFT THREE */ 2719 /* 8.3.143: SINGLE-SHIFT THREE */
2712 /*case C1_SS3: scr_single_shift (3); break; */ 2720 /* case C1_SS3: break; */
2713 2721
2714 /* 8.3.27: DEVICE CONTROL STRING */ 2722 /* 8.3.27: DEVICE CONTROL STRING */
2715 case C1_DCS: /* ESC P */ 2723 case C1_DCS: /* ESC P */
2716 process_dcs_seq (); 2724 process_dcs_seq ();
2717 break; 2725 break;
… …
2719 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2727 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2720 case C1_SCI: /* ESC Z */ 2728 case C1_SCI: /* ESC Z */
2721 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2729 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2722 break; /* steal obsolete ESC [ c */ 2730 break; /* steal obsolete ESC [ c */
2723 2731
2724 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2732 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2725 case C1_CSI: /* ESC [ */ 2733 case C1_CSI: /* ESC [ */
2726 process_csi_seq (); 2734 process_csi_seq ();
2727 break; 2735 break;
2728 2736
2729 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2737 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2730 case C1_OSC: /* ESC ] */ 2738 case C1_OSC: /* ESC ] */
2731 process_osc_seq (); 2739 process_osc_seq ();
2732 break; 2740 break;
2733 2741
2734 /* 8.3.106: RESET TO INITIAL STATE */ 2742 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2735 case 'c': 2743 case 'c':
2736 mbstate.reset (); 2744 mbstate.reset ();
2737 scr_poweron (); 2745 scr_poweron ();
2738 scrollbar_show (1); 2746 scrollBar.show (1);
2739 break; 2747 break;
2740 2748
2741 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2749 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2742 case 'n': 2750 case 'n':
2743 scr_charset_choose (2); 2751 scr_charset_choose (2);
… …
2750 } 2758 }
2751} 2759}
2752/*}}} */ 2760/*}}} */
2753 2761
2754/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2762/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2755/* *INDENT-OFF* */
2756enum { 2763enum {
2757 CSI_ICH = 0x40, 2764 CSI_ICH = 0x40,
2758 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2765 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2759 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2766 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2760 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2767 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2763 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2770 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2764 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2771 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2765 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2772 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2766}; 2773};
2767 2774
2768#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2775#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2769 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2776 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2770 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2777 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2771#define get_byte_array_bit(array, bit) \ 2778#define get_byte_array_bit(array, bit) \
2772 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2779 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2773 2780
2774const unsigned char csi_defaults[] = 2781static const unsigned char csi_defaults[] =
2775 { 2782 {
2776 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2783 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2777 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2784 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2778 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2785 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2779 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2786 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2780 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2787 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2781 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2788 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2782 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2789 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2783 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2790 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2784 }; 2791 };
2785/* *INDENT-ON* */
2786 2792
2787void 2793void ecb_hot
2788rxvt_term::process_csi_seq () 2794rxvt_term::process_csi_seq ()
2789{ 2795{
2790 unicode_t ch, priv, i; 2796 unicode_t ch, priv, prev_ch, i;
2791 unsigned int nargs, p; 2797 unsigned int nargs, p;
2792 int n, ndef; 2798 int n, ndef;
2793 int arg[ESC_ARGS] = { }; 2799 int arg[ESC_ARGS] = { };
2794 2800
2795 nargs = 0; 2801 nargs = 0;
2796 2802
2797 priv = 0; 2803 priv = 0;
2798 ch = cmd_getc (); 2804 ch = cmd_getc ();
2799 if (ch >= '<' && ch <= '?') 2805 if ((ch >= '<' && ch <= '?') || ch == '!')
2806 {
2800 { /* '<' '=' '>' '?' */ 2807 /* '<' '=' '>' '?' '!' */
2801 priv = ch; 2808 priv = ch;
2802 ch = cmd_getc (); 2809 ch = cmd_getc ();
2803 } 2810 }
2804 2811
2812 prev_ch = 0;
2805 /* read any numerical arguments */ 2813 /* read any numerical arguments */
2806 for (n = -1; ch < CSI_ICH; ) 2814 for (n = -1; ch < CSI_ICH; )
2807 { 2815 {
2808 if (isdigit (ch)) 2816 if (isdigit (ch))
2809 { 2817 {
… …
2819 n = -1; 2827 n = -1;
2820 } 2828 }
2821 else if (IS_CONTROL (ch)) 2829 else if (IS_CONTROL (ch))
2822 process_nonprinting (ch); 2830 process_nonprinting (ch);
2823 2831
2832 prev_ch = ch;
2824 ch = cmd_getc (); 2833 ch = cmd_getc ();
2825 } 2834 }
2826 2835
2827 if (ch > CSI_7F) 2836 if (ch > CSI_7F)
2828 return; 2837 return;
… …
2848 { 2857 {
2849 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2858 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2850 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2859 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2851 // 2860 //
2852 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2861 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2853 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2862 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2854 // that we do not support xterm mouse reporting (should be 95 when we do). 2863 // versions.
2855 // 2864 //
2856 tt_printf ("\033[>%d;94;0c", 'U'); 2865 tt_printf ("\033[>%d;95;0c", 'U');
2857 } 2866 }
2858 break; 2867 break;
2868
2859 case '?': 2869 case '?':
2860 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2870 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2861 process_terminal_mode (ch, priv, nargs, arg); 2871 process_terminal_mode (ch, priv, nargs, arg);
2872 if (prev_ch == '$' && ch == 'p')
2873 process_terminal_mode (ch, priv, nargs, arg);
2862 break; 2874 break;
2875
2876 case '!':
2877 if (ch == CSI_70)
2878 {
2879 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2880 scr_soft_reset ();
2881
2882 static const int pm_h[] = { 7, 25 };
2883 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2884
2885 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2886 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2863 } 2887 }
2888 break;
2889 }
2890
2864 return; 2891 return;
2865 } 2892 }
2866 2893
2867 switch (ch) 2894 switch (ch)
2868 { 2895 {
… …
2882 } 2909 }
2883 break; 2910 break;
2884#endif 2911#endif
2885 2912
2886 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2913 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2887 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2914 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2888 arg[0] = -arg[0]; 2915 arg[0] = -arg[0];
2889 /* FALLTHROUGH */ 2916 /* FALLTHROUGH */
2890 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2917 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2891 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2918 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2892 scr_gotorc (arg[0], 0, RELATIVE); 2919 scr_gotorc (arg[0], 0, RELATIVE);
2893 break; 2920 break;
2894 2921
2895 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2922 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2896 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2923 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2897#ifdef ISO6429 2924#ifdef ISO6429
2898 arg[0] = -arg[0]; 2925 arg[0] = -arg[0];
2899#else /* emulate common DEC VTs */ 2926#else /* emulate common DEC VTs */
2900 arg[0] = arg[0] ? -arg[0] : -1; 2927 arg[0] = arg[0] ? -arg[0] : -1;
2901#endif 2928#endif
… …
2992 case 7: /* unofficial extension */ 3019 case 7: /* unofficial extension */
2993 if (option (Opt_insecure)) 3020 if (option (Opt_insecure))
2994 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3021 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2995 break; 3022 break;
2996 case 8: /* unofficial extension */ 3023 case 8: /* unofficial extension */
2997 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3024 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, CHAR_ST); // char * cast verified
2998 break; 3025 break;
2999 } 3026 }
3000 break; 3027 break;
3001 3028
3002 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3029 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
3046 scr_insert_mode (1); 3073 scr_insert_mode (1);
3047 else if (arg[0] == 20) 3074 else if (arg[0] == 20)
3048 priv_modes |= PrivMode_LFNL; 3075 priv_modes |= PrivMode_LFNL;
3049 break; 3076 break;
3050 3077
3078 case CSI_71: // DECSCUSR: set cursor style
3079 if (prev_ch == ' ')
3080 set_cursor_style (arg[0]);
3081 break;
3082
3051 /* 3083 /*
3052 * PRIVATE USE beyond this point. All CSI_7? sequences here 3084 * PRIVATE USE beyond this point. All CSI_7? sequences here
3053 */ 3085 */
3054 case CSI_72: /* DECSTBM: set top and bottom margins */ 3086 case CSI_72: /* DECSTBM: set top and bottom margins */
3055 if (nargs == 1) 3087 if (nargs == 1)
… …
3083 } 3115 }
3084} 3116}
3085/*}}} */ 3117/*}}} */
3086 3118
3087#if !ENABLE_MINIMAL 3119#if !ENABLE_MINIMAL
3088/* ARGSUSED */
3089void 3120void
3090rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3121rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3091{ 3122{
3092 int x, y; 3123 int x, y;
3093 XWindowAttributes wattr; 3124 XWindowAttributes wattr;
… …
3102 { 3133 {
3103 /* 3134 /*
3104 * commands 3135 * commands
3105 */ 3136 */
3106 case 1: /* deiconify window */ 3137 case 1: /* deiconify window */
3107 XMapWindow (dpy, parent[0]); 3138 XMapWindow (dpy, parent);
3108 break; 3139 break;
3109 case 2: /* iconify window */ 3140 case 2: /* iconify window */
3110 XIconifyWindow (dpy, parent[0], display->screen); 3141 XIconifyWindow (dpy, parent, display->screen);
3111 break; 3142 break;
3112 case 3: /* set position (pixels) */ 3143 case 3: /* set position (pixels) */
3113 XMoveWindow (dpy, parent[0], args[1], args[2]); 3144 XMoveWindow (dpy, parent, args[1], args[2]);
3114 break; 3145 break;
3115 case 4: /* set size (pixels) */ 3146 case 4: /* set size (pixels) */
3116 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3147 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3117 break; 3148 break;
3118 case 5: /* raise window */ 3149 case 5: /* raise window */
3119 XRaiseWindow (dpy, parent[0]); 3150 XRaiseWindow (dpy, parent);
3120 break; 3151 break;
3121 case 6: /* lower window */ 3152 case 6: /* lower window */
3122 XLowerWindow (dpy, parent[0]); 3153 XLowerWindow (dpy, parent);
3123 break; 3154 break;
3124 case 7: /* refresh window */ 3155 case 7: /* refresh window */
3125 scr_touch (true); 3156 scr_touch (true);
3126 break; 3157 break;
3127 case 8: /* set size (chars) */ 3158 case 8: /* set size (chars) */
… …
3130 break; 3161 break;
3131 3162
3132 //case 9: NYI, TODO, restore maximized window or maximize window 3163 //case 9: NYI, TODO, restore maximized window or maximize window
3133 default: 3164 default:
3134 if (args[0] >= 24) /* set height (chars) */ 3165 if (args[0] >= 24) /* set height (chars) */
3135 set_widthheight ((unsigned int)width, 3166 set_widthheight ((unsigned int)vt_width,
3136 (unsigned int) (args[1] * fheight)); 3167 (unsigned int) (args[1] * fheight));
3137 break; 3168 break;
3138 3169
3139 /* 3170 /*
3140 * reports - some output format copied from XTerm 3171 * reports - some output format copied from XTerm
3141 */ 3172 */
3142 case 11: /* report window state */ 3173 case 11: /* report window state */
3143 XGetWindowAttributes (dpy, parent[0], &wattr); 3174 XGetWindowAttributes (dpy, parent, &wattr);
3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3175 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3145 break; 3176 break;
3146 case 13: /* report window position */ 3177 case 13: /* report window position */
3147 XGetWindowAttributes (dpy, parent[0], &wattr); 3178 XGetWindowAttributes (dpy, parent, &wattr);
3148 XTranslateCoordinates (dpy, parent[0], wattr.root, 3179 XTranslateCoordinates (dpy, parent, wattr.root,
3149 -wattr.border_width, -wattr.border_width, 3180 -wattr.border_width, -wattr.border_width,
3150 &x, &y, &wdummy); 3181 &x, &y, &wdummy);
3151 tt_printf ("\033[3;%d;%dt", x, y); 3182 tt_printf ("\033[3;%d;%dt", x, y);
3152 break; 3183 break;
3153 case 14: /* report window size (pixels) */ 3184 case 14: /* report window size (pixels) */
3154 XGetWindowAttributes (dpy, parent[0], &wattr); 3185 XGetWindowAttributes (dpy, parent, &wattr);
3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3186 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3156 break; 3187 break;
3157 case 18: /* report text area size (chars) */ 3188 case 18: /* report text area size (chars) */
3158 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3189 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3159 break; 3190 break;
… …
3161 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3192 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3162 break; 3193 break;
3163 case 20: /* report icon label */ 3194 case 20: /* report icon label */
3164 { 3195 {
3165 char *s; 3196 char *s;
3166 XGetIconName (dpy, parent[0], &s); 3197 XGetIconName (dpy, parent, &s);
3167 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3198 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3168 XFree (s); 3199 XFree (s);
3169 } 3200 }
3170 break; 3201 break;
3171 case 21: /* report window title */ 3202 case 21: /* report window title */
3172 { 3203 {
3173 char *s; 3204 char *s;
3174 XFetchName (dpy, parent[0], &s); 3205 XFetchName (dpy, parent, &s);
3175 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3206 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3176 XFree (s); 3207 XFree (s);
3177 } 3208 }
3178 break; 3209 break;
3179 } 3210 }
… …
3189rxvt_term::get_to_st (unicode_t &ends_how) 3220rxvt_term::get_to_st (unicode_t &ends_how)
3190{ 3221{
3191 unicode_t ch; 3222 unicode_t ch;
3192 bool seen_esc = false; 3223 bool seen_esc = false;
3193 unsigned int n = 0; 3224 unsigned int n = 0;
3194 wchar_t string[STRING_MAX]; 3225 wchar_t string[CBUFSIZ];
3195 3226
3196 while ((ch = cmd_getc ()) != NOCHAR) 3227 while ((ch = cmd_getc ()) != NOCHAR)
3197 { 3228 {
3198 if (seen_esc) 3229 if (seen_esc)
3199 { 3230 {
… …
3214 else if (ch < 0x20) 3245 else if (ch < 0x20)
3215 return NULL; /* other control character - exit */ 3246 return NULL; /* other control character - exit */
3216 3247
3217 seen_esc = false; 3248 seen_esc = false;
3218 3249
3219 if (n >= STRING_MAX - 1) 3250 if (n >= sizeof (string) - 1)
3220 // stop at some sane length 3251 // stop at some sane length
3221 return NULL; 3252 return NULL;
3222 3253
3223 string[n++] = ch; 3254 string[n++] = ch;
3224 } 3255 }
… …
3235 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3266 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3236 */ 3267 */
3237void 3268void
3238rxvt_term::process_dcs_seq () 3269rxvt_term::process_dcs_seq ()
3239{ 3270{
3240 char *s;
3241 unicode_t eh;
3242
3243 /* 3271 /*
3244 * Not handled yet 3272 * Not handled yet
3245 */ 3273 */
3274
3275 unicode_t eh;
3246 s = get_to_st (eh); 3276 char *s = get_to_st (eh);
3247 if (s) 3277 if (s)
3248 free (s); 3278 free (s);
3249 3279
3250 return; 3280 return;
3251} 3281}
… …
3255 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3285 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3256 */ 3286 */
3257void 3287void
3258rxvt_term::process_osc_seq () 3288rxvt_term::process_osc_seq ()
3259{ 3289{
3260 unicode_t ch, eh;
3261 int arg; 3290 int arg;
3262 3291
3263 ch = cmd_getc (); 3292 unicode_t ch = cmd_getc ();
3264 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3293 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3265 arg = arg * 10 + (ch - '0'); 3294 arg = arg * 10 + (ch - '0');
3266 3295
3267 if (ch == ';') 3296 if (ch == ';')
3268 { 3297 {
3298 unicode_t eh;
3269 char *s = get_to_st (eh); 3299 char *s = get_to_st (eh);
3270 3300
3271 if (s) 3301 if (s)
3272 { 3302 {
3273 process_xterm_seq (arg, s, eh); 3303 process_xterm_seq (arg, s, eh);
3274 free (s); 3304 free (s);
3275 } 3305 }
3276 } 3306 }
3277} 3307}
3278 3308
3309static unsigned int
3310colorcube_index (unsigned int idx_r,
3311 unsigned int idx_g,
3312 unsigned int idx_b)
3313{
3314 assert (idx_r < Red_levels);
3315 assert (idx_g < Green_levels);
3316 assert (idx_b < Blue_levels);
3317
3318 return idx_r * Blue_levels * Green_levels +
3319 idx_g * Blue_levels +
3320 idx_b;
3321}
3322
3323/*
3324 * Find the nearest color slot in the hidden color cube,
3325 * adapt its value to the 32bit RGBA color.
3326 */
3327unsigned int
3328rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3329{
3330 r &= 0xff;
3331 g &= 0xff;
3332 b &= 0xff;
3333 a &= 0xff;
3334
3335 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3336
3337 /* we allow one of the 6 closest neighbouring colours */
3338 /* to replace the current color, if they not used recently */
3339 #if 0
3340 static const unsigned char dxyz[][3] = {
3341 0, 0, 0,
3342 0, 0, 4,
3343 0, 4, 4,
3344 4, 4, 0,
3345 4, 0, 4,
3346 0, 4, 0,
3347 4, 0, 0,
3348 };
3349 #else
3350 // silly compressed verlapping triplets version of above
3351 static const unsigned char dxyz[] = {
3352 0, 0, 0, 4, 4, 0, 4, 0, 0,
3353 };
3354 #endif
3355
3356 static const unsigned char color_level[8][32] = {
3357 // neighbour index
3358 {0, 0, 1, 0, 0, 1, 1, 2, 2, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3359 {0, 1, 0, 1, 1, 2, 1, 1, 2, 2, 3, 3, 2, 2, 2, 3, 3, 3, 4, 4, 4, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4},
3360 {0, 0, 1, 2, 1, 1, 2, 3, 3, 2, 2, 3, 3, 4, 4, 3, 3, 3, 4, 4, 5, 5, 5, 4, 4, 4, 5, 5, 5, 5, 5, 5},
3361 {0, 0, 2, 1, 2, 3, 2, 2, 3, 4, 4, 3, 3, 4, 4, 5, 5, 4, 4, 5, 5, 5, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6},
3362 // Red_levels/Green_levels/Blue_levels index
3363 {0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3364 {0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4},
3365 {0, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5},
3366 {0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6},
3367 };
3368
3369 unsigned int idx;
3370
3371 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3372 {
3373 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3374 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3375 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3376 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3377
3378 if (n == 0)
3379 idx = index;
3380
3381 if (rgb24_color[index] == color)
3382 {
3383 rgb24_seqno[index] = ++rgb24_sequence;
3384 return index + minTermCOLOR24;
3385 }
3386
3387 // minor issue: could update index 0 few more times
3388 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3389 {
3390 idx = index;
3391 goto update;
3392 }
3393
3394 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3395 // but also handles wrap around values well enough
3396 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3397 idx = index;
3398 }
3399
3400update:
3401 rgb24_color[idx] = color;
3402 rgb24_seqno[idx] = ++rgb24_sequence;
3403
3404 idx += minTermCOLOR24;
3405 pix_colors_focused [idx].free (this);
3406 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3407 update_fade_color (idx, false);
3408
3409 return idx;
3410}
3411
3279void 3412void
3280rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3413rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3281{ 3414{
3282 if (str[0] == '?' && !str[1]) 3415 if (str[0] == '?' && !str[1])
3283 { 3416 {
3417 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3418 return;
3419
3284 rgba c; 3420 rgba c;
3285 pix_colors_focused[color].get (c); 3421 pix_colors_focused[color].get (c);
3422 color -= minCOLOR;
3286 3423
3287#if XFT 3424#if XFT
3288 if (c.a != rgba::MAX_CC) 3425 if (c.a != rgba::MAX_CC)
3289 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3426 tt_printf ("\033]%d;%d;rgba:%04x/%04x/%04x/%04x%c", report, color, c.r, c.g, c.b, c.a, resp);
3290 else 3427 else
3291#endif 3428#endif
3292 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3429 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", report, color, c.r, c.g, c.b, resp);
3293 } 3430 }
3294 else 3431 else
3295 set_window_color (color, str); 3432 set_window_color (color, str);
3296} 3433}
3297 3434
3298/* 3435/*
3299 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3436 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3300 */ 3437 */
3301void 3438void
3302rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3439rxvt_term::process_xterm_seq (int op, char *str, char resp)
3303{ 3440{
3304 int color; 3441 int color;
3305 char *buf, *name; 3442 char *buf, *name;
3306 bool query = str[0] == '?' && !str[1]; 3443 bool query = str[0] == '?' && !str[1];
3307 int saveop = op; 3444 int saveop = op;
… …
3334 unsigned long bytes_after; 3471 unsigned long bytes_after;
3335 unsigned char *value = 0; 3472 unsigned char *value = 0;
3336 const char *str = ""; 3473 const char *str = "";
3337 3474
3338 if (prop 3475 if (prop
3339 && XGetWindowProperty (dpy, parent[0], 3476 && XGetWindowProperty (dpy, parent,
3340 prop, 0, 1<<16, 0, AnyPropertyType, 3477 prop, 0, 1<<16, 0, AnyPropertyType,
3341 &actual_type, &actual_format, 3478 &actual_type, &actual_format,
3342 &nitems, &bytes_after, &value) == Success 3479 &nitems, &bytes_after, &value) == Success
3343 && actual_type != None 3480 && actual_type != None
3344 && actual_format == 8) 3481 && actual_format == 8)
3345 str = (const char *)(value); 3482 str = (const char *)(value);
3346 3483
3347 tt_printf ("\033]%d;%s%c", op, str, resp); 3484 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3348 3485
3349 XFree (value); 3486 XFree (value);
3350 } 3487 }
3351 else 3488 else
3352 { 3489 {
3353 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3490 char *eq = strchr (str, '=');
3354 3491
3355 if (eq) 3492 if (eq)
3356 { 3493 {
3357 *eq = 0; 3494 *eq = 0;
3358 set_utf8_property (display->atom (str), eq + 1); 3495 set_utf8_property (display->atom (str), eq + 1);
3359 } 3496 }
3360 else 3497 else
3361 XDeleteProperty (dpy, parent[0], 3498 XDeleteProperty (dpy, parent,
3362 display->atom (str)); 3499 display->atom (str));
3363 } 3500 }
3364 break; 3501 break;
3365 3502
3366 case XTerm_Color: 3503 case XTerm_Color:
… …
3379 *buf++ = '\0'; 3516 *buf++ = '\0';
3380 3517
3381 process_color_seq (op, color, name, resp); 3518 process_color_seq (op, color, name, resp);
3382 } 3519 }
3383 break; 3520 break;
3521 case Rxvt_restoreFG:
3384 case XTerm_Color00: 3522 case XTerm_Color00:
3385 process_color_seq (op, Color_fg, str, resp); 3523 process_color_seq (op, Color_fg, str, resp);
3386 break; 3524 break;
3525 case Rxvt_restoreBG:
3387 case XTerm_Color01: 3526 case XTerm_Color01:
3388 process_color_seq (op, Color_bg, str, resp); 3527 process_color_seq (op, Color_bg, str, resp);
3389 break; 3528 break;
3390#ifndef NO_CURSORCOLOR 3529#ifndef NO_CURSORCOLOR
3391 case XTerm_Color_cursor: 3530 case XTerm_Color_cursor:
… …
3396 process_color_seq (op, Color_pointer_fg, str, resp); 3535 process_color_seq (op, Color_pointer_fg, str, resp);
3397 break; 3536 break;
3398 case XTerm_Color_pointer_bg: 3537 case XTerm_Color_pointer_bg:
3399 process_color_seq (op, Color_pointer_bg, str, resp); 3538 process_color_seq (op, Color_pointer_bg, str, resp);
3400 break; 3539 break;
3540#ifdef OPTION_HC
3541 case XTerm_Color_HC:
3542 process_color_seq (op, Color_HC, str, resp);
3543 break;
3544 case XTerm_Color_HTC:
3545 process_color_seq (op, Color_HTC, str, resp);
3546 break;
3547#endif
3401#ifndef NO_BOLD_UNDERLINE_REVERSE 3548#ifndef NO_BOLD_UNDERLINE_REVERSE
3402 case XTerm_Color_RV:
3403 process_color_seq (op, Color_RV, str, resp);
3404 break;
3405 case Rxvt_Color_BD:
3406 case URxvt_Color_BD: 3549 case URxvt_Color_BD:
3407 process_color_seq (op, Color_BD, str, resp); 3550 process_color_seq (op, Color_BD, str, resp);
3408 break; 3551 break;
3409 case Rxvt_Color_UL:
3410 case URxvt_Color_UL: 3552 case URxvt_Color_UL:
3411 process_color_seq (op, Color_UL, str, resp); 3553 process_color_seq (op, Color_UL, str, resp);
3412 break; 3554 break;
3413 case URxvt_Color_IT: 3555 case URxvt_Color_IT:
3414 process_color_seq (op, Color_IT, str, resp); 3556 process_color_seq (op, Color_IT, str, resp);
3415 break; 3557 break;
3416#endif 3558#endif
3417#if ENABLE_TRANSPARENCY
3418 case URxvt_Color_tint: 3559 case URxvt_Color_border:
3419 process_color_seq (op, Color_tint, str, resp); 3560 process_color_seq (op, Color_border, str, resp);
3420 {
3421 bool changed = false;
3422 if (ISSET_PIXCOLOR (Color_tint))
3423 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3424 else
3425 changed = bgPixmap.unset_tint ();
3426 if (changed)
3427 update_background ();
3428 }
3429
3430 break;
3431#endif
3432
3433#if BG_IMAGE_FROM_FILE
3434 case Rxvt_Pixmap:
3435 if (!strcmp (str, "?"))
3436 {
3437 char str[256];
3438
3439 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3440 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3441 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3442 process_xterm_seq (XTerm_title, str, CHAR_ST);
3443 }
3444 else
3445 {
3446 int changed = 0;
3447
3448 if (*str != ';')
3449 {
3450 /* reset to default scaling :*/
3451 bgPixmap.unset_geometry ();
3452 if (bgPixmap.set_file (str)) /* change pixmap */
3453 changed++;
3454 str = strchr (str, ';');
3455 if (str == NULL)
3456 bgPixmap.set_defaultGeometry ();
3457 }
3458 while (str)
3459 {
3460 str++;
3461 if (bgPixmap.set_geometry (str))
3462 changed++;
3463 str = strchr (str, ';');
3464 }
3465 if (changed)
3466 update_background ();
3467 }
3468 break;
3469#endif
3470
3471 case Rxvt_restoreFG:
3472 set_window_color (Color_fg, str);
3473 break;
3474 case Rxvt_restoreBG:
3475 set_window_color (Color_bg, str);
3476 break; 3561 break;
3477 3562
3478 case XTerm_logfile: 3563 case XTerm_logfile:
3479 // TODO, when secure mode? 3564 // TODO, when secure mode?
3480 break; 3565 break;
… …
3521 rs[Rs_name], VERSION[0], VERSION[2], 3606 rs[Rs_name], VERSION[0], VERSION[2],
3522 resp); 3607 resp);
3523 break; 3608 break;
3524 3609
3525#if !ENABLE_MINIMAL 3610#if !ENABLE_MINIMAL
3611 case URxvt_cellinfo:
3612 if (query)
3613 tt_printf ("\33]%d;%d;%d;%d%c", saveop,
3614 fwidth, fheight, fbase,
3615 resp);
3616 break;
3617
3526 case URxvt_locale: 3618 case URxvt_locale:
3527 if (query) 3619 if (query)
3528 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); 3620 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3529 else 3621 else
3530 { 3622 {
… …
3548 break; 3640 break;
3549#endif 3641#endif
3550 3642
3551#if ENABLE_PERL 3643#if ENABLE_PERL
3552 case URxvt_perl: 3644 case URxvt_perl:
3553 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3645 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3554 ; // no responses yet
3555 break; 3646 break;
3556#endif 3647#endif
3557 } 3648 }
3558} 3649}
3559/*----------------------------------------------------------------------*/ 3650/*----------------------------------------------------------------------*/
… …
3566 * 's' = save 3657 * 's' = save
3567 * 'r' = restore 3658 * 'r' = restore
3568 * 't' = toggle 3659 * 't' = toggle
3569 * so no need for fancy checking 3660 * so no need for fancy checking
3570 */ 3661 */
3571int 3662int ecb_cold
3572rxvt_term::privcases (int mode, unsigned long bit) 3663rxvt_term::privcases (int mode, unsigned long bit)
3573{ 3664{
3574 int state; 3665 int state;
3575 3666
3576 if (mode == 's') 3667 if (mode == 's')
3577 { 3668 {
3578 SavedModes |= (priv_modes & bit); 3669 if (priv_modes & bit)
3670 SavedModes |= bit;
3671 else
3672 SavedModes &= ~bit;
3579 return -1; 3673 return -1;
3580 } 3674 }
3581 else 3675 else
3582 { 3676 {
3583 if (mode == 'r') 3677 if (mode == 'r')
3584 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3678 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3585 else 3679 else
3586 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3680 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3587 PrivMode (state, bit); 3681
3682 if (state)
3683 priv_modes |= bit;
3684 else
3685 priv_modes &= ~bit;
3588 } 3686 }
3589 3687
3590 return state; 3688 return state;
3591} 3689}
3592 3690
3593/* we're not using priv _yet_ */ 3691/* we're not using priv _yet_ */
3594void 3692void
3595rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3693rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3596{ 3694{
3597 unsigned int i, j; 3695 unsigned int i, j;
3598 int state; 3696 int state;
3599 3697
3600 static const struct 3698 static const struct
3601 { 3699 {
3602 const int argval; 3700 const int argval;
3603 const unsigned long bit; 3701 const unsigned long bit;
3604 } argtopriv[] = { 3702 } argtopriv[] = {
3605 { 1, PrivMode_aplCUR }, 3703 { 1, PrivMode_aplCUR }, // DECCKM
3606 { 2, PrivMode_vt52 }, 3704 { 2, PrivMode_vt52 }, // DECANM
3607 { 3, PrivMode_132 }, 3705 { 3, PrivMode_132 }, // DECCOLM
3608 { 4, PrivMode_smoothScroll }, 3706 { 4, PrivMode_smoothScroll }, // DECSCLM
3609 { 5, PrivMode_rVideo }, 3707 { 5, PrivMode_rVideo }, // DECSCNM
3610 { 6, PrivMode_relOrigin }, 3708 { 6, PrivMode_relOrigin }, // DECOM
3611 { 7, PrivMode_Autowrap }, 3709 { 7, PrivMode_Autowrap }, // DECAWM
3612 // 8, bi-directional support mode 3710 // 8, auto-repeat keys // DECARM
3613 { 9, PrivMode_MouseX10 }, 3711 { 9, PrivMode_MouseX10 },
3614 // 18, 19 printing-related
3615 { 25, PrivMode_VisibleCursor }, 3712 { 12, PrivMode_BlinkingCursor },
3713 // 18 end FF to printer after print screen
3714 // 19 Print screen prints full screen/scroll region
3715 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3616#ifdef scrollBar_esc 3716#ifdef scrollBar_esc
3617 { scrollBar_esc, PrivMode_scrollBar }, 3717 { scrollBar_esc, PrivMode_scrollBar },
3618#endif 3718#endif
3619 { 35, PrivMode_ShiftKeys }, // rxvt extension 3719 { 35, PrivMode_ShiftKeys }, // rxvt extension
3720 // 38, tektronix mode // DECTEK
3620 { 40, PrivMode_132OK }, 3721 { 40, PrivMode_132OK },
3621 // 41 xterm more fixes NYI 3722 // 41 xterm more fixes NYI
3622 // 45 margin bell NYI 3723 // 45 margin bell NYI
3623 // 46 start logging 3724 // 46 start logging
3624 { 47, PrivMode_Screen }, 3725 { 47, PrivMode_Screen },
3625 { 66, PrivMode_aplKP }, 3726 { 66, PrivMode_aplKP }, // DECNKM
3626#ifndef NO_BACKSPACE_KEY 3727#ifndef NO_BACKSPACE_KEY
3627 { 67, PrivMode_BackSpace }, 3728 { 67, PrivMode_BackSpace }, // DECBKM
3628#endif 3729#endif
3629 { 1000, PrivMode_MouseX11 }, 3730 { 1000, PrivMode_MouseX11 },
3630 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3731 { 1002, PrivMode_MouseBtnEvent },
3631 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3732 { 1003, PrivMode_MouseAnyEvent },
3632 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3733#if ENABLE_FRILLS
3734 { 1004, PrivMode_FocusEvent },
3735 { 1005, PrivMode_ExtMouseUTF8 },
3736 { 1006, PrivMode_ExtMouseSGR },
3737#endif
3633 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3738 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3634 { 1011, PrivMode_Keypress }, // rxvt extension 3739 { 1011, PrivMode_Keypress }, // rxvt extension
3740#if ENABLE_FRILLS
3741 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3742#endif
3635 // 1035 enable modifiers for alt, numlock NYI 3743 // 1035 enable modifiers for alt, numlock NYI
3636 // 1036 send ESC for meta keys NYI 3744 // 1036 send ESC for meta keys NYI
3637 // 1037 send DEL for keypad delete NYI 3745 // 1037 send DEL for keypad delete NYI
3638 { 1047, PrivMode_Screen }, 3746 { 1047, PrivMode_Screen },
3639 // 1048 save and restore cursor 3747 // 1048 save and restore cursor, implemented in code
3640 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3748 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3641 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3749 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3750#if ENABLE_FRILLS
3751 { 2004, PrivMode_BracketPaste },
3752#endif
3642 }; 3753 };
3643 3754
3644 if (nargs == 0) 3755 if (nargs == 0)
3645 return; 3756 return;
3757
3758 // DECRQM
3759 if (mode == 'p')
3760 {
3761 int status = 0;
3762 if (nargs != 1)
3763 return;
3764
3765 for (j = 0; j < ecb_array_length (argtopriv); j++)
3766 if (argtopriv[j].argval == arg[0])
3767 {
3768 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3769 break;
3770 }
3771
3772 tt_printf ("\33[?%d;%d$y", arg[0], status);
3773 return;
3774 }
3646 3775
3647 /* make lo/hi boolean */ 3776 /* make lo/hi boolean */
3648 if (mode == 'l') 3777 if (mode == 'l')
3649 mode = 0; /* reset */ 3778 mode = 0; /* reset */
3650 else if (mode == 'h') 3779 else if (mode == 'h')
… …
3653 for (i = 0; i < nargs; i++) 3782 for (i = 0; i < nargs; i++)
3654 { 3783 {
3655 state = -1; 3784 state = -1;
3656 3785
3657 /* basic handling */ 3786 /* basic handling */
3658 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3787 for (j = 0; j < ecb_array_length (argtopriv); j++)
3659 if (argtopriv[j].argval == arg[i]) 3788 if (argtopriv[j].argval == arg[i])
3660 { 3789 {
3661 state = privcases (mode, argtopriv[j].bit); 3790 state = privcases (mode, argtopriv[j].bit);
3662 break; 3791 break;
3663 } 3792 }
… …
3671 3800
3672 scr_touch (true); 3801 scr_touch (true);
3673 break; 3802 break;
3674#endif 3803#endif
3675 case 1048: /* alternative cursor save */ 3804 case 1048: /* alternative cursor save */
3676 case 1049:
3677 if (option (Opt_secondaryScreen)) 3805 if (option (Opt_secondaryScreen))
3678 if (mode == 0) 3806 if (mode == 0)
3679 scr_cursor (RESTORE); 3807 scr_cursor (RESTORE);
3680 else if (mode == 1) 3808 else if (mode == 1)
3681 scr_cursor (SAVE); 3809 scr_cursor (SAVE);
… …
3690 case 2: /* VT52 mode */ 3818 case 2: /* VT52 mode */
3691 /* oddball mode. should be set regardless of set/reset 3819 /* oddball mode. should be set regardless of set/reset
3692 * parameter. Return from VT52 mode with an ESC < from 3820 * parameter. Return from VT52 mode with an ESC < from
3693 * within VT52 mode 3821 * within VT52 mode
3694 */ 3822 */
3695 PrivMode (1, PrivMode_vt52); 3823 priv_modes |= PrivMode_vt52;
3696 break; 3824 break;
3697 case 3: /* 80/132 */ 3825 case 3: /* 80/132 */
3698 if (priv_modes & PrivMode_132OK) 3826 if (priv_modes & PrivMode_132OK)
3699 set_widthheight (((state ? 132 : 80) * fwidth), height); 3827 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3700 break; 3828 break;
3701 case 4: /* smooth scrolling */ 3829 case 4: /* smooth scrolling */
3702 set_option (Opt_jumpScroll, !state); 3830 set_option (Opt_jumpScroll, !state);
3703 break; 3831 break;
3704 case 5: /* reverse video */ 3832 case 5: /* reverse video */
… …
3711 scr_autowrap (state); 3839 scr_autowrap (state);
3712 break; 3840 break;
3713 /* case 8: - auto repeat, can't do on a per window basis */ 3841 /* case 8: - auto repeat, can't do on a per window basis */
3714 case 9: /* X10 mouse reporting */ 3842 case 9: /* X10 mouse reporting */
3715 if (state) /* orthogonal */ 3843 if (state) /* orthogonal */
3716 priv_modes &= ~PrivMode_MouseX11; 3844 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3717 break; 3845 break;
3718#ifdef scrollBar_esc 3846#ifdef scrollBar_esc
3719 case scrollBar_esc: 3847 case scrollBar_esc:
3720 if (scrollbar_mapping (state)) 3848 scrollBar.map (state);
3721 {
3722 resize_all_windows (0, 0, 0); 3849 resize_all_windows (0, 0, 0);
3723 scr_touch (true); 3850 scr_touch (true);
3724 } 3851 break;
3852#endif
3853#ifdef CURSOR_BLINK
3854 case 12:
3855 cursor_blink_reset ();
3725 break; 3856 break;
3726#endif 3857#endif
3727 case 25: /* visible/invisible cursor */ 3858 case 25: /* visible/invisible cursor */
3728 scr_cursor_visible (state); 3859 scr_cursor_visible (state);
3729 break; 3860 break;
… …
3734 break; 3865 break;
3735 /* case 66: - application key pad */ 3866 /* case 66: - application key pad */
3736 /* case 67: - backspace key */ 3867 /* case 67: - backspace key */
3737 case 1000: /* X11 mouse reporting */ 3868 case 1000: /* X11 mouse reporting */
3738 if (state) /* orthogonal */ 3869 if (state) /* orthogonal */
3739 priv_modes &= ~PrivMode_MouseX10; 3870 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3740 break; 3871 break;
3741#if 0
3742 case 1001: 3872 case 1002:
3743 break; /* X11 mouse highlighting */ 3873 case 1003:
3744#endif 3874 if (state)
3875 {
3876 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3877 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3878 mouse_row = mouse_col = 0;
3879 vt_emask_mouse = PointerMotionMask;
3880 }
3881 else
3882 vt_emask_mouse = NoEventMask;
3883
3884 vt_select_input ();
3885 break;
3745 case 1010: /* scroll to bottom on TTY output inhibit */ 3886 case 1010: /* scroll to bottom on TTY output inhibit */
3746 set_option (Opt_scrollTtyOutput, !state); 3887 set_option (Opt_scrollTtyOutput, !state);
3747 break; 3888 break;
3748 case 1011: /* scroll to bottom on key press */ 3889 case 1011: /* scroll to bottom on key press */
3749 set_option (Opt_scrollTtyKeypress, state); 3890 set_option (Opt_scrollTtyKeypress, state);
3750 break; 3891 break;
3751 case 1047: /* secondary screen w/ clearing last */ 3892 case 1047: /* secondary screen w/ clearing last */
3752 if (option (Opt_secondaryScreen)) 3893 if (option (Opt_secondaryScreen))
3753 if (current_screen != PRIMARY) 3894 if (!state)
3754 scr_erase_screen (2); 3895 scr_erase_screen (2);
3896
3755 scr_change_screen (state); 3897 scr_change_screen (state);
3756 break; 3898 break;
3757 case 1049: /* secondary screen w/ clearing first */ 3899 case 1049: /* secondary screen w/ clearing first */
3900 if (option (Opt_secondaryScreen))
3901 if (state)
3902 scr_cursor (SAVE);
3903
3758 scr_change_screen (state); 3904 scr_change_screen (state);
3905
3759 if (option (Opt_secondaryScreen)) 3906 if (option (Opt_secondaryScreen))
3760 if (current_screen != PRIMARY) 3907 if (state)
3761 scr_erase_screen (2); 3908 scr_erase_screen (2);
3909 else
3910 scr_cursor (RESTORE);
3762 break; 3911 break;
3763 default: 3912 default:
3764 break; 3913 break;
3765 } 3914 }
3766 } 3915 }
3767} 3916}
3768/*}}} */ 3917/*}}} */
3769 3918
3770/*{{{ process sgr sequences */ 3919/*{{{ process sgr sequences */
3771void 3920void ecb_hot
3772rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3921rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3773{ 3922{
3774 unsigned int i; 3923 unsigned int i;
3775 short rendset; 3924 short rendset;
3776 int rendstyle; 3925 int rendstyle;
… …
3818 //case 19: // ninth alt font 3967 //case 19: // ninth alt font
3819 //case 20: // gothic 3968 //case 20: // gothic
3820 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3969 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3821 rendset = 0, rendstyle = RS_Bold; 3970 rendset = 0, rendstyle = RS_Bold;
3822 break; 3971 break;
3823 case 22: // normal intensity 3972 case 22: // bold off (vt220)
3824 rendset = 0, rendstyle = RS_Bold; 3973 rendset = 0, rendstyle = RS_Bold;
3825 break; 3974 break;
3826 case 23: // disable italic 3975 case 23: // disable italic
3827 rendset = 0, rendstyle = RS_Italic; 3976 rendset = 0, rendstyle = RS_Italic;
3828 break; 3977 break;
3829 case 24: 3978 case 24: // underline off (vt220)
3830 rendset = 0, rendstyle = RS_Uline; 3979 rendset = 0, rendstyle = RS_Uline;
3831 break; 3980 break;
3832 case 25: 3981 case 25: // blink off (vt220)
3833 rendset = 0, rendstyle = RS_Blink; 3982 rendset = 0, rendstyle = RS_Blink;
3834 break; 3983 break;
3835 case 26: // variable spacing (iso 8613) 3984 case 26: // variable spacing (iso 8613)
3836 rendset = 0, rendstyle = RS_Blink; 3985 rendset = 0, rendstyle = RS_Blink;
3837 break; 3986 break;
3838 case 27: 3987 case 27: // reverse off (vt220)
3839 rendset = 0, rendstyle = RS_RVid; 3988 rendset = 0, rendstyle = RS_RVid;
3840 break; 3989 break;
3841 //case 28: // visible. NYI 3990 //case 28: // visible. NYI
3842 //case 29: // not crossed-out 3991 //case 29: // not crossed-out
3843 } 3992 }
… …
3858 case 35: 4007 case 35:
3859 case 36: 4008 case 36:
3860 case 37: 4009 case 37:
3861 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4010 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3862 break; 4011 break;
3863 case 38: // set fg color, ISO 8613-6
3864 if (nargs > i + 2 && arg[i + 1] == 5)
3865 {
3866 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3867 i += 2;
3868 }
3869 break;
3870 case 39: /* default fg */ 4012 case 39: /* default fg */
3871 scr_color (Color_fg, Color_fg); 4013 scr_color (Color_fg, Color_fg);
3872 break; 4014 break;
3873 4015
3874 case 40: 4016 case 40:
… …
3879 case 45: 4021 case 45:
3880 case 46: 4022 case 46:
3881 case 47: 4023 case 47:
3882 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4024 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3883 break; 4025 break;
3884 case 48: // set bg color, ISO 8613-6
3885 if (nargs > i + 2 && arg[i + 1] == 5)
3886 {
3887 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3888 i += 2;
3889 }
3890 break;
3891 case 49: /* default bg */ 4026 case 49: /* default bg */
3892 scr_color (Color_bg, Color_bg); 4027 scr_color (Color_bg, Color_bg);
4028 break;
4029
4030 case 38: // set fg color, ISO 8613-6
4031 case 48: // set bg color, ISO 8613-6
4032 {
4033 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4034 unsigned int idx;
4035
4036 if (nargs > i + 2 && arg[i + 1] == 5)
4037 {
4038 idx = minCOLOR + arg[i + 2];
4039 i += 2;
4040
4041 scr_color (idx, fgbg);
4042 }
4043 else if (nargs > i + 4 && arg[i + 1] == 2)
4044 {
4045 unsigned int r = arg[i + 2];
4046 unsigned int g = arg[i + 3];
4047 unsigned int b = arg[i + 4];
4048 unsigned int a = 0xff;
4049
4050 idx = map_rgb24_color (r, g, b, a);
4051
4052 i += 4;
4053
4054 scr_color (idx, fgbg);
4055 }
4056 }
3893 break; 4057 break;
3894 4058
3895 //case 50: // not variable spacing 4059 //case 50: // not variable spacing
3896 4060
3897#if !ENABLE_MINIMAL 4061#if !ENABLE_MINIMAL
… …
3917 break; 4081 break;
3918#endif 4082#endif
3919 } 4083 }
3920 } 4084 }
3921} 4085}
4086
4087void
4088rxvt_term::set_cursor_style (int style)
4089{
4090 if (!IN_RANGE_INC (style, 0, 6))
4091 return;
4092
4093 if (style == 0)
4094 style = 1;
4095
4096 cursor_type = (style - 1) / 2;
4097 set_option (Opt_cursorUnderline, cursor_type == 1);
4098
4099#ifdef CURSOR_BLINK
4100 set_option (Opt_cursorBlink, style & 1);
4101 cursor_blink_reset ();
4102#endif
4103
4104 want_refresh = 1;
4105}
3922/*}}} */ 4106/*}}} */
3923 4107
3924/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3925void
3926rxvt_term::process_graphics ()
3927{
3928 unicode_t ch, cmd = cmd_getc ();
3929
3930 if (cmd == 'Q')
3931 { /* query graphics */
3932 tt_printf ("\033G0\012"); /* no graphics */
3933 return;
3934 }
3935 /* swallow other graphics sequences until terminating ':' */
3936 do
3937 ch = cmd_getc ();
3938 while (ch != ':');
3939}
3940/*}}} */
3941
3942/* ------------------------------------------------------------------------- */ 4108/* ---------------------------------------------------------------------- */
4109/* Write data to the pty as typed by the user, pasted with the mouse,
4110 * or generated by us in response to a query ESC sequence.
4111 */
3943 4112
3944/* 4113/*
3945 * Send printf () formatted output to the command. 4114 * Send printf () formatted output to the command.
3946 * Only use for small amounts of data. 4115 * Only use for small amounts of data.
3947 */ 4116 */
… …
3955 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4124 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3956 va_end (arg_ptr); 4125 va_end (arg_ptr);
3957 tt_write (buf, strlen (buf)); 4126 tt_write (buf, strlen (buf));
3958} 4127}
3959 4128
3960/* ---------------------------------------------------------------------- */
3961/* Write data to the pty as typed by the user, pasted with the mouse, 4129/* Write data to the pty as typed by the user. */
3962 * or generated by us in response to a query ESC sequence. 4130void
3963 */ 4131rxvt_term::tt_write_user_input (const char *data, unsigned int len)
3964const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4132{
4133 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4134 return;
4135
4136 if (option (Opt_scrollTtyKeypress))
4137 if (view_start)
4138 {
4139 view_start = 0;
4140 want_refresh = 1;
4141 }
4142
4143 tt_write_ (data, len);
4144}
3965 4145
3966void 4146void
3967rxvt_term::tt_write (const char *data, unsigned int len) 4147rxvt_term::tt_write (const char *data, unsigned int len)
3968{ 4148{
3969 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4149 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3970 return; 4150 return;
3971 4151
4152 tt_write_ (data, len);
4153}
4154
4155static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4156
4157void
4158rxvt_term::tt_write_ (const char *data, unsigned int len)
4159{
3972 if (pty->pty < 0) 4160 if (pty->pty < 0)
3973 return; 4161 return;
3974 4162
3975 if (v_buflen == 0) 4163 if (v_buflen == 0)
3976 { 4164 {
3977 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4165 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3978 4166
4167 max_it (written, 0);
4168
3979 if ((unsigned int)written == len) 4169 if (written == len)
3980 return; 4170 return;
3981 4171
3982 data += written; 4172 data += written;
3983 len -= written; 4173 len -= written;
3984 } 4174 }
3985 4175
3986 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4176 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3987 4177
3988 memcpy (v_buffer + v_buflen, data, len); 4178 memcpy (v_buffer + v_buflen, data, len);
3989 v_buflen += len; 4179 v_buflen += len;
3990 4180
3991 pty_ev.set (EVENT_READ | EVENT_WRITE); 4181 pty_ev.set (ev::READ | ev::WRITE);
3992} 4182}
3993 4183
3994void rxvt_term::pty_write () 4184void rxvt_term::pty_write ()
3995{ 4185{
3996 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4186 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4002 if (v_buflen == 0) 4192 if (v_buflen == 0)
4003 { 4193 {
4004 free (v_buffer); 4194 free (v_buffer);
4005 v_buffer = 0; 4195 v_buffer = 0;
4006 4196
4007 pty_ev.set (EVENT_READ); 4197 pty_ev.set (ev::READ);
4008 return; 4198 return;
4009 } 4199 }
4010 4200
4011 memmove (v_buffer, v_buffer + written, v_buflen); 4201 memmove (v_buffer, v_buffer + written, v_buflen);
4012 } 4202 }
4013 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4203 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4014 pty_ev.set (EVENT_READ); 4204 pty_ev.set (ev::READ);
4015} 4205}
4016 4206
4017/*----------------------- end-of-file (C source) -----------------------*/ 4207/*----------------------- end-of-file (C source) -----------------------*/
4018 4208

Diff Legend

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