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

Diff Legend

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