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

Diff Legend

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