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

Diff Legend

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