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.90 by pcg, Fri Apr 2 19:09:52 2004 UTC vs.
Revision 1.337 by ayin, Sat Jul 28 20:04:00 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_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0,
106 XK_Home, 0x21f1,
107 XK_End, 0x21f2,
108
109 XK_Execute, 0x2318,
110 XK_Begin, 0x2320,
111 XK_Delete, 0x2326,
112 XK_Clear, 0x2327,
113 XK_BackSpace, 0x232b,
114 XK_Insert, 0x2380,
115 XK_Control_L, 0x2388,
116 XK_Control_R, 0x2388,
117 XK_Pause, 0x2389,
118 XK_Break, 0x238a,
119 XK_Escape, 0x238b,
120 XK_Undo, 0x238c,
121 XK_Print, 0x2399,
122
123 XK_space, 0x2423,
124
125#ifdef XK_KP_Begin
126 XK_KP_Prior, 0x21de,
127 XK_KP_Next, 0x21df,
128 XK_KP_Begin, 0x2320,
129 XK_KP_Insert, 0x2380,
130 XK_KP_Delete, 0x2326,
131 XK_KP_Space, 0x2422,
132#endif
133 0,
134};
135
63void 136void
137rxvt_term::iso14755_54 (int x, int y)
138{
139 x = Pixel2Col (x);
140 y = Pixel2Row (y);
141
142 if (!IN_RANGE_EXC (x, 0, ncol)
143 || !IN_RANGE_EXC (y, 0, nrow))
144 return;
145
146 for (;;)
147 {
148 const line_t &l = ROW(y + view_start);
149
150 text_t t = l.t[x];
151
152 if (t != NOCHAR || !x)
153 {
154 iso14755_51 (l.t[x], l.r[x], x, y);
155 iso14755buf = ISO_14755_54;
156 break;
157 }
158
159 x--;
160 }
161}
162
163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{
166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname;
169 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172
173# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch))
175 {
176 len = rxvt_composite.expand (ch, 0);
177 alloc = chr = new wchar_t[len];
178 rxvt_composite.expand (ch, chr);
179 }
180 else
181# endif
182 {
183 ch2 = ch;
184
185 alloc = 0;
186 chr = &ch2;
187 len = 1;
188 }
189
190 char attr[80]; // plenty
191
192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
193 (int)r,
194 fgcolor_of (r), bgcolor_of (r),
195 r & RS_Bold ? " bold" : "",
196 r & RS_Italic ? " italic" : "",
197 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : "");
201
202 int width = wcswidth (fname, wcslen (fname));
203
204 max_it (width, 8+5); // for char + hey
205 max_it (width, strlen (attr));
206
207 if (y >= 0)
208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0;
211 }
212
213 scr_overlay_new (x, y, width, len + 2);
214
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216
217 for (int y = 0; y < len; y++)
218 {
219 char buf[9];
220
221 ch = *chr++;
222
223 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '=');
226# if !UNICODE3
227 if (ch >= 0x10000)
228 ch = 0xfffd;
229# endif
230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
233 scr_overlay_set (12, y, NOCHAR, r);
234 }
235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
241 scr_overlay_set (0, len , attr);
242 scr_overlay_set (0, len + 1, fname);
243
244 free (fname);
245
246# if ENABLE_COMBINING
247 if (alloc)
248 delete [] alloc;
249# endif
250}
251#endif
252
253void
254rxvt_term::commit_iso14755 ()
255{
256 wchar_t ch[2];
257
258 ch[0] = iso14755buf & ISO_14755_MASK;
259 ch[1] = 0;
260
261 if (iso14755buf & ISO_14755_51)
262 {
263 char mb[16];
264 int len;
265
266 // allow verbatim 0-bytes and control-bytes to be entered
267 if (ch[0] >= 0x20)
268 len = wcstombs (mb, ch, 16);
269 else
270 {
271 mb[0] = ch[0];
272 len = 1;
273 }
274
275 if (len > 0)
276 tt_write (mb, len);
277 else
278 scr_bell ();
279 }
280
281 iso14755buf = 0;
282}
283
284int
64rxvt_term::lookup_key (XKeyEvent &ev) 285rxvt_term::hex_keyval (XKeyEvent &ev)
286{
287 // check wether this event corresponds to a hex digit
288 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++)
290 {
291 KeySym k = XLookupKeysym (&ev, index);
292
293 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
294 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
295 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
296 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
297 }
298
299 return -1;
300}
301#endif
302
303void
304rxvt_term::key_press (XKeyEvent &ev)
65{ 305{
66 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
67 unsigned int newlen; 307 unsigned int newlen;
68 KeySym keysym; 308 KeySym keysym;
69#ifdef DEBUG_CMD
70 static int debug_key = 1; /* accessible by a debugger only */
71#endif
72 int valid_keysym; 309 int valid_keysym;
73 unsigned char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
74 316
75 /* 317 /*
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
78 * 320 *
79 * Always permit `shift' to override the current setting 321 * Always permit `shift' to override the current setting
80 */ 322 */
81 shft = (ev.state & ShiftMask); 323 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 324 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 325 meta = ev.state & ModMetaMask;
84 326
85 if (numlock_state || (ev.state & ModNumLockMask)) 327 if (numlock_state || (ev.state & ModNumLockMask))
86 { 328 {
87 numlock_state = (ev.state & ModNumLockMask); 329 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 330 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
96 Status status_return; 338 Status status_return;
97 339
98#if 0 340#if 0
99#ifdef X_HAVE_UTF8_STRING 341#ifdef X_HAVE_UTF8_STRING
100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 342 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 343 len = Xutf8LookupString (Input_Context, &ev, kbuf,
102 KBUFSZ, &keysym, &status_return); 344 KBUFSZ, &keysym, &status_return);
103 else 345 else
104#endif 346#endif
105#endif 347#endif
106 { 348 {
… …
108 350
109 // the XOpenIM manpage lies about hardcoding the locale 351 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 352 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 353 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 354 SET_LOCALE (rs[Rs_imLocale]);
355
113 // assume wchar_t == unicode or better 356 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 357 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 358 KBUFSZ, &keysym, &status_return);
359
116 if (rs[Rs_imLocale]) 360 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 361 SET_LOCALE (locale);
118 362
119 if (status_return == XLookupChars 363 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 364 || status_return == XLookupBoth)
… …
141 || status_return == XLookupBoth; 385 || status_return == XLookupBoth;
142 } 386 }
143 else 387 else
144#endif 388#endif
145 { 389 {
146 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 390 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
147 valid_keysym = keysym != NoSymbol; 391 valid_keysym = keysym != NoSymbol;
148 } 392 }
149 393
150 if (valid_keysym) 394 if (valid_keysym)
151 { 395 {
396#ifdef KEYSYM_RESOURCE
397 if (keyboard->dispatch (this, keysym, ev.state))
398 return;
399#endif
400
152 if (TermWin.saveLines) 401 if (saveLines)
153 { 402 {
154#ifdef UNSHIFTED_SCROLLKEYS 403#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 404 if (!ctrl && !meta)
156 {
157#else 405#else
158 if (IS_SCROLL_MOD) 406 if (IS_SCROLL_MOD)
407#endif
159 { 408 {
160#endif
161 int lnsppg; 409 int lnsppg;
162 410
163#ifdef PAGING_CONTEXT_LINES 411#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 412 lnsppg = nrow - PAGING_CONTEXT_LINES;
165#else 413#else
166 lnsppg = TermWin.nrow * 4 / 5; 414 lnsppg = nrow * 4 / 5;
167#endif 415#endif
168 if (keysym == XK_Prior) 416 if (keysym == XK_Prior)
169 { 417 {
170 scr_page (UP, lnsppg); 418 scr_page (UP, lnsppg);
171 return; 419 return;
… …
199 scr_move_to (0, 1); 447 scr_move_to (0, 1);
200 return; 448 return;
201 } 449 }
202 else if (keysym == XK_End) 450 else if (keysym == XK_End)
203 { 451 {
204 scr_move_to (1, 0); 452 scr_move_to (1, 1);
205 return; 453 return;
206 } 454 }
207 } 455 }
208#endif 456#endif
209 } 457 }
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 462 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 463 {
216 keysym += (XK_F11 - XK_F1); 464 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 465 shft = 0; /* turn off Shift */
218 } 466 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 467 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 468 {
221 switch (keysym) 469 switch (keysym)
222 { 470 {
223 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
226 return; 474 return;
475#if TODO
227 /* rxvt extras */ 476 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 478 change_font (FONT_UP);
230 return; 479 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 480 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 481 change_font (FONT_DN);
233 return; 482 return;
483#endif
234 } 484 }
235 } 485 }
236 } 486 }
237#ifdef PRINTPIPE 487
238 if (keysym == XK_Print) 488#if ENABLE_FRILLS || ISO_14755
239 { 489 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 490 if (shft && ctrl)
241 return;
242 } 491 {
243#endif 492 int hv;
244 493
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 494 if (iso14755buf & ISO_14755_51
246 { 495 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 496 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 497 {
250 unsigned int l; 498 commit_iso14755 ();
251 const unsigned char *kbuf0; 499 iso14755buf = ISO_14755_51;
252 500# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 501 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 502# endif
261 ) 503 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 504 }
266 505 else if (keysym == XK_BackSpace)
267 tt_write (kbuf0, l); 506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
510# endif
511 return;
512 }
513 else if ((hv = hex_keyval (ev)) >= 0)
514 {
515 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
516 | hv | ISO_14755_51;
517# if ISO_14755
518 iso14755_51 (iso14755buf & ISO_14755_MASK);
519# endif
268 return; 520 return;
269 } 521 }
270 else 522 else
523 {
524# if ISO_14755
525 scr_overlay_off ();
271#endif 526# endif
527 iso14755buf = 0;
528 }
529 }
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
532 if (!(iso14755buf & ISO_14755_STARTED))
533 {
534 iso14755buf |= ISO_14755_STARTED;
535# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif
539 }
540#endif
541
542#ifdef PRINTPIPE
543 if (keysym == XK_Print)
544 {
545 scr_printscreen (ctrl | shft);
546 return;
547 }
548#endif
549
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 {
272 { 552 {
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, key_backspace);
286 break; 566 break;
287#endif 567#endif
288#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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, key_delete);
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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{
1038 flush_ev.stop ();
1039
660#ifdef TRANSPARENT 1040#ifdef ENABLE_TRANSPARENCY
661 if (want_full_refresh) 1041 if (want_full_refresh)
662 { 1042 {
663 want_full_refresh = 0; 1043 want_full_refresh = 0;
664 scr_clear (); 1044 scr_clear ();
665 scr_touch (false); 1045 scr_touch (false);
666 want_refresh = 1;
667 } 1046 }
668#endif 1047#endif
669 1048
670 if (want_refresh) 1049 if (want_refresh)
671 { 1050 {
1051 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1052 {
1053 int row = view_start;
1054 int end_row = row + nrow;
1055
1056 while (row > top_row && ROW (row - 1).is_longer ())
1057 --row;
1058
1059 do
1060 {
1061 int start_row = row;
1062 line_t *l;
1063
1064 do
1065 {
1066 l = &ROW (row++);
1067
1068 if (!(l->f & LINE_FILTERED))
1069 {
1070 // line not filtered, mark it as filtered
1071 l->f |= LINE_FILTERED;
1072 while (l->is_longer ())
1073 {
1074 l = &ROW (row++);
1075 l->f |= LINE_FILTERED;
1076 }
1077
1078 // and filter it
1079 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1080
1081 break;
1082 }
1083 }
1084 while (l->is_longer () && row < end_row);
1085 }
1086 while (row < end_row);
1087 }
1088
672 scr_refresh (refresh_type); 1089 scr_refresh ();
673 scrollbar_show (1); 1090 scrollbar_show (1);
674#ifdef USE_XIM 1091#ifdef USE_XIM
675 IMSendSpot (); 1092 IMSendSpot ();
676#endif 1093#endif
677
678 } 1094 }
679 1095
680 display->flush (); 1096 display->flush ();
681} 1097}
682 1098
683void 1099void
684rxvt_term::check_cb (check_watcher &w) 1100rxvt_term::check_cb (check_watcher &w)
685{ 1101{
686 SET_R (this); 1102 make_current ();
687 SET_LOCALE (locale);
688 1103
1104 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108}
1109
1110void
1111rxvt_term::flush_cb (time_watcher &w)
1112{
1113 make_current ();
1114
1115 refresh_count = 0;
689 flush (); 1116 flush ();
690} 1117}
691 1118
692#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
693void 1120void
694rxvt_term::cursor_blink_cb (time_watcher &w) 1121rxvt_term::cursor_blink_cb (time_watcher &w)
695{ 1122{
696 hidden_cursor = !hidden_cursor; 1123 hidden_cursor = !hidden_cursor;
697 want_refresh = 1; 1124 want_refresh = 1;
698 1125
699 w.start (w.at + BLINK_INTERVAL); 1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
700} 1127}
701#endif 1128#endif
702 1129
703#ifdef TEXT_BLINK 1130#ifdef TEXT_BLINK
704void 1131void
… …
711 w.start (w.at + TEXT_BLINK_INTERVAL); 1138 w.start (w.at + TEXT_BLINK_INTERVAL);
712 } 1139 }
713} 1140}
714#endif 1141#endif
715 1142
1143#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144void
1145rxvt_term::cont_scroll_cb (time_watcher &w)
1146{
1147 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1148 scr_page (scrollbar_isUp() ? UP : DN, 1))
1149 {
1150 want_refresh = 1;
1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1152 }
1153}
1154#endif
1155
1156#ifdef SELECTION_SCROLLING
1157void
1158rxvt_term::sel_scroll_cb (time_watcher &w)
1159{
1160 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161 {
1162 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163 want_refresh = 1;
1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1165 }
1166}
1167#endif
1168
1169#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170void
1171rxvt_term::slip_wheel_cb (time_watcher &w)
1172{
1173 if (mouse_slip_wheel_speed == 0
1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1175 : scr_page (UP, mouse_slip_wheel_speed))
1176 {
1177 if (view_start == top_row || view_start == 0)
1178 mouse_slip_wheel_speed = 0;
1179
1180 want_refresh = 1;
1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1182 }
1183}
1184#endif
1185
1186#if LINUX_YIELD_HACK
1187static struct event_handler
1188{
1189 check_watcher yield_ev;
1190
1191 void yield_cb (check_watcher &w)
1192 {
1193 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS.
1197
1198 struct timespec ts = { 0, 0 };
1199 nanosleep (&ts, 0);
1200
1201 w.stop ();
1202 }
1203
1204 event_handler ()
1205 : yield_ev (this, &event_handler::yield_cb)
1206 {
1207 }
1208} event_handler;
1209#endif
1210
716bool 1211bool
717rxvt_term::pty_fill () 1212rxvt_term::pty_fill ()
718{ 1213{
719 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1214 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1215
1216 if (CBUFSIZ == n)
1217 {
1218 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1219 n = 0;
1220 }
720 1221
721 memmove (cmdbuf_base, cmdbuf_ptr, n); 1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
722 cmdbuf_ptr = cmdbuf_base; 1223 cmdbuf_ptr = cmdbuf_base;
723 cmdbuf_endp = cmdbuf_ptr + n; 1224 cmdbuf_endp = cmdbuf_ptr + n;
724 1225
725 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
726 1227
727 if (n > 0) 1228 if (r > 0)
728 { 1229 {
729 cmdbuf_endp += n; 1230 cmdbuf_endp += r;
730 return true; 1231 return true;
731 } 1232 }
732 else if (n < 0 && errno != EAGAIN) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1234 {
1235#if LINUX_YIELD_HACK
1236 if (display->is_local)
1237 event_handler.yield_ev.start ();
1238#endif
1239 }
1240 else
1241 {
1242 pty_ev.stop ();
1243
1244 if (!option (Opt_hold))
733 destroy (); 1245 destroy ();
734 1246 }
1247
735 return false; 1248 return false;
736} 1249}
737 1250
738void 1251void
739rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
740{ 1253{
741 SET_R (this); 1254 make_current ();
742 SET_LOCALE (locale); 1255
1256 if (revents & EVENT_READ)
1257 // loop, but don't allow a single term to monopolize us
1258 while (pty_fill ())
1259 if (cmd_parse ())
1260 break;
743 1261
744 if (revents & EVENT_WRITE) 1262 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1263 pty_write ();
746 else if (revents & EVENT_READ) 1264}
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 1265
760 if (cmd_parse ()) 1266void
761 break; 1267rxvt_term::pointer_unblank ()
762 } 1268{
763 } 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1270 recolour_cursor ();
1271
1272#ifdef POINTER_BLANK
1273 hidden_pointer = 0;
1274
1275 if (option (Opt_pointerBlank))
1276 pointer_ev.start (NOW + pointerBlankDelay);
1277#endif
764} 1278}
765 1279
766#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
767void 1281void
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 () 1282rxvt_term::pointer_blank ()
781{ 1283{
782 if (! (Options & Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
783 return; 1285 return;
784 1286
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
786 XFlush (display->display); 1288 XFlush (dpy);
787 1289
788 hidden_pointer = 1; 1290 hidden_pointer = 1;
789} 1291}
790 1292
791void 1293void
792rxvt_term::pointer_cb (time_watcher &w) 1294rxvt_term::pointer_cb (time_watcher &w)
793{ 1295{
794 SET_R (this); 1296 make_current ();
795 SET_LOCALE (locale);
796 1297
797 pointer_blank (); 1298 pointer_blank ();
798} 1299}
799#endif 1300#endif
800 1301
… …
807 x = ev.x; 1308 x = ev.x;
808 y = ev.y; 1309 y = ev.y;
809 pixel_position (&x, &y); 1310 pixel_position (&x, &y);
810 1311
811 if (MEvent.button == AnyButton) 1312 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1313 button_number = 3;
814 }
815 else 1314 else
816 { 1315 {
817 button_number = MEvent.button - Button1; 1316 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1317 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1318 if (button_number >= 3)
820 button_number += (64 - 3); 1319 button_number += (64 - 3);
821 } 1320 }
822 1321
823 if (PrivateModes & PrivMode_MouseX10) 1322 if (priv_modes & PrivMode_MouseX10)
824 { 1323 {
825 /* 1324 /*
826 * do not report ButtonRelease 1325 * do not report ButtonRelease
827 * no state info allowed 1326 * no state info allowed
828 */ 1327 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1342 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1343 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1344#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1345 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1346#endif
848
849 } 1347 }
850 1348
851#ifdef DEBUG_MOUSEREPORT 1349#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1350 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1351 if (key_state & 16)
854 fputc ('C', stderr); 1352 fputc ('C', stderr);
855 if (key_state & 4) 1353 if (key_state & 4)
856 fputc ('S', stderr); 1354 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1358 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1359 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1360 button_number,
863 x + 1, 1361 x + 1,
864 y + 1); 1362 y + 1);
865#else 1363#endif
1364
866 tt_printf ("\033[M%c%c%c", 1365 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
868 (32 + x + 1), 1367 (32 + x + 1),
869 (32 + y + 1)); 1368 (32 + y + 1));
870#endif
871} 1369}
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 1370
883/*{{{ process an X event */ 1371/*{{{ process an X event */
884void 1372void
885rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
886{ 1374{
887 SET_R (this); 1375 make_current ();
888 SET_LOCALE (locale);
889 1376
890#if defined(CURSOR_BLINK) 1377 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 1378
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1379 if (ev.xany.window == vt
900 } 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
901#endif 1381 && 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; 1382 return;
920#endif
921 1383
1384 // for XQueryPointer
922 Window unused_root, unused_child; 1385 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1386 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1387 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 1388
975 switch (ev.type) 1389 switch (ev.type)
976 { 1390 {
977 case KeyPress: 1391 case KeyPress:
978 lookup_key (ev.xkey); 1392 key_press (ev.xkey);
979 break; 1393 break;
980 1394
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease: 1395 case KeyRelease:
983 { 1396 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; 1397 break;
995 }
996#endif
997 1398
998 case ButtonPress: 1399 case ButtonPress:
999 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1000 break; 1401 break;
1001 1402
… …
1003 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1004 break; 1405 break;
1005 1406
1006 case ClientMessage: 1407 case ClientMessage:
1007 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1008 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1409 && !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 { 1410 {
1017 /* Get Dnd data */ 1411 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1018 Atom ActualType; 1412 {
1019 int ActualFormat; 1413 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1020 unsigned char *data; 1414 {
1021 unsigned long Size, RemainingBytes; 1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1022 1416 {
1023 XGetWindowProperty (display->display, display->root, 1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1024 xa[XA_DNDSELECTION], 1418 destroy ();
1025 0L, 1000000L, 1419 }
1026 False, AnyPropertyType, 1420#if ENABLE_EWMH
1027 &ActualType, &ActualFormat, 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1028 &Size, &RemainingBytes, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1029 &data); 1424 &ev);
1030 XChangeProperty (display->display, display->root, 1425#endif
1031 XA_CUT_BUFFER0, XA_STRING, 1426 }
1032 8, PropModeReplace, 1427 }
1033 data, STRLEN (data)); 1428#if ENABLE_XEMBED
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1429 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1430 {
1431 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1432 focus_in ();
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out ();
1435 }
1436#endif
1036 } 1437 }
1037#endif /* OFFIX_DND */
1038 break;
1039
1040 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping));
1042 break; 1438 break;
1043 1439
1044 /* 1440 /*
1045 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1442 * Here's my conclusion:
… …
1065 break; 1461 break;
1066 } 1462 }
1067 break; 1463 break;
1068 1464
1069 case FocusIn: 1465 case FocusIn:
1070 if (!TermWin.focus) 1466 if (ev.xfocus.detail != NotifyInferior
1467 && ev.xfocus.detail != NotifyPointer
1468 && ev.xfocus.mode != NotifyGrab)
1469 focus_in ();
1470 break;
1471
1472 case FocusOut:
1473 if (ev.xfocus.detail != NotifyInferior
1474 && ev.xfocus.detail != NotifyPointer
1475 && ev.xfocus.mode != NotifyGrab)
1476 focus_out ();
1477 break;
1478
1479 case ConfigureNotify:
1480 if (ev.xconfigure.window == parent[0])
1071 { 1481 {
1072 TermWin.focus = 1; 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1073 want_refresh = 1; 1483 ;
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 1484
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 {
1487 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND
1490 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1491 {
1492 resize_pixmap ();
1493 scr_touch (true);
1494 }
1495#endif
1496 }
1497
1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499
1500#ifdef ENABLE_TRANSPARENCY
1501 if (option (Opt_transparent))
1502 check_our_parents ();
1503#endif
1083 } 1504 }
1084 break; 1505 break;
1085 1506
1086 case FocusOut:
1087 if (TermWin.focus)
1088 {
1089 TermWin.focus = 0;
1090 want_refresh = 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: 1507 case PropertyNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1508 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1106 { 1509 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1107 int height, width; 1510 && ev.xproperty.state == PropertyNewValue)
1511 selection_property (ev.xproperty.window, ev.xproperty.atom);
1108 1512
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 }
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
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent)
1130 {
1131 check_our_parents ();
1132 if (am_transparent)
1133 want_full_refresh = 1;
1134 }
1135#endif
1136 }
1137 break; 1513 break;
1138 1514
1139 case SelectionClear: 1515 case SelectionClear:
1140 selection_clear (); 1516 selection_clear ();
1141 break; 1517 break;
1142 1518
1143 case SelectionNotify: 1519 case SelectionNotify:
1144 if (selection_wait == Sel_normal) 1520 if (selection_wait == Sel_normal)
1145 selection_paste (ev.xselection.requestor, 1521 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1146 ev.xselection.property, True);
1147 break; 1522 break;
1148 1523
1149 case SelectionRequest: 1524 case SelectionRequest:
1150 selection_send (ev.xselectionrequest); 1525 selection_send (ev.xselectionrequest);
1151 break; 1526 break;
1152 1527
1528 case MapNotify:
1529 mapped = 1;
1530#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1532#endif
1533 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1534 break;
1535
1153 case UnmapNotify: 1536 case UnmapNotify:
1154 TermWin.mapped = 0; 1537 mapped = 0;
1155#ifdef TEXT_BLINK 1538#ifdef TEXT_BLINK
1156 text_blink_ev.stop (); 1539 text_blink_ev.stop ();
1157#endif 1540#endif
1541 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1158 break; 1542 break;
1159 1543
1160 case MapNotify:
1161 TermWin.mapped = 1;
1162#ifdef TEXT_BLINK
1163 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1164#endif
1165 break;
1166
1167#ifdef TRANSPARENT 1544#ifdef ENABLE_TRANSPARENCY
1168 case ReparentNotify: 1545 case ReparentNotify:
1169 rootwin_cb (ev); 1546 rootwin_cb (ev);
1170 break; 1547 break;
1171#endif /* TRANSPARENT */ 1548#endif /* ENABLE_TRANSPARENCY */
1172 1549
1173 case GraphicsExpose: 1550 case GraphicsExpose:
1174 case Expose: 1551 case Expose:
1175 if (ev.xany.window == TermWin.vt) 1552 if (ev.xany.window == vt)
1176 { 1553 {
1177#ifdef NO_SLOW_LINK_SUPPORT 1554 do
1178 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1179 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, False);
1180#else 1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1181 // don't understand this, so commented it out 1558
1559 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1560
1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1182 scr_expose (ev.xexpose.x, ev.xexpose.y, 1562 scr_expose (ev.xexpose.x, ev.xexpose.y,
1183 ev.xexpose.width, ev.xexpose.height, False); 1563 ev.xexpose.width, ev.xexpose.height, False);
1184 //scr_expose (ev.xexpose.x, 0, 1564
1185 // ev.xexpose.width, TermWin.height, False);
1186#endif
1187 want_refresh = 1; 1565 want_refresh = 1;
1188 } 1566 }
1189 else 1567 else
1190 { 1568 {
1191 XEvent unused_event; 1569 XEvent unused_event;
1192 1570
1193 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1194 Expose, 1572 ;
1195 &unused_event)) ; 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1196 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1574 ;
1197 GraphicsExpose, 1575
1198 &unused_event)) ;
1199 if (isScrollbarWindow (ev.xany.window)) 1576 if (isScrollbarWindow (ev.xany.window))
1200 { 1577 {
1201 scrollBar.setIdle (); 1578 scrollBar.setIdle ();
1202 scrollbar_show (0); 1579 scrollbar_show (0);
1203 } 1580 }
1204#ifdef MENUBAR 1581
1205 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1582#ifdef ENABLE_TRANSPARENCY
1206 menubar_expose (); 1583 if (am_transparent && ev.xany.window == parent[0])
1584 XClearWindow (dpy, ev.xany.window);
1207#endif 1585#endif
1208 } 1586 }
1209 break; 1587 break;
1210 1588
1211 case MotionNotify: 1589 case MotionNotify:
1212#ifdef POINTER_BLANK 1590#ifdef POINTER_BLANK
1213 if (hidden_pointer) 1591 if (hidden_pointer)
1214 pointer_unblank (); 1592 pointer_unblank ();
1215#endif 1593#endif
1216#if MENUBAR 1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1217 if (isMenuBarWindow (ev.xany.window)) 1595 break;
1596
1597 if (ev.xany.window == vt)
1218 { 1598 {
1219 menubar_control (ev.xbutton); 1599 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1220 break; 1600 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1221 } 1601 ; // nop
1222#endif
1223 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1224 break;
1225
1226 if (ev.xany.window == TermWin.vt)
1227 {
1228 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1602 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1229 { 1603 {
1230 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1604 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1231 ; 1605 ;
1232 1606
1233 XQueryPointer (display->display, TermWin.vt, 1607 XQueryPointer (dpy, vt,
1234 &unused_root, &unused_child, 1608 &unused_root, &unused_child,
1235 &unused_root_x, &unused_root_y, 1609 &unused_root_x, &unused_root_y,
1236 & (ev.xbutton.x), & (ev.xbutton.y), 1610 &ev.xbutton.x, &ev.xbutton.y,
1237 &unused_mask); 1611 &ev.xbutton.state);
1238#ifdef MOUSE_THRESHOLD 1612#ifdef MOUSE_THRESHOLD
1239 /* deal with a `jumpy' mouse */ 1613 /* deal with a `jumpy' mouse */
1240 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1614 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1241 { 1615 {
1242#endif 1616#endif
1617#if ISO_14755
1618 // 5.4
1619 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1620 {
1621 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1622 break;
1623 }
1624#endif
1243 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1625 selection_extend (ev.xbutton.x, ev.xbutton.y,
1244 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1626 ev.xbutton.state & Button3Mask ? 2 : 0);
1627
1245#ifdef SELECTION_SCROLLING 1628#ifdef SELECTION_SCROLLING
1246 if (ev.xbutton.y < TermWin.int_bwidth 1629 if (ev.xbutton.y < int_bwidth
1247 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1630 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1248 { 1631 {
1249 int dist; 1632 int dist;
1250
1251 pending_scroll_selection=1;
1252 1633
1253 /* don't clobber the current delay if we are 1634 /* don't clobber the current delay if we are
1254 * already in the middle of scrolling. 1635 * already in the middle of scrolling.
1255 */ 1636 */
1256 if (scroll_selection_delay<=0) 1637 if (!sel_scroll_ev.active)
1257 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1638 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1258 1639
1259 /* save the event params so we can highlight 1640 /* save the event params so we can highlight
1260 * the selection in the pending-scroll loop 1641 * the selection in the pending-scroll loop
1261 */ 1642 */
1262 selection_save_x=ev.xbutton.x; 1643 selection_save_x = ev.xbutton.x;
1263 selection_save_y=ev.xbutton.y; 1644 selection_save_y = ev.xbutton.y;
1264 selection_save_state=
1265 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1645 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1266 1646
1267 /* calc number of lines to scroll */ 1647 /* calc number of lines to scroll */
1268 if (ev.xbutton.y<TermWin.int_bwidth) 1648 if (ev.xbutton.y < int_bwidth)
1269 { 1649 {
1270 scroll_selection_dir = UP; 1650 scroll_selection_dir = UP;
1271 dist = TermWin.int_bwidth - ev.xbutton.y; 1651 dist = int_bwidth - ev.xbutton.y;
1272 } 1652 }
1273 else 1653 else
1274 { 1654 {
1275 scroll_selection_dir = DN; 1655 scroll_selection_dir = DN;
1276 dist = ev.xbutton.y - 1656 dist = ev.xbutton.y - (int_bwidth + height);
1277 (TermWin.int_bwidth + TermWin.height);
1278 } 1657 }
1658
1279 scroll_selection_lines= (Pixel2Height (dist)/ 1659 scroll_selection_lines = Pixel2Height (dist)
1280 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1660 / SELECTION_SCROLL_LINE_SPEEDUP
1661 + 1;
1281 MIN_IT (scroll_selection_lines, 1662 min_it (scroll_selection_lines,
1282 SELECTION_SCROLL_MAX_LINES); 1663 SELECTION_SCROLL_MAX_LINES);
1283 } 1664 }
1284 else 1665 else
1285 { 1666 {
1286 /* we are within the text window, so we 1667 /* we are within the text window, so we
1287 * shouldn't be scrolling 1668 * shouldn't be scrolling
1288 */ 1669 */
1289 pending_scroll_selection = 0; 1670 if (sel_scroll_ev.active)
1671 sel_scroll_ev.stop();
1290 } 1672 }
1291#endif 1673#endif
1292#ifdef MOUSE_THRESHOLD 1674#ifdef MOUSE_THRESHOLD
1293
1294 } 1675 }
1295#endif 1676#endif
1296
1297 } 1677 }
1298 } 1678 }
1299 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1679 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1300 { 1680 {
1301 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1681 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1302 MotionNotify, &ev)) ; 1682 MotionNotify, &ev))
1683 ;
1684
1303 XQueryPointer (display->display, scrollBar.win, 1685 XQueryPointer (dpy, scrollBar.win,
1304 &unused_root, &unused_child, 1686 &unused_root, &unused_child,
1305 &unused_root_x, &unused_root_y, 1687 &unused_root_x, &unused_root_y,
1306 & (ev.xbutton.x), & (ev.xbutton.y), 1688 &ev.xbutton.x, &ev.xbutton.y,
1307 &unused_mask); 1689 &unused_mask);
1308 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1690 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1309 scrollbar_size ()); 1691 scrollbar_size ());
1310 scr_refresh (refresh_type);
1311 refresh_limit = 0; 1692 want_refresh = 1;
1312 scrollbar_show (1); 1693 scrollbar_show (1);
1313 } 1694 }
1314 break; 1695 break;
1315 } 1696 }
1316}
1317 1697
1698#if defined(CURSOR_BLINK)
1699 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1700 {
1701 if (hidden_cursor)
1702 {
1703 hidden_cursor = 0;
1704 want_refresh = 1;
1705 }
1706
1707 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1708 }
1709#endif
1710
1711#if defined(POINTER_BLANK)
1712 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1713 {
1714 if (ev.type == MotionNotify
1715 || ev.type == ButtonPress
1716 || ev.type == ButtonRelease)
1717 if (hidden_pointer)
1718 pointer_unblank ();
1719
1720 if (ev.type == KeyPress && hidden_pointer == 0)
1721 pointer_blank ();
1722 }
1723#endif
1724}
1725
1726void
1727rxvt_term::focus_in ()
1728{
1729 if (!focus)
1730 {
1731 focus = 1;
1732 want_refresh = 1;
1733
1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1735
1736#if USE_XIM
1737 if (Input_Context != NULL)
1738 {
1739 IMSetPosition ();
1740 XSetICFocus (Input_Context);
1741 }
1742#endif
1743#if CURSOR_BLINK
1744 if (option (Opt_cursorBlink))
1745 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1746#endif
1747#if OFF_FOCUS_FADING
1748 if (rs[Rs_fade])
1749 {
1750 pix_colors = pix_colors_focused;
1751 scr_recolour ();
1752 }
1753#endif
1754#if ENABLE_FRILLS
1755 if (option (Opt_urgentOnBell))
1756 {
1757 XWMHints *h;
1758
1759 h = XGetWMHints(dpy, parent[0]);
1760 if (h != NULL)
1761 {
1762 h->flags &= ~XUrgencyHint;
1763 XSetWMHints(dpy, parent[0], h);
1764 }
1765 }
1766#endif
1767 }
1768}
1769
1770void
1771rxvt_term::focus_out ()
1772{
1773 if (focus)
1774 {
1775 focus = 0;
1776 want_refresh = 1;
1777
1778 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1779
1780#if ENABLE_FRILLS || ISO_14755
1781 if (iso14755buf)
1782 {
1783 iso14755buf = 0;
1784# if ISO_14755
1785 scr_overlay_off ();
1786# endif
1787 }
1788#endif
1789#if USE_XIM
1790 if (Input_Context != NULL)
1791 XUnsetICFocus (Input_Context);
1792#endif
1793#if CURSOR_BLINK
1794 if (option (Opt_cursorBlink))
1795 cursor_blink_ev.stop ();
1796 hidden_cursor = 0;
1797#endif
1798#if OFF_FOCUS_FADING
1799 if (rs[Rs_fade])
1800 {
1801 pix_colors = pix_colors_unfocused;
1802 scr_recolour ();
1803 }
1804#endif
1805 }
1806}
1807
1808void
1809rxvt_term::update_fade_color (unsigned int idx)
1810{
1811#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade])
1813 {
1814 rgba c;
1815 pix_colors [Color_fade].get (c);
1816 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817 }
1818#endif
1819}
1820
1821#if ENABLE_TRANSPARENCY || ENABLE_PERL
1318void 1822void
1319rxvt_term::rootwin_cb (XEvent &ev) 1823rxvt_term::rootwin_cb (XEvent &ev)
1320{ 1824{
1321 SET_R (this); 1825 make_current ();
1322 SET_LOCALE (locale);
1323 1826
1827 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829 return;
1830
1831# if ENABLE_TRANSPARENCY
1324 switch (ev.type) 1832 switch (ev.type)
1325 { 1833 {
1326 case PropertyNotify: 1834 case PropertyNotify:
1327 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1328 {
1329 if (ev.xproperty.state == PropertyNewValue)
1330 selection_property (ev.xproperty.window, ev.xproperty.atom);
1331 break;
1332 }
1333#ifdef TRANSPARENT
1334 else
1335 {
1336 /* 1835 /*
1337 * if user used some Esetroot compatible prog to set the root bg, 1836 * if user used some Esetroot compatible prog to set the root bg,
1338 * use the property to determine the pixmap. We use it later on. 1837 * use the property to determine the pixmap. We use it later on.
1339 */ 1838 */
1340 if (xa[XA_XROOTPMAPID] == 0)
1341 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1342
1343 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1839 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1840 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1344 return; 1841 return;
1345 }
1346 1842
1347 /* FALLTHROUGH */ 1843 /* FALLTHROUGH */
1348 case ReparentNotify: 1844 case ReparentNotify:
1349 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1845 if (option (Opt_transparent))
1350 want_full_refresh = 1; 1846 check_our_parents ();
1351 break; 1847 break;
1848 }
1352#endif 1849# endif
1353 }
1354} 1850}
1851#endif
1355 1852
1356void 1853void
1357rxvt_term::button_press (XButtonEvent &ev) 1854rxvt_term::button_press (XButtonEvent &ev)
1358{ 1855{
1359 int reportmode = 0, clickintime; 1856 int reportmode = 0, clickintime;
1360 1857
1361 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1858 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1859
1362 if (!bypass_keystate) 1860 if (!bypass_keystate)
1363 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1861 reportmode = !! (priv_modes & PrivMode_mouse_report);
1862
1364 /* 1863 /*
1365 * VT window processing of button press 1864 * VT window processing of button press
1366 */ 1865 */
1367 if (ev.window == TermWin.vt) 1866 if (ev.window == vt)
1368 { 1867 {
1868 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1869 return;
1870
1871#if ISO_14755
1872 // 5.4
1873 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1874 {
1875 iso14755_54 (ev.x, ev.y);
1876 return;
1877 }
1878#endif
1879
1369 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1880 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1881
1370 if (reportmode) 1882 if (reportmode)
1371 { 1883 {
1372 /* mouse report from vt window */ 1884 /* mouse report from vt window */
1373 /* save the xbutton state (for ButtonRelease) */ 1885 /* save the xbutton state (for ButtonRelease) */
1374 MEvent.state = ev.state; 1886 MEvent.state = ev.state;
1375#ifdef MOUSE_REPORT_DOUBLECLICK 1887#ifdef MOUSE_REPORT_DOUBLECLICK
1376 if (ev.button == MEvent.button && clickintime) 1888 if (ev.button == MEvent.button && clickintime)
1377 { 1889 {
1378 /* same button, within alloted time */ 1890 /* same button, within alloted time */
1379 MEvent.clicks++; 1891 MEvent.clicks++;
1892
1380 if (MEvent.clicks > 1) 1893 if (MEvent.clicks > 1)
1381 { 1894 {
1382 /* only report double clicks */ 1895 /* only report double clicks */
1383 MEvent.clicks = 2; 1896 MEvent.clicks = 2;
1384 mouse_report (ev); 1897 mouse_report (ev);
… …
1403 } 1916 }
1404 else 1917 else
1405 { 1918 {
1406 if (ev.button != MEvent.button) 1919 if (ev.button != MEvent.button)
1407 MEvent.clicks = 0; 1920 MEvent.clicks = 0;
1921
1408 switch (ev.button) 1922 switch (ev.button)
1409 { 1923 {
1410 case Button1: 1924 case Button1:
1925 /* allow meta + click to select rectangular areas */
1926 /* should be done in screen.C */
1927#if ENABLE_FRILLS
1928 selection.rect = !!(ev.state & ModMetaMask);
1929#else
1930 selection.rect = false;
1931#endif
1932
1411 /* allow shift+left click to extend selection */ 1933 /* allow shift+left click to extend selection */
1412 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1934 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1413 { 1935 {
1414 if (MEvent.button == Button1 && clickintime) 1936 if (MEvent.button == Button1 && clickintime)
1415 selection_rotate (ev.x, ev.y); 1937 selection_rotate (ev.x, ev.y);
1416 else 1938 else
1417 selection_extend (ev.x, ev.y, 1); 1939 selection_extend (ev.x, ev.y, 1);
… …
1432 case Button3: 1954 case Button3:
1433 if (MEvent.button == Button3 && clickintime) 1955 if (MEvent.button == Button3 && clickintime)
1434 selection_rotate (ev.x, ev.y); 1956 selection_rotate (ev.x, ev.y);
1435 else 1957 else
1436 selection_extend (ev.x, ev.y, 1); 1958 selection_extend (ev.x, ev.y, 1);
1959
1437 MEvent.button = Button3; 1960 MEvent.button = Button3;
1438 break; 1961 break;
1439 } 1962 }
1440 } 1963 }
1964
1441 MEvent.time = ev.time; 1965 MEvent.time = ev.time;
1442 return; 1966 return;
1443 } 1967 }
1444 1968
1445 /* 1969 /*
… …
1511 upordown = 1; /* down */ 2035 upordown = 1; /* down */
1512 } 2036 }
1513 if (upordown) 2037 if (upordown)
1514 { 2038 {
1515#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2039#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1516 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 2040 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1517#endif 2041#endif
1518 if (scr_page (upordown < 0 ? UP : DN, 1)) 2042 if (scr_page (upordown < 0 ? UP : DN, 1))
1519 { 2043 {
1520 if (upordown < 0) 2044 if (upordown < 0)
1521 scrollBar.setUp (); 2045 scrollBar.setUp ();
… …
1537 break; 2061 break;
1538 case R_SB_ALIGN_BOTTOM: 2062 case R_SB_ALIGN_BOTTOM:
1539 csrO = scrollBar.bot - scrollBar.top; 2063 csrO = scrollBar.bot - scrollBar.top;
1540 break; 2064 break;
1541 } 2065 }
2066
1542 if (scrollBar.style == R_SB_XTERM 2067 if (scrollBar.style == R_SB_XTERM
1543 || scrollbar_above_slider (ev.y) 2068 || scrollbar_above_slider (ev.y)
1544 || scrollbar_below_slider (ev.y)) 2069 || scrollbar_below_slider (ev.y))
1545 scr_move_to ( scrollbar_position (ev.y) - csrO, 2070 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1546 scrollbar_size ()); 2071
1547 scrollBar.setMotion (); 2072 scrollBar.setMotion ();
1548 break; 2073 break;
1549 2074
1550 case Button1: 2075 case Button1:
1551 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2076 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1555 case Button3: 2080 case Button3:
1556 if (scrollBar.style != R_SB_XTERM) 2081 if (scrollBar.style != R_SB_XTERM)
1557 { 2082 {
1558 if (scrollbar_above_slider (ev.y)) 2083 if (scrollbar_above_slider (ev.y))
1559# ifdef RXVT_SCROLL_FULL 2084# ifdef RXVT_SCROLL_FULL
1560 scr_page (UP, TermWin.nrow - 1); 2085 scr_page (UP, nrow - 1);
1561# else 2086# else
1562 scr_page (UP, TermWin.nrow / 4); 2087 scr_page (UP, nrow / 4);
1563# endif 2088# endif
1564 else if (scrollbar_below_slider (ev.y)) 2089 else if (scrollbar_below_slider (ev.y))
1565# ifdef RXVT_SCROLL_FULL 2090# ifdef RXVT_SCROLL_FULL
1566 scr_page (DN, TermWin.nrow - 1); 2091 scr_page (DN, nrow - 1);
1567# else 2092# else
1568 scr_page (DN, TermWin.nrow / 4); 2093 scr_page (DN, nrow / 4);
1569# endif 2094# endif
1570 else 2095 else
1571 scrollBar.setMotion (); 2096 scrollBar.setMotion ();
1572 } 2097 }
1573 else 2098 else
1574 { 2099 {
1575 scr_page ((ev.button == Button1 ? DN : UP), 2100 scr_page ((ev.button == Button1 ? DN : UP),
1576 (TermWin.nrow 2101 (nrow
1577 * scrollbar_position (ev.y) 2102 * scrollbar_position (ev.y)
1578 / scrollbar_size ())); 2103 / scrollbar_size ()));
1579 } 2104 }
2105
1580 break; 2106 break;
1581 } 2107 }
1582 } 2108 }
2109
1583 return; 2110 return;
1584 } 2111 }
1585#if MENUBAR
1586 /*
1587 * Menubar window processing of button press
1588 */
1589 if (isMenuBarWindow (ev.window))
1590 menubar_control (ev);
1591#endif
1592} 2112}
1593 2113
1594void 2114void
1595rxvt_term::button_release (XButtonEvent &ev) 2115rxvt_term::button_release (XButtonEvent &ev)
1596{ 2116{
1597 int reportmode = 0; 2117 int reportmode = 0;
1598 2118
1599 csrO = 0; /* reset csr Offset */ 2119 csrO = 0; /* reset csr Offset */
1600 if (!bypass_keystate) 2120 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2121 reportmode = !! (priv_modes & PrivMode_mouse_report);
1602 2122
1603 if (scrollbar_isUpDn ()) 2123 if (scrollbar_isUpDn ())
1604 { 2124 {
1605 scrollBar.setIdle (); 2125 scrollBar.setIdle ();
1606 scrollbar_show (0); 2126 scrollbar_show (0);
1607#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1608 refresh_type &= ~SMOOTH_REFRESH;
1609#endif
1610
1611 } 2127 }
2128
1612#ifdef SELECTION_SCROLLING 2129#ifdef SELECTION_SCROLLING
1613 pending_scroll_selection=0; 2130 if (sel_scroll_ev.active)
2131 sel_scroll_ev.stop();
1614#endif 2132#endif
2133
1615 if (ev.window == TermWin.vt) 2134 if (ev.window == vt)
1616 { 2135 {
2136 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2137 return;
2138
2139#if ISO_14755
2140 // 5.4
2141 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2142 return;
2143#endif
2144
1617 if (reportmode) 2145 if (reportmode)
1618 { 2146 {
1619 /* mouse report from vt window */ 2147 /* mouse report from vt window */
1620 /* don't report release of wheel "buttons" */ 2148 /* don't report release of wheel "buttons" */
1621 if (ev.button >= 4) 2149 if (ev.button >= 4)
… …
1635 MEvent.button = AnyButton; 2163 MEvent.button = AnyButton;
1636 mouse_report (ev); 2164 mouse_report (ev);
1637#endif /* MOUSE_REPORT_DOUBLECLICK */ 2165#endif /* MOUSE_REPORT_DOUBLECLICK */
1638 return; 2166 return;
1639 } 2167 }
2168
1640 /* 2169 /*
1641 * dumb hack to compensate for the failure of click-and-drag 2170 * dumb hack to compensate for the failure of click-and-drag
1642 * when overriding mouse reporting 2171 * when overriding mouse reporting
1643 */ 2172 */
1644 if (PrivateModes & PrivMode_mouse_report 2173 if (priv_modes & PrivMode_mouse_report
1645 && bypass_keystate 2174 && bypass_keystate
1646 && ev.button == Button1 && MEvent.clicks <= 1) 2175 && ev.button == Button1 && MEvent.clicks <= 1)
1647 selection_extend (ev.x, ev.y, 0); 2176 selection_extend (ev.x, ev.y, 0);
1648 2177
1649 switch (ev.button) 2178 switch (ev.button)
1650 { 2179 {
1651 case Button1: 2180 case Button1:
1652 case Button3: 2181 case Button3:
1653 selection_make (ev.time); 2182 selection_make (ev.time);
1654 break; 2183 break;
2184
1655 case Button2: 2185 case Button2:
1656 selection_request (ev.time, ev.x, ev.y); 2186 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
1657 break; 2188 break;
2189
1658#ifdef MOUSE_WHEEL 2190#ifdef MOUSE_WHEEL
1659 case Button4: 2191 case Button4:
1660 case Button5: 2192 case Button5:
1661 { 2193 {
1662 int i; 2194 int i;
1663 page_dirn v; 2195 page_dirn v;
1664 2196
1665 v = (ev.button == Button4) ? UP : DN; 2197 v = ev.button == Button4 ? UP : DN;
2198
1666 if (ev.state & ShiftMask) 2199 if (ev.state & ShiftMask)
1667 i = 1; 2200 i = 1;
1668 else if ((Options & Opt_mouseWheelScrollPage)) 2201 else if (option (Opt_mouseWheelScrollPage))
1669 i = TermWin.nrow - 1; 2202 i = nrow - 1;
1670 else 2203 else
1671 i = 5; 2204 i = 5;
2205
1672# ifdef MOUSE_SLIP_WHEELING 2206# ifdef MOUSE_SLIP_WHEELING
1673 if (ev.state & ControlMask) 2207 if (ev.state & ControlMask)
1674 { 2208 {
1675 mouse_slip_wheel_speed += (v ? -1 : 1); 2209 mouse_slip_wheel_speed += v ? -1 : 1;
2210 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2211 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2212
2213 if (slip_wheel_ev.at < NOW)
1676 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2214 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2215
2216 slip_wheel_ev.start ();
2217 }
2218 else
2219 {
2220# endif
2221 scr_page (v, i);
2222 scrollbar_show (1);
2223# ifdef MOUSE_SLIP_WHEELING
1677 } 2224 }
1678# endif 2225# endif
1679# ifdef JUMP_MOUSE_WHEEL
1680 scr_page (v, i);
1681 scr_refresh (SMOOTH_REFRESH);
1682 scrollbar_show (1);
1683# else
1684 while (i--)
1685 {
1686 scr_page (v, 1);
1687 scr_refresh (SMOOTH_REFRESH);
1688 scrollbar_show (1);
1689 }
1690# endif
1691
1692 } 2226 }
1693 break; 2227 break;
1694#endif 2228#endif
1695
1696 }
1697 }
1698#ifdef MENUBAR
1699 else if (isMenuBarWindow (ev.window))
1700 menubar_control (ev);
1701#endif
1702}
1703
1704#ifdef TRANSPARENT
1705#if TINTING
1706/* shading taken from eterm-0.9.2 */
1707/* RGB 15 */
1708
1709static void
1710shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1711{
1712 unsigned char *ptr;
1713 int x, y;
1714
1715 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1716 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1717 /* No saturation */
1718 for (y = h; --y >= 0;) {
1719 for (x = -w; x < 0; x++) {
1720 int r, g, b;
1721
1722 b = ((uint16_t *) ptr)[x];
1723 r = (b & 0x7c00) * rm;
1724 g = (b & 0x3e0) * gm;
1725 b = (b & 0x1f) * bm;
1726 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1727 | ((g >> 8) & 0x3e0)
1728 | ((b >> 8) & 0x1f);
1729 }
1730 ptr += bpl;
1731 }
1732 } else {
1733 for (y = h; --y >= 0;) {
1734 for (x = -w; x < 0; x++) {
1735 int r, g, b;
1736
1737 b = ((uint16_t *) ptr)[x];
1738 r = (b & 0x7c00) * rm;
1739 g = (b & 0x3e0) * gm;
1740 b = (b & 0x1f) * bm;
1741 r |= (!(r >> 15) - 1);
1742 g |= (!(g >> 10) - 1);
1743 b |= (!(b >> 5) - 1);
1744 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00)
1745 | ((g >> 8) & 0x3e0)
1746 | ((b >> 8) & 0x1f);
1747 }
1748 ptr += bpl;
1749 }
1750 }
1751}
1752
1753/* RGB 16 */
1754static void
1755shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1756{
1757 unsigned char *ptr;
1758 int x, y;
1759
1760 ptr = (unsigned char *)data + (w * sizeof(uint16_t));
1761 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1762 /* No saturation */
1763 for (y = h; --y >= 0;) {
1764 for (x = -w; x < 0; x++) {
1765 int r, g, b;
1766
1767 b = ((uint16_t *) ptr)[x];
1768 r = (b & 0xf800) * rm;
1769 g = (b & 0x7e0) * gm;
1770 b = (b & 0x1f) * bm;
1771 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1772 | ((g >> 8) & 0x7e0)
1773 | ((b >> 8) & 0x1f);
1774 }
1775 ptr += bpl;
1776 }
1777 } else {
1778 for (y = h; --y >= 0;) {
1779 for (x = -w; x < 0; x++) {
1780 int r, g, b;
1781
1782 b = ((uint16_t *) ptr)[x];
1783 r = (b & 0xf800) * rm;
1784 g = (b & 0x7e0) * gm;
1785 b = (b & 0x1f) * bm;
1786 r |= (!(r >> 16) - 1);
1787 g |= (!(g >> 11) - 1);
1788 b |= (!(b >> 5) - 1);
1789 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1790 | ((g >> 8) & 0x7e0)
1791 | ((b >> 8) & 0x1f);
1792 }
1793 ptr += bpl;
1794 }
1795 }
1796}
1797
1798/* RGB 24 */
1799static void
1800shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1801{
1802 unsigned char *ptr;
1803 int x, y;
1804
1805 ptr = (unsigned char *)data + (w * 3);
1806 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1807 /* No saturation */
1808 for (y = h; --y >= 0;) {
1809 for (x = -(w * 3); x < 0; x += 3) {
1810 int r, g, b;
1811
1812 if (byteorder.big_endian()) {
1813 r = (ptr[x + 0] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 2] * bm) >> 8;
1816 ptr[x + 0] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 2] = b;
1819 } else {
1820 r = (ptr[x + 2] * rm) >> 8;
1821 g = (ptr[x + 1] * gm) >> 8;
1822 b = (ptr[x + 0] * bm) >> 8;
1823 ptr[x + 2] = r;
1824 ptr[x + 1] = g;
1825 ptr[x + 0] = b;
1826 }
1827 }
1828 ptr += bpl;
1829 }
1830 } else {
1831 for (y = h; --y >= 0;) {
1832 for (x = -(w * 3); x < 0; x += 3) {
1833 int r, g, b;
1834
1835 if (byteorder.big_endian()) {
1836 r = (ptr[x + 0] * rm) >> 8;
1837 g = (ptr[x + 1] * gm) >> 8;
1838 b = (ptr[x + 2] * bm) >> 8;
1839
1840 r |= (!(r >> 8) - 1);
1841 g |= (!(g >> 8) - 1);
1842 b |= (!(b >> 8) - 1);
1843
1844 ptr[x + 0] = r;
1845 ptr[x + 1] = g;
1846 ptr[x + 2] = b;
1847 } else {
1848 r = (ptr[x + 2] * rm) >> 8;
1849 g = (ptr[x + 1] * gm) >> 8;
1850 b = (ptr[x + 0] * bm) >> 8;
1851
1852 r |= (!(r >> 8) - 1);
1853 g |= (!(g >> 8) - 1);
1854 b |= (!(b >> 8) - 1);
1855
1856 ptr[x + 2] = r;
1857 ptr[x + 1] = g;
1858 ptr[x + 0] = b;
1859 }
1860 }
1861 ptr += bpl;
1862 }
1863 }
1864}
1865
1866/* RGB 32 */
1867static void
1868shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1869{
1870 unsigned char *ptr;
1871 int x, y;
1872
1873 ptr = (unsigned char *)data + (w * 4);
1874 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1875 /* No saturation */
1876 for (y = h; --y >= 0;) {
1877 if (byteorder.big_endian()) {
1878 for (x = -(w * 4); x < 0; x += 4) {
1879 int r, g, b;
1880
1881 r = (ptr[x + 1] * rm) >> 8;
1882 g = (ptr[x + 2] * gm) >> 8;
1883 b = (ptr[x + 3] * bm) >> 8;
1884 ptr[x + 1] = r;
1885 ptr[x + 2] = g;
1886 ptr[x + 3] = b;
1887 }
1888 } else {
1889 for (x = -(w * 4); x < 0; x += 4) {
1890 int r, g, b;
1891
1892 r = (ptr[x + 2] * rm) >> 8;
1893 g = (ptr[x + 1] * gm) >> 8;
1894 b = (ptr[x + 0] * bm) >> 8;
1895 ptr[x + 2] = r;
1896 ptr[x + 1] = g;
1897 ptr[x + 0] = b;
1898 }
1899 }
1900 ptr += bpl;
1901 }
1902 } else {
1903 for (y = h; --y >= 0;) {
1904 for (x = -(w * 4); x < 0; x += 4) {
1905 int r, g, b;
1906
1907 if (byteorder.big_endian()) {
1908 r = (ptr[x + 1] * rm) >> 8;
1909 g = (ptr[x + 2] * gm) >> 8;
1910 b = (ptr[x + 3] * bm) >> 8;
1911
1912 r |= (!(r >> 8) - 1);
1913 g |= (!(g >> 8) - 1);
1914 b |= (!(b >> 8) - 1);
1915
1916 ptr[x + 1] = r;
1917 ptr[x + 2] = g;
1918 ptr[x + 3] = b;
1919 } else {
1920 r = (ptr[x + 2] * rm) >> 8;
1921 g = (ptr[x + 1] * gm) >> 8;
1922 b = (ptr[x + 0] * bm) >> 8;
1923
1924 r |= (!(r >> 8) - 1);
1925 g |= (!(g >> 8) - 1);
1926 b |= (!(b >> 8) - 1);
1927
1928 ptr[x + 2] = r;
1929 ptr[x + 1] = g;
1930 ptr[x + 0] = b;
1931 }
1932 }
1933 ptr += bpl;
1934 }
1935 }
1936}
1937
1938#endif
1939
1940/*
1941 * Check our parents are still who we think they are.
1942 * Do transparency updates if required
1943 */
1944int
1945rxvt_term::check_our_parents ()
1946{
1947 int i, pchanged, aformat, have_pixmap, rootdepth;
1948 unsigned long nitems, bytes_after;
1949 Atom atype;
1950 unsigned char *prop = NULL;
1951 Window root, oldp, *list;
1952 Pixmap rootpixmap = None;
1953 XWindowAttributes wattr, wrootattr;
1954
1955 pchanged = 0;
1956
1957 if (!(Options & Opt_transparent))
1958 return pchanged; /* Don't try any more */
1959
1960 XGetWindowAttributes (display->display, display->root, &wrootattr);
1961 rootdepth = wrootattr.depth;
1962
1963 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
1964
1965 if (rootdepth != wattr.depth)
1966 {
1967 if (am_transparent)
1968 { 2229 }
1969 pchanged = 1;
1970 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1971 am_transparent = am_pixmap_trans = 0;
1972 }
1973
1974 return pchanged; /* Don't try any more */
1975 }
1976
1977 /* Get all X ops out of the queue so that our information is up-to-date. */
1978 XSync (display->display, False);
1979
1980 /*
1981 * Make the frame window set by the window manager have
1982 * the root background. Some window managers put multiple nested frame
1983 * windows for each client, so we have to take care about that.
1984 */
1985 i = (xa[XA_XROOTPMAPID]
1986 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1987 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1988 &nitems, &bytes_after, &prop) == Success);
1989
1990 if (!i || prop == NULL)
1991 i = (xa[XA_XSETROOTID]
1992 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
1993 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994 &nitems, &bytes_after, &prop) == Success);
1995
1996 if (!i || prop == NULL)
1997 have_pixmap = 0;
1998 else
1999 { 2230 }
2000 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop);
2002 XFree (prop);
2003 }
2004
2005 if (have_pixmap)
2006 {
2007 /*
2008 * Copy display->root pixmap transparency
2009 */
2010 int sx, sy, nx, ny;
2011 unsigned int nw, nh;
2012 Window cr;
2013 XImage *image;
2014 GC gc;
2015 XGCValues gcvalue;
2016
2017 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2018 0, 0, &sx, &sy, &cr);
2019 nw = (unsigned int)szHint.width;
2020 nh = (unsigned int)szHint.height;
2021 nx = ny = 0;
2022
2023 if (sx < 0)
2024 {
2025 nw += sx;
2026 nx = -sx;
2027 sx = 0;
2028 }
2029
2030 if (sy < 0)
2031 {
2032 nh += sy;
2033 ny = -sy;
2034 sy = 0;
2035 }
2036
2037 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2038 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2039 allowedxerror = -1;
2040 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2041
2042 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2043 /* XXX: may need a delay here? */
2044 allowedxerror = 0;
2045
2046 if (image == NULL)
2047 {
2048 if (am_transparent && am_pixmap_trans)
2049 {
2050 pchanged = 1;
2051 if (TermWin.pixmap != None)
2052 {
2053 XFreePixmap (display->display, TermWin.pixmap);
2054 TermWin.pixmap = None;
2055 }
2056 }
2057
2058 am_pixmap_trans = 0;
2059 }
2060 else
2061 {
2062 if (TermWin.pixmap != None)
2063 XFreePixmap (display->display, TermWin.pixmap);
2064
2065#if TINTING
2066 if (ISSET_PIXCOLOR (Color_tint))
2067 {
2068 unsigned short shade, rm, gm, bm;
2069
2070 PixColors[Color_tint].get (display, rm, gm, bm);
2071
2072 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but...
2073
2074 /* Determine bitshift and bitmask values */
2075 switch (image->bits_per_pixel)
2076 {
2077 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2078 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2079 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2080 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2081 }
2082 }
2083#endif
2084
2085 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2086 szHint.width, szHint.height, image->depth);
2087 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2088 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2089 nx, ny, image->width, image->height);
2090 XFreeGC (display->display, gc);
2091 XDestroyImage (image);
2092 XSetWindowBackgroundPixmap (display->display, TermWin.vt,
2093 TermWin.pixmap);
2094
2095 if (!am_transparent || !am_pixmap_trans)
2096 pchanged = 1;
2097
2098 am_transparent = am_pixmap_trans = 1;
2099 }
2100 }
2101
2102 if (!am_pixmap_trans)
2103 {
2104 unsigned int n;
2105 /*
2106 * InheritPixmap transparency
2107 */
2108 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2109 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2110 {
2111 oldp = TermWin.parent[i];
2112 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2113 &TermWin.parent[i], &list, &n);
2114 XFree (list);
2115 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2116
2117 if (TermWin.parent[i] == display->root)
2118 {
2119 if (oldp != None)
2120 pchanged = 1;
2121
2122 break;
2123 }
2124
2125 if (oldp != TermWin.parent[i])
2126 pchanged = 1;
2127 }
2128
2129 n = 0;
2130
2131 if (pchanged)
2132 {
2133 for (; n < (unsigned int)i; n++)
2134 {
2135 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2136 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2137 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2138 {
2139 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2140 break;
2141 }
2142 }
2143 }
2144
2145 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2146 {
2147 D_X ((stderr, "InheritPixmap Turning off"));
2148 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]);
2149 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
2150 am_transparent = 0;
2151 /* XXX: also turn off Opt_transparent? */
2152 }
2153 else
2154 {
2155#if WAIT_FOR_WM
2156 /* wait (an arbitrary period) for the WM to do its thing
2157 * needed for fvwm2.2.2 (and before?) */
2158 sleep (1);
2159#endif
2160 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2161 for (n = 0; n < (unsigned int)i; n++)
2162 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2163
2164 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2165 am_transparent = 1;
2166 }
2167
2168 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2169 TermWin.parent[i] = None;
2170 }
2171
2172 return pchanged;
2173} 2231}
2174#endif
2175 2232
2176/*}}} */ 2233/*}}} */
2177 2234
2178bool 2235bool
2179rxvt_term::cmd_parse () 2236rxvt_term::cmd_parse ()
2180{ 2237{
2181 bool flag = false; 2238 bool flag = false;
2182 unicode_t ch = NOCHAR; 2239 wchar_t ch = NOCHAR;
2183 unsigned char *seq_begin; // remember start of esc-sequence here 2240 char *seq_begin; // remember start of esc-sequence here
2184 2241
2185 for (;;) 2242 for (;;)
2186 { 2243 {
2187 if (ch == NOCHAR) 2244 if (ch == NOCHAR)
2188 { 2245 {
2189 seq_begin = cmdbuf_ptr; 2246 seq_begin = cmdbuf_ptr;
2190 ch = next_char (); 2247 ch = next_char ();
2191 }
2192 2248
2193 if (ch == NOCHAR) // TODO: improve 2249 if (ch == NOCHAR)
2194 break; 2250 break;
2195
2196 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r')
2197 { 2251 }
2252
2253 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2254 {
2255 if (!seen_input)
2256 {
2257 seen_input = 1;
2258 // many badly-written programs (e.g. jed) contain a race condition:
2259 // they first read the screensize and then install a SIGWINCH handler.
2260 // some window managers resize the window early, and these programs
2261 // then sometimes get the size wrong.
2262 // unfortunately other programs are even more buggy and dislike
2263 // being sent SIGWINCH, so only do it when we were in fact being
2264 // resized.
2265 if (seen_resize && cmd_pid)
2266 kill (-cmd_pid, SIGWINCH);
2267 }
2268
2198 /* Read a text string from the input buffer */ 2269 /* Read a text string from the input buffer */
2199 unicode_t buf[UBUFSIZ]; 2270 wchar_t buf[UBUFSIZ];
2200 bool refreshnow = false; 2271 bool refreshnow = false;
2201 int nlines = 0; 2272 int nlines = 0;
2202 unicode_t *str = buf; 2273 wchar_t *str = buf;
2203 2274 wchar_t *eol = str + min (ncol, UBUFSIZ);
2204 *str++ = ch;
2205 2275
2206 for (;;) 2276 for (;;)
2207 { 2277 {
2278 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2279 break;
2280
2281 *str++ = ch;
2282
2283 if (ch == C0_LF || str >= eol)
2284 {
2285 if (ch == C0_LF)
2286 nlines++;
2287
2288 refresh_count++;
2289
2290 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2291 {
2292 refresh_count = 0;
2293
2294 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2295 {
2296 refreshnow = true;
2297 ch = NOCHAR;
2298 break;
2299 }
2300 }
2301
2302 // scr_add_lines only works for nlines <= nrow - 1.
2303 if (nlines >= nrow - 1)
2304 {
2305 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2306 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2307 scr_add_lines (buf, str - buf, nlines);
2308
2309 nlines = 0;
2310 str = buf;
2311 eol = str + min (ncol, UBUFSIZ);
2312 }
2313
2314 if (str >= eol)
2315 {
2316 if (eol >= buf + UBUFSIZ)
2317 {
2318 ch = NOCHAR;
2319 break;
2320 }
2321 else
2322 eol = min (eol + ncol, buf + UBUFSIZ);
2323 }
2324
2325 }
2326
2208 seq_begin = cmdbuf_ptr; 2327 seq_begin = cmdbuf_ptr;
2209 ch = next_char (); 2328 ch = next_char ();
2210
2211 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r'))
2212 break;
2213
2214 *str++ = ch;
2215
2216 if (ch == '\n')
2217 {
2218 nlines++;
2219 refresh_count++;
2220
2221 if (! (Options & Opt_jumpScroll)
2222 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
2223 {
2224 refreshnow = true;
2225 flag = true;
2226 ch = NOCHAR;
2227 break;
2228 }
2229
2230 // scr_add_lines only works for nlines < TermWin.nrow - 1.
2231 if (nlines >= TermWin.nrow - 1)
2232 {
2233 scr_add_lines (buf, nlines, str - buf);
2234 nlines = 0;
2235 str = buf;
2236 }
2237 }
2238
2239 if (str >= buf + UBUFSIZ)
2240 {
2241 ch = NOCHAR;
2242 break;
2243 }
2244 } 2329 }
2245 2330
2331 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2332 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2246 scr_add_lines (buf, nlines, str - buf); 2333 scr_add_lines (buf, str - buf, nlines);
2247 2334
2248 /* 2335 /*
2249 * If there have been a lot of new lines, then update the screen 2336 * If there have been a lot of new lines, then update the screen
2250 * What the heck I'll cheat and only refresh less than every page-full. 2337 * What the heck we'll cheat and only refresh less than every page-full.
2251 * the number of pages between refreshes is refresh_limit, which 2338 * if skipScroll is enabled.
2252 * is incremented here because we must be doing flat-out scrolling.
2253 *
2254 * refreshing should be correct for small scrolls, because of the
2255 * time-out
2256 */ 2339 */
2257 if (refreshnow) 2340 if (refreshnow)
2258 { 2341 {
2259 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2342 flag = true;
2260 refresh_limit++;
2261
2262 scr_refresh (refresh_type); 2343 scr_refresh ();
2344 want_refresh = 1;
2263 } 2345 }
2264 2346
2265 } 2347 }
2266 else 2348 else
2267 { 2349 {
… …
2282 2364
2283 return flag; 2365 return flag;
2284} 2366}
2285 2367
2286// read the next character 2368// read the next character
2287unicode_t 2369wchar_t
2288rxvt_term::next_char () 2370rxvt_term::next_char () NOTHROW
2289{ 2371{
2290 while (cmdbuf_ptr < cmdbuf_endp) 2372 while (cmdbuf_ptr < cmdbuf_endp)
2291 { 2373 {
2292 // assume 7-bit to be ascii ALWAYS 2374 // assume 7-bit to be ascii ALWAYS
2293 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2375 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2294 return *cmdbuf_ptr++; 2376 return *cmdbuf_ptr++;
2295 2377
2296 wchar_t wc; 2378 wchar_t wc;
2297 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2379 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2298 2380
2299 if (len == (size_t)-2) 2381 if (len == (size_t)-2)
2300 { 2382 {
2301 // the mbstate stores incomplete sequences. didn't know this :/ 2383 // the mbstate stores incomplete sequences. didn't know this :/
2302 cmdbuf_ptr = cmdbuf_endp; 2384 cmdbuf_ptr = cmdbuf_endp;
2303 break; 2385 break;
2304 } 2386 }
2305 2387
2306 if (len == (size_t)-1) 2388 if (len == (size_t)-1)
2307 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2389 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2308 2390
2309 // assume wchar == unicode 2391 // assume wchar == unicode
2310 cmdbuf_ptr += len; 2392 cmdbuf_ptr += len;
2311 return wc; 2393 return wc & UNICODE_MASK;
2312 } 2394 }
2313 2395
2314 return NOCHAR; 2396 return NOCHAR;
2315} 2397}
2398
2399// read the next octet
2400uint32_t
2401rxvt_term::next_octet () NOTHROW
2402{
2403 return cmdbuf_ptr < cmdbuf_endp
2404 ? (unsigned char)*cmdbuf_ptr++
2405 : NOCHAR;
2406}
2407
2408static class out_of_input out_of_input;
2316 2409
2317/* rxvt_cmd_getc () - Return next input character */ 2410/* rxvt_cmd_getc () - Return next input character */
2318/* 2411/*
2319 * Return the next input character after first passing any keyboard input 2412 * Return the next input character after first passing any keyboard input
2320 * to the command. 2413 * to the command.
2321 */ 2414 */
2322unicode_t 2415wchar_t
2323rxvt_term::cmd_getc () 2416rxvt_term::cmd_getc () THROW ((class out_of_input))
2324{ 2417{
2325 unicode_t c = next_char (); 2418 wchar_t c = next_char ();
2419
2420 if (c == NOCHAR)
2421 throw out_of_input;
2422
2423 return c;
2424}
2425
2426uint32_t
2427rxvt_term::cmd_get8 () THROW ((class out_of_input))
2428{
2429 uint32_t c = next_octet ();
2326 2430
2327 if (c == NOCHAR) 2431 if (c == NOCHAR)
2328 throw out_of_input; 2432 throw out_of_input;
2329 2433
2330 return c; 2434 return c;
… …
2394 { 2498 {
2395 if ((buf[len++] = cmd_getc ()) == 'i') 2499 if ((buf[len++] = cmd_getc ()) == 'i')
2396 break; /* done = 1 */ 2500 break; /* done = 1 */
2397 } 2501 }
2398 } 2502 }
2399 2503
2400 for (i = 0; i < len; i++) 2504 for (i = 0; i < len; i++)
2401 if (putc (buf[i], fd) == EOF) 2505 if (putc (buf[i], fd) == EOF)
2402 { 2506 {
2403 done = 1; 2507 done = 1;
2404 break; 2508 break;
… …
2430 case C0_ESC: 2534 case C0_ESC:
2431 process_escape_seq (); 2535 process_escape_seq ();
2432 break; 2536 break;
2433 case C0_ENQ: /* terminal Status */ 2537 case C0_ENQ: /* terminal Status */
2434 if (rs[Rs_answerbackstring]) 2538 if (rs[Rs_answerbackstring])
2435 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2539 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2436 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2437 else 2540 else
2438 tt_write ((unsigned char *)VT100_ANS, 2541 tt_write (VT100_ANS, strlen (VT100_ANS));
2439 (unsigned int)STRLEN (VT100_ANS));
2440 break; 2542 break;
2441 case C0_BEL: /* bell */ 2543 case C0_BEL: /* bell */
2442 scr_bell (); 2544 scr_bell ();
2443 break; 2545 break;
2444 case C0_BS: /* backspace */ 2546 case C0_BS: /* backspace */
… …
2460 break; 2562 break;
2461 case C0_SI: /* shift in - acs */ 2563 case C0_SI: /* shift in - acs */
2462 scr_charset_choose (0); 2564 scr_charset_choose (0);
2463 break; 2565 break;
2464 2566
2567#ifdef EIGHT_BIT_CONTROLS
2465 // 8-bit controls 2568 // 8-bit controls
2466 case 0x90: /* DCS */ 2569 case 0x90: /* DCS */
2467 process_dcs_seq (); 2570 process_dcs_seq ();
2468 break; 2571 break;
2469 case 0x9b: /* CSI */ 2572 case 0x9b: /* CSI */
2470 process_csi_seq (); 2573 process_csi_seq ();
2471 break; 2574 break;
2472 case 0x9d: /* CSI */ 2575 case 0x9d: /* OSC */
2473 process_osc_seq (); 2576 process_osc_seq ();
2474 break; 2577 break;
2578#endif
2475 } 2579 }
2476} 2580}
2477/*}}} */ 2581/*}}} */
2478 2582
2479 2583
… …
2541void 2645void
2542rxvt_term::process_escape_seq () 2646rxvt_term::process_escape_seq ()
2543{ 2647{
2544 unicode_t ch = cmd_getc (); 2648 unicode_t ch = cmd_getc ();
2545 2649
2546 if (PrivateModes & PrivMode_vt52) 2650 if (priv_modes & PrivMode_vt52)
2547 { 2651 {
2548 process_escape_vt52 (ch); 2652 process_escape_vt52 (ch);
2549 return; 2653 return;
2550 } 2654 }
2551 2655
… …
2566 scr_charset_set (2, (unsigned int)cmd_getc ()); 2670 scr_charset_set (2, (unsigned int)cmd_getc ());
2567 break; 2671 break;
2568 case '+': 2672 case '+':
2569 scr_charset_set (3, (unsigned int)cmd_getc ()); 2673 scr_charset_set (3, (unsigned int)cmd_getc ());
2570 break; 2674 break;
2571#ifndef NO_FRILLS 2675#if !ENABLE_MINIMAL
2572 case '6': 2676 case '6':
2573 scr_backindex (); 2677 scr_backindex ();
2574 break; 2678 break;
2575#endif 2679#endif
2576 case '7': 2680 case '7':
2577 scr_cursor (SAVE); 2681 scr_cursor (SAVE);
2578 break; 2682 break;
2579 case '8': 2683 case '8':
2580 scr_cursor (RESTORE); 2684 scr_cursor (RESTORE);
2581 break; 2685 break;
2582#ifndef NO_FRILLS 2686#if !ENABLE_MINIMAL
2583 case '9': 2687 case '9':
2584 scr_forwardindex (); 2688 scr_forwardindex ();
2585 break; 2689 break;
2586#endif 2690#endif
2587 case '=': 2691 case '=':
… …
2597 break; 2701 break;
2598 2702
2599 /* 8.3.87: NEXT LINE */ 2703 /* 8.3.87: NEXT LINE */
2600 case C1_NEL: /* ESC E */ 2704 case C1_NEL: /* ESC E */
2601 { 2705 {
2602 unicode_t nlcr[] = { L'\n', L'\r' }; 2706 wchar_t nlcr[] = { C0_LF, C0_CR };
2603 scr_add_lines (nlcr, 1, 2); 2707 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2604 } 2708 }
2605 break; 2709 break;
2606 2710
2607 /* kidnapped escape sequence: Should be 8.3.48 */ 2711 /* kidnapped escape sequence: Should be 8.3.48 */
2608 case C1_ESA: /* ESC G */ 2712 case C1_ESA: /* ESC G */
… …
2630 process_dcs_seq (); 2734 process_dcs_seq ();
2631 break; 2735 break;
2632 2736
2633 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2634 case C1_SCI: /* ESC Z */ 2738 case C1_SCI: /* ESC Z */
2635 tt_write ((const unsigned char *)ESCZ_ANSWER, 2739 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2636 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2637 break; /* steal obsolete ESC [ c */ 2740 break; /* steal obsolete ESC [ c */
2638 2741
2639 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2742 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2640 case C1_CSI: /* ESC [ */ 2743 case C1_CSI: /* ESC [ */
2641 process_csi_seq (); 2744 process_csi_seq ();
… …
2668 2771
2669/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2772/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2670/* *INDENT-OFF* */ 2773/* *INDENT-OFF* */
2671enum { 2774enum {
2672 CSI_ICH = 0x40, 2775 CSI_ICH = 0x40,
2673 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2776 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2674 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2777 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2675 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2778 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2676 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 2779 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2677 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 2780 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2678 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2781 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2705 unicode_t ch, priv, i; 2808 unicode_t ch, priv, i;
2706 unsigned int nargs, p; 2809 unsigned int nargs, p;
2707 int n, ndef; 2810 int n, ndef;
2708 int arg[ESC_ARGS]; 2811 int arg[ESC_ARGS];
2709 2812
2710 for (nargs = ESC_ARGS; nargs > 0;) 2813 memset (arg, 0, sizeof (arg));
2711 arg[--nargs] = 0; 2814 nargs = 0;
2712 2815
2713 priv = 0; 2816 priv = 0;
2714 ch = cmd_getc (); 2817 ch = cmd_getc ();
2715 if (ch >= '<' && ch <= '?') 2818 if (ch >= '<' && ch <= '?')
2716 { /* '<' '=' '>' '?' */ 2819 { /* '<' '=' '>' '?' */
… …
2750 ndef = get_byte_array_bit (csi_defaults, i); 2853 ndef = get_byte_array_bit (csi_defaults, i);
2751 for (p = 0; p < nargs; p++) 2854 for (p = 0; p < nargs; p++)
2752 if (arg[p] == -1) 2855 if (arg[p] == -1)
2753 arg[p] = ndef; 2856 arg[p] = ndef;
2754 2857
2755#ifdef DEBUG_CMD
2756 fprintf (stderr, "CSI ");
2757 for (p = 0; p < nargs; p++)
2758 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2759 fprintf (stderr, "%c\n", ch);
2760#endif
2761
2762 /* 2858 /*
2763 * private mode handling 2859 * private mode handling
2764 */ 2860 */
2765 if (priv) 2861 if (priv)
2766 { 2862 {
2767 switch (priv) 2863 switch (priv)
2768 { 2864 {
2769 case '>': 2865 case '>':
2770 if (ch == CSI_DA) /* secondary device attributes */ 2866 if (ch == CSI_DA) /* secondary device attributes */
2867 {
2868 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2869 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2870 //
2871 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2872 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2873 // that we do not support xterm mouse reporting (should be 95 when we do).
2874 //
2771 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 2875 tt_printf ("\033[>%d;94;0c", 'U');
2876 }
2772 break; 2877 break;
2773 case '?': 2878 case '?':
2774 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2775 process_terminal_mode (ch, priv, nargs, arg); 2880 process_terminal_mode (ch, priv, nargs, arg);
2776 break; 2881 break;
… …
2881 2986
2882 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 2987 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2883 arg[0] = -arg[0]; 2988 arg[0] = -arg[0];
2884 /* FALLTHROUGH */ 2989 /* FALLTHROUGH */
2885 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 2990 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2886 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 2991 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2887 break; 2992 break;
2888 2993
2889 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 2994 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2890 tt_write ((const unsigned char *)VT100_ANS, 2995 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2891 (unsigned int) (sizeof (VT100_ANS) - 1));
2892 break; 2996 break;
2893 2997
2894 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 2998 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2895 process_sgr_mode (nargs, arg); 2999 process_sgr_mode (nargs, arg);
2896 break; 3000 break;
… …
2903 break; 3007 break;
2904 case 6: /* CPR requested */ 3008 case 6: /* CPR requested */
2905 scr_report_position (); 3009 scr_report_position ();
2906 break; 3010 break;
2907 case 7: /* unofficial extension */ 3011 case 7: /* unofficial extension */
2908 if (Options & Opt_insecure) 3012 if (option (Opt_insecure))
2909 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3013 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2910 break; 3014 break;
2911 case 8: /* unofficial extension */ 3015 case 8: /* unofficial extension */
2912 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2913 break; 3017 break;
2914 } 3018 }
… …
2950 break; 3054 break;
2951 3055
2952 case CSI_RM: /* 8.3.107: RESET MODE */ 3056 case CSI_RM: /* 8.3.107: RESET MODE */
2953 if (arg[0] == 4) 3057 if (arg[0] == 4)
2954 scr_insert_mode (0); 3058 scr_insert_mode (0);
3059 else if (arg[0] == 20)
3060 priv_modes &= ~PrivMode_LFNL;
2955 break; 3061 break;
2956 3062
2957 case CSI_SM: /* 8.3.126: SET MODE */ 3063 case CSI_SM: /* 8.3.126: SET MODE */
2958 if (arg[0] == 4) 3064 if (arg[0] == 4)
2959 scr_insert_mode (1); 3065 scr_insert_mode (1);
3066 else if (arg[0] == 20)
3067 priv_modes |= PrivMode_LFNL;
2960 break; 3068 break;
2961 3069
2962 /* 3070 /*
2963 * PRIVATE USE beyond this point. All CSI_7? sequences here 3071 * PRIVATE USE beyond this point. All CSI_7? sequences here
2964 */ 3072 */
… …
2976 break; 3084 break;
2977 case CSI_75: 3085 case CSI_75:
2978 scr_cursor (RESTORE); 3086 scr_cursor (RESTORE);
2979 break; 3087 break;
2980 3088
2981#ifndef NO_FRILLS 3089#if !ENABLE_MINIMAL
2982 case CSI_74: 3090 case CSI_74:
2983 process_window_ops (arg, nargs); 3091 process_window_ops (arg, nargs);
2984 break; 3092 break;
2985#endif 3093#endif
2986 3094
… …
2993 break; 3101 break;
2994 } 3102 }
2995} 3103}
2996/*}}} */ 3104/*}}} */
2997 3105
2998#ifndef NO_FRILLS 3106#if !ENABLE_MINIMAL
2999/* ARGSUSED */ 3107/* ARGSUSED */
3000void 3108void
3001rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3109rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3002{ 3110{
3003 int x, y; 3111 int x, y;
3004 XWindowAttributes wattr; 3112 XWindowAttributes wattr;
3005 Window wdummy; 3113 Window wdummy;
3114
3115 dLocal (Display *, dpy);
3006 3116
3007 if (nargs == 0) 3117 if (nargs == 0)
3008 return; 3118 return;
3009 3119
3010 switch (args[0]) 3120 switch (args[0])
3011 { 3121 {
3012 /* 3122 /*
3013 * commands 3123 * commands
3014 */ 3124 */
3015 case 1: /* deiconify window */ 3125 case 1: /* deiconify window */
3016 XMapWindow (display->display, TermWin.parent[0]); 3126 XMapWindow (dpy, parent[0]);
3017 break; 3127 break;
3018 case 2: /* iconify window */ 3128 case 2: /* iconify window */
3019 XIconifyWindow (display->display, TermWin.parent[0], 3129 XIconifyWindow (dpy, parent[0], display->screen);
3020 DefaultScreen (display->display));
3021 break; 3130 break;
3022 case 3: /* set position (pixels) */ 3131 case 3: /* set position (pixels) */
3023 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3132 XMoveWindow (dpy, parent[0], args[1], args[2]);
3024 break; 3133 break;
3025 case 4: /* set size (pixels) */ 3134 case 4: /* set size (pixels) */
3026 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3135 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3027 break; 3136 break;
3028 case 5: /* raise window */ 3137 case 5: /* raise window */
3029 XRaiseWindow (display->display, TermWin.parent[0]); 3138 XRaiseWindow (dpy, parent[0]);
3030 break; 3139 break;
3031 case 6: /* lower window */ 3140 case 6: /* lower window */
3032 XLowerWindow (display->display, TermWin.parent[0]); 3141 XLowerWindow (dpy, parent[0]);
3033 break; 3142 break;
3034 case 7: /* refresh window */ 3143 case 7: /* refresh window */
3035 scr_touch (true); 3144 scr_touch (true);
3036 break; 3145 break;
3037 case 8: /* set size (chars) */ 3146 case 8: /* set size (chars) */
3038 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3147 set_widthheight ((unsigned int) (args[2] * fwidth),
3039 (unsigned int) (args[1] * TermWin.fheight)); 3148 (unsigned int) (args[1] * fheight));
3040 break; 3149 break;
3041 3150
3042 //case 9: NYI, TODO, restore maximized window or maximize window 3151 //case 9: NYI, TODO, restore maximized window or maximize window
3043 default: 3152 default:
3044 if (args[0] >= 24) /* set height (chars) */ 3153 if (args[0] >= 24) /* set height (chars) */
3045 set_widthheight ((unsigned int)TermWin.width, 3154 set_widthheight ((unsigned int)width,
3046 (unsigned int) (args[1] * TermWin.fheight)); 3155 (unsigned int) (args[1] * fheight));
3047 break; 3156 break;
3048
3049 3157
3050 /* 3158 /*
3051 * reports - some output format copied from XTerm 3159 * reports - some output format copied from XTerm
3052 */ 3160 */
3053 case 11: /* report window state */ 3161 case 11: /* report window state */
3054 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent[0], &wattr);
3055 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3163 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3056 break; 3164 break;
3057 case 13: /* report window position */ 3165 case 13: /* report window position */
3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3166 XGetWindowAttributes (dpy, parent[0], &wattr);
3059 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3167 XTranslateCoordinates (dpy, parent[0], wattr.root,
3060 -wattr.border_width, -wattr.border_width, 3168 -wattr.border_width, -wattr.border_width,
3061 &x, &y, &wdummy); 3169 &x, &y, &wdummy);
3062 tt_printf ("\033[3;%d;%dt", x, y); 3170 tt_printf ("\033[3;%d;%dt", x, y);
3063 break; 3171 break;
3064 case 14: /* report window size (pixels) */ 3172 case 14: /* report window size (pixels) */
3065 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3173 XGetWindowAttributes (dpy, parent[0], &wattr);
3066 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3174 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3067 break; 3175 break;
3068 case 18: /* report text area size (chars) */ 3176 case 18: /* report text area size (chars) */
3069 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3177 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3070 break; 3178 break;
3071 case 19: /* report window size (chars) */ 3179 case 19: /* report window size (chars) */
3072 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3180 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3073 break; 3181 break;
3074 case 20: /* report icon label */ 3182 case 20: /* report icon label */
3075 if (Options & Opt_insecure)
3076 { 3183 {
3077 char *s; 3184 char *s;
3078 XGetIconName (display->display, TermWin.parent[0], &s); 3185 XGetIconName (dpy, parent[0], &s);
3079 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);
3080 } 3188 }
3081 break; 3189 break;
3082 case 21: /* report window title */ 3190 case 21: /* report window title */
3083 if (Options & Opt_insecure)
3084 { 3191 {
3085 char *s; 3192 char *s;
3086 XFetchName (display->display, TermWin.parent[0], &s); 3193 XFetchName (dpy, parent[0], &s);
3087 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3194 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3195 XFree (s);
3088 } 3196 }
3089 break; 3197 break;
3090 } 3198 }
3091} 3199}
3092#endif 3200#endif
3093 3201
3094/*----------------------------------------------------------------------*/ 3202/*----------------------------------------------------------------------*/
3095/* 3203/*
3096 * get input up until STRING TERMINATOR (or BEL) 3204 * get input up until STRING TERMINATOR (or BEL)
3097 * ends_how is terminator used. returned input must be free ()d 3205 * ends_how is terminator used. returned input must be free()'d
3098 */ 3206 */
3099unsigned char * 3207char *
3100rxvt_term::get_to_st (unicode_t &ends_how) 3208rxvt_term::get_to_st (unicode_t &ends_how)
3101{ 3209{
3102 int seen_esc = 0; /* seen escape? */ 3210 unicode_t ch;
3211 bool seen_esc = false;
3103 unsigned int n = 0; 3212 unsigned int n = 0;
3104 unsigned char *s;
3105 unicode_t ch;
3106 unsigned char string[STRING_MAX]; 3213 wchar_t string[STRING_MAX];
3107 3214
3108 while ((ch = cmd_getc ())) 3215 while ((ch = cmd_getc ()) != NOCHAR)
3109 { 3216 {
3110 if (ch == C0_BEL || ch == CHAR_ST)
3111 break;
3112
3113 if (seen_esc) 3217 if (seen_esc)
3218 {
3114 if (ch == 0x5c) /* 7bit ST */ 3219 if (ch == 0x5c) /* 7bit ST */
3115 break; 3220 break;
3116 else 3221 else
3117 return NULL; 3222 return NULL;
3118 3223 }
3119 if (ch == C0_ESC) 3224 else if (ch == C0_ESC)
3120 { 3225 {
3121 seen_esc = 1; 3226 seen_esc = true;
3122 continue; 3227 continue;
3123 } 3228 }
3229 else if (ch == C0_BEL || ch == CHAR_ST)
3230 break;
3124 else if (ch == '\t') 3231 else if (ch == C0_SYN)
3125 ch = ' '; /* translate '\t' to space */ 3232 ch = cmd_get8 ();
3126 else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d)) 3233 else if (ch < 0x20)
3127 return NULL; /* other control character - exit */ 3234 return NULL; /* other control character - exit */
3128 3235
3129 if (n >= sizeof (string) - 1) 3236 seen_esc = false;
3237
3238 if (n >= STRING_MAX - 1)
3130 // stop at some sane length 3239 // stop at some sane length
3131 return NULL; 3240 return NULL;
3132 3241
3133 string[n++] = ch; 3242 string[n++] = ch;
3134 seen_esc = 0;
3135 } 3243 }
3136 3244
3137 string[n++] = '\0'; 3245 string[n++] = '\0';
3138 3246
3139 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3140 return NULL;
3141
3142 ends_how = (ch == 0x5c ? C0_ESC : ch); 3247 ends_how = (ch == 0x5c ? C0_ESC : ch);
3143 STRNCPY (s, string, n); 3248
3144 return s; 3249 return rxvt_wcstombs (string);
3145} 3250}
3146 3251
3147/*----------------------------------------------------------------------*/ 3252/*----------------------------------------------------------------------*/
3148/* 3253/*
3149 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3254 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3150 */ 3255 */
3151void 3256void
3152rxvt_term::process_dcs_seq () 3257rxvt_term::process_dcs_seq ()
3153{ 3258{
3154 unsigned char *s; 3259 char *s;
3155 unicode_t eh; 3260 unicode_t eh;
3156 3261
3157 /* 3262 /*
3158 * Not handled yet 3263 * Not handled yet
3159 */ 3264 */
… …
3178 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3283 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3179 arg = arg * 10 + (ch - '0'); 3284 arg = arg * 10 + (ch - '0');
3180 3285
3181 if (ch == ';') 3286 if (ch == ';')
3182 { 3287 {
3183 unsigned char *s = get_to_st (eh); 3288 char *s = get_to_st (eh);
3184 3289
3185 if (s) 3290 if (s)
3186 { 3291 {
3187 process_xterm_seq (arg, (char *)s, eh); 3292 process_xterm_seq (arg, s, eh);
3188 free (s); 3293 free (s);
3189 } 3294 }
3190 } 3295 }
3191} 3296}
3192 3297
3193void 3298void
3194rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3299rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3195{ 3300{
3196 if (str[0] == '?' && !str[1]) 3301 if (str[0] == '?' && !str[1])
3197 { 3302 {
3198 if (Options & Opt_insecure) 3303 rgba c;
3199 { 3304 pix_colors_focused[color].get (c);
3200 unsigned short r, g, b; 3305
3201 PixColors[color].get (display, r, g, b); 3306#if XFT
3307 if (c.a != rgba::MAX_CC)
3308 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3309 else
3310#endif
3202 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3311 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3203 }
3204 } 3312 }
3205 else 3313 else
3206 set_window_color (color, str); 3314 set_window_color (color, str);
3207} 3315}
3208 3316
3209/* 3317/*
3210 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3318 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3211 * 0 = change iconName/title
3212 * 1 = change iconName
3213 * 2 = change title
3214 * 4 = change color
3215 * 10 = change fg color
3216 * 11 = change bg color
3217 * 12 = change text color
3218 * 13 = change mouse foreground color
3219 * 17 = change highlight character colour
3220 * 18 = change bold character color
3221 * 19 = change underlined character color
3222 * 46 = change logfile (not implemented)
3223 * 50 = change font
3224 *
3225 * rxvt extensions:
3226 * 20 = bg pixmap
3227 * 39 = change default fg color
3228 * 49 = change default bg color
3229 * 55 = dump scrollback buffer and all of screen
3230 * 701 = change locale
3231 * 702 = find font
3232 * 703 = menu
3233 */ 3319 */
3234void 3320void
3235rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3321rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3236{ 3322{
3237 int changed = 0;
3238 int color; 3323 int color;
3239 char *buf, *name; 3324 char *buf, *name;
3240 bool query = str[0] == '?' && !str[1]; 3325 bool query = str[0] == '?' && !str[1];
3326 int saveop = op;
3327
3328 dLocal (Display *, dpy);
3241 3329
3242 assert (str != NULL); 3330 assert (str != NULL);
3331
3332 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3333 return;
3334
3243 switch (op) 3335 switch (op)
3244 { 3336 {
3245 case XTerm_name: 3337 case XTerm_name:
3246 set_title (str); 3338 set_title (str);
3247 /* FALLTHROUGH */ 3339 /* FALLTHROUGH */
… …
3252 set_title (str); 3344 set_title (str);
3253 break; 3345 break;
3254 case XTerm_property: 3346 case XTerm_property:
3255 if (str[0] == '?') 3347 if (str[0] == '?')
3256 { 3348 {
3257 Atom prop = XInternAtom (display->display, str + 1, True); 3349 Atom prop = display->atom (str + 1);
3258 Atom actual_type; 3350 Atom actual_type;
3259 int actual_format; 3351 int actual_format;
3260 unsigned long nitems; 3352 unsigned long nitems;
3261 unsigned long bytes_after; 3353 unsigned long bytes_after;
3262 unsigned char *value = 0; 3354 unsigned char *value = 0;
3263 const char *str = ""; 3355 const char *str = "";
3264 3356
3265 if (prop 3357 if (prop
3266 && XGetWindowProperty (display->display, TermWin.parent[0], 3358 && XGetWindowProperty (dpy, parent[0],
3267 prop, 0, 1<<16, 0, AnyPropertyType, 3359 prop, 0, 1<<16, 0, AnyPropertyType,
3268 &actual_type, &actual_format, 3360 &actual_type, &actual_format,
3269 &nitems, &bytes_after, &value) == Success 3361 &nitems, &bytes_after, &value) == Success
3270 && actual_type != None 3362 && actual_type != None
3271 && actual_format == 8) 3363 && actual_format == 8)
3272 str = (const char *)(value); 3364 str = (const char *)(value);
3273 3365
3274 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3366 tt_printf ("\033]%d;%s%c", op, str, resp);
3275 3367
3276 XFree (value); 3368 XFree (value);
3277 } 3369 }
3278 else 3370 else
3279 { 3371 {
3280 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3372 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3281 3373
3282 if (eq) 3374 if (eq)
3283 { 3375 {
3284 *eq = 0; 3376 *eq = 0;
3285 XChangeProperty (display->display, TermWin.parent[0], 3377 set_utf8_property (display->atom (str), eq + 1);
3286 display->atom (str), XA_STRING, 8,
3287 PropModeReplace, (unsigned char *)eq + 1,
3288 strlen (eq + 1));
3289 } 3378 }
3290 else 3379 else
3291 XDeleteProperty (display->display, TermWin.parent[0], 3380 XDeleteProperty (dpy, parent[0],
3292 display->atom (str)); 3381 display->atom (str));
3293 } 3382 }
3294 break; 3383 break;
3295 3384
3296 case XTerm_Color: 3385 case XTerm_Color:
3297 for (buf = (char *)str; buf && *buf;) 3386 for (buf = (char *)str; buf && *buf;)
3298 { 3387 {
3299 if ((name = STRCHR (buf, ';')) == NULL) 3388 if ((name = strchr (buf, ';')) == NULL)
3300 break; 3389 break;
3301 3390
3302 *name++ = '\0'; 3391 *name++ = '\0';
3303 color = atoi (buf); 3392 color = atoi (buf) + minCOLOR;
3304 3393
3305 if (color < 0 || color >= TOTAL_COLORS) 3394 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3306 break; 3395 break;
3307 3396
3308 if ((buf = STRCHR (name, ';')) != NULL) 3397 if ((buf = strchr (name, ';')) != NULL)
3309 *buf++ = '\0'; 3398 *buf++ = '\0';
3310 3399
3311 if (name[0] == '?' && !name[1]) 3400 process_color_seq (op, color, name, resp);
3312 {
3313 if (Options & Opt_insecure)
3314 {
3315 unsigned short r, g, b;
3316 PixColors[color + minCOLOR].get (display, r, g, b);
3317 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3318 }
3319 }
3320 else
3321 set_window_color (color + minCOLOR, name);
3322 } 3401 }
3323 break; 3402 break;
3324 case XTerm_Color00: 3403 case XTerm_Color00:
3325 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3404 process_color_seq (op, Color_fg, str, resp);
3326 break; 3405 break;
3327 case XTerm_Color01: 3406 case XTerm_Color01:
3328 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3407 process_color_seq (op, Color_bg, str, resp);
3329 break; 3408 break;
3330#ifndef NO_CURSORCOLOR 3409#ifndef NO_CURSORCOLOR
3331 case XTerm_Color_cursor: 3410 case XTerm_Color_cursor:
3332 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3411 process_color_seq (op, Color_cursor, str, resp);
3333 break; 3412 break;
3334#endif 3413#endif
3335 case XTerm_Color_pointer_fg: 3414 case XTerm_Color_pointer_fg:
3336 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3415 process_color_seq (op, Color_pointer_fg, str, resp);
3337 break; 3416 break;
3338 case XTerm_Color_pointer_bg: 3417 case XTerm_Color_pointer_bg:
3339 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3418 process_color_seq (op, Color_pointer_bg, str, resp);
3340 break; 3419 break;
3341#ifndef NO_BOLD_UNDERLINE_REVERSE 3420#ifndef NO_BOLD_UNDERLINE_REVERSE
3342 case XTerm_Color_BD:
3343 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3344 break;
3345 case XTerm_Color_UL:
3346 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3347 break;
3348 case XTerm_Color_RV: 3421 case XTerm_Color_RV:
3349 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3422 process_color_seq (op, Color_RV, str, resp);
3350 break; 3423 break;
3424 case Rxvt_Color_BD:
3425 case URxvt_Color_BD:
3426 process_color_seq (op, Color_BD, str, resp);
3427 break;
3428 case Rxvt_Color_UL:
3429 case URxvt_Color_UL:
3430 process_color_seq (op, Color_UL, str, resp);
3431 break;
3432 case URxvt_Color_IT:
3433 process_color_seq (op, Color_IT, str, resp);
3434 break;
3351#endif 3435#endif
3436#if ENABLE_TRANSPARENCY && TINTING
3437 case URxvt_Color_tint:
3438 process_color_seq (op, Color_tint, str, resp);
3352 3439
3440 check_our_parents ();
3441
3442 if (am_transparent)
3443 want_full_refresh = want_refresh = 1;
3444
3445 break;
3446#endif
3447
3353 case XTerm_Pixmap: 3448 case Rxvt_Pixmap:
3449 {
3354 if (*str != ';') 3450 if (*str != ';')
3355 { 3451 {
3356#if XPM_BACKGROUND 3452#if XPM_BACKGROUND
3357 scale_pixmap (""); /* reset to default scaling */ 3453 scale_pixmap (""); /* reset to default scaling */
3358 set_bgPixmap (str); /* change pixmap */ 3454 set_bgPixmap (str); /* change pixmap */
3359#endif
3360 scr_touch (true); 3455 scr_touch (true);
3456#endif
3361 } 3457 }
3458
3459 int changed = 0;
3460
3362 while ((str = STRCHR (str, ';')) != NULL) 3461 while ((str = strchr (str, ';')) != NULL)
3363 { 3462 {
3364 str++; 3463 str++;
3365#if XPM_BACKGROUND 3464#if XPM_BACKGROUND
3366 changed += scale_pixmap (str); 3465 changed += scale_pixmap (str);
3367#endif 3466#endif
3368
3369 } 3467 }
3468
3370 if (changed) 3469 if (changed)
3371 { 3470 {
3372#ifdef XPM_BACKGROUND 3471#ifdef XPM_BACKGROUND
3373 resize_pixmap (); 3472 resize_pixmap ();
3374#endif
3375 scr_touch (true); 3473 scr_touch (true);
3474#endif
3376 } 3475 }
3476#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3477 if (option (Opt_transparent))
3478 check_our_parents ();
3479#endif
3480 }
3377 break; 3481 break;
3378 3482
3379 case XTerm_restoreFG: 3483 case Rxvt_restoreFG:
3380 set_window_color (Color_fg, str); 3484 set_window_color (Color_fg, str);
3381 break; 3485 break;
3382 case XTerm_restoreBG: 3486 case Rxvt_restoreBG:
3383 set_window_color (Color_bg, str); 3487 set_window_color (Color_bg, str);
3384 break; 3488 break;
3385 3489
3386 case XTerm_logfile: 3490 case XTerm_logfile:
3387 // TODO, when secure mode? 3491 // TODO, when secure mode?
3388 break; 3492 break;
3389 3493
3390 case XTerm_font:
3391 if (query)
3392 {
3393 if (Options & Opt_insecure)
3394 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3395 TermWin.fontset->fontdesc
3396 ? TermWin.fontset->fontdesc
3397 : "",
3398 resp);
3399 }
3400 else
3401 change_font (str);
3402 break;
3403
3404#ifndef NO_FRILLS
3405 case XTerm_locale:
3406 if (query)
3407 {
3408 if (Options & Opt_insecure)
3409 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3410 }
3411 else
3412 {
3413 set_locale (str);
3414# ifdef USE_XIM
3415 im_cb ();
3416# endif
3417 }
3418 break;
3419
3420 case XTerm_findfont:
3421 if (Options & Opt_insecure)
3422 {
3423 int fid = TermWin.fontset->find_font (atoi (str));
3424 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3425 fid, (*TermWin.fontset)[fid]->name, resp);
3426 }
3427 break;
3428#endif
3429
3430#ifdef MENUBAR
3431 case XTerm_Menu:
3432 if (Options & Opt_insecure)
3433 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3434 break;
3435#endif
3436#if 0 3494#if 0
3437 case XTerm_dumpscreen: /* no error notices */ 3495 case Rxvt_dumpscreen: /* no error notices */
3438 { 3496 {
3439 int fd; 3497 int fd;
3440 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3498 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3441 { 3499 {
3442 scr_dump (fd); 3500 scr_dump (fd);
3443 close (fd); 3501 close (fd);
3444 } 3502 }
3445 } 3503 }
3504 break;
3505#endif
3506 case XTerm_font:
3507 op = URxvt_font;
3508 case URxvt_font:
3509#if ENABLE_STYLES
3510 case URxvt_boldFont:
3511 case URxvt_italicFont:
3512 case URxvt_boldItalicFont:
3513#endif
3514 if (query)
3515 tt_printf ("\33]%d;%-.250s%c", saveop,
3516 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3517 ? fontset[op - URxvt_font]->fontdesc : "",
3518 resp);
3519 else
3520 {
3521 const char *&res = rs[Rs_font + (op - URxvt_font)];
3522
3523 res = strdup (str);
3524 allocated.push_back ((void *)res);
3525 set_fonts ();
3526 }
3527 break;
3528
3529 case URxvt_version:
3530 if (query)
3531 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3532 op,
3533 rs[Rs_name], VERSION[0], VERSION[2],
3534 resp);
3535 break;
3536
3537#if !ENABLE_MINIMAL
3538 case URxvt_locale:
3539 if (query)
3540 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3541 else
3542 {
3543 set_locale (str);
3544 pty->set_utf8_mode (enc_utf8);
3545 init_xlocale ();
3546 }
3547 break;
3548
3549 case URxvt_view_up:
3550 case URxvt_view_down:
3551 {
3552 int lines = atoi (str);
3553
3554 if (lines)
3555 scr_page (op == URxvt_view_up ? UP : DN, lines);
3556 else
3557 scr_erase_savelines ();
3558 }
3559
3560 break;
3561#endif
3562
3563#if ENABLE_PERL
3564 case URxvt_perl:
3565 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3566 ; // no responses yet
3446 break; 3567 break;
3447#endif 3568#endif
3448 } 3569 }
3449} 3570}
3450/*----------------------------------------------------------------------*/ 3571/*----------------------------------------------------------------------*/
… …
3464{ 3585{
3465 int state; 3586 int state;
3466 3587
3467 if (mode == 's') 3588 if (mode == 's')
3468 { 3589 {
3469 SavedModes |= (PrivateModes & bit); 3590 SavedModes |= (priv_modes & bit);
3470 return -1; 3591 return -1;
3471 } 3592 }
3472 else 3593 else
3473 { 3594 {
3474 if (mode == 'r') 3595 if (mode == 'r')
3475 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3596 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3476 else 3597 else
3477 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3598 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3478 PrivMode (state, bit); 3599 PrivMode (state, bit);
3479 } 3600 }
3480 3601
3481 return state; 3602 return state;
3482} 3603}
3483 3604
3484/* we're not using priv _yet_ */ 3605/* we're not using priv _yet_ */
3485void 3606void
3486rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3607rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3487{ 3608{
3488 unsigned int i, j; 3609 unsigned int i, j;
3489 int state; 3610 int state;
3490 3611
3491 static const struct 3612 static const struct
… …
3500 { 3, PrivMode_132 }, 3621 { 3, PrivMode_132 },
3501 { 4, PrivMode_smoothScroll }, 3622 { 4, PrivMode_smoothScroll },
3502 { 5, PrivMode_rVideo }, 3623 { 5, PrivMode_rVideo },
3503 { 6, PrivMode_relOrigin }, 3624 { 6, PrivMode_relOrigin },
3504 { 7, PrivMode_Autowrap }, 3625 { 7, PrivMode_Autowrap },
3626 // 8, bi-directional support mode
3505 { 9, PrivMode_MouseX10 }, 3627 { 9, PrivMode_MouseX10 },
3506#ifdef menuBar_esc 3628 // 18, 19 printing-related
3507 { menuBar_esc, PrivMode_menuBar }, 3629 { 25, PrivMode_VisibleCursor },
3508#endif
3509#ifdef scrollBar_esc 3630#ifdef scrollBar_esc
3510 { scrollBar_esc, PrivMode_scrollBar }, 3631 { scrollBar_esc, PrivMode_scrollBar },
3511#endif 3632#endif
3512 // 18, 19 printing-related
3513 { 25, PrivMode_VisibleCursor },
3514 // 30 show scrollbar rxvt. extension
3515 { 35, PrivMode_ShiftKeys }, // rxvt extension 3633 { 35, PrivMode_ShiftKeys }, // rxvt extension
3516 { 40, PrivMode_132OK }, 3634 { 40, PrivMode_132OK },
3517 // 41 xterm more fixes NYI 3635 // 41 xterm more fixes NYI
3518 // 45 margin bell NYI 3636 // 45 margin bell NYI
3519 // 46 start logging 3637 // 46 start logging
… …
3559 } 3677 }
3560 3678
3561 /* extra handling for values with state unkept */ 3679 /* extra handling for values with state unkept */
3562 switch (arg[i]) 3680 switch (arg[i])
3563 { 3681 {
3682#if ENABLE_STYLES
3683 case 1021:
3684 set_option (Opt_intensityStyles, mode);
3685
3686 scr_touch (true);
3687 break;
3688#endif
3564 case 1048: /* alternative cursor save */ 3689 case 1048: /* alternative cursor save */
3690 case 1049:
3565 if (Options & Opt_secondaryScreen) 3691 if (option (Opt_secondaryScreen))
3566 if (mode == 0) 3692 if (mode == 0)
3567 scr_cursor (RESTORE); 3693 scr_cursor (RESTORE);
3568 else if (mode == 1) 3694 else if (mode == 1)
3569 scr_cursor (SAVE); 3695 scr_cursor (SAVE);
3570 break; 3696 break;
… …
3581 * within VT52 mode 3707 * within VT52 mode
3582 */ 3708 */
3583 PrivMode (1, PrivMode_vt52); 3709 PrivMode (1, PrivMode_vt52);
3584 break; 3710 break;
3585 case 3: /* 80/132 */ 3711 case 3: /* 80/132 */
3586 if (PrivateModes & PrivMode_132OK) 3712 if (priv_modes & PrivMode_132OK)
3587 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3713 set_widthheight (((state ? 132 : 80) * fwidth), height);
3588 break; 3714 break;
3589 case 4: /* smooth scrolling */ 3715 case 4: /* smooth scrolling */
3590 if (state) 3716 set_option (Opt_jumpScroll, !state);
3591 Options &= ~Opt_jumpScroll;
3592 else
3593 Options |= Opt_jumpScroll;
3594 break; 3717 break;
3595 case 5: /* reverse video */ 3718 case 5: /* reverse video */
3596 scr_rvideo_mode (state); 3719 scr_rvideo_mode (state);
3597 break; 3720 break;
3598 case 6: /* relative/absolute origins */ 3721 case 6: /* relative/absolute origins */
… …
3602 scr_autowrap (state); 3725 scr_autowrap (state);
3603 break; 3726 break;
3604 /* case 8: - auto repeat, can't do on a per window basis */ 3727 /* case 8: - auto repeat, can't do on a per window basis */
3605 case 9: /* X10 mouse reporting */ 3728 case 9: /* X10 mouse reporting */
3606 if (state) /* orthogonal */ 3729 if (state) /* orthogonal */
3607 PrivateModes &= ~PrivMode_MouseX11; 3730 priv_modes &= ~PrivMode_MouseX11;
3608 break; 3731 break;
3609#ifdef menuBar_esc
3610 case menuBar_esc:
3611#ifdef MENUBAR
3612 map_menuBar (state);
3613#endif
3614 break;
3615#endif
3616#ifdef scrollBar_esc 3732#ifdef scrollBar_esc
3617 case scrollBar_esc: 3733 case scrollBar_esc:
3618 if (scrollbar_mapping (state)) 3734 if (scrollbar_mapping (state))
3619 { 3735 {
3620 resize_all_windows (0, 0, 0); 3736 resize_all_windows (0, 0, 0);
… …
3632 break; 3748 break;
3633 /* case 66: - application key pad */ 3749 /* case 66: - application key pad */
3634 /* case 67: - backspace key */ 3750 /* case 67: - backspace key */
3635 case 1000: /* X11 mouse reporting */ 3751 case 1000: /* X11 mouse reporting */
3636 if (state) /* orthogonal */ 3752 if (state) /* orthogonal */
3637 PrivateModes &= ~PrivMode_MouseX10; 3753 priv_modes &= ~PrivMode_MouseX10;
3638 break; 3754 break;
3639#if 0 3755#if 0
3640 case 1001: 3756 case 1001:
3641 break; /* X11 mouse highlighting */ 3757 break; /* X11 mouse highlighting */
3642#endif 3758#endif
3643 case 1010: /* scroll to bottom on TTY output inhibit */ 3759 case 1010: /* scroll to bottom on TTY output inhibit */
3644 if (state)
3645 Options &= ~Opt_scrollTtyOutput;
3646 else
3647 Options |= Opt_scrollTtyOutput; 3760 set_option (Opt_scrollTtyOutput, !state);
3648 break; 3761 break;
3649 case 1011: /* scroll to bottom on key press */ 3762 case 1011: /* scroll to bottom on key press */
3650 if (state)
3651 Options |= Opt_scrollTtyKeypress; 3763 set_option (Opt_scrollTtyKeypress, state);
3652 else
3653 Options &= ~Opt_scrollTtyKeypress;
3654 break; 3764 break;
3655 case 1047: /* secondary screen w/ clearing last */ 3765 case 1047: /* secondary screen w/ clearing last */
3656 if (Options & Opt_secondaryScreen) 3766 if (option (Opt_secondaryScreen))
3657 if (current_screen != PRIMARY) 3767 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 3768 scr_erase_screen (2);
3659 scr_change_screen (state); 3769 scr_change_screen (state);
3660 break; 3770 break;
3661 case 1049: /* secondary screen w/ clearing first */ 3771 case 1049: /* secondary screen w/ clearing first */
3662 scr_change_screen (state); 3772 scr_change_screen (state);
3663 if (Options & Opt_secondaryScreen) 3773 if (option (Opt_secondaryScreen))
3664 if (current_screen != PRIMARY) 3774 if (current_screen != PRIMARY)
3665 scr_erase_screen (2); 3775 scr_erase_screen (2);
3666 break; 3776 break;
3667 default: 3777 default:
3668 break; 3778 break;
… …
3694 rendset = 0, rendstyle = ~RS_None; 3804 rendset = 0, rendstyle = ~RS_None;
3695 break; 3805 break;
3696 case 1: 3806 case 1:
3697 rendset = 1, rendstyle = RS_Bold; 3807 rendset = 1, rendstyle = RS_Bold;
3698 break; 3808 break;
3809 //case 2: // low intensity
3810 case 3:
3811 rendset = 1, rendstyle = RS_Italic;
3812 break;
3699 case 4: 3813 case 4:
3700 rendset = 1, rendstyle = RS_Uline; 3814 rendset = 1, rendstyle = RS_Uline;
3701 break; 3815 break;
3702 case 5: 3816 case 5: // slowly blinking
3817 case 6: // rapidly blinking
3703 rendset = 1, rendstyle = RS_Blink; 3818 rendset = 1, rendstyle = RS_Blink;
3704 break; 3819 break;
3820 //case 6: // scoansi light background
3705 case 7: 3821 case 7:
3706 rendset = 1, rendstyle = RS_RVid; 3822 rendset = 1, rendstyle = RS_RVid;
3707 break; 3823 break;
3708 case 8: 3824 case 8:
3709 // invisible. NYI 3825 // invisible. NYI
3710 break; 3826 break;
3711 case 22: 3827 //case 9: // crossed out
3828 //case 10: // scoansi acs off, primary font
3829 //case 11: // scoansi acs on, first alt font
3830 //case 12: // scoansi acs on, |0x80, second alt font
3831 //...
3832 //case 19: // ninth alt font
3833 //case 20: // gothic
3834 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3712 rendset = 0, rendstyle = RS_Bold; 3835 rendset = 0, rendstyle = RS_Bold;
3836 break;
3837 case 22: // normal intensity
3838 rendset = 0, rendstyle = RS_Bold;
3839 break;
3840 case 23: // disable italic
3841 rendset = 0, rendstyle = RS_Italic;
3713 break; 3842 break;
3714 case 24: 3843 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 3844 rendset = 0, rendstyle = RS_Uline;
3716 break; 3845 break;
3717 case 25: 3846 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 3847 rendset = 0, rendstyle = RS_Blink;
3719 break; 3848 break;
3849 case 26: // variable spacing (iso 8613)
3850 rendset = 0, rendstyle = RS_Blink;
3851 break;
3720 case 27: 3852 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 3853 rendset = 0, rendstyle = RS_RVid;
3722 break; 3854 break;
3723 case 28:
3724 // visible. NYI 3855 //case 28: // visible. NYI
3725 break; 3856 //case 29: // not crossed-out
3726 } 3857 }
3727 3858
3728 if (rendset != -1) 3859 if (rendset != -1)
3729 { 3860 {
3730 scr_rendition (rendset, rendstyle); 3861 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 3872 case 35:
3742 case 36: 3873 case 36:
3743 case 37: 3874 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3875 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 3876 break;
3746#ifdef TTY_256COLOR 3877 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 3878 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 3879 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 3880 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 3881 i += 2;
3752 } 3882 }
3753 break; 3883 break;
3754#endif
3755 case 39: /* default fg */ 3884 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 3885 scr_color (Color_fg, Color_fg);
3757 break; 3886 break;
3758 3887
3759 case 40: 3888 case 40:
… …
3764 case 45: 3893 case 45:
3765 case 46: 3894 case 46:
3766 case 47: 3895 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3896 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 3897 break;
3769#ifdef TTY_256COLOR 3898 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 3899 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 3900 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 3901 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 3902 i += 2;
3775 } 3903 }
3776 break; 3904 break;
3777#endif
3778 case 49: /* default bg */ 3905 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 3906 scr_color (Color_bg, Color_bg);
3780 break; 3907 break;
3781 3908
3782#ifndef NO_BRIGHTCOLOR 3909 //case 50: // not variable spacing
3910
3911#if !ENABLE_MINIMAL
3783 case 90: 3912 case 90:
3784 case 91: /* set bright fg color */ 3913 case 91: /* set bright fg color */
3785 case 92: 3914 case 92:
3786 case 93: 3915 case 93:
3787 case 94: 3916 case 94:
3788 case 95: 3917 case 95:
3789 case 96: 3918 case 96:
3790 case 97: 3919 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 3920 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 3921 break;
3794 case 100: 3922 case 100:
3795 case 101: /* set bright bg color */ 3923 case 101: /* set bright bg color */
3796 case 102: 3924 case 102:
3797 case 103: 3925 case 103:
3798 case 104: 3926 case 104:
3799 case 105: 3927 case 105:
3800 case 106: 3928 case 106:
3801 case 107: 3929 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 3930 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 3931 break;
3805#endif 3932#endif
3806
3807 } 3933 }
3808 } 3934 }
3809} 3935}
3810/*}}} */ 3936/*}}} */
3811 3937
3812/*{{{ process Rob Nation's own graphics mode sequences */ 3938/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3813void 3939void
3814rxvt_term::process_graphics () 3940rxvt_term::process_graphics ()
3815{ 3941{
3816 unicode_t ch, cmd = cmd_getc (); 3942 unicode_t ch, cmd = cmd_getc ();
3817 3943
3818 if (cmd == 'Q') 3944 if (cmd == 'Q')
3819 { /* query graphics */ 3945 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 3946 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 3947 return;
3822 } 3948 }
3823 /* swallow other graphics sequences until terminating ':' */ 3949 /* swallow other graphics sequences until terminating ':' */
3824 do 3950 do
3825 ch = cmd_getc (); 3951 ch = cmd_getc ();
… …
3835 */ 3961 */
3836void 3962void
3837rxvt_term::tt_printf (const char *fmt,...) 3963rxvt_term::tt_printf (const char *fmt,...)
3838{ 3964{
3839 va_list arg_ptr; 3965 va_list arg_ptr;
3840 unsigned char buf[256]; 3966 char buf[256];
3841 3967
3842 va_start (arg_ptr, fmt); 3968 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 3969 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 3970 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 3971 tt_write (buf, strlen (buf));
3846} 3972}
3847 3973
3848/* ---------------------------------------------------------------------- */ 3974/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 3975/* Write data to the pty as typed by the user, pasted with the mouse,
3850 * or generated by us in response to a query ESC sequence. 3976 * or generated by us in response to a query ESC sequence.
3851 */ 3977 */
3978const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3979
3852void 3980void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 3981rxvt_term::tt_write (const char *data, unsigned int len)
3854{ 3982{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 3983 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3984 return;
3856 3985
3857 if (len) 3986 if (pty->pty < 0)
3987 return;
3988
3989 if (v_buflen == 0)
3990 {
3991 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3992
3993 if ((unsigned int)written == len)
3994 return;
3995
3996 data += written;
3997 len -= written;
3858 { 3998 }
3999
4000 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4001
4002 memcpy (v_buffer + v_buflen, data, len);
4003 v_buflen += len;
4004
4005 pty_ev.set (EVENT_READ | EVENT_WRITE);
4006}
4007
4008void rxvt_term::pty_write ()
4009{
4010 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4011
4012 if (written > 0)
4013 {
4014 v_buflen -= written;
4015
3859 if (v_buflen == 0) 4016 if (v_buflen == 0)
3860 { 4017 {
3861 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3862
3863 if ((unsigned int)written == len)
3864 return;
3865
3866 data += written;
3867 len -= written;
3868 }
3869
3870
3871 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3872
3873 memcpy (v_buffer + v_buflen, data, len);
3874 v_buflen += len;
3875 }
3876
3877 for (;;)
3878 {
3879 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3880
3881 if (written > 0)
3882 {
3883 v_buflen -= written;
3884
3885 if (v_buflen == 0)
3886 {
3887 free (v_buffer); 4018 free (v_buffer);
3888 v_buffer = 0; 4019 v_buffer = 0;
3889 v_buflen = 0; 4020 v_buflen = 0;
3890 4021
3891 pty_ev.set (EVENT_READ); 4022 pty_ev.set (EVENT_READ);
3892 return;
3893 }
3894
3895 memmove (v_buffer, v_buffer + written, v_buflen);
3896 }
3897 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3898 // original code just ignores this...
3899 destroy ();
3900 else
3901 {
3902 pty_ev.set (EVENT_READ | EVENT_WRITE);
3903 return; 4023 return;
3904 } 4024 }
4025
4026 memmove (v_buffer, v_buffer + written, v_buflen);
3905 } 4027 }
4028 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4029 pty_ev.set (EVENT_READ);
3906} 4030}
3907 4031
3908/*----------------------- end-of-file (C source) -----------------------*/ 4032/*----------------------- end-of-file (C source) -----------------------*/
3909 4033

Diff Legend

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