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

Diff Legend

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