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

Diff Legend

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