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.301 by root, Tue Jan 31 21:23:13 2006 UTC

… …
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>
54 59
55/*----------------------------------------------------------------------*/ 60/*----------------------------------------------------------------------*/
56 61
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 63
59// exception thrown when the command parser runs out of input data 64#if ENABLE_FRILLS || ISO_14755
60class out_of_input { } out_of_input; 65
66#define ISO_14755_STARTED 0x80000000UL
67#define ISO_14755_51 0x40000000UL // basic (section 5.1)
68#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
69#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
70#define ISO_14755_MASK 0x0fffffffUL
71
72#if ISO_14755
73static unsigned short iso14755_symtab[] = {
74 // keysym, unicode
75 XK_Left, 0x2190,
76 XK_KP_Left, 0x2190,
77 XK_Up, 0x2191,
78 XK_KP_Up, 0x2191,
79 XK_Right, 0x2192,
80 XK_KP_Right, 0x2192,
81 XK_Down, 0x2193,
82 XK_KP_Down, 0x2193,
83 XK_Linefeed, 0x21b4,
84 XK_Return, 0x21b5,
85 XK_KP_Enter, 0x21b5,
86
87 XK_Prior, 0x21de,
88 XK_Next, 0x21df,
89 XK_Tab, 0x21e5,
90 XK_ISO_Left_Tab, 0x21e6,
91 XK_Shift_L, 0x21e7,
92 XK_Shift_R, 0x21e7,
93
94 XK_Shift_Lock, 0x21eb,
95 XK_ISO_Lock, 0x21eb,
96 XK_ISO_Lock, 0x21eb,
97 XK_Caps_Lock, 0x21ec,
98 XK_Num_Lock, 0x21ed,
99 XK_ISO_Level3_Shift, 0x21ee,
100 XK_ISO_Level3_Lock, 0x21ef,
101 XK_ISO_Group_Lock, 0x21f0,
102 XK_Home, 0x21f1,
103 XK_End, 0x21f2,
104
105 XK_Execute, 0x2318,
106 XK_Begin, 0x2320,
107 XK_Delete, 0x2326,
108 XK_Clear, 0x2327,
109 XK_BackSpace, 0x232b,
110 XK_Insert, 0x2380,
111 XK_Control_L, 0x2388,
112 XK_Control_R, 0x2388,
113 XK_Pause, 0x2389,
114 XK_Break, 0x238a,
115 XK_Escape, 0x238b,
116 XK_Undo, 0x238c,
117 XK_Print, 0x2399,
118
119 XK_space, 0x2423,
120
121#ifdef XK_KP_Begin
122 XK_KP_Prior, 0x21de,
123 XK_KP_Next, 0x21df,
124 XK_KP_Begin, 0x2320,
125 XK_KP_Insert, 0x2380,
126 XK_KP_Delete, 0x2326,
127 XK_KP_Space, 0x2422,
128#endif
129 0,
130};
131
132void
133rxvt_term::iso14755_54 (int x, int y)
134{
135 x = Pixel2Col (x);
136 y = Pixel2Row (y);
137
138 if (!IN_RANGE_EXC (x, 0, ncol)
139 || !IN_RANGE_EXC (y, 0, nrow))
140 return;
141
142 for (;;)
143 {
144 const line_t &l = ROW(y + view_start);
145
146 text_t t = l.t[x];
147
148 if (t != NOCHAR || !x)
149 {
150 iso14755_51 (l.t[x], l.r[x], x, y);
151 iso14755buf = ISO_14755_54;
152 break;
153 }
154
155 x--;
156 }
157}
158
159void
160rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
161{
162 rxvt_fontset *fs = FONTSET (r);
163 rxvt_font *f = (*fs)[fs->find_font (ch)];
164 wchar_t *chr, *alloc, ch2, *fname;
165 int len;
166
167 fname = rxvt_utf8towcs (f->name);
168
169# if ENABLE_COMBINING
170 if (IS_COMPOSE (ch))
171 {
172 len = rxvt_composite.expand (ch, 0);
173 alloc = chr = new wchar_t[len];
174 rxvt_composite.expand (ch, chr);
175 }
176 else
177# endif
178 {
179 ch2 = ch;
180
181 alloc = 0;
182 chr = &ch2;
183 len = 1;
184 }
185
186 char attr[80]; // plenty
187
188 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
189 (int)r,
190 fgcolor_of (r), bgcolor_of (r),
191 r & RS_Bold ? " bold" : "",
192 r & RS_Italic ? " italic" : "",
193 r & RS_Blink ? " blink" : "",
194 r & RS_RVid ? " rvid" : "",
195 r & RS_Uline ? " uline" : "",
196 r & RS_Careful ? " careful" : "");
197
198 int width = wcswidth (fname, wcslen (fname));
199
200 max_it (width, 8+5); // for char + hey
201 max_it (width, strlen (attr));
202
203 if (y >= 0)
204 {
205 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
206 x = 0;
207 }
208
209 scr_overlay_new (x, y, width, len + 2);
210
211 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
212
213 for (int y = 0; y < len; y++)
214 {
215 char buf[9];
216
217 ch = *chr++;
218
219 sprintf (buf, "%8x", ch);
220 scr_overlay_set (0, y, buf);
221 scr_overlay_set (9, y, '=');
222# if !UNICODE3
223 if (ch >= 0x10000)
224 ch = 0xfffd;
225# endif
226 scr_overlay_set (11, y, ch, r);
227
228 if (WCWIDTH (ch) >= 2)
229 scr_overlay_set (12, y, NOCHAR, r);
230 }
231
232// {
233// char buf[4+4+3+1];
234// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
235// scr_overlay_set (0, 0, buf);
236// }
237 scr_overlay_set (0, len , attr);
238 scr_overlay_set (0, len + 1, fname);
239
240 free (fname);
241
242# if ENABLE_COMBINING
243 if (alloc)
244 delete [] alloc;
245# endif
246}
247#endif
248
249void
250rxvt_term::commit_iso14755 ()
251{
252 wchar_t ch[2];
253
254 ch[0] = iso14755buf & ISO_14755_MASK;
255 ch[1] = 0;
256
257 if (iso14755buf & ISO_14755_51)
258 {
259 char mb[16];
260 int len;
261
262 // allow verbatim 0-bytes and control-bytes to be entered
263 if (ch[0] >= 0x20)
264 len = wcstombs (mb, ch, 16);
265 else
266 {
267 mb[0] = ch[0];
268 len = 1;
269 }
270
271 if (len > 0)
272 tt_write (mb, len);
273 else
274 scr_bell ();
275 }
276
277 iso14755buf = 0;
278}
279
280int
281rxvt_term::hex_keyval (XKeyEvent &ev)
282{
283 // check wether this event corresponds to a hex digit
284 // if the modifiers had not been pressed.
285 for (int index = 0; index < 8; index++)
286 {
287 KeySym k = XLookupKeysym (&ev, index);
288
289 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
290 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
291 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
292 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
293 }
294
295 return -1;
296}
297#endif
61 298
62/*{{{ Convert the keypress event into a string */ 299/*{{{ Convert the keypress event into a string */
63void 300void
64rxvt_term::lookup_key (XKeyEvent &ev) 301rxvt_term::lookup_key (XKeyEvent &ev)
65{ 302{
66 int ctrl, meta, shft, len; 303 int ctrl, meta, shft, len;
67 unsigned int newlen; 304 unsigned int newlen;
68 KeySym keysym; 305 KeySym keysym;
69#ifdef DEBUG_CMD
70 static int debug_key = 1; /* accessible by a debugger only */
71#endif
72 int valid_keysym; 306 int valid_keysym;
73 unsigned char kbuf[KBUFSZ]; 307 char kbuf[KBUFSZ];
74 308
75 /* 309 /*
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 310 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 311 * escape sequence to toggle the Keypad.
78 * 312 *
79 * Always permit `shift' to override the current setting 313 * Always permit `shift' to override the current setting
80 */ 314 */
81 shft = (ev.state & ShiftMask); 315 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 316 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 317 meta = ev.state & ModMetaMask;
84 318
85 if (numlock_state || (ev.state & ModNumLockMask)) 319 if (numlock_state || (ev.state & ModNumLockMask))
86 { 320 {
87 numlock_state = (ev.state & ModNumLockMask); 321 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 322 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
96 Status status_return; 330 Status status_return;
97 331
98#if 0 332#if 0
99#ifdef X_HAVE_UTF8_STRING 333#ifdef X_HAVE_UTF8_STRING
100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 334 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 335 len = Xutf8LookupString (Input_Context, &ev, kbuf,
102 KBUFSZ, &keysym, &status_return); 336 KBUFSZ, &keysym, &status_return);
103 else 337 else
104#endif 338#endif
105#endif 339#endif
106 { 340 {
… …
108 342
109 // the XOpenIM manpage lies about hardcoding the locale 343 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 344 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 345 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 346 SET_LOCALE (rs[Rs_imLocale]);
347
113 // assume wchar_t == unicode or better 348 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 349 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 350 KBUFSZ, &keysym, &status_return);
351
116 if (rs[Rs_imLocale]) 352 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 353 SET_LOCALE (locale);
118 354
119 if (status_return == XLookupChars 355 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 356 || status_return == XLookupBoth)
… …
141 || status_return == XLookupBoth; 377 || status_return == XLookupBoth;
142 } 378 }
143 else 379 else
144#endif 380#endif
145 { 381 {
146 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 382 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
147 valid_keysym = keysym != NoSymbol; 383 valid_keysym = keysym != NoSymbol;
148 } 384 }
149 385
150 if (valid_keysym) 386 if (valid_keysym)
151 { 387 {
388#ifdef KEYSYM_RESOURCE
389 if (keyboard->dispatch (this, keysym, ev.state))
390 return;
391#endif
392
152 if (TermWin.saveLines) 393 if (saveLines)
153 { 394 {
154#ifdef UNSHIFTED_SCROLLKEYS 395#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 396 if (!ctrl && !meta)
156 {
157#else 397#else
158 if (IS_SCROLL_MOD) 398 if (IS_SCROLL_MOD)
399#endif
159 { 400 {
160#endif
161 int lnsppg; 401 int lnsppg;
162 402
163#ifdef PAGING_CONTEXT_LINES 403#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 404 lnsppg = nrow - PAGING_CONTEXT_LINES;
165#else 405#else
166 lnsppg = TermWin.nrow * 4 / 5; 406 lnsppg = nrow * 4 / 5;
167#endif 407#endif
168 if (keysym == XK_Prior) 408 if (keysym == XK_Prior)
169 { 409 {
170 scr_page (UP, lnsppg); 410 scr_page (UP, lnsppg);
171 return; 411 return;
… …
199 scr_move_to (0, 1); 439 scr_move_to (0, 1);
200 return; 440 return;
201 } 441 }
202 else if (keysym == XK_End) 442 else if (keysym == XK_End)
203 { 443 {
204 scr_move_to (1, 0); 444 scr_move_to (1, 1);
205 return; 445 return;
206 } 446 }
207 } 447 }
208#endif 448#endif
209 } 449 }
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 454 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 455 {
216 keysym += (XK_F11 - XK_F1); 456 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 457 shft = 0; /* turn off Shift */
218 } 458 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 459 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 460 {
221 switch (keysym) 461 switch (keysym)
222 { 462 {
223 /* normal XTerm key bindings */ 463 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 464 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 465 selection_request (ev.time);
226 return; 466 return;
467#if TODO
227 /* rxvt extras */ 468 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 469 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 470 change_font (FONT_UP);
230 return; 471 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 472 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 473 change_font (FONT_DN);
233 return; 474 return;
475#endif
234 } 476 }
235 } 477 }
236 } 478 }
237#ifdef PRINTPIPE 479
238 if (keysym == XK_Print) 480#if ENABLE_FRILLS || ISO_14755
239 { 481 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 482 if (shft && ctrl)
241 return;
242 } 483 {
243#endif 484 int hv;
244 485
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 486 if (iso14755buf & ISO_14755_51
246 { 487 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 488 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 489 {
250 unsigned int l; 490 commit_iso14755 ();
251 const unsigned char *kbuf0; 491 iso14755buf = ISO_14755_51;
252 492# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 493 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 494# endif
261 ) 495 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 496 }
266 497 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 498 {
499 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
500 | hv | ISO_14755_51;
501# if ISO_14755
502 iso14755_51 (iso14755buf & ISO_14755_MASK);
503# endif
268 return; 504 return;
269 } 505 }
270 else 506 else
507 {
508# if ENABLE_OVERLAY
509 scr_overlay_off ();
271#endif 510# endif
511 iso14755buf = 0;
512 }
513 }
514 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
515 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
516 if (!(iso14755buf & ISO_14755_STARTED))
517 {
518 iso14755buf |= ISO_14755_STARTED;
519# if ENABLE_OVERLAY
520 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
521 scr_overlay_set (0, 0, "ISO 14755 mode");
522# endif
523 }
524#endif
525
526#ifdef PRINTPIPE
527 if (keysym == XK_Print)
528 {
529 scr_printscreen (ctrl | shft);
530 return;
531 }
532#endif
533
534 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
535 {
272 { 536 {
273 newlen = 1; 537 newlen = 1;
274 switch (keysym) 538 switch (keysym)
275 { 539 {
276#ifndef NO_BACKSPACE_KEY 540#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 541 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 542 if (priv_modes & PrivMode_HaveBackSpace)
279 { 543 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 544 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 545 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 546 kbuf[1] = '\0';
283 } 547 }
284 else 548 else
285 STRCPY (kbuf, key_backspace); 549 strcpy (kbuf, key_backspace);
286 break; 550 break;
287#endif 551#endif
288#ifndef NO_DELETE_KEY 552#ifndef NO_DELETE_KEY
553# ifdef XK_KP_Prior
554 case XK_KP_Delete:
555 /* allow shift to override */
556 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
557 {
558 strcpy (kbuf, "\033On");
559 break;
560 }
561 /* FALLTHROUGH */
562# endif
289 case XK_Delete: 563 case XK_Delete:
290 STRCPY (kbuf, key_delete); 564 strcpy (kbuf, key_delete);
291 break; 565 break;
292#endif 566#endif
293 case XK_Tab: 567 case XK_Tab:
294 if (shft) 568 if (shft)
295 STRCPY (kbuf, "\033[Z"); 569 strcpy (kbuf, "\033[Z");
296 else 570 else
297 { 571 {
298#ifdef CTRL_TAB_MAKES_META 572#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 573 if (ctrl)
300 meta = 1; 574 meta = 1;
… …
306 newlen = 0; 580 newlen = 0;
307 } 581 }
308 break; 582 break;
309 583
310#ifdef XK_KP_Left 584#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 585 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 586 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 587 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 588 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 589 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 590 {
317 STRCPY (kbuf, "\033OZ"); 591 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 592 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 593 break;
320 } 594 }
321 else 595 else
322 /* translate to std. cursor key */ 596 /* translate to std. cursor key */
… …
325#endif 599#endif
326 case XK_Up: /* "\033[A" */ 600 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 601 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 602 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 603 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 604 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 605 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 606 /* do Shift first */
333 if (shft) 607 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 608 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 609 else if (ctrl)
336 { 610 {
337 kbuf[1] = 'O'; 611 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 612 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 613 }
340 else if (PrivateModes & PrivMode_aplCUR) 614 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 615 kbuf[1] = 'O';
342 break; 616 break;
343 617
344#ifndef UNSHIFTED_SCROLLKEYS 618#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 619# ifdef XK_KP_Prior
346 case XK_KP_Prior: 620 case XK_KP_Prior:
347 /* allow shift to override */ 621 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 622 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 623 {
350 STRCPY (kbuf, "\033Oy"); 624 strcpy (kbuf, "\033Oy");
351 break; 625 break;
352 } 626 }
353 /* FALLTHROUGH */ 627 /* FALLTHROUGH */
354# endif 628# endif
355 case XK_Prior: 629 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 630 strcpy (kbuf, "\033[5~");
357 break; 631 break;
358# ifdef XK_KP_Next 632# ifdef XK_KP_Next
359 case XK_KP_Next: 633 case XK_KP_Next:
360 /* allow shift to override */ 634 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 635 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 636 {
363 STRCPY (kbuf, "\033Os"); 637 strcpy (kbuf, "\033Os");
364 break; 638 break;
365 } 639 }
366 /* FALLTHROUGH */ 640 /* FALLTHROUGH */
367# endif 641# endif
368 case XK_Next: 642 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
370 break; 644 break;
371#endif 645#endif
372 case XK_KP_Enter: 646 case XK_KP_Enter:
373 /* allow shift to override */ 647 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 648 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 649 {
376 STRCPY (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
651 break;
652 }
653
654 /* FALLTHROUGH */
655
656 case XK_Return:
657 if (priv_modes & PrivMode_LFNL)
658 {
659 kbuf[0] = '\015';
660 kbuf[1] = '\012';
661 kbuf[2] = '\0';
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 670#ifdef XK_KP_Begin
386 case XK_KP_Begin: 671 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 672 strcpy (kbuf, "\033Ou");
388 break; 673 break;
389 674
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 675#endif
398 case XK_KP_F1: /* "\033OP" */ 676 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 677 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 678 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 679 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 680 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 681 kbuf[2] += (keysym - XK_KP_F1);
404 break; 682 break;
405 683
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 684 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 685 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 696 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 697 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 698 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 699 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 700 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 701 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 702 {
425 STRCPY (kbuf, "\033Oj"); 703 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 704 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 705 }
428 else 706 else
429 { 707 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 708 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 709 kbuf[1] = '\0';
432 } 710 }
433 break; 711 break;
434 712
435 case XK_Find: 713 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 714 strcpy (kbuf, "\033[1~");
437 break; 715 break;
716
717#ifdef XK_KP_End
718 case XK_KP_Insert:
719 /* allow shift to override */
720 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
721 {
722 strcpy (kbuf, "\033Op");
723 break;
724 }
725 /* FALLTHROUGH */
726#endif
438 case XK_Insert: 727 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 728 strcpy (kbuf, "\033[2~");
440 break; 729 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 730#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 731 case DXK_Remove:
443 /* FALLTHROUGH */ 732 /* FALLTHROUGH */
444#endif 733#endif
445 case XK_Execute: 734 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 735 strcpy (kbuf, "\033[3~");
447 break; 736 break;
448 case XK_Select: 737 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 738 strcpy (kbuf, "\033[4~");
450 break; 739 break;
451#ifdef XK_KP_End 740#ifdef XK_KP_End
452 case XK_KP_End: 741 case XK_KP_End:
453 /* allow shift to override */ 742 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 743 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 744 {
456 STRCPY (kbuf, "\033Oq"); 745 strcpy (kbuf, "\033Oq");
457 break; 746 break;
458 } 747 }
459 /* FALLTHROUGH */ 748 /* FALLTHROUGH */
460#endif 749#endif
461 case XK_End: 750 case XK_End:
462 STRCPY (kbuf, KS_END); 751 strcpy (kbuf, KS_END);
463 break; 752 break;
464#ifdef XK_KP_Home 753#ifdef XK_KP_Home
465 case XK_KP_Home: 754 case XK_KP_Home:
466 /* allow shift to override */ 755 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 756 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 757 {
469 STRCPY (kbuf, "\033Ow"); 758 strcpy (kbuf, "\033Ow");
470 break; 759 break;
471 } 760 }
472 /* FALLTHROUGH */ 761 /* FALLTHROUGH */
473#endif 762#endif
474 case XK_Home: 763 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 764 strcpy (kbuf, KS_HOME);
476 break; 765 break;
477 766
478#define FKEY(n, fkey) \ 767#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 768 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 769
… …
532#undef FKEY 821#undef FKEY
533 default: 822 default:
534 newlen = 0; 823 newlen = 0;
535 break; 824 break;
536 } 825 }
826
537 if (newlen) 827 if (newlen)
538 len = STRLEN (kbuf); 828 len = strlen (kbuf);
539 } 829 }
540 830
541 /* 831 /*
542 * Pass meta for all function keys, if 'meta' option set 832 * Pass meta for all function keys, if 'meta' option set
543 */ 833 */
… …
550 else if (ctrl && keysym == XK_minus) 840 else if (ctrl && keysym == XK_minus)
551 { 841 {
552 len = 1; 842 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 843 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 844 }
845 else if (keysym == XK_ISO_Left_Tab)
846 {
847 strcpy (kbuf, "\033[Z");
848 len = 3;
849 }
555 else 850 else
556 { 851 {
557#ifdef META8_OPTION 852#ifdef META8_OPTION
558 /* set 8-bit on */ 853 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 854 if (meta && (meta_char == 0x80))
560 { 855 {
561 unsigned char *ch; 856 char *ch;
562 857
563 for (ch = kbuf; ch < kbuf + len; ch++) 858 for (ch = kbuf; ch < kbuf + len; ch++)
564 *ch |= 0x80; 859 *ch |= 0x80;
565 860
566 meta = 0; 861 meta = 0;
… …
568#endif 863#endif
569 /* nil */ ; 864 /* nil */ ;
570 } 865 }
571 } 866 }
572 867
868 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
869 return;
870
573 if (len <= 0) 871 if (len <= 0)
574 return; /* not mapped */ 872 return; /* not mapped */
575 873
576 if (Options & Opt_scrollTtyKeypress) 874 if (OPTION (Opt_scrollTtyKeypress))
577 if (TermWin.view_start) 875 if (view_start)
578 { 876 {
579 TermWin.view_start = 0; 877 view_start = 0;
580 want_refresh = 1; 878 want_refresh = 1;
581 } 879 }
582 880
583 /* 881 /*
584 * these modifications only affect the static keybuffer 882 * these modifications only affect the static keybuffer
… …
599#ifdef META8_OPTION 897#ifdef META8_OPTION
600 && meta_char == C0_ESC 898 && meta_char == C0_ESC
601#endif 899#endif
602 ) 900 )
603 { 901 {
604 const unsigned char ch = C0_ESC; 902 const char ch = C0_ESC;
605 tt_write (&ch, 1); 903 tt_write (&ch, 1);
606 } 904 }
607 905
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); 906 tt_write (kbuf, (unsigned int)len);
619} 907}
620/*}}} */ 908/*}}} */
621 909
622#if (MENUBAR_MAX) 910#if defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */
625unsigned int 911unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 912rxvt_term::cmd_write (const char *str, unsigned int count)
627{ 913{
628 unsigned int n, s; 914 unsigned int n, s;
629 915
630 n = cmdbuf_ptr - cmdbuf_base; 916 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 917 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 918
633 if (n > 0 && s < count) 919 if (n > 0 && s < count)
634 { 920 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 921 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 922 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 923 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 924 cmdbuf_endp -= n;
639 s += n; 925 s += n;
640 } 926 }
… …
650 936
651 cmd_parse (); 937 cmd_parse ();
652 938
653 return 0; 939 return 0;
654} 940}
655#endif /* MENUBAR_MAX */ 941#endif
656 942
657void 943void
658rxvt_term::flush () 944rxvt_term::flush ()
659{ 945{
946 flush_ev.stop ();
947
660#ifdef TRANSPARENT 948#ifdef TRANSPARENT
661 if (want_full_refresh) 949 if (want_full_refresh)
662 { 950 {
663 want_full_refresh = 0; 951 want_full_refresh = 0;
664 scr_clear (); 952 scr_clear ();
665 scr_touch (false); 953 scr_touch (false);
666 want_refresh = 1;
667 } 954 }
668#endif 955#endif
669 956
670 if (want_refresh) 957 if (want_refresh)
671 { 958 {
959 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
960 {
961 int row = view_start;
962 int end_row = row + nrow;
963
964 while (row > top_row && ROW (row - 1).is_longer ())
965 --row;
966
967 do
968 {
969 int start_row = row;
970 line_t *l;
971
972 do
973 {
974 l = &ROW (row++);
975
976 if (!(l->f & LINE_FILTERED))
977 {
978 // line not filtered, mark it as filtered
979 l->f |= LINE_FILTERED;
980 while (l->is_longer ())
981 {
982 l = &ROW (row++);
983 l->f |= LINE_FILTERED;
984 }
985
986 // and filter it
987 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
988
989 break;
990 }
991 }
992 while (l->is_longer () && row < end_row);
993 }
994 while (row < end_row);
995 }
996
672 scr_refresh (refresh_type); 997 scr_refresh ();
673 scrollbar_show (1); 998 scrollbar_show (1);
674#ifdef USE_XIM 999#ifdef USE_XIM
675 IMSendSpot (); 1000 IMSendSpot ();
676#endif 1001#endif
677 } 1002 }
678 1003
679 display->flush (); 1004 display->flush ();
680
681 flush_ev.stop ();
682} 1005}
683 1006
684void 1007void
685rxvt_term::check_cb (check_watcher &w) 1008rxvt_term::check_cb (check_watcher &w)
686{ 1009{
687 SET_R (this); 1010 make_current ();
688 SET_LOCALE (locale);
689 1011
690 display->flush (); 1012 display->flush ();
691 1013
692 if (!flush_ev.active) 1014 if (want_refresh && !flush_ev.active)
693 flush_ev.start (NOW + 0.01); 1015 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
694} 1016}
695 1017
696void 1018void
697rxvt_term::flush_cb (time_watcher &w) 1019rxvt_term::flush_cb (time_watcher &w)
698{ 1020{
699 SET_R (this); 1021 make_current ();
700 SET_LOCALE (locale);
701 1022
702 refresh_limit = 1; 1023 refresh_limit = 1;
703 refresh_count = 0; 1024 refresh_count = 0;
704 flush (); 1025 flush ();
705} 1026}
… …
709rxvt_term::cursor_blink_cb (time_watcher &w) 1030rxvt_term::cursor_blink_cb (time_watcher &w)
710{ 1031{
711 hidden_cursor = !hidden_cursor; 1032 hidden_cursor = !hidden_cursor;
712 want_refresh = 1; 1033 want_refresh = 1;
713 1034
714 w.start (w.at + BLINK_INTERVAL); 1035 w.start (w.at + CURSOR_BLINK_INTERVAL);
715} 1036}
716#endif 1037#endif
717 1038
718#ifdef TEXT_BLINK 1039#ifdef TEXT_BLINK
719void 1040void
… …
733rxvt_term::cont_scroll_cb (time_watcher &w) 1054rxvt_term::cont_scroll_cb (time_watcher &w)
734{ 1055{
735 if ((scrollbar_isUp() || scrollbar_isDn()) && 1056 if ((scrollbar_isUp() || scrollbar_isDn()) &&
736 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1057 scr_page (scrollbar_isUp() ? UP : DN, 1))
737 { 1058 {
738 refresh_type |= SMOOTH_REFRESH;
739 want_refresh = 1; 1059 want_refresh = 1;
740 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1060 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
741 } 1061 }
742} 1062}
743#endif 1063#endif
… …
747rxvt_term::sel_scroll_cb (time_watcher &w) 1067rxvt_term::sel_scroll_cb (time_watcher &w)
748{ 1068{
749 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1069 if (scr_page (scroll_selection_dir, scroll_selection_lines))
750 { 1070 {
751 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1071 selection_extend (selection_save_x, selection_save_y, selection_save_state);
752 refresh_type |= SMOOTH_REFRESH;
753 want_refresh = 1; 1072 want_refresh = 1;
754 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1073 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
755 } 1074 }
756} 1075}
757#endif 1076#endif
… …
762{ 1081{
763 if (mouse_slip_wheel_speed == 0 1082 if (mouse_slip_wheel_speed == 0
764 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1083 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
765 : scr_page (UP, mouse_slip_wheel_speed)) 1084 : scr_page (UP, mouse_slip_wheel_speed))
766 { 1085 {
767 refresh_type |= SMOOTH_REFRESH; 1086 if (view_start == top_row || view_start == 0)
1087 mouse_slip_wheel_speed = 0;
1088
768 want_refresh = 1; 1089 want_refresh = 1;
769 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
770 } 1091 }
771} 1092}
772#endif 1093#endif
… …
776{ 1097{
777 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1098 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
778 1099
779 if (CBUFSIZ == n) 1100 if (CBUFSIZ == n)
780 { 1101 {
781 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1102 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
782 n = 0; 1103 n = 0;
783 } 1104 }
784 1105
785 memmove (cmdbuf_base, cmdbuf_ptr, n); 1106 memmove (cmdbuf_base, cmdbuf_ptr, n);
786 cmdbuf_ptr = cmdbuf_base; 1107 cmdbuf_ptr = cmdbuf_base;
787 cmdbuf_endp = cmdbuf_ptr + n; 1108 cmdbuf_endp = cmdbuf_ptr + n;
788 1109
789 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1110 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
790 1111
791 if (n > 0) 1112 if (r > 0)
792 { 1113 {
793 cmdbuf_endp += n; 1114 cmdbuf_endp += r;
794 return true; 1115 return true;
795 } 1116 }
796 else if (n < 0 && errno != EAGAIN) 1117 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1118 {
1119#if HAVE_SCHED_YIELD
1120 if (display->is_local)
1121 event_handler.cw_yield.start ();
1122#endif
1123 }
1124 else
1125 {
1126 pty_ev.stop ();
1127
1128 if (!OPTION (Opt_hold))
797 destroy (); 1129 destroy ();
1130 }
798 1131
799 return false; 1132 return false;
800} 1133}
801 1134
802void 1135void
803rxvt_term::pty_cb (io_watcher &w, short revents) 1136rxvt_term::pty_cb (io_watcher &w, short revents)
804{ 1137{
805 SET_R (this); 1138 make_current ();
806 SET_LOCALE (locale);
807 1139
808 if (revents & EVENT_WRITE)
809 tt_write (0, 0);
810 else if (revents & EVENT_READ) 1140 if (revents & EVENT_READ)
811 // loop, but don't allow a single term to monopolize us 1141 // loop, but don't allow a single term to monopolize us
812 while (pty_fill ()) 1142 while (pty_fill ())
813 if (cmd_parse ()) 1143 if (cmd_parse ())
814 break; 1144 break;
1145
1146 if (revents & EVENT_WRITE)
1147 pty_write ();
815} 1148}
816 1149
817void 1150void
818rxvt_term::pointer_unblank () 1151rxvt_term::pointer_unblank ()
819{ 1152{
820 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1153 XDefineCursor (xdisp, vt, TermWin_cursor);
821 recolour_cursor (); 1154 recolour_cursor ();
822 1155
823#ifdef POINTER_BLANK 1156#ifdef POINTER_BLANK
824 hidden_pointer = 0; 1157 hidden_pointer = 0;
825 1158
826 if (Options & Opt_pointerBlank) 1159 if (OPTION (Opt_pointerBlank))
827 pointer_ev.start (NOW + pointerBlankDelay); 1160 pointer_ev.start (NOW + pointerBlankDelay);
828#endif 1161#endif
829} 1162}
830 1163
831#ifdef POINTER_BLANK 1164#ifdef POINTER_BLANK
832void 1165void
833rxvt_term::pointer_blank () 1166rxvt_term::pointer_blank ()
834{ 1167{
835 if (! (Options & Opt_pointerBlank)) 1168 if (!OPTION (Opt_pointerBlank))
836 return; 1169 return;
837 1170
838 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1171 XDefineCursor (xdisp, vt, display->blank_cursor);
839 XFlush (display->display); 1172 XFlush (xdisp);
840 1173
841 hidden_pointer = 1; 1174 hidden_pointer = 1;
842} 1175}
843 1176
844void 1177void
845rxvt_term::pointer_cb (time_watcher &w) 1178rxvt_term::pointer_cb (time_watcher &w)
846{ 1179{
847 SET_R (this); 1180 make_current ();
848 SET_LOCALE (locale);
849 1181
850 pointer_blank (); 1182 pointer_blank ();
851} 1183}
852#endif 1184#endif
853 1185
… …
860 x = ev.x; 1192 x = ev.x;
861 y = ev.y; 1193 y = ev.y;
862 pixel_position (&x, &y); 1194 pixel_position (&x, &y);
863 1195
864 if (MEvent.button == AnyButton) 1196 if (MEvent.button == AnyButton)
865 {
866 button_number = 3; 1197 button_number = 3;
867 }
868 else 1198 else
869 { 1199 {
870 button_number = MEvent.button - Button1; 1200 button_number = MEvent.button - Button1;
871 /* add 0x3D for wheel events, like xterm does */ 1201 /* add 0x3D for wheel events, like xterm does */
872 if (button_number >= 3) 1202 if (button_number >= 3)
873 button_number += (64 - 3); 1203 button_number += (64 - 3);
874 } 1204 }
875 1205
876 if (PrivateModes & PrivMode_MouseX10) 1206 if (priv_modes & PrivMode_MouseX10)
877 { 1207 {
878 /* 1208 /*
879 * do not report ButtonRelease 1209 * do not report ButtonRelease
880 * no state info allowed 1210 * no state info allowed
881 */ 1211 */
… …
896 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1226 + ((MEvent.state & ModMetaMask) ? 8 : 0)
897 + ((MEvent.state & ControlMask) ? 16 : 0); 1227 + ((MEvent.state & ControlMask) ? 16 : 0);
898#ifdef MOUSE_REPORT_DOUBLECLICK 1228#ifdef MOUSE_REPORT_DOUBLECLICK
899 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1229 key_state += ((MEvent.clicks > 1) ? 32 : 0);
900#endif 1230#endif
901
902 } 1231 }
903 1232
904#ifdef DEBUG_MOUSEREPORT 1233#if DEBUG_MOUSEREPORT
905 fprintf (stderr, "Mouse ["); 1234 fprintf (stderr, "Mouse [");
906 if (key_state & 16) 1235 if (key_state & 16)
907 fputc ('C', stderr); 1236 fputc ('C', stderr);
908 if (key_state & 4) 1237 if (key_state & 4)
909 fputc ('S', stderr); 1238 fputc ('S', stderr);
… …
913 fputc ('2', stderr); 1242 fputc ('2', stderr);
914 fprintf (stderr, "]: <%d>, %d/%d\n", 1243 fprintf (stderr, "]: <%d>, %d/%d\n",
915 button_number, 1244 button_number,
916 x + 1, 1245 x + 1,
917 y + 1); 1246 y + 1);
918#else 1247#endif
1248
919 tt_printf ("\033[M%c%c%c", 1249 tt_printf ("\033[M%c%c%c",
920 (32 + button_number + key_state), 1250 (32 + button_number + key_state),
921 (32 + x + 1), 1251 (32 + x + 1),
922 (32 + y + 1)); 1252 (32 + y + 1));
923#endif
924} 1253}
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 1254
936/*{{{ process an X event */ 1255/*{{{ process an X event */
937void 1256void
938rxvt_term::x_cb (XEvent &ev) 1257rxvt_term::x_cb (XEvent &ev)
939{ 1258{
940 SET_R (this); 1259 make_current ();
941 SET_LOCALE (locale);
942 1260
943#if defined(CURSOR_BLINK) 1261 dLocal (Display *, xdisp);
944 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
945 {
946 if (hidden_cursor)
947 {
948 hidden_cursor = 0;
949 want_refresh = 1;
950 }
951 1262
952 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1263 if (ev.xany.window == vt
953 } 1264 && SHOULD_INVOKE (HOOK_X_EVENT)
954#endif 1265 && 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; 1266 return;
973#endif
974 1267
1268 // for XQueryPointer
975 Window unused_root, unused_child; 1269 Window unused_root, unused_child;
976 int unused_root_x, unused_root_y; 1270 int unused_root_x, unused_root_y;
977 unsigned int unused_mask; 1271 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 1272
1028 switch (ev.type) 1273 switch (ev.type)
1029 { 1274 {
1030 case KeyPress: 1275 case KeyPress:
1276#if ISO_14755
1277 if (!(iso14755buf & ISO_14755_52))
1278#endif
1031 lookup_key (ev.xkey); 1279 lookup_key (ev.xkey);
1280
1281 break;
1282
1283 case KeyRelease:
1284 {
1285#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1286 KeySym keysym;
1287
1288 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1289#endif
1290
1291#if ENABLE_FRILLS || ISO_14755
1292 // ISO 14755 support
1293 if (iso14755buf)
1294 if (iso14755buf & ISO_14755_52)
1295 {
1296# if ENABLE_OVERLAY
1297 scr_overlay_off ();
1298# endif
1299# if ISO_14755
1300 // iso14755 part 5.2 handling: release time
1301 // first: controls
1302 if ((ev.xkey.state & ControlMask)
1303 && ((keysym >= 0x40 && keysym <= 0x5f)
1304 || (keysym >= 0x61 && keysym <= 0x7f)))
1305 {
1306 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1307 commit_iso14755 ();
1308 goto skip_switch;
1309 }
1310
1311 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1312 if (i[0] == keysym)
1313 {
1314 iso14755buf = ISO_14755_51 | i[1];
1315 commit_iso14755 ();
1316 goto skip_switch;
1317 }
1318
1319 scr_bell ();
1320# endif
1321 iso14755buf = 0;
1322 break;
1323 }
1324 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1325 {
1326# if ENABLE_OVERLAY
1327 scr_overlay_off ();
1328# endif
1329 if (iso14755buf & ISO_14755_51)
1330 commit_iso14755 ();
1331#if ISO_14755
1332 else if (iso14755buf & ISO_14755_STARTED)
1333 {
1334 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1335
1336 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1337 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1338 }
1339# endif
1340 else
1341 iso14755buf = 0;
1342 }
1343#endif
1344
1345 if (ev.xany.window == vt
1346 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1032 break; 1347 break;
1033 1348
1034#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1035 case KeyRelease:
1036 {
1037 if (!(ev.xkey.state & ControlMask)) 1350 if (!(ev.xkey.state & ControlMask))
1038 slip_wheel_ev.stop (); 1351 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) 1352 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1045 mouse_slip_wheel_speed = 0; 1353 mouse_slip_wheel_speed = 0;
1046 } 1354#endif
1047 break; 1355 break;
1048 } 1356 }
1049#endif
1050 1357
1051 case ButtonPress: 1358 case ButtonPress:
1052 button_press (ev.xbutton); 1359 button_press (ev.xbutton);
1053 break; 1360 break;
1054 1361
… …
1056 button_release (ev.xbutton); 1363 button_release (ev.xbutton);
1057 break; 1364 break;
1058 1365
1059 case ClientMessage: 1366 case ClientMessage:
1060 if (ev.xclient.format == 32 1367 if (ev.xclient.format == 32
1061 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1368 && !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 { 1369 {
1070 /* Get Dnd data */ 1370 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1071 Atom ActualType; 1371 {
1072 int ActualFormat; 1372 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1073 unsigned char *data; 1373 {
1074 unsigned long Size, RemainingBytes; 1374 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1075 1375 {
1076 XGetWindowProperty (display->display, display->root, 1376 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1077 xa[XA_DNDSELECTION], 1377 destroy ();
1078 0L, 1000000L, 1378 }
1079 False, AnyPropertyType, 1379#if ENABLE_EWMH
1080 &ActualType, &ActualFormat, 1380 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1081 &Size, &RemainingBytes, 1381 XSendEvent (xdisp, ev.xclient.window = display->root,
1382 False, SubstructureRedirectMask | SubstructureNotifyMask,
1082 &data); 1383 &ev);
1083 XChangeProperty (display->display, display->root, 1384#endif
1084 XA_CUT_BUFFER0, XA_STRING, 1385 }
1085 8, PropModeReplace, 1386 }
1086 data, STRLEN (data)); 1387#if ENABLE_XEMBED
1087 XFree (data); 1388 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1088 selection_paste (display->root, XA_CUT_BUFFER0, True); 1389 {
1089 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1390 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1391 focus_in ();
1392 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1393 focus_out ();
1394 }
1395#endif
1090 } 1396 }
1091#endif /* OFFIX_DND */
1092 break; 1397 break;
1093 1398
1094 case MappingNotify: 1399 case MappingNotify:
1095 XRefreshKeyboardMapping (&ev.xmapping); 1400 XRefreshKeyboardMapping (&ev.xmapping);
1096 break; 1401 break;
… …
1119 break; 1424 break;
1120 } 1425 }
1121 break; 1426 break;
1122 1427
1123 case FocusIn: 1428 case FocusIn:
1124 if (!TermWin.focus) 1429 focus_in ();
1430 break;
1431
1432 case FocusOut:
1433 focus_out ();
1434 break;
1435
1436 case ConfigureNotify:
1437 if (ev.xconfigure.window == parent[0])
1125 { 1438 {
1126 TermWin.focus = 1; 1439 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1127 want_refresh = 1; 1440 ;
1128#ifdef USE_XIM 1441
1129 if (Input_Context != NULL) 1442 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 { 1443 {
1139 PixColors = PixColorsFocused; 1444 seen_resize = 1;
1140 set_colorfgbg (); 1445 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1141 scr_clear ();
1142 scr_touch (true);
1143 } 1446 }
1144#endif
1145 1447
1448 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1449
1450#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1451 if (OPTION (Opt_transparent))
1452 check_our_parents ();
1453#endif
1146 } 1454 }
1147 break; 1455 break;
1148 1456
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: 1457 case PropertyNotify:
1177 if (ev.xconfigure.window == TermWin.parent[0]) 1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1178 { 1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1179 int height, width; 1460 && ev.xproperty.state == PropertyNewValue)
1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1180 1462
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; 1463 break;
1202 1464
1203 case SelectionClear: 1465 case SelectionClear:
1204 selection_clear (); 1466 selection_clear ();
1205 break; 1467 break;
1206 1468
1207 case SelectionNotify: 1469 case SelectionNotify:
1208 if (selection_wait == Sel_normal) 1470 if (selection_wait == Sel_normal)
1209 selection_paste (ev.xselection.requestor, 1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1210 ev.xselection.property, True);
1211 break; 1472 break;
1212 1473
1213 case SelectionRequest: 1474 case SelectionRequest:
1214 selection_send (ev.xselectionrequest); 1475 selection_send (ev.xselectionrequest);
1215 break; 1476 break;
1216 1477
1478 case MapNotify:
1479 mapped = 1;
1480#ifdef TEXT_BLINK
1481 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1482#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break;
1485
1217 case UnmapNotify: 1486 case UnmapNotify:
1218 TermWin.mapped = 0; 1487 mapped = 0;
1219#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1220 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1221#endif 1490#endif
1222 break; 1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
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; 1492 break;
1230 1493
1231#ifdef TRANSPARENT 1494#ifdef TRANSPARENT
1232 case ReparentNotify: 1495 case ReparentNotify:
1233 rootwin_cb (ev); 1496 rootwin_cb (ev);
1234 break; 1497 break;
1235#endif /* TRANSPARENT */ 1498#endif /* TRANSPARENT */
1236 1499
1237 case GraphicsExpose: 1500 case GraphicsExpose:
1238 case Expose: 1501 case Expose:
1239 if (ev.xany.window == TermWin.vt) 1502 if (ev.xany.window == vt)
1240 { 1503 {
1241 do 1504 do
1242 scr_expose (ev.xexpose.x, ev.xexpose.y, 1505 scr_expose (ev.xexpose.x, ev.xexpose.y,
1243 ev.xexpose.width, ev.xexpose.height, False); 1506 ev.xexpose.width, ev.xexpose.height, False);
1244 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1507 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1245 1508
1246 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1247 1510
1248 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1511 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1249 scr_expose (ev.xexpose.x, ev.xexpose.y, 1512 scr_expose (ev.xexpose.x, ev.xexpose.y,
1250 ev.xexpose.width, ev.xexpose.height, False); 1513 ev.xexpose.width, ev.xexpose.height, False);
1251 1514
1252 scr_refresh (refresh_type); 1515 want_refresh = 1;
1253 } 1516 }
1254 else 1517 else
1255 { 1518 {
1256 XEvent unused_event; 1519 XEvent unused_event;
1257 1520
1258 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1521 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1259 ; 1522 ;
1260 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1523 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1261 ; 1524 ;
1262 1525
1263 if (isScrollbarWindow (ev.xany.window)) 1526 if (isScrollbarWindow (ev.xany.window))
1264 { 1527 {
1265 scrollBar.setIdle (); 1528 scrollBar.setIdle ();
1266 scrollbar_show (0); 1529 scrollbar_show (0);
1267 } 1530 }
1268#ifdef MENUBAR
1269 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1270 menubar_expose ();
1271#endif
1272 1531
1273#ifdef TRANSPARENT 1532#ifdef TRANSPARENT
1274 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1533 if (am_transparent && ev.xany.window == parent[0])
1275 XClearWindow (display->display, ev.xany.window); 1534 XClearWindow (xdisp, ev.xany.window);
1276#endif 1535#endif
1277 } 1536 }
1278 break; 1537 break;
1279 1538
1280 case MotionNotify: 1539 case MotionNotify:
1281#ifdef POINTER_BLANK 1540#ifdef POINTER_BLANK
1282 if (hidden_pointer) 1541 if (hidden_pointer)
1283 pointer_unblank (); 1542 pointer_unblank ();
1284#endif 1543#endif
1285#if MENUBAR 1544 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1286 if (isMenuBarWindow (ev.xany.window)) 1545 break;
1546
1547 if (ev.xany.window == vt)
1287 { 1548 {
1288 menubar_control (ev.xbutton); 1549 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1289 break; 1550 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1290 } 1551 ; // 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))) 1552 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1298 { 1553 {
1299 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1554 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1300 ; 1555 ;
1301 1556
1302 XQueryPointer (display->display, TermWin.vt, 1557 XQueryPointer (xdisp, vt,
1303 &unused_root, &unused_child, 1558 &unused_root, &unused_child,
1304 &unused_root_x, &unused_root_y, 1559 &unused_root_x, &unused_root_y,
1305 & (ev.xbutton.x), & (ev.xbutton.y), 1560 &ev.xbutton.x, &ev.xbutton.y,
1306 &unused_mask); 1561 &ev.xbutton.state);
1307#ifdef MOUSE_THRESHOLD 1562#ifdef MOUSE_THRESHOLD
1308 /* deal with a `jumpy' mouse */ 1563 /* deal with a `jumpy' mouse */
1309 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1564 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1310 { 1565 {
1311#endif 1566#endif
1567#if ISO_14755
1568 // 5.4
1569 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1570 {
1571 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1572 break;
1573 }
1574#endif
1312 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1575 selection_extend (ev.xbutton.x, ev.xbutton.y,
1313 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1576 ev.xbutton.state & Button3Mask ? 2 : 0);
1577
1314#ifdef SELECTION_SCROLLING 1578#ifdef SELECTION_SCROLLING
1315 if (ev.xbutton.y < TermWin.int_bwidth 1579 if (ev.xbutton.y < int_bwidth
1316 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1580 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1317 { 1581 {
1318 int dist; 1582 int dist;
1319 1583
1320 /* don't clobber the current delay if we are 1584 /* don't clobber the current delay if we are
1321 * already in the middle of scrolling. 1585 * already in the middle of scrolling.
… …
1324 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1588 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1325 1589
1326 /* save the event params so we can highlight 1590 /* save the event params so we can highlight
1327 * the selection in the pending-scroll loop 1591 * the selection in the pending-scroll loop
1328 */ 1592 */
1329 selection_save_x=ev.xbutton.x; 1593 selection_save_x = ev.xbutton.x;
1330 selection_save_y=ev.xbutton.y; 1594 selection_save_y = ev.xbutton.y;
1331 selection_save_state=
1332 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1595 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1333 1596
1334 /* calc number of lines to scroll */ 1597 /* calc number of lines to scroll */
1335 if (ev.xbutton.y<TermWin.int_bwidth) 1598 if (ev.xbutton.y < int_bwidth)
1336 { 1599 {
1337 scroll_selection_dir = UP; 1600 scroll_selection_dir = UP;
1338 dist = TermWin.int_bwidth - ev.xbutton.y; 1601 dist = int_bwidth - ev.xbutton.y;
1339 } 1602 }
1340 else 1603 else
1341 { 1604 {
1342 scroll_selection_dir = DN; 1605 scroll_selection_dir = DN;
1343 dist = ev.xbutton.y - 1606 dist = ev.xbutton.y - (int_bwidth + height);
1344 (TermWin.int_bwidth + TermWin.height);
1345 } 1607 }
1608
1346 scroll_selection_lines= (Pixel2Height (dist)/ 1609 scroll_selection_lines = Pixel2Height (dist)
1347 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1610 / SELECTION_SCROLL_LINE_SPEEDUP
1611 + 1;
1348 MIN_IT (scroll_selection_lines, 1612 min_it (scroll_selection_lines,
1349 SELECTION_SCROLL_MAX_LINES); 1613 SELECTION_SCROLL_MAX_LINES);
1350 } 1614 }
1351 else 1615 else
1352 { 1616 {
1353 /* we are within the text window, so we 1617 /* we are within the text window, so we
1354 * shouldn't be scrolling 1618 * shouldn't be scrolling
… …
1356 if (sel_scroll_ev.active) 1620 if (sel_scroll_ev.active)
1357 sel_scroll_ev.stop(); 1621 sel_scroll_ev.stop();
1358 } 1622 }
1359#endif 1623#endif
1360#ifdef MOUSE_THRESHOLD 1624#ifdef MOUSE_THRESHOLD
1361
1362 } 1625 }
1363#endif 1626#endif
1364
1365 } 1627 }
1366 } 1628 }
1367 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1368 { 1630 {
1369 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1631 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1370 MotionNotify, &ev)) ; 1632 MotionNotify, &ev))
1633 ;
1634
1371 XQueryPointer (display->display, scrollBar.win, 1635 XQueryPointer (xdisp, scrollBar.win,
1372 &unused_root, &unused_child, 1636 &unused_root, &unused_child,
1373 &unused_root_x, &unused_root_y, 1637 &unused_root_x, &unused_root_y,
1374 & (ev.xbutton.x), & (ev.xbutton.y), 1638 &ev.xbutton.x, &ev.xbutton.y,
1375 &unused_mask); 1639 &unused_mask);
1376 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1377 scrollbar_size ()); 1641 scrollbar_size ());
1378 scr_refresh (refresh_type); 1642 want_refresh = 1;
1379 refresh_limit = 0; 1643 refresh_limit = 0;
1380 scrollbar_show (1); 1644 scrollbar_show (1);
1381 } 1645 }
1382 break; 1646 break;
1383 } 1647 }
1384}
1385 1648
1649skip_switch: ;
1650
1651#if defined(CURSOR_BLINK)
1652 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1653 {
1654 if (hidden_cursor)
1655 {
1656 hidden_cursor = 0;
1657 want_refresh = 1;
1658 }
1659
1660 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1661 }
1662#endif
1663
1664#if defined(POINTER_BLANK)
1665 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1666 {
1667 if (ev.type == MotionNotify
1668 || ev.type == ButtonPress
1669 || ev.type == ButtonRelease)
1670 if (hidden_pointer)
1671 pointer_unblank ();
1672
1673 if (ev.type == KeyPress && hidden_pointer == 0)
1674 pointer_blank ();
1675 }
1676#endif
1677}
1678
1679void
1680rxvt_term::focus_in ()
1681{
1682 if (!focus)
1683 {
1684 focus = 1;
1685 want_refresh = 1;
1686
1687 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1688
1689#if USE_XIM
1690 if (Input_Context != NULL)
1691 {
1692 IMSetStatusPosition ();
1693 XSetICFocus (Input_Context);
1694 }
1695#endif
1696#if CURSOR_BLINK
1697 if (OPTION (Opt_cursorBlink))
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1699#endif
1700#if OFF_FOCUS_FADING
1701 if (rs[Rs_fade])
1702 {
1703 pix_colors = pix_colors_focused;
1704 scr_recolour ();
1705 }
1706#endif
1707 }
1708}
1709
1710void
1711rxvt_term::focus_out ()
1712{
1713 if (focus)
1714 {
1715 focus = 0;
1716 want_refresh = 1;
1717
1718 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1719
1720#if ENABLE_FRILLS || ISO_14755
1721 if (iso14755buf)
1722 {
1723 iso14755buf = 0;
1724# if ENABLE_OVERLAY
1725 scr_overlay_off ();
1726# endif
1727 }
1728#endif
1729#if USE_XIM
1730 if (Input_Context != NULL)
1731 XUnsetICFocus (Input_Context);
1732#endif
1733#if CURSOR_BLINK
1734 if (OPTION (Opt_cursorBlink))
1735 cursor_blink_ev.stop ();
1736 hidden_cursor = 0;
1737#endif
1738#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade])
1740 {
1741 pix_colors = pix_colors_unfocused;
1742 scr_recolour ();
1743 }
1744#endif
1745 }
1746}
1747
1748#if TRANSPARENT
1386void 1749void
1387rxvt_term::rootwin_cb (XEvent &ev) 1750rxvt_term::rootwin_cb (XEvent &ev)
1388{ 1751{
1389 SET_R (this); 1752 make_current ();
1390 SET_LOCALE (locale);
1391 1753
1392 switch (ev.type) 1754 switch (ev.type)
1393 { 1755 {
1394 case PropertyNotify: 1756 case PropertyNotify:
1395 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1396 {
1397 if (ev.xproperty.state == PropertyNewValue)
1398 selection_property (ev.xproperty.window, ev.xproperty.atom);
1399 break;
1400 }
1401#ifdef TRANSPARENT
1402 else
1403 {
1404 /* 1757 /*
1405 * if user used some Esetroot compatible prog to set the root bg, 1758 * 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. 1759 * use the property to determine the pixmap. We use it later on.
1407 */ 1760 */
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]) 1761 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1762 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1412 return; 1763 return;
1413 }
1414 1764
1415 /* FALLTHROUGH */ 1765 /* FALLTHROUGH */
1416 case ReparentNotify: 1766 case ReparentNotify:
1417 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1767 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1418 want_full_refresh = 1; 1768 want_refresh = want_full_refresh = 1;
1419 break; 1769 break;
1420#endif
1421 } 1770 }
1422} 1771}
1772#endif
1423 1773
1424void 1774void
1425rxvt_term::button_press (XButtonEvent &ev) 1775rxvt_term::button_press (XButtonEvent &ev)
1426{ 1776{
1427 int reportmode = 0, clickintime; 1777 int reportmode = 0, clickintime;
1428 1778
1429 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1779 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1780
1430 if (!bypass_keystate) 1781 if (!bypass_keystate)
1431 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1782 reportmode = !! (priv_modes & PrivMode_mouse_report);
1783
1432 /* 1784 /*
1433 * VT window processing of button press 1785 * VT window processing of button press
1434 */ 1786 */
1435 if (ev.window == TermWin.vt) 1787 if (ev.window == vt)
1436 { 1788 {
1789 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1790 return;
1791
1792#if ISO_14755
1793 // 5.4
1794 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1795 {
1796 iso14755_54 (ev.x, ev.y);
1797 return;
1798 }
1799#endif
1800
1437 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1801 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1802
1438 if (reportmode) 1803 if (reportmode)
1439 { 1804 {
1440 /* mouse report from vt window */ 1805 /* mouse report from vt window */
1441 /* save the xbutton state (for ButtonRelease) */ 1806 /* save the xbutton state (for ButtonRelease) */
1442 MEvent.state = ev.state; 1807 MEvent.state = ev.state;
1443#ifdef MOUSE_REPORT_DOUBLECLICK 1808#ifdef MOUSE_REPORT_DOUBLECLICK
1444 if (ev.button == MEvent.button && clickintime) 1809 if (ev.button == MEvent.button && clickintime)
1445 { 1810 {
1446 /* same button, within alloted time */ 1811 /* same button, within alloted time */
1447 MEvent.clicks++; 1812 MEvent.clicks++;
1813
1448 if (MEvent.clicks > 1) 1814 if (MEvent.clicks > 1)
1449 { 1815 {
1450 /* only report double clicks */ 1816 /* only report double clicks */
1451 MEvent.clicks = 2; 1817 MEvent.clicks = 2;
1452 mouse_report (ev); 1818 mouse_report (ev);
… …
1471 } 1837 }
1472 else 1838 else
1473 { 1839 {
1474 if (ev.button != MEvent.button) 1840 if (ev.button != MEvent.button)
1475 MEvent.clicks = 0; 1841 MEvent.clicks = 0;
1842
1476 switch (ev.button) 1843 switch (ev.button)
1477 { 1844 {
1478 case Button1: 1845 case Button1:
1846 /* allow meta + click to select rectangular areas */
1847 /* should be done in screen.C */
1848#if ENABLE_FRILLS
1849 selection.rect = !!(ev.state & ModMetaMask);
1850#else
1851 selection.rect = false;
1852#endif
1853
1479 /* allow shift+left click to extend selection */ 1854 /* allow shift+left click to extend selection */
1480 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1855 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1481 { 1856 {
1482 if (MEvent.button == Button1 && clickintime) 1857 if (MEvent.button == Button1 && clickintime)
1483 selection_rotate (ev.x, ev.y); 1858 selection_rotate (ev.x, ev.y);
1484 else 1859 else
1485 selection_extend (ev.x, ev.y, 1); 1860 selection_extend (ev.x, ev.y, 1);
… …
1500 case Button3: 1875 case Button3:
1501 if (MEvent.button == Button3 && clickintime) 1876 if (MEvent.button == Button3 && clickintime)
1502 selection_rotate (ev.x, ev.y); 1877 selection_rotate (ev.x, ev.y);
1503 else 1878 else
1504 selection_extend (ev.x, ev.y, 1); 1879 selection_extend (ev.x, ev.y, 1);
1880
1505 MEvent.button = Button3; 1881 MEvent.button = Button3;
1506 break; 1882 break;
1507 } 1883 }
1508 } 1884 }
1885
1509 MEvent.time = ev.time; 1886 MEvent.time = ev.time;
1510 return; 1887 return;
1511 } 1888 }
1512 1889
1513 /* 1890 /*
… …
1605 break; 1982 break;
1606 case R_SB_ALIGN_BOTTOM: 1983 case R_SB_ALIGN_BOTTOM:
1607 csrO = scrollBar.bot - scrollBar.top; 1984 csrO = scrollBar.bot - scrollBar.top;
1608 break; 1985 break;
1609 } 1986 }
1987
1610 if (scrollBar.style == R_SB_XTERM 1988 if (scrollBar.style == R_SB_XTERM
1611 || scrollbar_above_slider (ev.y) 1989 || scrollbar_above_slider (ev.y)
1612 || scrollbar_below_slider (ev.y)) 1990 || scrollbar_below_slider (ev.y))
1613 scr_move_to ( scrollbar_position (ev.y) - csrO, 1991 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1614 scrollbar_size ()); 1992
1615 scrollBar.setMotion (); 1993 scrollBar.setMotion ();
1616 break; 1994 break;
1617 1995
1618 case Button1: 1996 case Button1:
1619 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1997 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1623 case Button3: 2001 case Button3:
1624 if (scrollBar.style != R_SB_XTERM) 2002 if (scrollBar.style != R_SB_XTERM)
1625 { 2003 {
1626 if (scrollbar_above_slider (ev.y)) 2004 if (scrollbar_above_slider (ev.y))
1627# ifdef RXVT_SCROLL_FULL 2005# ifdef RXVT_SCROLL_FULL
1628 scr_page (UP, TermWin.nrow - 1); 2006 scr_page (UP, nrow - 1);
1629# else 2007# else
1630 scr_page (UP, TermWin.nrow / 4); 2008 scr_page (UP, nrow / 4);
1631# endif 2009# endif
1632 else if (scrollbar_below_slider (ev.y)) 2010 else if (scrollbar_below_slider (ev.y))
1633# ifdef RXVT_SCROLL_FULL 2011# ifdef RXVT_SCROLL_FULL
1634 scr_page (DN, TermWin.nrow - 1); 2012 scr_page (DN, nrow - 1);
1635# else 2013# else
1636 scr_page (DN, TermWin.nrow / 4); 2014 scr_page (DN, nrow / 4);
1637# endif 2015# endif
1638 else 2016 else
1639 scrollBar.setMotion (); 2017 scrollBar.setMotion ();
1640 } 2018 }
1641 else 2019 else
1642 { 2020 {
1643 scr_page ((ev.button == Button1 ? DN : UP), 2021 scr_page ((ev.button == Button1 ? DN : UP),
1644 (TermWin.nrow 2022 (nrow
1645 * scrollbar_position (ev.y) 2023 * scrollbar_position (ev.y)
1646 / scrollbar_size ())); 2024 / scrollbar_size ()));
1647 } 2025 }
2026
1648 break; 2027 break;
1649 } 2028 }
1650 } 2029 }
2030
1651 return; 2031 return;
1652 } 2032 }
1653#if MENUBAR
1654 /*
1655 * Menubar window processing of button press
1656 */
1657 if (isMenuBarWindow (ev.window))
1658 menubar_control (ev);
1659#endif
1660} 2033}
1661 2034
1662void 2035void
1663rxvt_term::button_release (XButtonEvent &ev) 2036rxvt_term::button_release (XButtonEvent &ev)
1664{ 2037{
1665 int reportmode = 0; 2038 int reportmode = 0;
1666 2039
1667 csrO = 0; /* reset csr Offset */ 2040 csrO = 0; /* reset csr Offset */
1668 if (!bypass_keystate) 2041 if (!bypass_keystate)
1669 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2042 reportmode = !! (priv_modes & PrivMode_mouse_report);
1670 2043
1671 if (scrollbar_isUpDn ()) 2044 if (scrollbar_isUpDn ())
1672 { 2045 {
1673 scrollBar.setIdle (); 2046 scrollBar.setIdle ();
1674 scrollbar_show (0); 2047 scrollbar_show (0);
1675#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1676 refresh_type &= ~SMOOTH_REFRESH;
1677#endif
1678
1679 } 2048 }
2049
1680#ifdef SELECTION_SCROLLING 2050#ifdef SELECTION_SCROLLING
1681 if (sel_scroll_ev.active) 2051 if (sel_scroll_ev.active)
1682 sel_scroll_ev.stop(); 2052 sel_scroll_ev.stop();
1683#endif 2053#endif
2054
1684 if (ev.window == TermWin.vt) 2055 if (ev.window == vt)
1685 { 2056 {
2057 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2058 return;
2059
2060#if ISO_14755
2061 // 5.4
2062 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2063 return;
2064#endif
2065
1686 if (reportmode) 2066 if (reportmode)
1687 { 2067 {
1688 /* mouse report from vt window */ 2068 /* mouse report from vt window */
1689 /* don't report release of wheel "buttons" */ 2069 /* don't report release of wheel "buttons" */
1690 if (ev.button >= 4) 2070 if (ev.button >= 4)
… …
1704 MEvent.button = AnyButton; 2084 MEvent.button = AnyButton;
1705 mouse_report (ev); 2085 mouse_report (ev);
1706#endif /* MOUSE_REPORT_DOUBLECLICK */ 2086#endif /* MOUSE_REPORT_DOUBLECLICK */
1707 return; 2087 return;
1708 } 2088 }
2089
1709 /* 2090 /*
1710 * dumb hack to compensate for the failure of click-and-drag 2091 * dumb hack to compensate for the failure of click-and-drag
1711 * when overriding mouse reporting 2092 * when overriding mouse reporting
1712 */ 2093 */
1713 if (PrivateModes & PrivMode_mouse_report 2094 if (priv_modes & PrivMode_mouse_report
1714 && bypass_keystate 2095 && bypass_keystate
1715 && ev.button == Button1 && MEvent.clicks <= 1) 2096 && ev.button == Button1 && MEvent.clicks <= 1)
1716 selection_extend (ev.x, ev.y, 0); 2097 selection_extend (ev.x, ev.y, 0);
1717 2098
1718 switch (ev.button) 2099 switch (ev.button)
1719 { 2100 {
1720 case Button1: 2101 case Button1:
1721 case Button3: 2102 case Button3:
1722 selection_make (ev.time); 2103 selection_make (ev.time);
1723 break; 2104 break;
2105
1724 case Button2: 2106 case Button2:
1725 selection_request (ev.time, ev.x, ev.y); 2107 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2108 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
1726 break; 2109 break;
2110
1727#ifdef MOUSE_WHEEL 2111#ifdef MOUSE_WHEEL
1728 case Button4: 2112 case Button4:
1729 case Button5: 2113 case Button5:
1730 { 2114 {
1731 int i; 2115 int i;
… …
1733 2117
1734 v = ev.button == Button4 ? UP : DN; 2118 v = ev.button == Button4 ? UP : DN;
1735 2119
1736 if (ev.state & ShiftMask) 2120 if (ev.state & ShiftMask)
1737 i = 1; 2121 i = 1;
1738 else if (Options & Opt_mouseWheelScrollPage) 2122 else if (OPTION (Opt_mouseWheelScrollPage))
1739 i = TermWin.nrow - 1; 2123 i = nrow - 1;
1740 else 2124 else
1741 i = 5; 2125 i = 5;
1742 2126
1743# ifdef MOUSE_SLIP_WHEELING 2127# ifdef MOUSE_SLIP_WHEELING
1744 if (ev.state & ControlMask) 2128 if (ev.state & ControlMask)
1745 { 2129 {
1746 mouse_slip_wheel_speed += v ? -1 : 1; 2130 mouse_slip_wheel_speed += v ? -1 : 1;
1747 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2131 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; 2132 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1749 2133
1750 if (slip_wheel_ev.at < NOW) 2134 if (slip_wheel_ev.at < NOW)
1751 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2135 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1752 2136
1753 slip_wheel_ev.start (); 2137 slip_wheel_ev.start ();
1754 } 2138 }
1755 else 2139 else
1756 { 2140 {
1757# endif 2141# endif
1758# ifdef JUMP_MOUSE_WHEEL
1759 scr_page (v, i); 2142 scr_page (v, i);
1760 scr_refresh (SMOOTH_REFRESH);
1761 scrollbar_show (1); 2143 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 2144# ifdef MOUSE_SLIP_WHEELING
1771 } 2145 }
1772#endif 2146# endif
1773 } 2147 }
1774 break; 2148 break;
1775#endif 2149#endif
1776 } 2150 }
1777 } 2151 }
1778#ifdef MENUBAR
1779 else if (isMenuBarWindow (ev.window))
1780 menubar_control (ev);
1781#endif
1782} 2152}
1783 2153
1784#ifdef TRANSPARENT 2154#ifdef TRANSPARENT
1785#if TINTING 2155#if TINTING
1786/* taken from aterm-0.4.2 */ 2156/* taken from aterm-0.4.2 */
1787 2157
1788typedef uint32_t RUINT32T; 2158typedef uint32_t RUINT32T;
1789 2159
1790void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2160void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
1791{ 2161{
1792 int sh_r, sh_g, sh_b; 2162 int sh_r, sh_g, sh_b;
1793 RUINT32T mask_r, mask_g, mask_b; 2163 RUINT32T mask_r, mask_g, mask_b;
1794 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2164 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1795 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2165 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1796 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2166 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1797 int i; 2167 int i;
1798 2168
1799 Visual* visual = display->visual; 2169 Visual *visual = term->visual;
1800 2170
1801 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2171 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1802 2172
1803 /* for convenience */ 2173 /* for convenience */
1804 mask_r = visual->red_mask; 2174 mask_r = visual->red_mask;
… …
2028 Pixmap rootpixmap = None; 2398 Pixmap rootpixmap = None;
2029 XWindowAttributes wattr, wrootattr; 2399 XWindowAttributes wattr, wrootattr;
2030 2400
2031 pchanged = 0; 2401 pchanged = 0;
2032 2402
2033 if (!(Options & Opt_transparent)) 2403 if (!OPTION (Opt_transparent))
2034 return pchanged; /* Don't try any more */ 2404 return pchanged; /* Don't try any more */
2035 2405
2036 XGetWindowAttributes (display->display, display->root, &wrootattr); 2406 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2037 rootdepth = wrootattr.depth; 2407 rootdepth = wrootattr.depth;
2038 2408
2039 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2409 XGetWindowAttributes (xdisp, parent[0], &wattr);
2040 2410
2041 if (rootdepth != wattr.depth) 2411 if (rootdepth != wattr.depth)
2042 { 2412 {
2043 if (am_transparent) 2413 if (am_transparent)
2044 { 2414 {
2045 pchanged = 1; 2415 pchanged = 1;
2046 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2416 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2047 am_transparent = am_pixmap_trans = 0; 2417 am_transparent = am_pixmap_trans = 0;
2048 } 2418 }
2049 2419
2050 return pchanged; /* Don't try any more */ 2420 return pchanged; /* Don't try any more */
2051 } 2421 }
2052 2422
2053 /* Get all X ops out of the queue so that our information is up-to-date. */ 2423 /* Get all X ops out of the queue so that our information is up-to-date. */
2054 XSync (display->display, False); 2424 XSync (xdisp, False);
2055 2425
2056 /* 2426 /*
2057 * Make the frame window set by the window manager have 2427 * Make the frame window set by the window manager have
2058 * the root background. Some window managers put multiple nested frame 2428 * the root background. Some window managers put multiple nested frame
2059 * windows for each client, so we have to take care about that. 2429 * windows for each client, so we have to take care about that.
2060 */ 2430 */
2061 i = (xa[XA_XROOTPMAPID] 2431 i = (xa[XA_XROOTPMAP_ID]
2062 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2432 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2063 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2064 &nitems, &bytes_after, &prop) == Success); 2434 &nitems, &bytes_after, &prop) == Success);
2065 2435
2066 if (!i || prop == NULL) 2436 if (!i || prop == NULL)
2067 i = (xa[XA_XSETROOTID] 2437 i = (xa[XA_ESETROOT_PMAP_ID]
2068 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2438 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2069 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2070 &nitems, &bytes_after, &prop) == Success); 2440 &nitems, &bytes_after, &prop) == Success);
2071 2441
2072 if (!i || prop == NULL 2442 if (!i || prop == NULL
2073#if TINTING 2443#if TINTING
2074 || !rs[Rs_color + Color_tint] 2444 || !ISSET_PIXCOLOR (Color_tint)
2075#endif 2445#endif
2076 ) 2446 )
2077 have_pixmap = 0; 2447 have_pixmap = 0;
2078 else 2448 else
2079 { 2449 {
… …
2092 Window cr; 2462 Window cr;
2093 XImage *image; 2463 XImage *image;
2094 GC gc; 2464 GC gc;
2095 XGCValues gcvalue; 2465 XGCValues gcvalue;
2096 2466
2097 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2467 XTranslateCoordinates (xdisp, parent[0], display->root,
2098 0, 0, &sx, &sy, &cr); 2468 0, 0, &sx, &sy, &cr);
2099 nw = (unsigned int)szHint.width; 2469 nw = (unsigned int)szHint.width;
2100 nh = (unsigned int)szHint.height; 2470 nh = (unsigned int)szHint.height;
2101 nx = ny = 0; 2471 nx = ny = 0;
2102 2472
… …
2112 nh += sy; 2482 nh += sy;
2113 ny = -sy; 2483 ny = -sy;
2114 sy = 0; 2484 sy = 0;
2115 } 2485 }
2116 2486
2117 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2487 min_it (nw, (unsigned int) (wrootattr.width - sx));
2118 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2488 min_it (nh, (unsigned int) (wrootattr.height - sy));
2489
2490 XSync (xdisp, False);
2119 allowedxerror = -1; 2491 allowedxerror = -1;
2120 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2492 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2121 2493
2122 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2494 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2123 /* XXX: may need a delay here? */ 2495 /* XXX: may need a delay here? */
2124 allowedxerror = 0; 2496 allowedxerror = 0;
2125 2497
2126 if (image == NULL) 2498 if (image == NULL)
2127 { 2499 {
2128 if (am_transparent && am_pixmap_trans) 2500 if (am_transparent && am_pixmap_trans)
2129 { 2501 {
2130 pchanged = 1; 2502 pchanged = 1;
2131 if (TermWin.pixmap != None) 2503 if (pixmap != None)
2132 { 2504 {
2133 XFreePixmap (display->display, TermWin.pixmap); 2505 XFreePixmap (xdisp, pixmap);
2134 TermWin.pixmap = None; 2506 pixmap = None;
2135 } 2507 }
2136 } 2508 }
2137 2509
2138 am_pixmap_trans = 0; 2510 am_pixmap_trans = 0;
2139 } 2511 }
2140 else 2512 else
2141 { 2513 {
2142 if (TermWin.pixmap != None) 2514 if (pixmap != None)
2143 XFreePixmap (display->display, TermWin.pixmap); 2515 XFreePixmap (xdisp, pixmap);
2144 2516
2145#if TINTING 2517#if TINTING
2146 if (ISSET_PIXCOLOR (Color_tint)) 2518 if (ISSET_PIXCOLOR (Color_tint))
2147 { 2519 {
2148 unsigned short rm, gm, bm;
2149 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2150 2521
2522 rgba c;
2151 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2523 pix_colors_focused [Color_tint].get (c);
2152 2524
2153 ShadeXImage (display, image, shade, rm, gm, bm); 2525 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2154 } 2526 }
2155#endif 2527#endif
2156 2528
2157 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2158 szHint.width, szHint.height, image->depth);
2159 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2160 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2531 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2161 nx, ny, image->width, image->height); 2532 nx, ny, image->width, image->height);
2162 XFreeGC (display->display, gc); 2533 XFreeGC (xdisp, gc);
2163 XDestroyImage (image); 2534 XDestroyImage (image);
2164 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2535 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2165 XClearWindow (display->display, TermWin.parent[0]); 2536 XClearWindow (xdisp, parent[0]);
2166 2537
2167 if (!am_transparent || !am_pixmap_trans) 2538 if (!am_transparent || !am_pixmap_trans)
2168 pchanged = 1; 2539 pchanged = 1;
2169 2540
2170 am_transparent = am_pixmap_trans = 1; 2541 am_transparent = am_pixmap_trans = 1;
2171 } 2542 }
2172 } 2543 }
2173 2544
2174 if (!am_pixmap_trans) 2545 if (am_pixmap_trans)
2546 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2547 else
2175 { 2548 {
2176 unsigned int n; 2549 unsigned int n;
2177 /* 2550 /*
2178 * InheritPixmap transparency 2551 * InheritPixmap transparency
2179 */ 2552 */
2180 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2181 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2182 { 2554 {
2183 oldp = TermWin.parent[i]; 2555 oldp = parent[i];
2184 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2185 &TermWin.parent[i], &list, &n);
2186 XFree (list); 2557 XFree (list);
2187 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2188 2558
2189 if (TermWin.parent[i] == display->root) 2559 if (parent[i] == display->root)
2190 { 2560 {
2191 if (oldp != None) 2561 if (oldp != None)
2192 pchanged = 1; 2562 pchanged = 1;
2193 2563
2194 break; 2564 break;
2195 } 2565 }
2196 2566
2197 if (oldp != TermWin.parent[i]) 2567 if (oldp != parent[i])
2198 pchanged = 1; 2568 pchanged = 1;
2199 } 2569 }
2200 2570
2201 n = 0; 2571 n = 0;
2202 2572
2203 if (pchanged) 2573 if (pchanged)
2204 {
2205 for (; n < (unsigned int)i; n++) 2574 for (; n < (unsigned int)i; n++)
2206 { 2575 {
2207 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2576 XGetWindowAttributes (xdisp, parent[n], &wattr);
2208 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2577
2209 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2210 { 2579 {
2211 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2212 break; 2581 break;
2213 } 2582 }
2214 } 2583 }
2584
2585 if (n > (sizeof (parent) / sizeof (parent[0])))
2215 } 2586 {
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]); 2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2221 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2222 am_transparent = 0; 2589 am_transparent = 0;
2223 /* XXX: also turn off Opt_transparent? */ 2590 /* XXX: also turn off Opt_transparent? */
2224 } 2591 }
2225 else 2592 else
2226 { 2593 {
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++) 2594 for (n = 0; n < (unsigned int)i; n++)
2234 { 2595 {
2235 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2596 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2236 XClearWindow (display->display, TermWin.parent[n]); 2597 XClearWindow (xdisp, parent[n]);
2237 } 2598 }
2238 2599
2239 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2600 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2240 am_transparent = 1; 2601 am_transparent = 1;
2241 } 2602 }
2242 2603
2243 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2604 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2244 TermWin.parent[i] = None; 2605 parent[i] = None;
2245 } 2606 }
2246 2607
2247 // this is experimental
2248 if (scrollBar.win) 2608 if (scrollBar.win)
2249 { 2609 {
2250 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2610 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2251 XClearWindow (display->display, scrollBar.win);
2252 scrollBar.setIdle (); 2611 scrollBar.setIdle ();
2253 scrollbar_show (0); 2612 scrollbar_show (0);
2254 } 2613 }
2255 2614
2615 if (am_transparent)
2616 {
2617 want_refresh = want_full_refresh = 1;
2618 if (am_pixmap_trans)
2619 flush ();
2620 }
2621
2256 return pchanged; 2622 return pchanged;
2257} 2623}
2258#endif 2624#endif
2259 2625
2260/*}}} */ 2626/*}}} */
2261 2627
2262bool 2628bool
2263rxvt_term::cmd_parse () 2629rxvt_term::cmd_parse ()
2264{ 2630{
2265 bool flag = false; 2631 bool flag = false;
2266 unicode_t ch = NOCHAR; 2632 wchar_t ch = NOCHAR;
2267 unsigned char *seq_begin; // remember start of esc-sequence here 2633 char *seq_begin; // remember start of esc-sequence here
2268 2634
2269 for (;;) 2635 for (;;)
2270 { 2636 {
2271 if (ch == NOCHAR) 2637 if (ch == NOCHAR)
2272 { 2638 {
2273 seq_begin = cmdbuf_ptr; 2639 seq_begin = cmdbuf_ptr;
2274 ch = next_char (); 2640 ch = next_char ();
2275 }
2276 2641
2277 if (ch == NOCHAR) // TODO: improve 2642 if (ch == NOCHAR)
2278 break; 2643 break;
2644 }
2279 2645
2280 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2646 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2281 { 2647 {
2648 if (!seen_input)
2649 {
2650 seen_input = 1;
2651 // many badly-written programs (e.g. jed) contain a race condition:
2652 // they first read the screensize and then install a SIGWINCH handler.
2653 // some window managers resize the window early, and these programs
2654 // then sometimes get the size wrong.
2655 // unfortunately other programs are even more buggy and dislike
2656 // being sent SIGWINCH, so only do it when we were in fact being
2657 // resized.
2658 if (seen_resize && cmd_pid)
2659 kill (-cmd_pid, SIGWINCH);
2660 }
2661
2282 /* Read a text string from the input buffer */ 2662 /* Read a text string from the input buffer */
2283 unicode_t buf[UBUFSIZ]; 2663 wchar_t buf[UBUFSIZ];
2284 bool refreshnow = false; 2664 bool refreshnow = false;
2285 int nlines = 0; 2665 int nlines = 0;
2286 unicode_t *str = buf; 2666 wchar_t *str = buf;
2287 2667 wchar_t *eol = str + min (ncol, UBUFSIZ);
2288 *str++ = ch;
2289 2668
2290 for (;;) 2669 for (;;)
2291 { 2670 {
2292 seq_begin = cmdbuf_ptr;
2293 ch = next_char ();
2294
2295 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2671 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2296 break; 2672 break;
2297 2673
2298 *str++ = ch; 2674 *str++ = ch;
2299 2675
2300 if (ch == C0_LF) 2676 if (ch == C0_LF || str >= eol)
2301 { 2677 {
2678 if (ch == C0_LF)
2302 nlines++; 2679 nlines++;
2680
2303 refresh_count++; 2681 refresh_count++;
2304 2682
2305 if (! (Options & Opt_jumpScroll) 2683 if (!OPTION (Opt_jumpScroll)
2306 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2684 || (refresh_count >= refresh_limit * (nrow - 1)))
2307 { 2685 {
2308 refreshnow = true; 2686 refreshnow = true;
2687 refresh_count = 0;
2309 ch = NOCHAR; 2688 ch = NOCHAR;
2310 break; 2689 break;
2311 } 2690 }
2312 2691
2313 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2692 // scr_add_lines only works for nlines <= nrow - 1.
2314 if (nlines >= TermWin.nrow - 1) 2693 if (nlines >= nrow - 1)
2315 { 2694 {
2695 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2696 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2316 scr_add_lines (buf, nlines, str - buf); 2697 scr_add_lines (buf, str - buf, nlines);
2698
2317 nlines = 0; 2699 nlines = 0;
2318 str = buf; 2700 str = buf;
2701 eol = str + min (ncol, UBUFSIZ);
2319 } 2702 }
2703
2704 if (str >= eol)
2705 {
2706 if (eol >= buf + UBUFSIZ)
2707 {
2708 ch = NOCHAR;
2709 break;
2710 }
2711 else
2712 eol = min (eol + ncol, buf + UBUFSIZ);
2713 }
2714
2320 } 2715 }
2321 2716
2322 if (str >= buf + UBUFSIZ) 2717 seq_begin = cmdbuf_ptr;
2323 { 2718 ch = next_char ();
2324 ch = NOCHAR;
2325 break;
2326 }
2327 } 2719 }
2328 2720
2721 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2722 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2329 scr_add_lines (buf, nlines, str - buf); 2723 scr_add_lines (buf, str - buf, nlines);
2330 2724
2331 /* 2725 /*
2332 * If there have been a lot of new lines, then update the screen 2726 * 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. 2727 * What the heck I'll cheat and only refresh less than every page-full.
2334 * the number of pages between refreshes is refresh_limit, which 2728 * the number of pages between refreshes is refresh_limit, which
2335 * is incremented here because we must be doing flat-out scrolling. 2729 * is incremented here because we must be doing flat-out scrolling.
2336 */ 2730 */
2337 if (refreshnow) 2731 if (refreshnow)
2338 { 2732 {
2339 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2733 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2340 refresh_limit++; 2734 refresh_limit++;
2341 else 2735 else
2342 { 2736 {
2343 flag = true; 2737 flag = true;
2344 scr_refresh (refresh_type); 2738 scr_refresh ();
2739 want_refresh = 1;
2345 } 2740 }
2346 } 2741 }
2347 2742
2348 } 2743 }
2349 else 2744 else
… …
2364 } 2759 }
2365 2760
2366 return flag; 2761 return flag;
2367} 2762}
2368 2763
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 2764// read the next character
2379unicode_t 2765wchar_t
2380rxvt_term::next_char () 2766rxvt_term::next_char () NOTHROW
2381{ 2767{
2382 while (cmdbuf_ptr < cmdbuf_endp) 2768 while (cmdbuf_ptr < cmdbuf_endp)
2383 { 2769 {
2384 // assume 7-bit to be ascii ALWAYS 2770 // assume 7-bit to be ascii ALWAYS
2385 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2771 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2386 return *cmdbuf_ptr++; 2772 return *cmdbuf_ptr++;
2387 2773
2388 wchar_t wc; 2774 wchar_t wc;
2389 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2775 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2390 2776
2391 if (len == (size_t)-2) 2777 if (len == (size_t)-2)
2392 { 2778 {
2393 // the mbstate stores incomplete sequences. didn't know this :/ 2779 // the mbstate stores incomplete sequences. didn't know this :/
2394 cmdbuf_ptr = cmdbuf_endp; 2780 cmdbuf_ptr = cmdbuf_endp;
2395 break; 2781 break;
2396 } 2782 }
2397 2783
2398 if (len == (size_t)-1) 2784 if (len == (size_t)-1)
2399 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2785 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2400 2786
2401 // assume wchar == unicode 2787 // assume wchar == unicode
2402 cmdbuf_ptr += len; 2788 cmdbuf_ptr += len;
2403 return wc; 2789 return wc & UNICODE_MASK;
2404 } 2790 }
2405 2791
2406 return NOCHAR; 2792 return NOCHAR;
2407} 2793}
2794
2795// read the next octet
2796uint32_t
2797rxvt_term::next_octet () NOTHROW
2798{
2799 return cmdbuf_ptr < cmdbuf_endp
2800 ? (unsigned char)*cmdbuf_ptr++
2801 : NOCHAR;
2802}
2803
2804static class out_of_input out_of_input;
2408 2805
2409/* rxvt_cmd_getc () - Return next input character */ 2806/* rxvt_cmd_getc () - Return next input character */
2410/* 2807/*
2411 * Return the next input character after first passing any keyboard input 2808 * Return the next input character after first passing any keyboard input
2412 * to the command. 2809 * to the command.
2413 */ 2810 */
2414unicode_t 2811wchar_t
2415rxvt_term::cmd_getc () 2812rxvt_term::cmd_getc () THROW ((class out_of_input))
2416{ 2813{
2417 unicode_t c = next_char (); 2814 wchar_t c = next_char ();
2418 2815
2419 if (c == NOCHAR) 2816 if (c == NOCHAR)
2420 throw out_of_input; 2817 throw out_of_input;
2421 2818
2422 return c; 2819 return c;
2423} 2820}
2424 2821
2425unicode_t 2822uint32_t
2426rxvt_term::cmd_get8 () 2823rxvt_term::cmd_get8 () THROW ((class out_of_input))
2427{ 2824{
2428 unicode_t c = next_octet (); 2825 uint32_t c = next_octet ();
2429 2826
2430 if (c == NOCHAR) 2827 if (c == NOCHAR)
2431 throw out_of_input; 2828 throw out_of_input;
2432 2829
2433 return c; 2830 return c;
… …
2533 case C0_ESC: 2930 case C0_ESC:
2534 process_escape_seq (); 2931 process_escape_seq ();
2535 break; 2932 break;
2536 case C0_ENQ: /* terminal Status */ 2933 case C0_ENQ: /* terminal Status */
2537 if (rs[Rs_answerbackstring]) 2934 if (rs[Rs_answerbackstring])
2538 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2935 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2539 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2540 else 2936 else
2541 tt_write ((unsigned char *)VT100_ANS, 2937 tt_write (VT100_ANS, strlen (VT100_ANS));
2542 (unsigned int)STRLEN (VT100_ANS));
2543 break; 2938 break;
2544 case C0_BEL: /* bell */ 2939 case C0_BEL: /* bell */
2545 scr_bell (); 2940 scr_bell ();
2546 break; 2941 break;
2547 case C0_BS: /* backspace */ 2942 case C0_BS: /* backspace */
… …
2646void 3041void
2647rxvt_term::process_escape_seq () 3042rxvt_term::process_escape_seq ()
2648{ 3043{
2649 unicode_t ch = cmd_getc (); 3044 unicode_t ch = cmd_getc ();
2650 3045
2651 if (PrivateModes & PrivMode_vt52) 3046 if (priv_modes & PrivMode_vt52)
2652 { 3047 {
2653 process_escape_vt52 (ch); 3048 process_escape_vt52 (ch);
2654 return; 3049 return;
2655 } 3050 }
2656 3051
… …
2671 scr_charset_set (2, (unsigned int)cmd_getc ()); 3066 scr_charset_set (2, (unsigned int)cmd_getc ());
2672 break; 3067 break;
2673 case '+': 3068 case '+':
2674 scr_charset_set (3, (unsigned int)cmd_getc ()); 3069 scr_charset_set (3, (unsigned int)cmd_getc ());
2675 break; 3070 break;
2676#ifndef NO_FRILLS 3071#if !ENABLE_MINIMAL
2677 case '6': 3072 case '6':
2678 scr_backindex (); 3073 scr_backindex ();
2679 break; 3074 break;
2680#endif 3075#endif
2681 case '7': 3076 case '7':
2682 scr_cursor (SAVE); 3077 scr_cursor (SAVE);
2683 break; 3078 break;
2684 case '8': 3079 case '8':
2685 scr_cursor (RESTORE); 3080 scr_cursor (RESTORE);
2686 break; 3081 break;
2687#ifndef NO_FRILLS 3082#if !ENABLE_MINIMAL
2688 case '9': 3083 case '9':
2689 scr_forwardindex (); 3084 scr_forwardindex ();
2690 break; 3085 break;
2691#endif 3086#endif
2692 case '=': 3087 case '=':
… …
2702 break; 3097 break;
2703 3098
2704 /* 8.3.87: NEXT LINE */ 3099 /* 8.3.87: NEXT LINE */
2705 case C1_NEL: /* ESC E */ 3100 case C1_NEL: /* ESC E */
2706 { 3101 {
2707 unicode_t nlcr[] = { C0_LF, C0_CR }; 3102 wchar_t nlcr[] = { C0_LF, C0_CR };
2708 scr_add_lines (nlcr, 1, 2); 3103 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2709 } 3104 }
2710 break; 3105 break;
2711 3106
2712 /* kidnapped escape sequence: Should be 8.3.48 */ 3107 /* kidnapped escape sequence: Should be 8.3.48 */
2713 case C1_ESA: /* ESC G */ 3108 case C1_ESA: /* ESC G */
… …
2735 process_dcs_seq (); 3130 process_dcs_seq ();
2736 break; 3131 break;
2737 3132
2738 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3133 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2739 case C1_SCI: /* ESC Z */ 3134 case C1_SCI: /* ESC Z */
2740 tt_write ((const unsigned char *)ESCZ_ANSWER, 3135 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2741 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2742 break; /* steal obsolete ESC [ c */ 3136 break; /* steal obsolete ESC [ c */
2743 3137
2744 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3138 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2745 case C1_CSI: /* ESC [ */ 3139 case C1_CSI: /* ESC [ */
2746 process_csi_seq (); 3140 process_csi_seq ();
… …
2855 ndef = get_byte_array_bit (csi_defaults, i); 3249 ndef = get_byte_array_bit (csi_defaults, i);
2856 for (p = 0; p < nargs; p++) 3250 for (p = 0; p < nargs; p++)
2857 if (arg[p] == -1) 3251 if (arg[p] == -1)
2858 arg[p] = ndef; 3252 arg[p] = ndef;
2859 3253
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 /* 3254 /*
2868 * private mode handling 3255 * private mode handling
2869 */ 3256 */
2870 if (priv) 3257 if (priv)
2871 { 3258 {
2872 switch (priv) 3259 switch (priv)
2873 { 3260 {
2874 case '>': 3261 case '>':
2875 if (ch == CSI_DA) /* secondary device attributes */ 3262 if (ch == CSI_DA) /* secondary device attributes */
3263 {
3264 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3265 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3266 //
3267 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3268 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3269 // that we do not support xterm mouse reporting (should be 95 when we do).
3270 //
2876 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3271 tt_printf ("\033[>%d;94;0c", 'U');
3272 }
2877 break; 3273 break;
2878 case '?': 3274 case '?':
2879 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3275 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2880 process_terminal_mode (ch, priv, nargs, arg); 3276 process_terminal_mode (ch, priv, nargs, arg);
2881 break; 3277 break;
… …
2986 3382
2987 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3383 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2988 arg[0] = -arg[0]; 3384 arg[0] = -arg[0];
2989 /* FALLTHROUGH */ 3385 /* FALLTHROUGH */
2990 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3386 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2991 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3387 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2992 break; 3388 break;
2993 3389
2994 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3390 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2995 tt_write ((const unsigned char *)VT100_ANS, 3391 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2996 (unsigned int) (sizeof (VT100_ANS) - 1));
2997 break; 3392 break;
2998 3393
2999 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3394 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3000 process_sgr_mode (nargs, arg); 3395 process_sgr_mode (nargs, arg);
3001 break; 3396 break;
… …
3008 break; 3403 break;
3009 case 6: /* CPR requested */ 3404 case 6: /* CPR requested */
3010 scr_report_position (); 3405 scr_report_position ();
3011 break; 3406 break;
3012 case 7: /* unofficial extension */ 3407 case 7: /* unofficial extension */
3013 if (Options & Opt_insecure) 3408 if (OPTION (Opt_insecure))
3014 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3409 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3015 break; 3410 break;
3016 case 8: /* unofficial extension */ 3411 case 8: /* unofficial extension */
3017 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3412 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3018 break; 3413 break;
3019 } 3414 }
… …
3055 break; 3450 break;
3056 3451
3057 case CSI_RM: /* 8.3.107: RESET MODE */ 3452 case CSI_RM: /* 8.3.107: RESET MODE */
3058 if (arg[0] == 4) 3453 if (arg[0] == 4)
3059 scr_insert_mode (0); 3454 scr_insert_mode (0);
3455 else if (arg[0] == 20)
3456 priv_modes &= ~PrivMode_LFNL;
3060 break; 3457 break;
3061 3458
3062 case CSI_SM: /* 8.3.126: SET MODE */ 3459 case CSI_SM: /* 8.3.126: SET MODE */
3063 if (arg[0] == 4) 3460 if (arg[0] == 4)
3064 scr_insert_mode (1); 3461 scr_insert_mode (1);
3462 else if (arg[0] == 20)
3463 priv_modes |= PrivMode_LFNL;
3065 break; 3464 break;
3066 3465
3067 /* 3466 /*
3068 * PRIVATE USE beyond this point. All CSI_7? sequences here 3467 * PRIVATE USE beyond this point. All CSI_7? sequences here
3069 */ 3468 */
… …
3081 break; 3480 break;
3082 case CSI_75: 3481 case CSI_75:
3083 scr_cursor (RESTORE); 3482 scr_cursor (RESTORE);
3084 break; 3483 break;
3085 3484
3086#ifndef NO_FRILLS 3485#if !ENABLE_MINIMAL
3087 case CSI_74: 3486 case CSI_74:
3088 process_window_ops (arg, nargs); 3487 process_window_ops (arg, nargs);
3089 break; 3488 break;
3090#endif 3489#endif
3091 3490
… …
3098 break; 3497 break;
3099 } 3498 }
3100} 3499}
3101/*}}} */ 3500/*}}} */
3102 3501
3103#ifndef NO_FRILLS 3502#if !ENABLE_MINIMAL
3104/* ARGSUSED */ 3503/* ARGSUSED */
3105void 3504void
3106rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3505rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3107{ 3506{
3108 int x, y; 3507 int x, y;
3109 XWindowAttributes wattr; 3508 XWindowAttributes wattr;
3110 Window wdummy; 3509 Window wdummy;
3510
3511 dLocal (Display *, xdisp);
3111 3512
3112 if (nargs == 0) 3513 if (nargs == 0)
3113 return; 3514 return;
3114 3515
3115 switch (args[0]) 3516 switch (args[0])
3116 { 3517 {
3117 /* 3518 /*
3118 * commands 3519 * commands
3119 */ 3520 */
3120 case 1: /* deiconify window */ 3521 case 1: /* deiconify window */
3121 XMapWindow (display->display, TermWin.parent[0]); 3522 XMapWindow (xdisp, parent[0]);
3122 break; 3523 break;
3123 case 2: /* iconify window */ 3524 case 2: /* iconify window */
3124 XIconifyWindow (display->display, TermWin.parent[0], 3525 XIconifyWindow (xdisp, parent[0], display->screen);
3125 DefaultScreen (display->display));
3126 break; 3526 break;
3127 case 3: /* set position (pixels) */ 3527 case 3: /* set position (pixels) */
3128 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3528 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3129 break; 3529 break;
3130 case 4: /* set size (pixels) */ 3530 case 4: /* set size (pixels) */
3131 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3531 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3132 break; 3532 break;
3133 case 5: /* raise window */ 3533 case 5: /* raise window */
3134 XRaiseWindow (display->display, TermWin.parent[0]); 3534 XRaiseWindow (xdisp, parent[0]);
3135 break; 3535 break;
3136 case 6: /* lower window */ 3536 case 6: /* lower window */
3137 XLowerWindow (display->display, TermWin.parent[0]); 3537 XLowerWindow (xdisp, parent[0]);
3138 break; 3538 break;
3139 case 7: /* refresh window */ 3539 case 7: /* refresh window */
3140 scr_touch (true); 3540 scr_touch (true);
3141 break; 3541 break;
3142 case 8: /* set size (chars) */ 3542 case 8: /* set size (chars) */
3143 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3543 set_widthheight ((unsigned int) (args[2] * fwidth),
3144 (unsigned int) (args[1] * TermWin.fheight)); 3544 (unsigned int) (args[1] * fheight));
3145 break; 3545 break;
3146 3546
3147 //case 9: NYI, TODO, restore maximized window or maximize window 3547 //case 9: NYI, TODO, restore maximized window or maximize window
3148 default: 3548 default:
3149 if (args[0] >= 24) /* set height (chars) */ 3549 if (args[0] >= 24) /* set height (chars) */
3150 set_widthheight ((unsigned int)TermWin.width, 3550 set_widthheight ((unsigned int)width,
3151 (unsigned int) (args[1] * TermWin.fheight)); 3551 (unsigned int) (args[1] * fheight));
3152 break; 3552 break;
3153
3154 3553
3155 /* 3554 /*
3156 * reports - some output format copied from XTerm 3555 * reports - some output format copied from XTerm
3157 */ 3556 */
3158 case 11: /* report window state */ 3557 case 11: /* report window state */
3159 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3558 XGetWindowAttributes (xdisp, parent[0], &wattr);
3160 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3559 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3161 break; 3560 break;
3162 case 13: /* report window position */ 3561 case 13: /* report window position */
3163 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3562 XGetWindowAttributes (xdisp, parent[0], &wattr);
3164 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3563 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3165 -wattr.border_width, -wattr.border_width, 3564 -wattr.border_width, -wattr.border_width,
3166 &x, &y, &wdummy); 3565 &x, &y, &wdummy);
3167 tt_printf ("\033[3;%d;%dt", x, y); 3566 tt_printf ("\033[3;%d;%dt", x, y);
3168 break; 3567 break;
3169 case 14: /* report window size (pixels) */ 3568 case 14: /* report window size (pixels) */
3170 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3569 XGetWindowAttributes (xdisp, parent[0], &wattr);
3171 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3570 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3172 break; 3571 break;
3173 case 18: /* report text area size (chars) */ 3572 case 18: /* report text area size (chars) */
3174 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3573 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3175 break; 3574 break;
3176 case 19: /* report window size (chars) */ 3575 case 19: /* report window size (chars) */
3177 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3576 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3178 break; 3577 break;
3179 case 20: /* report icon label */ 3578 case 20: /* report icon label */
3180 if (Options & Opt_insecure)
3181 { 3579 {
3182 char *s; 3580 char *s;
3183 XGetIconName (display->display, TermWin.parent[0], &s); 3581 XGetIconName (xdisp, parent[0], &s);
3184 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3582 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3583 XFree (s);
3185 } 3584 }
3186 break; 3585 break;
3187 case 21: /* report window title */ 3586 case 21: /* report window title */
3188 if (Options & Opt_insecure)
3189 { 3587 {
3190 char *s; 3588 char *s;
3191 XFetchName (display->display, TermWin.parent[0], &s); 3589 XFetchName (xdisp, parent[0], &s);
3192 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3590 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3591 XFree (s);
3193 } 3592 }
3194 break; 3593 break;
3195 } 3594 }
3196} 3595}
3197#endif 3596#endif
3198 3597
3199/*----------------------------------------------------------------------*/ 3598/*----------------------------------------------------------------------*/
3200/* 3599/*
3201 * get input up until STRING TERMINATOR (or BEL) 3600 * get input up until STRING TERMINATOR (or BEL)
3202 * ends_how is terminator used. returned input must be free()'d 3601 * ends_how is terminator used. returned input must be free()'d
3203 */ 3602 */
3204unsigned char * 3603char *
3205rxvt_term::get_to_st (unicode_t &ends_how) 3604rxvt_term::get_to_st (unicode_t &ends_how)
3206{ 3605{
3207 unicode_t prev = 0, ch; 3606 unicode_t ch;
3607 bool seen_esc = false;
3208 unsigned int n = 0; 3608 unsigned int n = 0;
3209 unsigned char *s;
3210 unsigned char string[STRING_MAX]; 3609 wchar_t string[STRING_MAX];
3211 3610
3212 while ((ch = cmd_getc ()) != NOCHAR) 3611 while ((ch = cmd_getc ()) != NOCHAR)
3213 { 3612 {
3214 if (prev == C0_ESC) 3613 if (seen_esc)
3215 { 3614 {
3216 if (ch == 0x5c) /* 7bit ST */ 3615 if (ch == 0x5c) /* 7bit ST */
3217 break; 3616 break;
3218 else 3617 else
3219 return NULL; 3618 return NULL;
3220 } 3619 }
3620 else if (ch == C0_ESC)
3621 {
3622 seen_esc = true;
3623 continue;
3624 }
3221 else if (ch == C0_BEL || ch == CHAR_ST) 3625 else if (ch == C0_BEL || ch == CHAR_ST)
3222 break; 3626 break;
3223 else if (ch < 0x20) 3627 else if (ch < 0x20)
3224 return NULL; /* other control character - exit */ 3628 return NULL; /* other control character - exit */
3225 3629
3226 if (n >= sizeof (string) - 1) 3630 seen_esc = false;
3631
3632 if (n >= STRING_MAX - 1)
3227 // stop at some sane length 3633 // stop at some sane length
3228 return NULL; 3634 return NULL;
3229 3635
3230 if (ch == C0_SYN) 3636 if (ch == C0_SYN)
3231 {
3232 string[n++] = cmd_get8 (); 3637 string[n++] = cmd_get8 ();
3233 prev = 0;
3234 }
3235 else 3638 else
3236 string[n++] = prev = ch; 3639 string[n++] = ch;
3237 } 3640 }
3238 3641
3239 string[n++] = '\0'; 3642 string[n++] = '\0';
3240 3643
3241 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3242 return NULL;
3243
3244 ends_how = (ch == 0x5c ? C0_ESC : ch); 3644 ends_how = (ch == 0x5c ? C0_ESC : ch);
3245 STRNCPY (s, string, n); 3645
3246 return s; 3646 return rxvt_wcstombs (string);
3247} 3647}
3248 3648
3249/*----------------------------------------------------------------------*/ 3649/*----------------------------------------------------------------------*/
3250/* 3650/*
3251 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3651 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3252 */ 3652 */
3253void 3653void
3254rxvt_term::process_dcs_seq () 3654rxvt_term::process_dcs_seq ()
3255{ 3655{
3256 unsigned char *s; 3656 char *s;
3257 unicode_t eh; 3657 unicode_t eh;
3258 3658
3259 /* 3659 /*
3260 * Not handled yet 3660 * Not handled yet
3261 */ 3661 */
… …
3280 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3680 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3281 arg = arg * 10 + (ch - '0'); 3681 arg = arg * 10 + (ch - '0');
3282 3682
3283 if (ch == ';') 3683 if (ch == ';')
3284 { 3684 {
3285 unsigned char *s = get_to_st (eh); 3685 char *s = get_to_st (eh);
3286 3686
3287 if (s) 3687 if (s)
3288 { 3688 {
3289 process_xterm_seq (arg, (char *)s, eh); 3689 process_xterm_seq (arg, s, eh);
3290 free (s); 3690 free (s);
3291 } 3691 }
3292 } 3692 }
3293} 3693}
3294 3694
3295void 3695void
3296rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3696rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3297{ 3697{
3298 if (str[0] == '?' && !str[1]) 3698 if (str[0] == '?' && !str[1])
3299 { 3699 {
3300 if (Options & Opt_insecure) 3700 rgba c;
3301 { 3701 pix_colors_focused[color].get (c);
3302 unsigned short r, g, b; 3702
3303 PixColorsFocused[color].get (display, r, g, b); 3703#if XFT
3704 if (c.a != rgba::MAX_CC)
3705 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3706 else
3707#endif
3304 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3708 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3305 }
3306 } 3709 }
3307 else 3710 else
3308 set_window_color (color, str); 3711 set_window_color (color, str);
3309} 3712}
3310 3713
3311/* 3714/*
3312 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3715 * 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 */ 3716 */
3336void 3717void
3337rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3718rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3338{ 3719{
3339 int changed = 0;
3340 int color; 3720 int color;
3341 char *buf, *name; 3721 char *buf, *name;
3342 bool query = str[0] == '?' && !str[1]; 3722 bool query = str[0] == '?' && !str[1];
3723 int saveop = op;
3724
3725 dLocal (Display *, xdisp);
3343 3726
3344 assert (str != NULL); 3727 assert (str != NULL);
3345 switch (op) 3728 switch (op)
3346 { 3729 {
3347 case XTerm_name: 3730 case XTerm_name:
… …
3354 set_title (str); 3737 set_title (str);
3355 break; 3738 break;
3356 case XTerm_property: 3739 case XTerm_property:
3357 if (str[0] == '?') 3740 if (str[0] == '?')
3358 { 3741 {
3359 Atom prop = XInternAtom (display->display, str + 1, True); 3742 Atom prop = display->atom (str + 1);
3360 Atom actual_type; 3743 Atom actual_type;
3361 int actual_format; 3744 int actual_format;
3362 unsigned long nitems; 3745 unsigned long nitems;
3363 unsigned long bytes_after; 3746 unsigned long bytes_after;
3364 unsigned char *value = 0; 3747 unsigned char *value = 0;
3365 const char *str = ""; 3748 const char *str = "";
3366 3749
3367 if (prop 3750 if (prop
3368 && XGetWindowProperty (display->display, TermWin.parent[0], 3751 && XGetWindowProperty (xdisp, parent[0],
3369 prop, 0, 1<<16, 0, AnyPropertyType, 3752 prop, 0, 1<<16, 0, AnyPropertyType,
3370 &actual_type, &actual_format, 3753 &actual_type, &actual_format,
3371 &nitems, &bytes_after, &value) == Success 3754 &nitems, &bytes_after, &value) == Success
3372 && actual_type != None 3755 && actual_type != None
3373 && actual_format == 8) 3756 && actual_format == 8)
3374 str = (const char *)(value); 3757 str = (const char *)(value);
3375 3758
3376 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3759 tt_printf ("\033]%d;%s%c", op, str, resp);
3377 3760
3378 XFree (value); 3761 XFree (value);
3379 } 3762 }
3380 else 3763 else
3381 { 3764 {
3382 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3765 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3383 3766
3384 if (eq) 3767 if (eq)
3385 { 3768 {
3386 *eq = 0; 3769 *eq = 0;
3387 XChangeProperty (display->display, TermWin.parent[0], 3770 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 } 3771 }
3392 else 3772 else
3393 XDeleteProperty (display->display, TermWin.parent[0], 3773 XDeleteProperty (xdisp, parent[0],
3394 display->atom (str)); 3774 display->atom (str));
3395 } 3775 }
3396 break; 3776 break;
3397 3777
3398 case XTerm_Color: 3778 case XTerm_Color:
3399 for (buf = (char *)str; buf && *buf;) 3779 for (buf = (char *)str; buf && *buf;)
3400 { 3780 {
3401 if ((name = STRCHR (buf, ';')) == NULL) 3781 if ((name = strchr (buf, ';')) == NULL)
3402 break; 3782 break;
3403 3783
3404 *name++ = '\0'; 3784 *name++ = '\0';
3405 color = atoi (buf); 3785 color = atoi (buf) + minCOLOR;
3406 3786
3407 if (color < 0 || color >= TOTAL_COLORS) 3787 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3408 break; 3788 break;
3409 3789
3410 if ((buf = STRCHR (name, ';')) != NULL) 3790 if ((buf = strchr (name, ';')) != NULL)
3411 *buf++ = '\0'; 3791 *buf++ = '\0';
3412 3792
3413 if (name[0] == '?' && !name[1]) 3793 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 } 3794 }
3425 break; 3795 break;
3426 case XTerm_Color00: 3796 case XTerm_Color00:
3427 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3797 process_color_seq (op, Color_fg, str, resp);
3428 break; 3798 break;
3429 case XTerm_Color01: 3799 case XTerm_Color01:
3430 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3800 process_color_seq (op, Color_bg, str, resp);
3431 break; 3801 break;
3432#ifndef NO_CURSORCOLOR 3802#ifndef NO_CURSORCOLOR
3433 case XTerm_Color_cursor: 3803 case XTerm_Color_cursor:
3434 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3804 process_color_seq (op, Color_cursor, str, resp);
3435 break; 3805 break;
3436#endif 3806#endif
3437 case XTerm_Color_pointer_fg: 3807 case XTerm_Color_pointer_fg:
3438 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3808 process_color_seq (op, Color_pointer_fg, str, resp);
3439 break; 3809 break;
3440 case XTerm_Color_pointer_bg: 3810 case XTerm_Color_pointer_bg:
3441 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3811 process_color_seq (op, Color_pointer_bg, str, resp);
3442 break; 3812 break;
3443#ifndef NO_BOLD_UNDERLINE_REVERSE 3813#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: 3814 case XTerm_Color_RV:
3451 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3815 process_color_seq (op, Color_RV, str, resp);
3452 break; 3816 break;
3817 case Rxvt_Color_BD:
3818 case URxvt_Color_BD:
3819 process_color_seq (op, Color_BD, str, resp);
3820 break;
3821 case Rxvt_Color_UL:
3822 case URxvt_Color_UL:
3823 process_color_seq (op, Color_UL, str, resp);
3824 break;
3825 case URxvt_Color_IT:
3826 process_color_seq (op, Color_IT, str, resp);
3827 break;
3453#endif 3828#endif
3829#if TRANSPARENT && TINTING
3830 case URxvt_Color_tint:
3831 process_color_seq (op, Color_tint, str, resp);
3454 3832
3833 check_our_parents ();
3834
3835 if (am_transparent)
3836 want_full_refresh = want_refresh = 1;
3837
3838 break;
3839#endif
3840
3455 case XTerm_Pixmap: 3841 case Rxvt_Pixmap:
3842 {
3456 if (*str != ';') 3843 if (*str != ';')
3457 { 3844 {
3458#if XPM_BACKGROUND 3845#if XPM_BACKGROUND
3459 scale_pixmap (""); /* reset to default scaling */ 3846 scale_pixmap (""); /* reset to default scaling */
3460 set_bgPixmap (str); /* change pixmap */ 3847 set_bgPixmap (str); /* change pixmap */
3461#endif
3462 scr_touch (true); 3848 scr_touch (true);
3849#endif
3463 } 3850 }
3851
3852 int changed = 0;
3853
3464 while ((str = STRCHR (str, ';')) != NULL) 3854 while ((str = strchr (str, ';')) != NULL)
3465 { 3855 {
3466 str++; 3856 str++;
3467#if XPM_BACKGROUND 3857#if XPM_BACKGROUND
3468 changed += scale_pixmap (str); 3858 changed += scale_pixmap (str);
3469#endif 3859#endif
3470
3471 } 3860 }
3861
3472 if (changed) 3862 if (changed)
3473 { 3863 {
3474#ifdef XPM_BACKGROUND 3864#ifdef XPM_BACKGROUND
3475 resize_pixmap (); 3865 resize_pixmap ();
3476#endif
3477 scr_touch (true); 3866 scr_touch (true);
3867#endif
3478 } 3868 }
3869 }
3479 break; 3870 break;
3480 3871
3481 case XTerm_restoreFG: 3872 case Rxvt_restoreFG:
3482 set_window_color (Color_fg, str); 3873 set_window_color (Color_fg, str);
3483 break; 3874 break;
3484 case XTerm_restoreBG: 3875 case Rxvt_restoreBG:
3485 set_window_color (Color_bg, str); 3876 set_window_color (Color_bg, str);
3486 break; 3877 break;
3487 3878
3488 case XTerm_logfile: 3879 case XTerm_logfile:
3489 // TODO, when secure mode? 3880 // TODO, when secure mode?
3490 break; 3881 break;
3491 3882
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 }
3513 else
3514 {
3515 set_locale (str);
3516# ifdef USE_XIM
3517 im_cb ();
3518# endif
3519 }
3520 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
3531
3532#ifdef MENUBAR
3533 case XTerm_Menu:
3534 if (Options & Opt_insecure)
3535 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3536 break;
3537#endif
3538#if 0 3883#if 0
3539 case XTerm_dumpscreen: /* no error notices */ 3884 case Rxvt_dumpscreen: /* no error notices */
3540 { 3885 {
3541 int fd; 3886 int fd;
3542 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3887 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3543 { 3888 {
3544 scr_dump (fd); 3889 scr_dump (fd);
3545 close (fd); 3890 close (fd);
3546 } 3891 }
3547 } 3892 }
3893 break;
3894#endif
3895 case XTerm_font:
3896 op = URxvt_font;
3897 case URxvt_font:
3898#if ENABLE_STYLES
3899 case URxvt_boldFont:
3900 case URxvt_italicFont:
3901 case URxvt_boldItalicFont:
3902#endif
3903 if (query)
3904 tt_printf ("\33]%d;%-.250s%c", saveop,
3905 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3906 ? fontset[op - URxvt_font]->fontdesc : "",
3907 resp);
3908 else
3909 {
3910 const char *&res = rs[Rs_font + (op - URxvt_font)];
3911
3912 res = strdup (str);
3913 allocated.push_back ((void *)res);
3914 set_fonts ();
3915 }
3916 break;
3917
3918 case URxvt_version:
3919 if (query)
3920 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3921 op,
3922 rs[Rs_name], VERSION[0], VERSION[2],
3923 resp);
3924 break;
3925
3926#if !ENABLE_MINIMAL
3927 case URxvt_locale:
3928 if (query)
3929 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3930 else
3931 {
3932 set_locale (str);
3933 pty->set_utf8_mode (enc_utf8);
3934 init_xlocale ();
3935 }
3936 break;
3937
3938 case URxvt_view_up:
3939 case URxvt_view_down:
3940 {
3941 int lines = atoi (str);
3942
3943 if (lines)
3944 scr_page (op == URxvt_view_up ? UP : DN, lines);
3945 else
3946 scr_erase_savelines ();
3947 }
3948
3949 break;
3950#endif
3951
3952#if ENABLE_PERL
3953 case URxvt_perl:
3954 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3955 ; // no responses yet
3548 break; 3956 break;
3549#endif 3957#endif
3550 } 3958 }
3551} 3959}
3552/*----------------------------------------------------------------------*/ 3960/*----------------------------------------------------------------------*/
… …
3566{ 3974{
3567 int state; 3975 int state;
3568 3976
3569 if (mode == 's') 3977 if (mode == 's')
3570 { 3978 {
3571 SavedModes |= (PrivateModes & bit); 3979 SavedModes |= (priv_modes & bit);
3572 return -1; 3980 return -1;
3573 } 3981 }
3574 else 3982 else
3575 { 3983 {
3576 if (mode == 'r') 3984 if (mode == 'r')
3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3985 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3578 else 3986 else
3579 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3987 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3580 PrivMode (state, bit); 3988 PrivMode (state, bit);
3581 } 3989 }
3582 3990
3583 return state; 3991 return state;
3584} 3992}
3585 3993
3586/* we're not using priv _yet_ */ 3994/* we're not using priv _yet_ */
3587void 3995void
3588rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3996rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3589{ 3997{
3590 unsigned int i, j; 3998 unsigned int i, j;
3591 int state; 3999 int state;
3592 4000
3593 static const struct 4001 static const struct
… …
3602 { 3, PrivMode_132 }, 4010 { 3, PrivMode_132 },
3603 { 4, PrivMode_smoothScroll }, 4011 { 4, PrivMode_smoothScroll },
3604 { 5, PrivMode_rVideo }, 4012 { 5, PrivMode_rVideo },
3605 { 6, PrivMode_relOrigin }, 4013 { 6, PrivMode_relOrigin },
3606 { 7, PrivMode_Autowrap }, 4014 { 7, PrivMode_Autowrap },
4015 // 8, bi-directional support mode
3607 { 9, PrivMode_MouseX10 }, 4016 { 9, PrivMode_MouseX10 },
3608#ifdef menuBar_esc 4017 // 18, 19 printing-related
3609 { menuBar_esc, PrivMode_menuBar }, 4018 { 25, PrivMode_VisibleCursor },
3610#endif
3611#ifdef scrollBar_esc 4019#ifdef scrollBar_esc
3612 { scrollBar_esc, PrivMode_scrollBar }, 4020 { scrollBar_esc, PrivMode_scrollBar },
3613#endif 4021#endif
3614 // 18, 19 printing-related
3615 { 25, PrivMode_VisibleCursor },
3616 // 30 show scrollbar rxvt. extension
3617 { 35, PrivMode_ShiftKeys }, // rxvt extension 4022 { 35, PrivMode_ShiftKeys }, // rxvt extension
3618 { 40, PrivMode_132OK }, 4023 { 40, PrivMode_132OK },
3619 // 41 xterm more fixes NYI 4024 // 41 xterm more fixes NYI
3620 // 45 margin bell NYI 4025 // 45 margin bell NYI
3621 // 46 start logging 4026 // 46 start logging
… …
3661 } 4066 }
3662 4067
3663 /* extra handling for values with state unkept */ 4068 /* extra handling for values with state unkept */
3664 switch (arg[i]) 4069 switch (arg[i])
3665 { 4070 {
4071#if ENABLE_STYLES
4072 case 1021:
4073 set_option (Opt_intensityStyles, mode);
4074
4075 scr_touch (true);
4076 break;
4077#endif
3666 case 1048: /* alternative cursor save */ 4078 case 1048: /* alternative cursor save */
4079 case 1049:
3667 if (Options & Opt_secondaryScreen) 4080 if (OPTION (Opt_secondaryScreen))
3668 if (mode == 0) 4081 if (mode == 0)
3669 scr_cursor (RESTORE); 4082 scr_cursor (RESTORE);
3670 else if (mode == 1) 4083 else if (mode == 1)
3671 scr_cursor (SAVE); 4084 scr_cursor (SAVE);
3672 break; 4085 break;
… …
3683 * within VT52 mode 4096 * within VT52 mode
3684 */ 4097 */
3685 PrivMode (1, PrivMode_vt52); 4098 PrivMode (1, PrivMode_vt52);
3686 break; 4099 break;
3687 case 3: /* 80/132 */ 4100 case 3: /* 80/132 */
3688 if (PrivateModes & PrivMode_132OK) 4101 if (priv_modes & PrivMode_132OK)
3689 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4102 set_widthheight (((state ? 132 : 80) * fwidth), height);
3690 break; 4103 break;
3691 case 4: /* smooth scrolling */ 4104 case 4: /* smooth scrolling */
3692 if (state) 4105 set_option (Opt_jumpScroll, !state);
3693 Options &= ~Opt_jumpScroll;
3694 else
3695 Options |= Opt_jumpScroll;
3696 break; 4106 break;
3697 case 5: /* reverse video */ 4107 case 5: /* reverse video */
3698 scr_rvideo_mode (state); 4108 scr_rvideo_mode (state);
3699 break; 4109 break;
3700 case 6: /* relative/absolute origins */ 4110 case 6: /* relative/absolute origins */
… …
3704 scr_autowrap (state); 4114 scr_autowrap (state);
3705 break; 4115 break;
3706 /* case 8: - auto repeat, can't do on a per window basis */ 4116 /* case 8: - auto repeat, can't do on a per window basis */
3707 case 9: /* X10 mouse reporting */ 4117 case 9: /* X10 mouse reporting */
3708 if (state) /* orthogonal */ 4118 if (state) /* orthogonal */
3709 PrivateModes &= ~PrivMode_MouseX11; 4119 priv_modes &= ~PrivMode_MouseX11;
3710 break; 4120 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 4121#ifdef scrollBar_esc
3719 case scrollBar_esc: 4122 case scrollBar_esc:
3720 if (scrollbar_mapping (state)) 4123 if (scrollbar_mapping (state))
3721 { 4124 {
3722 resize_all_windows (0, 0, 0); 4125 resize_all_windows (0, 0, 0);
… …
3734 break; 4137 break;
3735 /* case 66: - application key pad */ 4138 /* case 66: - application key pad */
3736 /* case 67: - backspace key */ 4139 /* case 67: - backspace key */
3737 case 1000: /* X11 mouse reporting */ 4140 case 1000: /* X11 mouse reporting */
3738 if (state) /* orthogonal */ 4141 if (state) /* orthogonal */
3739 PrivateModes &= ~PrivMode_MouseX10; 4142 priv_modes &= ~PrivMode_MouseX10;
3740 break; 4143 break;
3741#if 0 4144#if 0
3742 case 1001: 4145 case 1001:
3743 break; /* X11 mouse highlighting */ 4146 break; /* X11 mouse highlighting */
3744#endif 4147#endif
3745 case 1010: /* scroll to bottom on TTY output inhibit */ 4148 case 1010: /* scroll to bottom on TTY output inhibit */
3746 if (state)
3747 Options &= ~Opt_scrollTtyOutput;
3748 else
3749 Options |= Opt_scrollTtyOutput; 4149 set_option (Opt_scrollTtyOutput, !state);
3750 break; 4150 break;
3751 case 1011: /* scroll to bottom on key press */ 4151 case 1011: /* scroll to bottom on key press */
3752 if (state)
3753 Options |= Opt_scrollTtyKeypress; 4152 set_option (Opt_scrollTtyKeypress, state);
3754 else
3755 Options &= ~Opt_scrollTtyKeypress;
3756 break; 4153 break;
3757 case 1047: /* secondary screen w/ clearing last */ 4154 case 1047: /* secondary screen w/ clearing last */
3758 if (Options & Opt_secondaryScreen) 4155 if (OPTION (Opt_secondaryScreen))
3759 if (current_screen != PRIMARY) 4156 if (current_screen != PRIMARY)
3760 scr_erase_screen (2); 4157 scr_erase_screen (2);
3761 scr_change_screen (state); 4158 scr_change_screen (state);
3762 break; 4159 break;
3763 case 1049: /* secondary screen w/ clearing first */ 4160 case 1049: /* secondary screen w/ clearing first */
3764 scr_change_screen (state); 4161 scr_change_screen (state);
3765 if (Options & Opt_secondaryScreen) 4162 if (OPTION (Opt_secondaryScreen))
3766 if (current_screen != PRIMARY) 4163 if (current_screen != PRIMARY)
3767 scr_erase_screen (2); 4164 scr_erase_screen (2);
3768 break; 4165 break;
3769 default: 4166 default:
3770 break; 4167 break;
… …
3796 rendset = 0, rendstyle = ~RS_None; 4193 rendset = 0, rendstyle = ~RS_None;
3797 break; 4194 break;
3798 case 1: 4195 case 1:
3799 rendset = 1, rendstyle = RS_Bold; 4196 rendset = 1, rendstyle = RS_Bold;
3800 break; 4197 break;
3801 //case 2: // faint or second colour 4198 //case 2: // low intensity
4199 case 3:
4200 rendset = 1, rendstyle = RS_Italic;
4201 break;
3802 case 4: 4202 case 4:
3803 rendset = 1, rendstyle = RS_Uline; 4203 rendset = 1, rendstyle = RS_Uline;
3804 break; 4204 break;
3805 case 5: // slowly blinking 4205 case 5: // slowly blinking
3806 case 6: // rapidly blinking 4206 case 6: // rapidly blinking
… …
3818 //case 11: // scoansi acs on, first alt font 4218 //case 11: // scoansi acs on, first alt font
3819 //case 12: // scoansi acs on, |0x80, second alt font 4219 //case 12: // scoansi acs on, |0x80, second alt font
3820 //... 4220 //...
3821 //case 19: // ninth alt font 4221 //case 19: // ninth alt font
3822 //case 20: // gothic 4222 //case 20: // gothic
3823 case 21: // disable bold, faint 4223 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3824 rendset = 0, rendstyle = RS_Bold; 4224 rendset = 0, rendstyle = RS_Bold;
3825 break; 4225 break;
3826 case 22: 4226 case 22: // normal intensity
3827 rendset = 0, rendstyle = RS_Bold; 4227 rendset = 0, rendstyle = RS_Bold;
3828 break; 4228 break;
3829 //case 23: disable italic 4229 case 23: // disable italic
4230 rendset = 0, rendstyle = RS_Italic;
4231 break;
3830 case 24: 4232 case 24:
3831 rendset = 0, rendstyle = RS_Uline; 4233 rendset = 0, rendstyle = RS_Uline;
3832 break; 4234 break;
3833 case 25: 4235 case 25:
4236 rendset = 0, rendstyle = RS_Blink;
4237 break;
4238 case 26: // variable spacing (iso 8613)
3834 rendset = 0, rendstyle = RS_Blink; 4239 rendset = 0, rendstyle = RS_Blink;
3835 break; 4240 break;
3836 case 27: 4241 case 27:
3837 rendset = 0, rendstyle = RS_RVid; 4242 rendset = 0, rendstyle = RS_RVid;
3838 break; 4243 break;
… …
3856 case 35: 4261 case 35:
3857 case 36: 4262 case 36:
3858 case 37: 4263 case 37:
3859 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4264 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3860 break; 4265 break;
3861#ifdef TTY_256COLOR 4266 case 38: // set fg color, ISO 8613-6
3862 case 38:
3863 if (nargs > i + 2 && arg[i + 1] == 5) 4267 if (nargs > i + 2 && arg[i + 1] == 5)
3864 { 4268 {
3865 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4269 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3866 i += 2; 4270 i += 2;
3867 } 4271 }
3868 break; 4272 break;
3869#endif
3870 case 39: /* default fg */ 4273 case 39: /* default fg */
3871 scr_color (Color_fg, Color_fg); 4274 scr_color (Color_fg, Color_fg);
3872 break; 4275 break;
3873 4276
3874 case 40: 4277 case 40:
… …
3879 case 45: 4282 case 45:
3880 case 46: 4283 case 46:
3881 case 47: 4284 case 47:
3882 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4285 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3883 break; 4286 break;
3884#ifdef TTY_256COLOR 4287 case 48: // set bg color, ISO 8613-6
3885 case 48:
3886 if (nargs > i + 2 && arg[i + 1] == 5) 4288 if (nargs > i + 2 && arg[i + 1] == 5)
3887 { 4289 {
3888 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4290 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3889 i += 2; 4291 i += 2;
3890 } 4292 }
3891 break; 4293 break;
3892#endif
3893 case 49: /* default bg */ 4294 case 49: /* default bg */
3894 scr_color (Color_bg, Color_bg); 4295 scr_color (Color_bg, Color_bg);
3895 break; 4296 break;
3896 4297
3897#ifndef NO_BRIGHTCOLOR 4298 //case 50: // not variable spacing
4299
4300#if !ENABLE_MINIMAL
3898 case 90: 4301 case 90:
3899 case 91: /* set bright fg color */ 4302 case 91: /* set bright fg color */
3900 case 92: 4303 case 92:
3901 case 93: 4304 case 93:
3902 case 94: 4305 case 94:
3903 case 95: 4306 case 95:
3904 case 96: 4307 case 96:
3905 case 97: 4308 case 97:
3906 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4309 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3907 Color_fg);
3908 break; 4310 break;
3909 case 100: 4311 case 100:
3910 case 101: /* set bright bg color */ 4312 case 101: /* set bright bg color */
3911 case 102: 4313 case 102:
3912 case 103: 4314 case 103:
3913 case 104: 4315 case 104:
3914 case 105: 4316 case 105:
3915 case 106: 4317 case 106:
3916 case 107: 4318 case 107:
3917 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4319 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3918 Color_bg);
3919 break; 4320 break;
3920#endif 4321#endif
3921
3922 } 4322 }
3923 } 4323 }
3924} 4324}
3925/*}}} */ 4325/*}}} */
3926 4326
… …
3930{ 4330{
3931 unicode_t ch, cmd = cmd_getc (); 4331 unicode_t ch, cmd = cmd_getc ();
3932 4332
3933 if (cmd == 'Q') 4333 if (cmd == 'Q')
3934 { /* query graphics */ 4334 { /* query graphics */
3935 tt_printf ("\033G0\n"); /* no graphics */ 4335 tt_printf ("\033G0\012"); /* no graphics */
3936 return; 4336 return;
3937 } 4337 }
3938 /* swallow other graphics sequences until terminating ':' */ 4338 /* swallow other graphics sequences until terminating ':' */
3939 do 4339 do
3940 ch = cmd_getc (); 4340 ch = cmd_getc ();
… …
3950 */ 4350 */
3951void 4351void
3952rxvt_term::tt_printf (const char *fmt,...) 4352rxvt_term::tt_printf (const char *fmt,...)
3953{ 4353{
3954 va_list arg_ptr; 4354 va_list arg_ptr;
3955 unsigned char buf[256]; 4355 char buf[256];
3956 4356
3957 va_start (arg_ptr, fmt); 4357 va_start (arg_ptr, fmt);
3958 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4358 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3959 va_end (arg_ptr); 4359 va_end (arg_ptr);
3960 tt_write (buf, STRLEN (buf)); 4360 tt_write (buf, strlen (buf));
3961} 4361}
3962 4362
3963/* ---------------------------------------------------------------------- */ 4363/* ---------------------------------------------------------------------- */
3964/* Write data to the pty as typed by the user, pasted with the mouse, 4364/* 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. 4365 * or generated by us in response to a query ESC sequence.
3966 */ 4366 */
4367const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4368
3967void 4369void
3968rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4370rxvt_term::tt_write (const char *data, unsigned int len)
3969{ 4371{
3970 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4372 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4373 return;
3971 4374
3972 if (len) 4375 if (pty->pty < 0)
4376 return;
4377
4378 if (v_buflen == 0)
4379 {
4380 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4381
4382 if ((unsigned int)written == len)
4383 return;
4384
4385 data += written;
4386 len -= written;
3973 { 4387 }
4388
4389 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4390
4391 memcpy (v_buffer + v_buflen, data, len);
4392 v_buflen += len;
4393
4394 pty_ev.set (EVENT_READ | EVENT_WRITE);
4395}
4396
4397void rxvt_term::pty_write ()
4398{
4399 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4400
4401 if (written > 0)
4402 {
4403 v_buflen -= written;
4404
3974 if (v_buflen == 0) 4405 if (v_buflen == 0)
3975 { 4406 {
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); 4407 free (v_buffer);
4003 v_buffer = 0; 4408 v_buffer = 0;
4004 v_buflen = 0; 4409 v_buflen = 0;
4005 4410
4006 pty_ev.set (EVENT_READ); 4411 pty_ev.set (EVENT_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; 4412 return;
4019 } 4413 }
4414
4415 memmove (v_buffer, v_buffer + written, v_buflen);
4020 } 4416 }
4417 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4418 pty_ev.set (EVENT_READ);
4021} 4419}
4022 4420
4023/*----------------------- end-of-file (C source) -----------------------*/ 4421/*----------------------- end-of-file (C source) -----------------------*/
4024 4422

Diff Legend

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