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

Diff Legend

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