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

Diff Legend

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