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.271 by root, Wed Jan 18 17:49:46 2006 UTC vs.
Revision 1.585 by root, Sun Jul 7 08:06:44 2019 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007,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
… …
49#include "rxvt.h" 50#include "rxvt.h"
50#include "rxvtperl.h" 51#include "rxvtperl.h"
51#include "version.h" 52#include "version.h"
52#include "command.h" 53#include "command.h"
53 54
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 56# include "keyboard.h"
61#endif 57#endif
62 58
63#include <csignal> 59#include <signal.h>
60
61#if LINUX_YIELD_HACK
62# include <time.h>
63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 68
72#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
73 70
74#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
99 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
100 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
101 98
102 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
104 XK_ISO_Lock, 0x21eb,
105 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
106 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
107 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
108 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
109 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
135 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
136#endif 132#endif
137 0, 133 0,
138}; 134};
139 135
140void 136void ecb_cold
141rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
142{ 138{
143 x = Pixel2Col (x); 139 x = Pixel2Col (x);
144 y = Pixel2Row (y); 140 y = Pixel2Row (y);
145 141
… …
153 149
154 text_t t = l.t[x]; 150 text_t t = l.t[x];
155 151
156 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
157 { 153 {
158 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
159 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
160 break; 156 break;
161 } 157 }
162 158
163 x--; 159 x--;
164 } 160 }
165} 161}
166 162
167void 163void ecb_cold
168rxvt_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)
169{ 165{
170 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
171 rxvt_font *f = (*fs)[fs->find_font (ch)];
172 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
173 int len; 168 int len;
174
175 fname = rxvt_utf8towcs (f->name);
176 169
177# if ENABLE_COMBINING 170# if ENABLE_COMBINING
178 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
179 { 172 {
180 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
188 181
189 alloc = 0; 182 alloc = 0;
190 chr = &ch2; 183 chr = &ch2;
191 len = 1; 184 len = 1;
192 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
193 189
194 char attr[80]; // plenty 190 char attr[80]; // plenty
195 191
196 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",
197 (int)r, 193 (int)r,
… …
201 r & RS_Blink ? " blink" : "", 197 r & RS_Blink ? " blink" : "",
202 r & RS_RVid ? " rvid" : "", 198 r & RS_RVid ? " rvid" : "",
203 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
205 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);
206 int width = wcswidth (fname, wcslen (fname)); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
209 }
207 210
208 max_it (width, 8+5); // for char + hey
209 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
210 212
211 if (y >= 0) 213 if (y >= 0)
212 { 214 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 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);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
239
240 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
236 } 242 }
237 243
244// {
245// char buf[4+4+3+1];
246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
247// scr_overlay_set (0, 0, buf);
248// }
238 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
250 for (int i = 0; i < len; i++)
251 {
239 scr_overlay_set (0, len + 1, fname); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
240
241 free (fname); 253 free (fname[i]);
254 }
242 255
243# if ENABLE_COMBINING 256# if ENABLE_COMBINING
244 if (alloc) 257 if (alloc)
245 delete [] alloc; 258 delete [] alloc;
246# endif 259# endif
247} 260}
248#endif 261#endif
249 262
250void 263void ecb_cold
251rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
252{ 265{
253 wchar_t ch[2];
254
255 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
256 ch[1] = 0;
257 267
258 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
259 { 269 {
260 char mb[16]; 270 char mb[MB_LEN_MAX];
261 int len; 271 int len;
262 272
263 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
264 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
265 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
266 else 276 else
267 { 277 {
268 mb[0] = ch[0]; 278 mb[0] = ch;
269 len = 1; 279 len = 1;
270 } 280 }
271 281
272 if (len > 0) 282 if (len > 0)
273 tt_write (mb, len); 283 tt_write (mb, len);
… …
276 } 286 }
277 287
278 iso14755buf = 0; 288 iso14755buf = 0;
279} 289}
280 290
281int 291static int ecb_cold
282rxvt_term::hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
283{ 293{
284 // check wether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
285 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
286 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
287 { 297 {
288 KeySym k = XLookupKeysym (&ev, index); 298 KeySym k = XLookupKeysym (&ev, index);
289 299
… …
295 305
296 return -1; 306 return -1;
297} 307}
298#endif 308#endif
299 309
300/*{{{ Convert the keypress event into a string */ 310static inline KeySym ecb_cold
301void 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
302rxvt_term::lookup_key (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
303{ 409{
304 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
305 unsigned int newlen; 411 KeySym keysym = NoSymbol;
306 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
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, 0, 0); 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#if defined(DEBUG_CMD) 933 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
911 /* Display keyboard buffer contents */ 934 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
912 unsigned char *p; 935 }
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len);
921}
922/*}}} */
923
924#if defined (KEYSYM_RESOURCE)
925unsigned int
926rxvt_term::cmd_write (const char *str, unsigned int count)
927{
928 unsigned int n, s;
929
930 n = cmdbuf_ptr - cmdbuf_base;
931 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
932
933 if (n > 0 && s < count)
934 {
935 memmove (cmdbuf_base, cmdbuf_ptr,
936 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
937 cmdbuf_ptr = cmdbuf_base;
938 cmdbuf_endp -= n;
939 s += n;
940 }
941
942 if (count > s)
943 {
944 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
945 count = s;
946 }
947
948 for (; count--;)
949 *cmdbuf_endp++ = *str++;
950
951 cmd_parse ();
952
953 return 0;
954}
955#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}
956 952
957void 953void
958rxvt_term::flush () 954rxvt_term::flush ()
959{ 955{
960 flush_ev.stop (); 956 flush_ev.stop ();
961 957
962#ifdef TRANSPARENT 958#ifdef HAVE_IMG
963 if (want_full_refresh) 959 if (bg_flags & BG_NEEDS_REFRESH)
964 { 960 {
965 want_full_refresh = 0; 961 bg_flags &= ~BG_NEEDS_REFRESH;
966 scr_clear ();
967 scr_touch (false); 962 scr_touch (false);
968 } 963 }
969#endif 964#endif
970 965
971 if (want_refresh) 966 if (want_refresh)
… …
1007 } 1002 }
1008 while (row < end_row); 1003 while (row < end_row);
1009 } 1004 }
1010 1005
1011 scr_refresh (); 1006 scr_refresh ();
1012 scrollbar_show (1); 1007 scrollBar.show (1);
1013#ifdef USE_XIM 1008#if USE_XIM
1014 IMSendSpot (); 1009 im_send_spot ();
1015#endif 1010#endif
1016 } 1011 }
1017 1012
1018 display->flush (); 1013 display->flush ();
1019} 1014}
1020 1015
1016/* checks whether a refresh is requested and starts the refresh timer */
1021void 1017void
1022rxvt_term::check_cb (check_watcher &w) 1018rxvt_term::refresh_check ()
1019{
1020 if (want_refresh && !flush_ev.is_active ())
1021 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1022
1023 display->flush ();
1024}
1025
1026void
1027rxvt_term::flush_cb (ev::timer &w, int revents)
1023{ 1028{
1024 make_current (); 1029 make_current ();
1025 1030
1026 display->flush ();
1027
1028 if (want_refresh && !flush_ev.active)
1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1030}
1031
1032void
1033rxvt_term::flush_cb (time_watcher &w)
1034{
1035 make_current ();
1036
1037 refresh_limit = 1;
1038 refresh_count = 0; 1031 refresh_count = 0;
1039 flush (); 1032 flush ();
1040} 1033}
1041 1034
1042#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1043void 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
1044rxvt_term::cursor_blink_cb (time_watcher &w) 1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1045{ 1056{
1046 hidden_cursor = !hidden_cursor; 1057 hidden_cursor = !hidden_cursor;
1047 want_refresh = 1; 1058 want_refresh = 1;
1048 1059 refresh_check ();
1049 w.start (w.at + BLINK_INTERVAL);
1050} 1060}
1051#endif 1061#endif
1052 1062
1053#ifdef TEXT_BLINK 1063#ifdef TEXT_BLINK
1054void 1064void
1055rxvt_term::text_blink_cb (time_watcher &w) 1065rxvt_term::text_blink_cb (ev::timer &w, int revents)
1056{ 1066{
1057 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1067 if (scr_refresh_rend (RS_Blink, RS_Blink))
1058 { 1068 {
1059 hidden_text = !hidden_text; 1069 hidden_text = !hidden_text;
1060 want_refresh = 1; 1070 want_refresh = 1;
1061 w.start (w.at + TEXT_BLINK_INTERVAL); 1071 refresh_check ();
1062 } 1072 }
1073 else
1074 w.stop ();
1063} 1075}
1064#endif 1076#endif
1065 1077
1066#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1067void 1079void
1068rxvt_term::cont_scroll_cb (time_watcher &w) 1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1069{ 1081{
1070 if ((scrollbar_isUp() || scrollbar_isDn()) && 1082 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1071 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1083 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1072 { 1084 {
1073 want_refresh = 1; 1085 want_refresh = 1;
1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1086 refresh_check ();
1075 } 1087 }
1088 else
1089 w.stop ();
1076} 1090}
1077#endif 1091#endif
1078 1092
1079#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1080void 1094void
1081rxvt_term::sel_scroll_cb (time_watcher &w) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1082{ 1096{
1083 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1084 { 1098 {
1085 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1086 want_refresh = 1; 1100 want_refresh = 1;
1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 refresh_check ();
1088 } 1102 }
1103 else
1104 w.stop ();
1089} 1105}
1090#endif 1106#endif
1091 1107
1092#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1093void 1109void
1094rxvt_term::slip_wheel_cb (time_watcher &w) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1095{ 1111{
1096 if (mouse_slip_wheel_speed == 0 1112 if (scr_page (mouse_slip_wheel_speed))
1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1098 : scr_page (UP, mouse_slip_wheel_speed))
1099 { 1113 {
1100 if (view_start == top_row || view_start == 0)
1101 mouse_slip_wheel_speed = 0;
1102
1103 want_refresh = 1; 1114 want_refresh = 1;
1104 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)
1105 } 1119 {
1120 mouse_slip_wheel_speed = 0;
1121 w.stop ();
1122 }
1106} 1123}
1107#endif 1124#endif
1108 1125
1109#if HAVE_SCHED_YIELD 1126#if LINUX_YIELD_HACK
1110static struct event_handler 1127static struct event_handler
1111{ 1128{
1112 check_watcher cw_yield; 1129 ev::prepare yield_ev;
1113 1130
1114 void yield (check_watcher &w) 1131 void yield_cb (ev::prepare &w, int revents)
1115 { 1132 {
1116 sched_yield (); 1133 // this should really be sched_yield(), but the linux guys thought
1134 // that giving a process calling sched_yield () less cpu time than
1135 // ones with high nice levels is a useful thing to do. It surely is is
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.
1140
1141 struct timespec ts = { 0, 1000 };
1142 nanosleep (&ts, 0);
1143
1117 w.stop (); 1144 w.stop ();
1118 } 1145 }
1119 1146
1120 event_handler () 1147 event_handler ()
1121 : cw_yield (this, &event_handler::yield) 1148 : yield_ev (this, &event_handler::yield_cb)
1122 { 1149 {
1123 } 1150 }
1124} event_handler; 1151} event_handler;
1125#endif 1152#endif
1126 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
1127bool 1187bool
1128rxvt_term::pty_fill () 1188rxvt_term::pty_fill ()
1129{ 1189{
1130 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1190 cmdbuf_reify ();
1131 1191
1132 if (CBUFSIZ == n) 1192 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1133 { 1193
1134 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1194 if (!avail)
1135 n = 0;
1136 } 1195 {
1137 1196 // normally this indicates a "too long" command sequence - just drop the data we have
1138 memmove (cmdbuf_base, cmdbuf_ptr, n);
1139 cmdbuf_ptr = cmdbuf_base; 1197 cmdbuf_ptr = cmdbuf_base;
1140 cmdbuf_endp = cmdbuf_ptr + n; 1198 cmdbuf_endp = cmdbuf_ptr;
1199 avail = CBUFSIZ;
1200 }
1141 1201
1142 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1202 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1143 1203
1144 if (r > 0) 1204 if (r > 0)
1145 { 1205 {
1146 cmdbuf_endp += r; 1206 cmdbuf_endp += r;
1147 return true; 1207 return true;
1148 } 1208 }
1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1209 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 { 1210 {
1151#if HAVE_SCHED_YIELD 1211#if LINUX_YIELD_HACK
1152 if (display->is_local) 1212 if (display->is_local)
1153 event_handler.cw_yield.start (); 1213 event_handler.yield_ev.start ();
1154#endif 1214#endif
1155 } 1215 }
1156 else 1216 else
1157 { 1217 {
1158 pty_ev.stop (); 1218 pty_ev.stop ();
1159 1219
1160 if (!OPTION (Opt_hold)) 1220 if (!option (Opt_hold))
1161 destroy (); 1221 destroy ();
1162 } 1222 }
1163 1223
1164 return false; 1224 return false;
1165} 1225}
1166 1226
1167void 1227void
1168rxvt_term::pty_cb (io_watcher &w, short revents) 1228rxvt_term::pty_cb (ev::io &w, int revents)
1169{ 1229{
1170 make_current (); 1230 make_current ();
1171 1231
1172 if (revents & EVENT_READ) 1232 if (revents & ev::READ)
1173 // loop, but don't allow a single term to monopolize us 1233 // loop, but don't allow a single term to monopolize us
1174 while (pty_fill ()) 1234 for (int i = CBUFCNT; i-- && pty_fill (); )
1175 if (cmd_parse ()) 1235 cmd_parse ();
1176 break;
1177 1236
1178 if (revents & EVENT_WRITE) 1237 if (revents & ev::WRITE)
1179 pty_write (); 1238 pty_write ();
1180}
1181 1239
1182void 1240 refresh_check ();
1241}
1242
1243void ecb_cold
1183rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1184{ 1245{
1185 XDefineCursor (display->display, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1186 recolour_cursor (); 1247 recolor_cursor ();
1187 1248
1188#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1189 hidden_pointer = 0; 1250 hidden_pointer = 0;
1190 1251
1191 if (OPTION (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
1192 pointer_ev.start (NOW + pointerBlankDelay); 1253 pointer_ev.start (pointerBlankDelay);
1193#endif 1254#endif
1194} 1255}
1195 1256
1196#ifdef POINTER_BLANK 1257#ifdef POINTER_BLANK
1197void 1258void ecb_cold
1198rxvt_term::pointer_blank () 1259rxvt_term::pointer_blank ()
1199{ 1260{
1200 if (!OPTION (Opt_pointerBlank)) 1261 if (!option (Opt_pointerBlank))
1201 return; 1262 return;
1202 1263
1203 XDefineCursor (display->display, vt, display->blank_cursor); 1264 XDefineCursor (dpy, vt, display->blank_cursor);
1204 XFlush (display->display); 1265 XFlush (dpy);
1205 1266
1206 hidden_pointer = 1; 1267 hidden_pointer = 1;
1207} 1268}
1208 1269
1209void 1270void ecb_cold
1210rxvt_term::pointer_cb (time_watcher &w) 1271rxvt_term::pointer_cb (ev::timer &w, int revents)
1211{ 1272{
1212 make_current (); 1273 make_current ();
1213 1274
1214 pointer_blank (); 1275 pointer_blank ();
1215} 1276}
… …
1218void 1279void
1219rxvt_term::mouse_report (XButtonEvent &ev) 1280rxvt_term::mouse_report (XButtonEvent &ev)
1220{ 1281{
1221 int button_number, key_state = 0; 1282 int button_number, key_state = 0;
1222 int x, y; 1283 int x, y;
1284 int code = 32;
1223 1285
1224 x = ev.x; 1286 x = Pixel2Col (ev.x) + 1;
1225 y = ev.y; 1287 y = Pixel2Row (ev.y) + 1;
1226 pixel_position (&x, &y); 1288
1289 if (ev.type == MotionNotify)
1290 {
1291 if (x == mouse_row && y == mouse_col)
1292 return;
1293
1294 mouse_row = x;
1295 mouse_col = y;
1296 code += 32;
1297 }
1227 1298
1228 if (MEvent.button == AnyButton) 1299 if (MEvent.button == AnyButton)
1229 button_number = 3; 1300 button_number = 3;
1230 else 1301 else
1231 { 1302 {
1232 button_number = MEvent.button - Button1; 1303 button_number = MEvent.button - Button1;
1233 /* add 0x3D for wheel events, like xterm does */ 1304 /* add 0x3D for wheel events, like xterm does */
1234 if (button_number >= 3) 1305 if (button_number >= 3)
1235 button_number += (64 - 3); 1306 button_number += 64 - 3;
1236 } 1307 }
1237 1308
1238 if (priv_modes & PrivMode_MouseX10) 1309 if (priv_modes & PrivMode_MouseX10)
1239 { 1310 {
1240 /* 1311 /*
… …
1272 fputc ('A', stderr); 1343 fputc ('A', stderr);
1273 if (key_state & 32) 1344 if (key_state & 32)
1274 fputc ('2', stderr); 1345 fputc ('2', stderr);
1275 fprintf (stderr, "]: <%d>, %d/%d\n", 1346 fprintf (stderr, "]: <%d>, %d/%d\n",
1276 button_number, 1347 button_number,
1277 x + 1, 1348 x,
1278 y + 1); 1349 y);
1279#endif 1350#endif
1280 1351
1352#if ENABLE_FRILLS
1353 if (priv_modes & PrivMode_ExtMouseRight)
1354 tt_printf ("\033[%d;%d;%dM",
1355 code + button_number + key_state,
1356 x,
1357 y);
1358 else if (priv_modes & PrivMode_ExtModeMouse)
1359 tt_printf ("\033[M%c%lc%lc",
1360 code + button_number + key_state,
1361 wint_t (32 + x),
1362 wint_t (32 + y));
1363 else
1364#endif
1281 tt_printf ("\033[M%c%c%c", 1365 tt_printf ("\033[M%c%c%c",
1282 (32 + button_number + key_state), 1366 code + button_number + key_state,
1283 (32 + x + 1), 1367 32 + x,
1284 (32 + y + 1)); 1368 32 + y);
1285} 1369}
1286
1287#ifdef USING_W11LIB
1288void
1289rxvt_W11_process_x_event (XEvent *ev)
1290{
1291 rxvt_t *r = rxvt_get_r ();
1292
1293 x_cb (*ev);
1294}
1295#endif
1296 1370
1297/*{{{ process an X event */ 1371/*{{{ process an X event */
1298void 1372void ecb_hot
1299rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1300{ 1374{
1301 make_current (); 1375 make_current ();
1302 1376
1303 dDisp; 1377 dLocal (Display *, dpy);
1304 1378
1305 if (ev.xany.window == vt 1379 if (ev.xany.window == vt
1306 && SHOULD_INVOKE (HOOK_X_EVENT) 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return; 1382 return;
… …
1313 unsigned int unused_mask; 1387 unsigned int unused_mask;
1314 1388
1315 switch (ev.type) 1389 switch (ev.type)
1316 { 1390 {
1317 case KeyPress: 1391 case KeyPress:
1318#if ISO_14755 1392 key_press (ev.xkey);
1319 if (!(iso14755buf & ISO_14755_52))
1320#endif
1321 lookup_key (ev.xkey);
1322
1323 break; 1393 break;
1324 1394
1325 case KeyRelease: 1395 case KeyRelease:
1326 { 1396 key_release (ev.xkey);
1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1328 KeySym keysym;
1329
1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1331#endif
1332
1333#if ENABLE_FRILLS || ISO_14755
1334 // ISO 14755 support
1335 if (iso14755buf)
1336 if (iso14755buf & ISO_14755_52)
1337 {
1338# if ENABLE_OVERLAY
1339 scr_overlay_off ();
1340# endif
1341# if ISO_14755
1342 // iso14755 part 5.2 handling: release time
1343 // first: controls
1344 if ((ev.xkey.state & ControlMask)
1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1347 {
1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1349 commit_iso14755 ();
1350 goto skip_switch;
1351 }
1352
1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1354 if (i[0] == keysym)
1355 {
1356 iso14755buf = ISO_14755_51 | i[1];
1357 commit_iso14755 ();
1358 goto skip_switch;
1359 }
1360
1361 scr_bell ();
1362# endif
1363 iso14755buf = 0;
1364 break;
1365 }
1366 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1367 {
1368# if ENABLE_OVERLAY
1369 scr_overlay_off ();
1370# endif
1371 if (iso14755buf & ISO_14755_51)
1372 commit_iso14755 ();
1373#if ISO_14755
1374 else if (iso14755buf & ISO_14755_STARTED)
1375 {
1376 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1377
1378 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1379 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1380 }
1381# endif
1382 else
1383 iso14755buf = 0;
1384 }
1385#endif
1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389 break;
1390
1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1392 if (!(ev.xkey.state & ControlMask))
1393 slip_wheel_ev.stop ();
1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1395 mouse_slip_wheel_speed = 0;
1396#endif
1397 break; 1397 break;
1398 }
1399 1398
1400 case ButtonPress: 1399 case ButtonPress:
1401 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1402 break; 1401 break;
1403 1402
… …
1405 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1406 break; 1405 break;
1407 1406
1408 case ClientMessage: 1407 case ClientMessage:
1409 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1409 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411 { 1410 {
1411 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1412 {
1413 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1414 {
1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1416 {
1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413 destroy (); 1418 destroy ();
1419 }
1414#if ENABLE_EWMH 1420#if ENABLE_EWMH
1415 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416 XSendEvent (disp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev); 1424 &ev);
1425#endif
1426 }
1427 }
1428#if ENABLE_XEMBED
1429 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1430 {
1431 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1432 focus_in ();
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out ();
1435 }
1419#endif 1436#endif
1420 } 1437 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1430#ifdef OFFIX_DND
1431 /* OffiX Dnd (drag 'n' drop) protocol */
1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1433 && (ev.xclient.data.l[0] == DndFile
1434 || ev.xclient.data.l[0] == DndDir
1435 || ev.xclient.data.l[0] == DndLink))
1436 {
1437 /* Get Dnd data */
1438 Atom ActualType;
1439 int ActualFormat;
1440 unsigned char *data;
1441 unsigned long Size, RemainingBytes;
1442
1443 XGetWindowProperty (disp, display->root,
1444 xa[XA_DNDSELECTION],
1445 0L, 1000000L,
1446 False, AnyPropertyType,
1447 &ActualType, &ActualFormat,
1448 &Size, &RemainingBytes,
1449 &data);
1450 set_string_property (XA_CUT_BUFFER0, data);
1451 XFree (data);
1452 selection_paste (display->root, XA_CUT_BUFFER0, true);
1453 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1454 }
1455#endif /* OFFIX_DND */
1456 break;
1457
1458 case MappingNotify:
1459 XRefreshKeyboardMapping (&ev.xmapping);
1460 break; 1438 break;
1461 1439
1462 /* 1440 /*
1463 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1464 * Here's my conclusion: 1442 * Here's my conclusion:
… …
1483 break; 1461 break;
1484 } 1462 }
1485 break; 1463 break;
1486 1464
1487 case FocusIn: 1465 case FocusIn:
1466 if (ev.xfocus.detail != NotifyInferior
1467 && ev.xfocus.detail != NotifyPointer
1468 && ev.xfocus.mode != NotifyGrab)
1488 focus_in (); 1469 focus_in ();
1489 break; 1470 break;
1490 1471
1491 case FocusOut: 1472 case FocusOut:
1473 if (ev.xfocus.detail != NotifyInferior
1474 && ev.xfocus.detail != NotifyPointer
1475 && ev.xfocus.mode != NotifyGrab)
1492 focus_out (); 1476 focus_out ();
1493 break; 1477 break;
1494 1478
1495 case ConfigureNotify: 1479 case ConfigureNotify:
1496 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent)
1497 { 1481 {
1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1499 ; 1483 ;
1484
1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1486
1487 if (want_position_change)
1488 {
1489 int x, y;
1490
1491 if (ev.xconfigure.send_event)
1492 {
1493 x = ev.xconfigure.x;
1494 y = ev.xconfigure.y;
1495 }
1496 else
1497 get_window_origin (x, y);
1498
1499 if (x != parent_x || y != parent_y)
1500 {
1501 parent_x = x;
1502 parent_y = y;
1503 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1504 }
1505 }
1500 1506
1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1507 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1502 { 1508 {
1503 seen_resize = 1; 1509 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1510 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505 } 1511 }
1506 1512
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1513 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508
1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1510 if (OPTION (Opt_transparent))
1511 check_our_parents ();
1512#endif
1513 } 1514 }
1514 break; 1515 break;
1515 1516
1516 case PropertyNotify: 1517 case PropertyNotify:
1517 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1518 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 && ev.xproperty.state == PropertyNewValue)
1519 selection_property (ev.xproperty.window, ev.xproperty.atom);
1520
1521 break; 1519 break;
1522 1520
1523 case SelectionClear: 1521 case SelectionClear:
1524 selection_clear (); 1522 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1525 break;
1526
1527 case SelectionNotify:
1528 if (selection_wait == Sel_normal)
1529 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1530 break; 1523 break;
1531 1524
1532 case SelectionRequest: 1525 case SelectionRequest:
1533 selection_send (ev.xselectionrequest); 1526 selection_send (ev.xselectionrequest);
1534 break; 1527 break;
1535 1528
1536 case MapNotify: 1529 case MapNotify:
1537 mapped = 1; 1530 mapped = 1;
1538#ifdef TEXT_BLINK 1531#ifdef TEXT_BLINK
1539 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1532 text_blink_ev.start ();
1540#endif 1533#endif
1541 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 break; 1535 break;
1543 1536
1544 case UnmapNotify: 1537 case UnmapNotify:
… …
1546#ifdef TEXT_BLINK 1539#ifdef TEXT_BLINK
1547 text_blink_ev.stop (); 1540 text_blink_ev.stop ();
1548#endif 1541#endif
1549 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1550 break; 1543 break;
1551
1552#ifdef TRANSPARENT
1553 case ReparentNotify:
1554 rootwin_cb (ev);
1555 break;
1556#endif /* TRANSPARENT */
1557 1544
1558 case GraphicsExpose: 1545 case GraphicsExpose:
1559 case Expose: 1546 case Expose:
1560 if (ev.xany.window == vt) 1547 if (ev.xany.window == vt)
1561 { 1548 {
1562 do 1549 do
1550 {
1563 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1564 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, false);
1553 }
1565 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1554 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1566 1555
1567 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1556 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1568 1557
1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1559 {
1570 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1571 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, false);
1562 }
1572 1563
1573 want_refresh = 1; 1564 want_refresh = 1;
1574 } 1565 }
1575 else 1566 else
1576 { 1567 {
1577 XEvent unused_event; 1568 XEvent unused_event;
1578 1569
1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1570 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1580 ; 1571 ;
1581 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1572 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1582 ; 1573 ;
1583 1574
1584 if (isScrollbarWindow (ev.xany.window)) 1575 if (scrollBar.state && ev.xany.window == scrollBar.win)
1585 { 1576 {
1586 scrollBar.setIdle (); 1577 scrollBar.state = SB_STATE_IDLE;
1587 scrollbar_show (0); 1578 scrollBar.show (0);
1588 } 1579 }
1589
1590#ifdef TRANSPARENT
1591 if (am_transparent && ev.xany.window == parent[0])
1592 XClearWindow (disp, ev.xany.window);
1593#endif
1594 } 1580 }
1595 break; 1581 break;
1596 1582
1597 case MotionNotify: 1583 case MotionNotify:
1598#ifdef POINTER_BLANK 1584#ifdef POINTER_BLANK
1599 if (hidden_pointer) 1585 if (hidden_pointer)
1600 pointer_unblank (); 1586 pointer_unblank ();
1601#endif 1587#endif
1588 if (!bypass_keystate
1589 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1590 || priv_modes & PrivMode_MouseAnyEvent))
1591 mouse_report (ev.xbutton);
1602 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1603 break; 1593 break;
1604 1594
1605 if (ev.xany.window == vt) 1595 if (ev.xany.window == vt)
1606 { 1596 {
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1597 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1598 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609 ; // nop 1599 ; // nop
1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1600 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1611 { 1601 {
1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1613 ; 1603 ;
1614 1604
1615 XQueryPointer (disp, vt, 1605 XQueryPointer (dpy, vt,
1616 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1617 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1618 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1619 &ev.xbutton.state); 1609 &ev.xbutton.state);
1620#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
1621 /* deal with a `jumpy' mouse */ 1611 /* deal with a `jumpy' mouse */
1622 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1612 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1613#endif
1623 { 1614 {
1624#endif
1625#if ISO_14755 1615#if ISO_14755
1626 // 5.4 1616 // 5.4
1627 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1617 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1628 { 1618 {
1629 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1619 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1635 1625
1636#ifdef SELECTION_SCROLLING 1626#ifdef SELECTION_SCROLLING
1637 if (ev.xbutton.y < int_bwidth 1627 if (ev.xbutton.y < int_bwidth
1638 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1628 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1639 { 1629 {
1630 page_dirn scroll_selection_dir;
1640 int dist; 1631 int dist;
1641 1632
1642 /* don't clobber the current delay if we are 1633 /* don't clobber the current delay if we are
1643 * already in the middle of scrolling. 1634 * already in the middle of scrolling.
1644 */ 1635 */
1645 if (!sel_scroll_ev.active) 1636 if (!sel_scroll_ev.is_active ())
1646 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1637 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1647 1638
1648 /* save the event params so we can highlight 1639 /* save the event params so we can highlight
1649 * the selection in the pending-scroll loop 1640 * the selection in the pending-scroll loop
1650 */ 1641 */
1651 selection_save_x = ev.xbutton.x; 1642 selection_save_x = ev.xbutton.x;
… …
1659 dist = int_bwidth - ev.xbutton.y; 1650 dist = int_bwidth - ev.xbutton.y;
1660 } 1651 }
1661 else 1652 else
1662 { 1653 {
1663 scroll_selection_dir = DN; 1654 scroll_selection_dir = DN;
1664 dist = ev.xbutton.y - (int_bwidth + height); 1655 dist = ev.xbutton.y - (int_bwidth + vt_height);
1665 } 1656 }
1666 1657
1667 scroll_selection_lines = Pixel2Height (dist) 1658 scroll_selection_lines = Pixel2Height (dist)
1668 / SELECTION_SCROLL_LINE_SPEEDUP 1659 / SELECTION_SCROLL_LINE_SPEEDUP
1669 + 1; 1660 + 1;
1670 min_it (scroll_selection_lines, 1661 min_it (scroll_selection_lines,
1671 SELECTION_SCROLL_MAX_LINES); 1662 SELECTION_SCROLL_MAX_LINES);
1663 scroll_selection_lines *= scroll_selection_dir;
1672 } 1664 }
1673 else 1665 else
1674 { 1666 {
1675 /* we are within the text window, so we 1667 /* we are within the text window, so we
1676 * shouldn't be scrolling 1668 * shouldn't be scrolling
1677 */ 1669 */
1678 if (sel_scroll_ev.active)
1679 sel_scroll_ev.stop(); 1670 sel_scroll_ev.stop();
1680 } 1671 }
1681#endif 1672#endif
1682#ifdef MOUSE_THRESHOLD
1683 } 1673 }
1684#endif
1685 } 1674 }
1686 } 1675 }
1687 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1676 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1688 { 1677 {
1689 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1690 MotionNotify, &ev)) 1679 MotionNotify, &ev))
1691 ; 1680 ;
1692 1681
1693 XQueryPointer (disp, scrollBar.win, 1682 XQueryPointer (dpy, scrollBar.win,
1694 &unused_root, &unused_child, 1683 &unused_root, &unused_child,
1695 &unused_root_x, &unused_root_y, 1684 &unused_root_x, &unused_root_y,
1696 &ev.xbutton.x, &ev.xbutton.y, 1685 &ev.xbutton.x, &ev.xbutton.y,
1697 &unused_mask); 1686 &unused_mask);
1698 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1687 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1699 scrollbar_size ()); 1688 scrollBar.size ());
1700 want_refresh = 1; 1689 want_refresh = 1;
1701 refresh_limit = 0;
1702 scrollbar_show (1); 1690 scrollBar.show (1);
1703 } 1691 }
1704 break; 1692 break;
1705 } 1693 }
1706 1694
1707skip_switch: ;
1708
1709#if defined(CURSOR_BLINK) 1695#if defined(CURSOR_BLINK)
1710 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1696 if (ev.type == KeyPress)
1711 { 1697 cursor_blink_reset ();
1712 if (hidden_cursor)
1713 {
1714 hidden_cursor = 0;
1715 want_refresh = 1;
1716 }
1717
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1719 }
1720#endif 1698#endif
1721 1699
1722#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1723 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1724 { 1702 {
1725 if (ev.type == MotionNotify 1703 if (ev.type == MotionNotify
1726 || ev.type == ButtonPress 1704 || ev.type == ButtonPress
1727 || ev.type == ButtonRelease) 1705 || ev.type == ButtonRelease)
1728 if (hidden_pointer) 1706 if (hidden_pointer)
… …
1730 1708
1731 if (ev.type == KeyPress && hidden_pointer == 0) 1709 if (ev.type == KeyPress && hidden_pointer == 0)
1732 pointer_blank (); 1710 pointer_blank ();
1733 } 1711 }
1734#endif 1712#endif
1735}
1736 1713
1737void 1714 refresh_check ();
1715}
1716
1717#if ENABLE_FRILLS
1718void ecb_cold
1719rxvt_term::set_urgency (bool enable)
1720{
1721 if (enable == urgency_hint)
1722 return;
1723
1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1725 {
1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1727 XSetWMHints (dpy, parent, h);
1728 urgency_hint = enable;
1729 XFree (h);
1730 }
1731}
1732#endif
1733
1734void ecb_cold
1738rxvt_term::focus_in () 1735rxvt_term::focus_in ()
1739{ 1736{
1740 if (!focus) 1737 if (!focus)
1741 { 1738 {
1742 focus = 1; 1739 focus = 1;
1743 want_refresh = 1; 1740 want_refresh = 1;
1744 1741
1745 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1746
1747#if USE_XIM 1742#if USE_XIM
1748 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1749 { 1744 {
1750 IMSetStatusPosition (); 1745 im_set_position ();
1751 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1752 } 1747 }
1753#endif 1748#endif
1754#if CURSOR_BLINK 1749#if CURSOR_BLINK
1755 if (OPTION (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
1756 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1751 cursor_blink_ev.again ();
1757#endif 1752#endif
1758#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1760 { 1755 {
1761 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1762 scr_recolour (); 1757 scr_recolor ();
1763 } 1758 }
1764#endif 1759#endif
1765 } 1760#if ENABLE_FRILLS
1766} 1761 if (option (Opt_urgentOnBell))
1762 set_urgency (0);
1767 1763
1768void 1764 if (priv_modes & PrivMode_FocusEvent)
1765 tt_printf ("\x1b[I");
1766#endif
1767
1768 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1769 }
1770}
1771
1772void ecb_cold
1769rxvt_term::focus_out () 1773rxvt_term::focus_out ()
1770{ 1774{
1771 if (focus) 1775 if (focus)
1772 { 1776 {
1773 focus = 0; 1777 focus = 0;
1774 want_refresh = 1; 1778 want_refresh = 1;
1775 1779
1776 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1780#if ENABLE_FRILLS
1781 if (option (Opt_urgentOnBell))
1782 set_urgency (0);
1777 1783
1784 if (priv_modes & PrivMode_FocusEvent)
1785 tt_printf ("\x1b[O");
1786#endif
1778#if ENABLE_FRILLS || ISO_14755 1787#if ENABLE_FRILLS || ISO_14755
1779 if (iso14755buf) 1788 if (iso14755buf)
1780 { 1789 {
1781 iso14755buf = 0; 1790 iso14755buf = 0;
1782# if ENABLE_OVERLAY 1791# if ISO_14755
1783 scr_overlay_off (); 1792 scr_overlay_off ();
1784# endif 1793# endif
1785 } 1794 }
1786#endif 1795#endif
1787#if USE_XIM 1796#if USE_XIM
1788 if (Input_Context != NULL) 1797 if (Input_Context != NULL)
1789 XUnsetICFocus (Input_Context); 1798 XUnsetICFocus (Input_Context);
1790#endif 1799#endif
1791#if CURSOR_BLINK 1800#if CURSOR_BLINK
1792 if (OPTION (Opt_cursorBlink)) 1801 if (option (Opt_cursorBlink))
1793 cursor_blink_ev.stop (); 1802 cursor_blink_ev.stop ();
1803
1794 hidden_cursor = 0; 1804 hidden_cursor = 0;
1795#endif 1805#endif
1796#if OFF_FOCUS_FADING 1806#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade]) 1807 if (rs[Rs_fade])
1798 { 1808 {
1799 pix_colors = pix_colors_unfocused; 1809 pix_colors = pix_colors_unfocused;
1800 scr_recolour (); 1810 scr_recolor ();
1801 } 1811 }
1802#endif 1812#endif
1813
1814 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1815 }
1816}
1817
1818void ecb_cold
1819rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1820{
1821#if OFF_FOCUS_FADING
1822 if (rs[Rs_fade])
1803 } 1823 {
1804} 1824 if (!first_time)
1825 pix_colors_focused [idx].free (this);
1805 1826
1806#if TRANSPARENT 1827 rgba c;
1807void 1828 pix_colors [Color_fade].get (c);
1829 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1830 }
1831#endif
1832}
1833
1834#if ENABLE_PERL
1835void ecb_hot
1808rxvt_term::rootwin_cb (XEvent &ev) 1836rxvt_term::rootwin_cb (XEvent &ev)
1809{ 1837{
1810 make_current (); 1838 make_current ();
1839
1840 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1841 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1842 return;
1811 1843
1812 switch (ev.type) 1844 switch (ev.type)
1813 { 1845 {
1814 case PropertyNotify: 1846 case PropertyNotify:
1815 /* 1847 /*
1816 * if user used some Esetroot compatible prog to set the root bg, 1848 * if user used some Esetroot compatible prog to set the root bg,
1817 * use the property to determine the pixmap. We use it later on. 1849 * use the property to determine the pixmap. We use it later on.
1818 */ 1850 */
1819 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1851 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1820 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1852 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1821 return; 1853 {
1854 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1855 }
1822 1856
1823 /* FALLTHROUGH */
1824 case ReparentNotify:
1825 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1826 want_refresh = want_full_refresh = 1;
1827 break; 1857 break;
1828 } 1858 }
1859
1860 refresh_check ();
1829} 1861}
1830#endif 1862#endif
1831 1863
1832void 1864void
1833rxvt_term::button_press (XButtonEvent &ev) 1865rxvt_term::button_press (XButtonEvent &ev)
… …
1842 /* 1874 /*
1843 * VT window processing of button press 1875 * VT window processing of button press
1844 */ 1876 */
1845 if (ev.window == vt) 1877 if (ev.window == vt)
1846 { 1878 {
1879 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1880 return;
1881
1847#if ISO_14755 1882#if ISO_14755
1848 // 5.4 1883 // 5.4
1849 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1884 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1850 { 1885 {
1851 iso14755_54 (ev.x, ev.y); 1886 iso14755_54 (ev.x, ev.y);
1852 return; 1887 return;
1853 } 1888 }
1854#endif 1889#endif
1855 1890
1856 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1891 clickintime = ev.time - MEvent.time < multiClickTime;
1857 1892
1858 if (reportmode) 1893 if (reportmode)
1859 { 1894 {
1860 /* mouse report from vt window */ 1895 /* mouse report from vt window */
1861 /* save the xbutton state (for ButtonRelease) */ 1896 /* save the xbutton state (for ButtonRelease) */
1862 MEvent.state = ev.state; 1897 MEvent.state = ev.state;
1863#ifdef MOUSE_REPORT_DOUBLECLICK 1898#ifdef MOUSE_REPORT_DOUBLECLICK
1864 if (ev.button == MEvent.button && clickintime) 1899 if (ev.button == MEvent.button && clickintime)
1865 { 1900 {
1866 /* same button, within alloted time */ 1901 /* same button, within allowed time */
1867 MEvent.clicks++; 1902 MEvent.clicks++;
1868 1903
1869 if (MEvent.clicks > 1) 1904 if (MEvent.clicks > 1)
1870 { 1905 {
1871 /* only report double clicks */ 1906 /* only report double clicks */
… …
1885 mouse_report (ev); 1920 mouse_report (ev);
1886 } 1921 }
1887#else 1922#else
1888 MEvent.button = ev.button; 1923 MEvent.button = ev.button;
1889 mouse_report (ev); 1924 mouse_report (ev);
1890#endif /* MOUSE_REPORT_DOUBLECLICK */ 1925#endif /* MOUSE_REPORT_DOUBLECLICK */
1891 1926
1892 } 1927 }
1893 else 1928 else
1894 { 1929 {
1895 if (ev.button != MEvent.button) 1930 if (ev.button != MEvent.button)
1896 MEvent.clicks = 0; 1931 MEvent.clicks = 0;
1897 1932
1898 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1899 switch (ev.button) 1933 switch (ev.button)
1900 { 1934 {
1901 case Button1: 1935 case Button1:
1902 /* allow meta + click to select rectangular areas */ 1936 /* allow meta + click to select rectangular areas */
1903 /* should be done in screen.C */ 1937 /* should be done in screen.C */
1904#if ENABLE_FRILLS 1938#if ENABLE_FRILLS
1905 selection.rect = !!(ev.state & ModMetaMask); 1939 selection.rect = !!(ev.state & ModMetaMask);
1906#else 1940#else
1907 selection.rect = false; 1941 selection.rect = false;
1908#endif 1942#endif
1909 1943
1910 /* allow shift+left click to extend selection */ 1944 /* allow shift+left click to extend selection */
1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1945 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1912 { 1946 {
1913 if (MEvent.button == Button1 && clickintime) 1947 if (MEvent.button == Button1 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1948 selection_rotate (ev.x, ev.y);
1915 else 1949 else
1916 selection_extend (ev.x, ev.y, 1); 1950 selection_extend (ev.x, ev.y, 1);
1917 } 1951 }
1918 else 1952 else
1919 { 1953 {
1920 if (MEvent.button == Button1 && clickintime) 1954 if (MEvent.button == Button1 && clickintime)
1921 MEvent.clicks++; 1955 MEvent.clicks++;
1922 else 1956 else
1923 MEvent.clicks = 1; 1957 MEvent.clicks = 1;
1924 1958
1925 selection_click (MEvent.clicks, ev.x, ev.y); 1959 selection_click (MEvent.clicks, ev.x, ev.y);
1926 } 1960 }
1927 1961
1928 MEvent.button = Button1; 1962 MEvent.button = Button1;
1929 break; 1963 break;
1930 1964
1931 case Button3: 1965 case Button3:
1932 if (MEvent.button == Button3 && clickintime) 1966 if (MEvent.button == Button3 && clickintime)
1933 selection_rotate (ev.x, ev.y); 1967 selection_rotate (ev.x, ev.y);
1934 else 1968 else
1935 selection_extend (ev.x, ev.y, 1); 1969 selection_extend (ev.x, ev.y, 1);
1936 1970
1937 MEvent.button = Button3; 1971 MEvent.button = Button3;
1938 break; 1972 break;
1939 } 1973 }
1940 } 1974 }
1941 1975
1942 MEvent.time = ev.time; 1976 MEvent.time = ev.time;
1943 return; 1977 return;
1944 } 1978 }
1945 1979
1946 /* 1980 /*
1947 * Scrollbar window processing of button press 1981 * Scrollbar window processing of button press
1948 */ 1982 */
1949 if (isScrollbarWindow (ev.window)) 1983 if (scrollBar.state && ev.window == scrollBar.win)
1950 { 1984 {
1951 scrollBar.setIdle (); 1985 page_dirn direction = NO_DIR;
1986
1987 if (scrollBar.upButton (ev.y))
1988 direction = UP; /* up */
1989 else if (scrollBar.dnButton (ev.y))
1990 direction = DN; /* down */
1991
1992 scrollBar.state = SB_STATE_IDLE;
1952 /* 1993 /*
1953 * Rxvt-style scrollbar: 1994 * Rxvt-style scrollbar:
1954 * move up if mouse is above slider 1995 * move up if mouse is above slider
1955 * move dn if mouse is below slider 1996 * move dn if mouse is below slider
1956 * 1997 *
… …
1965 /* 2006 /*
1966 * Mouse report disabled scrollbar: 2007 * Mouse report disabled scrollbar:
1967 * arrow buttons - send up/down 2008 * arrow buttons - send up/down
1968 * click on scrollbar - send pageup/down 2009 * click on scrollbar - send pageup/down
1969 */ 2010 */
1970 if ((scrollBar.style == R_SB_NEXT 2011 if (direction == UP)
1971 && scrollbarnext_upButton (ev.y))
1972 || (scrollBar.style == R_SB_RXVT
1973 && scrollbarrxvt_upButton (ev.y)))
1974 tt_printf ("\033[A"); 2012 tt_printf ("\033[A");
1975 else if ((scrollBar.style == R_SB_NEXT 2013 else if (direction == DN)
1976 && scrollbarnext_dnButton (ev.y))
1977 || (scrollBar.style == R_SB_RXVT
1978 && scrollbarrxvt_dnButton (ev.y)))
1979 tt_printf ("\033[B"); 2014 tt_printf ("\033[B");
1980 else 2015 else
1981 switch (ev.button) 2016 switch (ev.button)
1982 { 2017 {
1983 case Button2: 2018 case Button2:
… …
1990 tt_printf ("\033[5~"); 2025 tt_printf ("\033[5~");
1991 break; 2026 break;
1992 } 2027 }
1993 } 2028 }
1994 else 2029 else
1995#endif /* NO_SCROLLBAR_REPORT */ 2030#endif /* NO_SCROLLBAR_REPORT */
1996
1997 {
1998 char upordown = 0;
1999
2000 if (scrollBar.style == R_SB_NEXT)
2001 { 2031 {
2002 if (scrollbarnext_upButton (ev.y)) 2032 if (direction != NO_DIR)
2003 upordown = -1; /* up */
2004 else if (scrollbarnext_dnButton (ev.y))
2005 upordown = 1; /* down */
2006 }
2007 else if (scrollBar.style == R_SB_RXVT)
2008 {
2009 if (scrollbarrxvt_upButton (ev.y))
2010 upordown = -1; /* up */
2011 else if (scrollbarrxvt_dnButton (ev.y))
2012 upordown = 1; /* down */
2013 }
2014 if (upordown)
2015 { 2033 {
2016#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2034#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2035 if (!cont_scroll_ev.is_active ())
2017 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2036 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2018#endif 2037#endif
2019 if (scr_page (upordown < 0 ? UP : DN, 1)) 2038 if (scr_page (direction, 1))
2020 { 2039 {
2021 if (upordown < 0) 2040 if (direction == UP)
2022 scrollBar.setUp (); 2041 scrollBar.state = SB_STATE_UP;
2023 else 2042 else
2024 scrollBar.setDn (); 2043 scrollBar.state = SB_STATE_DOWN;
2025 } 2044 }
2026 } 2045 }
2027 else 2046 else
2028 switch (ev.button) 2047 switch (ev.button)
2029 { 2048 {
2030 case Button2: 2049 case Button2:
2031 switch (scrollbar_align) 2050 switch (scrollBar.align)
2032 { 2051 {
2033 case R_SB_ALIGN_TOP: 2052 case SB_ALIGN_TOP:
2034 csrO = 0; 2053 csrO = 0;
2035 break; 2054 break;
2036 case R_SB_ALIGN_CENTRE: 2055 case SB_ALIGN_CENTRE:
2037 csrO = (scrollBar.bot - scrollBar.top) / 2; 2056 csrO = (scrollBar.bot - scrollBar.top) / 2;
2038 break; 2057 break;
2039 case R_SB_ALIGN_BOTTOM: 2058 case SB_ALIGN_BOTTOM:
2040 csrO = scrollBar.bot - scrollBar.top; 2059 csrO = scrollBar.bot - scrollBar.top;
2041 break; 2060 break;
2042 } 2061 }
2043 2062
2044 if (scrollBar.style == R_SB_XTERM 2063 if (scrollBar.style == SB_STYLE_XTERM
2045 || scrollbar_above_slider (ev.y) 2064 || scrollBar.above_slider (ev.y)
2046 || scrollbar_below_slider (ev.y)) 2065 || scrollBar.below_slider (ev.y))
2047 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2066 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2048 2067
2049 scrollBar.setMotion (); 2068 scrollBar.state = SB_STATE_MOTION;
2050 break; 2069 break;
2051 2070
2052 case Button1: 2071 case Button1:
2053 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2072 if (scrollBar.align == SB_ALIGN_CENTRE)
2054 csrO = ev.y - scrollBar.top; 2073 csrO = ev.y - scrollBar.top;
2055 /* FALLTHROUGH */ 2074 /* FALLTHROUGH */
2056 2075
2057 case Button3: 2076 case Button3:
2058 if (scrollBar.style != R_SB_XTERM) 2077 if (scrollBar.style != SB_STYLE_XTERM)
2059 { 2078 {
2060 if (scrollbar_above_slider (ev.y)) 2079 if (scrollBar.above_slider (ev.y))
2061# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
2062 scr_page (UP, nrow - 1); 2081 scr_page (UP, nrow - 1);
2063# else 2082# else
2064 scr_page (UP, nrow / 4); 2083 scr_page (UP, nrow / 4);
2065# endif 2084# endif
2066 else if (scrollbar_below_slider (ev.y)) 2085 else if (scrollBar.below_slider (ev.y))
2067# ifdef RXVT_SCROLL_FULL 2086# ifdef RXVT_SCROLL_FULL
2068 scr_page (DN, nrow - 1); 2087 scr_page (DN, nrow - 1);
2069# else 2088# else
2070 scr_page (DN, nrow / 4); 2089 scr_page (DN, nrow / 4);
2071# endif 2090# endif
2072 else 2091 else
2073 scrollBar.setMotion (); 2092 scrollBar.state = SB_STATE_MOTION;
2074 } 2093 }
2075 else 2094 else
2076 { 2095 {
2077 scr_page ((ev.button == Button1 ? DN : UP), 2096 scr_page ((ev.button == Button1 ? DN : UP),
2078 (nrow 2097 (nrow
2079 * scrollbar_position (ev.y) 2098 * scrollBar.position (ev.y)
2080 / scrollbar_size ())); 2099 / scrollBar.size ()));
2081 } 2100 }
2082 2101
2083 break; 2102 break;
2084 } 2103 }
2085 } 2104 }
… …
2095 2114
2096 csrO = 0; /* reset csr Offset */ 2115 csrO = 0; /* reset csr Offset */
2097 if (!bypass_keystate) 2116 if (!bypass_keystate)
2098 reportmode = !! (priv_modes & PrivMode_mouse_report); 2117 reportmode = !! (priv_modes & PrivMode_mouse_report);
2099 2118
2100 if (scrollbar_isUpDn ()) 2119 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2101 { 2120 {
2102 scrollBar.setIdle (); 2121 scrollBar.state = SB_STATE_IDLE;
2103 scrollbar_show (0); 2122 scrollBar.show (0);
2104 } 2123 }
2105 2124
2106#ifdef SELECTION_SCROLLING 2125#ifdef SELECTION_SCROLLING
2107 if (sel_scroll_ev.active)
2108 sel_scroll_ev.stop(); 2126 sel_scroll_ev.stop();
2109#endif 2127#endif
2110 2128
2111 if (ev.window == vt) 2129 if (ev.window == vt)
2112 { 2130 {
2131 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2132 return;
2133
2113#if ISO_14755 2134#if ISO_14755
2114 // 5.4 2135 // 5.4
2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2136 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2116 return; 2137 return;
2117#endif 2138#endif
2139
2118 if (reportmode) 2140 if (reportmode)
2119 { 2141 {
2120 /* mouse report from vt window */ 2142 /* mouse report from vt window */
2121 /* don't report release of wheel "buttons" */ 2143 /* don't report release of wheel "buttons" */
2122 if (ev.button >= 4) 2144 if (ev.button >= 4)
… …
2124#ifdef MOUSE_REPORT_DOUBLECLICK 2146#ifdef MOUSE_REPORT_DOUBLECLICK
2125 /* only report the release of 'slow' single clicks */ 2147 /* only report the release of 'slow' single clicks */
2126 if (MEvent.button != AnyButton 2148 if (MEvent.button != AnyButton
2127 && (ev.button != MEvent.button 2149 && (ev.button != MEvent.button
2128 || (ev.time - MEvent.time 2150 || (ev.time - MEvent.time
2129 > MULTICLICK_TIME / 2))) 2151 > multiClickTime / 2)))
2130 { 2152 {
2131 MEvent.clicks = 0; 2153 MEvent.clicks = 0;
2132 MEvent.button = AnyButton; 2154 MEvent.button = AnyButton;
2133 mouse_report (ev); 2155 mouse_report (ev);
2134 } 2156 }
2135#else /* MOUSE_REPORT_DOUBLECLICK */ 2157#else /* MOUSE_REPORT_DOUBLECLICK */
2136 MEvent.button = AnyButton; 2158 MEvent.button = AnyButton;
2137 mouse_report (ev); 2159 mouse_report (ev);
2138#endif /* MOUSE_REPORT_DOUBLECLICK */ 2160#endif /* MOUSE_REPORT_DOUBLECLICK */
2139 return; 2161 return;
2140 } 2162 }
2141 2163
2142 /* 2164 /*
2143 * dumb hack to compensate for the failure of click-and-drag 2165 * dumb hack to compensate for the failure of click-and-drag
… …
2146 if (priv_modes & PrivMode_mouse_report 2168 if (priv_modes & PrivMode_mouse_report
2147 && bypass_keystate 2169 && bypass_keystate
2148 && ev.button == Button1 && MEvent.clicks <= 1) 2170 && ev.button == Button1 && MEvent.clicks <= 1)
2149 selection_extend (ev.x, ev.y, 0); 2171 selection_extend (ev.x, ev.y, 0);
2150 2172
2151 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152 return;
2153
2154 switch (ev.button) 2173 switch (ev.button)
2155 { 2174 {
2156 case Button1: 2175 case Button1:
2157 case Button3: 2176 case Button3:
2158 selection_make (ev.time); 2177 selection_make (ev.time);
2159 break; 2178 break;
2179
2160 case Button2: 2180 case Button2:
2161 selection_request (ev.time, ev.x, ev.y); 2181 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2182 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2162 break; 2183 break;
2184
2163#ifdef MOUSE_WHEEL 2185#ifdef MOUSE_WHEEL
2164 case Button4: 2186 case Button4:
2165 case Button5: 2187 case Button5:
2166 { 2188 {
2167 int i; 2189 int lines;
2168 page_dirn v; 2190 page_dirn dirn;
2169 2191
2170 v = ev.button == Button4 ? UP : DN; 2192 dirn = ev.button == Button4 ? UP : DN;
2171 2193
2172 if (ev.state & ShiftMask) 2194 if (ev.state & ShiftMask)
2173 i = 1; 2195 lines = 1;
2174 else if (OPTION (Opt_mouseWheelScrollPage)) 2196 else if (option (Opt_mouseWheelScrollPage))
2175 i = nrow - 1; 2197 lines = nrow - 1;
2176 else 2198 else
2177 i = 5; 2199 lines = 5;
2178 2200
2179# ifdef MOUSE_SLIP_WHEELING 2201# ifdef MOUSE_SLIP_WHEELING
2180 if (ev.state & ControlMask) 2202 if (ev.state & ControlMask)
2181 { 2203 {
2182 mouse_slip_wheel_speed += v ? -1 : 1; 2204 mouse_slip_wheel_speed += dirn;
2183 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2205 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2184 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2185 2206
2186 if (slip_wheel_ev.at < NOW) 2207 if (!slip_wheel_ev.is_active ())
2187 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2208 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2188
2189 slip_wheel_ev.start ();
2190 } 2209 }
2191 else 2210 else
2211# endif
2192 { 2212 {
2193# endif
2194 scr_page (v, i); 2213 scr_page (dirn, lines);
2195 scrollbar_show (1); 2214 scrollBar.show (1);
2196# ifdef MOUSE_SLIP_WHEELING
2197 } 2215 }
2198# endif
2199 } 2216 }
2200 break; 2217 break;
2201#endif 2218#endif
2202 } 2219 }
2203 } 2220 }
2204} 2221}
2205 2222
2206#ifdef TRANSPARENT
2207#if TINTING
2208/* taken from aterm-0.4.2 */
2209
2210typedef uint32_t RUINT32T;
2211
2212void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2213{
2214 int sh_r, sh_g, sh_b;
2215 RUINT32T mask_r, mask_g, mask_b;
2216 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2217 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2218 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2219 int i;
2220
2221 Visual *visual = display->visual;
2222
2223 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2224
2225 /* for convenience */
2226 mask_r = visual->red_mask;
2227 mask_g = visual->green_mask;
2228 mask_b = visual->blue_mask;
2229
2230 /* boring lookup table pre-initialization */
2231 switch (srcImage->bits_per_pixel) {
2232 case 15:
2233 if ((mask_r != 0x7c00) ||
2234 (mask_g != 0x03e0) ||
2235 (mask_b != 0x001f))
2236 return;
2237 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2238 lookup_r = lookup;
2239 lookup_g = lookup+32;
2240 lookup_b = lookup+32+32;
2241 sh_r = 10;
2242 sh_g = 5;
2243 sh_b = 0;
2244 break;
2245 case 16:
2246 if ((mask_r != 0xf800) ||
2247 (mask_g != 0x07e0) ||
2248 (mask_b != 0x001f))
2249 return;
2250 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2251 lookup_r = lookup;
2252 lookup_g = lookup+32;
2253 lookup_b = lookup+32+64;
2254 sh_r = 11;
2255 sh_g = 5;
2256 sh_b = 0;
2257 break;
2258 case 24:
2259 if ((mask_r != 0xff0000) ||
2260 (mask_g != 0x00ff00) ||
2261 (mask_b != 0x0000ff))
2262 return;
2263 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2264 lookup_r = lookup;
2265 lookup_g = lookup+256;
2266 lookup_b = lookup+256+256;
2267 sh_r = 16;
2268 sh_g = 8;
2269 sh_b = 0;
2270 break;
2271 case 32:
2272 if ((mask_r != 0xff0000) ||
2273 (mask_g != 0x00ff00) ||
2274 (mask_b != 0x0000ff))
2275 return;
2276 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2277 lookup_r = lookup;
2278 lookup_g = lookup+256;
2279 lookup_b = lookup+256+256;
2280 sh_r = 16;
2281 sh_g = 8;
2282 sh_b = 0;
2283 break;
2284 default:
2285 return; /* we do not support this color depth */
2286 }
2287
2288 /* prepare limits for color transformation (each channel is handled separately) */
2289 if (shade < 0) {
2290 shade = -shade;
2291 if (shade < 0) shade = 0;
2292 if (shade > 100) shade = 100;
2293
2294 lower_lim_r = 65535-rm;
2295 lower_lim_g = 65535-gm;
2296 lower_lim_b = 65535-bm;
2297
2298 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2299 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2300 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2301
2302 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2303 } else {
2304 if (shade < 0) shade = 0;
2305 if (shade > 100) shade = 100;
2306
2307 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2308
2309 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2310 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2311 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2312 }
2313
2314 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2315 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2316 {
2317 unsigned int tmp;
2318
2319 tmp = lower_lim_r;
2320 lower_lim_r = lower_lim_b;
2321 lower_lim_b = tmp;
2322
2323 tmp = upper_lim_r;
2324 upper_lim_r = upper_lim_b;
2325 upper_lim_b = tmp;
2326 }
2327
2328 /* fill our lookup tables */
2329 for (i = 0; i <= mask_r>>sh_r; i++)
2330 {
2331 RUINT32T tmp;
2332 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2333 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2334 lookup_r[i] = (tmp/65535)<<sh_r;
2335 }
2336 for (i = 0; i <= mask_g>>sh_g; i++)
2337 {
2338 RUINT32T tmp;
2339 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2340 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2341 lookup_g[i] = (tmp/65535)<<sh_g;
2342 }
2343 for (i = 0; i <= mask_b>>sh_b; i++)
2344 {
2345 RUINT32T tmp;
2346 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2347 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2348 lookup_b[i] = (tmp/65535)<<sh_b;
2349 }
2350
2351 /* apply table to input image (replacing colors by newly calculated ones) */
2352 switch (srcImage->bits_per_pixel)
2353 {
2354 case 15:
2355 {
2356 unsigned short *p1, *pf, *p, *pl;
2357 p1 = (unsigned short *) srcImage->data;
2358 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2359 while (p1 < pf)
2360 {
2361 p = p1;
2362 pl = p1 + srcImage->width;
2363 for (; p < pl; p++)
2364 {
2365 *p = lookup_r[(*p & 0x7c00)>>10] |
2366 lookup_g[(*p & 0x03e0)>> 5] |
2367 lookup_b[(*p & 0x001f)];
2368 }
2369 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2370 }
2371 break;
2372 }
2373 case 16:
2374 {
2375 unsigned short *p1, *pf, *p, *pl;
2376 p1 = (unsigned short *) srcImage->data;
2377 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2378 while (p1 < pf)
2379 {
2380 p = p1;
2381 pl = p1 + srcImage->width;
2382 for (; p < pl; p++)
2383 {
2384 *p = lookup_r[(*p & 0xf800)>>11] |
2385 lookup_g[(*p & 0x07e0)>> 5] |
2386 lookup_b[(*p & 0x001f)];
2387 }
2388 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2389 }
2390 break;
2391 }
2392 case 24:
2393 {
2394 unsigned char *p1, *pf, *p, *pl;
2395 p1 = (unsigned char *) srcImage->data;
2396 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width * 3;
2401 for (; p < pl; p += 3)
2402 {
2403 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2404 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2405 p[2] = lookup_r[(p[2] & 0x0000ff)];
2406 }
2407 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2408 }
2409 break;
2410 }
2411 case 32:
2412 {
2413 RUINT32T *p1, *pf, *p, *pl;
2414 p1 = (RUINT32T *) srcImage->data;
2415 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2416
2417 while (p1 < pf)
2418 {
2419 p = p1;
2420 pl = p1 + srcImage->width;
2421 for (; p < pl; p++)
2422 {
2423 *p = lookup_r[(*p & 0xff0000)>>16] |
2424 lookup_g[(*p & 0x00ff00)>> 8] |
2425 lookup_b[(*p & 0x0000ff)] |
2426 (*p & ~0xffffff);
2427 }
2428 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2429 }
2430 break;
2431 }
2432 }
2433
2434 free (lookup);
2435}
2436#endif
2437
2438/*
2439 * Check our parents are still who we think they are.
2440 * Do transparency updates if required
2441 */
2442int
2443rxvt_term::check_our_parents ()
2444{
2445 int i, pchanged, aformat, have_pixmap, rootdepth;
2446 unsigned long nitems, bytes_after;
2447 Atom atype;
2448 unsigned char *prop = NULL;
2449 Window root, oldp, *list;
2450 Pixmap rootpixmap = None;
2451 XWindowAttributes wattr, wrootattr;
2452 dDisp;
2453
2454 pchanged = 0;
2455
2456 if (!OPTION (Opt_transparent))
2457 return pchanged; /* Don't try any more */
2458
2459 XGetWindowAttributes (disp, display->root, &wrootattr);
2460 rootdepth = wrootattr.depth;
2461
2462 XGetWindowAttributes (disp, parent[0], &wattr);
2463
2464 if (rootdepth != wattr.depth)
2465 {
2466 if (am_transparent)
2467 {
2468 pchanged = 1;
2469 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2470 am_transparent = am_pixmap_trans = 0;
2471 }
2472
2473 return pchanged; /* Don't try any more */
2474 }
2475
2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2477 XSync (disp, False);
2478
2479 /*
2480 * Make the frame window set by the window manager have
2481 * the root background. Some window managers put multiple nested frame
2482 * windows for each client, so we have to take care about that.
2483 */
2484 i = (xa[XA_XROOTPMAP_ID]
2485 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2487 &nitems, &bytes_after, &prop) == Success);
2488
2489 if (!i || prop == NULL)
2490 i = (xa[XA_ESETROOT_PMAP_ID]
2491 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493 &nitems, &bytes_after, &prop) == Success);
2494
2495 if (!i || prop == NULL
2496#if TINTING
2497 || !rs[Rs_color + Color_tint]
2498#endif
2499 )
2500 have_pixmap = 0;
2501 else
2502 {
2503 have_pixmap = 1;
2504 rootpixmap = *(Pixmap *)prop;
2505 XFree (prop);
2506 }
2507
2508 if (have_pixmap)
2509 {
2510 /*
2511 * Copy display->root pixmap transparency
2512 */
2513 int sx, sy, nx, ny;
2514 unsigned int nw, nh;
2515 Window cr;
2516 XImage *image;
2517 GC gc;
2518 XGCValues gcvalue;
2519
2520 XTranslateCoordinates (disp, parent[0], display->root,
2521 0, 0, &sx, &sy, &cr);
2522 nw = (unsigned int)szHint.width;
2523 nh = (unsigned int)szHint.height;
2524 nx = ny = 0;
2525
2526 if (sx < 0)
2527 {
2528 nw += sx;
2529 nx = -sx;
2530 sx = 0;
2531 }
2532
2533 if (sy < 0)
2534 {
2535 nh += sy;
2536 ny = -sy;
2537 sy = 0;
2538 }
2539
2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2542
2543 XSync (disp, False);
2544 allowedxerror = -1;
2545 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2546
2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2548 /* XXX: may need a delay here? */
2549 allowedxerror = 0;
2550
2551 if (image == NULL)
2552 {
2553 if (am_transparent && am_pixmap_trans)
2554 {
2555 pchanged = 1;
2556 if (pixmap != None)
2557 {
2558 XFreePixmap (disp, pixmap);
2559 pixmap = None;
2560 }
2561 }
2562
2563 am_pixmap_trans = 0;
2564 }
2565 else
2566 {
2567 if (pixmap != None)
2568 XFreePixmap (disp, pixmap);
2569
2570#if TINTING
2571 if (ISSET_PIXCOLOR (Color_tint))
2572 {
2573 unsigned short rm, gm, bm;
2574 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2575
2576 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2577
2578 ShadeXImage (display, image, shade, rm, gm, bm);
2579 }
2580#endif
2581
2582 pixmap = XCreatePixmap (disp, vt,
2583 szHint.width, szHint.height, image->depth);
2584 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2585 XPutImage (disp, pixmap, gc, image, 0, 0,
2586 nx, ny, image->width, image->height);
2587 XFreeGC (disp, gc);
2588 XDestroyImage (image);
2589 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2590 XClearWindow (disp, parent[0]);
2591
2592 if (!am_transparent || !am_pixmap_trans)
2593 pchanged = 1;
2594
2595 am_transparent = am_pixmap_trans = 1;
2596 }
2597 }
2598
2599 if (am_pixmap_trans)
2600 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2601 else
2602 {
2603 unsigned int n;
2604 /*
2605 * InheritPixmap transparency
2606 */
2607 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2608 {
2609 oldp = parent[i];
2610 XQueryTree (disp, parent[i - 1], &root,
2611 &parent[i], &list, &n);
2612 XFree (list);
2613
2614 if (parent[i] == display->root)
2615 {
2616 if (oldp != None)
2617 pchanged = 1;
2618
2619 break;
2620 }
2621
2622 if (oldp != parent[i])
2623 pchanged = 1;
2624 }
2625
2626 n = 0;
2627
2628 if (pchanged)
2629 {
2630 for (; n < (unsigned int)i; n++)
2631 {
2632 XGetWindowAttributes (disp, parent[n], &wattr);
2633 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2634 {
2635 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2636 break;
2637 }
2638 }
2639 }
2640
2641 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2642 {
2643 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2644 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2645 am_transparent = 0;
2646 /* XXX: also turn off Opt_transparent? */
2647 }
2648 else
2649 {
2650#if WAIT_FOR_WM
2651 /* wait (an arbitrary period) for the WM to do its thing
2652 * needed for fvwm2.2.2 (and before?) */
2653 sleep (1);
2654#endif
2655 for (n = 0; n < (unsigned int)i; n++)
2656 {
2657 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2658 XClearWindow (disp, parent[n]);
2659 }
2660
2661 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2662 am_transparent = 1;
2663 }
2664
2665 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2666 parent[i] = None;
2667 }
2668
2669 if (scrollBar.win)
2670 {
2671 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2672 scrollBar.setIdle ();
2673 scrollbar_show (0);
2674 }
2675
2676 if (am_transparent)
2677 {
2678 want_refresh = want_full_refresh = 1;
2679 if (am_pixmap_trans)
2680 flush ();
2681 }
2682
2683 return pchanged;
2684}
2685#endif
2686
2687/*}}} */ 2223/*}}} */
2688 2224
2689bool 2225void ecb_hot
2690rxvt_term::cmd_parse () 2226rxvt_term::cmd_parse ()
2691{ 2227{
2692 bool flag = false;
2693 wchar_t ch = NOCHAR; 2228 wchar_t ch = NOCHAR;
2694 char *seq_begin; // remember start of esc-sequence here 2229 char *seq_begin; // remember start of esc-sequence here
2695 2230
2696 for (;;) 2231 for (;;)
2697 { 2232 {
2698 if (ch == NOCHAR) 2233 if (ecb_unlikely (ch == NOCHAR))
2699 { 2234 {
2700 seq_begin = cmdbuf_ptr; 2235 seq_begin = cmdbuf_ptr;
2701 ch = next_char (); 2236 ch = next_char ();
2702 2237
2703 if (ch == NOCHAR) 2238 if (ch == NOCHAR)
2704 break; 2239 break;
2705 } 2240 }
2706 2241
2707 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2242 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2708 { 2243 {
2709 if (!seen_input) 2244 if (ecb_unlikely (!seen_input))
2710 { 2245 {
2711 seen_input = 1; 2246 seen_input = 1;
2712 // many badly-written programs (e.g. jed) contain a race condition: 2247 // many badly-written programs (e.g. jed) contain a race condition:
2713 // they first read the screensize and then install a SIGWINCH handler. 2248 // they first read the screensize and then install a SIGWINCH handler.
2714 // some window managers resize the window early, and these programs 2249 // some window managers resize the window early, and these programs
… …
2727 wchar_t *str = buf; 2262 wchar_t *str = buf;
2728 wchar_t *eol = str + min (ncol, UBUFSIZ); 2263 wchar_t *eol = str + min (ncol, UBUFSIZ);
2729 2264
2730 for (;;) 2265 for (;;)
2731 { 2266 {
2732 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2267 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2733 break; 2268 break;
2734 2269
2735 *str++ = ch; 2270 *str++ = ch;
2736 2271
2737 if (ch == C0_LF || str >= eol) 2272 if (ecb_unlikely (ch == C0_LF || str >= eol))
2738 { 2273 {
2739 if (ch == C0_LF) 2274 if (ch == C0_LF)
2740 nlines++; 2275 nlines++;
2741 2276
2742 refresh_count++; 2277 refresh_count++;
2743 2278
2744 if (!OPTION (Opt_jumpScroll) 2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2745 || (refresh_count >= refresh_limit * (nrow - 1)))
2746 { 2280 {
2747 refreshnow = true;
2748 refresh_count = 0; 2281 refresh_count = 0;
2282
2283 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2284 {
2285 refreshnow = true;
2749 ch = NOCHAR; 2286 ch = NOCHAR;
2750 break; 2287 break;
2288 }
2751 } 2289 }
2752 2290
2753 // scr_add_lines only works for nlines <= nrow - 1. 2291 // scr_add_lines only works for nlines <= nrow - 1.
2754 if (nlines >= nrow - 1) 2292 if (nlines >= nrow - 1)
2755 { 2293 {
… …
2783 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2321 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2784 scr_add_lines (buf, str - buf, nlines); 2322 scr_add_lines (buf, str - buf, nlines);
2785 2323
2786 /* 2324 /*
2787 * If there have been a lot of new lines, then update the screen 2325 * If there have been a lot of new lines, then update the screen
2788 * What the heck I'll cheat and only refresh less than every page-full. 2326 * What the heck we'll cheat and only refresh less than every page-full.
2789 * the number of pages between refreshes is refresh_limit, which 2327 * if skipScroll is enabled.
2790 * is incremented here because we must be doing flat-out scrolling.
2791 */ 2328 */
2792 if (refreshnow) 2329 if (refreshnow)
2793 { 2330 {
2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2795 refresh_limit++;
2796 else
2797 {
2798 flag = true;
2799 scr_refresh (); 2331 scr_refresh ();
2800 want_refresh = 1; 2332 want_refresh = 1;
2801 }
2802 } 2333 }
2803
2804 } 2334 }
2805 else 2335 else
2806 { 2336 {
2807 try 2337 try
2808 { 2338 {
… …
2816 } 2346 }
2817 2347
2818 ch = NOCHAR; 2348 ch = NOCHAR;
2819 } 2349 }
2820 } 2350 }
2821
2822 return flag;
2823} 2351}
2824 2352
2825// read the next character 2353// read the next character
2826wchar_t 2354wchar_t ecb_hot
2827rxvt_term::next_char () 2355rxvt_term::next_char () NOTHROW
2828{ 2356{
2829 while (cmdbuf_ptr < cmdbuf_endp) 2357 while (cmdbuf_ptr < cmdbuf_endp)
2830 { 2358 {
2831 // assume 7-bit to be ascii ALWAYS 2359 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2832 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2360 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2833 return *cmdbuf_ptr++; 2361 return *cmdbuf_ptr++;
2834 2362
2835 wchar_t wc; 2363 wchar_t wc;
2836 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2364 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2837 2365
… …
2841 cmdbuf_ptr = cmdbuf_endp; 2369 cmdbuf_ptr = cmdbuf_endp;
2842 break; 2370 break;
2843 } 2371 }
2844 2372
2845 if (len == (size_t)-1) 2373 if (len == (size_t)-1)
2374 {
2375 mbstate.reset (); // reset now undefined conversion state
2376 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2377 // in which case we "erroneously" return the next byte which might be valid.
2846 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2378 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2379 }
2847 2380
2848 // assume wchar == unicode 2381 // assume wchar == unicode
2849 cmdbuf_ptr += len; 2382 cmdbuf_ptr += len;
2850 return wc & UNICODE_MASK; 2383 return wc & UNICODE_MASK;
2851 } 2384 }
2852 2385
2853 return NOCHAR; 2386 return NOCHAR;
2854} 2387}
2855 2388
2856// read the next octet 2389// read the next octet
2857uint32_t 2390uint32_t ecb_hot
2858rxvt_term::next_octet () 2391rxvt_term::next_octet () NOTHROW
2859{ 2392{
2860 return cmdbuf_ptr < cmdbuf_endp 2393 return cmdbuf_ptr < cmdbuf_endp
2861 ? (unsigned char)*cmdbuf_ptr++ 2394 ? (unsigned char)*cmdbuf_ptr++
2862 : NOCHAR; 2395 : NOCHAR;
2863} 2396}
2864 2397
2865/* rxvt_cmd_getc () - Return next input character */ 2398static class out_of_input out_of_input;
2866/* 2399
2867 * Return the next input character after first passing any keyboard input 2400wchar_t ecb_hot
2868 * to the command. 2401rxvt_term::cmd_getc () THROW ((class out_of_input))
2869 */
2870wchar_t
2871rxvt_term::cmd_getc ()
2872{ 2402{
2873 wchar_t c = next_char (); 2403 wchar_t c = next_char ();
2874 2404
2875 if (c == NOCHAR) 2405 if (c == NOCHAR)
2876 throw out_of_input; 2406 throw out_of_input;
2877 2407
2878 return c; 2408 return c;
2879} 2409}
2880 2410
2881uint32_t 2411uint32_t ecb_hot
2882rxvt_term::cmd_get8 () 2412rxvt_term::cmd_get8 () THROW ((class out_of_input))
2883{ 2413{
2884 uint32_t c = next_octet (); 2414 uint32_t c = next_octet ();
2885 2415
2886 if (c == NOCHAR) 2416 if (c == NOCHAR)
2887 throw out_of_input; 2417 throw out_of_input;
… …
2890} 2420}
2891 2421
2892/*{{{ print pipe */ 2422/*{{{ print pipe */
2893/*----------------------------------------------------------------------*/ 2423/*----------------------------------------------------------------------*/
2894#ifdef PRINTPIPE 2424#ifdef PRINTPIPE
2895FILE * 2425FILE * ecb_cold
2896rxvt_term::popen_printer () 2426rxvt_term::popen_printer ()
2897{ 2427{
2898 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2428 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2899 2429
2900 if (stream == NULL) 2430 if (stream == NULL)
2901 rxvt_warn ("can't open printer pipe, not printing.\n"); 2431 rxvt_warn ("can't open printer pipe, not printing.\n");
2902 2432
2903 return stream; 2433 return stream;
2904} 2434}
2905 2435
2906int 2436int ecb_cold
2907rxvt_term::pclose_printer (FILE *stream) 2437rxvt_term::pclose_printer (FILE *stream)
2908{ 2438{
2909 fflush (stream); 2439 fflush (stream);
2910 return pclose (stream); 2440 return pclose (stream);
2911} 2441}
2912 2442
2913/* 2443/*
2914 * simulate attached vt100 printer 2444 * simulate attached vt100 printer
2915 */ 2445 */
2916void 2446void ecb_cold
2917rxvt_term::process_print_pipe () 2447rxvt_term::process_print_pipe ()
2918{ 2448{
2919 int done; 2449 FILE *fd = popen_printer ();
2920 FILE *fd;
2921 2450
2922 if ((fd = popen_printer ()) == NULL) 2451 if (!fd)
2923 return; 2452 return;
2924 2453
2925 /* 2454 /*
2926 * Send all input to the printer until either ESC[4i or ESC[?4i 2455 * Send all input to the printer until either ESC[4i or ESC[?4i
2927 * is received. 2456 * is received.
2928 */ 2457 */
2929 for (done = 0; !done;) 2458 for (int done = 0; !done; )
2930 { 2459 {
2931 unsigned char buf[8]; 2460 unsigned char buf[8];
2932 unicode_t ch; 2461 unicode_t ch;
2933 unsigned int i, len; 2462 unsigned int i, len;
2934 2463
… …
2953 { 2482 {
2954 if ((buf[len++] = cmd_getc ()) == 'i') 2483 if ((buf[len++] = cmd_getc ()) == 'i')
2955 break; /* done = 1 */ 2484 break; /* done = 1 */
2956 } 2485 }
2957 } 2486 }
2958 2487
2959 for (i = 0; i < len; i++) 2488 for (i = 0; i < len; i++)
2960 if (putc (buf[i], fd) == EOF) 2489 if (putc (buf[i], fd) == EOF)
2961 { 2490 {
2962 done = 1; 2491 done = 1;
2963 break; 2492 break;
… …
2965 } 2494 }
2966 } 2495 }
2967 2496
2968 pclose_printer (fd); 2497 pclose_printer (fd);
2969} 2498}
2970#endif /* PRINTPIPE */ 2499#endif /* PRINTPIPE */
2971/*}}} */ 2500/*}}} */
2972 2501
2973/* *INDENT-OFF* */
2974enum { 2502enum {
2975 C1_40 = 0x40, 2503 C1_40 = 0x40,
2976 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2504 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2977 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2505 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2978 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2506 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2979 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2507 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2980}; 2508};
2981/* *INDENT-ON* */
2982 2509
2983/*{{{ process non-printing single characters */ 2510/*{{{ process non-printing single characters */
2984void 2511void ecb_hot
2985rxvt_term::process_nonprinting (unicode_t ch) 2512rxvt_term::process_nonprinting (unicode_t ch)
2986{ 2513{
2987 switch (ch) 2514 switch (ch)
2988 { 2515 {
2989 case C0_ESC: 2516 case C0_ESC:
… …
3019 scr_charset_choose (0); 2546 scr_charset_choose (0);
3020 break; 2547 break;
3021 2548
3022#ifdef EIGHT_BIT_CONTROLS 2549#ifdef EIGHT_BIT_CONTROLS
3023 // 8-bit controls 2550 // 8-bit controls
3024 case 0x90: /* DCS */ 2551 case 0x90: /* DCS */
3025 process_dcs_seq (); 2552 process_dcs_seq ();
3026 break; 2553 break;
3027 case 0x9b: /* CSI */ 2554 case 0x9b: /* CSI */
3028 process_csi_seq (); 2555 process_csi_seq ();
3029 break; 2556 break;
3030 case 0x9d: /* CSI */ 2557 case 0x9d: /* OSC */
3031 process_osc_seq (); 2558 process_osc_seq ();
3032 break; 2559 break;
3033#endif 2560#endif
3034 } 2561 }
3035} 2562}
3036/*}}} */ 2563/*}}} */
3037 2564
3038 2565
3039/*{{{ process VT52 escape sequences */ 2566/*{{{ process VT52 escape sequences */
3040void 2567void ecb_cold
3041rxvt_term::process_escape_vt52 (unicode_t ch) 2568rxvt_term::process_escape_vt52 (unicode_t ch)
3042{ 2569{
3043 int row, col; 2570 int row, col;
3044 2571
3045 switch (ch) 2572 switch (ch)
… …
3079 break; 2606 break;
3080 case 'Z': /* identify the terminal type */ 2607 case 'Z': /* identify the terminal type */
3081 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2608 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3082 break; 2609 break;
3083 case '<': /* turn off VT52 mode */ 2610 case '<': /* turn off VT52 mode */
3084 PrivMode (0, PrivMode_vt52); 2611 priv_modes &= ~PrivMode_vt52;
3085 break; 2612 break;
3086 case 'F': /* use special graphics character set */ 2613 case 'F': /* use special graphics character set */
3087 case 'G': /* use regular character set */ 2614 case 'G': /* use regular character set */
3088 /* unimplemented */ 2615 /* unimplemented */
3089 break; 2616 break;
… …
3095} 2622}
3096/*}}} */ 2623/*}}} */
3097 2624
3098 2625
3099/*{{{ process escape sequences */ 2626/*{{{ process escape sequences */
3100void 2627void ecb_hot
3101rxvt_term::process_escape_seq () 2628rxvt_term::process_escape_seq ()
3102{ 2629{
3103 unicode_t ch = cmd_getc (); 2630 unicode_t ch = cmd_getc ();
3104 2631
3105 if (priv_modes & PrivMode_vt52) 2632 if (priv_modes & PrivMode_vt52)
… …
3108 return; 2635 return;
3109 } 2636 }
3110 2637
3111 switch (ch) 2638 switch (ch)
3112 { 2639 {
3113 /* case 1: do_tek_mode (); break; */
3114 case '#': 2640 case '#':
3115 if (cmd_getc () == '8') 2641 if (cmd_getc () == '8')
3116 scr_E (); 2642 scr_E ();
3117 break; 2643 break;
3118 case '(': 2644 case '(':
… …
3125 scr_charset_set (2, (unsigned int)cmd_getc ()); 2651 scr_charset_set (2, (unsigned int)cmd_getc ());
3126 break; 2652 break;
3127 case '+': 2653 case '+':
3128 scr_charset_set (3, (unsigned int)cmd_getc ()); 2654 scr_charset_set (3, (unsigned int)cmd_getc ());
3129 break; 2655 break;
3130#if ENABLE_FRILLS 2656#if !ENABLE_MINIMAL
3131 case '6': 2657 case '6':
3132 scr_backindex (); 2658 scr_backindex ();
3133 break; 2659 break;
3134#endif 2660#endif
3135 case '7': 2661 case '7':
3136 scr_cursor (SAVE); 2662 scr_cursor (SAVE);
3137 break; 2663 break;
3138 case '8': 2664 case '8':
3139 scr_cursor (RESTORE); 2665 scr_cursor (RESTORE);
3140 break; 2666 break;
3141#if ENABLE_FRILLS 2667#if !ENABLE_MINIMAL
3142 case '9': 2668 case '9':
3143 scr_forwardindex (); 2669 scr_forwardindex ();
3144 break; 2670 break;
3145#endif 2671#endif
2672 // DECPAM/DECPNM
3146 case '=': 2673 case '=':
2674 priv_modes |= PrivMode_aplKP;
2675 break;
3147 case '>': 2676 case '>':
3148 PrivMode ((ch == '='), PrivMode_aplKP); 2677 priv_modes &= ~PrivMode_aplKP;
3149 break; 2678 break;
3150 2679
3151 case C1_40: 2680 case C1_40:
3152 cmd_getc (); 2681 cmd_getc ();
3153 break; 2682 break;
… …
3157 2686
3158 /* 8.3.87: NEXT LINE */ 2687 /* 8.3.87: NEXT LINE */
3159 case C1_NEL: /* ESC E */ 2688 case C1_NEL: /* ESC E */
3160 { 2689 {
3161 wchar_t nlcr[] = { C0_LF, C0_CR }; 2690 wchar_t nlcr[] = { C0_LF, C0_CR };
3162 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2691 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
3163 } 2692 }
3164 break; 2693 break;
3165 2694
2695#if 0 // disabled because embedded newlines can make exploits easier
3166 /* kidnapped escape sequence: Should be 8.3.48 */ 2696 /* kidnapped escape sequence: Should be 8.3.48 */
3167 case C1_ESA: /* ESC G */ 2697 case C1_ESA: /* ESC G */
3168 process_graphics (); 2698 // used by original rxvt for rob nations own graphics mode
2699 if (cmd_getc () == 'Q' && option (Opt_insecure))
2700 tt_printf ("\033G0\012"); /* query graphics - no graphics */
3169 break; 2701 break;
2702#endif
3170 2703
3171 /* 8.3.63: CHARACTER TABULATION SET */ 2704 /* 8.3.63: CHARACTER TABULATION SET */
3172 case C1_HTS: /* ESC H */ 2705 case C1_HTS: /* ESC H */
3173 scr_set_tab (1); 2706 scr_set_tab (1);
3174 break; 2707 break;
… …
3177 case C1_RI: /* ESC M */ 2710 case C1_RI: /* ESC M */
3178 scr_index (DN); 2711 scr_index (DN);
3179 break; 2712 break;
3180 2713
3181 /* 8.3.142: SINGLE-SHIFT TWO */ 2714 /* 8.3.142: SINGLE-SHIFT TWO */
3182 /*case C1_SS2: scr_single_shift (2); break; */ 2715 /* case C1_SS2: break; */
3183 2716
3184 /* 8.3.143: SINGLE-SHIFT THREE */ 2717 /* 8.3.143: SINGLE-SHIFT THREE */
3185 /*case C1_SS3: scr_single_shift (3); break; */ 2718 /* case C1_SS3: break; */
3186 2719
3187 /* 8.3.27: DEVICE CONTROL STRING */ 2720 /* 8.3.27: DEVICE CONTROL STRING */
3188 case C1_DCS: /* ESC P */ 2721 case C1_DCS: /* ESC P */
3189 process_dcs_seq (); 2722 process_dcs_seq ();
3190 break; 2723 break;
… …
3192 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2725 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3193 case C1_SCI: /* ESC Z */ 2726 case C1_SCI: /* ESC Z */
3194 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2727 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3195 break; /* steal obsolete ESC [ c */ 2728 break; /* steal obsolete ESC [ c */
3196 2729
3197 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2730 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
3198 case C1_CSI: /* ESC [ */ 2731 case C1_CSI: /* ESC [ */
3199 process_csi_seq (); 2732 process_csi_seq ();
3200 break; 2733 break;
3201 2734
3202 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2735 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
3203 case C1_OSC: /* ESC ] */ 2736 case C1_OSC: /* ESC ] */
3204 process_osc_seq (); 2737 process_osc_seq ();
3205 break; 2738 break;
3206 2739
3207 /* 8.3.106: RESET TO INITIAL STATE */ 2740 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
3208 case 'c': 2741 case 'c':
3209 mbstate.reset (); 2742 mbstate.reset ();
3210 scr_poweron (); 2743 scr_poweron ();
3211 scrollbar_show (1); 2744 scrollBar.show (1);
3212 break; 2745 break;
3213 2746
3214 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2747 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3215 case 'n': 2748 case 'n':
3216 scr_charset_choose (2); 2749 scr_charset_choose (2);
… …
3223 } 2756 }
3224} 2757}
3225/*}}} */ 2758/*}}} */
3226 2759
3227/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2760/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
3228/* *INDENT-OFF* */
3229enum { 2761enum {
3230 CSI_ICH = 0x40, 2762 CSI_ICH = 0x40,
3231 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2763 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
3232 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2764 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
3233 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2765 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
3236 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2768 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
3237 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2769 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
3238 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2770 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
3239}; 2771};
3240 2772
3241#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2773#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
3242 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2774 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
3243 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2775 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
3244#define get_byte_array_bit(array, bit) \ 2776#define get_byte_array_bit(array, bit) \
3245 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2777 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
3246 2778
3247const unsigned char csi_defaults[] = 2779static const unsigned char csi_defaults[] =
3248 { 2780 {
3249 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2781 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
3250 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2782 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
3251 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2783 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
3252 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2784 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
3253 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2785 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
3254 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2786 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
3255 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2787 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
3256 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2788 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
3257 }; 2789 };
3258/* *INDENT-ON* */
3259 2790
3260void 2791void ecb_hot
3261rxvt_term::process_csi_seq () 2792rxvt_term::process_csi_seq ()
3262{ 2793{
3263 unicode_t ch, priv, i; 2794 unicode_t ch, priv, prev_ch, i;
3264 unsigned int nargs, p; 2795 unsigned int nargs, p;
3265 int n, ndef; 2796 int n, ndef;
3266 int arg[ESC_ARGS]; 2797 int arg[ESC_ARGS] = { };
3267 2798
3268 for (nargs = ESC_ARGS; nargs > 0;) 2799 nargs = 0;
3269 arg[--nargs] = 0;
3270 2800
3271 priv = 0; 2801 priv = 0;
3272 ch = cmd_getc (); 2802 ch = cmd_getc ();
3273 if (ch >= '<' && ch <= '?') 2803 if ((ch >= '<' && ch <= '?') || ch == '!')
2804 {
3274 { /* '<' '=' '>' '?' */ 2805 /* '<' '=' '>' '?' '!' */
3275 priv = ch; 2806 priv = ch;
3276 ch = cmd_getc (); 2807 ch = cmd_getc ();
3277 } 2808 }
3278 2809
2810 prev_ch = 0;
3279 /* read any numerical arguments */ 2811 /* read any numerical arguments */
3280 for (n = -1; ch < CSI_ICH; ) 2812 for (n = -1; ch < CSI_ICH; )
3281 { 2813 {
3282 if (isdigit (ch)) 2814 if (isdigit (ch))
3283 { 2815 {
… …
3293 n = -1; 2825 n = -1;
3294 } 2826 }
3295 else if (IS_CONTROL (ch)) 2827 else if (IS_CONTROL (ch))
3296 process_nonprinting (ch); 2828 process_nonprinting (ch);
3297 2829
2830 prev_ch = ch;
3298 ch = cmd_getc (); 2831 ch = cmd_getc ();
3299 } 2832 }
3300 2833
3301 if (ch > CSI_7F) 2834 if (ch > CSI_7F)
3302 return; 2835 return;
… …
3308 ndef = get_byte_array_bit (csi_defaults, i); 2841 ndef = get_byte_array_bit (csi_defaults, i);
3309 for (p = 0; p < nargs; p++) 2842 for (p = 0; p < nargs; p++)
3310 if (arg[p] == -1) 2843 if (arg[p] == -1)
3311 arg[p] = ndef; 2844 arg[p] = ndef;
3312 2845
3313#ifdef DEBUG_CMD
3314 fprintf (stderr, "CSI ");
3315 for (p = 0; p < nargs; p++)
3316 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3317 fprintf (stderr, "%c\n", ch);
3318#endif
3319
3320 /* 2846 /*
3321 * private mode handling 2847 * private mode handling
3322 */ 2848 */
3323 if (priv) 2849 if (priv)
3324 { 2850 {
3325 switch (priv) 2851 switch (priv)
3326 { 2852 {
3327 case '>': 2853 case '>':
3328 if (ch == CSI_DA) /* secondary device attributes */ 2854 if (ch == CSI_DA) /* secondary device attributes */
3329 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2855 {
2856 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2857 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2858 //
2859 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2860 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2861 // versions.
2862 //
2863 tt_printf ("\033[>%d;95;0c", 'U');
2864 }
3330 break; 2865 break;
2866
3331 case '?': 2867 case '?':
3332 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2868 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3333 process_terminal_mode (ch, priv, nargs, arg); 2869 process_terminal_mode (ch, priv, nargs, arg);
3334 break; 2870 break;
2871
2872 case '!':
2873 if (ch == CSI_70)
2874 {
2875 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2876 scr_soft_reset ();
2877
2878 static const int pm_h[] = { 7, 25 };
2879 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2880
2881 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2882 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
3335 } 2883 }
2884 break;
2885 }
2886
3336 return; 2887 return;
3337 } 2888 }
3338 2889
3339 switch (ch) 2890 switch (ch)
3340 { 2891 {
… …
3354 } 2905 }
3355 break; 2906 break;
3356#endif 2907#endif
3357 2908
3358 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2909 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
3359 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2910 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
3360 arg[0] = -arg[0]; 2911 arg[0] = -arg[0];
3361 /* FALLTHROUGH */ 2912 /* FALLTHROUGH */
3362 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2913 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
3363 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2914 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
3364 scr_gotorc (arg[0], 0, RELATIVE); 2915 scr_gotorc (arg[0], 0, RELATIVE);
3365 break; 2916 break;
3366 2917
3367 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2918 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
3368 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2919 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
3369#ifdef ISO6429 2920#ifdef ISO6429
3370 arg[0] = -arg[0]; 2921 arg[0] = -arg[0];
3371#else /* emulate common DEC VTs */ 2922#else /* emulate common DEC VTs */
3372 arg[0] = arg[0] ? -arg[0] : -1; 2923 arg[0] = arg[0] ? -arg[0] : -1;
3373#endif 2924#endif
… …
3460 break; 3011 break;
3461 case 6: /* CPR requested */ 3012 case 6: /* CPR requested */
3462 scr_report_position (); 3013 scr_report_position ();
3463 break; 3014 break;
3464 case 7: /* unofficial extension */ 3015 case 7: /* unofficial extension */
3465 if (OPTION (Opt_insecure)) 3016 if (option (Opt_insecure))
3466 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3017 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3467 break; 3018 break;
3468 case 8: /* unofficial extension */ 3019 case 8: /* unofficial extension */
3469 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3020 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3470 break; 3021 break;
… …
3518 scr_insert_mode (1); 3069 scr_insert_mode (1);
3519 else if (arg[0] == 20) 3070 else if (arg[0] == 20)
3520 priv_modes |= PrivMode_LFNL; 3071 priv_modes |= PrivMode_LFNL;
3521 break; 3072 break;
3522 3073
3074 case CSI_71: // DECSCUSR: set cursor style
3075 if (prev_ch == ' ')
3076 set_cursor_style (arg[0]);
3077 break;
3078
3523 /* 3079 /*
3524 * PRIVATE USE beyond this point. All CSI_7? sequences here 3080 * PRIVATE USE beyond this point. All CSI_7? sequences here
3525 */ 3081 */
3526 case CSI_72: /* DECSTBM: set top and bottom margins */ 3082 case CSI_72: /* DECSTBM: set top and bottom margins */
3527 if (nargs == 1) 3083 if (nargs == 1)
… …
3537 break; 3093 break;
3538 case CSI_75: 3094 case CSI_75:
3539 scr_cursor (RESTORE); 3095 scr_cursor (RESTORE);
3540 break; 3096 break;
3541 3097
3542#if ENABLE_FRILLS 3098#if !ENABLE_MINIMAL
3543 case CSI_74: 3099 case CSI_74:
3544 process_window_ops (arg, nargs); 3100 process_window_ops (arg, nargs);
3545 break; 3101 break;
3546#endif 3102#endif
3547 3103
… …
3554 break; 3110 break;
3555 } 3111 }
3556} 3112}
3557/*}}} */ 3113/*}}} */
3558 3114
3559#if ENABLE_FRILLS 3115#if !ENABLE_MINIMAL
3560/* ARGSUSED */
3561void 3116void
3562rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3117rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3563{ 3118{
3564 int x, y; 3119 int x, y;
3565 XWindowAttributes wattr; 3120 XWindowAttributes wattr;
3566 Window wdummy; 3121 Window wdummy;
3567 dDisp; 3122
3123 dLocal (Display *, dpy);
3568 3124
3569 if (nargs == 0) 3125 if (nargs == 0)
3570 return; 3126 return;
3571 3127
3572 switch (args[0]) 3128 switch (args[0])
3573 { 3129 {
3574 /* 3130 /*
3575 * commands 3131 * commands
3576 */ 3132 */
3577 case 1: /* deiconify window */ 3133 case 1: /* deiconify window */
3578 XMapWindow (disp, parent[0]); 3134 XMapWindow (dpy, parent);
3579 break; 3135 break;
3580 case 2: /* iconify window */ 3136 case 2: /* iconify window */
3581 XIconifyWindow (disp, parent[0], display->screen); 3137 XIconifyWindow (dpy, parent, display->screen);
3582 break; 3138 break;
3583 case 3: /* set position (pixels) */ 3139 case 3: /* set position (pixels) */
3584 XMoveWindow (disp, parent[0], args[1], args[2]); 3140 XMoveWindow (dpy, parent, args[1], args[2]);
3585 break; 3141 break;
3586 case 4: /* set size (pixels) */ 3142 case 4: /* set size (pixels) */
3587 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3143 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3588 break; 3144 break;
3589 case 5: /* raise window */ 3145 case 5: /* raise window */
3590 XRaiseWindow (disp, parent[0]); 3146 XRaiseWindow (dpy, parent);
3591 break; 3147 break;
3592 case 6: /* lower window */ 3148 case 6: /* lower window */
3593 XLowerWindow (disp, parent[0]); 3149 XLowerWindow (dpy, parent);
3594 break; 3150 break;
3595 case 7: /* refresh window */ 3151 case 7: /* refresh window */
3596 scr_touch (true); 3152 scr_touch (true);
3597 break; 3153 break;
3598 case 8: /* set size (chars) */ 3154 case 8: /* set size (chars) */
… …
3601 break; 3157 break;
3602 3158
3603 //case 9: NYI, TODO, restore maximized window or maximize window 3159 //case 9: NYI, TODO, restore maximized window or maximize window
3604 default: 3160 default:
3605 if (args[0] >= 24) /* set height (chars) */ 3161 if (args[0] >= 24) /* set height (chars) */
3606 set_widthheight ((unsigned int)width, 3162 set_widthheight ((unsigned int)vt_width,
3607 (unsigned int) (args[1] * fheight)); 3163 (unsigned int) (args[1] * fheight));
3608 break; 3164 break;
3609
3610 3165
3611 /* 3166 /*
3612 * reports - some output format copied from XTerm 3167 * reports - some output format copied from XTerm
3613 */ 3168 */
3614 case 11: /* report window state */ 3169 case 11: /* report window state */
3615 XGetWindowAttributes (disp, parent[0], &wattr); 3170 XGetWindowAttributes (dpy, parent, &wattr);
3616 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3171 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3617 break; 3172 break;
3618 case 13: /* report window position */ 3173 case 13: /* report window position */
3619 XGetWindowAttributes (disp, parent[0], &wattr); 3174 XGetWindowAttributes (dpy, parent, &wattr);
3620 XTranslateCoordinates (disp, parent[0], wattr.root, 3175 XTranslateCoordinates (dpy, parent, wattr.root,
3621 -wattr.border_width, -wattr.border_width, 3176 -wattr.border_width, -wattr.border_width,
3622 &x, &y, &wdummy); 3177 &x, &y, &wdummy);
3623 tt_printf ("\033[3;%d;%dt", x, y); 3178 tt_printf ("\033[3;%d;%dt", x, y);
3624 break; 3179 break;
3625 case 14: /* report window size (pixels) */ 3180 case 14: /* report window size (pixels) */
3626 XGetWindowAttributes (disp, parent[0], &wattr); 3181 XGetWindowAttributes (dpy, parent, &wattr);
3627 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3182 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3628 break; 3183 break;
3629 case 18: /* report text area size (chars) */ 3184 case 18: /* report text area size (chars) */
3630 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3185 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3631 break; 3186 break;
… …
3633 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3188 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3634 break; 3189 break;
3635 case 20: /* report icon label */ 3190 case 20: /* report icon label */
3636 { 3191 {
3637 char *s; 3192 char *s;
3638 XGetIconName (disp, parent[0], &s); 3193 XGetIconName (dpy, parent, &s);
3639 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3194 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3640 XFree (s); 3195 XFree (s);
3641 } 3196 }
3642 break; 3197 break;
3643 case 21: /* report window title */ 3198 case 21: /* report window title */
3644 { 3199 {
3645 char *s; 3200 char *s;
3646 XFetchName (disp, parent[0], &s); 3201 XFetchName (dpy, parent, &s);
3647 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3202 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3648 XFree (s); 3203 XFree (s);
3649 } 3204 }
3650 break; 3205 break;
3651 } 3206 }
3652} 3207}
… …
3661rxvt_term::get_to_st (unicode_t &ends_how) 3216rxvt_term::get_to_st (unicode_t &ends_how)
3662{ 3217{
3663 unicode_t ch; 3218 unicode_t ch;
3664 bool seen_esc = false; 3219 bool seen_esc = false;
3665 unsigned int n = 0; 3220 unsigned int n = 0;
3666 wchar_t string[STRING_MAX]; 3221 wchar_t string[CBUFSIZ];
3667 3222
3668 while ((ch = cmd_getc ()) != NOCHAR) 3223 while ((ch = cmd_getc ()) != NOCHAR)
3669 { 3224 {
3670 if (seen_esc) 3225 if (seen_esc)
3671 { 3226 {
… …
3679 seen_esc = true; 3234 seen_esc = true;
3680 continue; 3235 continue;
3681 } 3236 }
3682 else if (ch == C0_BEL || ch == CHAR_ST) 3237 else if (ch == C0_BEL || ch == CHAR_ST)
3683 break; 3238 break;
3239 else if (ch == C0_SYN)
3240 ch = cmd_get8 ();
3684 else if (ch < 0x20) 3241 else if (ch < 0x20)
3685 return NULL; /* other control character - exit */ 3242 return NULL; /* other control character - exit */
3686 3243
3687 seen_esc = false; 3244 seen_esc = false;
3688 3245
3689 if (n >= STRING_MAX - 1) 3246 if (n >= sizeof (string) - 1)
3690 // stop at some sane length 3247 // stop at some sane length
3691 return NULL; 3248 return NULL;
3692 3249
3693 if (ch == C0_SYN)
3694 string[n++] = cmd_get8 ();
3695 else
3696 string[n++] = ch; 3250 string[n++] = ch;
3697 } 3251 }
3698 3252
3699 string[n++] = '\0'; 3253 string[n++] = '\0';
3700 3254
3701 ends_how = (ch == 0x5c ? C0_ESC : ch); 3255 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3708 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3262 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3709 */ 3263 */
3710void 3264void
3711rxvt_term::process_dcs_seq () 3265rxvt_term::process_dcs_seq ()
3712{ 3266{
3713 char *s;
3714 unicode_t eh;
3715
3716 /* 3267 /*
3717 * Not handled yet 3268 * Not handled yet
3718 */ 3269 */
3270
3271 unicode_t eh;
3719 s = get_to_st (eh); 3272 char *s = get_to_st (eh);
3720 if (s) 3273 if (s)
3721 free (s); 3274 free (s);
3722 3275
3723 return; 3276 return;
3724} 3277}
… …
3728 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3281 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3729 */ 3282 */
3730void 3283void
3731rxvt_term::process_osc_seq () 3284rxvt_term::process_osc_seq ()
3732{ 3285{
3733 unicode_t ch, eh;
3734 int arg; 3286 int arg;
3735 3287
3736 ch = cmd_getc (); 3288 unicode_t ch = cmd_getc ();
3737 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3289 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3738 arg = arg * 10 + (ch - '0'); 3290 arg = arg * 10 + (ch - '0');
3739 3291
3740 if (ch == ';') 3292 if (ch == ';')
3741 { 3293 {
3294 unicode_t eh;
3742 char *s = get_to_st (eh); 3295 char *s = get_to_st (eh);
3743 3296
3744 if (s) 3297 if (s)
3745 { 3298 {
3746 process_xterm_seq (arg, s, eh); 3299 process_xterm_seq (arg, s, eh);
3747 free (s); 3300 free (s);
3748 } 3301 }
3749 } 3302 }
3750} 3303}
3751 3304
3305static unsigned int
3306colorcube_index (unsigned int idx_r,
3307 unsigned int idx_g,
3308 unsigned int idx_b)
3309{
3310 assert (idx_r < Red_levels);
3311 assert (idx_g < Green_levels);
3312 assert (idx_b < Blue_levels);
3313
3314 return idx_r * Blue_levels * Green_levels +
3315 idx_g * Blue_levels +
3316 idx_b;
3317}
3318
3319/*
3320 * Find the nearest color slot in the hidden color cube,
3321 * adapt its value to the 32bit RGBA color.
3322 */
3323unsigned int
3324rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3325{
3326 r &= 0xff;
3327 g &= 0xff;
3328 b &= 0xff;
3329 a &= 0xff;
3330
3331 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3332
3333 unsigned int idx_r = r * (Red_levels - 1) / 0xff;
3334 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3335 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
3336 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3337
3338 /* we allow one of the 6 directly neighbouring colours */
3339 /* to replace the current color, if they not used recently */
3340 static const signed char dxyz[][3] = {
3341 0, 0, 0,
3342 0, 0, +1,
3343 0, 0, -1,
3344 0, +1, 0,
3345 0, -1, 0,
3346 +1, 0, 0,
3347 -1, 0, 0,
3348 };
3349
3350 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3351 {
3352 int r = idx_r + dxyz[n][0];
3353 int g = idx_g + dxyz[n][1];
3354 int b = idx_b + dxyz[n][2];
3355
3356 if (!IN_RANGE_EXC (r, 0, Red_levels )) continue;
3357 if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
3358 if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
3359
3360 unsigned int index = colorcube_index (r, g, b);
3361
3362 if (rgb24_color[index] == color)
3363 {
3364 rgb24_seqno[index] = ++rgb24_sequence;
3365 return index + minTermCOLOR24;
3366 }
3367
3368 // minor issue: could update index 0 few more times
3369 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3370 {
3371 idx = index;
3372 goto update;
3373 }
3374
3375 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3376 // but also handles wrap around values good enough
3377 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3378 idx = index;
3379 }
3380
3381update:
3382 rgb24_color[idx] = color;
3383 rgb24_seqno[idx] = ++rgb24_sequence;
3384
3385 idx += minTermCOLOR24;
3386 pix_colors_focused [idx].free (this);
3387 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3388 update_fade_color (idx, false);
3389
3390 return idx;
3391}
3392
3752void 3393void
3753rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3394rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3754{ 3395{
3755 if (str[0] == '?' && !str[1]) 3396 if (str[0] == '?' && !str[1])
3756 { 3397 {
3757 unsigned short r, g, b; 3398 rgba c;
3758 pix_colors_focused[color].get (display, r, g, b); 3399 pix_colors_focused[color].get (c);
3400
3401#if XFT
3402 if (c.a != rgba::MAX_CC)
3403 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3404 else
3405#endif
3759 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3406 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3760 } 3407 }
3761 else 3408 else
3762 set_window_color (color, str); 3409 set_window_color (color, str);
3763} 3410}
3764 3411
3765/* 3412/*
3766 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3413 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3767 */ 3414 */
3768void 3415void
3769rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3416rxvt_term::process_xterm_seq (int op, char *str, char resp)
3770{ 3417{
3771 int color; 3418 int color;
3772 char *buf, *name; 3419 char *buf, *name;
3773 bool query = str[0] == '?' && !str[1]; 3420 bool query = str[0] == '?' && !str[1];
3774 int saveop = op; 3421 int saveop = op;
3775 dDisp; 3422
3423 dLocal (Display *, dpy);
3776 3424
3777 assert (str != NULL); 3425 assert (str != NULL);
3426
3427 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3428 return;
3429
3778 switch (op) 3430 switch (op)
3779 { 3431 {
3780 case XTerm_name: 3432 case XTerm_name:
3781 set_title (str); 3433 set_title (str);
3782 /* FALLTHROUGH */ 3434 /* FALLTHROUGH */
… …
3796 unsigned long bytes_after; 3448 unsigned long bytes_after;
3797 unsigned char *value = 0; 3449 unsigned char *value = 0;
3798 const char *str = ""; 3450 const char *str = "";
3799 3451
3800 if (prop 3452 if (prop
3801 && XGetWindowProperty (disp, parent[0], 3453 && XGetWindowProperty (dpy, parent,
3802 prop, 0, 1<<16, 0, AnyPropertyType, 3454 prop, 0, 1<<16, 0, AnyPropertyType,
3803 &actual_type, &actual_format, 3455 &actual_type, &actual_format,
3804 &nitems, &bytes_after, &value) == Success 3456 &nitems, &bytes_after, &value) == Success
3805 && actual_type != None 3457 && actual_type != None
3806 && actual_format == 8) 3458 && actual_format == 8)
3807 str = (const char *)(value); 3459 str = (const char *)(value);
3808 3460
3809 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3461 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3810 3462
3811 XFree (value); 3463 XFree (value);
3812 } 3464 }
3813 else 3465 else
3814 { 3466 {
3815 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3467 char *eq = strchr (str, '=');
3816 3468
3817 if (eq) 3469 if (eq)
3818 { 3470 {
3819 *eq = 0; 3471 *eq = 0;
3820 set_utf8_property (display->atom (str), eq + 1); 3472 set_utf8_property (display->atom (str), eq + 1);
3821 } 3473 }
3822 else 3474 else
3823 XDeleteProperty (disp, parent[0], 3475 XDeleteProperty (dpy, parent,
3824 display->atom (str)); 3476 display->atom (str));
3825 } 3477 }
3826 break; 3478 break;
3827 3479
3828 case XTerm_Color: 3480 case XTerm_Color:
… …
3838 break; 3490 break;
3839 3491
3840 if ((buf = strchr (name, ';')) != NULL) 3492 if ((buf = strchr (name, ';')) != NULL)
3841 *buf++ = '\0'; 3493 *buf++ = '\0';
3842 3494
3843 if (name[0] == '?' && !name[1]) 3495 process_color_seq (op, color, name, resp);
3844 {
3845 unsigned short r, g, b;
3846 pix_colors_focused[color].get (display, r, g, b);
3847 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3848 }
3849 else
3850 set_window_color (color, name);
3851 } 3496 }
3852 break; 3497 break;
3498 case Rxvt_restoreFG:
3853 case XTerm_Color00: 3499 case XTerm_Color00:
3854 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3500 process_color_seq (op, Color_fg, str, resp);
3855 break; 3501 break;
3502 case Rxvt_restoreBG:
3856 case XTerm_Color01: 3503 case XTerm_Color01:
3857 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3504 process_color_seq (op, Color_bg, str, resp);
3858 break; 3505 break;
3859#ifndef NO_CURSORCOLOR 3506#ifndef NO_CURSORCOLOR
3860 case XTerm_Color_cursor: 3507 case XTerm_Color_cursor:
3861 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3508 process_color_seq (op, Color_cursor, str, resp);
3862 break; 3509 break;
3863#endif 3510#endif
3864 case XTerm_Color_pointer_fg: 3511 case XTerm_Color_pointer_fg:
3865 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3512 process_color_seq (op, Color_pointer_fg, str, resp);
3866 break; 3513 break;
3867 case XTerm_Color_pointer_bg: 3514 case XTerm_Color_pointer_bg:
3868 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3515 process_color_seq (op, Color_pointer_bg, str, resp);
3869 break; 3516 break;
3517#ifdef OPTION_HC
3518 case XTerm_Color_HC:
3519 process_color_seq (op, Color_HC, str, resp);
3520 break;
3521 case XTerm_Color_HTC:
3522 process_color_seq (op, Color_HTC, str, resp);
3523 break;
3524#endif
3870#ifndef NO_BOLD_UNDERLINE_REVERSE 3525#ifndef NO_BOLD_UNDERLINE_REVERSE
3871 case XTerm_Color_RV:
3872 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3873 break;
3874 case Rxvt_Color_BD:
3875 case URxvt_Color_BD: 3526 case URxvt_Color_BD:
3876 process_color_seq (op, Color_BD, str, resp); 3527 process_color_seq (op, Color_BD, str, resp);
3877 break; 3528 break;
3878 case Rxvt_Color_UL:
3879 case URxvt_Color_UL: 3529 case URxvt_Color_UL:
3880 process_color_seq (op, Color_UL, str, resp); 3530 process_color_seq (op, Color_UL, str, resp);
3881 break; 3531 break;
3882 case URxvt_Color_IT: 3532 case URxvt_Color_IT:
3883 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3533 process_color_seq (op, Color_IT, str, resp);
3884 break; 3534 break;
3885#endif 3535#endif
3886#if TRANSPARENT && TINTING
3887 case URxvt_Color_tint: 3536 case URxvt_Color_border:
3888 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3537 process_color_seq (op, Color_border, str, resp);
3889 check_our_parents ();
3890 if (am_transparent)
3891 want_full_refresh = want_refresh = 1;
3892 break;
3893#endif
3894
3895 case Rxvt_Pixmap:
3896 {
3897 if (*str != ';')
3898 {
3899#if XPM_BACKGROUND
3900 scale_pixmap (""); /* reset to default scaling */
3901 set_bgPixmap (str); /* change pixmap */
3902 scr_touch (true);
3903#endif
3904 }
3905
3906 int changed = 0;
3907
3908 while ((str = strchr (str, ';')) != NULL)
3909 {
3910 str++;
3911#if XPM_BACKGROUND
3912 changed += scale_pixmap (str);
3913#endif
3914 }
3915
3916 if (changed)
3917 {
3918#ifdef XPM_BACKGROUND
3919 resize_pixmap ();
3920 scr_touch (true);
3921#endif
3922 }
3923 }
3924 break;
3925
3926 case Rxvt_restoreFG:
3927 set_window_color (Color_fg, str);
3928 break;
3929 case Rxvt_restoreBG:
3930 set_window_color (Color_bg, str);
3931 break; 3538 break;
3932 3539
3933 case XTerm_logfile: 3540 case XTerm_logfile:
3934 // TODO, when secure mode? 3541 // TODO, when secure mode?
3935 break; 3542 break;
… …
3954 case URxvt_italicFont: 3561 case URxvt_italicFont:
3955 case URxvt_boldItalicFont: 3562 case URxvt_boldItalicFont:
3956#endif 3563#endif
3957 if (query) 3564 if (query)
3958 tt_printf ("\33]%d;%-.250s%c", saveop, 3565 tt_printf ("\33]%d;%-.250s%c", saveop,
3959 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3566 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3960 ? fontset[op - URxvt_font]->fontdesc : "", 3567 ? fontset[op - URxvt_font]->fontdesc : "",
3961 resp); 3568 resp);
3962 else 3569 else
3963 { 3570 {
3964 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3571 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3967 allocated.push_back ((void *)res); 3574 allocated.push_back ((void *)res);
3968 set_fonts (); 3575 set_fonts ();
3969 } 3576 }
3970 break; 3577 break;
3971 3578
3972#if ENABLE_FRILLS 3579 case URxvt_version:
3580 if (query)
3581 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3582 op,
3583 rs[Rs_name], VERSION[0], VERSION[2],
3584 resp);
3585 break;
3586
3587#if !ENABLE_MINIMAL
3973 case URxvt_locale: 3588 case URxvt_locale:
3974 if (query) 3589 if (query)
3975 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3590 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3976 else 3591 else
3977 { 3592 {
3978 set_locale (str); 3593 set_locale (str);
3979 pty->set_utf8_mode (enc_utf8); 3594 pty->set_utf8_mode (enc_utf8);
3980 init_xlocale (); 3595 init_xlocale ();
… …
3995 break; 3610 break;
3996#endif 3611#endif
3997 3612
3998#if ENABLE_PERL 3613#if ENABLE_PERL
3999 case URxvt_perl: 3614 case URxvt_perl:
4000 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3615 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
4001 ; // no responses yet
4002 break; 3616 break;
4003#endif 3617#endif
4004 } 3618 }
4005} 3619}
4006/*----------------------------------------------------------------------*/ 3620/*----------------------------------------------------------------------*/
… …
4013 * 's' = save 3627 * 's' = save
4014 * 'r' = restore 3628 * 'r' = restore
4015 * 't' = toggle 3629 * 't' = toggle
4016 * so no need for fancy checking 3630 * so no need for fancy checking
4017 */ 3631 */
4018int 3632int ecb_cold
4019rxvt_term::privcases (int mode, unsigned long bit) 3633rxvt_term::privcases (int mode, unsigned long bit)
4020{ 3634{
4021 int state; 3635 int state;
4022 3636
4023 if (mode == 's') 3637 if (mode == 's')
4024 { 3638 {
4025 SavedModes |= (priv_modes & bit); 3639 if (priv_modes & bit)
3640 SavedModes |= bit;
3641 else
3642 SavedModes &= ~bit;
4026 return -1; 3643 return -1;
4027 } 3644 }
4028 else 3645 else
4029 { 3646 {
4030 if (mode == 'r') 3647 if (mode == 'r')
4031 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3648 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4032 else 3649 else
4033 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3650 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4034 PrivMode (state, bit); 3651
3652 if (state)
3653 priv_modes |= bit;
3654 else
3655 priv_modes &= ~bit;
4035 } 3656 }
4036 3657
4037 return state; 3658 return state;
4038} 3659}
4039 3660
4040/* we're not using priv _yet_ */ 3661/* we're not using priv _yet_ */
4041void 3662void
4042rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3663rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
4043{ 3664{
4044 unsigned int i, j; 3665 unsigned int i, j;
4045 int state; 3666 int state;
4046 3667
4047 static const struct 3668 static const struct
4048 { 3669 {
4049 const int argval; 3670 const int argval;
4050 const unsigned long bit; 3671 const unsigned long bit;
4051 }
4052
4053 argtopriv[] = { 3672 } argtopriv[] = {
4054 { 1, PrivMode_aplCUR }, 3673 { 1, PrivMode_aplCUR }, // DECCKM
4055 { 2, PrivMode_vt52 }, 3674 { 2, PrivMode_vt52 }, // DECANM
4056 { 3, PrivMode_132 }, 3675 { 3, PrivMode_132 }, // DECCOLM
4057 { 4, PrivMode_smoothScroll }, 3676 { 4, PrivMode_smoothScroll }, // DECSCLM
4058 { 5, PrivMode_rVideo }, 3677 { 5, PrivMode_rVideo }, // DECSCNM
4059 { 6, PrivMode_relOrigin }, 3678 { 6, PrivMode_relOrigin }, // DECOM
4060 { 7, PrivMode_Autowrap }, 3679 { 7, PrivMode_Autowrap }, // DECAWM
4061 // 8, bi-directional support mode 3680 // 8, auto-repeat keys // DECARM
4062 { 9, PrivMode_MouseX10 }, 3681 { 9, PrivMode_MouseX10 },
4063 // 18, 19 printing-related
4064 { 25, PrivMode_VisibleCursor }, 3682 { 12, PrivMode_BlinkingCursor },
3683 // 18 end FF to printer after print screen
3684 // 19 Print screen prints full screen/scroll region
3685 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
4065#ifdef scrollBar_esc 3686#ifdef scrollBar_esc
4066 { scrollBar_esc, PrivMode_scrollBar }, 3687 { scrollBar_esc, PrivMode_scrollBar },
4067#endif 3688#endif
4068 { 35, PrivMode_ShiftKeys }, // rxvt extension 3689 { 35, PrivMode_ShiftKeys }, // rxvt extension
3690 // 38, tektronix mode // DECTEK
4069 { 40, PrivMode_132OK }, 3691 { 40, PrivMode_132OK },
4070 // 41 xterm more fixes NYI 3692 // 41 xterm more fixes NYI
4071 // 45 margin bell NYI 3693 // 45 margin bell NYI
4072 // 46 start logging 3694 // 46 start logging
4073 { 47, PrivMode_Screen }, 3695 { 47, PrivMode_Screen },
4074 { 66, PrivMode_aplKP }, 3696 { 66, PrivMode_aplKP }, // DECNKM
4075#ifndef NO_BACKSPACE_KEY 3697#ifndef NO_BACKSPACE_KEY
4076 { 67, PrivMode_BackSpace }, 3698 { 67, PrivMode_BackSpace }, // DECBKM
4077#endif 3699#endif
4078 { 1000, PrivMode_MouseX11 }, 3700 { 1000, PrivMode_MouseX11 },
4079 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3701 { 1002, PrivMode_MouseBtnEvent },
4080 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3702 { 1003, PrivMode_MouseAnyEvent },
4081 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3703#if ENABLE_FRILLS
3704 { 1004, PrivMode_FocusEvent },
3705 { 1005, PrivMode_ExtModeMouse },
3706#endif
4082 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3707 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4083 { 1011, PrivMode_Keypress }, // rxvt extension 3708 { 1011, PrivMode_Keypress }, // rxvt extension
3709#if ENABLE_FRILLS
3710 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3711#endif
4084 // 1035 enable modifiers for alt, numlock NYI 3712 // 1035 enable modifiers for alt, numlock NYI
4085 // 1036 send ESC for meta keys NYI 3713 // 1036 send ESC for meta keys NYI
4086 // 1037 send DEL for keypad delete NYI 3714 // 1037 send DEL for keypad delete NYI
4087 { 1047, PrivMode_Screen }, 3715 { 1047, PrivMode_Screen },
4088 // 1048 save and restore cursor 3716 // 1048 save and restore cursor, implemented in code
4089 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3717 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4090 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3718 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3719 { 2004, PrivMode_BracketPaste },
4091 }; 3720 };
4092 3721
4093 if (nargs == 0) 3722 if (nargs == 0)
4094 return; 3723 return;
4095 3724
… …
4102 for (i = 0; i < nargs; i++) 3731 for (i = 0; i < nargs; i++)
4103 { 3732 {
4104 state = -1; 3733 state = -1;
4105 3734
4106 /* basic handling */ 3735 /* basic handling */
4107 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3736 for (j = 0; j < ecb_array_length (argtopriv); j++)
4108 if (argtopriv[j].argval == arg[i]) 3737 if (argtopriv[j].argval == arg[i])
4109 { 3738 {
4110 state = privcases (mode, argtopriv[j].bit); 3739 state = privcases (mode, argtopriv[j].bit);
4111 break; 3740 break;
4112 } 3741 }
… …
4120 3749
4121 scr_touch (true); 3750 scr_touch (true);
4122 break; 3751 break;
4123#endif 3752#endif
4124 case 1048: /* alternative cursor save */ 3753 case 1048: /* alternative cursor save */
4125 case 1049:
4126 if (OPTION (Opt_secondaryScreen)) 3754 if (option (Opt_secondaryScreen))
4127 if (mode == 0) 3755 if (mode == 0)
4128 scr_cursor (RESTORE); 3756 scr_cursor (RESTORE);
4129 else if (mode == 1) 3757 else if (mode == 1)
4130 scr_cursor (SAVE); 3758 scr_cursor (SAVE);
4131 break; 3759 break;
… …
4139 case 2: /* VT52 mode */ 3767 case 2: /* VT52 mode */
4140 /* oddball mode. should be set regardless of set/reset 3768 /* oddball mode. should be set regardless of set/reset
4141 * parameter. Return from VT52 mode with an ESC < from 3769 * parameter. Return from VT52 mode with an ESC < from
4142 * within VT52 mode 3770 * within VT52 mode
4143 */ 3771 */
4144 PrivMode (1, PrivMode_vt52); 3772 priv_modes |= PrivMode_vt52;
4145 break; 3773 break;
4146 case 3: /* 80/132 */ 3774 case 3: /* 80/132 */
4147 if (priv_modes & PrivMode_132OK) 3775 if (priv_modes & PrivMode_132OK)
4148 set_widthheight (((state ? 132 : 80) * fwidth), height); 3776 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
4149 break; 3777 break;
4150 case 4: /* smooth scrolling */ 3778 case 4: /* smooth scrolling */
4151 set_option (Opt_jumpScroll, !state); 3779 set_option (Opt_jumpScroll, !state);
4152 break; 3780 break;
4153 case 5: /* reverse video */ 3781 case 5: /* reverse video */
… …
4160 scr_autowrap (state); 3788 scr_autowrap (state);
4161 break; 3789 break;
4162 /* case 8: - auto repeat, can't do on a per window basis */ 3790 /* case 8: - auto repeat, can't do on a per window basis */
4163 case 9: /* X10 mouse reporting */ 3791 case 9: /* X10 mouse reporting */
4164 if (state) /* orthogonal */ 3792 if (state) /* orthogonal */
4165 priv_modes &= ~PrivMode_MouseX11; 3793 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4166 break; 3794 break;
4167#ifdef scrollBar_esc 3795#ifdef scrollBar_esc
4168 case scrollBar_esc: 3796 case scrollBar_esc:
4169 if (scrollbar_mapping (state)) 3797 scrollBar.map (state);
4170 {
4171 resize_all_windows (0, 0, 0); 3798 resize_all_windows (0, 0, 0);
4172 scr_touch (true); 3799 scr_touch (true);
4173 } 3800 break;
3801#endif
3802#ifdef CURSOR_BLINK
3803 case 12:
3804 cursor_blink_reset ();
4174 break; 3805 break;
4175#endif 3806#endif
4176 case 25: /* visible/invisible cursor */ 3807 case 25: /* visible/invisible cursor */
4177 scr_cursor_visible (state); 3808 scr_cursor_visible (state);
4178 break; 3809 break;
… …
4183 break; 3814 break;
4184 /* case 66: - application key pad */ 3815 /* case 66: - application key pad */
4185 /* case 67: - backspace key */ 3816 /* case 67: - backspace key */
4186 case 1000: /* X11 mouse reporting */ 3817 case 1000: /* X11 mouse reporting */
4187 if (state) /* orthogonal */ 3818 if (state) /* orthogonal */
4188 priv_modes &= ~PrivMode_MouseX10; 3819 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4189 break; 3820 break;
4190#if 0
4191 case 1001: 3821 case 1002:
4192 break; /* X11 mouse highlighting */ 3822 case 1003:
4193#endif 3823 if (state)
3824 {
3825 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3826 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3827 mouse_row = mouse_col = 0;
3828 vt_emask_mouse = PointerMotionMask;
3829 }
3830 else
3831 vt_emask_mouse = NoEventMask;
3832
3833 vt_select_input ();
3834 break;
4194 case 1010: /* scroll to bottom on TTY output inhibit */ 3835 case 1010: /* scroll to bottom on TTY output inhibit */
4195 set_option (Opt_scrollTtyOutput, !state); 3836 set_option (Opt_scrollTtyOutput, !state);
4196 break; 3837 break;
4197 case 1011: /* scroll to bottom on key press */ 3838 case 1011: /* scroll to bottom on key press */
4198 set_option (Opt_scrollTtyKeypress, state); 3839 set_option (Opt_scrollTtyKeypress, state);
4199 break; 3840 break;
4200 case 1047: /* secondary screen w/ clearing last */ 3841 case 1047: /* secondary screen w/ clearing last */
4201 if (OPTION (Opt_secondaryScreen)) 3842 if (option (Opt_secondaryScreen))
4202 if (current_screen != PRIMARY) 3843 if (!state)
4203 scr_erase_screen (2); 3844 scr_erase_screen (2);
3845
4204 scr_change_screen (state); 3846 scr_change_screen (state);
4205 break; 3847 break;
4206 case 1049: /* secondary screen w/ clearing first */ 3848 case 1049: /* secondary screen w/ clearing first */
3849 if (option (Opt_secondaryScreen))
3850 if (state)
3851 scr_cursor (SAVE);
3852
4207 scr_change_screen (state); 3853 scr_change_screen (state);
3854
4208 if (OPTION (Opt_secondaryScreen)) 3855 if (option (Opt_secondaryScreen))
4209 if (current_screen != PRIMARY) 3856 if (state)
4210 scr_erase_screen (2); 3857 scr_erase_screen (2);
3858 else
3859 scr_cursor (RESTORE);
4211 break; 3860 break;
4212 default: 3861 default:
4213 break; 3862 break;
4214 } 3863 }
4215 } 3864 }
4216} 3865}
4217/*}}} */ 3866/*}}} */
4218 3867
4219/*{{{ process sgr sequences */ 3868/*{{{ process sgr sequences */
4220void 3869void ecb_hot
4221rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3870rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
4222{ 3871{
4223 unsigned int i; 3872 unsigned int i;
4224 short rendset; 3873 short rendset;
4225 int rendstyle; 3874 int rendstyle;
… …
4267 //case 19: // ninth alt font 3916 //case 19: // ninth alt font
4268 //case 20: // gothic 3917 //case 20: // gothic
4269 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3918 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
4270 rendset = 0, rendstyle = RS_Bold; 3919 rendset = 0, rendstyle = RS_Bold;
4271 break; 3920 break;
4272 case 22: // normal intensity 3921 case 22: // bold off (vt220)
4273 rendset = 0, rendstyle = RS_Bold; 3922 rendset = 0, rendstyle = RS_Bold;
4274 break; 3923 break;
4275 case 23: // disable italic 3924 case 23: // disable italic
4276 rendset = 0, rendstyle = RS_Italic; 3925 rendset = 0, rendstyle = RS_Italic;
4277 break; 3926 break;
4278 case 24: 3927 case 24: // underline off (vt220)
4279 rendset = 0, rendstyle = RS_Uline; 3928 rendset = 0, rendstyle = RS_Uline;
4280 break; 3929 break;
4281 case 25: 3930 case 25: // blink off (vt220)
4282 rendset = 0, rendstyle = RS_Blink; 3931 rendset = 0, rendstyle = RS_Blink;
4283 break; 3932 break;
4284 case 26: // variable spacing (iso 8613) 3933 case 26: // variable spacing (iso 8613)
4285 rendset = 0, rendstyle = RS_Blink; 3934 rendset = 0, rendstyle = RS_Blink;
4286 break; 3935 break;
4287 case 27: 3936 case 27: // reverse off (vt220)
4288 rendset = 0, rendstyle = RS_RVid; 3937 rendset = 0, rendstyle = RS_RVid;
4289 break; 3938 break;
4290 //case 28: // visible. NYI 3939 //case 28: // visible. NYI
4291 //case 29: // not crossed-out 3940 //case 29: // not crossed-out
4292 } 3941 }
… …
4307 case 35: 3956 case 35:
4308 case 36: 3957 case 36:
4309 case 37: 3958 case 37:
4310 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3959 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
4311 break; 3960 break;
4312 case 38: // set fg color, ISO 8613-6
4313 if (nargs > i + 2 && arg[i + 1] == 5)
4314 {
4315 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
4316 i += 2;
4317 }
4318 break;
4319 case 39: /* default fg */ 3961 case 39: /* default fg */
4320 scr_color (Color_fg, Color_fg); 3962 scr_color (Color_fg, Color_fg);
4321 break; 3963 break;
4322 3964
4323 case 40: 3965 case 40:
… …
4328 case 45: 3970 case 45:
4329 case 46: 3971 case 46:
4330 case 47: 3972 case 47:
4331 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3973 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
4332 break; 3974 break;
4333 case 48: // set bg color, ISO 8613-6
4334 if (nargs > i + 2 && arg[i + 1] == 5)
4335 {
4336 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
4337 i += 2;
4338 }
4339 break;
4340 case 49: /* default bg */ 3975 case 49: /* default bg */
4341 scr_color (Color_bg, Color_bg); 3976 scr_color (Color_bg, Color_bg);
4342 break; 3977 break;
4343 3978
3979 case 38: // set fg color, ISO 8613-6
3980 case 48: // set bg color, ISO 8613-6
3981 {
3982 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
3983 unsigned int idx;
3984
3985 if (nargs > i + 2 && arg[i + 1] == 5)
3986 {
3987 idx = minCOLOR + arg[i + 2];
3988 i += 2;
3989
3990 scr_color (idx, fgbg);
3991 }
3992 else if (nargs > i + 4 && arg[i + 1] == 2)
3993 {
3994 unsigned int r = arg[i + 2];
3995 unsigned int g = arg[i + 3];
3996 unsigned int b = arg[i + 4];
3997 unsigned int a = 0xff;
3998
3999 idx = map_rgb24_color (r, g, b, a);
4000
4001 i += 4;
4002
4003 scr_color (idx, fgbg);
4004 }
4005 }
4006 break;
4007
4344 //case 50: // not variable spacing 4008 //case 50: // not variable spacing
4345 4009
4346#if ENABLE_FRILLS 4010#if !ENABLE_MINIMAL
4347 case 90: 4011 case 90:
4348 case 91: /* set bright fg color */ 4012 case 91: /* set bright fg color */
4349 case 92: 4013 case 92:
4350 case 93: 4014 case 93:
4351 case 94: 4015 case 94:
… …
4366 break; 4030 break;
4367#endif 4031#endif
4368 } 4032 }
4369 } 4033 }
4370} 4034}
4035
4036void
4037rxvt_term::set_cursor_style (int style)
4038{
4039 if (!IN_RANGE_INC (style, 0, 6))
4040 return;
4041
4042 if (style == 0)
4043 style = 1;
4044
4045 cursor_type = (style - 1) / 2;
4046 set_option (Opt_cursorUnderline, cursor_type == 1);
4047
4048#ifdef CURSOR_BLINK
4049 set_option (Opt_cursorBlink, style & 1);
4050 cursor_blink_reset ();
4051#endif
4052
4053 want_refresh = 1;
4054}
4371/*}}} */ 4055/*}}} */
4372 4056
4373/*{{{ (do not) process Rob Nation's own graphics mode sequences */
4374void
4375rxvt_term::process_graphics ()
4376{
4377 unicode_t ch, cmd = cmd_getc ();
4378
4379 if (cmd == 'Q')
4380 { /* query graphics */
4381 tt_printf ("\033G0\012"); /* no graphics */
4382 return;
4383 }
4384 /* swallow other graphics sequences until terminating ':' */
4385 do
4386 ch = cmd_getc ();
4387 while (ch != ':');
4388}
4389/*}}} */
4390
4391/* ------------------------------------------------------------------------- */ 4057/* ---------------------------------------------------------------------- */
4058/* Write data to the pty as typed by the user, pasted with the mouse,
4059 * or generated by us in response to a query ESC sequence.
4060 */
4392 4061
4393/* 4062/*
4394 * Send printf () formatted output to the command. 4063 * Send printf () formatted output to the command.
4395 * Only use for small amounts of data. 4064 * Only use for small amounts of data.
4396 */ 4065 */
… …
4404 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4073 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4405 va_end (arg_ptr); 4074 va_end (arg_ptr);
4406 tt_write (buf, strlen (buf)); 4075 tt_write (buf, strlen (buf));
4407} 4076}
4408 4077
4409/* ---------------------------------------------------------------------- */
4410/* Write data to the pty as typed by the user, pasted with the mouse, 4078/* Write data to the pty as typed by the user. */
4411 * or generated by us in response to a query ESC sequence. 4079void
4412 */ 4080rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4413const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4081{
4082 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4083 return;
4084
4085 if (option (Opt_scrollTtyKeypress))
4086 if (view_start)
4087 {
4088 view_start = 0;
4089 want_refresh = 1;
4090 }
4091
4092 tt_write_ (data, len);
4093}
4414 4094
4415void 4095void
4416rxvt_term::tt_write (const char *data, unsigned int len) 4096rxvt_term::tt_write (const char *data, unsigned int len)
4417{ 4097{
4418 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4098 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4419 return; 4099 return;
4420 4100
4101 tt_write_ (data, len);
4102}
4103
4104static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4105
4106void
4107rxvt_term::tt_write_ (const char *data, unsigned int len)
4108{
4421 if (pty->pty < 0) 4109 if (pty->pty < 0)
4422 return; 4110 return;
4423 4111
4424 if (v_buflen == 0) 4112 if (v_buflen == 0)
4425 { 4113 {
4426 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4114 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4427 4115
4116 max_it (written, 0);
4117
4428 if ((unsigned int)written == len) 4118 if (written == len)
4429 return; 4119 return;
4430 4120
4431 data += written; 4121 data += written;
4432 len -= written; 4122 len -= written;
4433 } 4123 }
4434 4124
4435 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4125 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4436 4126
4437 memcpy (v_buffer + v_buflen, data, len); 4127 memcpy (v_buffer + v_buflen, data, len);
4438 v_buflen += len; 4128 v_buflen += len;
4439 4129
4440 pty_ev.set (EVENT_READ | EVENT_WRITE); 4130 pty_ev.set (ev::READ | ev::WRITE);
4441} 4131}
4442 4132
4443void rxvt_term::pty_write () 4133void rxvt_term::pty_write ()
4444{ 4134{
4445 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4135 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4450 4140
4451 if (v_buflen == 0) 4141 if (v_buflen == 0)
4452 { 4142 {
4453 free (v_buffer); 4143 free (v_buffer);
4454 v_buffer = 0; 4144 v_buffer = 0;
4455 v_buflen = 0;
4456 4145
4457 pty_ev.set (EVENT_READ); 4146 pty_ev.set (ev::READ);
4458 return; 4147 return;
4459 } 4148 }
4460 4149
4461 memmove (v_buffer, v_buffer + written, v_buflen); 4150 memmove (v_buffer, v_buffer + written, v_buflen);
4462 } 4151 }
4463 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4152 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4464 pty_ev.set (EVENT_READ); 4153 pty_ev.set (ev::READ);
4465} 4154}
4466 4155
4467/*----------------------- end-of-file (C source) -----------------------*/ 4156/*----------------------- end-of-file (C source) -----------------------*/
4468 4157

Diff Legend

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