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

Diff Legend

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