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

Diff Legend

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