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.346 by root, Wed Aug 15 06:48:16 2007 UTC

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

Diff Legend

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