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.207 by root, Tue Oct 25 19:04:45 2005 UTC vs.
Revision 1.545 by sf-exg, Sat Apr 26 15:05:17 2014 UTC

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

Diff Legend

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