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.460 by sf-exg, Fri Nov 19 23:29:30 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.flags & bgPixmap_t::hasChanged)
662 { 981 {
663 want_full_refresh = 0; 982 bgPixmap.flags &= ~bgPixmap_t::hasChanged;
664 scr_clear (); 983// scr_clear (true); This needs to be researched further!
665 scr_touch (false); 984 scr_touch (false);
666 want_refresh = 1;
667 } 985 }
668#endif 986#endif
669 987
670 if (want_refresh) 988 if (want_refresh)
671 { 989 {
990 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
991 {
992 int row = view_start;
993 int end_row = row + nrow;
994
995 while (row > top_row && ROW (row - 1).is_longer ())
996 --row;
997
998 do
999 {
1000 int start_row = row;
1001 line_t *l;
1002
1003 do
1004 {
1005 l = &ROW (row++);
1006
1007 if (!(l->f & LINE_FILTERED))
1008 {
1009 // line not filtered, mark it as filtered
1010 l->f |= LINE_FILTERED;
1011 while (l->is_longer ())
1012 {
1013 l = &ROW (row++);
1014 l->f |= LINE_FILTERED;
1015 }
1016
1017 // and filter it
1018 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1019
1020 break;
1021 }
1022 }
1023 while (l->is_longer () && row < end_row);
1024 }
1025 while (row < end_row);
1026 }
1027
672 scr_refresh (refresh_type); 1028 scr_refresh ();
673 scrollbar_show (1); 1029 scrollBar.show (1);
674#ifdef USE_XIM 1030#ifdef USE_XIM
675 IMSendSpot (); 1031 IMSendSpot ();
676#endif 1032#endif
677
678 } 1033 }
679 1034
680 display->flush (); 1035 display->flush ();
681} 1036}
682 1037
1038/* checks whether a refresh is requested and starts the refresh timer */
683void 1039void
684rxvt_term::check_cb (check_watcher &w) 1040rxvt_term::refresh_check ()
685{ 1041{
686 SET_R (this); 1042 if (want_refresh && !flush_ev.is_active ())
687 SET_LOCALE (locale); 1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
688 1044
1045 display->flush ();
1046}
1047
1048void
1049rxvt_term::flush_cb (ev::timer &w, int revents)
1050{
1051 make_current ();
1052
1053 refresh_count = 0;
689 flush (); 1054 flush ();
690} 1055}
691 1056
692#ifdef CURSOR_BLINK 1057#ifdef CURSOR_BLINK
693void 1058void
694rxvt_term::cursor_blink_cb (time_watcher &w) 1059rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
695{ 1060{
696 hidden_cursor = !hidden_cursor; 1061 hidden_cursor = !hidden_cursor;
697 want_refresh = 1; 1062 want_refresh = 1;
698 1063 refresh_check ();
699 w.start (w.at + BLINK_INTERVAL);
700} 1064}
701#endif 1065#endif
702 1066
703#ifdef TEXT_BLINK 1067#ifdef TEXT_BLINK
704void 1068void
705rxvt_term::text_blink_cb (time_watcher &w) 1069rxvt_term::text_blink_cb (ev::timer &w, int revents)
706{ 1070{
707 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1071 if (scr_refresh_rend (RS_Blink, RS_Blink))
708 { 1072 {
709 hidden_text = !hidden_text; 1073 hidden_text = !hidden_text;
710 want_refresh = 1; 1074 want_refresh = 1;
711 w.start (w.at + TEXT_BLINK_INTERVAL); 1075 refresh_check ();
1076 }
1077 else
1078 w.stop ();
1079}
1080#endif
1081
1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1083void
1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1085{
1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
712 } 1088 {
1089 want_refresh = 1;
1090 refresh_check ();
1091 }
1092 else
1093 w.stop ();
713} 1094}
1095#endif
1096
1097#ifdef SELECTION_SCROLLING
1098void
1099rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1100{
1101 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1102 {
1103 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1104 want_refresh = 1;
1105 refresh_check ();
1106 }
1107 else
1108 w.stop ();
1109}
1110#endif
1111
1112#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1113void
1114rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1115{
1116 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1117 {
1118 want_refresh = 1;
1119 refresh_check ();
1120 }
1121
1122 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1123 {
1124 mouse_slip_wheel_speed = 0;
1125 w.stop ();
1126 }
1127}
1128#endif
1129
1130#if LINUX_YIELD_HACK
1131static struct event_handler
1132{
1133 ev::prepare yield_ev;
1134
1135 void yield_cb (ev::prepare &w, int revents)
1136 {
1137 // this should really be sched_yield(), but the linux guys thought
1138 // that giving a process calling sched_yield () less cpu time than
1139 // ones with high nice levels is a useful thing to do. It surely is is
1140 // allowed by the sus... as is returning ENOSYS.
1141 // since the linux guys additionally thought that breaking the only
1142 // known workaround against their unusable sched_yield hack is cool,
1143 // we just nanosleep a bit and hope for the best.
1144
1145 struct timespec ts = { 0, 1000 };
1146 nanosleep (&ts, 0);
1147
1148 w.stop ();
1149 }
1150
1151 event_handler ()
1152 : yield_ev (this, &event_handler::yield_cb)
1153 {
1154 }
1155} event_handler;
714#endif 1156#endif
715 1157
716bool 1158bool
717rxvt_term::pty_fill () 1159rxvt_term::pty_fill ()
718{ 1160{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1162
1163 if (CBUFSIZ == n)
1164 {
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1166 n = 0;
1167 }
720 1168
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1170 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1171 cmdbuf_endp = cmdbuf_ptr + n;
724 1172
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
726 1174
727 if (n > 0) 1175 if (r > 0)
728 { 1176 {
729 cmdbuf_endp += n; 1177 cmdbuf_endp += r;
730 return true; 1178 return true;
731 } 1179 }
732 else if (n < 0 && errno != EAGAIN) 1180 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1181 {
1182#if LINUX_YIELD_HACK
1183 if (display->is_local)
1184 event_handler.yield_ev.start ();
1185#endif
1186 }
1187 else
1188 {
1189 pty_ev.stop ();
1190
1191 if (!option (Opt_hold))
733 destroy (); 1192 destroy ();
734 1193 }
1194
735 return false; 1195 return false;
736} 1196}
737 1197
738void 1198void
739rxvt_term::pty_cb (io_watcher &w, short revents) 1199rxvt_term::pty_cb (ev::io &w, int revents)
740{ 1200{
741 SET_R (this); 1201 make_current ();
742 SET_LOCALE (locale);
743 1202
744 if (revents & EVENT_WRITE) 1203 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 1204 // loop, but don't allow a single term to monopolize us
749 // the number of loops is fully arbitrary, and thus wrong 1205 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 ()) 1206 cmd_parse ();
761 break; 1207
762 } 1208 if (revents & ev::WRITE)
763 } 1209 pty_write ();
1210
1211 refresh_check ();
764} 1212}
1213
1214void
1215rxvt_term::pointer_unblank ()
1216{
1217 XDefineCursor (dpy, vt, TermWin_cursor);
1218 recolour_cursor ();
765 1219
766#ifdef POINTER_BLANK 1220#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; 1221 hidden_pointer = 0;
774 1222
775 if (Options & Opt_pointerBlank) 1223 if (option (Opt_pointerBlank))
776 pointer_ev.start (NOW + pointerBlankDelay); 1224 pointer_ev.start (pointerBlankDelay);
1225#endif
777} 1226}
778 1227
1228#ifdef POINTER_BLANK
779void 1229void
780rxvt_term::pointer_blank () 1230rxvt_term::pointer_blank ()
781{ 1231{
782 if (! (Options & Opt_pointerBlank)) 1232 if (!option (Opt_pointerBlank))
783 return; 1233 return;
784 1234
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1235 XDefineCursor (dpy, vt, display->blank_cursor);
786 XFlush (display->display); 1236 XFlush (dpy);
787 1237
788 hidden_pointer = 1; 1238 hidden_pointer = 1;
789} 1239}
790 1240
791void 1241void
792rxvt_term::pointer_cb (time_watcher &w) 1242rxvt_term::pointer_cb (ev::timer &w, int revents)
793{ 1243{
794 SET_R (this); 1244 make_current ();
795 SET_LOCALE (locale);
796 1245
797 pointer_blank (); 1246 pointer_blank ();
798} 1247}
799#endif 1248#endif
800 1249
801void 1250void
802rxvt_term::mouse_report (XButtonEvent &ev) 1251rxvt_term::mouse_report (XButtonEvent &ev)
803{ 1252{
804 int button_number, key_state = 0; 1253 int button_number, key_state = 0;
805 int x, y; 1254 int x, y;
1255 int code = 32;
806 1256
807 x = ev.x; 1257 x = Pixel2Col (ev.x);
808 y = ev.y; 1258 y = Pixel2Row (ev.y);
809 pixel_position (&x, &y); 1259 if (ev.type == MotionNotify)
1260 {
1261 if (x == mouse_row && y == mouse_col)
1262 return;
1263 mouse_row = x;
1264 mouse_col = y;
1265 code += 32;
1266 }
810 1267
811 if (MEvent.button == AnyButton) 1268 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1269 button_number = 3;
814 }
815 else 1270 else
816 { 1271 {
817 button_number = MEvent.button - Button1; 1272 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1273 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1274 if (button_number >= 3)
820 button_number += (64 - 3); 1275 button_number += (64 - 3);
821 } 1276 }
822 1277
823 if (PrivateModes & PrivMode_MouseX10) 1278 if (priv_modes & PrivMode_MouseX10)
824 { 1279 {
825 /* 1280 /*
826 * do not report ButtonRelease 1281 * do not report ButtonRelease
827 * no state info allowed 1282 * no state info allowed
828 */ 1283 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1298 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1299 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1300#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1301 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1302#endif
848
849 } 1303 }
850 1304
851#ifdef DEBUG_MOUSEREPORT 1305#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1306 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1307 if (key_state & 16)
854 fputc ('C', stderr); 1308 fputc ('C', stderr);
855 if (key_state & 4) 1309 if (key_state & 4)
856 fputc ('S', stderr); 1310 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1314 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1315 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1316 button_number,
863 x + 1, 1317 x + 1,
864 y + 1); 1318 y + 1);
865#else 1319#endif
1320
866 tt_printf ("\033[M%c%c%c", 1321 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1322 (code + button_number + key_state),
868 (32 + x + 1), 1323 (32 + x + 1),
869 (32 + y + 1)); 1324 (32 + y + 1));
870#endif
871} 1325}
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 1326
883/*{{{ process an X event */ 1327/*{{{ process an X event */
884void 1328void
885rxvt_term::x_cb (XEvent &ev) 1329rxvt_term::x_cb (XEvent &ev)
886{ 1330{
887 SET_R (this); 1331 make_current ();
888 SET_LOCALE (locale);
889 1332
890#if defined(CURSOR_BLINK) 1333 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 1334
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1335 if (ev.xany.window == vt
900 } 1336 && SHOULD_INVOKE (HOOK_X_EVENT)
901#endif 1337 && 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; 1338 return;
920#endif
921 1339
1340 // for XQueryPointer
922 Window unused_root, unused_child; 1341 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1342 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1343 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 1344
975 switch (ev.type) 1345 switch (ev.type)
976 { 1346 {
977 case KeyPress: 1347 case KeyPress:
978 lookup_key (ev.xkey); 1348 key_press (ev.xkey);
979 break; 1349 break;
980 1350
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease: 1351 case KeyRelease:
983 { 1352 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; 1353 break;
995 }
996#endif
997 1354
998 case ButtonPress: 1355 case ButtonPress:
999 button_press (ev.xbutton); 1356 button_press (ev.xbutton);
1000 break; 1357 break;
1001 1358
… …
1003 button_release (ev.xbutton); 1360 button_release (ev.xbutton);
1004 break; 1361 break;
1005 1362
1006 case ClientMessage: 1363 case ClientMessage:
1007 if (ev.xclient.format == 32 1364 if (ev.xclient.format == 32
1008 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1365 && !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 { 1366 {
1017 /* Get Dnd data */ 1367 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1018 Atom ActualType; 1368 {
1019 int ActualFormat; 1369 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1020 unsigned char *data; 1370 {
1021 unsigned long Size, RemainingBytes; 1371 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1022 1372 {
1023 XGetWindowProperty (display->display, display->root, 1373 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1024 xa[XA_DNDSELECTION], 1374 destroy ();
1025 0L, 1000000L, 1375 }
1026 False, AnyPropertyType, 1376#if ENABLE_EWMH
1027 &ActualType, &ActualFormat, 1377 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1028 &Size, &RemainingBytes, 1378 XSendEvent (dpy, ev.xclient.window = display->root,
1379 False, SubstructureRedirectMask | SubstructureNotifyMask,
1029 &data); 1380 &ev);
1030 XChangeProperty (display->display, display->root, 1381#endif
1031 XA_CUT_BUFFER0, XA_STRING, 1382 }
1032 8, PropModeReplace, 1383 }
1033 data, STRLEN (data)); 1384#if ENABLE_XEMBED
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1385 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1386 {
1387 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1388 focus_in ();
1389 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1390 focus_out ();
1391 }
1392#endif
1036 } 1393 }
1037#endif /* OFFIX_DND */
1038 break;
1039
1040 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping));
1042 break; 1394 break;
1043 1395
1044 /* 1396 /*
1045 * XXX: this is not the _current_ arrangement 1397 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1398 * Here's my conclusion:
… …
1065 break; 1417 break;
1066 } 1418 }
1067 break; 1419 break;
1068 1420
1069 case FocusIn: 1421 case FocusIn:
1070 if (!TermWin.focus) 1422 if (ev.xfocus.detail != NotifyInferior
1423 && ev.xfocus.detail != NotifyPointer
1424 && ev.xfocus.mode != NotifyGrab)
1425 focus_in ();
1426 break;
1427
1428 case FocusOut:
1429 if (ev.xfocus.detail != NotifyInferior
1430 && ev.xfocus.detail != NotifyPointer
1431 && ev.xfocus.mode != NotifyGrab)
1432 focus_out ();
1433 break;
1434
1435 case ConfigureNotify:
1436 if (ev.xconfigure.window == parent[0])
1071 { 1437 {
1072 TermWin.focus = 1; 1438 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 } 1439 ;
1084 break;
1085 1440
1086 case FocusOut: 1441#ifdef HAVE_BG_PIXMAP
1087 if (TermWin.focus) 1442 bool moved = false;
1443 if (bgPixmap.window_position_sensitive ())
1088 { 1444 {
1089 TermWin.focus = 0; 1445 int x, y;
1090 want_refresh = 1; 1446 if (ev.xconfigure.send_event)
1091#ifdef USE_XIM 1447 {
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; 1448 x = ev.xconfigure.x;
1112 height = ev.xconfigure.height; 1449 y = ev.xconfigure.y;
1113 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1450 }
1451 else
1452 get_window_origin (x, y);
1453
1454 if (bgPixmap.set_position (x, y)
1455 || (bgPixmap.flags & bgPixmap_t::isInvalid))
1456 moved = true;
1114 } 1457 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1458#endif
1116 1459
1117 if (szHint.width != width || szHint.height != height) 1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1118 { 1461 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1462 seen_resize = 1;
1120 resize_all_windows (width, height, 1); 1463 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1121 } 1464 }
1122#ifdef DEBUG_SIZE
1123 else 1465 else
1124 { 1466 {
1125 D_SIZE ((stderr, "Size: Not resizing")); 1467#ifdef HAVE_BG_PIXMAP
1468 if (moved)
1469 {
1470 if (mapped)
1471 update_background ();
1472 else
1473 bgPixmap.invalidate ();
1474 }
1475#endif
1126 } 1476 }
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 1477
1478 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1137 } 1479 }
1138 break; 1480 break;
1139 1481
1482 case PropertyNotify:
1483 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1484 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1485 && ev.xproperty.state == PropertyNewValue)
1486 selection_property (ev.xproperty.window, ev.xproperty.atom);
1487
1488 break;
1489
1140 case SelectionClear: 1490 case SelectionClear:
1141 selection_clear (); 1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1142 break; 1492 break;
1143 1493
1144 case SelectionNotify: 1494 case SelectionNotify:
1145 if (selection_wait == Sel_normal) 1495 if (selection_wait == Sel_normal)
1146 selection_paste (ev.xselection.requestor, 1496 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1147 ev.xselection.property, True);
1148 break; 1497 break;
1149 1498
1150 case SelectionRequest: 1499 case SelectionRequest:
1151 selection_send (ev.xselectionrequest); 1500 selection_send (ev.xselectionrequest);
1152 break; 1501 break;
1153 1502
1503 case MapNotify:
1504#ifdef HAVE_BG_PIXMAP
1505 /* This is needed specifically to fix the case of no window manager or a
1506 * non-reparenting window manager. In those cases we never get first
1507 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1508 * care of multiplicity of ConfigureNotify events arriving while WM does
1509 * reparenting.
1510 * We should not render background immediately, as there could be several
1511 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1512 * by scheduling background redraw as soon as we can, but giving a short
1513 * bit of time for ConfigureNotifies to arrive.
1514 * We should render background PRIOR to drawing any text, but AFTER all
1515 * of ConfigureNotifys for the best results.
1516 */
1517 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1518 update_background_ev.start (0.025);
1519#endif
1520 mapped = 1;
1521#ifdef TEXT_BLINK
1522 text_blink_ev.start ();
1523#endif
1524 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1525 break;
1526
1154 case UnmapNotify: 1527 case UnmapNotify:
1155 TermWin.mapped = 0; 1528 mapped = 0;
1156#ifdef TEXT_BLINK 1529#ifdef TEXT_BLINK
1157 text_blink_ev.stop (); 1530 text_blink_ev.stop ();
1158#endif 1531#endif
1532 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1159 break; 1533 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 1534
1174 case GraphicsExpose: 1535 case GraphicsExpose:
1175 case Expose: 1536 case Expose:
1176 if (ev.xany.window == TermWin.vt) 1537 if (ev.xany.window == vt)
1177 { 1538 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1539 do
1540 {
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1181#else 1543 }
1182 // don't understand this, so commented it out 1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1545
1546 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1547
1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1549 {
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1550 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1551 ev.xexpose.width, ev.xexpose.height, False);
1185 //scr_expose (ev.xexpose.x, 0, 1552 }
1186 // ev.xexpose.width, TermWin.height, False); 1553
1187#endif
1188 want_refresh = 1; 1554 want_refresh = 1;
1189 } 1555 }
1190 else 1556 else
1191 { 1557 {
1192 XEvent unused_event; 1558 XEvent unused_event;
1193 1559
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1560 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1195 Expose, 1561 ;
1196 &unused_event)) ; 1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1563 ;
1198 GraphicsExpose, 1564
1199 &unused_event)) ; 1565 if (scrollBar.state && ev.xany.window == scrollBar.win)
1200 if (isScrollbarWindow (ev.xany.window))
1201 { 1566 {
1202 scrollBar.setIdle (); 1567 scrollBar.state = STATE_IDLE;
1203 scrollbar_show (0); 1568 scrollBar.show (0);
1204 } 1569 }
1205#ifdef MENUBAR
1206 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1207 menubar_expose ();
1208#endif
1209 } 1570 }
1210 break; 1571 break;
1211 1572
1212 case MotionNotify: 1573 case MotionNotify:
1213#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1214 if (hidden_pointer) 1575 if (hidden_pointer)
1215 pointer_unblank (); 1576 pointer_unblank ();
1216#endif 1577#endif
1217#if MENUBAR 1578 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1218 if (isMenuBarWindow (ev.xany.window)) 1579 || priv_modes & PrivMode_MouseAnyEvent)
1580 mouse_report (ev.xbutton);
1581 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1582 break;
1583
1584 if (ev.xany.window == vt)
1219 { 1585 {
1220 menubar_control (ev.xbutton); 1586 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1221 break; 1587 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1222 } 1588 ; // 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))) 1589 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1230 { 1590 {
1231 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1591 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1232 ; 1592 ;
1233 1593
1234 XQueryPointer (display->display, TermWin.vt, 1594 XQueryPointer (dpy, vt,
1235 &unused_root, &unused_child, 1595 &unused_root, &unused_child,
1236 &unused_root_x, &unused_root_y, 1596 &unused_root_x, &unused_root_y,
1237 & (ev.xbutton.x), & (ev.xbutton.y), 1597 &ev.xbutton.x, &ev.xbutton.y,
1238 &unused_mask); 1598 &ev.xbutton.state);
1239#ifdef MOUSE_THRESHOLD 1599#ifdef MOUSE_THRESHOLD
1240 /* deal with a `jumpy' mouse */ 1600 /* deal with a `jumpy' mouse */
1241 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1601 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1242 { 1602 {
1243#endif 1603#endif
1604#if ISO_14755
1605 // 5.4
1606 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1607 {
1608 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1609 break;
1610 }
1611#endif
1244 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1612 selection_extend (ev.xbutton.x, ev.xbutton.y,
1245 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1613 ev.xbutton.state & Button3Mask ? 2 : 0);
1614
1246#ifdef SELECTION_SCROLLING 1615#ifdef SELECTION_SCROLLING
1247 if (ev.xbutton.y < TermWin.int_bwidth 1616 if (ev.xbutton.y < int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1617 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1249 { 1618 {
1250 int dist; 1619 int dist;
1251
1252 pending_scroll_selection=1;
1253 1620
1254 /* don't clobber the current delay if we are 1621 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1622 * already in the middle of scrolling.
1256 */ 1623 */
1257 if (scroll_selection_delay<=0) 1624 if (!sel_scroll_ev.is_active ())
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1625 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1259 1626
1260 /* save the event params so we can highlight 1627 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1628 * the selection in the pending-scroll loop
1262 */ 1629 */
1263 selection_save_x=ev.xbutton.x; 1630 selection_save_x = ev.xbutton.x;
1264 selection_save_y=ev.xbutton.y; 1631 selection_save_y = ev.xbutton.y;
1265 selection_save_state=
1266 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1632 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1267 1633
1268 /* calc number of lines to scroll */ 1634 /* calc number of lines to scroll */
1269 if (ev.xbutton.y<TermWin.int_bwidth) 1635 if (ev.xbutton.y < int_bwidth)
1270 { 1636 {
1271 scroll_selection_dir = UP; 1637 scroll_selection_dir = UP;
1272 dist = TermWin.int_bwidth - ev.xbutton.y; 1638 dist = int_bwidth - ev.xbutton.y;
1273 } 1639 }
1274 else 1640 else
1275 { 1641 {
1276 scroll_selection_dir = DN; 1642 scroll_selection_dir = DN;
1277 dist = ev.xbutton.y - 1643 dist = ev.xbutton.y - (int_bwidth + height);
1278 (TermWin.int_bwidth + TermWin.height);
1279 } 1644 }
1645
1280 scroll_selection_lines= (Pixel2Height (dist)/ 1646 scroll_selection_lines = Pixel2Height (dist)
1281 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1647 / SELECTION_SCROLL_LINE_SPEEDUP
1648 + 1;
1282 MIN_IT (scroll_selection_lines, 1649 min_it (scroll_selection_lines,
1283 SELECTION_SCROLL_MAX_LINES); 1650 SELECTION_SCROLL_MAX_LINES);
1284 } 1651 }
1285 else 1652 else
1286 { 1653 {
1287 /* we are within the text window, so we 1654 /* we are within the text window, so we
1288 * shouldn't be scrolling 1655 * shouldn't be scrolling
1289 */ 1656 */
1290 pending_scroll_selection = 0; 1657 sel_scroll_ev.stop();
1291 } 1658 }
1292#endif 1659#endif
1293#ifdef MOUSE_THRESHOLD 1660#ifdef MOUSE_THRESHOLD
1294
1295 } 1661 }
1296#endif 1662#endif
1297
1298 } 1663 }
1299 } 1664 }
1300 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1665 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1301 { 1666 {
1302 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1303 MotionNotify, &ev)) ; 1668 MotionNotify, &ev))
1669 ;
1670
1304 XQueryPointer (display->display, scrollBar.win, 1671 XQueryPointer (dpy, scrollBar.win,
1305 &unused_root, &unused_child, 1672 &unused_root, &unused_child,
1306 &unused_root_x, &unused_root_y, 1673 &unused_root_x, &unused_root_y,
1307 & (ev.xbutton.x), & (ev.xbutton.y), 1674 &ev.xbutton.x, &ev.xbutton.y,
1308 &unused_mask); 1675 &unused_mask);
1309 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1310 scrollbar_size ()); 1677 scrollBar.size ());
1311 scr_refresh (refresh_type);
1312 refresh_limit = 0; 1678 want_refresh = 1;
1313 scrollbar_show (1); 1679 scrollBar.show (1);
1314 } 1680 }
1315 break; 1681 break;
1316 } 1682 }
1317}
1318 1683
1684#if defined(CURSOR_BLINK)
1685 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1686 {
1687 if (hidden_cursor)
1688 {
1689 hidden_cursor = 0;
1690 want_refresh = 1;
1691 }
1692
1693 cursor_blink_ev.again ();
1694 }
1695#endif
1696
1697#if defined(POINTER_BLANK)
1698 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1699 {
1700 if (ev.type == MotionNotify
1701 || ev.type == ButtonPress
1702 || ev.type == ButtonRelease)
1703 if (hidden_pointer)
1704 pointer_unblank ();
1705
1706 if (ev.type == KeyPress && hidden_pointer == 0)
1707 pointer_blank ();
1708 }
1709#endif
1710
1711 refresh_check ();
1712}
1713
1714#if ENABLE_FRILLS
1715void
1716rxvt_term::set_urgency (bool enable)
1717{
1718 if (enable == urgency_hint)
1719 return;
1720
1721 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1722 {
1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724 XSetWMHints (dpy, parent[0], h);
1725 urgency_hint = enable;
1726 }
1727}
1728#endif
1729
1730void
1731rxvt_term::focus_in ()
1732{
1733 if (!focus)
1734 {
1735 focus = 1;
1736 want_refresh = 1;
1737
1738#if USE_XIM
1739 if (Input_Context != NULL)
1740 {
1741 IMSetPosition ();
1742 XSetICFocus (Input_Context);
1743 }
1744#endif
1745#if CURSOR_BLINK
1746 if (option (Opt_cursorBlink))
1747 cursor_blink_ev.again ();
1748#endif
1749#if OFF_FOCUS_FADING
1750 if (rs[Rs_fade])
1751 {
1752 pix_colors = pix_colors_focused;
1753 scr_recolour ();
1754 }
1755#endif
1756#if ENABLE_FRILLS
1757 if (option (Opt_urgentOnBell))
1758 set_urgency (0);
1759#endif
1760
1761 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1762 }
1763}
1764
1765void
1766rxvt_term::focus_out ()
1767{
1768 if (focus)
1769 {
1770 focus = 0;
1771 want_refresh = 1;
1772
1773#if ENABLE_FRILLS
1774 if (option (Opt_urgentOnBell))
1775 set_urgency (0);
1776#endif
1777#if ENABLE_FRILLS || ISO_14755
1778 if (iso14755buf)
1779 {
1780 iso14755buf = 0;
1781# if ISO_14755
1782 scr_overlay_off ();
1783# endif
1784 }
1785#endif
1786#if USE_XIM
1787 if (Input_Context != NULL)
1788 XUnsetICFocus (Input_Context);
1789#endif
1790#if CURSOR_BLINK
1791 if (option (Opt_cursorBlink))
1792 cursor_blink_ev.stop ();
1793
1794 hidden_cursor = 0;
1795#endif
1796#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade])
1798 {
1799 pix_colors = pix_colors_unfocused;
1800 scr_recolour ();
1801 }
1802#endif
1803
1804 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1805 }
1806}
1807
1808void
1809rxvt_term::update_fade_color (unsigned int idx)
1810{
1811#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade])
1813 {
1814 rgba c;
1815 pix_colors [Color_fade].get (c);
1816 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817 }
1818#endif
1819}
1820
1821#if ENABLE_TRANSPARENCY || ENABLE_PERL
1319void 1822void
1320rxvt_term::rootwin_cb (XEvent &ev) 1823rxvt_term::rootwin_cb (XEvent &ev)
1321{ 1824{
1322 SET_R (this); 1825 make_current ();
1323 SET_LOCALE (locale);
1324 1826
1827 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829 return;
1830
1831# if ENABLE_TRANSPARENCY
1325 switch (ev.type) 1832 switch (ev.type)
1326 { 1833 {
1327 case PropertyNotify: 1834 case PropertyNotify:
1835 /*
1836 * if user used some Esetroot compatible prog to set the root bg,
1837 * use the property to determine the pixmap. We use it later on.
1838 */
1328 if (ev.xproperty.atom == xa[XA_VT_SELECTION]) 1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1329 { 1841 {
1330 if (ev.xproperty.state == PropertyNewValue) 1842 bgPixmap.set_root_pixmap ();
1331 selection_property (ev.xproperty.window, ev.xproperty.atom); 1843 update_background ();
1332 break;
1333 } 1844 }
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 1845
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; 1846 break;
1847 }
1354#endif 1848# endif
1355 } 1849
1850 refresh_check ();
1356} 1851}
1852#endif
1357 1853
1358void 1854void
1359rxvt_term::button_press (XButtonEvent &ev) 1855rxvt_term::button_press (XButtonEvent &ev)
1360{ 1856{
1361 int reportmode = 0, clickintime; 1857 int reportmode = 0, clickintime;
1362 1858
1363 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1859 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1860
1364 if (!bypass_keystate) 1861 if (!bypass_keystate)
1365 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1862 reportmode = !! (priv_modes & PrivMode_mouse_report);
1863
1366 /* 1864 /*
1367 * VT window processing of button press 1865 * VT window processing of button press
1368 */ 1866 */
1369 if (ev.window == TermWin.vt) 1867 if (ev.window == vt)
1370 { 1868 {
1869 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1870 return;
1871
1872#if ISO_14755
1873 // 5.4
1874 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1875 {
1876 iso14755_54 (ev.x, ev.y);
1877 return;
1878 }
1879#endif
1880
1371 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1881 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1882
1372 if (reportmode) 1883 if (reportmode)
1373 { 1884 {
1374 /* mouse report from vt window */ 1885 /* mouse report from vt window */
1375 /* save the xbutton state (for ButtonRelease) */ 1886 /* save the xbutton state (for ButtonRelease) */
1376 MEvent.state = ev.state; 1887 MEvent.state = ev.state;
1377#ifdef MOUSE_REPORT_DOUBLECLICK 1888#ifdef MOUSE_REPORT_DOUBLECLICK
1378 if (ev.button == MEvent.button && clickintime) 1889 if (ev.button == MEvent.button && clickintime)
1379 { 1890 {
1380 /* same button, within alloted time */ 1891 /* same button, within allowed time */
1381 MEvent.clicks++; 1892 MEvent.clicks++;
1893
1382 if (MEvent.clicks > 1) 1894 if (MEvent.clicks > 1)
1383 { 1895 {
1384 /* only report double clicks */ 1896 /* only report double clicks */
1385 MEvent.clicks = 2; 1897 MEvent.clicks = 2;
1386 mouse_report (ev); 1898 mouse_report (ev);
… …
1398 mouse_report (ev); 1910 mouse_report (ev);
1399 } 1911 }
1400#else 1912#else
1401 MEvent.button = ev.button; 1913 MEvent.button = ev.button;
1402 mouse_report (ev); 1914 mouse_report (ev);
1403#endif /* MOUSE_REPORT_DOUBLECLICK */ 1915#endif /* MOUSE_REPORT_DOUBLECLICK */
1404 1916
1405 } 1917 }
1406 else 1918 else
1407 { 1919 {
1408 if (ev.button != MEvent.button) 1920 if (ev.button != MEvent.button)
1409 MEvent.clicks = 0; 1921 MEvent.clicks = 0;
1922
1410 switch (ev.button) 1923 switch (ev.button)
1411 { 1924 {
1412 case Button1: 1925 case Button1:
1926 /* allow meta + click to select rectangular areas */
1927 /* should be done in screen.C */
1928#if ENABLE_FRILLS
1929 selection.rect = !!(ev.state & ModMetaMask);
1930#else
1931 selection.rect = false;
1932#endif
1933
1413 /* allow shift+left click to extend selection */ 1934 /* allow shift+left click to extend selection */
1414 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1935 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1415 { 1936 {
1416 if (MEvent.button == Button1 && clickintime) 1937 if (MEvent.button == Button1 && clickintime)
1417 selection_rotate (ev.x, ev.y); 1938 selection_rotate (ev.x, ev.y);
1418 else 1939 else
1419 selection_extend (ev.x, ev.y, 1); 1940 selection_extend (ev.x, ev.y, 1);
… …
1434 case Button3: 1955 case Button3:
1435 if (MEvent.button == Button3 && clickintime) 1956 if (MEvent.button == Button3 && clickintime)
1436 selection_rotate (ev.x, ev.y); 1957 selection_rotate (ev.x, ev.y);
1437 else 1958 else
1438 selection_extend (ev.x, ev.y, 1); 1959 selection_extend (ev.x, ev.y, 1);
1960
1439 MEvent.button = Button3; 1961 MEvent.button = Button3;
1440 break; 1962 break;
1441 } 1963 }
1442 } 1964 }
1965
1443 MEvent.time = ev.time; 1966 MEvent.time = ev.time;
1444 return; 1967 return;
1445 } 1968 }
1446 1969
1447 /* 1970 /*
1448 * Scrollbar window processing of button press 1971 * Scrollbar window processing of button press
1449 */ 1972 */
1450 if (isScrollbarWindow (ev.window)) 1973 if (scrollBar.state && ev.window == scrollBar.win)
1451 { 1974 {
1452 scrollBar.setIdle (); 1975 page_dirn direction = NO_DIR;
1976
1977 if (scrollBar.upButton (ev.y))
1978 direction = UP; /* up */
1979 else if (scrollBar.dnButton (ev.y))
1980 direction = DN; /* down */
1981
1982 scrollBar.state = STATE_IDLE;
1453 /* 1983 /*
1454 * Rxvt-style scrollbar: 1984 * Rxvt-style scrollbar:
1455 * move up if mouse is above slider 1985 * move up if mouse is above slider
1456 * move dn if mouse is below slider 1986 * move dn if mouse is below slider
1457 * 1987 *
… …
1466 /* 1996 /*
1467 * Mouse report disabled scrollbar: 1997 * Mouse report disabled scrollbar:
1468 * arrow buttons - send up/down 1998 * arrow buttons - send up/down
1469 * click on scrollbar - send pageup/down 1999 * click on scrollbar - send pageup/down
1470 */ 2000 */
1471 if ((scrollBar.style == R_SB_NEXT 2001 if (direction == UP)
1472 && scrollbarnext_upButton (ev.y))
1473 || (scrollBar.style == R_SB_RXVT
1474 && scrollbarrxvt_upButton (ev.y)))
1475 tt_printf ("\033[A"); 2002 tt_printf ("\033[A");
1476 else if ((scrollBar.style == R_SB_NEXT 2003 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"); 2004 tt_printf ("\033[B");
1481 else 2005 else
1482 switch (ev.button) 2006 switch (ev.button)
1483 { 2007 {
1484 case Button2: 2008 case Button2:
… …
1491 tt_printf ("\033[5~"); 2015 tt_printf ("\033[5~");
1492 break; 2016 break;
1493 } 2017 }
1494 } 2018 }
1495 else 2019 else
1496#endif /* NO_SCROLLBAR_REPORT */ 2020#endif /* NO_SCROLLBAR_REPORT */
1497
1498 {
1499 char upordown = 0;
1500
1501 if (scrollBar.style == R_SB_NEXT)
1502 { 2021 {
1503 if (scrollbarnext_upButton (ev.y)) 2022 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 { 2023 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2024#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2025 if (!cont_scroll_ev.is_active ())
2026 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1519#endif 2027#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 2028 if (scr_page (direction, 1))
1521 { 2029 {
1522 if (upordown < 0) 2030 if (direction == UP)
1523 scrollBar.setUp (); 2031 scrollBar.state = STATE_UP;
1524 else 2032 else
1525 scrollBar.setDn (); 2033 scrollBar.state = STATE_DOWN;
1526 } 2034 }
1527 } 2035 }
1528 else 2036 else
1529 switch (ev.button) 2037 switch (ev.button)
1530 { 2038 {
1531 case Button2: 2039 case Button2:
1532 switch (scrollbar_align) 2040 switch (scrollBar.align)
1533 { 2041 {
1534 case R_SB_ALIGN_TOP: 2042 case R_SB_ALIGN_TOP:
1535 csrO = 0; 2043 csrO = 0;
1536 break; 2044 break;
1537 case R_SB_ALIGN_CENTRE: 2045 case R_SB_ALIGN_CENTRE:
… …
1539 break; 2047 break;
1540 case R_SB_ALIGN_BOTTOM: 2048 case R_SB_ALIGN_BOTTOM:
1541 csrO = scrollBar.bot - scrollBar.top; 2049 csrO = scrollBar.bot - scrollBar.top;
1542 break; 2050 break;
1543 } 2051 }
2052
1544 if (scrollBar.style == R_SB_XTERM 2053 if (scrollBar.style == R_SB_XTERM
1545 || scrollbar_above_slider (ev.y) 2054 || scrollbar_above_slider (ev.y)
1546 || scrollbar_below_slider (ev.y)) 2055 || scrollbar_below_slider (ev.y))
1547 scr_move_to ( scrollbar_position (ev.y) - csrO, 2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
1548 scrollbar_size ()); 2057
1549 scrollBar.setMotion (); 2058 scrollBar.state = STATE_MOTION;
1550 break; 2059 break;
1551 2060
1552 case Button1: 2061 case Button1:
1553 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2062 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1554 csrO = ev.y - scrollBar.top; 2063 csrO = ev.y - scrollBar.top;
1555 /* FALLTHROUGH */ 2064 /* FALLTHROUGH */
1556 2065
1557 case Button3: 2066 case Button3:
1558 if (scrollBar.style != R_SB_XTERM) 2067 if (scrollBar.style != R_SB_XTERM)
1559 { 2068 {
1560 if (scrollbar_above_slider (ev.y)) 2069 if (scrollbar_above_slider (ev.y))
1561# ifdef RXVT_SCROLL_FULL 2070# ifdef RXVT_SCROLL_FULL
1562 scr_page (UP, TermWin.nrow - 1); 2071 scr_page (UP, nrow - 1);
1563# else 2072# else
1564 scr_page (UP, TermWin.nrow / 4); 2073 scr_page (UP, nrow / 4);
1565# endif 2074# endif
1566 else if (scrollbar_below_slider (ev.y)) 2075 else if (scrollbar_below_slider (ev.y))
1567# ifdef RXVT_SCROLL_FULL 2076# ifdef RXVT_SCROLL_FULL
1568 scr_page (DN, TermWin.nrow - 1); 2077 scr_page (DN, nrow - 1);
1569# else 2078# else
1570 scr_page (DN, TermWin.nrow / 4); 2079 scr_page (DN, nrow / 4);
1571# endif 2080# endif
1572 else 2081 else
1573 scrollBar.setMotion (); 2082 scrollBar.state = STATE_MOTION;
1574 } 2083 }
1575 else 2084 else
1576 { 2085 {
1577 scr_page ((ev.button == Button1 ? DN : UP), 2086 scr_page ((ev.button == Button1 ? DN : UP),
1578 (TermWin.nrow 2087 (nrow
1579 * scrollbar_position (ev.y) 2088 * scrollbar_position (ev.y)
1580 / scrollbar_size ())); 2089 / scrollBar.size ()));
1581 } 2090 }
2091
1582 break; 2092 break;
1583 } 2093 }
1584 } 2094 }
2095
1585 return; 2096 return;
1586 } 2097 }
1587#if MENUBAR
1588 /*
1589 * Menubar window processing of button press
1590 */
1591 if (isMenuBarWindow (ev.window))
1592 menubar_control (ev);
1593#endif
1594} 2098}
1595 2099
1596void 2100void
1597rxvt_term::button_release (XButtonEvent &ev) 2101rxvt_term::button_release (XButtonEvent &ev)
1598{ 2102{
1599 int reportmode = 0; 2103 int reportmode = 0;
1600 2104
1601 csrO = 0; /* reset csr Offset */ 2105 csrO = 0; /* reset csr Offset */
1602 if (!bypass_keystate) 2106 if (!bypass_keystate)
1603 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2107 reportmode = !! (priv_modes & PrivMode_mouse_report);
1604 2108
1605 if (scrollbar_isUpDn ()) 2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1606 { 2110 {
1607 scrollBar.setIdle (); 2111 scrollBar.state = STATE_IDLE;
1608 scrollbar_show (0); 2112 scrollBar.show (0);
1609#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1610 refresh_type &= ~SMOOTH_REFRESH;
1611#endif
1612
1613 } 2113 }
2114
1614#ifdef SELECTION_SCROLLING 2115#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 2116 sel_scroll_ev.stop();
1616#endif 2117#endif
2118
1617 if (ev.window == TermWin.vt) 2119 if (ev.window == vt)
1618 { 2120 {
2121 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2122 return;
2123
2124#if ISO_14755
2125 // 5.4
2126 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2127 return;
2128#endif
2129
1619 if (reportmode) 2130 if (reportmode)
1620 { 2131 {
1621 /* mouse report from vt window */ 2132 /* mouse report from vt window */
1622 /* don't report release of wheel "buttons" */ 2133 /* don't report release of wheel "buttons" */
1623 if (ev.button >= 4) 2134 if (ev.button >= 4)
… …
1634 mouse_report (ev); 2145 mouse_report (ev);
1635 } 2146 }
1636#else /* MOUSE_REPORT_DOUBLECLICK */ 2147#else /* MOUSE_REPORT_DOUBLECLICK */
1637 MEvent.button = AnyButton; 2148 MEvent.button = AnyButton;
1638 mouse_report (ev); 2149 mouse_report (ev);
1639#endif /* MOUSE_REPORT_DOUBLECLICK */ 2150#endif /* MOUSE_REPORT_DOUBLECLICK */
1640 return; 2151 return;
1641 } 2152 }
2153
1642 /* 2154 /*
1643 * dumb hack to compensate for the failure of click-and-drag 2155 * dumb hack to compensate for the failure of click-and-drag
1644 * when overriding mouse reporting 2156 * when overriding mouse reporting
1645 */ 2157 */
1646 if (PrivateModes & PrivMode_mouse_report 2158 if (priv_modes & PrivMode_mouse_report
1647 && bypass_keystate 2159 && bypass_keystate
1648 && ev.button == Button1 && MEvent.clicks <= 1) 2160 && ev.button == Button1 && MEvent.clicks <= 1)
1649 selection_extend (ev.x, ev.y, 0); 2161 selection_extend (ev.x, ev.y, 0);
1650 2162
1651 switch (ev.button) 2163 switch (ev.button)
1652 { 2164 {
1653 case Button1: 2165 case Button1:
1654 case Button3: 2166 case Button3:
1655 selection_make (ev.time); 2167 selection_make (ev.time);
1656 break; 2168 break;
2169
1657 case Button2: 2170 case Button2:
1658 selection_request (ev.time, ev.x, ev.y); 2171 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1659 break; 2173 break;
2174
1660#ifdef MOUSE_WHEEL 2175#ifdef MOUSE_WHEEL
1661 case Button4: 2176 case Button4:
1662 case Button5: 2177 case Button5:
1663 { 2178 {
1664 int i; 2179 int i;
1665 page_dirn v; 2180 page_dirn v;
1666 2181
1667 v = (ev.button == Button4) ? UP : DN; 2182 v = ev.button == Button4 ? UP : DN;
2183
1668 if (ev.state & ShiftMask) 2184 if (ev.state & ShiftMask)
1669 i = 1; 2185 i = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 2186 else if (option (Opt_mouseWheelScrollPage))
1671 i = TermWin.nrow - 1; 2187 i = nrow - 1;
1672 else 2188 else
1673 i = 5; 2189 i = 5;
2190
1674# ifdef MOUSE_SLIP_WHEELING 2191# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 2192 if (ev.state & ControlMask)
1676 { 2193 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 2194 mouse_slip_wheel_speed += v ? -1 : 1;
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2195 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2196 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2197
2198 if (!slip_wheel_ev.is_active ())
2199 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1679 } 2200 }
2201 else
1680# endif 2202# 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 { 2203 {
1688 scr_page (v, 1); 2204 scr_page (v, i);
1689 scr_refresh (SMOOTH_REFRESH);
1690 scrollbar_show (1); 2205 scrollBar.show (1);
1691 } 2206 }
1692# endif
1693
1694 } 2207 }
1695 break; 2208 break;
1696#endif 2209#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 { 2210 }
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 { 2211 }
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} 2212}
1918#endif
1919 2213
1920/*}}} */ 2214/*}}} */
1921 2215
1922bool 2216void
1923rxvt_term::cmd_parse () 2217rxvt_term::cmd_parse ()
1924{ 2218{
1925 bool flag = false;
1926 unicode_t ch = NOCHAR; 2219 wchar_t ch = NOCHAR;
1927 unsigned char *seq_begin; // remember start of esc-sequence here 2220 char *seq_begin; // remember start of esc-sequence here
1928 2221
1929 for (;;) 2222 for (;;)
1930 { 2223 {
1931 if (ch == NOCHAR) 2224 if (expect_false (ch == NOCHAR))
1932 { 2225 {
1933 seq_begin = cmdbuf_ptr; 2226 seq_begin = cmdbuf_ptr;
1934 ch = next_char (); 2227 ch = next_char ();
1935 }
1936 2228
1937 if (ch == NOCHAR) // TODO: improve 2229 if (ch == NOCHAR)
1938 break; 2230 break;
1939
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r')
1941 { 2231 }
2232
2233 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2234 {
2235 if (expect_false (!seen_input))
2236 {
2237 seen_input = 1;
2238 // many badly-written programs (e.g. jed) contain a race condition:
2239 // they first read the screensize and then install a SIGWINCH handler.
2240 // some window managers resize the window early, and these programs
2241 // then sometimes get the size wrong.
2242 // unfortunately other programs are even more buggy and dislike
2243 // being sent SIGWINCH, so only do it when we were in fact being
2244 // resized.
2245 if (seen_resize && cmd_pid)
2246 kill (-cmd_pid, SIGWINCH);
2247 }
2248
1942 /* Read a text string from the input buffer */ 2249 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2250 wchar_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2251 bool refreshnow = false;
1945 int nlines = 0; 2252 int nlines = 0;
1946 unicode_t *str = buf; 2253 wchar_t *str = buf;
1947 2254 wchar_t *eol = str + min (ncol, UBUFSIZ);
1948 *str++ = ch;
1949 2255
1950 for (;;) 2256 for (;;)
1951 { 2257 {
2258 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2259 break;
2260
2261 *str++ = ch;
2262
2263 if (expect_false (ch == C0_LF || str >= eol))
2264 {
2265 if (ch == C0_LF)
2266 nlines++;
2267
2268 refresh_count++;
2269
2270 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2271 {
2272 refresh_count = 0;
2273
2274 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2275 {
2276 refreshnow = true;
2277 ch = NOCHAR;
2278 break;
2279 }
2280 }
2281
2282 // scr_add_lines only works for nlines <= nrow - 1.
2283 if (nlines >= nrow - 1)
2284 {
2285 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2286 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2287 scr_add_lines (buf, str - buf, nlines);
2288
2289 nlines = 0;
2290 str = buf;
2291 eol = str + min (ncol, UBUFSIZ);
2292 }
2293
2294 if (str >= eol)
2295 {
2296 if (eol >= buf + UBUFSIZ)
2297 {
2298 ch = NOCHAR;
2299 break;
2300 }
2301 else
2302 eol = min (eol + ncol, buf + UBUFSIZ);
2303 }
2304
2305 }
2306
1952 seq_begin = cmdbuf_ptr; 2307 seq_begin = cmdbuf_ptr;
1953 ch = next_char (); 2308 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 } 2309 }
1989 2310
2311 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2312 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
1990 scr_add_lines (buf, nlines, str - buf); 2313 scr_add_lines (buf, str - buf, nlines);
1991 2314
1992 /* 2315 /*
1993 * If there have been a lot of new lines, then update the screen 2316 * 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. 2317 * 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 2318 * 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 */ 2319 */
2001 if (refreshnow) 2320 if (refreshnow)
2002 { 2321 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2004 refresh_limit++;
2005
2006 scr_refresh (refresh_type); 2322 scr_refresh ();
2323 want_refresh = 1;
2007 } 2324 }
2008
2009 } 2325 }
2010 else 2326 else
2011 { 2327 {
2012 try 2328 try
2013 { 2329 {
… …
2021 } 2337 }
2022 2338
2023 ch = NOCHAR; 2339 ch = NOCHAR;
2024 } 2340 }
2025 } 2341 }
2026
2027 return flag;
2028} 2342}
2029 2343
2030// read the next character 2344// read the next character
2031unicode_t 2345wchar_t
2032rxvt_term::next_char () 2346rxvt_term::next_char () NOTHROW
2033{ 2347{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2348 while (cmdbuf_ptr < cmdbuf_endp)
2035 { 2349 {
2036 // assume 7-bit to be ascii ALWAYS 2350 // assume 7-bit to be ascii ALWAYS
2037 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2351 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2038 return *cmdbuf_ptr++; 2352 return *cmdbuf_ptr++;
2039 2353
2040 wchar_t wc; 2354 wchar_t wc;
2041 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2355 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2042 2356
2043 if (len == (size_t)-2) 2357 if (len == (size_t)-2)
2044 { 2358 {
2045 // the mbstate stores incomplete sequences. didn't know this :/ 2359 // the mbstate stores incomplete sequences. didn't know this :/
2046 cmdbuf_ptr = cmdbuf_endp; 2360 cmdbuf_ptr = cmdbuf_endp;
2047 break; 2361 break;
2048 } 2362 }
2049 2363
2050 if (len == (size_t)-1) 2364 if (len == (size_t)-1)
2365 {
2366 mbstate.reset (); // reset now undefined conversion state
2051 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2367 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2368 }
2052 2369
2053 // assume wchar == unicode 2370 // assume wchar == unicode
2054 cmdbuf_ptr += len; 2371 cmdbuf_ptr += len;
2055 return wc; 2372 return wc & UNICODE_MASK;
2056 } 2373 }
2057 2374
2058 return NOCHAR; 2375 return NOCHAR;
2059} 2376}
2377
2378// read the next octet
2379uint32_t
2380rxvt_term::next_octet () NOTHROW
2381{
2382 return cmdbuf_ptr < cmdbuf_endp
2383 ? (unsigned char)*cmdbuf_ptr++
2384 : NOCHAR;
2385}
2386
2387static class out_of_input out_of_input;
2060 2388
2061/* rxvt_cmd_getc () - Return next input character */ 2389/* rxvt_cmd_getc () - Return next input character */
2062/* 2390/*
2063 * Return the next input character after first passing any keyboard input 2391 * Return the next input character after first passing any keyboard input
2064 * to the command. 2392 * to the command.
2065 */ 2393 */
2066unicode_t 2394wchar_t
2067rxvt_term::cmd_getc () 2395rxvt_term::cmd_getc () THROW ((class out_of_input))
2068{ 2396{
2069 unicode_t c = next_char (); 2397 wchar_t c = next_char ();
2398
2399 if (c == NOCHAR)
2400 throw out_of_input;
2401
2402 return c;
2403}
2404
2405uint32_t
2406rxvt_term::cmd_get8 () THROW ((class out_of_input))
2407{
2408 uint32_t c = next_octet ();
2070 2409
2071 if (c == NOCHAR) 2410 if (c == NOCHAR)
2072 throw out_of_input; 2411 throw out_of_input;
2073 2412
2074 return c; 2413 return c;
… …
2078/*----------------------------------------------------------------------*/ 2417/*----------------------------------------------------------------------*/
2079#ifdef PRINTPIPE 2418#ifdef PRINTPIPE
2080FILE * 2419FILE *
2081rxvt_term::popen_printer () 2420rxvt_term::popen_printer ()
2082{ 2421{
2083 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2422 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2084 2423
2085 if (stream == NULL) 2424 if (stream == NULL)
2086 rxvt_warn ("can't open printer pipe, not printing.\n"); 2425 rxvt_warn ("can't open printer pipe, not printing.\n");
2087 2426
2088 return stream; 2427 return stream;
… …
2099 * simulate attached vt100 printer 2438 * simulate attached vt100 printer
2100 */ 2439 */
2101void 2440void
2102rxvt_term::process_print_pipe () 2441rxvt_term::process_print_pipe ()
2103{ 2442{
2104 int done; 2443 FILE *fd = popen_printer ();
2105 FILE *fd;
2106 2444
2107 if ((fd = popen_printer ()) == NULL) 2445 if (!fd)
2108 return; 2446 return;
2109 2447
2110 /* 2448 /*
2111 * Send all input to the printer until either ESC[4i or ESC[?4i 2449 * Send all input to the printer until either ESC[4i or ESC[?4i
2112 * is received. 2450 * is received.
2113 */ 2451 */
2114 for (done = 0; !done;) 2452 for (int done = 0; !done; )
2115 { 2453 {
2116 unsigned char buf[8]; 2454 unsigned char buf[8];
2117 unicode_t ch; 2455 unicode_t ch;
2118 unsigned int i, len; 2456 unsigned int i, len;
2119 2457
… …
2138 { 2476 {
2139 if ((buf[len++] = cmd_getc ()) == 'i') 2477 if ((buf[len++] = cmd_getc ()) == 'i')
2140 break; /* done = 1 */ 2478 break; /* done = 1 */
2141 } 2479 }
2142 } 2480 }
2143 2481
2144 for (i = 0; i < len; i++) 2482 for (i = 0; i < len; i++)
2145 if (putc (buf[i], fd) == EOF) 2483 if (putc (buf[i], fd) == EOF)
2146 { 2484 {
2147 done = 1; 2485 done = 1;
2148 break; 2486 break;
… …
2150 } 2488 }
2151 } 2489 }
2152 2490
2153 pclose_printer (fd); 2491 pclose_printer (fd);
2154} 2492}
2155#endif /* PRINTPIPE */ 2493#endif /* PRINTPIPE */
2156/*}}} */ 2494/*}}} */
2157 2495
2158/* *INDENT-OFF* */ 2496/* *INDENT-OFF* */
2159enum { 2497enum {
2160 C1_40 = 0x40, 2498 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2499 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, 2500 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, 2501 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 2502 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 2503};
2166/* *INDENT-ON* */ 2504/* *INDENT-ON* */
2167 2505
2168/*{{{ process non-printing single characters */ 2506/*{{{ process non-printing single characters */
2169void 2507void
… …
2174 case C0_ESC: 2512 case C0_ESC:
2175 process_escape_seq (); 2513 process_escape_seq ();
2176 break; 2514 break;
2177 case C0_ENQ: /* terminal Status */ 2515 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2516 if (rs[Rs_answerbackstring])
2179 tt_write ( 2517 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 2518 else
2183 tt_write ((unsigned char *)VT100_ANS, 2519 tt_write (VT100_ANS, strlen (VT100_ANS));
2184 (unsigned int)STRLEN (VT100_ANS));
2185 break; 2520 break;
2186 case C0_BEL: /* bell */ 2521 case C0_BEL: /* bell */
2187 scr_bell (); 2522 scr_bell ();
2188 break; 2523 break;
2189 case C0_BS: /* backspace */ 2524 case C0_BS: /* backspace */
… …
2205 break; 2540 break;
2206 case C0_SI: /* shift in - acs */ 2541 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2542 scr_charset_choose (0);
2208 break; 2543 break;
2209 2544
2545#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 2546 // 8-bit controls
2211 case 0x90: /* DCS */ 2547 case 0x90: /* DCS */
2212 process_dcs_seq (); 2548 process_dcs_seq ();
2213 break; 2549 break;
2214 case 0x9b: /* CSI */ 2550 case 0x9b: /* CSI */
2215 process_csi_seq (); 2551 process_csi_seq ();
2216 break; 2552 break;
2217 case 0x9d: /* CSI */ 2553 case 0x9d: /* OSC */
2218 process_osc_seq (); 2554 process_osc_seq ();
2219 break; 2555 break;
2556#endif
2220 } 2557 }
2221} 2558}
2222/*}}} */ 2559/*}}} */
2223 2560
2224 2561
… …
2265 break; 2602 break;
2266 case 'Z': /* identify the terminal type */ 2603 case 'Z': /* identify the terminal type */
2267 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2604 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2268 break; 2605 break;
2269 case '<': /* turn off VT52 mode */ 2606 case '<': /* turn off VT52 mode */
2270 PrivMode (0, PrivMode_vt52); 2607 set_privmode (PrivMode_vt52, 0);
2271 break; 2608 break;
2272 case 'F': /* use special graphics character set */ 2609 case 'F': /* use special graphics character set */
2273 case 'G': /* use regular character set */ 2610 case 'G': /* use regular character set */
2274 /* unimplemented */ 2611 /* unimplemented */
2275 break; 2612 break;
… …
2286void 2623void
2287rxvt_term::process_escape_seq () 2624rxvt_term::process_escape_seq ()
2288{ 2625{
2289 unicode_t ch = cmd_getc (); 2626 unicode_t ch = cmd_getc ();
2290 2627
2291 if (PrivateModes & PrivMode_vt52) 2628 if (priv_modes & PrivMode_vt52)
2292 { 2629 {
2293 process_escape_vt52 (ch); 2630 process_escape_vt52 (ch);
2294 return; 2631 return;
2295 } 2632 }
2296 2633
… …
2311 scr_charset_set (2, (unsigned int)cmd_getc ()); 2648 scr_charset_set (2, (unsigned int)cmd_getc ());
2312 break; 2649 break;
2313 case '+': 2650 case '+':
2314 scr_charset_set (3, (unsigned int)cmd_getc ()); 2651 scr_charset_set (3, (unsigned int)cmd_getc ());
2315 break; 2652 break;
2316#ifndef NO_FRILLS 2653#if !ENABLE_MINIMAL
2317 case '6': 2654 case '6':
2318 scr_backindex (); 2655 scr_backindex ();
2319 break; 2656 break;
2320#endif 2657#endif
2321 case '7': 2658 case '7':
2322 scr_cursor (SAVE); 2659 scr_cursor (SAVE);
2323 break; 2660 break;
2324 case '8': 2661 case '8':
2325 scr_cursor (RESTORE); 2662 scr_cursor (RESTORE);
2326 break; 2663 break;
2327#ifndef NO_FRILLS 2664#if !ENABLE_MINIMAL
2328 case '9': 2665 case '9':
2329 scr_forwardindex (); 2666 scr_forwardindex ();
2330 break; 2667 break;
2331#endif 2668#endif
2332 case '=': 2669 case '=':
2333 case '>': 2670 case '>':
2334 PrivMode ((ch == '='), PrivMode_aplKP); 2671 set_privmode (PrivMode_aplKP, ch == '=');
2335 break; 2672 break;
2336 2673
2337 case C1_40: 2674 case C1_40:
2338 cmd_getc (); 2675 cmd_getc ();
2339 break; 2676 break;
… …
2342 break; 2679 break;
2343 2680
2344 /* 8.3.87: NEXT LINE */ 2681 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 2682 case C1_NEL: /* ESC E */
2346 { 2683 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 2684 wchar_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 2685 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2349 } 2686 }
2350 break; 2687 break;
2351 2688
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 2689 /* kidnapped escape sequence: Should be 8.3.48 */
2353 case C1_ESA: /* ESC G */ 2690 case C1_ESA: /* ESC G */
… …
2363 case C1_RI: /* ESC M */ 2700 case C1_RI: /* ESC M */
2364 scr_index (DN); 2701 scr_index (DN);
2365 break; 2702 break;
2366 2703
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 2704 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 2705 /*case C1_SS2: scr_single_shift (2); break; */
2369 2706
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 2707 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 2708 /*case C1_SS3: scr_single_shift (3); break; */
2372 2709
2373 /* 8.3.27: DEVICE CONTROL STRING */ 2710 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 2711 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 2712 process_dcs_seq ();
2376 break; 2713 break;
2377 2714
2378 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2715 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2379 case C1_SCI: /* ESC Z */ 2716 case C1_SCI: /* ESC Z */
2380 tt_write ((const unsigned char *)ESCZ_ANSWER, 2717 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2381 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2382 break; /* steal obsolete ESC [ c */ 2718 break; /* steal obsolete ESC [ c */
2383 2719
2384 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2720 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2385 case C1_CSI: /* ESC [ */ 2721 case C1_CSI: /* ESC [ */
2386 process_csi_seq (); 2722 process_csi_seq ();
2387 break; 2723 break;
2388 2724
2389 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2725 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2390 case C1_OSC: /* ESC ] */ 2726 case C1_OSC: /* ESC ] */
2391 process_osc_seq (); 2727 process_osc_seq ();
2392 break; 2728 break;
2393 2729
2394 /* 8.3.106: RESET TO INITIAL STATE */ 2730 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2395 case 'c': 2731 case 'c':
2732 mbstate.reset ();
2396 scr_poweron (); 2733 scr_poweron ();
2397 scrollbar_show (1); 2734 scrollBar.show (1);
2398 break; 2735 break;
2399 2736
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2737 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2401 case 'n': 2738 case 'n':
2402 scr_charset_choose (2); 2739 scr_charset_choose (2);
… …
2412 2749
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2750/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */ 2751/* *INDENT-OFF* */
2415enum { 2752enum {
2416 CSI_ICH = 0x40, 2753 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2754 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 , 2755 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, 2756 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, 2757 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, 2758 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, 2759 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, */ 2774 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, [, \, ], ^, _, */ 2775 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, */ 2776 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, */ 2777 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, */ 2778 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, {, |, }, ~, */ 2779 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 2780 };
2444/* *INDENT-ON* */ 2781/* *INDENT-ON* */
2445 2782
2446void 2783void
2447rxvt_term::process_csi_seq () 2784rxvt_term::process_csi_seq ()
2448{ 2785{
2449 unicode_t ch, priv, i; 2786 unicode_t ch, priv, i;
2450 unsigned int nargs, p; 2787 unsigned int nargs, p;
2451 int n, ndef; 2788 int n, ndef;
2452 int arg[ESC_ARGS]; 2789 int arg[ESC_ARGS] = { };
2453 2790
2454 for (nargs = ESC_ARGS; nargs > 0;) 2791 nargs = 0;
2455 arg[--nargs] = 0;
2456 2792
2457 priv = 0; 2793 priv = 0;
2458 ch = cmd_getc (); 2794 ch = cmd_getc ();
2459 if (ch >= '<' && ch <= '?') 2795 if ((ch >= '<' && ch <= '?') || ch == '!')
2796 {
2460 { /* '<' '=' '>' '?' */ 2797 /* '<' '=' '>' '?' '!' */
2461 priv = ch; 2798 priv = ch;
2462 ch = cmd_getc (); 2799 ch = cmd_getc ();
2463 } 2800 }
2464 2801
2465 /* read any numerical arguments */ 2802 /* read any numerical arguments */
… …
2494 ndef = get_byte_array_bit (csi_defaults, i); 2831 ndef = get_byte_array_bit (csi_defaults, i);
2495 for (p = 0; p < nargs; p++) 2832 for (p = 0; p < nargs; p++)
2496 if (arg[p] == -1) 2833 if (arg[p] == -1)
2497 arg[p] = ndef; 2834 arg[p] = ndef;
2498 2835
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 /* 2836 /*
2507 * private mode handling 2837 * private mode handling
2508 */ 2838 */
2509 if (priv) 2839 if (priv)
2510 { 2840 {
2511 switch (priv) 2841 switch (priv)
2512 { 2842 {
2513 case '>': 2843 case '>':
2514 if (ch == CSI_DA) /* secondary device attributes */ 2844 if (ch == CSI_DA) /* secondary device attributes */
2845 {
2846 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2847 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2848 //
2849 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2850 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2851 // versions.
2852 //
2515 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2853 tt_printf ("\033[>%d;95;0c", 'U');
2854 }
2516 break; 2855 break;
2856
2517 case '?': 2857 case '?':
2518 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2858 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2519 process_terminal_mode (ch, priv, nargs, arg); 2859 process_terminal_mode (ch, priv, nargs, arg);
2520 break; 2860 break;
2861
2862 case '!':
2863 if (ch == CSI_70)
2864 {
2865 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2866 scr_soft_reset ();
2867
2868 static const int pm_h[] = { 7, 25 };
2869 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2870
2871 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2872 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2521 } 2873 }
2874 break;
2875 }
2876
2522 return; 2877 return;
2523 } 2878 }
2524 2879
2525 switch (ch) 2880 switch (ch)
2526 { 2881 {
… …
2625 2980
2626 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2981 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2627 arg[0] = -arg[0]; 2982 arg[0] = -arg[0];
2628 /* FALLTHROUGH */ 2983 /* FALLTHROUGH */
2629 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2984 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2630 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2985 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2631 break; 2986 break;
2632 2987
2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2988 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2634 tt_write ((const unsigned char *)VT100_ANS, 2989 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2635 (unsigned int) (sizeof (VT100_ANS) - 1));
2636 break; 2990 break;
2637 2991
2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2992 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2639 process_sgr_mode (nargs, arg); 2993 process_sgr_mode (nargs, arg);
2640 break; 2994 break;
… …
2646 tt_printf ("\033[0n"); 3000 tt_printf ("\033[0n");
2647 break; 3001 break;
2648 case 6: /* CPR requested */ 3002 case 6: /* CPR requested */
2649 scr_report_position (); 3003 scr_report_position ();
2650 break; 3004 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 3005 case 7: /* unofficial extension */
3006 if (option (Opt_insecure))
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3007 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2654 break; 3008 break;
2655#endif
2656 case 8: /* unofficial extension */ 3009 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3010 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 3011 break;
2659 } 3012 }
2660 break; 3013 break;
2661 3014
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3015 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2695 break; 3048 break;
2696 3049
2697 case CSI_RM: /* 8.3.107: RESET MODE */ 3050 case CSI_RM: /* 8.3.107: RESET MODE */
2698 if (arg[0] == 4) 3051 if (arg[0] == 4)
2699 scr_insert_mode (0); 3052 scr_insert_mode (0);
3053 else if (arg[0] == 20)
3054 priv_modes &= ~PrivMode_LFNL;
2700 break; 3055 break;
2701 3056
2702 case CSI_SM: /* 8.3.126: SET MODE */ 3057 case CSI_SM: /* 8.3.126: SET MODE */
2703 if (arg[0] == 4) 3058 if (arg[0] == 4)
2704 scr_insert_mode (1); 3059 scr_insert_mode (1);
3060 else if (arg[0] == 20)
3061 priv_modes |= PrivMode_LFNL;
2705 break; 3062 break;
2706 3063
2707 /* 3064 /*
2708 * PRIVATE USE beyond this point. All CSI_7? sequences here 3065 * PRIVATE USE beyond this point. All CSI_7? sequences here
2709 */ 3066 */
… …
2721 break; 3078 break;
2722 case CSI_75: 3079 case CSI_75:
2723 scr_cursor (RESTORE); 3080 scr_cursor (RESTORE);
2724 break; 3081 break;
2725 3082
2726#ifndef NO_FRILLS 3083#if !ENABLE_MINIMAL
2727 case CSI_74: 3084 case CSI_74:
2728 process_window_ops (arg, nargs); 3085 process_window_ops (arg, nargs);
2729 break; 3086 break;
2730#endif 3087#endif
2731 3088
… …
2738 break; 3095 break;
2739 } 3096 }
2740} 3097}
2741/*}}} */ 3098/*}}} */
2742 3099
2743#ifndef NO_FRILLS 3100#if !ENABLE_MINIMAL
2744/* ARGSUSED */ 3101/* ARGSUSED */
2745void 3102void
2746rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3103rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2747{ 3104{
2748 int x, y; 3105 int x, y;
2749 XWindowAttributes wattr; 3106 XWindowAttributes wattr;
2750 Window wdummy; 3107 Window wdummy;
3108
3109 dLocal (Display *, dpy);
2751 3110
2752 if (nargs == 0) 3111 if (nargs == 0)
2753 return; 3112 return;
2754 3113
2755 switch (args[0]) 3114 switch (args[0])
2756 { 3115 {
2757 /* 3116 /*
2758 * commands 3117 * commands
2759 */ 3118 */
2760 case 1: /* deiconify window */ 3119 case 1: /* deiconify window */
2761 XMapWindow (display->display, TermWin.parent[0]); 3120 XMapWindow (dpy, parent[0]);
2762 break; 3121 break;
2763 case 2: /* iconify window */ 3122 case 2: /* iconify window */
2764 XIconifyWindow (display->display, TermWin.parent[0], 3123 XIconifyWindow (dpy, parent[0], display->screen);
2765 DefaultScreen (display->display));
2766 break; 3124 break;
2767 case 3: /* set position (pixels) */ 3125 case 3: /* set position (pixels) */
2768 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3126 XMoveWindow (dpy, parent[0], args[1], args[2]);
2769 break; 3127 break;
2770 case 4: /* set size (pixels) */ 3128 case 4: /* set size (pixels) */
2771 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3129 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
2772 break; 3130 break;
2773 case 5: /* raise window */ 3131 case 5: /* raise window */
2774 XRaiseWindow (display->display, TermWin.parent[0]); 3132 XRaiseWindow (dpy, parent[0]);
2775 break; 3133 break;
2776 case 6: /* lower window */ 3134 case 6: /* lower window */
2777 XLowerWindow (display->display, TermWin.parent[0]); 3135 XLowerWindow (dpy, parent[0]);
2778 break; 3136 break;
2779 case 7: /* refresh window */ 3137 case 7: /* refresh window */
2780 scr_touch (true); 3138 scr_touch (true);
2781 break; 3139 break;
2782 case 8: /* set size (chars) */ 3140 case 8: /* set size (chars) */
2783 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3141 set_widthheight ((unsigned int) (args[2] * fwidth),
2784 (unsigned int) (args[1] * TermWin.fheight)); 3142 (unsigned int) (args[1] * fheight));
2785 break; 3143 break;
2786 3144
2787 //case 9: NYI, TODO, restore maximized window or maximize window 3145 //case 9: NYI, TODO, restore maximized window or maximize window
2788 default: 3146 default:
2789 if (args[0] >= 24) /* set height (chars) */ 3147 if (args[0] >= 24) /* set height (chars) */
2790 set_widthheight ((unsigned int)TermWin.width, 3148 set_widthheight ((unsigned int)width,
2791 (unsigned int) (args[1] * TermWin.fheight)); 3149 (unsigned int) (args[1] * fheight));
2792 break; 3150 break;
2793
2794 3151
2795 /* 3152 /*
2796 * reports - some output format copied from XTerm 3153 * reports - some output format copied from XTerm
2797 */ 3154 */
2798 case 11: /* report window state */ 3155 case 11: /* report window state */
2799 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3156 XGetWindowAttributes (dpy, parent[0], &wattr);
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3157 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3158 break;
2802 case 13: /* report window position */ 3159 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3160 XGetWindowAttributes (dpy, parent[0], &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3161 XTranslateCoordinates (dpy, parent[0], wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3162 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3163 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3164 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3165 break;
2809 case 14: /* report window size (pixels) */ 3166 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3167 XGetWindowAttributes (dpy, parent[0], &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3168 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2812 break; 3169 break;
2813 case 18: /* report text area size (chars) */ 3170 case 18: /* report text area size (chars) */
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3171 tt_printf ("\033[8;%d;%dt", nrow, ncol);
2815 break; 3172 break;
2816 case 19: /* report window size (chars) */ 3173 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3174 tt_printf ("\033[9;%d;%dt", nrow, ncol);
2818 break; 3175 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3176 case 20: /* report icon label */
3177 {
3178 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3179 XGetIconName (dpy, parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3180 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3181 XFree (s);
3182 }
2823 break; 3183 break;
2824 case 21: /* report window title */ 3184 case 21: /* report window title */
3185 {
3186 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3187 XFetchName (dpy, parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3188 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3189 XFree (s);
3190 }
2827 break; 3191 break;
2828#endif
2829 } 3192 }
2830} 3193}
2831#endif 3194#endif
2832 3195
2833/*----------------------------------------------------------------------*/ 3196/*----------------------------------------------------------------------*/
2834/* 3197/*
2835 * get input up until STRING TERMINATOR (or BEL) 3198 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3199 * ends_how is terminator used. returned input must be free()'d
2837 */ 3200 */
2838unsigned char * 3201char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3202rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3203{
2841 int seen_esc = 0; /* seen escape? */ 3204 unicode_t ch;
3205 bool seen_esc = false;
2842 unsigned int n = 0; 3206 unsigned int n = 0;
2843 unsigned char *s;
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX]; 3207 wchar_t string[STRING_MAX];
2846 3208
2847 while ((ch = cmd_getc ())) 3209 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3210 {
2849 if (ch == C0_BEL 3211 if (seen_esc)
2850 || ch == CHAR_ST 3212 {
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3213 if (ch == 0x5c) /* 7bit ST */
2852 break; 3214 break;
2853 3215 else
3216 return NULL;
3217 }
2854 if (ch == C0_ESC) 3218 else if (ch == C0_ESC)
2855 { 3219 {
2856 seen_esc = 1; 3220 seen_esc = true;
2857 continue; 3221 continue;
2858 } 3222 }
3223 else if (ch == C0_BEL || ch == CHAR_ST)
3224 break;
2859 else if (ch == '\t') 3225 else if (ch == C0_SYN)
2860 ch = ' '; /* translate '\t' to space */ 3226 ch = cmd_get8 ();
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3227 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3228 return NULL; /* other control character - exit */
2863 3229
2864 if (n < sizeof (string) - 1) 3230 seen_esc = false;
3231
3232 if (n >= STRING_MAX - 1)
3233 // stop at some sane length
3234 return NULL;
3235
2865 string[n++] = ch; 3236 string[n++] = ch;
2866
2867 seen_esc = 0;
2868 } 3237 }
2869 3238
2870 string[n++] = '\0'; 3239 string[n++] = '\0';
2871 3240
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2873 return NULL;
2874
2875 ends_how = (ch == 0x5c ? C0_ESC : ch); 3241 ends_how = (ch == 0x5c ? C0_ESC : ch);
2876 STRNCPY (s, string, n); 3242
2877 return s; 3243 return rxvt_wcstombs (string);
2878} 3244}
2879 3245
2880/*----------------------------------------------------------------------*/ 3246/*----------------------------------------------------------------------*/
2881/* 3247/*
2882 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3248 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2883 */ 3249 */
2884void 3250void
2885rxvt_term::process_dcs_seq () 3251rxvt_term::process_dcs_seq ()
2886{ 3252{
2887 unsigned char *s;
2888 unicode_t eh;
2889
2890 /* 3253 /*
2891 * Not handled yet 3254 * Not handled yet
2892 */ 3255 */
3256
3257 unicode_t eh;
2893 s = get_to_st (eh); 3258 char *s = get_to_st (eh);
2894 if (s) 3259 if (s)
2895 free (s); 3260 free (s);
2896 3261
2897 return; 3262 return;
2898} 3263}
… …
2902 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3267 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2903 */ 3268 */
2904void 3269void
2905rxvt_term::process_osc_seq () 3270rxvt_term::process_osc_seq ()
2906{ 3271{
2907 unicode_t ch, eh;
2908 int arg; 3272 int arg;
2909 3273
2910 ch = cmd_getc (); 3274 unicode_t ch = cmd_getc ();
2911 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3275 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2912 arg = arg * 10 + (ch - '0'); 3276 arg = arg * 10 + (ch - '0');
2913 3277
2914 if (ch == ';') 3278 if (ch == ';')
2915 { 3279 {
3280 unicode_t eh;
2916 unsigned char *s = get_to_st (eh); 3281 char *s = get_to_st (eh);
2917 3282
2918 if (s) 3283 if (s)
2919 { 3284 {
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); 3285 process_xterm_seq (arg, s, eh);
2932
2933 free (s); 3286 free (s);
2934 } 3287 }
2935 } 3288 }
2936} 3289}
3290
3291void
3292rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3293{
3294 if (str[0] == '?' && !str[1])
3295 {
3296 rgba c;
3297 pix_colors_focused[color].get (c);
3298
3299#if XFT
3300 if (c.a != rgba::MAX_CC)
3301 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3302 else
3303#endif
3304 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3305 }
3306 else
3307 set_window_color (color, str);
3308}
3309
2937/* 3310/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3311 * 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 */ 3312 */
2960void 3313void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3314rxvt_term::process_xterm_seq (int op, char *str, char resp)
2962{ 3315{
2963 int changed = 0;
2964 int color; 3316 int color;
2965 char *buf, *name; 3317 char *buf, *name;
3318 bool query = str[0] == '?' && !str[1];
3319 int saveop = op;
3320
3321 dLocal (Display *, dpy);
2966 3322
2967 assert (str != NULL); 3323 assert (str != NULL);
3324
3325 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3326 return;
3327
2968 switch (op) 3328 switch (op)
2969 { 3329 {
2970 case XTerm_name: 3330 case XTerm_name:
2971 set_title (str); 3331 set_title (str);
2972 /* FALLTHROUGH */ 3332 /* FALLTHROUGH */
… …
2974 set_icon_name (str); 3334 set_icon_name (str);
2975 break; 3335 break;
2976 case XTerm_title: 3336 case XTerm_title:
2977 set_title (str); 3337 set_title (str);
2978 break; 3338 break;
3339 case XTerm_property:
3340 if (str[0] == '?')
3341 {
3342 Atom prop = display->atom (str + 1);
3343 Atom actual_type;
3344 int actual_format;
3345 unsigned long nitems;
3346 unsigned long bytes_after;
3347 unsigned char *value = 0;
3348 const char *str = "";
3349
3350 if (prop
3351 && XGetWindowProperty (dpy, parent[0],
3352 prop, 0, 1<<16, 0, AnyPropertyType,
3353 &actual_type, &actual_format,
3354 &nitems, &bytes_after, &value) == Success
3355 && actual_type != None
3356 && actual_format == 8)
3357 str = (const char *)(value);
3358
3359 tt_printf ("\033]%d;%s%c", op, str, resp);
3360
3361 XFree (value);
3362 }
3363 else
3364 {
3365 char *eq = strchr (str, '=');
3366
3367 if (eq)
3368 {
3369 *eq = 0;
3370 set_utf8_property (display->atom (str), eq + 1);
3371 }
3372 else
3373 XDeleteProperty (dpy, parent[0],
3374 display->atom (str));
3375 }
3376 break;
3377
2979 case XTerm_Color: 3378 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3379 for (buf = (char *)str; buf && *buf;)
2981 { 3380 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3381 if ((name = strchr (buf, ';')) == NULL)
2983 break; 3382 break;
2984 3383
2985 *name++ = '\0'; 3384 *name++ = '\0';
2986 color = atoi (buf); 3385 color = atoi (buf) + minCOLOR;
2987 3386
2988 if (color < 0 || color >= TOTAL_COLORS) 3387 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
2989 break; 3388 break;
2990 3389
2991 if ((buf = STRCHR (name, ';')) != NULL) 3390 if ((buf = strchr (name, ';')) != NULL)
2992 *buf++ = '\0'; 3391 *buf++ = '\0';
2993 3392
2994 set_window_color (color + minCOLOR, name); 3393 process_color_seq (op, color, name, resp);
2995 } 3394 }
3395 break;
3396 case Rxvt_restoreFG:
3397 case XTerm_Color00:
3398 process_color_seq (op, Color_fg, str, resp);
3399 break;
3400 case Rxvt_restoreBG:
3401 case XTerm_Color01:
3402 process_color_seq (op, Color_bg, str, resp);
2996 break; 3403 break;
2997#ifndef NO_CURSORCOLOR 3404#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3405 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3406 process_color_seq (op, Color_cursor, str, resp);
3000 break; 3407 break;
3001#endif 3408#endif
3002 case XTerm_Color_pointer: 3409 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3410 process_color_seq (op, Color_pointer_fg, str, resp);
3004 break; 3411 break;
3412 case XTerm_Color_pointer_bg:
3413 process_color_seq (op, Color_pointer_bg, str, resp);
3414 break;
3415#ifdef OPTION_HC
3416 case XTerm_Color_HC:
3417 process_color_seq (op, Color_HC, str, resp);
3418 break;
3419 case XTerm_Color_HTC:
3420 process_color_seq (op, Color_HTC, str, resp);
3421 break;
3422#endif
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3423#ifndef NO_BOLD_UNDERLINE_REVERSE
3006 case XTerm_Color_BD: 3424 case URxvt_Color_BD:
3007 set_window_color (Color_BD, str); 3425 process_color_seq (op, Color_BD, str, resp);
3008 break; 3426 break;
3009 case XTerm_Color_UL: 3427 case URxvt_Color_UL:
3010 set_window_color (Color_UL, str); 3428 process_color_seq (op, Color_UL, str, resp);
3011 break; 3429 break;
3012 case XTerm_Color_RV: 3430 case URxvt_Color_IT:
3013 set_window_color (Color_RV, str); 3431 process_color_seq (op, Color_IT, str, resp);
3014 break; 3432 break;
3015#endif 3433#endif
3016 3434 case URxvt_Color_border:
3017 case XTerm_Menu: 3435 process_color_seq (op, Color_border, str, resp);
3436 break;
3437#if ENABLE_TRANSPARENCY
3438 case URxvt_Color_tint:
3439 process_color_seq (op, Color_tint, str, resp);
3018 /* 3440 {
3019 * rxvt_menubar_dispatch () violates the constness of the string, 3441 bool changed = false;
3020 * so DON'T do it here 3442
3443 if (ISSET_PIXCOLOR (Color_tint))
3444 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3445 else
3446 changed = bgPixmap.unset_tint ();
3447
3448 if (changed)
3449 update_background ();
3021 */ 3450 }
3451
3022 break; 3452 break;
3453#endif
3454
3455#if BG_IMAGE_FROM_FILE
3023 case XTerm_Pixmap: 3456 case Rxvt_Pixmap:
3024 if (*str != ';') 3457 if (!strcmp (str, "?"))
3025 { 3458 {
3026#if XPM_BACKGROUND 3459 char str[256];
3027 scale_pixmap (""); /* reset to default scaling */ 3460
3028 set_bgPixmap (str); /* change pixmap */ 3461 sprintf (str, "[%dx%d+%d+%d]",
3029#endif 3462 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3030 scr_touch (true); 3463 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3464 process_xterm_seq (XTerm_title, str, CHAR_ST);
3031 } 3465 }
3032 while ((str = STRCHR (str, ';')) != NULL) 3466 else
3033 { 3467 {
3468 int changed = 0;
3469
3470 if (*str != ';')
3471 {
3472 if (bgPixmap.set_file (str)) /* change pixmap */
3473 {
3474 changed++;
3475 str = strchr (str, ';');
3476 if (str == NULL)
3477 bgPixmap.set_defaultGeometry ();
3478 else
3479 bgPixmap.set_geometry (str+1);
3480 }
3481 }
3482 else
3483 {
3034 str++; 3484 str++;
3035#if XPM_BACKGROUND 3485 if (bgPixmap.set_geometry (str, true))
3036 changed += scale_pixmap (str); 3486 changed++;
3037#endif 3487 }
3038 3488
3489 if (changed)
3490 {
3491 if (bgPixmap.window_position_sensitive ())
3492 {
3493 int x, y;
3494 get_window_origin (x, y);
3495 bgPixmap.set_position (x, y);
3496 }
3497 update_background ();
3498 }
3039 } 3499 }
3040 if (changed)
3041 {
3042#ifdef XPM_BACKGROUND
3043 resize_pixmap ();
3044#endif
3045 scr_touch (true);
3046 }
3047 break; 3500 break;
3501#endif
3048 3502
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: 3503 case XTerm_logfile:
3056 // TODO, when secure mode? 3504 // TODO, when secure mode?
3057 break; 3505 break;
3058 case XTerm_font: 3506
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 3507#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3508 case Rxvt_dumpscreen: /* no error notices */
3082 { 3509 {
3083 int fd; 3510 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3511 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3512 {
3086 scr_dump (fd); 3513 scr_dump (fd);
3087 close (fd); 3514 close (fd);
3088 } 3515 }
3089 } 3516 }
3517 break;
3518#endif
3519 case XTerm_font:
3520 op = URxvt_font;
3521 case URxvt_font:
3522#if ENABLE_STYLES
3523 case URxvt_boldFont:
3524 case URxvt_italicFont:
3525 case URxvt_boldItalicFont:
3526#endif
3527 if (query)
3528 tt_printf ("\33]%d;%-.250s%c", saveop,
3529 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3530 ? fontset[op - URxvt_font]->fontdesc : "",
3531 resp);
3532 else
3533 {
3534 const char *&res = rs[Rs_font + (op - URxvt_font)];
3535
3536 res = strdup (str);
3537 allocated.push_back ((void *)res);
3538 set_fonts ();
3539 }
3540 break;
3541
3542 case URxvt_version:
3543 if (query)
3544 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3545 op,
3546 rs[Rs_name], VERSION[0], VERSION[2],
3547 resp);
3548 break;
3549
3550#if !ENABLE_MINIMAL
3551 case URxvt_locale:
3552 if (query)
3553 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3554 else
3555 {
3556 set_locale (str);
3557 pty->set_utf8_mode (enc_utf8);
3558 init_xlocale ();
3559 }
3560 break;
3561
3562 case URxvt_view_up:
3563 case URxvt_view_down:
3564 {
3565 int lines = atoi (str);
3566
3567 if (lines)
3568 scr_page (op == URxvt_view_up ? UP : DN, lines);
3569 else
3570 scr_erase_savelines ();
3571 }
3572
3573 break;
3574#endif
3575
3576#if ENABLE_PERL
3577 case URxvt_perl:
3578 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3090 break; 3579 break;
3091#endif 3580#endif
3092 } 3581 }
3093} 3582}
3094/*----------------------------------------------------------------------*/ 3583/*----------------------------------------------------------------------*/
… …
3108{ 3597{
3109 int state; 3598 int state;
3110 3599
3111 if (mode == 's') 3600 if (mode == 's')
3112 { 3601 {
3113 SavedModes |= (PrivateModes & bit); 3602 SavedModes |= (priv_modes & bit);
3114 return -1; 3603 return -1;
3115 } 3604 }
3116 else 3605 else
3117 { 3606 {
3118 if (mode == 'r') 3607 if (mode == 'r')
3119 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3120 else 3609 else
3121 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3610 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3122 PrivMode (state, bit); 3611
3612 set_privmode (bit, state);
3123 } 3613 }
3124 3614
3125 return state; 3615 return state;
3126} 3616}
3127 3617
3128/* we're not using priv _yet_ */ 3618/* we're not using priv _yet_ */
3129void 3619void
3130rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3620rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3131{ 3621{
3132 unsigned int i, j; 3622 unsigned int i, j;
3133 int state; 3623 int state;
3134 3624
3135 static const struct 3625 static const struct
3136 { 3626 {
3137 const int argval; 3627 const int argval;
3138 const unsigned long bit; 3628 const unsigned long bit;
3139 }
3140
3141 argtopriv[] = { 3629 } argtopriv[] = {
3142 { 1, PrivMode_aplCUR }, 3630 { 1, PrivMode_aplCUR }, // DECCKM
3143 { 2, PrivMode_vt52 }, 3631 { 2, PrivMode_vt52 },
3144 { 3, PrivMode_132 }, 3632 { 3, PrivMode_132 }, // DECCOLM
3145 { 4, PrivMode_smoothScroll }, 3633 { 4, PrivMode_smoothScroll }, // DECSCLM
3146 { 5, PrivMode_rVideo }, 3634 { 5, PrivMode_rVideo }, // DECSCNM
3147 { 6, PrivMode_relOrigin }, 3635 { 6, PrivMode_relOrigin }, // DECOM
3148 { 7, PrivMode_Autowrap }, 3636 { 7, PrivMode_Autowrap }, // DECAWM
3637 // 8, auto-repeat keys // DECARM
3149 { 9, PrivMode_MouseX10 }, 3638 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 3639 // 18 end FF to printer after print screen
3151 { menuBar_esc, PrivMode_menuBar }, 3640 // 19 Print screen prints full screen/scroll region
3152#endif 3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3153#ifdef scrollBar_esc 3642#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 3643 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 3644#endif
3156 // 18, 19 printing-related
3157 { 25, PrivMode_VisibleCursor },
3158 // 30 show scrollbar rxvt. extension
3159 { 35, PrivMode_ShiftKeys }, // rxvt extension 3645 { 35, PrivMode_ShiftKeys }, // rxvt extension
3646 // 38, tektronix mode // DECTEK
3160 { 40, PrivMode_132OK }, 3647 { 40, PrivMode_132OK },
3161 // 41 xterm more fixes NYI 3648 // 41 xterm more fixes NYI
3162 // 45 margin bell NYI 3649 // 45 margin bell NYI
3163 // 46 start logging 3650 // 46 start logging
3164 { 47, PrivMode_Screen }, 3651 { 47, PrivMode_Screen },
3165 { 66, PrivMode_aplKP }, 3652 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3166#ifndef NO_BACKSPACE_KEY 3653#ifndef NO_BACKSPACE_KEY
3167 { 67, PrivMode_BackSpace }, 3654 { 67, PrivMode_BackSpace }, // DECBKM
3168#endif 3655#endif
3169 { 1000, PrivMode_MouseX11 }, 3656 { 1000, PrivMode_MouseX11 },
3170 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3657 { 1002, PrivMode_MouseBtnEvent },
3171 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3658 { 1003, PrivMode_MouseAnyEvent },
3172 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3173 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3659 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3174 { 1011, PrivMode_Keypress }, // rxvt extension 3660 { 1011, PrivMode_Keypress }, // rxvt extension
3175 // 1035 enable modifiers for alt, numlock NYI 3661 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 3662 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 3663 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 3664 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 3665 // 1048 save and restore cursor
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3666 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3667 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3668 { 2004, PrivMode_BracketPaste },
3182 }; 3669 };
3183 3670
3184 if (nargs == 0) 3671 if (nargs == 0)
3185 return; 3672 return;
3186 3673
… …
3203 } 3690 }
3204 3691
3205 /* extra handling for values with state unkept */ 3692 /* extra handling for values with state unkept */
3206 switch (arg[i]) 3693 switch (arg[i])
3207 { 3694 {
3695#if ENABLE_STYLES
3696 case 1021:
3697 set_option (Opt_intensityStyles, mode);
3698
3699 scr_touch (true);
3700 break;
3701#endif
3208 case 1048: /* alternative cursor save */ 3702 case 1048: /* alternative cursor save */
3209 case 1049: 3703 if (option (Opt_secondaryScreen))
3210 if (mode == 0) 3704 if (mode == 0)
3211 scr_cursor (RESTORE); 3705 scr_cursor (RESTORE);
3212 else if (mode == 1) 3706 else if (mode == 1)
3213 scr_cursor (SAVE); 3707 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 3708 break;
3215 } 3709 }
3216 3710
3217 if (state >= 0) 3711 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 3712 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 3713 switch (arg[i])
… …
3222 case 2: /* VT52 mode */ 3716 case 2: /* VT52 mode */
3223 /* oddball mode. should be set regardless of set/reset 3717 /* oddball mode. should be set regardless of set/reset
3224 * parameter. Return from VT52 mode with an ESC < from 3718 * parameter. Return from VT52 mode with an ESC < from
3225 * within VT52 mode 3719 * within VT52 mode
3226 */ 3720 */
3227 PrivMode (1, PrivMode_vt52); 3721 set_privmode (PrivMode_vt52, 1);
3228 break; 3722 break;
3229 case 3: /* 80/132 */ 3723 case 3: /* 80/132 */
3230 if (PrivateModes & PrivMode_132OK) 3724 if (priv_modes & PrivMode_132OK)
3231 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3725 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3232 break; 3726 break;
3233 case 4: /* smooth scrolling */ 3727 case 4: /* smooth scrolling */
3234 if (state) 3728 set_option (Opt_jumpScroll, !state);
3235 Options &= ~Opt_jumpScroll;
3236 else
3237 Options |= Opt_jumpScroll;
3238 break; 3729 break;
3239 case 5: /* reverse video */ 3730 case 5: /* reverse video */
3240 scr_rvideo_mode (state); 3731 scr_rvideo_mode (state);
3241 break; 3732 break;
3242 case 6: /* relative/absolute origins */ 3733 case 6: /* relative/absolute origins */
3243 scr_relative_origin (state); 3734 scr_relative_origin (state);
3244 break; 3735 break;
3245 case 7: /* autowrap */ 3736 case 7: /* autowrap */
3246 scr_autowrap (state); 3737 scr_autowrap (state);
3247 break; 3738 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 3739 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 3740 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 3741 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 3742 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3252 break; 3743 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 3744#ifdef scrollBar_esc
3261 case scrollBar_esc: 3745 case scrollBar_esc:
3262 if (scrollbar_mapping (state)) 3746 if (scrollBar.map (state))
3263 { 3747 {
3264 resize_all_windows (0, 0, 0); 3748 resize_all_windows (0, 0, 0);
3265 scr_touch (true); 3749 scr_touch (true);
3266 } 3750 }
3267 break; 3751 break;
3268#endif 3752#endif
3269 case 25: /* visible/invisible cursor */ 3753 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 3754 scr_cursor_visible (state);
3271 break; 3755 break;
3272 /* case 35: - shift keys */ 3756 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 3757 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 3758 case 47: /* secondary screen */
3275 scr_change_screen (state); 3759 scr_change_screen (state);
3276 break; 3760 break;
3277 /* case 66: - application key pad */ 3761 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 3762 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 3763 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 3764 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 3765 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3282 break; 3766 break;
3283#if 0
3284 case 1001: 3767 case 1002:
3285 break; /* X11 mouse highlighting */ 3768 case 1003:
3286#endif 3769 if (state)
3770 {
3771 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3772 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3773 vt_emask_mouse = PointerMotionMask;
3774 }
3775 else
3776 vt_emask_mouse = NoEventMask;
3777
3778 vt_select_input ();
3779 break;
3287 case 1010: /* scroll to bottom on TTY output inhibit */ 3780 case 1010: /* scroll to bottom on TTY output inhibit */
3288 if (state)
3289 Options &= ~Opt_scrollTtyOutput;
3290 else
3291 Options |= Opt_scrollTtyOutput; 3781 set_option (Opt_scrollTtyOutput, !state);
3292 break; 3782 break;
3293 case 1011: /* scroll to bottom on key press */ 3783 case 1011: /* scroll to bottom on key press */
3294 if (state)
3295 Options |= Opt_scrollTtyKeypress; 3784 set_option (Opt_scrollTtyKeypress, state);
3296 else
3297 Options &= ~Opt_scrollTtyKeypress;
3298 break; 3785 break;
3299 case 1047: /* secondary screen w/ clearing */ 3786 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 3787 if (option (Opt_secondaryScreen))
3301 if (current_screen != PRIMARY) 3788 if (!state)
3302 scr_erase_screen (2); 3789 scr_erase_screen (2);
3303 3790
3304 scr_change_screen (state); 3791 scr_change_screen (state);
3305 /* FALLTHROUGH */ 3792 break;
3793 case 1049: /* secondary screen w/ clearing first */
3794 if (option (Opt_secondaryScreen))
3795 if (state)
3796 scr_cursor (SAVE);
3797
3798 scr_change_screen (state);
3799
3800 if (option (Opt_secondaryScreen))
3801 if (state)
3802 scr_erase_screen (2);
3803 else
3804 scr_cursor (RESTORE);
3805 break;
3306 default: 3806 default:
3307 break; 3807 break;
3308 } 3808 }
3309 } 3809 }
3310} 3810}
… …
3333 rendset = 0, rendstyle = ~RS_None; 3833 rendset = 0, rendstyle = ~RS_None;
3334 break; 3834 break;
3335 case 1: 3835 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 3836 rendset = 1, rendstyle = RS_Bold;
3337 break; 3837 break;
3838 //case 2: // low intensity
3839 case 3:
3840 rendset = 1, rendstyle = RS_Italic;
3841 break;
3338 case 4: 3842 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 3843 rendset = 1, rendstyle = RS_Uline;
3340 break; 3844 break;
3341 case 5: 3845 case 5: // slowly blinking
3846 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 3847 rendset = 1, rendstyle = RS_Blink;
3343 break; 3848 break;
3849 //case 6: // scoansi light background
3344 case 7: 3850 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 3851 rendset = 1, rendstyle = RS_RVid;
3346 break; 3852 break;
3347 case 8: 3853 case 8:
3348 // invisible. NYI 3854 // invisible. NYI
3349 break; 3855 break;
3350 case 22: 3856 //case 9: // crossed out
3857 //case 10: // scoansi acs off, primary font
3858 //case 11: // scoansi acs on, first alt font
3859 //case 12: // scoansi acs on, |0x80, second alt font
3860 //...
3861 //case 19: // ninth alt font
3862 //case 20: // gothic
3863 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3351 rendset = 0, rendstyle = RS_Bold; 3864 rendset = 0, rendstyle = RS_Bold;
3865 break;
3866 case 22: // normal intensity
3867 rendset = 0, rendstyle = RS_Bold;
3868 break;
3869 case 23: // disable italic
3870 rendset = 0, rendstyle = RS_Italic;
3352 break; 3871 break;
3353 case 24: 3872 case 24:
3354 rendset = 0, rendstyle = RS_Uline; 3873 rendset = 0, rendstyle = RS_Uline;
3355 break; 3874 break;
3356 case 25: 3875 case 25:
3357 rendset = 0, rendstyle = RS_Blink; 3876 rendset = 0, rendstyle = RS_Blink;
3358 break; 3877 break;
3878 case 26: // variable spacing (iso 8613)
3879 rendset = 0, rendstyle = RS_Blink;
3880 break;
3359 case 27: 3881 case 27:
3360 rendset = 0, rendstyle = RS_RVid; 3882 rendset = 0, rendstyle = RS_RVid;
3361 break; 3883 break;
3362 case 28:
3363 // visible. NYI 3884 //case 28: // visible. NYI
3364 break; 3885 //case 29: // not crossed-out
3365 } 3886 }
3366 3887
3367 if (rendset != -1) 3888 if (rendset != -1)
3368 { 3889 {
3369 scr_rendition (rendset, rendstyle); 3890 scr_rendition (rendset, rendstyle);
… …
3380 case 35: 3901 case 35:
3381 case 36: 3902 case 36:
3382 case 37: 3903 case 37:
3383 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3904 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3384 break; 3905 break;
3385#ifdef TTY_256COLOR 3906 case 38: // set fg color, ISO 8613-6
3386 case 38:
3387 if (nargs > i + 2 && arg[i + 1] == 5) 3907 if (nargs > i + 2 && arg[i + 1] == 5)
3388 { 3908 {
3389 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3909 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3390 i += 2; 3910 i += 2;
3391 } 3911 }
3392 break; 3912 break;
3393#endif
3394 case 39: /* default fg */ 3913 case 39: /* default fg */
3395 scr_color (Color_fg, Color_fg); 3914 scr_color (Color_fg, Color_fg);
3396 break; 3915 break;
3397 3916
3398 case 40: 3917 case 40:
… …
3403 case 45: 3922 case 45:
3404 case 46: 3923 case 46:
3405 case 47: 3924 case 47:
3406 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3925 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3407 break; 3926 break;
3408#ifdef TTY_256COLOR 3927 case 48: // set bg color, ISO 8613-6
3409 case 48:
3410 if (nargs > i + 2 && arg[i + 1] == 5) 3928 if (nargs > i + 2 && arg[i + 1] == 5)
3411 { 3929 {
3412 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3930 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3413 i += 2; 3931 i += 2;
3414 } 3932 }
3415 break; 3933 break;
3416#endif
3417 case 49: /* default bg */ 3934 case 49: /* default bg */
3418 scr_color (Color_bg, Color_bg); 3935 scr_color (Color_bg, Color_bg);
3419 break; 3936 break;
3420 3937
3421#ifndef NO_BRIGHTCOLOR 3938 //case 50: // not variable spacing
3939
3940#if !ENABLE_MINIMAL
3422 case 90: 3941 case 90:
3423 case 91: /* set bright fg color */ 3942 case 91: /* set bright fg color */
3424 case 92: 3943 case 92:
3425 case 93: 3944 case 93:
3426 case 94: 3945 case 94:
3427 case 95: 3946 case 95:
3428 case 96: 3947 case 96:
3429 case 97: 3948 case 97:
3430 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3949 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3431 Color_fg);
3432 break; 3950 break;
3433 case 100: 3951 case 100:
3434 case 101: /* set bright bg color */ 3952 case 101: /* set bright bg color */
3435 case 102: 3953 case 102:
3436 case 103: 3954 case 103:
3437 case 104: 3955 case 104:
3438 case 105: 3956 case 105:
3439 case 106: 3957 case 106:
3440 case 107: 3958 case 107:
3441 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3959 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3442 Color_bg);
3443 break; 3960 break;
3444#endif 3961#endif
3445
3446 } 3962 }
3447 } 3963 }
3448} 3964}
3449/*}}} */ 3965/*}}} */
3450 3966
3451/*{{{ process Rob Nation's own graphics mode sequences */ 3967/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3452void 3968void
3453rxvt_term::process_graphics () 3969rxvt_term::process_graphics ()
3454{ 3970{
3455 unicode_t ch, cmd = cmd_getc (); 3971 unicode_t ch, cmd = cmd_getc ();
3456 3972
3457 if (cmd == 'Q') 3973 if (cmd == 'Q')
3974 {
3458 { /* query graphics */ 3975 /* query graphics */
3459 tt_printf ("\033G0\n"); /* no graphics */ 3976 tt_printf ("\033G0\012"); /* no graphics */
3460 return; 3977 return;
3461 } 3978 }
3462 /* swallow other graphics sequences until terminating ':' */ 3979 /* swallow other graphics sequences until terminating ':' */
3463 do 3980 do
3464 ch = cmd_getc (); 3981 ch = cmd_getc ();
… …
3474 */ 3991 */
3475void 3992void
3476rxvt_term::tt_printf (const char *fmt,...) 3993rxvt_term::tt_printf (const char *fmt,...)
3477{ 3994{
3478 va_list arg_ptr; 3995 va_list arg_ptr;
3479 unsigned char buf[256]; 3996 char buf[256];
3480 3997
3481 va_start (arg_ptr, fmt); 3998 va_start (arg_ptr, fmt);
3482 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3999 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3483 va_end (arg_ptr); 4000 va_end (arg_ptr);
3484 tt_write (buf, STRLEN (buf)); 4001 tt_write (buf, strlen (buf));
3485} 4002}
3486 4003
3487/* ---------------------------------------------------------------------- */ 4004/* ---------------------------------------------------------------------- */
3488/* Write data to the pty as typed by the user, pasted with the mouse, 4005/* 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. 4006 * or generated by us in response to a query ESC sequence.
3490 */ 4007 */
3491void
3492rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3493{
3494 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4008const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3495 4009
3496 if (len) 4010void
4011rxvt_term::tt_write (const char *data, unsigned int len)
4012{
4013 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4014 return;
4015
4016 if (pty->pty < 0)
4017 return;
4018
4019 if (v_buflen == 0)
4020 {
4021 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4022
4023 if ((unsigned int)written == len)
4024 return;
4025
4026 data += written;
4027 len -= written;
3497 { 4028 }
4029
4030 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4031
4032 memcpy (v_buffer + v_buflen, data, len);
4033 v_buflen += len;
4034
4035 pty_ev.set (ev::READ | ev::WRITE);
4036}
4037
4038void rxvt_term::pty_write ()
4039{
4040 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4041
4042 if (written > 0)
4043 {
4044 v_buflen -= written;
4045
3498 if (v_buflen == 0) 4046 if (v_buflen == 0)
3499 { 4047 {
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); 4048 free (v_buffer);
3527 v_buffer = 0; 4049 v_buffer = 0;
3528 v_buflen = 0;
3529 4050
3530 pty_ev.set (EVENT_READ); 4051 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; 4052 return;
3543 } 4053 }
4054
4055 memmove (v_buffer, v_buffer + written, v_buflen);
3544 } 4056 }
4057 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4058 pty_ev.set (ev::READ);
3545} 4059}
3546 4060
3547/*----------------------- end-of-file (C source) -----------------------*/ 4061/*----------------------- end-of-file (C source) -----------------------*/
3548 4062

Diff Legend

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