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

Diff Legend

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