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.304 by root, Tue Jan 31 22:01:25 2006 UTC vs.
Revision 1.602 by sf-exg, Sat May 6 08:01:35 2023 UTC

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

Diff Legend

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