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

Diff Legend

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