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.120 by root, Tue Aug 10 22:36:30 2004 UTC vs.
Revision 1.302 by root, Tue Jan 31 21:35:39 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;
… …
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 ();
… …
666 } 954 }
667#endif 955#endif
668 956
669 if (want_refresh) 957 if (want_refresh)
670 { 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
671 scr_refresh (refresh_type); 997 scr_refresh ();
672 scrollbar_show (1); 998 scrollbar_show (1);
673#ifdef USE_XIM 999#ifdef USE_XIM
674 IMSendSpot (); 1000 IMSendSpot ();
675#endif 1001#endif
676 } 1002 }
677 1003
678 display->flush (); 1004 display->flush ();
679
680 flush_ev.stop ();
681} 1005}
682 1006
683void 1007void
684rxvt_term::check_cb (check_watcher &w) 1008rxvt_term::check_cb (check_watcher &w)
685{ 1009{
686 SET_R (this); 1010 make_current ();
687 SET_LOCALE (locale);
688 1011
689 display->flush (); 1012 display->flush ();
690 1013
691 if (want_refresh && !flush_ev.active) 1014 if (want_refresh && !flush_ev.active)
692 flush_ev.start (NOW + 0.01); 1015 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
693} 1016}
694 1017
695void 1018void
696rxvt_term::flush_cb (time_watcher &w) 1019rxvt_term::flush_cb (time_watcher &w)
697{ 1020{
698 SET_R (this); 1021 make_current ();
699 SET_LOCALE (locale);
700 1022
701 refresh_limit = 1; 1023 refresh_limit = 1;
702 refresh_count = 0; 1024 refresh_count = 0;
703 flush (); 1025 flush ();
704} 1026}
… …
708rxvt_term::cursor_blink_cb (time_watcher &w) 1030rxvt_term::cursor_blink_cb (time_watcher &w)
709{ 1031{
710 hidden_cursor = !hidden_cursor; 1032 hidden_cursor = !hidden_cursor;
711 want_refresh = 1; 1033 want_refresh = 1;
712 1034
713 w.start (w.at + BLINK_INTERVAL); 1035 w.start (w.at + CURSOR_BLINK_INTERVAL);
714} 1036}
715#endif 1037#endif
716 1038
717#ifdef TEXT_BLINK 1039#ifdef TEXT_BLINK
718void 1040void
… …
732rxvt_term::cont_scroll_cb (time_watcher &w) 1054rxvt_term::cont_scroll_cb (time_watcher &w)
733{ 1055{
734 if ((scrollbar_isUp() || scrollbar_isDn()) && 1056 if ((scrollbar_isUp() || scrollbar_isDn()) &&
735 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1057 scr_page (scrollbar_isUp() ? UP : DN, 1))
736 { 1058 {
737 refresh_type |= SMOOTH_REFRESH;
738 want_refresh = 1; 1059 want_refresh = 1;
739 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1060 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
740 } 1061 }
741} 1062}
742#endif 1063#endif
… …
746rxvt_term::sel_scroll_cb (time_watcher &w) 1067rxvt_term::sel_scroll_cb (time_watcher &w)
747{ 1068{
748 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1069 if (scr_page (scroll_selection_dir, scroll_selection_lines))
749 { 1070 {
750 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1071 selection_extend (selection_save_x, selection_save_y, selection_save_state);
751 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1; 1072 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1073 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
754 } 1074 }
755} 1075}
756#endif 1076#endif
… …
761{ 1081{
762 if (mouse_slip_wheel_speed == 0 1082 if (mouse_slip_wheel_speed == 0
763 || 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)
764 : scr_page (UP, mouse_slip_wheel_speed)) 1084 : scr_page (UP, mouse_slip_wheel_speed))
765 { 1085 {
766 refresh_type |= SMOOTH_REFRESH; 1086 if (view_start == top_row || view_start == 0)
1087 mouse_slip_wheel_speed = 0;
1088
767 want_refresh = 1; 1089 want_refresh = 1;
768 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
769 } 1091 }
770} 1092}
771#endif 1093#endif
772 1094
1095#if LINUX_YIELD_HACK
1096static struct event_handler
1097{
1098 check_watcher yield_ev;
1099
1100 void yield_cb (check_watcher &w)
1101 {
1102 usleep (0);
1103 w.stop ();
1104 }
1105
1106 event_handler ()
1107 : yield_ev (this, &event_handler::yield_cb)
1108 {
1109 }
1110} event_handler;
1111#endif
1112
773bool 1113bool
774rxvt_term::pty_fill () 1114rxvt_term::pty_fill ()
775{ 1115{
776 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1116 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
777 1117
778 if (CBUFSIZ == n) 1118 if (CBUFSIZ == n)
779 { 1119 {
780 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1120 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
781 n = 0; 1121 n = 0;
782 } 1122 }
783 1123
784 memmove (cmdbuf_base, cmdbuf_ptr, n); 1124 memmove (cmdbuf_base, cmdbuf_ptr, n);
785 cmdbuf_ptr = cmdbuf_base; 1125 cmdbuf_ptr = cmdbuf_base;
786 cmdbuf_endp = cmdbuf_ptr + n; 1126 cmdbuf_endp = cmdbuf_ptr + n;
787 1127
788 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1128 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
789 1129
790 if (n > 0) 1130 if (r > 0)
791 { 1131 {
792 cmdbuf_endp += n; 1132 cmdbuf_endp += r;
793 return true; 1133 return true;
794 } 1134 }
795 else if (n < 0 && errno != EAGAIN) 1135 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1136 {
1137#if LINUX_YIELD_HACK
1138 if (display->is_local)
1139 event_handler.yield_ev.start ();
1140#endif
1141 }
1142 else
1143 {
1144 pty_ev.stop ();
1145
1146 if (!OPTION (Opt_hold))
796 destroy (); 1147 destroy ();
1148 }
797 1149
798 return false; 1150 return false;
799} 1151}
800 1152
801void 1153void
802rxvt_term::pty_cb (io_watcher &w, short revents) 1154rxvt_term::pty_cb (io_watcher &w, short revents)
803{ 1155{
804 SET_R (this); 1156 make_current ();
805 SET_LOCALE (locale);
806 1157
807 if (revents & EVENT_WRITE)
808 tt_write (0, 0);
809 else if (revents & EVENT_READ) 1158 if (revents & EVENT_READ)
810 // loop, but don't allow a single term to monopolize us 1159 // loop, but don't allow a single term to monopolize us
811 while (pty_fill ()) 1160 while (pty_fill ())
812 if (cmd_parse ()) 1161 if (cmd_parse ())
813 break; 1162 break;
1163
1164 if (revents & EVENT_WRITE)
1165 pty_write ();
814} 1166}
815 1167
816void 1168void
817rxvt_term::pointer_unblank () 1169rxvt_term::pointer_unblank ()
818{ 1170{
819 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1171 XDefineCursor (xdisp, vt, TermWin_cursor);
820 recolour_cursor (); 1172 recolour_cursor ();
821 1173
822#ifdef POINTER_BLANK 1174#ifdef POINTER_BLANK
823 hidden_pointer = 0; 1175 hidden_pointer = 0;
824 1176
825 if (Options & Opt_pointerBlank) 1177 if (OPTION (Opt_pointerBlank))
826 pointer_ev.start (NOW + pointerBlankDelay); 1178 pointer_ev.start (NOW + pointerBlankDelay);
827#endif 1179#endif
828} 1180}
829 1181
830#ifdef POINTER_BLANK 1182#ifdef POINTER_BLANK
831void 1183void
832rxvt_term::pointer_blank () 1184rxvt_term::pointer_blank ()
833{ 1185{
834 if (! (Options & Opt_pointerBlank)) 1186 if (!OPTION (Opt_pointerBlank))
835 return; 1187 return;
836 1188
837 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1189 XDefineCursor (xdisp, vt, display->blank_cursor);
838 XFlush (display->display); 1190 XFlush (xdisp);
839 1191
840 hidden_pointer = 1; 1192 hidden_pointer = 1;
841} 1193}
842 1194
843void 1195void
844rxvt_term::pointer_cb (time_watcher &w) 1196rxvt_term::pointer_cb (time_watcher &w)
845{ 1197{
846 SET_R (this); 1198 make_current ();
847 SET_LOCALE (locale);
848 1199
849 pointer_blank (); 1200 pointer_blank ();
850} 1201}
851#endif 1202#endif
852 1203
… …
859 x = ev.x; 1210 x = ev.x;
860 y = ev.y; 1211 y = ev.y;
861 pixel_position (&x, &y); 1212 pixel_position (&x, &y);
862 1213
863 if (MEvent.button == AnyButton) 1214 if (MEvent.button == AnyButton)
864 {
865 button_number = 3; 1215 button_number = 3;
866 }
867 else 1216 else
868 { 1217 {
869 button_number = MEvent.button - Button1; 1218 button_number = MEvent.button - Button1;
870 /* add 0x3D for wheel events, like xterm does */ 1219 /* add 0x3D for wheel events, like xterm does */
871 if (button_number >= 3) 1220 if (button_number >= 3)
872 button_number += (64 - 3); 1221 button_number += (64 - 3);
873 } 1222 }
874 1223
875 if (PrivateModes & PrivMode_MouseX10) 1224 if (priv_modes & PrivMode_MouseX10)
876 { 1225 {
877 /* 1226 /*
878 * do not report ButtonRelease 1227 * do not report ButtonRelease
879 * no state info allowed 1228 * no state info allowed
880 */ 1229 */
… …
895 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1244 + ((MEvent.state & ModMetaMask) ? 8 : 0)
896 + ((MEvent.state & ControlMask) ? 16 : 0); 1245 + ((MEvent.state & ControlMask) ? 16 : 0);
897#ifdef MOUSE_REPORT_DOUBLECLICK 1246#ifdef MOUSE_REPORT_DOUBLECLICK
898 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1247 key_state += ((MEvent.clicks > 1) ? 32 : 0);
899#endif 1248#endif
900
901 } 1249 }
902 1250
903#ifdef DEBUG_MOUSEREPORT 1251#if DEBUG_MOUSEREPORT
904 fprintf (stderr, "Mouse ["); 1252 fprintf (stderr, "Mouse [");
905 if (key_state & 16) 1253 if (key_state & 16)
906 fputc ('C', stderr); 1254 fputc ('C', stderr);
907 if (key_state & 4) 1255 if (key_state & 4)
908 fputc ('S', stderr); 1256 fputc ('S', stderr);
… …
912 fputc ('2', stderr); 1260 fputc ('2', stderr);
913 fprintf (stderr, "]: <%d>, %d/%d\n", 1261 fprintf (stderr, "]: <%d>, %d/%d\n",
914 button_number, 1262 button_number,
915 x + 1, 1263 x + 1,
916 y + 1); 1264 y + 1);
917#else 1265#endif
1266
918 tt_printf ("\033[M%c%c%c", 1267 tt_printf ("\033[M%c%c%c",
919 (32 + button_number + key_state), 1268 (32 + button_number + key_state),
920 (32 + x + 1), 1269 (32 + x + 1),
921 (32 + y + 1)); 1270 (32 + y + 1));
922#endif
923} 1271}
924
925#ifdef USING_W11LIB
926void
927rxvt_W11_process_x_event (XEvent *ev)
928{
929 rxvt_t *r = rxvt_get_r ();
930
931 x_cb (*ev);
932}
933#endif
934 1272
935/*{{{ process an X event */ 1273/*{{{ process an X event */
936void 1274void
937rxvt_term::x_cb (XEvent &ev) 1275rxvt_term::x_cb (XEvent &ev)
938{ 1276{
939 SET_R (this); 1277 make_current ();
940 SET_LOCALE (locale);
941 1278
942#if defined(CURSOR_BLINK) 1279 dLocal (Display *, xdisp);
943 if ((Options & Opt_cursorBlink) && ev.type == KeyPress)
944 {
945 if (hidden_cursor)
946 {
947 hidden_cursor = 0;
948 want_refresh = 1;
949 }
950 1280
951 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1281 if (ev.xany.window == vt
952 } 1282 && SHOULD_INVOKE (HOOK_X_EVENT)
953#endif 1283 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
954
955#if defined(POINTER_BLANK)
956 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0)
957 {
958 if (ev.type == MotionNotify
959 || ev.type == ButtonPress
960 || ev.type == ButtonRelease)
961 if (hidden_pointer)
962 pointer_unblank ();
963
964 if (ev.type == KeyPress && hidden_pointer == 0)
965 pointer_blank ();
966 }
967#endif
968
969#ifdef USE_XIM
970 if (XFilterEvent (&ev, None))
971 return; 1284 return;
972#endif
973 1285
1286 // for XQueryPointer
974 Window unused_root, unused_child; 1287 Window unused_root, unused_child;
975 int unused_root_x, unused_root_y; 1288 int unused_root_x, unused_root_y;
976 unsigned int unused_mask; 1289 unsigned int unused_mask;
977
978#ifdef DEBUG_X
979 const char *const eventnames[] =
980 { /* mason - this matches my system */
981 "",
982 "",
983 "KeyPress",
984 "KeyRelease",
985 "ButtonPress",
986 "ButtonRelease",
987 "MotionNotify",
988 "EnterNotify",
989 "LeaveNotify",
990 "FocusIn",
991 "FocusOut",
992 "KeymapNotify",
993 "Expose",
994 "GraphicsExpose",
995 "NoExpose",
996 "VisibilityNotify",
997 "CreateNotify",
998 "DestroyNotify",
999 "UnmapNotify",
1000 "MapNotify",
1001 "MapRequest",
1002 "ReparentNotify",
1003 "ConfigureNotify",
1004 "ConfigureRequest",
1005 "GravityNotify",
1006 "ResizeRequest",
1007 "CirculateNotify",
1008 "CirculateRequest",
1009 "PropertyNotify",
1010 "SelectionClear",
1011 "SelectionRequest",
1012 "SelectionNotify",
1013 "ColormapNotify",
1014 "ClientMessage",
1015 "MappingNotify"
1016 };
1017#endif
1018
1019#ifdef DEBUG_X
1020 struct timeval tp;
1021 struct tm *ltt;
1022 (void)gettimeofday (&tp, NULL);
1023 ltt = localtime (& (tp.tv_sec));
1024 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));
1025#endif
1026 1290
1027 switch (ev.type) 1291 switch (ev.type)
1028 { 1292 {
1029 case KeyPress: 1293 case KeyPress:
1294#if ISO_14755
1295 if (!(iso14755buf & ISO_14755_52))
1296#endif
1030 lookup_key (ev.xkey); 1297 lookup_key (ev.xkey);
1298
1299 break;
1300
1301 case KeyRelease:
1302 {
1303#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1304 KeySym keysym;
1305
1306 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1307#endif
1308
1309#if ENABLE_FRILLS || ISO_14755
1310 // ISO 14755 support
1311 if (iso14755buf)
1312 if (iso14755buf & ISO_14755_52)
1313 {
1314# if ENABLE_OVERLAY
1315 scr_overlay_off ();
1316# endif
1317# if ISO_14755
1318 // iso14755 part 5.2 handling: release time
1319 // first: controls
1320 if ((ev.xkey.state & ControlMask)
1321 && ((keysym >= 0x40 && keysym <= 0x5f)
1322 || (keysym >= 0x61 && keysym <= 0x7f)))
1323 {
1324 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1325 commit_iso14755 ();
1326 goto skip_switch;
1327 }
1328
1329 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1330 if (i[0] == keysym)
1331 {
1332 iso14755buf = ISO_14755_51 | i[1];
1333 commit_iso14755 ();
1334 goto skip_switch;
1335 }
1336
1337 scr_bell ();
1338# endif
1339 iso14755buf = 0;
1340 break;
1341 }
1342 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1343 {
1344# if ENABLE_OVERLAY
1345 scr_overlay_off ();
1346# endif
1347 if (iso14755buf & ISO_14755_51)
1348 commit_iso14755 ();
1349#if ISO_14755
1350 else if (iso14755buf & ISO_14755_STARTED)
1351 {
1352 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1353
1354 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1355 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1356 }
1357# endif
1358 else
1359 iso14755buf = 0;
1360 }
1361#endif
1362
1363 if (ev.xany.window == vt
1364 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1031 break; 1365 break;
1032 1366
1033#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1367#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1034 case KeyRelease:
1035 {
1036 if (!(ev.xkey.state & ControlMask)) 1368 if (!(ev.xkey.state & ControlMask))
1037 slip_wheel_ev.stop (); 1369 slip_wheel_ev.stop ();
1038 else
1039 {
1040 KeySym ks;
1041
1042 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1043 if (ks == XK_Control_L || ks == XK_Control_R) 1370 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1044 mouse_slip_wheel_speed = 0; 1371 mouse_slip_wheel_speed = 0;
1045 } 1372#endif
1046 break; 1373 break;
1047 } 1374 }
1048#endif
1049 1375
1050 case ButtonPress: 1376 case ButtonPress:
1051 button_press (ev.xbutton); 1377 button_press (ev.xbutton);
1052 break; 1378 break;
1053 1379
… …
1055 button_release (ev.xbutton); 1381 button_release (ev.xbutton);
1056 break; 1382 break;
1057 1383
1058 case ClientMessage: 1384 case ClientMessage:
1059 if (ev.xclient.format == 32 1385 if (ev.xclient.format == 32
1060 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1386 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1061 destroy ();
1062#ifdef OFFIX_DND
1063 /* OffiX Dnd (drag 'n' drop) protocol */
1064 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1065 && (ev.xclient.data.l[0] == DndFile
1066 || ev.xclient.data.l[0] == DndDir
1067 || ev.xclient.data.l[0] == DndLink))
1068 { 1387 {
1069 /* Get Dnd data */ 1388 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1070 Atom ActualType; 1389 {
1071 int ActualFormat; 1390 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1072 unsigned char *data; 1391 {
1073 unsigned long Size, RemainingBytes; 1392 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1074 1393 {
1075 XGetWindowProperty (display->display, display->root, 1394 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1076 xa[XA_DNDSELECTION], 1395 destroy ();
1077 0L, 1000000L, 1396 }
1078 False, AnyPropertyType, 1397#if ENABLE_EWMH
1079 &ActualType, &ActualFormat, 1398 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1080 &Size, &RemainingBytes, 1399 XSendEvent (xdisp, ev.xclient.window = display->root,
1400 False, SubstructureRedirectMask | SubstructureNotifyMask,
1081 &data); 1401 &ev);
1082 XChangeProperty (display->display, display->root, 1402#endif
1083 XA_CUT_BUFFER0, XA_STRING, 1403 }
1084 8, PropModeReplace, 1404 }
1085 data, STRLEN (data)); 1405#if ENABLE_XEMBED
1086 XFree (data); 1406 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1087 selection_paste (display->root, XA_CUT_BUFFER0, True); 1407 {
1088 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1408 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1409 focus_in ();
1410 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1411 focus_out ();
1412 }
1413#endif
1089 } 1414 }
1090#endif /* OFFIX_DND */
1091 break; 1415 break;
1092 1416
1093 case MappingNotify: 1417 case MappingNotify:
1094 XRefreshKeyboardMapping (&ev.xmapping); 1418 XRefreshKeyboardMapping (&ev.xmapping);
1095 break; 1419 break;
… …
1118 break; 1442 break;
1119 } 1443 }
1120 break; 1444 break;
1121 1445
1122 case FocusIn: 1446 case FocusIn:
1123 if (!TermWin.focus) 1447 focus_in ();
1448 break;
1449
1450 case FocusOut:
1451 focus_out ();
1452 break;
1453
1454 case ConfigureNotify:
1455 if (ev.xconfigure.window == parent[0])
1124 { 1456 {
1125 TermWin.focus = 1; 1457 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1126 want_refresh = 1; 1458 ;
1127#ifdef USE_XIM 1459
1128 if (Input_Context != NULL) 1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1129 XSetICFocus (Input_Context);
1130#endif
1131#ifdef CURSOR_BLINK
1132 if (Options & Opt_cursorBlink)
1133 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1134#endif
1135#ifdef OFF_FOCUS_FADING
1136 if (rs[Rs_fade])
1137 { 1461 {
1138 PixColors = PixColorsFocused; 1462 seen_resize = 1;
1139 set_colorfgbg (); 1463 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1140 scr_clear ();
1141 scr_touch (true);
1142 } 1464 }
1143#endif
1144 1465
1466 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1467
1468#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1469 if (OPTION (Opt_transparent))
1470 check_our_parents ();
1471#endif
1145 } 1472 }
1146 break; 1473 break;
1147 1474
1148 case FocusOut:
1149 if (TermWin.focus)
1150 {
1151 TermWin.focus = 0;
1152 want_refresh = 1;
1153#ifdef USE_XIM
1154 if (Input_Context != NULL)
1155 XUnsetICFocus (Input_Context);
1156#endif
1157#ifdef CURSOR_BLINK
1158 if (Options & Opt_cursorBlink)
1159 cursor_blink_ev.stop ();
1160 hidden_cursor = 0;
1161#endif
1162#ifdef OFF_FOCUS_FADING
1163 if (rs[Rs_fade])
1164 {
1165 PixColors = PixColorsUnFocused;
1166 set_colorfgbg ();
1167 scr_clear ();
1168 scr_touch (true);
1169 }
1170#endif
1171
1172 }
1173 break;
1174
1175 case ConfigureNotify: 1475 case PropertyNotify:
1176 if (ev.xconfigure.window == TermWin.parent[0]) 1476 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1177 { 1477 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1178 int height, width; 1478 && ev.xproperty.state == PropertyNewValue)
1479 selection_property (ev.xproperty.window, ev.xproperty.atom);
1179 1480
1180 do
1181 { /* Wrap lots of configures into one */
1182 width = ev.xconfigure.width;
1183 height = ev.xconfigure.height;
1184 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1185 }
1186 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1187
1188 if (szHint.width != width || szHint.height != height)
1189 resize_all_windows (width, height, 1);
1190
1191#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1192 if (Options & Opt_transparent)
1193 {
1194 check_our_parents ();
1195 if (am_transparent)
1196 want_refresh = want_full_refresh = 1;
1197 }
1198#endif
1199 }
1200 break; 1481 break;
1201 1482
1202 case SelectionClear: 1483 case SelectionClear:
1203 selection_clear (); 1484 selection_clear ();
1204 break; 1485 break;
1205 1486
1206 case SelectionNotify: 1487 case SelectionNotify:
1207 if (selection_wait == Sel_normal) 1488 if (selection_wait == Sel_normal)
1208 selection_paste (ev.xselection.requestor, 1489 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1209 ev.xselection.property, True);
1210 break; 1490 break;
1211 1491
1212 case SelectionRequest: 1492 case SelectionRequest:
1213 selection_send (ev.xselectionrequest); 1493 selection_send (ev.xselectionrequest);
1214 break; 1494 break;
1215 1495
1496 case MapNotify:
1497 mapped = 1;
1498#ifdef TEXT_BLINK
1499 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1500#endif
1501 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1502 break;
1503
1216 case UnmapNotify: 1504 case UnmapNotify:
1217 TermWin.mapped = 0; 1505 mapped = 0;
1218#ifdef TEXT_BLINK 1506#ifdef TEXT_BLINK
1219 text_blink_ev.stop (); 1507 text_blink_ev.stop ();
1220#endif 1508#endif
1221 break; 1509 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1222
1223 case MapNotify:
1224 TermWin.mapped = 1;
1225#ifdef TEXT_BLINK
1226 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1227#endif
1228 break; 1510 break;
1229 1511
1230#ifdef TRANSPARENT 1512#ifdef TRANSPARENT
1231 case ReparentNotify: 1513 case ReparentNotify:
1232 rootwin_cb (ev); 1514 rootwin_cb (ev);
1233 break; 1515 break;
1234#endif /* TRANSPARENT */ 1516#endif /* TRANSPARENT */
1235 1517
1236 case GraphicsExpose: 1518 case GraphicsExpose:
1237 case Expose: 1519 case Expose:
1238 if (ev.xany.window == TermWin.vt) 1520 if (ev.xany.window == vt)
1239 { 1521 {
1240 do 1522 do
1241 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1242 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1243 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1525 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1244 1526
1245 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1246 1528
1247 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1529 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1248 scr_expose (ev.xexpose.x, ev.xexpose.y, 1530 scr_expose (ev.xexpose.x, ev.xexpose.y,
1249 ev.xexpose.width, ev.xexpose.height, False); 1531 ev.xexpose.width, ev.xexpose.height, False);
1250 1532
1251 scr_refresh (refresh_type); 1533 want_refresh = 1;
1252 } 1534 }
1253 else 1535 else
1254 { 1536 {
1255 XEvent unused_event; 1537 XEvent unused_event;
1256 1538
1257 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1258 ; 1540 ;
1259 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1541 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1260 ; 1542 ;
1261 1543
1262 if (isScrollbarWindow (ev.xany.window)) 1544 if (isScrollbarWindow (ev.xany.window))
1263 { 1545 {
1264 scrollBar.setIdle (); 1546 scrollBar.setIdle ();
1265 scrollbar_show (0); 1547 scrollbar_show (0);
1266 } 1548 }
1267#ifdef MENUBAR
1268 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1269 menubar_expose ();
1270#endif
1271 1549
1272#ifdef TRANSPARENT 1550#ifdef TRANSPARENT
1273 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1551 if (am_transparent && ev.xany.window == parent[0])
1274 XClearWindow (display->display, ev.xany.window); 1552 XClearWindow (xdisp, ev.xany.window);
1275#endif 1553#endif
1276 } 1554 }
1277 break; 1555 break;
1278 1556
1279 case MotionNotify: 1557 case MotionNotify:
1280#ifdef POINTER_BLANK 1558#ifdef POINTER_BLANK
1281 if (hidden_pointer) 1559 if (hidden_pointer)
1282 pointer_unblank (); 1560 pointer_unblank ();
1283#endif 1561#endif
1284#if MENUBAR 1562 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1285 if (isMenuBarWindow (ev.xany.window)) 1563 break;
1564
1565 if (ev.xany.window == vt)
1286 { 1566 {
1287 menubar_control (ev.xbutton); 1567 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1288 break; 1568 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1289 } 1569 ; // nop
1290#endif
1291 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate))
1292 break;
1293
1294 if (ev.xany.window == TermWin.vt)
1295 {
1296 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1570 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1297 { 1571 {
1298 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1572 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1299 ; 1573 ;
1300 1574
1301 XQueryPointer (display->display, TermWin.vt, 1575 XQueryPointer (xdisp, vt,
1302 &unused_root, &unused_child, 1576 &unused_root, &unused_child,
1303 &unused_root_x, &unused_root_y, 1577 &unused_root_x, &unused_root_y,
1304 & (ev.xbutton.x), & (ev.xbutton.y), 1578 &ev.xbutton.x, &ev.xbutton.y,
1305 &unused_mask); 1579 &ev.xbutton.state);
1306#ifdef MOUSE_THRESHOLD 1580#ifdef MOUSE_THRESHOLD
1307 /* deal with a `jumpy' mouse */ 1581 /* deal with a `jumpy' mouse */
1308 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1582 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1309 { 1583 {
1310#endif 1584#endif
1585#if ISO_14755
1586 // 5.4
1587 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1588 {
1589 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1590 break;
1591 }
1592#endif
1311 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1593 selection_extend (ev.xbutton.x, ev.xbutton.y,
1312 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1594 ev.xbutton.state & Button3Mask ? 2 : 0);
1595
1313#ifdef SELECTION_SCROLLING 1596#ifdef SELECTION_SCROLLING
1314 if (ev.xbutton.y < TermWin.int_bwidth 1597 if (ev.xbutton.y < int_bwidth
1315 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1598 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1316 { 1599 {
1317 int dist; 1600 int dist;
1318 1601
1319 /* don't clobber the current delay if we are 1602 /* don't clobber the current delay if we are
1320 * already in the middle of scrolling. 1603 * already in the middle of scrolling.
… …
1323 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1606 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1324 1607
1325 /* save the event params so we can highlight 1608 /* save the event params so we can highlight
1326 * the selection in the pending-scroll loop 1609 * the selection in the pending-scroll loop
1327 */ 1610 */
1328 selection_save_x=ev.xbutton.x; 1611 selection_save_x = ev.xbutton.x;
1329 selection_save_y=ev.xbutton.y; 1612 selection_save_y = ev.xbutton.y;
1330 selection_save_state=
1331 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1613 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1332 1614
1333 /* calc number of lines to scroll */ 1615 /* calc number of lines to scroll */
1334 if (ev.xbutton.y<TermWin.int_bwidth) 1616 if (ev.xbutton.y < int_bwidth)
1335 { 1617 {
1336 scroll_selection_dir = UP; 1618 scroll_selection_dir = UP;
1337 dist = TermWin.int_bwidth - ev.xbutton.y; 1619 dist = int_bwidth - ev.xbutton.y;
1338 } 1620 }
1339 else 1621 else
1340 { 1622 {
1341 scroll_selection_dir = DN; 1623 scroll_selection_dir = DN;
1342 dist = ev.xbutton.y - 1624 dist = ev.xbutton.y - (int_bwidth + height);
1343 (TermWin.int_bwidth + TermWin.height);
1344 } 1625 }
1626
1345 scroll_selection_lines= (Pixel2Height (dist)/ 1627 scroll_selection_lines = Pixel2Height (dist)
1346 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1628 / SELECTION_SCROLL_LINE_SPEEDUP
1629 + 1;
1347 MIN_IT (scroll_selection_lines, 1630 min_it (scroll_selection_lines,
1348 SELECTION_SCROLL_MAX_LINES); 1631 SELECTION_SCROLL_MAX_LINES);
1349 } 1632 }
1350 else 1633 else
1351 { 1634 {
1352 /* we are within the text window, so we 1635 /* we are within the text window, so we
1353 * shouldn't be scrolling 1636 * shouldn't be scrolling
… …
1355 if (sel_scroll_ev.active) 1638 if (sel_scroll_ev.active)
1356 sel_scroll_ev.stop(); 1639 sel_scroll_ev.stop();
1357 } 1640 }
1358#endif 1641#endif
1359#ifdef MOUSE_THRESHOLD 1642#ifdef MOUSE_THRESHOLD
1360
1361 } 1643 }
1362#endif 1644#endif
1363
1364 } 1645 }
1365 } 1646 }
1366 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1647 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1367 { 1648 {
1368 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1649 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1369 MotionNotify, &ev)) ; 1650 MotionNotify, &ev))
1651 ;
1652
1370 XQueryPointer (display->display, scrollBar.win, 1653 XQueryPointer (xdisp, scrollBar.win,
1371 &unused_root, &unused_child, 1654 &unused_root, &unused_child,
1372 &unused_root_x, &unused_root_y, 1655 &unused_root_x, &unused_root_y,
1373 & (ev.xbutton.x), & (ev.xbutton.y), 1656 &ev.xbutton.x, &ev.xbutton.y,
1374 &unused_mask); 1657 &unused_mask);
1375 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1376 scrollbar_size ()); 1659 scrollbar_size ());
1377 scr_refresh (refresh_type); 1660 want_refresh = 1;
1378 refresh_limit = 0; 1661 refresh_limit = 0;
1379 scrollbar_show (1); 1662 scrollbar_show (1);
1380 } 1663 }
1381 break; 1664 break;
1382 } 1665 }
1383}
1384 1666
1667skip_switch: ;
1668
1669#if defined(CURSOR_BLINK)
1670 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1671 {
1672 if (hidden_cursor)
1673 {
1674 hidden_cursor = 0;
1675 want_refresh = 1;
1676 }
1677
1678 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1679 }
1680#endif
1681
1682#if defined(POINTER_BLANK)
1683 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1684 {
1685 if (ev.type == MotionNotify
1686 || ev.type == ButtonPress
1687 || ev.type == ButtonRelease)
1688 if (hidden_pointer)
1689 pointer_unblank ();
1690
1691 if (ev.type == KeyPress && hidden_pointer == 0)
1692 pointer_blank ();
1693 }
1694#endif
1695}
1696
1697void
1698rxvt_term::focus_in ()
1699{
1700 if (!focus)
1701 {
1702 focus = 1;
1703 want_refresh = 1;
1704
1705 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1706
1707#if USE_XIM
1708 if (Input_Context != NULL)
1709 {
1710 IMSetStatusPosition ();
1711 XSetICFocus (Input_Context);
1712 }
1713#endif
1714#if CURSOR_BLINK
1715 if (OPTION (Opt_cursorBlink))
1716 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1717#endif
1718#if OFF_FOCUS_FADING
1719 if (rs[Rs_fade])
1720 {
1721 pix_colors = pix_colors_focused;
1722 scr_recolour ();
1723 }
1724#endif
1725 }
1726}
1727
1728void
1729rxvt_term::focus_out ()
1730{
1731 if (focus)
1732 {
1733 focus = 0;
1734 want_refresh = 1;
1735
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1737
1738#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf)
1740 {
1741 iso14755buf = 0;
1742# if ENABLE_OVERLAY
1743 scr_overlay_off ();
1744# endif
1745 }
1746#endif
1747#if USE_XIM
1748 if (Input_Context != NULL)
1749 XUnsetICFocus (Input_Context);
1750#endif
1751#if CURSOR_BLINK
1752 if (OPTION (Opt_cursorBlink))
1753 cursor_blink_ev.stop ();
1754 hidden_cursor = 0;
1755#endif
1756#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade])
1758 {
1759 pix_colors = pix_colors_unfocused;
1760 scr_recolour ();
1761 }
1762#endif
1763 }
1764}
1765
1766#if TRANSPARENT
1385void 1767void
1386rxvt_term::rootwin_cb (XEvent &ev) 1768rxvt_term::rootwin_cb (XEvent &ev)
1387{ 1769{
1388 SET_R (this); 1770 make_current ();
1389 SET_LOCALE (locale);
1390 1771
1391 switch (ev.type) 1772 switch (ev.type)
1392 { 1773 {
1393 case PropertyNotify: 1774 case PropertyNotify:
1394 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1395 {
1396 if (ev.xproperty.state == PropertyNewValue)
1397 selection_property (ev.xproperty.window, ev.xproperty.atom);
1398 break;
1399 }
1400#ifdef TRANSPARENT
1401 else
1402 {
1403 /* 1775 /*
1404 * if user used some Esetroot compatible prog to set the root bg, 1776 * if user used some Esetroot compatible prog to set the root bg,
1405 * use the property to determine the pixmap. We use it later on. 1777 * use the property to determine the pixmap. We use it later on.
1406 */ 1778 */
1407 if (xa[XA_XROOTPMAPID] == 0)
1408 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1409
1410 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1779 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1780 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1411 return; 1781 return;
1412 }
1413 1782
1414 /* FALLTHROUGH */ 1783 /* FALLTHROUGH */
1415 case ReparentNotify: 1784 case ReparentNotify:
1416 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1785 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1417 want_refresh = want_full_refresh = 1; 1786 want_refresh = want_full_refresh = 1;
1418 break; 1787 break;
1419#endif
1420 } 1788 }
1421} 1789}
1790#endif
1422 1791
1423void 1792void
1424rxvt_term::button_press (XButtonEvent &ev) 1793rxvt_term::button_press (XButtonEvent &ev)
1425{ 1794{
1426 int reportmode = 0, clickintime; 1795 int reportmode = 0, clickintime;
1427 1796
1428 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1797 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1798
1429 if (!bypass_keystate) 1799 if (!bypass_keystate)
1430 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1800 reportmode = !! (priv_modes & PrivMode_mouse_report);
1801
1431 /* 1802 /*
1432 * VT window processing of button press 1803 * VT window processing of button press
1433 */ 1804 */
1434 if (ev.window == TermWin.vt) 1805 if (ev.window == vt)
1435 { 1806 {
1807 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1808 return;
1809
1810#if ISO_14755
1811 // 5.4
1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1813 {
1814 iso14755_54 (ev.x, ev.y);
1815 return;
1816 }
1817#endif
1818
1436 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1819 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1820
1437 if (reportmode) 1821 if (reportmode)
1438 { 1822 {
1439 /* mouse report from vt window */ 1823 /* mouse report from vt window */
1440 /* save the xbutton state (for ButtonRelease) */ 1824 /* save the xbutton state (for ButtonRelease) */
1441 MEvent.state = ev.state; 1825 MEvent.state = ev.state;
1442#ifdef MOUSE_REPORT_DOUBLECLICK 1826#ifdef MOUSE_REPORT_DOUBLECLICK
1443 if (ev.button == MEvent.button && clickintime) 1827 if (ev.button == MEvent.button && clickintime)
1444 { 1828 {
1445 /* same button, within alloted time */ 1829 /* same button, within alloted time */
1446 MEvent.clicks++; 1830 MEvent.clicks++;
1831
1447 if (MEvent.clicks > 1) 1832 if (MEvent.clicks > 1)
1448 { 1833 {
1449 /* only report double clicks */ 1834 /* only report double clicks */
1450 MEvent.clicks = 2; 1835 MEvent.clicks = 2;
1451 mouse_report (ev); 1836 mouse_report (ev);
… …
1470 } 1855 }
1471 else 1856 else
1472 { 1857 {
1473 if (ev.button != MEvent.button) 1858 if (ev.button != MEvent.button)
1474 MEvent.clicks = 0; 1859 MEvent.clicks = 0;
1860
1475 switch (ev.button) 1861 switch (ev.button)
1476 { 1862 {
1477 case Button1: 1863 case Button1:
1864 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */
1866#if ENABLE_FRILLS
1867 selection.rect = !!(ev.state & ModMetaMask);
1868#else
1869 selection.rect = false;
1870#endif
1871
1478 /* allow shift+left click to extend selection */ 1872 /* allow shift+left click to extend selection */
1479 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1873 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1480 { 1874 {
1481 if (MEvent.button == Button1 && clickintime) 1875 if (MEvent.button == Button1 && clickintime)
1482 selection_rotate (ev.x, ev.y); 1876 selection_rotate (ev.x, ev.y);
1483 else 1877 else
1484 selection_extend (ev.x, ev.y, 1); 1878 selection_extend (ev.x, ev.y, 1);
… …
1499 case Button3: 1893 case Button3:
1500 if (MEvent.button == Button3 && clickintime) 1894 if (MEvent.button == Button3 && clickintime)
1501 selection_rotate (ev.x, ev.y); 1895 selection_rotate (ev.x, ev.y);
1502 else 1896 else
1503 selection_extend (ev.x, ev.y, 1); 1897 selection_extend (ev.x, ev.y, 1);
1898
1504 MEvent.button = Button3; 1899 MEvent.button = Button3;
1505 break; 1900 break;
1506 } 1901 }
1507 } 1902 }
1903
1508 MEvent.time = ev.time; 1904 MEvent.time = ev.time;
1509 return; 1905 return;
1510 } 1906 }
1511 1907
1512 /* 1908 /*
… …
1623 case Button3: 2019 case Button3:
1624 if (scrollBar.style != R_SB_XTERM) 2020 if (scrollBar.style != R_SB_XTERM)
1625 { 2021 {
1626 if (scrollbar_above_slider (ev.y)) 2022 if (scrollbar_above_slider (ev.y))
1627# ifdef RXVT_SCROLL_FULL 2023# ifdef RXVT_SCROLL_FULL
1628 scr_page (UP, TermWin.nrow - 1); 2024 scr_page (UP, nrow - 1);
1629# else 2025# else
1630 scr_page (UP, TermWin.nrow / 4); 2026 scr_page (UP, nrow / 4);
1631# endif 2027# endif
1632 else if (scrollbar_below_slider (ev.y)) 2028 else if (scrollbar_below_slider (ev.y))
1633# ifdef RXVT_SCROLL_FULL 2029# ifdef RXVT_SCROLL_FULL
1634 scr_page (DN, TermWin.nrow - 1); 2030 scr_page (DN, nrow - 1);
1635# else 2031# else
1636 scr_page (DN, TermWin.nrow / 4); 2032 scr_page (DN, nrow / 4);
1637# endif 2033# endif
1638 else 2034 else
1639 scrollBar.setMotion (); 2035 scrollBar.setMotion ();
1640 } 2036 }
1641 else 2037 else
1642 { 2038 {
1643 scr_page ((ev.button == Button1 ? DN : UP), 2039 scr_page ((ev.button == Button1 ? DN : UP),
1644 (TermWin.nrow 2040 (nrow
1645 * scrollbar_position (ev.y) 2041 * scrollbar_position (ev.y)
1646 / scrollbar_size ())); 2042 / scrollbar_size ()));
1647 } 2043 }
1648 2044
1649 break; 2045 break;
1650 } 2046 }
1651 } 2047 }
2048
1652 return; 2049 return;
1653 } 2050 }
1654#if MENUBAR
1655 /*
1656 * Menubar window processing of button press
1657 */
1658 if (isMenuBarWindow (ev.window))
1659 menubar_control (ev);
1660#endif
1661} 2051}
1662 2052
1663void 2053void
1664rxvt_term::button_release (XButtonEvent &ev) 2054rxvt_term::button_release (XButtonEvent &ev)
1665{ 2055{
1666 int reportmode = 0; 2056 int reportmode = 0;
1667 2057
1668 csrO = 0; /* reset csr Offset */ 2058 csrO = 0; /* reset csr Offset */
1669 if (!bypass_keystate) 2059 if (!bypass_keystate)
1670 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2060 reportmode = !! (priv_modes & PrivMode_mouse_report);
1671 2061
1672 if (scrollbar_isUpDn ()) 2062 if (scrollbar_isUpDn ())
1673 { 2063 {
1674 scrollBar.setIdle (); 2064 scrollBar.setIdle ();
1675 scrollbar_show (0); 2065 scrollbar_show (0);
1676#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1677 refresh_type &= ~SMOOTH_REFRESH;
1678#endif
1679
1680 } 2066 }
2067
1681#ifdef SELECTION_SCROLLING 2068#ifdef SELECTION_SCROLLING
1682 if (sel_scroll_ev.active) 2069 if (sel_scroll_ev.active)
1683 sel_scroll_ev.stop(); 2070 sel_scroll_ev.stop();
1684#endif 2071#endif
2072
1685 if (ev.window == TermWin.vt) 2073 if (ev.window == vt)
1686 { 2074 {
2075 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2076 return;
2077
2078#if ISO_14755
2079 // 5.4
2080 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2081 return;
2082#endif
2083
1687 if (reportmode) 2084 if (reportmode)
1688 { 2085 {
1689 /* mouse report from vt window */ 2086 /* mouse report from vt window */
1690 /* don't report release of wheel "buttons" */ 2087 /* don't report release of wheel "buttons" */
1691 if (ev.button >= 4) 2088 if (ev.button >= 4)
… …
1705 MEvent.button = AnyButton; 2102 MEvent.button = AnyButton;
1706 mouse_report (ev); 2103 mouse_report (ev);
1707#endif /* MOUSE_REPORT_DOUBLECLICK */ 2104#endif /* MOUSE_REPORT_DOUBLECLICK */
1708 return; 2105 return;
1709 } 2106 }
2107
1710 /* 2108 /*
1711 * dumb hack to compensate for the failure of click-and-drag 2109 * dumb hack to compensate for the failure of click-and-drag
1712 * when overriding mouse reporting 2110 * when overriding mouse reporting
1713 */ 2111 */
1714 if (PrivateModes & PrivMode_mouse_report 2112 if (priv_modes & PrivMode_mouse_report
1715 && bypass_keystate 2113 && bypass_keystate
1716 && ev.button == Button1 && MEvent.clicks <= 1) 2114 && ev.button == Button1 && MEvent.clicks <= 1)
1717 selection_extend (ev.x, ev.y, 0); 2115 selection_extend (ev.x, ev.y, 0);
1718 2116
1719 switch (ev.button) 2117 switch (ev.button)
1720 { 2118 {
1721 case Button1: 2119 case Button1:
1722 case Button3: 2120 case Button3:
1723 selection_make (ev.time); 2121 selection_make (ev.time);
1724 break; 2122 break;
2123
1725 case Button2: 2124 case Button2:
1726 selection_request (ev.time, ev.x, ev.y); 2125 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2126 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
1727 break; 2127 break;
2128
1728#ifdef MOUSE_WHEEL 2129#ifdef MOUSE_WHEEL
1729 case Button4: 2130 case Button4:
1730 case Button5: 2131 case Button5:
1731 { 2132 {
1732 int i; 2133 int i;
… …
1734 2135
1735 v = ev.button == Button4 ? UP : DN; 2136 v = ev.button == Button4 ? UP : DN;
1736 2137
1737 if (ev.state & ShiftMask) 2138 if (ev.state & ShiftMask)
1738 i = 1; 2139 i = 1;
1739 else if (Options & Opt_mouseWheelScrollPage) 2140 else if (OPTION (Opt_mouseWheelScrollPage))
1740 i = TermWin.nrow - 1; 2141 i = nrow - 1;
1741 else 2142 else
1742 i = 5; 2143 i = 5;
1743 2144
1744# ifdef MOUSE_SLIP_WHEELING 2145# ifdef MOUSE_SLIP_WHEELING
1745 if (ev.state & ControlMask) 2146 if (ev.state & ControlMask)
1746 { 2147 {
1747 mouse_slip_wheel_speed += v ? -1 : 1; 2148 mouse_slip_wheel_speed += v ? -1 : 1;
1748 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2149 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
1749 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2150 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1750 2151
1751 if (slip_wheel_ev.at < NOW) 2152 if (slip_wheel_ev.at < NOW)
1752 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2153 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1753 2154
1754 slip_wheel_ev.start (); 2155 slip_wheel_ev.start ();
1755 } 2156 }
1756 else 2157 else
1757 { 2158 {
1758# endif 2159# endif
1759# ifdef JUMP_MOUSE_WHEEL
1760 scr_page (v, i); 2160 scr_page (v, i);
1761 scr_refresh (SMOOTH_REFRESH);
1762 scrollbar_show (1); 2161 scrollbar_show (1);
1763# else
1764 while (i--)
1765 {
1766 scr_page (v, 1);
1767 scr_refresh (SMOOTH_REFRESH);
1768 scrollbar_show (1);
1769 }
1770# endif
1771# ifdef MOUSE_SLIP_WHEELING 2162# ifdef MOUSE_SLIP_WHEELING
1772 } 2163 }
1773#endif 2164# endif
1774 } 2165 }
1775 break; 2166 break;
1776#endif 2167#endif
1777 } 2168 }
1778 } 2169 }
1779#ifdef MENUBAR
1780 else if (isMenuBarWindow (ev.window))
1781 menubar_control (ev);
1782#endif
1783} 2170}
1784 2171
1785#ifdef TRANSPARENT 2172#ifdef TRANSPARENT
1786#if TINTING 2173#if TINTING
1787/* taken from aterm-0.4.2 */ 2174/* taken from aterm-0.4.2 */
1788 2175
1789typedef uint32_t RUINT32T; 2176typedef uint32_t RUINT32T;
1790 2177
1791void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2178void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
1792{ 2179{
1793 int sh_r, sh_g, sh_b; 2180 int sh_r, sh_g, sh_b;
1794 RUINT32T mask_r, mask_g, mask_b; 2181 RUINT32T mask_r, mask_g, mask_b;
1795 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2182 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1796 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2183 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1797 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2184 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1798 int i; 2185 int i;
1799 2186
1800 Visual* visual = display->visual; 2187 Visual *visual = term->visual;
1801 2188
1802 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2189 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1803 2190
1804 /* for convenience */ 2191 /* for convenience */
1805 mask_r = visual->red_mask; 2192 mask_r = visual->red_mask;
… …
2029 Pixmap rootpixmap = None; 2416 Pixmap rootpixmap = None;
2030 XWindowAttributes wattr, wrootattr; 2417 XWindowAttributes wattr, wrootattr;
2031 2418
2032 pchanged = 0; 2419 pchanged = 0;
2033 2420
2034 if (!(Options & Opt_transparent)) 2421 if (!OPTION (Opt_transparent))
2035 return pchanged; /* Don't try any more */ 2422 return pchanged; /* Don't try any more */
2036 2423
2037 XGetWindowAttributes (display->display, display->root, &wrootattr); 2424 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2038 rootdepth = wrootattr.depth; 2425 rootdepth = wrootattr.depth;
2039 2426
2040 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2427 XGetWindowAttributes (xdisp, parent[0], &wattr);
2041 2428
2042 if (rootdepth != wattr.depth) 2429 if (rootdepth != wattr.depth)
2043 { 2430 {
2044 if (am_transparent) 2431 if (am_transparent)
2045 { 2432 {
2046 pchanged = 1; 2433 pchanged = 1;
2047 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2434 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2048 am_transparent = am_pixmap_trans = 0; 2435 am_transparent = am_pixmap_trans = 0;
2049 } 2436 }
2050 2437
2051 return pchanged; /* Don't try any more */ 2438 return pchanged; /* Don't try any more */
2052 } 2439 }
2053 2440
2054 /* Get all X ops out of the queue so that our information is up-to-date. */ 2441 /* Get all X ops out of the queue so that our information is up-to-date. */
2055 XSync (display->display, False); 2442 XSync (xdisp, False);
2056 2443
2057 /* 2444 /*
2058 * Make the frame window set by the window manager have 2445 * Make the frame window set by the window manager have
2059 * the root background. Some window managers put multiple nested frame 2446 * the root background. Some window managers put multiple nested frame
2060 * windows for each client, so we have to take care about that. 2447 * windows for each client, so we have to take care about that.
2061 */ 2448 */
2062 i = (xa[XA_XROOTPMAPID] 2449 i = (xa[XA_XROOTPMAP_ID]
2063 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2450 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2064 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2451 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2065 &nitems, &bytes_after, &prop) == Success); 2452 &nitems, &bytes_after, &prop) == Success);
2066 2453
2067 if (!i || prop == NULL) 2454 if (!i || prop == NULL)
2068 i = (xa[XA_XSETROOTID] 2455 i = (xa[XA_ESETROOT_PMAP_ID]
2069 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2456 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2070 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2457 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2071 &nitems, &bytes_after, &prop) == Success); 2458 &nitems, &bytes_after, &prop) == Success);
2072 2459
2073 if (!i || prop == NULL 2460 if (!i || prop == NULL
2074#if TINTING 2461#if TINTING
2075 || !rs[Rs_color + Color_tint] 2462 || !ISSET_PIXCOLOR (Color_tint)
2076#endif 2463#endif
2077 ) 2464 )
2078 have_pixmap = 0; 2465 have_pixmap = 0;
2079 else 2466 else
2080 { 2467 {
… …
2093 Window cr; 2480 Window cr;
2094 XImage *image; 2481 XImage *image;
2095 GC gc; 2482 GC gc;
2096 XGCValues gcvalue; 2483 XGCValues gcvalue;
2097 2484
2098 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2485 XTranslateCoordinates (xdisp, parent[0], display->root,
2099 0, 0, &sx, &sy, &cr); 2486 0, 0, &sx, &sy, &cr);
2100 nw = (unsigned int)szHint.width; 2487 nw = (unsigned int)szHint.width;
2101 nh = (unsigned int)szHint.height; 2488 nh = (unsigned int)szHint.height;
2102 nx = ny = 0; 2489 nx = ny = 0;
2103 2490
… …
2113 nh += sy; 2500 nh += sy;
2114 ny = -sy; 2501 ny = -sy;
2115 sy = 0; 2502 sy = 0;
2116 } 2503 }
2117 2504
2118 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2505 min_it (nw, (unsigned int) (wrootattr.width - sx));
2119 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2506 min_it (nh, (unsigned int) (wrootattr.height - sy));
2507
2508 XSync (xdisp, False);
2120 allowedxerror = -1; 2509 allowedxerror = -1;
2121 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2510 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2122 2511
2123 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2512 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2124 /* XXX: may need a delay here? */ 2513 /* XXX: may need a delay here? */
2125 allowedxerror = 0; 2514 allowedxerror = 0;
2126 2515
2127 if (image == NULL) 2516 if (image == NULL)
2128 { 2517 {
2129 if (am_transparent && am_pixmap_trans) 2518 if (am_transparent && am_pixmap_trans)
2130 { 2519 {
2131 pchanged = 1; 2520 pchanged = 1;
2132 if (TermWin.pixmap != None) 2521 if (pixmap != None)
2133 { 2522 {
2134 XFreePixmap (display->display, TermWin.pixmap); 2523 XFreePixmap (xdisp, pixmap);
2135 TermWin.pixmap = None; 2524 pixmap = None;
2136 } 2525 }
2137 } 2526 }
2138 2527
2139 am_pixmap_trans = 0; 2528 am_pixmap_trans = 0;
2140 } 2529 }
2141 else 2530 else
2142 { 2531 {
2143 if (TermWin.pixmap != None) 2532 if (pixmap != None)
2144 XFreePixmap (display->display, TermWin.pixmap); 2533 XFreePixmap (xdisp, pixmap);
2145 2534
2146#if TINTING 2535#if TINTING
2147 if (ISSET_PIXCOLOR (Color_tint)) 2536 if (ISSET_PIXCOLOR (Color_tint))
2148 { 2537 {
2149 unsigned short rm, gm, bm;
2150 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2538 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2151 2539
2540 rgba c;
2152 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2541 pix_colors_focused [Color_tint].get (c);
2153 2542
2154 ShadeXImage (display, image, shade, rm, gm, bm); 2543 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2155 } 2544 }
2156#endif 2545#endif
2157 2546
2158 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2547 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2159 szHint.width, szHint.height, image->depth);
2160 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2548 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2161 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2549 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2162 nx, ny, image->width, image->height); 2550 nx, ny, image->width, image->height);
2163 XFreeGC (display->display, gc); 2551 XFreeGC (xdisp, gc);
2164 XDestroyImage (image); 2552 XDestroyImage (image);
2165 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2553 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2166 XClearWindow (display->display, TermWin.parent[0]); 2554 XClearWindow (xdisp, parent[0]);
2167 2555
2168 if (!am_transparent || !am_pixmap_trans) 2556 if (!am_transparent || !am_pixmap_trans)
2169 pchanged = 1; 2557 pchanged = 1;
2170 2558
2171 am_transparent = am_pixmap_trans = 1; 2559 am_transparent = am_pixmap_trans = 1;
2172 } 2560 }
2173 } 2561 }
2174 2562
2175 if (!am_pixmap_trans) 2563 if (am_pixmap_trans)
2564 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2565 else
2176 { 2566 {
2177 unsigned int n; 2567 unsigned int n;
2178 /* 2568 /*
2179 * InheritPixmap transparency 2569 * InheritPixmap transparency
2180 */ 2570 */
2181 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2182 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2571 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2183 { 2572 {
2184 oldp = TermWin.parent[i]; 2573 oldp = parent[i];
2185 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2574 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2186 &TermWin.parent[i], &list, &n);
2187 XFree (list); 2575 XFree (list);
2188 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2189 2576
2190 if (TermWin.parent[i] == display->root) 2577 if (parent[i] == display->root)
2191 { 2578 {
2192 if (oldp != None) 2579 if (oldp != None)
2193 pchanged = 1; 2580 pchanged = 1;
2194 2581
2195 break; 2582 break;
2196 } 2583 }
2197 2584
2198 if (oldp != TermWin.parent[i]) 2585 if (oldp != parent[i])
2199 pchanged = 1; 2586 pchanged = 1;
2200 } 2587 }
2201 2588
2202 n = 0; 2589 n = 0;
2203 2590
2204 if (pchanged) 2591 if (pchanged)
2205 {
2206 for (; n < (unsigned int)i; n++) 2592 for (; n < (unsigned int)i; n++)
2207 { 2593 {
2208 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2209 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); 2595
2210 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2596 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2211 { 2597 {
2212 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2598 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2213 break; 2599 break;
2214 } 2600 }
2215 } 2601 }
2602
2603 if (n > (sizeof (parent) / sizeof (parent[0])))
2216 } 2604 {
2217
2218 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2219 {
2220 D_X ((stderr, "InheritPixmap Turning off"));
2221 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2222 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2223 am_transparent = 0; 2607 am_transparent = 0;
2224 /* XXX: also turn off Opt_transparent? */ 2608 /* XXX: also turn off Opt_transparent? */
2225 } 2609 }
2226 else 2610 else
2227 { 2611 {
2228#if WAIT_FOR_WM
2229 /* wait (an arbitrary period) for the WM to do its thing
2230 * needed for fvwm2.2.2 (and before?) */
2231 sleep (1);
2232#endif
2233 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2234 for (n = 0; n < (unsigned int)i; n++) 2612 for (n = 0; n < (unsigned int)i; n++)
2235 { 2613 {
2236 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2237 XClearWindow (display->display, TermWin.parent[n]); 2615 XClearWindow (xdisp, parent[n]);
2238 } 2616 }
2239 2617
2240 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2241 am_transparent = 1; 2619 am_transparent = 1;
2242 } 2620 }
2243 2621
2244 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2245 TermWin.parent[i] = None; 2623 parent[i] = None;
2246 } 2624 }
2247 2625
2248 // this is experimental
2249 if (scrollBar.win) 2626 if (scrollBar.win)
2250 { 2627 {
2251 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2252 XClearWindow (display->display, scrollBar.win);
2253 scrollBar.setIdle (); 2629 scrollBar.setIdle ();
2254 scrollbar_show (0); 2630 scrollbar_show (0);
2255 } 2631 }
2256 2632
2633 if (am_transparent)
2634 {
2635 want_refresh = want_full_refresh = 1;
2636 if (am_pixmap_trans)
2637 flush ();
2638 }
2639
2257 return pchanged; 2640 return pchanged;
2258} 2641}
2259#endif 2642#endif
2260 2643
2261/*}}} */ 2644/*}}} */
2262 2645
2263bool 2646bool
2264rxvt_term::cmd_parse () 2647rxvt_term::cmd_parse ()
2265{ 2648{
2266 bool flag = false; 2649 bool flag = false;
2267 unicode_t ch = NOCHAR; 2650 wchar_t ch = NOCHAR;
2268 unsigned char *seq_begin; // remember start of esc-sequence here 2651 char *seq_begin; // remember start of esc-sequence here
2269 2652
2270 for (;;) 2653 for (;;)
2271 { 2654 {
2272 if (ch == NOCHAR) 2655 if (ch == NOCHAR)
2273 { 2656 {
2274 seq_begin = cmdbuf_ptr; 2657 seq_begin = cmdbuf_ptr;
2275 ch = next_char (); 2658 ch = next_char ();
2276 }
2277 2659
2278 if (ch == NOCHAR) // TODO: improve 2660 if (ch == NOCHAR)
2279 break; 2661 break;
2662 }
2280 2663
2281 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2664 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2282 { 2665 {
2666 if (!seen_input)
2667 {
2668 seen_input = 1;
2669 // many badly-written programs (e.g. jed) contain a race condition:
2670 // they first read the screensize and then install a SIGWINCH handler.
2671 // some window managers resize the window early, and these programs
2672 // then sometimes get the size wrong.
2673 // unfortunately other programs are even more buggy and dislike
2674 // being sent SIGWINCH, so only do it when we were in fact being
2675 // resized.
2676 if (seen_resize && cmd_pid)
2677 kill (-cmd_pid, SIGWINCH);
2678 }
2679
2283 /* Read a text string from the input buffer */ 2680 /* Read a text string from the input buffer */
2284 unicode_t buf[UBUFSIZ]; 2681 wchar_t buf[UBUFSIZ];
2285 bool refreshnow = false; 2682 bool refreshnow = false;
2286 int nlines = 0; 2683 int nlines = 0;
2287 unicode_t *str = buf; 2684 wchar_t *str = buf;
2685 wchar_t *eol = str + min (ncol, UBUFSIZ);
2288 2686
2289 for (;;) 2687 for (;;)
2290 { 2688 {
2291 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2689 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2292 break; 2690 break;
2293 2691
2294 *str++ = ch; 2692 *str++ = ch;
2295 2693
2296 if (ch == C0_LF) 2694 if (ch == C0_LF || str >= eol)
2297 { 2695 {
2696 if (ch == C0_LF)
2298 nlines++; 2697 nlines++;
2698
2299 refresh_count++; 2699 refresh_count++;
2300 2700
2301 if (!(Options & Opt_jumpScroll) 2701 if (!OPTION (Opt_jumpScroll)
2302 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2702 || (refresh_count >= refresh_limit * (nrow - 1)))
2303 { 2703 {
2304 refreshnow = true; 2704 refreshnow = true;
2705 refresh_count = 0;
2305 ch = NOCHAR; 2706 ch = NOCHAR;
2306 break; 2707 break;
2307 } 2708 }
2308 2709
2309 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2710 // scr_add_lines only works for nlines <= nrow - 1.
2310 if (nlines >= TermWin.nrow - 1) 2711 if (nlines >= nrow - 1)
2311 { 2712 {
2713 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2714 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2312 scr_add_lines (buf, nlines, str - buf); 2715 scr_add_lines (buf, str - buf, nlines);
2716
2313 nlines = 0; 2717 nlines = 0;
2314 str = buf; 2718 str = buf;
2719 eol = str + min (ncol, UBUFSIZ);
2315 } 2720 }
2316 }
2317 2721
2318 if (str >= buf + UBUFSIZ) 2722 if (str >= eol)
2319 { 2723 {
2724 if (eol >= buf + UBUFSIZ)
2725 {
2320 ch = NOCHAR; 2726 ch = NOCHAR;
2321 break; 2727 break;
2728 }
2729 else
2730 eol = min (eol + ncol, buf + UBUFSIZ);
2731 }
2732
2322 } 2733 }
2323 2734
2324 seq_begin = cmdbuf_ptr; 2735 seq_begin = cmdbuf_ptr;
2325 ch = next_char (); 2736 ch = next_char ();
2326 } 2737 }
2327 2738
2739 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2740 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2328 scr_add_lines (buf, nlines, str - buf); 2741 scr_add_lines (buf, str - buf, nlines);
2329 2742
2330 /* 2743 /*
2331 * If there have been a lot of new lines, then update the screen 2744 * If there have been a lot of new lines, then update the screen
2332 * What the heck I'll cheat and only refresh less than every page-full. 2745 * What the heck I'll cheat and only refresh less than every page-full.
2333 * the number of pages between refreshes is refresh_limit, which 2746 * the number of pages between refreshes is refresh_limit, which
2334 * is incremented here because we must be doing flat-out scrolling. 2747 * is incremented here because we must be doing flat-out scrolling.
2335 */ 2748 */
2336 if (refreshnow) 2749 if (refreshnow)
2337 { 2750 {
2338 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2339 refresh_limit++; 2752 refresh_limit++;
2340 else 2753 else
2341 { 2754 {
2342 flag = true; 2755 flag = true;
2343 scr_refresh (refresh_type); 2756 scr_refresh ();
2757 want_refresh = 1;
2344 } 2758 }
2345 } 2759 }
2346 2760
2347 } 2761 }
2348 else 2762 else
… …
2363 } 2777 }
2364 2778
2365 return flag; 2779 return flag;
2366} 2780}
2367 2781
2368// read the next octet
2369unicode_t
2370rxvt_term::next_octet ()
2371{
2372 return cmdbuf_ptr < cmdbuf_endp
2373 ? *cmdbuf_ptr++
2374 : NOCHAR;
2375}
2376
2377// read the next character 2782// read the next character
2378unicode_t 2783wchar_t
2379rxvt_term::next_char () 2784rxvt_term::next_char () NOTHROW
2380{ 2785{
2381 while (cmdbuf_ptr < cmdbuf_endp) 2786 while (cmdbuf_ptr < cmdbuf_endp)
2382 { 2787 {
2383 // assume 7-bit to be ascii ALWAYS 2788 // assume 7-bit to be ascii ALWAYS
2384 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2789 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2385 return *cmdbuf_ptr++; 2790 return *cmdbuf_ptr++;
2386 2791
2387 wchar_t wc; 2792 wchar_t wc;
2388 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2793 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2389 2794
2390 if (len == (size_t)-2) 2795 if (len == (size_t)-2)
2391 { 2796 {
2392 // the mbstate stores incomplete sequences. didn't know this :/ 2797 // the mbstate stores incomplete sequences. didn't know this :/
2393 cmdbuf_ptr = cmdbuf_endp; 2798 cmdbuf_ptr = cmdbuf_endp;
2394 break; 2799 break;
2395 } 2800 }
2396 2801
2397 if (len == (size_t)-1) 2802 if (len == (size_t)-1)
2398 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2803 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2399 2804
2400 // assume wchar == unicode 2805 // assume wchar == unicode
2401 cmdbuf_ptr += len; 2806 cmdbuf_ptr += len;
2402 return wc; 2807 return wc & UNICODE_MASK;
2403 } 2808 }
2404 2809
2405 return NOCHAR; 2810 return NOCHAR;
2406} 2811}
2812
2813// read the next octet
2814uint32_t
2815rxvt_term::next_octet () NOTHROW
2816{
2817 return cmdbuf_ptr < cmdbuf_endp
2818 ? (unsigned char)*cmdbuf_ptr++
2819 : NOCHAR;
2820}
2821
2822static class out_of_input out_of_input;
2407 2823
2408/* rxvt_cmd_getc () - Return next input character */ 2824/* rxvt_cmd_getc () - Return next input character */
2409/* 2825/*
2410 * Return the next input character after first passing any keyboard input 2826 * Return the next input character after first passing any keyboard input
2411 * to the command. 2827 * to the command.
2412 */ 2828 */
2413unicode_t 2829wchar_t
2414rxvt_term::cmd_getc () 2830rxvt_term::cmd_getc () THROW ((class out_of_input))
2415{ 2831{
2416 unicode_t c = next_char (); 2832 wchar_t c = next_char ();
2417 2833
2418 if (c == NOCHAR) 2834 if (c == NOCHAR)
2419 throw out_of_input; 2835 throw out_of_input;
2420 2836
2421 return c; 2837 return c;
2422} 2838}
2423 2839
2424unicode_t 2840uint32_t
2425rxvt_term::cmd_get8 () 2841rxvt_term::cmd_get8 () THROW ((class out_of_input))
2426{ 2842{
2427 unicode_t c = next_octet (); 2843 uint32_t c = next_octet ();
2428 2844
2429 if (c == NOCHAR) 2845 if (c == NOCHAR)
2430 throw out_of_input; 2846 throw out_of_input;
2431 2847
2432 return c; 2848 return c;
… …
2532 case C0_ESC: 2948 case C0_ESC:
2533 process_escape_seq (); 2949 process_escape_seq ();
2534 break; 2950 break;
2535 case C0_ENQ: /* terminal Status */ 2951 case C0_ENQ: /* terminal Status */
2536 if (rs[Rs_answerbackstring]) 2952 if (rs[Rs_answerbackstring])
2537 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2953 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2538 (unsigned int)STRLEN (rs[Rs_answerbackstring]));
2539 else 2954 else
2540 tt_write ((unsigned char *)VT100_ANS, 2955 tt_write (VT100_ANS, strlen (VT100_ANS));
2541 (unsigned int)STRLEN (VT100_ANS));
2542 break; 2956 break;
2543 case C0_BEL: /* bell */ 2957 case C0_BEL: /* bell */
2544 scr_bell (); 2958 scr_bell ();
2545 break; 2959 break;
2546 case C0_BS: /* backspace */ 2960 case C0_BS: /* backspace */
… …
2645void 3059void
2646rxvt_term::process_escape_seq () 3060rxvt_term::process_escape_seq ()
2647{ 3061{
2648 unicode_t ch = cmd_getc (); 3062 unicode_t ch = cmd_getc ();
2649 3063
2650 if (PrivateModes & PrivMode_vt52) 3064 if (priv_modes & PrivMode_vt52)
2651 { 3065 {
2652 process_escape_vt52 (ch); 3066 process_escape_vt52 (ch);
2653 return; 3067 return;
2654 } 3068 }
2655 3069
… …
2670 scr_charset_set (2, (unsigned int)cmd_getc ()); 3084 scr_charset_set (2, (unsigned int)cmd_getc ());
2671 break; 3085 break;
2672 case '+': 3086 case '+':
2673 scr_charset_set (3, (unsigned int)cmd_getc ()); 3087 scr_charset_set (3, (unsigned int)cmd_getc ());
2674 break; 3088 break;
2675#ifndef NO_FRILLS 3089#if !ENABLE_MINIMAL
2676 case '6': 3090 case '6':
2677 scr_backindex (); 3091 scr_backindex ();
2678 break; 3092 break;
2679#endif 3093#endif
2680 case '7': 3094 case '7':
2681 scr_cursor (SAVE); 3095 scr_cursor (SAVE);
2682 break; 3096 break;
2683 case '8': 3097 case '8':
2684 scr_cursor (RESTORE); 3098 scr_cursor (RESTORE);
2685 break; 3099 break;
2686#ifndef NO_FRILLS 3100#if !ENABLE_MINIMAL
2687 case '9': 3101 case '9':
2688 scr_forwardindex (); 3102 scr_forwardindex ();
2689 break; 3103 break;
2690#endif 3104#endif
2691 case '=': 3105 case '=':
… …
2701 break; 3115 break;
2702 3116
2703 /* 8.3.87: NEXT LINE */ 3117 /* 8.3.87: NEXT LINE */
2704 case C1_NEL: /* ESC E */ 3118 case C1_NEL: /* ESC E */
2705 { 3119 {
2706 unicode_t nlcr[] = { C0_LF, C0_CR }; 3120 wchar_t nlcr[] = { C0_LF, C0_CR };
2707 scr_add_lines (nlcr, 1, 2); 3121 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
2708 } 3122 }
2709 break; 3123 break;
2710 3124
2711 /* kidnapped escape sequence: Should be 8.3.48 */ 3125 /* kidnapped escape sequence: Should be 8.3.48 */
2712 case C1_ESA: /* ESC G */ 3126 case C1_ESA: /* ESC G */
… …
2734 process_dcs_seq (); 3148 process_dcs_seq ();
2735 break; 3149 break;
2736 3150
2737 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3151 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2738 case C1_SCI: /* ESC Z */ 3152 case C1_SCI: /* ESC Z */
2739 tt_write ((const unsigned char *)ESCZ_ANSWER, 3153 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2740 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
2741 break; /* steal obsolete ESC [ c */ 3154 break; /* steal obsolete ESC [ c */
2742 3155
2743 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3156 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
2744 case C1_CSI: /* ESC [ */ 3157 case C1_CSI: /* ESC [ */
2745 process_csi_seq (); 3158 process_csi_seq ();
… …
2854 ndef = get_byte_array_bit (csi_defaults, i); 3267 ndef = get_byte_array_bit (csi_defaults, i);
2855 for (p = 0; p < nargs; p++) 3268 for (p = 0; p < nargs; p++)
2856 if (arg[p] == -1) 3269 if (arg[p] == -1)
2857 arg[p] = ndef; 3270 arg[p] = ndef;
2858 3271
2859#ifdef DEBUG_CMD
2860 fprintf (stderr, "CSI ");
2861 for (p = 0; p < nargs; p++)
2862 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
2863 fprintf (stderr, "%c\n", ch);
2864#endif
2865
2866 /* 3272 /*
2867 * private mode handling 3273 * private mode handling
2868 */ 3274 */
2869 if (priv) 3275 if (priv)
2870 { 3276 {
2871 switch (priv) 3277 switch (priv)
2872 { 3278 {
2873 case '>': 3279 case '>':
2874 if (ch == CSI_DA) /* secondary device attributes */ 3280 if (ch == CSI_DA) /* secondary device attributes */
3281 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3283 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3284 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3286 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3287 // that we do not support xterm mouse reporting (should be 95 when we do).
3288 //
2875 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3289 tt_printf ("\033[>%d;94;0c", 'U');
3290 }
2876 break; 3291 break;
2877 case '?': 3292 case '?':
2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2879 process_terminal_mode (ch, priv, nargs, arg); 3294 process_terminal_mode (ch, priv, nargs, arg);
2880 break; 3295 break;
… …
2985 3400
2986 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3401 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
2987 arg[0] = -arg[0]; 3402 arg[0] = -arg[0];
2988 /* FALLTHROUGH */ 3403 /* FALLTHROUGH */
2989 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3404 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
2990 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3405 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
2991 break; 3406 break;
2992 3407
2993 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3408 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2994 tt_write ((const unsigned char *)VT100_ANS, 3409 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
2995 (unsigned int) (sizeof (VT100_ANS) - 1));
2996 break; 3410 break;
2997 3411
2998 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3412 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2999 process_sgr_mode (nargs, arg); 3413 process_sgr_mode (nargs, arg);
3000 break; 3414 break;
… …
3007 break; 3421 break;
3008 case 6: /* CPR requested */ 3422 case 6: /* CPR requested */
3009 scr_report_position (); 3423 scr_report_position ();
3010 break; 3424 break;
3011 case 7: /* unofficial extension */ 3425 case 7: /* unofficial extension */
3012 if (Options & Opt_insecure) 3426 if (OPTION (Opt_insecure))
3013 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3427 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3014 break; 3428 break;
3015 case 8: /* unofficial extension */ 3429 case 8: /* unofficial extension */
3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3430 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3017 break; 3431 break;
3018 } 3432 }
… …
3054 break; 3468 break;
3055 3469
3056 case CSI_RM: /* 8.3.107: RESET MODE */ 3470 case CSI_RM: /* 8.3.107: RESET MODE */
3057 if (arg[0] == 4) 3471 if (arg[0] == 4)
3058 scr_insert_mode (0); 3472 scr_insert_mode (0);
3473 else if (arg[0] == 20)
3474 priv_modes &= ~PrivMode_LFNL;
3059 break; 3475 break;
3060 3476
3061 case CSI_SM: /* 8.3.126: SET MODE */ 3477 case CSI_SM: /* 8.3.126: SET MODE */
3062 if (arg[0] == 4) 3478 if (arg[0] == 4)
3063 scr_insert_mode (1); 3479 scr_insert_mode (1);
3480 else if (arg[0] == 20)
3481 priv_modes |= PrivMode_LFNL;
3064 break; 3482 break;
3065 3483
3066 /* 3484 /*
3067 * PRIVATE USE beyond this point. All CSI_7? sequences here 3485 * PRIVATE USE beyond this point. All CSI_7? sequences here
3068 */ 3486 */
… …
3080 break; 3498 break;
3081 case CSI_75: 3499 case CSI_75:
3082 scr_cursor (RESTORE); 3500 scr_cursor (RESTORE);
3083 break; 3501 break;
3084 3502
3085#ifndef NO_FRILLS 3503#if !ENABLE_MINIMAL
3086 case CSI_74: 3504 case CSI_74:
3087 process_window_ops (arg, nargs); 3505 process_window_ops (arg, nargs);
3088 break; 3506 break;
3089#endif 3507#endif
3090 3508
… …
3097 break; 3515 break;
3098 } 3516 }
3099} 3517}
3100/*}}} */ 3518/*}}} */
3101 3519
3102#ifndef NO_FRILLS 3520#if !ENABLE_MINIMAL
3103/* ARGSUSED */ 3521/* ARGSUSED */
3104void 3522void
3105rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3523rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3106{ 3524{
3107 int x, y; 3525 int x, y;
3108 XWindowAttributes wattr; 3526 XWindowAttributes wattr;
3109 Window wdummy; 3527 Window wdummy;
3528
3529 dLocal (Display *, xdisp);
3110 3530
3111 if (nargs == 0) 3531 if (nargs == 0)
3112 return; 3532 return;
3113 3533
3114 switch (args[0]) 3534 switch (args[0])
3115 { 3535 {
3116 /* 3536 /*
3117 * commands 3537 * commands
3118 */ 3538 */
3119 case 1: /* deiconify window */ 3539 case 1: /* deiconify window */
3120 XMapWindow (display->display, TermWin.parent[0]); 3540 XMapWindow (xdisp, parent[0]);
3121 break; 3541 break;
3122 case 2: /* iconify window */ 3542 case 2: /* iconify window */
3123 XIconifyWindow (display->display, TermWin.parent[0], 3543 XIconifyWindow (xdisp, parent[0], display->screen);
3124 DefaultScreen (display->display));
3125 break; 3544 break;
3126 case 3: /* set position (pixels) */ 3545 case 3: /* set position (pixels) */
3127 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3546 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3128 break; 3547 break;
3129 case 4: /* set size (pixels) */ 3548 case 4: /* set size (pixels) */
3130 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3131 break; 3550 break;
3132 case 5: /* raise window */ 3551 case 5: /* raise window */
3133 XRaiseWindow (display->display, TermWin.parent[0]); 3552 XRaiseWindow (xdisp, parent[0]);
3134 break; 3553 break;
3135 case 6: /* lower window */ 3554 case 6: /* lower window */
3136 XLowerWindow (display->display, TermWin.parent[0]); 3555 XLowerWindow (xdisp, parent[0]);
3137 break; 3556 break;
3138 case 7: /* refresh window */ 3557 case 7: /* refresh window */
3139 scr_touch (true); 3558 scr_touch (true);
3140 break; 3559 break;
3141 case 8: /* set size (chars) */ 3560 case 8: /* set size (chars) */
3142 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3561 set_widthheight ((unsigned int) (args[2] * fwidth),
3143 (unsigned int) (args[1] * TermWin.fheight)); 3562 (unsigned int) (args[1] * fheight));
3144 break; 3563 break;
3145 3564
3146 //case 9: NYI, TODO, restore maximized window or maximize window 3565 //case 9: NYI, TODO, restore maximized window or maximize window
3147 default: 3566 default:
3148 if (args[0] >= 24) /* set height (chars) */ 3567 if (args[0] >= 24) /* set height (chars) */
3149 set_widthheight ((unsigned int)TermWin.width, 3568 set_widthheight ((unsigned int)width,
3150 (unsigned int) (args[1] * TermWin.fheight)); 3569 (unsigned int) (args[1] * fheight));
3151 break; 3570 break;
3152
3153 3571
3154 /* 3572 /*
3155 * reports - some output format copied from XTerm 3573 * reports - some output format copied from XTerm
3156 */ 3574 */
3157 case 11: /* report window state */ 3575 case 11: /* report window state */
3158 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3576 XGetWindowAttributes (xdisp, parent[0], &wattr);
3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3577 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3160 break; 3578 break;
3161 case 13: /* report window position */ 3579 case 13: /* report window position */
3162 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3580 XGetWindowAttributes (xdisp, parent[0], &wattr);
3163 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3581 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3164 -wattr.border_width, -wattr.border_width, 3582 -wattr.border_width, -wattr.border_width,
3165 &x, &y, &wdummy); 3583 &x, &y, &wdummy);
3166 tt_printf ("\033[3;%d;%dt", x, y); 3584 tt_printf ("\033[3;%d;%dt", x, y);
3167 break; 3585 break;
3168 case 14: /* report window size (pixels) */ 3586 case 14: /* report window size (pixels) */
3169 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3587 XGetWindowAttributes (xdisp, parent[0], &wattr);
3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3588 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3171 break; 3589 break;
3172 case 18: /* report text area size (chars) */ 3590 case 18: /* report text area size (chars) */
3173 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3591 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3174 break; 3592 break;
3175 case 19: /* report window size (chars) */ 3593 case 19: /* report window size (chars) */
3176 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3594 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3177 break; 3595 break;
3178 case 20: /* report icon label */ 3596 case 20: /* report icon label */
3179 if (Options & Opt_insecure)
3180 { 3597 {
3181 char *s; 3598 char *s;
3182 XGetIconName (display->display, TermWin.parent[0], &s); 3599 XGetIconName (xdisp, parent[0], &s);
3183 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3600 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3601 XFree (s);
3184 } 3602 }
3185 break; 3603 break;
3186 case 21: /* report window title */ 3604 case 21: /* report window title */
3187 if (Options & Opt_insecure)
3188 { 3605 {
3189 char *s; 3606 char *s;
3190 XFetchName (display->display, TermWin.parent[0], &s); 3607 XFetchName (xdisp, parent[0], &s);
3191 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3608 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3609 XFree (s);
3192 } 3610 }
3193 break; 3611 break;
3194 } 3612 }
3195} 3613}
3196#endif 3614#endif
3197 3615
3198/*----------------------------------------------------------------------*/ 3616/*----------------------------------------------------------------------*/
3199/* 3617/*
3200 * get input up until STRING TERMINATOR (or BEL) 3618 * get input up until STRING TERMINATOR (or BEL)
3201 * ends_how is terminator used. returned input must be free()'d 3619 * ends_how is terminator used. returned input must be free()'d
3202 */ 3620 */
3203unsigned char * 3621char *
3204rxvt_term::get_to_st (unicode_t &ends_how) 3622rxvt_term::get_to_st (unicode_t &ends_how)
3205{ 3623{
3206 unicode_t prev = 0, ch; 3624 unicode_t ch;
3625 bool seen_esc = false;
3207 unsigned int n = 0; 3626 unsigned int n = 0;
3208 unsigned char *s;
3209 unsigned char string[STRING_MAX]; 3627 wchar_t string[STRING_MAX];
3210 3628
3211 while ((ch = cmd_getc ()) != NOCHAR) 3629 while ((ch = cmd_getc ()) != NOCHAR)
3212 { 3630 {
3213 if (prev == C0_ESC) 3631 if (seen_esc)
3214 { 3632 {
3215 if (ch == 0x5c) /* 7bit ST */ 3633 if (ch == 0x5c) /* 7bit ST */
3216 break; 3634 break;
3217 else 3635 else
3218 return NULL; 3636 return NULL;
3219 } 3637 }
3638 else if (ch == C0_ESC)
3639 {
3640 seen_esc = true;
3641 continue;
3642 }
3220 else if (ch == C0_BEL || ch == CHAR_ST) 3643 else if (ch == C0_BEL || ch == CHAR_ST)
3221 break; 3644 break;
3222 else if (ch < 0x20) 3645 else if (ch < 0x20)
3223 return NULL; /* other control character - exit */ 3646 return NULL; /* other control character - exit */
3224 3647
3225 if (n >= sizeof (string) - 1) 3648 seen_esc = false;
3649
3650 if (n >= STRING_MAX - 1)
3226 // stop at some sane length 3651 // stop at some sane length
3227 return NULL; 3652 return NULL;
3228 3653
3229 if (ch == C0_SYN) 3654 if (ch == C0_SYN)
3230 {
3231 string[n++] = cmd_get8 (); 3655 string[n++] = cmd_get8 ();
3232 prev = 0;
3233 }
3234 else 3656 else
3235 string[n++] = prev = ch; 3657 string[n++] = ch;
3236 } 3658 }
3237 3659
3238 string[n++] = '\0'; 3660 string[n++] = '\0';
3239 3661
3240 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3241 return NULL;
3242
3243 ends_how = (ch == 0x5c ? C0_ESC : ch); 3662 ends_how = (ch == 0x5c ? C0_ESC : ch);
3244 STRNCPY (s, string, n); 3663
3245 return s; 3664 return rxvt_wcstombs (string);
3246} 3665}
3247 3666
3248/*----------------------------------------------------------------------*/ 3667/*----------------------------------------------------------------------*/
3249/* 3668/*
3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3669 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3251 */ 3670 */
3252void 3671void
3253rxvt_term::process_dcs_seq () 3672rxvt_term::process_dcs_seq ()
3254{ 3673{
3255 unsigned char *s; 3674 char *s;
3256 unicode_t eh; 3675 unicode_t eh;
3257 3676
3258 /* 3677 /*
3259 * Not handled yet 3678 * Not handled yet
3260 */ 3679 */
… …
3279 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3698 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3280 arg = arg * 10 + (ch - '0'); 3699 arg = arg * 10 + (ch - '0');
3281 3700
3282 if (ch == ';') 3701 if (ch == ';')
3283 { 3702 {
3284 unsigned char *s = get_to_st (eh); 3703 char *s = get_to_st (eh);
3285 3704
3286 if (s) 3705 if (s)
3287 { 3706 {
3288 process_xterm_seq (arg, (char *)s, eh); 3707 process_xterm_seq (arg, s, eh);
3289 free (s); 3708 free (s);
3290 } 3709 }
3291 } 3710 }
3292} 3711}
3293 3712
3294void 3713void
3295rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3714rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3296{ 3715{
3297 if (str[0] == '?' && !str[1]) 3716 if (str[0] == '?' && !str[1])
3298 { 3717 {
3299 if (Options & Opt_insecure) 3718 rgba c;
3300 { 3719 pix_colors_focused[color].get (c);
3301 unsigned short r, g, b; 3720
3302 PixColorsFocused[color].get (display, r, g, b); 3721#if XFT
3722 if (c.a != rgba::MAX_CC)
3723 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3724 else
3725#endif
3303 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3726 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3304 }
3305 } 3727 }
3306 else 3728 else
3307 set_window_color (color, str); 3729 set_window_color (color, str);
3308} 3730}
3309 3731
3310/* 3732/*
3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3733 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3312 * 0 = change iconName/title
3313 * 1 = change iconName
3314 * 2 = change title
3315 * 4 = change color
3316 * 10 = change fg color
3317 * 11 = change bg color
3318 * 12 = change text color
3319 * 13 = change mouse foreground color
3320 * 17 = change highlight character colour
3321 * 18 = change bold character color
3322 * 19 = change underlined character color
3323 * 46 = change logfile (not implemented)
3324 * 50 = change font
3325 *
3326 * rxvt extensions:
3327 * 20 = bg pixmap
3328 * 39 = change default fg color
3329 * 49 = change default bg color
3330 * 55 = dump scrollback buffer and all of screen
3331 * 701 = change locale
3332 * 702 = find font
3333 * 703 = menu
3334 */ 3734 */
3335void 3735void
3336rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3736rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3337{ 3737{
3338 int changed = 0;
3339 int color; 3738 int color;
3340 char *buf, *name; 3739 char *buf, *name;
3341 bool query = str[0] == '?' && !str[1]; 3740 bool query = str[0] == '?' && !str[1];
3741 int saveop = op;
3742
3743 dLocal (Display *, xdisp);
3342 3744
3343 assert (str != NULL); 3745 assert (str != NULL);
3344 switch (op) 3746 switch (op)
3345 { 3747 {
3346 case XTerm_name: 3748 case XTerm_name:
… …
3353 set_title (str); 3755 set_title (str);
3354 break; 3756 break;
3355 case XTerm_property: 3757 case XTerm_property:
3356 if (str[0] == '?') 3758 if (str[0] == '?')
3357 { 3759 {
3358 Atom prop = XInternAtom (display->display, str + 1, True); 3760 Atom prop = display->atom (str + 1);
3359 Atom actual_type; 3761 Atom actual_type;
3360 int actual_format; 3762 int actual_format;
3361 unsigned long nitems; 3763 unsigned long nitems;
3362 unsigned long bytes_after; 3764 unsigned long bytes_after;
3363 unsigned char *value = 0; 3765 unsigned char *value = 0;
3364 const char *str = ""; 3766 const char *str = "";
3365 3767
3366 if (prop 3768 if (prop
3367 && XGetWindowProperty (display->display, TermWin.parent[0], 3769 && XGetWindowProperty (xdisp, parent[0],
3368 prop, 0, 1<<16, 0, AnyPropertyType, 3770 prop, 0, 1<<16, 0, AnyPropertyType,
3369 &actual_type, &actual_format, 3771 &actual_type, &actual_format,
3370 &nitems, &bytes_after, &value) == Success 3772 &nitems, &bytes_after, &value) == Success
3371 && actual_type != None 3773 && actual_type != None
3372 && actual_format == 8) 3774 && actual_format == 8)
3373 str = (const char *)(value); 3775 str = (const char *)(value);
3374 3776
3375 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3777 tt_printf ("\033]%d;%s%c", op, str, resp);
3376 3778
3377 XFree (value); 3779 XFree (value);
3378 } 3780 }
3379 else 3781 else
3380 { 3782 {
3381 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3783 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3382 3784
3383 if (eq) 3785 if (eq)
3384 { 3786 {
3385 *eq = 0; 3787 *eq = 0;
3386 XChangeProperty (display->display, TermWin.parent[0], 3788 set_utf8_property (display->atom (str), eq + 1);
3387 display->atom (str), XA_STRING, 8,
3388 PropModeReplace, (unsigned char *)eq + 1,
3389 strlen (eq + 1));
3390 } 3789 }
3391 else 3790 else
3392 XDeleteProperty (display->display, TermWin.parent[0], 3791 XDeleteProperty (xdisp, parent[0],
3393 display->atom (str)); 3792 display->atom (str));
3394 } 3793 }
3395 break; 3794 break;
3396 3795
3397 case XTerm_Color: 3796 case XTerm_Color:
3398 for (buf = (char *)str; buf && *buf;) 3797 for (buf = (char *)str; buf && *buf;)
3399 { 3798 {
3400 if ((name = STRCHR (buf, ';')) == NULL) 3799 if ((name = strchr (buf, ';')) == NULL)
3401 break; 3800 break;
3402 3801
3403 *name++ = '\0'; 3802 *name++ = '\0';
3404 color = atoi (buf); 3803 color = atoi (buf) + minCOLOR;
3405 3804
3406 if (color < 0 || color >= TOTAL_COLORS) 3805 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3407 break; 3806 break;
3408 3807
3409 if ((buf = STRCHR (name, ';')) != NULL) 3808 if ((buf = strchr (name, ';')) != NULL)
3410 *buf++ = '\0'; 3809 *buf++ = '\0';
3411 3810
3412 if (name[0] == '?' && !name[1]) 3811 process_color_seq (op, color, name, resp);
3413 {
3414 if (Options & Opt_insecure)
3415 {
3416 unsigned short r, g, b;
3417 PixColorsFocused[color + minCOLOR].get (display, r, g, b);
3418 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3419 }
3420 }
3421 else
3422 set_window_color (color + minCOLOR, name);
3423 } 3812 }
3424 break; 3813 break;
3425 case XTerm_Color00: 3814 case XTerm_Color00:
3426 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3815 process_color_seq (op, Color_fg, str, resp);
3427 break; 3816 break;
3428 case XTerm_Color01: 3817 case XTerm_Color01:
3429 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3818 process_color_seq (op, Color_bg, str, resp);
3430 break; 3819 break;
3431#ifndef NO_CURSORCOLOR 3820#ifndef NO_CURSORCOLOR
3432 case XTerm_Color_cursor: 3821 case XTerm_Color_cursor:
3433 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3822 process_color_seq (op, Color_cursor, str, resp);
3434 break; 3823 break;
3435#endif 3824#endif
3436 case XTerm_Color_pointer_fg: 3825 case XTerm_Color_pointer_fg:
3437 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3826 process_color_seq (op, Color_pointer_fg, str, resp);
3438 break; 3827 break;
3439 case XTerm_Color_pointer_bg: 3828 case XTerm_Color_pointer_bg:
3440 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3829 process_color_seq (op, Color_pointer_bg, str, resp);
3441 break; 3830 break;
3442#ifndef NO_BOLD_UNDERLINE_REVERSE 3831#ifndef NO_BOLD_UNDERLINE_REVERSE
3443 case XTerm_Color_BD:
3444 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3445 break;
3446 case XTerm_Color_UL:
3447 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3448 break;
3449 case XTerm_Color_RV: 3832 case XTerm_Color_RV:
3450 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3833 process_color_seq (op, Color_RV, str, resp);
3451 break; 3834 break;
3835 case Rxvt_Color_BD:
3836 case URxvt_Color_BD:
3837 process_color_seq (op, Color_BD, str, resp);
3838 break;
3839 case Rxvt_Color_UL:
3840 case URxvt_Color_UL:
3841 process_color_seq (op, Color_UL, str, resp);
3842 break;
3843 case URxvt_Color_IT:
3844 process_color_seq (op, Color_IT, str, resp);
3845 break;
3452#endif 3846#endif
3847#if TRANSPARENT && TINTING
3848 case URxvt_Color_tint:
3849 process_color_seq (op, Color_tint, str, resp);
3453 3850
3851 check_our_parents ();
3852
3853 if (am_transparent)
3854 want_full_refresh = want_refresh = 1;
3855
3856 break;
3857#endif
3858
3454 case XTerm_Pixmap: 3859 case Rxvt_Pixmap:
3860 {
3455 if (*str != ';') 3861 if (*str != ';')
3456 { 3862 {
3457#if XPM_BACKGROUND 3863#if XPM_BACKGROUND
3458 scale_pixmap (""); /* reset to default scaling */ 3864 scale_pixmap (""); /* reset to default scaling */
3459 set_bgPixmap (str); /* change pixmap */ 3865 set_bgPixmap (str); /* change pixmap */
3460#endif
3461 scr_touch (true); 3866 scr_touch (true);
3867#endif
3462 } 3868 }
3869
3870 int changed = 0;
3871
3463 while ((str = STRCHR (str, ';')) != NULL) 3872 while ((str = strchr (str, ';')) != NULL)
3464 { 3873 {
3465 str++; 3874 str++;
3466#if XPM_BACKGROUND 3875#if XPM_BACKGROUND
3467 changed += scale_pixmap (str); 3876 changed += scale_pixmap (str);
3468#endif 3877#endif
3469
3470 } 3878 }
3879
3471 if (changed) 3880 if (changed)
3472 { 3881 {
3473#ifdef XPM_BACKGROUND 3882#ifdef XPM_BACKGROUND
3474 resize_pixmap (); 3883 resize_pixmap ();
3475#endif
3476 scr_touch (true); 3884 scr_touch (true);
3885#endif
3477 } 3886 }
3887 }
3478 break; 3888 break;
3479 3889
3480 case XTerm_restoreFG: 3890 case Rxvt_restoreFG:
3481 set_window_color (Color_fg, str); 3891 set_window_color (Color_fg, str);
3482 break; 3892 break;
3483 case XTerm_restoreBG: 3893 case Rxvt_restoreBG:
3484 set_window_color (Color_bg, str); 3894 set_window_color (Color_bg, str);
3485 break; 3895 break;
3486 3896
3487 case XTerm_logfile: 3897 case XTerm_logfile:
3488 // TODO, when secure mode? 3898 // TODO, when secure mode?
3489 break; 3899 break;
3490 3900
3491 case XTerm_font:
3492 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3496 TermWin.fontset->fontdesc
3497 ? TermWin.fontset->fontdesc
3498 : "",
3499 resp);
3500 }
3501 else
3502 change_font (str);
3503 break;
3504
3505#ifndef NO_FRILLS
3506 case XTerm_locale:
3507 if (query)
3508 {
3509 if (Options & Opt_insecure)
3510 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3511 }
3512 else
3513 {
3514 set_locale (str);
3515# ifdef USE_XIM
3516 im_cb ();
3517# endif
3518 }
3519 break;
3520
3521 case XTerm_findfont:
3522 if (Options & Opt_insecure)
3523 {
3524 int fid = TermWin.fontset->find_font (atoi (str));
3525 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3526 fid, (*TermWin.fontset)[fid]->name, resp);
3527 }
3528 break;
3529#endif
3530
3531#ifdef MENUBAR
3532 case XTerm_Menu:
3533 if (Options & Opt_insecure)
3534 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3535 break;
3536#endif
3537#if 0 3901#if 0
3538 case XTerm_dumpscreen: /* no error notices */ 3902 case Rxvt_dumpscreen: /* no error notices */
3539 { 3903 {
3540 int fd; 3904 int fd;
3541 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3905 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3542 { 3906 {
3543 scr_dump (fd); 3907 scr_dump (fd);
3544 close (fd); 3908 close (fd);
3545 } 3909 }
3546 } 3910 }
3911 break;
3912#endif
3913 case XTerm_font:
3914 op = URxvt_font;
3915 case URxvt_font:
3916#if ENABLE_STYLES
3917 case URxvt_boldFont:
3918 case URxvt_italicFont:
3919 case URxvt_boldItalicFont:
3920#endif
3921 if (query)
3922 tt_printf ("\33]%d;%-.250s%c", saveop,
3923 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3924 ? fontset[op - URxvt_font]->fontdesc : "",
3925 resp);
3926 else
3927 {
3928 const char *&res = rs[Rs_font + (op - URxvt_font)];
3929
3930 res = strdup (str);
3931 allocated.push_back ((void *)res);
3932 set_fonts ();
3933 }
3934 break;
3935
3936 case URxvt_version:
3937 if (query)
3938 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3939 op,
3940 rs[Rs_name], VERSION[0], VERSION[2],
3941 resp);
3942 break;
3943
3944#if !ENABLE_MINIMAL
3945 case URxvt_locale:
3946 if (query)
3947 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3948 else
3949 {
3950 set_locale (str);
3951 pty->set_utf8_mode (enc_utf8);
3952 init_xlocale ();
3953 }
3954 break;
3955
3956 case URxvt_view_up:
3957 case URxvt_view_down:
3958 {
3959 int lines = atoi (str);
3960
3961 if (lines)
3962 scr_page (op == URxvt_view_up ? UP : DN, lines);
3963 else
3964 scr_erase_savelines ();
3965 }
3966
3967 break;
3968#endif
3969
3970#if ENABLE_PERL
3971 case URxvt_perl:
3972 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3973 ; // no responses yet
3547 break; 3974 break;
3548#endif 3975#endif
3549 } 3976 }
3550} 3977}
3551/*----------------------------------------------------------------------*/ 3978/*----------------------------------------------------------------------*/
… …
3565{ 3992{
3566 int state; 3993 int state;
3567 3994
3568 if (mode == 's') 3995 if (mode == 's')
3569 { 3996 {
3570 SavedModes |= (PrivateModes & bit); 3997 SavedModes |= (priv_modes & bit);
3571 return -1; 3998 return -1;
3572 } 3999 }
3573 else 4000 else
3574 { 4001 {
3575 if (mode == 'r') 4002 if (mode == 'r')
3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 4003 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3577 else 4004 else
3578 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 4005 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3579 PrivMode (state, bit); 4006 PrivMode (state, bit);
3580 } 4007 }
3581 4008
3582 return state; 4009 return state;
3583} 4010}
3584 4011
3585/* we're not using priv _yet_ */ 4012/* we're not using priv _yet_ */
3586void 4013void
3587rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4014rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3588{ 4015{
3589 unsigned int i, j; 4016 unsigned int i, j;
3590 int state; 4017 int state;
3591 4018
3592 static const struct 4019 static const struct
… …
3601 { 3, PrivMode_132 }, 4028 { 3, PrivMode_132 },
3602 { 4, PrivMode_smoothScroll }, 4029 { 4, PrivMode_smoothScroll },
3603 { 5, PrivMode_rVideo }, 4030 { 5, PrivMode_rVideo },
3604 { 6, PrivMode_relOrigin }, 4031 { 6, PrivMode_relOrigin },
3605 { 7, PrivMode_Autowrap }, 4032 { 7, PrivMode_Autowrap },
4033 // 8, bi-directional support mode
3606 { 9, PrivMode_MouseX10 }, 4034 { 9, PrivMode_MouseX10 },
3607#ifdef menuBar_esc 4035 // 18, 19 printing-related
3608 { menuBar_esc, PrivMode_menuBar }, 4036 { 25, PrivMode_VisibleCursor },
3609#endif
3610#ifdef scrollBar_esc 4037#ifdef scrollBar_esc
3611 { scrollBar_esc, PrivMode_scrollBar }, 4038 { scrollBar_esc, PrivMode_scrollBar },
3612#endif 4039#endif
3613 // 18, 19 printing-related
3614 { 25, PrivMode_VisibleCursor },
3615 // 30 show scrollbar rxvt. extension
3616 { 35, PrivMode_ShiftKeys }, // rxvt extension 4040 { 35, PrivMode_ShiftKeys }, // rxvt extension
3617 { 40, PrivMode_132OK }, 4041 { 40, PrivMode_132OK },
3618 // 41 xterm more fixes NYI 4042 // 41 xterm more fixes NYI
3619 // 45 margin bell NYI 4043 // 45 margin bell NYI
3620 // 46 start logging 4044 // 46 start logging
… …
3660 } 4084 }
3661 4085
3662 /* extra handling for values with state unkept */ 4086 /* extra handling for values with state unkept */
3663 switch (arg[i]) 4087 switch (arg[i])
3664 { 4088 {
4089#if ENABLE_STYLES
4090 case 1021:
4091 set_option (Opt_intensityStyles, mode);
4092
4093 scr_touch (true);
4094 break;
4095#endif
3665 case 1048: /* alternative cursor save */ 4096 case 1048: /* alternative cursor save */
4097 case 1049:
3666 if (Options & Opt_secondaryScreen) 4098 if (OPTION (Opt_secondaryScreen))
3667 if (mode == 0) 4099 if (mode == 0)
3668 scr_cursor (RESTORE); 4100 scr_cursor (RESTORE);
3669 else if (mode == 1) 4101 else if (mode == 1)
3670 scr_cursor (SAVE); 4102 scr_cursor (SAVE);
3671 break; 4103 break;
… …
3682 * within VT52 mode 4114 * within VT52 mode
3683 */ 4115 */
3684 PrivMode (1, PrivMode_vt52); 4116 PrivMode (1, PrivMode_vt52);
3685 break; 4117 break;
3686 case 3: /* 80/132 */ 4118 case 3: /* 80/132 */
3687 if (PrivateModes & PrivMode_132OK) 4119 if (priv_modes & PrivMode_132OK)
3688 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4120 set_widthheight (((state ? 132 : 80) * fwidth), height);
3689 break; 4121 break;
3690 case 4: /* smooth scrolling */ 4122 case 4: /* smooth scrolling */
3691 if (state) 4123 set_option (Opt_jumpScroll, !state);
3692 Options &= ~Opt_jumpScroll;
3693 else
3694 Options |= Opt_jumpScroll;
3695 break; 4124 break;
3696 case 5: /* reverse video */ 4125 case 5: /* reverse video */
3697 scr_rvideo_mode (state); 4126 scr_rvideo_mode (state);
3698 break; 4127 break;
3699 case 6: /* relative/absolute origins */ 4128 case 6: /* relative/absolute origins */
… …
3703 scr_autowrap (state); 4132 scr_autowrap (state);
3704 break; 4133 break;
3705 /* case 8: - auto repeat, can't do on a per window basis */ 4134 /* case 8: - auto repeat, can't do on a per window basis */
3706 case 9: /* X10 mouse reporting */ 4135 case 9: /* X10 mouse reporting */
3707 if (state) /* orthogonal */ 4136 if (state) /* orthogonal */
3708 PrivateModes &= ~PrivMode_MouseX11; 4137 priv_modes &= ~PrivMode_MouseX11;
3709 break; 4138 break;
3710#ifdef menuBar_esc
3711 case menuBar_esc:
3712#ifdef MENUBAR
3713 map_menuBar (state);
3714#endif
3715 break;
3716#endif
3717#ifdef scrollBar_esc 4139#ifdef scrollBar_esc
3718 case scrollBar_esc: 4140 case scrollBar_esc:
3719 if (scrollbar_mapping (state)) 4141 if (scrollbar_mapping (state))
3720 { 4142 {
3721 resize_all_windows (0, 0, 0); 4143 resize_all_windows (0, 0, 0);
… …
3733 break; 4155 break;
3734 /* case 66: - application key pad */ 4156 /* case 66: - application key pad */
3735 /* case 67: - backspace key */ 4157 /* case 67: - backspace key */
3736 case 1000: /* X11 mouse reporting */ 4158 case 1000: /* X11 mouse reporting */
3737 if (state) /* orthogonal */ 4159 if (state) /* orthogonal */
3738 PrivateModes &= ~PrivMode_MouseX10; 4160 priv_modes &= ~PrivMode_MouseX10;
3739 break; 4161 break;
3740#if 0 4162#if 0
3741 case 1001: 4163 case 1001:
3742 break; /* X11 mouse highlighting */ 4164 break; /* X11 mouse highlighting */
3743#endif 4165#endif
3744 case 1010: /* scroll to bottom on TTY output inhibit */ 4166 case 1010: /* scroll to bottom on TTY output inhibit */
3745 if (state)
3746 Options &= ~Opt_scrollTtyOutput;
3747 else
3748 Options |= Opt_scrollTtyOutput; 4167 set_option (Opt_scrollTtyOutput, !state);
3749 break; 4168 break;
3750 case 1011: /* scroll to bottom on key press */ 4169 case 1011: /* scroll to bottom on key press */
3751 if (state)
3752 Options |= Opt_scrollTtyKeypress; 4170 set_option (Opt_scrollTtyKeypress, state);
3753 else
3754 Options &= ~Opt_scrollTtyKeypress;
3755 break; 4171 break;
3756 case 1047: /* secondary screen w/ clearing last */ 4172 case 1047: /* secondary screen w/ clearing last */
3757 if (Options & Opt_secondaryScreen) 4173 if (OPTION (Opt_secondaryScreen))
3758 if (current_screen != PRIMARY) 4174 if (current_screen != PRIMARY)
3759 scr_erase_screen (2); 4175 scr_erase_screen (2);
3760 scr_change_screen (state); 4176 scr_change_screen (state);
3761 break; 4177 break;
3762 case 1049: /* secondary screen w/ clearing first */ 4178 case 1049: /* secondary screen w/ clearing first */
3763 scr_change_screen (state); 4179 scr_change_screen (state);
3764 if (Options & Opt_secondaryScreen) 4180 if (OPTION (Opt_secondaryScreen))
3765 if (current_screen != PRIMARY) 4181 if (current_screen != PRIMARY)
3766 scr_erase_screen (2); 4182 scr_erase_screen (2);
3767 break; 4183 break;
3768 default: 4184 default:
3769 break; 4185 break;
… …
3795 rendset = 0, rendstyle = ~RS_None; 4211 rendset = 0, rendstyle = ~RS_None;
3796 break; 4212 break;
3797 case 1: 4213 case 1:
3798 rendset = 1, rendstyle = RS_Bold; 4214 rendset = 1, rendstyle = RS_Bold;
3799 break; 4215 break;
3800 //case 2: // faint or second colour 4216 //case 2: // low intensity
4217 case 3:
4218 rendset = 1, rendstyle = RS_Italic;
4219 break;
3801 case 4: 4220 case 4:
3802 rendset = 1, rendstyle = RS_Uline; 4221 rendset = 1, rendstyle = RS_Uline;
3803 break; 4222 break;
3804 case 5: // slowly blinking 4223 case 5: // slowly blinking
3805 case 6: // rapidly blinking 4224 case 6: // rapidly blinking
… …
3817 //case 11: // scoansi acs on, first alt font 4236 //case 11: // scoansi acs on, first alt font
3818 //case 12: // scoansi acs on, |0x80, second alt font 4237 //case 12: // scoansi acs on, |0x80, second alt font
3819 //... 4238 //...
3820 //case 19: // ninth alt font 4239 //case 19: // ninth alt font
3821 //case 20: // gothic 4240 //case 20: // gothic
3822 case 21: // disable bold, faint 4241 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3823 rendset = 0, rendstyle = RS_Bold; 4242 rendset = 0, rendstyle = RS_Bold;
3824 break; 4243 break;
3825 case 22: 4244 case 22: // normal intensity
3826 rendset = 0, rendstyle = RS_Bold; 4245 rendset = 0, rendstyle = RS_Bold;
3827 break; 4246 break;
3828 //case 23: disable italic 4247 case 23: // disable italic
4248 rendset = 0, rendstyle = RS_Italic;
4249 break;
3829 case 24: 4250 case 24:
3830 rendset = 0, rendstyle = RS_Uline; 4251 rendset = 0, rendstyle = RS_Uline;
3831 break; 4252 break;
3832 case 25: 4253 case 25:
4254 rendset = 0, rendstyle = RS_Blink;
4255 break;
4256 case 26: // variable spacing (iso 8613)
3833 rendset = 0, rendstyle = RS_Blink; 4257 rendset = 0, rendstyle = RS_Blink;
3834 break; 4258 break;
3835 case 27: 4259 case 27:
3836 rendset = 0, rendstyle = RS_RVid; 4260 rendset = 0, rendstyle = RS_RVid;
3837 break; 4261 break;
… …
3855 case 35: 4279 case 35:
3856 case 36: 4280 case 36:
3857 case 37: 4281 case 37:
3858 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4282 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3859 break; 4283 break;
3860#ifdef TTY_256COLOR 4284 case 38: // set fg color, ISO 8613-6
3861 case 38:
3862 if (nargs > i + 2 && arg[i + 1] == 5) 4285 if (nargs > i + 2 && arg[i + 1] == 5)
3863 { 4286 {
3864 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4287 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3865 i += 2; 4288 i += 2;
3866 } 4289 }
3867 break; 4290 break;
3868#endif
3869 case 39: /* default fg */ 4291 case 39: /* default fg */
3870 scr_color (Color_fg, Color_fg); 4292 scr_color (Color_fg, Color_fg);
3871 break; 4293 break;
3872 4294
3873 case 40: 4295 case 40:
… …
3878 case 45: 4300 case 45:
3879 case 46: 4301 case 46:
3880 case 47: 4302 case 47:
3881 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4303 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3882 break; 4304 break;
3883#ifdef TTY_256COLOR 4305 case 48: // set bg color, ISO 8613-6
3884 case 48:
3885 if (nargs > i + 2 && arg[i + 1] == 5) 4306 if (nargs > i + 2 && arg[i + 1] == 5)
3886 { 4307 {
3887 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4308 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3888 i += 2; 4309 i += 2;
3889 } 4310 }
3890 break; 4311 break;
3891#endif
3892 case 49: /* default bg */ 4312 case 49: /* default bg */
3893 scr_color (Color_bg, Color_bg); 4313 scr_color (Color_bg, Color_bg);
3894 break; 4314 break;
3895 4315
3896#ifndef NO_BRIGHTCOLOR 4316 //case 50: // not variable spacing
4317
4318#if !ENABLE_MINIMAL
3897 case 90: 4319 case 90:
3898 case 91: /* set bright fg color */ 4320 case 91: /* set bright fg color */
3899 case 92: 4321 case 92:
3900 case 93: 4322 case 93:
3901 case 94: 4323 case 94:
3902 case 95: 4324 case 95:
3903 case 96: 4325 case 96:
3904 case 97: 4326 case 97:
3905 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4327 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3906 Color_fg);
3907 break; 4328 break;
3908 case 100: 4329 case 100:
3909 case 101: /* set bright bg color */ 4330 case 101: /* set bright bg color */
3910 case 102: 4331 case 102:
3911 case 103: 4332 case 103:
3912 case 104: 4333 case 104:
3913 case 105: 4334 case 105:
3914 case 106: 4335 case 106:
3915 case 107: 4336 case 107:
3916 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4337 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3917 Color_bg);
3918 break; 4338 break;
3919#endif 4339#endif
3920
3921 } 4340 }
3922 } 4341 }
3923} 4342}
3924/*}}} */ 4343/*}}} */
3925 4344
… …
3929{ 4348{
3930 unicode_t ch, cmd = cmd_getc (); 4349 unicode_t ch, cmd = cmd_getc ();
3931 4350
3932 if (cmd == 'Q') 4351 if (cmd == 'Q')
3933 { /* query graphics */ 4352 { /* query graphics */
3934 tt_printf ("\033G0\n"); /* no graphics */ 4353 tt_printf ("\033G0\012"); /* no graphics */
3935 return; 4354 return;
3936 } 4355 }
3937 /* swallow other graphics sequences until terminating ':' */ 4356 /* swallow other graphics sequences until terminating ':' */
3938 do 4357 do
3939 ch = cmd_getc (); 4358 ch = cmd_getc ();
… …
3949 */ 4368 */
3950void 4369void
3951rxvt_term::tt_printf (const char *fmt,...) 4370rxvt_term::tt_printf (const char *fmt,...)
3952{ 4371{
3953 va_list arg_ptr; 4372 va_list arg_ptr;
3954 unsigned char buf[256]; 4373 char buf[256];
3955 4374
3956 va_start (arg_ptr, fmt); 4375 va_start (arg_ptr, fmt);
3957 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4376 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3958 va_end (arg_ptr); 4377 va_end (arg_ptr);
3959 tt_write (buf, STRLEN (buf)); 4378 tt_write (buf, strlen (buf));
3960} 4379}
3961 4380
3962/* ---------------------------------------------------------------------- */ 4381/* ---------------------------------------------------------------------- */
3963/* Write data to the pty as typed by the user, pasted with the mouse, 4382/* Write data to the pty as typed by the user, pasted with the mouse,
3964 * or generated by us in response to a query ESC sequence. 4383 * or generated by us in response to a query ESC sequence.
3965 */ 4384 */
4385const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4386
3966void 4387void
3967rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4388rxvt_term::tt_write (const char *data, unsigned int len)
3968{ 4389{
3969 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4390 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4391 return;
3970 4392
3971 if (len) 4393 if (pty->pty < 0)
4394 return;
4395
4396 if (v_buflen == 0)
4397 {
4398 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4399
4400 if ((unsigned int)written == len)
4401 return;
4402
4403 data += written;
4404 len -= written;
3972 { 4405 }
4406
4407 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4408
4409 memcpy (v_buffer + v_buflen, data, len);
4410 v_buflen += len;
4411
4412 pty_ev.set (EVENT_READ | EVENT_WRITE);
4413}
4414
4415void rxvt_term::pty_write ()
4416{
4417 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4418
4419 if (written > 0)
4420 {
4421 v_buflen -= written;
4422
3973 if (v_buflen == 0) 4423 if (v_buflen == 0)
3974 { 4424 {
3975 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3976
3977 if ((unsigned int)written == len)
3978 return;
3979
3980 data += written;
3981 len -= written;
3982 }
3983
3984
3985 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3986
3987 memcpy (v_buffer + v_buflen, data, len);
3988 v_buflen += len;
3989 }
3990
3991 for (;;)
3992 {
3993 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3994
3995 if (written > 0)
3996 {
3997 v_buflen -= written;
3998
3999 if (v_buflen == 0)
4000 {
4001 free (v_buffer); 4425 free (v_buffer);
4002 v_buffer = 0; 4426 v_buffer = 0;
4003 v_buflen = 0; 4427 v_buflen = 0;
4004 4428
4005 pty_ev.set (EVENT_READ); 4429 pty_ev.set (EVENT_READ);
4006 return;
4007 }
4008
4009 memmove (v_buffer, v_buffer + written, v_buflen);
4010 }
4011 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4012 // original code just ignores this...
4013 destroy ();
4014 else
4015 {
4016 pty_ev.set (EVENT_READ | EVENT_WRITE);
4017 return; 4430 return;
4018 } 4431 }
4432
4433 memmove (v_buffer, v_buffer + written, v_buflen);
4019 } 4434 }
4435 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4436 pty_ev.set (EVENT_READ);
4020} 4437}
4021 4438
4022/*----------------------- end-of-file (C source) -----------------------*/ 4439/*----------------------- end-of-file (C source) -----------------------*/
4023 4440

Diff Legend

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