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

Diff Legend

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