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

Diff Legend

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