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.286 by root, Wed Jan 25 21:09:21 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
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
53#include <wchar.h> 56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE
60# include "keyboard.h"
61#endif
62
63#include <csignal>
54 64
55/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
56 66
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 68
59// exception thrown when the command parser runs out of input data 69#if ENABLE_FRILLS || ISO_14755
60class out_of_input { } out_of_input; 70
71#define ISO_14755_STARTED 0x80000000UL
72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
73#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
74#define ISO_14755_54 0x10000000UL // code feedback (section 5.4)
75#define ISO_14755_MASK 0x0fffffffUL
76
77#if ISO_14755
78static unsigned short iso14755_symtab[] = {
79 // keysym, unicode
80 XK_Left, 0x2190,
81 XK_KP_Left, 0x2190,
82 XK_Up, 0x2191,
83 XK_KP_Up, 0x2191,
84 XK_Right, 0x2192,
85 XK_KP_Right, 0x2192,
86 XK_Down, 0x2193,
87 XK_KP_Down, 0x2193,
88 XK_Linefeed, 0x21b4,
89 XK_Return, 0x21b5,
90 XK_KP_Enter, 0x21b5,
91
92 XK_Prior, 0x21de,
93 XK_Next, 0x21df,
94 XK_Tab, 0x21e5,
95 XK_ISO_Left_Tab, 0x21e6,
96 XK_Shift_L, 0x21e7,
97 XK_Shift_R, 0x21e7,
98
99 XK_Shift_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0,
107 XK_Home, 0x21f1,
108 XK_End, 0x21f2,
109
110 XK_Execute, 0x2318,
111 XK_Begin, 0x2320,
112 XK_Delete, 0x2326,
113 XK_Clear, 0x2327,
114 XK_BackSpace, 0x232b,
115 XK_Insert, 0x2380,
116 XK_Control_L, 0x2388,
117 XK_Control_R, 0x2388,
118 XK_Pause, 0x2389,
119 XK_Break, 0x238a,
120 XK_Escape, 0x238b,
121 XK_Undo, 0x238c,
122 XK_Print, 0x2399,
123
124 XK_space, 0x2423,
125
126#ifdef XK_KP_Begin
127 XK_KP_Prior, 0x21de,
128 XK_KP_Next, 0x21df,
129 XK_KP_Begin, 0x2320,
130 XK_KP_Insert, 0x2380,
131 XK_KP_Delete, 0x2326,
132 XK_KP_Space, 0x2422,
133#endif
134 0,
135};
136
137void
138rxvt_term::iso14755_54 (int x, int y)
139{
140 x = Pixel2Col (x);
141 y = Pixel2Row (y);
142
143 if (!IN_RANGE_EXC (x, 0, ncol)
144 || !IN_RANGE_EXC (y, 0, nrow))
145 return;
146
147 for (;;)
148 {
149 const line_t &l = ROW(y + view_start);
150
151 text_t t = l.t[x];
152
153 if (t != NOCHAR || !x)
154 {
155 iso14755_51 (l.t[x], l.r[x], x, y);
156 iso14755buf = ISO_14755_54;
157 break;
158 }
159
160 x--;
161 }
162}
163
164void
165rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
166{
167 rxvt_fontset *fs = FONTSET (r);
168 rxvt_font *f = (*fs)[fs->find_font (ch)];
169 wchar_t *chr, *alloc, ch2, *fname;
170 int len;
171
172 fname = rxvt_utf8towcs (f->name);
173
174# if ENABLE_COMBINING
175 if (IS_COMPOSE (ch))
176 {
177 len = rxvt_composite.expand (ch, 0);
178 alloc = chr = new wchar_t[len];
179 rxvt_composite.expand (ch, chr);
180 }
181 else
182# endif
183 {
184 ch2 = ch;
185
186 alloc = 0;
187 chr = &ch2;
188 len = 1;
189 }
190
191 char attr[80]; // plenty
192
193 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
194 (int)r,
195 fgcolor_of (r), bgcolor_of (r),
196 r & RS_Bold ? " bold" : "",
197 r & RS_Italic ? " italic" : "",
198 r & RS_Blink ? " blink" : "",
199 r & RS_RVid ? " rvid" : "",
200 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : "");
202
203 int width = wcswidth (fname, wcslen (fname));
204
205 max_it (width, 8+5); // for char + hey
206 max_it (width, strlen (attr));
207
208 if (y >= 0)
209 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
211 x = 0;
212 }
213
214 scr_overlay_new (x, y, width, len + 2);
215
216 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
217
218 for (int y = 0; y < len; y++)
219 {
220 char buf[9];
221
222 ch = *chr++;
223
224 sprintf (buf, "%8x", ch);
225 scr_overlay_set (0, y, buf);
226 scr_overlay_set (9, y, '=');
227# if !UNICODE3
228 if (ch >= 0x10000)
229 ch = 0xfffd;
230# endif
231 scr_overlay_set (11, y, ch, r);
232 scr_overlay_set (12, y, NOCHAR, r);
233 }
234
235 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname);
237
238 free (fname);
239
240# if ENABLE_COMBINING
241 if (alloc)
242 delete [] alloc;
243# endif
244}
245#endif
246
247void
248rxvt_term::commit_iso14755 ()
249{
250 wchar_t ch[2];
251
252 ch[0] = iso14755buf & ISO_14755_MASK;
253 ch[1] = 0;
254
255 if (iso14755buf & ISO_14755_51)
256 {
257 char mb[16];
258 int len;
259
260 // allow verbatim 0-bytes and control-bytes to be entered
261 if (ch[0] >= 0x20)
262 len = wcstombs (mb, ch, 16);
263 else
264 {
265 mb[0] = ch[0];
266 len = 1;
267 }
268
269 if (len > 0)
270 tt_write (mb, len);
271 else
272 scr_bell ();
273 }
274
275 iso14755buf = 0;
276}
277
278int
279rxvt_term::hex_keyval (XKeyEvent &ev)
280{
281 // check wether this event corresponds to a hex digit
282 // if the modifiers had not been pressed.
283 for (int index = 0; index < 8; index++)
284 {
285 KeySym k = XLookupKeysym (&ev, index);
286
287 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
288 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
289 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
290 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
291 }
292
293 return -1;
294}
295#endif
61 296
62/*{{{ Convert the keypress event into a string */ 297/*{{{ Convert the keypress event into a string */
63void 298void
64rxvt_term::lookup_key (XKeyEvent &ev) 299rxvt_term::lookup_key (XKeyEvent &ev)
65{ 300{
66 int ctrl, meta, shft, len; 301 int ctrl, meta, shft, len;
67 unsigned int newlen; 302 unsigned int newlen;
68 KeySym keysym; 303 KeySym keysym;
69#ifdef DEBUG_CMD
70 static int debug_key = 1; /* accessible by a debugger only */
71#endif
72 int valid_keysym; 304 int valid_keysym;
73 unsigned char kbuf[KBUFSZ]; 305 char kbuf[KBUFSZ];
74 306
75 /* 307 /*
76 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 308 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
77 * escape sequence to toggle the Keypad. 309 * escape sequence to toggle the Keypad.
78 * 310 *
79 * Always permit `shift' to override the current setting 311 * Always permit `shift' to override the current setting
80 */ 312 */
81 shft = (ev.state & ShiftMask); 313 shft = ev.state & ShiftMask;
82 ctrl = (ev.state & ControlMask); 314 ctrl = ev.state & ControlMask;
83 meta = (ev.state & ModMetaMask); 315 meta = ev.state & ModMetaMask;
84 316
85 if (numlock_state || (ev.state & ModNumLockMask)) 317 if (numlock_state || (ev.state & ModNumLockMask))
86 { 318 {
87 numlock_state = (ev.state & ModNumLockMask); 319 numlock_state = (ev.state & ModNumLockMask);
88 PrivMode ((!numlock_state), PrivMode_aplKP); 320 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
96 Status status_return; 328 Status status_return;
97 329
98#if 0 330#if 0
99#ifdef X_HAVE_UTF8_STRING 331#ifdef X_HAVE_UTF8_STRING
100 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 332 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
101 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 333 len = Xutf8LookupString (Input_Context, &ev, kbuf,
102 KBUFSZ, &keysym, &status_return); 334 KBUFSZ, &keysym, &status_return);
103 else 335 else
104#endif 336#endif
105#endif 337#endif
106 { 338 {
… …
108 340
109 // the XOpenIM manpage lies about hardcoding the locale 341 // the XOpenIM manpage lies about hardcoding the locale
110 // at the point of XOpenIM, so temporarily switch locales 342 // at the point of XOpenIM, so temporarily switch locales
111 if (rs[Rs_imLocale]) 343 if (rs[Rs_imLocale])
112 SET_LOCALE (rs[Rs_imLocale]); 344 SET_LOCALE (rs[Rs_imLocale]);
345
113 // assume wchar_t == unicode or better 346 // assume wchar_t == unicode or better
114 len = XwcLookupString (Input_Context, &ev, wkbuf, 347 len = XwcLookupString (Input_Context, &ev, wkbuf,
115 KBUFSZ, &keysym, &status_return); 348 KBUFSZ, &keysym, &status_return);
349
116 if (rs[Rs_imLocale]) 350 if (rs[Rs_imLocale])
117 SET_LOCALE (locale); 351 SET_LOCALE (locale);
118 352
119 if (status_return == XLookupChars 353 if (status_return == XLookupChars
120 || status_return == XLookupBoth) 354 || status_return == XLookupBoth)
… …
141 || status_return == XLookupBoth; 375 || status_return == XLookupBoth;
142 } 376 }
143 else 377 else
144#endif 378#endif
145 { 379 {
146 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 380 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
147 valid_keysym = keysym != NoSymbol; 381 valid_keysym = keysym != NoSymbol;
148 } 382 }
149 383
150 if (valid_keysym) 384 if (valid_keysym)
151 { 385 {
386#ifdef KEYSYM_RESOURCE
387 if (keyboard->dispatch (this, keysym, ev.state))
388 return;
389#endif
390
152 if (TermWin.saveLines) 391 if (saveLines)
153 { 392 {
154#ifdef UNSHIFTED_SCROLLKEYS 393#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 394 if (!ctrl && !meta)
156 {
157#else 395#else
158 if (IS_SCROLL_MOD) 396 if (IS_SCROLL_MOD)
397#endif
159 { 398 {
160#endif
161 int lnsppg; 399 int lnsppg;
162 400
163#ifdef PAGING_CONTEXT_LINES 401#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 402 lnsppg = nrow - PAGING_CONTEXT_LINES;
165#else 403#else
166 lnsppg = TermWin.nrow * 4 / 5; 404 lnsppg = nrow * 4 / 5;
167#endif 405#endif
168 if (keysym == XK_Prior) 406 if (keysym == XK_Prior)
169 { 407 {
170 scr_page (UP, lnsppg); 408 scr_page (UP, lnsppg);
171 return; 409 return;
… …
199 scr_move_to (0, 1); 437 scr_move_to (0, 1);
200 return; 438 return;
201 } 439 }
202 else if (keysym == XK_End) 440 else if (keysym == XK_End)
203 { 441 {
204 scr_move_to (1, 0); 442 scr_move_to (1, 1);
205 return; 443 return;
206 } 444 }
207 } 445 }
208#endif 446#endif
209 } 447 }
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 452 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 453 {
216 keysym += (XK_F11 - XK_F1); 454 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 455 shft = 0; /* turn off Shift */
218 } 456 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 457 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 458 {
221 switch (keysym) 459 switch (keysym)
222 { 460 {
223 /* normal XTerm key bindings */ 461 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 462 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 463 selection_request (ev.time);
226 return; 464 return;
465#if TODO
227 /* rxvt extras */ 466 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 467 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 468 change_font (FONT_UP);
230 return; 469 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 470 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 471 change_font (FONT_DN);
233 return; 472 return;
473#endif
234 } 474 }
235 } 475 }
236 } 476 }
237#ifdef PRINTPIPE 477
238 if (keysym == XK_Print) 478#if ENABLE_FRILLS || ISO_14755
239 { 479 // ISO 14755 support
240 scr_printscreen (ctrl | shft); 480 if (shft && ctrl)
241 return;
242 } 481 {
243#endif 482 int hv;
244 483
245 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 484 if (iso14755buf & ISO_14755_51
246 { 485 && (keysym == XK_space || keysym == XK_KP_Space
247#ifdef KEYSYM_RESOURCE 486 || keysym == XK_Return || keysym == XK_KP_Enter))
248 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
249 { 487 {
250 unsigned int l; 488 commit_iso14755 ();
251 const unsigned char *kbuf0; 489 iso14755buf = ISO_14755_51;
252 490# if ISO_14755
253 kbuf0 = (Keysym_map[keysym & 0xFF]); 491 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 492# endif
261 ) 493 return;
262 {
263 const unsigned char ch = C0_ESC;
264 tt_write (&ch, 1);
265 } 494 }
266 495 else if ((hv = hex_keyval (ev)) >= 0)
267 tt_write (kbuf0, l); 496 {
497 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
498 | hv | ISO_14755_51;
499# if ISO_14755
500 iso14755_51 (iso14755buf & ISO_14755_MASK);
501# endif
268 return; 502 return;
269 } 503 }
270 else 504 else
505 {
506# if ENABLE_OVERLAY
507 scr_overlay_off ();
271#endif 508# endif
509 iso14755buf = 0;
510 }
511 }
512 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
513 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
514 if (!(iso14755buf & ISO_14755_STARTED))
515 {
516 iso14755buf |= ISO_14755_STARTED;
517# if ENABLE_OVERLAY
518 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
519 scr_overlay_set (0, 0, "ISO 14755 mode");
520# endif
521 }
522#endif
523
524#ifdef PRINTPIPE
525 if (keysym == XK_Print)
526 {
527 scr_printscreen (ctrl | shft);
528 return;
529 }
530#endif
531
532 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
533 {
272 { 534 {
273 newlen = 1; 535 newlen = 1;
274 switch (keysym) 536 switch (keysym)
275 { 537 {
276#ifndef NO_BACKSPACE_KEY 538#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 539 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 540 if (priv_modes & PrivMode_HaveBackSpace)
279 { 541 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 542 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 543 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 544 kbuf[1] = '\0';
283 } 545 }
284 else 546 else
285 STRCPY (kbuf, key_backspace); 547 strcpy (kbuf, key_backspace);
286 break; 548 break;
287#endif 549#endif
288#ifndef NO_DELETE_KEY 550#ifndef NO_DELETE_KEY
551# ifdef XK_KP_Prior
552 case XK_KP_Delete:
553 /* allow shift to override */
554 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
555 {
556 strcpy (kbuf, "\033On");
557 break;
558 }
559 /* FALLTHROUGH */
560# endif
289 case XK_Delete: 561 case XK_Delete:
290 STRCPY (kbuf, key_delete); 562 strcpy (kbuf, key_delete);
291 break; 563 break;
292#endif 564#endif
293 case XK_Tab: 565 case XK_Tab:
294 if (shft) 566 if (shft)
295 STRCPY (kbuf, "\033[Z"); 567 strcpy (kbuf, "\033[Z");
296 else 568 else
297 { 569 {
298#ifdef CTRL_TAB_MAKES_META 570#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 571 if (ctrl)
300 meta = 1; 572 meta = 1;
… …
310#ifdef XK_KP_Left 582#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 583 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 584 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 585 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 586 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 587 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 588 {
317 STRCPY (kbuf, "\033OZ"); 589 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 590 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 591 break;
320 } 592 }
321 else 593 else
322 /* translate to std. cursor key */ 594 /* translate to std. cursor key */
… …
325#endif 597#endif
326 case XK_Up: /* "\033[A" */ 598 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 599 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 600 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 601 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 602 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 603 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 604 /* do Shift first */
333 if (shft) 605 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 606 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 607 else if (ctrl)
336 { 608 {
337 kbuf[1] = 'O'; 609 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 610 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 611 }
340 else if (PrivateModes & PrivMode_aplCUR) 612 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 613 kbuf[1] = 'O';
342 break; 614 break;
343 615
344#ifndef UNSHIFTED_SCROLLKEYS 616#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 617# ifdef XK_KP_Prior
346 case XK_KP_Prior: 618 case XK_KP_Prior:
347 /* allow shift to override */ 619 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 620 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 621 {
350 STRCPY (kbuf, "\033Oy"); 622 strcpy (kbuf, "\033Oy");
351 break; 623 break;
352 } 624 }
353 /* FALLTHROUGH */ 625 /* FALLTHROUGH */
354# endif 626# endif
355 case XK_Prior: 627 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 628 strcpy (kbuf, "\033[5~");
357 break; 629 break;
358# ifdef XK_KP_Next 630# ifdef XK_KP_Next
359 case XK_KP_Next: 631 case XK_KP_Next:
360 /* allow shift to override */ 632 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 633 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 634 {
363 STRCPY (kbuf, "\033Os"); 635 strcpy (kbuf, "\033Os");
364 break; 636 break;
365 } 637 }
366 /* FALLTHROUGH */ 638 /* FALLTHROUGH */
367# endif 639# endif
368 case XK_Next: 640 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 641 strcpy (kbuf, "\033[6~");
370 break; 642 break;
371#endif 643#endif
372 case XK_KP_Enter: 644 case XK_KP_Enter:
373 /* allow shift to override */ 645 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 646 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 647 {
376 STRCPY (kbuf, "\033OM"); 648 strcpy (kbuf, "\033OM");
649 break;
650 }
651
652 /* FALLTHROUGH */
653
654 case XK_Return:
655 if (priv_modes & PrivMode_LFNL)
656 {
657 kbuf[0] = '\015';
658 kbuf[1] = '\012';
659 kbuf[2] = '\0';
377 } 660 }
378 else 661 else
379 { 662 {
380 kbuf[0] = '\r'; 663 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 664 kbuf[1] = '\0';
382 } 665 }
383 break; 666 break;
384 667
385#ifdef XK_KP_Begin 668#ifdef XK_KP_Begin
386 case XK_KP_Begin: 669 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 670 strcpy (kbuf, "\033Ou");
388 break; 671 break;
389 672
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 673#endif
398 case XK_KP_F1: /* "\033OP" */ 674 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 675 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 676 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 677 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 678 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 679 kbuf[2] += (keysym - XK_KP_F1);
404 break; 680 break;
405 681
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 682 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 683 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 694 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 695 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 696 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 697 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 698 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 699 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 700 {
425 STRCPY (kbuf, "\033Oj"); 701 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 702 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 703 }
428 else 704 else
429 { 705 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 706 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 707 kbuf[1] = '\0';
432 } 708 }
433 break; 709 break;
434 710
435 case XK_Find: 711 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 712 strcpy (kbuf, "\033[1~");
437 break; 713 break;
714
715#ifdef XK_KP_End
716 case XK_KP_Insert:
717 /* allow shift to override */
718 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
719 {
720 strcpy (kbuf, "\033Op");
721 break;
722 }
723 /* FALLTHROUGH */
724#endif
438 case XK_Insert: 725 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 726 strcpy (kbuf, "\033[2~");
440 break; 727 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 728#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 729 case DXK_Remove:
443 /* FALLTHROUGH */ 730 /* FALLTHROUGH */
444#endif 731#endif
445 case XK_Execute: 732 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 733 strcpy (kbuf, "\033[3~");
447 break; 734 break;
448 case XK_Select: 735 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 736 strcpy (kbuf, "\033[4~");
450 break; 737 break;
451#ifdef XK_KP_End 738#ifdef XK_KP_End
452 case XK_KP_End: 739 case XK_KP_End:
453 /* allow shift to override */ 740 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 741 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 742 {
456 STRCPY (kbuf, "\033Oq"); 743 strcpy (kbuf, "\033Oq");
457 break; 744 break;
458 } 745 }
459 /* FALLTHROUGH */ 746 /* FALLTHROUGH */
460#endif 747#endif
461 case XK_End: 748 case XK_End:
462 STRCPY (kbuf, KS_END); 749 strcpy (kbuf, KS_END);
463 break; 750 break;
464#ifdef XK_KP_Home 751#ifdef XK_KP_Home
465 case XK_KP_Home: 752 case XK_KP_Home:
466 /* allow shift to override */ 753 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 754 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 755 {
469 STRCPY (kbuf, "\033Ow"); 756 strcpy (kbuf, "\033Ow");
470 break; 757 break;
471 } 758 }
472 /* FALLTHROUGH */ 759 /* FALLTHROUGH */
473#endif 760#endif
474 case XK_Home: 761 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 762 strcpy (kbuf, KS_HOME);
476 break; 763 break;
477 764
478#define FKEY(n, fkey) \ 765#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 766 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 767
… …
532#undef FKEY 819#undef FKEY
533 default: 820 default:
534 newlen = 0; 821 newlen = 0;
535 break; 822 break;
536 } 823 }
824
537 if (newlen) 825 if (newlen)
538 len = STRLEN (kbuf); 826 len = strlen (kbuf);
539 } 827 }
540 828
541 /* 829 /*
542 * Pass meta for all function keys, if 'meta' option set 830 * Pass meta for all function keys, if 'meta' option set
543 */ 831 */
… …
550 else if (ctrl && keysym == XK_minus) 838 else if (ctrl && keysym == XK_minus)
551 { 839 {
552 len = 1; 840 len = 1;
553 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 841 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
554 } 842 }
843 else if (keysym == XK_ISO_Left_Tab)
844 {
845 strcpy (kbuf, "\033[Z");
846 len = 3;
847 }
555 else 848 else
556 { 849 {
557#ifdef META8_OPTION 850#ifdef META8_OPTION
558 /* set 8-bit on */ 851 /* set 8-bit on */
559 if (meta && (meta_char == 0x80)) 852 if (meta && (meta_char == 0x80))
560 { 853 {
561 unsigned char *ch; 854 char *ch;
562 855
563 for (ch = kbuf; ch < kbuf + len; ch++) 856 for (ch = kbuf; ch < kbuf + len; ch++)
564 *ch |= 0x80; 857 *ch |= 0x80;
565 858
566 meta = 0; 859 meta = 0;
… …
568#endif 861#endif
569 /* nil */ ; 862 /* nil */ ;
570 } 863 }
571 } 864 }
572 865
866 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
867 return;
868
573 if (len <= 0) 869 if (len <= 0)
574 return; /* not mapped */ 870 return; /* not mapped */
575 871
576 if (Options & Opt_scrollTtyKeypress) 872 if (OPTION (Opt_scrollTtyKeypress))
577 if (TermWin.view_start) 873 if (view_start)
578 { 874 {
579 TermWin.view_start = 0; 875 view_start = 0;
580 want_refresh = 1; 876 want_refresh = 1;
581 } 877 }
582 878
583 /* 879 /*
584 * these modifications only affect the static keybuffer 880 * these modifications only affect the static keybuffer
… …
599#ifdef META8_OPTION 895#ifdef META8_OPTION
600 && meta_char == C0_ESC 896 && meta_char == C0_ESC
601#endif 897#endif
602 ) 898 )
603 { 899 {
604 const unsigned char ch = C0_ESC; 900 const char ch = C0_ESC;
605 tt_write (&ch, 1); 901 tt_write (&ch, 1);
606 } 902 }
607 903
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); 904 tt_write (kbuf, (unsigned int)len);
619} 905}
620/*}}} */ 906/*}}} */
621 907
622#if (MENUBAR_MAX) 908#if defined (KEYSYM_RESOURCE)
623/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
624/* attempt to `write' count to the input buffer */
625unsigned int 909unsigned int
626rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 910rxvt_term::cmd_write (const char *str, unsigned int count)
627{ 911{
628 unsigned int n, s; 912 unsigned int n, s;
629 913
630 n = cmdbuf_ptr - cmdbuf_base; 914 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 915 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 916
633 if (n > 0 && s < count) 917 if (n > 0 && s < count)
634 { 918 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 919 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 920 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 921 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 922 cmdbuf_endp -= n;
639 s += n; 923 s += n;
640 } 924 }
… …
650 934
651 cmd_parse (); 935 cmd_parse ();
652 936
653 return 0; 937 return 0;
654} 938}
655#endif /* MENUBAR_MAX */ 939#endif
656 940
657void 941void
658rxvt_term::flush () 942rxvt_term::flush ()
659{ 943{
944 flush_ev.stop ();
945
660#ifdef TRANSPARENT 946#ifdef TRANSPARENT
661 if (want_full_refresh) 947 if (want_full_refresh)
662 { 948 {
663 want_full_refresh = 0; 949 want_full_refresh = 0;
664 scr_clear (); 950 scr_clear ();
… …
666 } 952 }
667#endif 953#endif
668 954
669 if (want_refresh) 955 if (want_refresh)
670 { 956 {
957 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
958 {
959 int row = view_start;
960 int end_row = row + nrow;
961
962 while (row > top_row && ROW (row - 1).is_longer ())
963 --row;
964
965 do
966 {
967 int start_row = row;
968 line_t *l;
969
970 do
971 {
972 l = &ROW (row++);
973
974 if (!(l->f & LINE_FILTERED))
975 {
976 // line not filtered, mark it as filtered
977 l->f |= LINE_FILTERED;
978 while (l->is_longer ())
979 {
980 l = &ROW (row++);
981 l->f |= LINE_FILTERED;
982 }
983
984 // and filter it
985 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
986
987 break;
988 }
989 }
990 while (l->is_longer () && row < end_row);
991 }
992 while (row < end_row);
993 }
994
671 scr_refresh (refresh_type); 995 scr_refresh ();
672 scrollbar_show (1); 996 scrollbar_show (1);
673#ifdef USE_XIM 997#ifdef USE_XIM
674 IMSendSpot (); 998 IMSendSpot ();
675#endif 999#endif
676 } 1000 }
677 1001
678 display->flush (); 1002 display->flush ();
679
680 flush_ev.stop ();
681} 1003}
682 1004
683void 1005void
684rxvt_term::check_cb (check_watcher &w) 1006rxvt_term::check_cb (check_watcher &w)
685{ 1007{
686 SET_R (this); 1008 make_current ();
687 SET_LOCALE (locale);
688 1009
689 display->flush (); 1010 display->flush ();
690 1011
691 if (want_refresh && !flush_ev.active) 1012 if (want_refresh && !flush_ev.active)
692 flush_ev.start (NOW + 0.01); 1013 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
693} 1014}
694 1015
695void 1016void
696rxvt_term::flush_cb (time_watcher &w) 1017rxvt_term::flush_cb (time_watcher &w)
697{ 1018{
698 SET_R (this); 1019 make_current ();
699 SET_LOCALE (locale);
700 1020
701 refresh_limit = 1; 1021 refresh_limit = 1;
702 refresh_count = 0; 1022 refresh_count = 0;
703 flush (); 1023 flush ();
704} 1024}
… …
708rxvt_term::cursor_blink_cb (time_watcher &w) 1028rxvt_term::cursor_blink_cb (time_watcher &w)
709{ 1029{
710 hidden_cursor = !hidden_cursor; 1030 hidden_cursor = !hidden_cursor;
711 want_refresh = 1; 1031 want_refresh = 1;
712 1032
713 w.start (w.at + BLINK_INTERVAL); 1033 w.start (w.at + CURSOR_BLINK_INTERVAL);
714} 1034}
715#endif 1035#endif
716 1036
717#ifdef TEXT_BLINK 1037#ifdef TEXT_BLINK
718void 1038void
… …
732rxvt_term::cont_scroll_cb (time_watcher &w) 1052rxvt_term::cont_scroll_cb (time_watcher &w)
733{ 1053{
734 if ((scrollbar_isUp() || scrollbar_isDn()) && 1054 if ((scrollbar_isUp() || scrollbar_isDn()) &&
735 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1055 scr_page (scrollbar_isUp() ? UP : DN, 1))
736 { 1056 {
737 refresh_type |= SMOOTH_REFRESH;
738 want_refresh = 1; 1057 want_refresh = 1;
739 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1058 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
740 } 1059 }
741} 1060}
742#endif 1061#endif
… …
746rxvt_term::sel_scroll_cb (time_watcher &w) 1065rxvt_term::sel_scroll_cb (time_watcher &w)
747{ 1066{
748 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1067 if (scr_page (scroll_selection_dir, scroll_selection_lines))
749 { 1068 {
750 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1069 selection_extend (selection_save_x, selection_save_y, selection_save_state);
751 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1; 1070 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
754 } 1072 }
755} 1073}
756#endif 1074#endif
… …
761{ 1079{
762 if (mouse_slip_wheel_speed == 0 1080 if (mouse_slip_wheel_speed == 0
763 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1081 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
764 : scr_page (UP, mouse_slip_wheel_speed)) 1082 : scr_page (UP, mouse_slip_wheel_speed))
765 { 1083 {
766 refresh_type |= SMOOTH_REFRESH; 1084 if (view_start == top_row || view_start == 0)
1085 mouse_slip_wheel_speed = 0;
1086
767 want_refresh = 1; 1087 want_refresh = 1;
768 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
769 } 1089 }
770} 1090}
771#endif 1091#endif
772 1092
1093#if HAVE_SCHED_YIELD
1094static struct event_handler
1095{
1096 check_watcher cw_yield;
1097
1098 void yield (check_watcher &w)
1099 {
1100 sched_yield ();
1101 w.stop ();
1102 }
1103
1104 event_handler ()
1105 : cw_yield (this, &event_handler::yield)
1106 {
1107 }
1108} event_handler;
1109#endif
1110
773bool 1111bool
774rxvt_term::pty_fill () 1112rxvt_term::pty_fill ()
775{ 1113{
776 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1114 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
777 1115
778 if (CBUFSIZ == n) 1116 if (CBUFSIZ == n)
779 { 1117 {
780 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1118 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
781 n = 0; 1119 n = 0;
782 } 1120 }
783 1121
784 memmove (cmdbuf_base, cmdbuf_ptr, n); 1122 memmove (cmdbuf_base, cmdbuf_ptr, n);
785 cmdbuf_ptr = cmdbuf_base; 1123 cmdbuf_ptr = cmdbuf_base;
786 cmdbuf_endp = cmdbuf_ptr + n; 1124 cmdbuf_endp = cmdbuf_ptr + n;
787 1125
788 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1126 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
789 1127
790 if (n > 0) 1128 if (r > 0)
791 { 1129 {
792 cmdbuf_endp += n; 1130 cmdbuf_endp += r;
793 return true; 1131 return true;
794 } 1132 }
795 else if (n < 0 && errno != EAGAIN) 1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 {
1135#if HAVE_SCHED_YIELD
1136 if (display->is_local)
1137 event_handler.cw_yield.start ();
1138#endif
1139 }
1140 else
1141 {
1142 pty_ev.stop ();
1143
1144 if (!OPTION (Opt_hold))
796 destroy (); 1145 destroy ();
1146 }
797 1147
798 return false; 1148 return false;
799} 1149}
800 1150
801void 1151void
802rxvt_term::pty_cb (io_watcher &w, short revents) 1152rxvt_term::pty_cb (io_watcher &w, short revents)
803{ 1153{
804 SET_R (this); 1154 make_current ();
805 SET_LOCALE (locale);
806 1155
807 if (revents & EVENT_WRITE)
808 tt_write (0, 0);
809 else if (revents & EVENT_READ) 1156 if (revents & EVENT_READ)
810 // loop, but don't allow a single term to monopolize us 1157 // loop, but don't allow a single term to monopolize us
811 while (pty_fill ()) 1158 while (pty_fill ())
812 if (cmd_parse ()) 1159 if (cmd_parse ())
813 break; 1160 break;
1161
1162 if (revents & EVENT_WRITE)
1163 pty_write ();
814} 1164}
815 1165
816void 1166void
817rxvt_term::pointer_unblank () 1167rxvt_term::pointer_unblank ()
818{ 1168{
819 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1169 XDefineCursor (xdisp, vt, TermWin_cursor);
820 recolour_cursor (); 1170 recolour_cursor ();
821 1171
822#ifdef POINTER_BLANK 1172#ifdef POINTER_BLANK
823 hidden_pointer = 0; 1173 hidden_pointer = 0;
824 1174
825 if (Options & Opt_pointerBlank) 1175 if (OPTION (Opt_pointerBlank))
826 pointer_ev.start (NOW + pointerBlankDelay); 1176 pointer_ev.start (NOW + pointerBlankDelay);
827#endif 1177#endif
828} 1178}
829 1179
830#ifdef POINTER_BLANK 1180#ifdef POINTER_BLANK
831void 1181void
832rxvt_term::pointer_blank () 1182rxvt_term::pointer_blank ()
833{ 1183{
834 if (! (Options & Opt_pointerBlank)) 1184 if (!OPTION (Opt_pointerBlank))
835 return; 1185 return;
836 1186
837 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1187 XDefineCursor (xdisp, vt, display->blank_cursor);
838 XFlush (display->display); 1188 XFlush (xdisp);
839 1189
840 hidden_pointer = 1; 1190 hidden_pointer = 1;
841} 1191}
842 1192
843void 1193void
844rxvt_term::pointer_cb (time_watcher &w) 1194rxvt_term::pointer_cb (time_watcher &w)
845{ 1195{
846 SET_R (this); 1196 make_current ();
847 SET_LOCALE (locale);
848 1197
849 pointer_blank (); 1198 pointer_blank ();
850} 1199}
851#endif 1200#endif
852 1201
… …
859 x = ev.x; 1208 x = ev.x;
860 y = ev.y; 1209 y = ev.y;
861 pixel_position (&x, &y); 1210 pixel_position (&x, &y);
862 1211
863 if (MEvent.button == AnyButton) 1212 if (MEvent.button == AnyButton)
864 {
865 button_number = 3; 1213 button_number = 3;
866 }
867 else 1214 else
868 { 1215 {
869 button_number = MEvent.button - Button1; 1216 button_number = MEvent.button - Button1;
870 /* add 0x3D for wheel events, like xterm does */ 1217 /* add 0x3D for wheel events, like xterm does */
871 if (button_number >= 3) 1218 if (button_number >= 3)
872 button_number += (64 - 3); 1219 button_number += (64 - 3);
873 } 1220 }
874 1221
875 if (PrivateModes & PrivMode_MouseX10) 1222 if (priv_modes & PrivMode_MouseX10)
876 { 1223 {
877 /* 1224 /*
878 * do not report ButtonRelease 1225 * do not report ButtonRelease
879 * no state info allowed 1226 * no state info allowed
880 */ 1227 */
… …
895 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1242 + ((MEvent.state & ModMetaMask) ? 8 : 0)
896 + ((MEvent.state & ControlMask) ? 16 : 0); 1243 + ((MEvent.state & ControlMask) ? 16 : 0);
897#ifdef MOUSE_REPORT_DOUBLECLICK 1244#ifdef MOUSE_REPORT_DOUBLECLICK
898 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1245 key_state += ((MEvent.clicks > 1) ? 32 : 0);
899#endif 1246#endif
900
901 } 1247 }
902 1248
903#ifdef DEBUG_MOUSEREPORT 1249#if DEBUG_MOUSEREPORT
904 fprintf (stderr, "Mouse ["); 1250 fprintf (stderr, "Mouse [");
905 if (key_state & 16) 1251 if (key_state & 16)
906 fputc ('C', stderr); 1252 fputc ('C', stderr);
907 if (key_state & 4) 1253 if (key_state & 4)
908 fputc ('S', stderr); 1254 fputc ('S', stderr);
… …
912 fputc ('2', stderr); 1258 fputc ('2', stderr);
913 fprintf (stderr, "]: <%d>, %d/%d\n", 1259 fprintf (stderr, "]: <%d>, %d/%d\n",
914 button_number, 1260 button_number,
915 x + 1, 1261 x + 1,
916 y + 1); 1262 y + 1);
917#else 1263#endif
1264
918 tt_printf ("\033[M%c%c%c", 1265 tt_printf ("\033[M%c%c%c",
919 (32 + button_number + key_state), 1266 (32 + button_number + key_state),
920 (32 + x + 1), 1267 (32 + x + 1),
921 (32 + y + 1)); 1268 (32 + y + 1));
922#endif
923} 1269}
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 1270
935/*{{{ process an X event */ 1271/*{{{ process an X event */
936void 1272void
937rxvt_term::x_cb (XEvent &ev) 1273rxvt_term::x_cb (XEvent &ev)
938{ 1274{
939 SET_R (this); 1275 make_current ();
940 SET_LOCALE (locale);
941 1276
942#if defined(CURSOR_BLINK) 1277 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 1278
951 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1279 if (ev.xany.window == vt
952 } 1280 && SHOULD_INVOKE (HOOK_X_EVENT)
953#endif 1281 && 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; 1282 return;
972#endif
973 1283
1284 // for XQueryPointer
974 Window unused_root, unused_child; 1285 Window unused_root, unused_child;
975 int unused_root_x, unused_root_y; 1286 int unused_root_x, unused_root_y;
976 unsigned int unused_mask; 1287 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 1288
1027 switch (ev.type) 1289 switch (ev.type)
1028 { 1290 {
1029 case KeyPress: 1291 case KeyPress:
1292#if ISO_14755
1293 if (!(iso14755buf & ISO_14755_52))
1294#endif
1030 lookup_key (ev.xkey); 1295 lookup_key (ev.xkey);
1296
1297 break;
1298
1299 case KeyRelease:
1300 {
1301#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1302 KeySym keysym;
1303
1304 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1305#endif
1306
1307#if ENABLE_FRILLS || ISO_14755
1308 // ISO 14755 support
1309 if (iso14755buf)
1310 if (iso14755buf & ISO_14755_52)
1311 {
1312# if ENABLE_OVERLAY
1313 scr_overlay_off ();
1314# endif
1315# if ISO_14755
1316 // iso14755 part 5.2 handling: release time
1317 // first: controls
1318 if ((ev.xkey.state & ControlMask)
1319 && ((keysym >= 0x40 && keysym <= 0x5f)
1320 || (keysym >= 0x61 && keysym <= 0x7f)))
1321 {
1322 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1323 commit_iso14755 ();
1324 goto skip_switch;
1325 }
1326
1327 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1328 if (i[0] == keysym)
1329 {
1330 iso14755buf = ISO_14755_51 | i[1];
1331 commit_iso14755 ();
1332 goto skip_switch;
1333 }
1334
1335 scr_bell ();
1336# endif
1337 iso14755buf = 0;
1338 break;
1339 }
1340 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1341 {
1342# if ENABLE_OVERLAY
1343 scr_overlay_off ();
1344# endif
1345 if (iso14755buf & ISO_14755_51)
1346 commit_iso14755 ();
1347#if ISO_14755
1348 else if (iso14755buf & ISO_14755_STARTED)
1349 {
1350 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1351
1352 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1353 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1354 }
1355# endif
1356 else
1357 iso14755buf = 0;
1358 }
1359#endif
1360
1361 if (ev.xany.window == vt
1362 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1031 break; 1363 break;
1032 1364
1033#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1365#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1034 case KeyRelease:
1035 {
1036 if (!(ev.xkey.state & ControlMask)) 1366 if (!(ev.xkey.state & ControlMask))
1037 slip_wheel_ev.stop (); 1367 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) 1368 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1044 mouse_slip_wheel_speed = 0; 1369 mouse_slip_wheel_speed = 0;
1045 } 1370#endif
1046 break; 1371 break;
1047 } 1372 }
1048#endif
1049 1373
1050 case ButtonPress: 1374 case ButtonPress:
1051 button_press (ev.xbutton); 1375 button_press (ev.xbutton);
1052 break; 1376 break;
1053 1377
… …
1055 button_release (ev.xbutton); 1379 button_release (ev.xbutton);
1056 break; 1380 break;
1057 1381
1058 case ClientMessage: 1382 case ClientMessage:
1059 if (ev.xclient.format == 32 1383 if (ev.xclient.format == 32
1060 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1384 && !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 { 1385 {
1069 /* Get Dnd data */ 1386 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1070 Atom ActualType; 1387 {
1071 int ActualFormat; 1388 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1072 unsigned char *data; 1389 {
1073 unsigned long Size, RemainingBytes; 1390 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1074 1391 {
1075 XGetWindowProperty (display->display, display->root, 1392 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1076 xa[XA_DNDSELECTION], 1393 destroy ();
1077 0L, 1000000L, 1394 }
1078 False, AnyPropertyType, 1395#if ENABLE_EWMH
1079 &ActualType, &ActualFormat, 1396 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1080 &Size, &RemainingBytes, 1397 XSendEvent (xdisp, ev.xclient.window = display->root,
1398 False, SubstructureRedirectMask | SubstructureNotifyMask,
1081 &data); 1399 &ev);
1082 XChangeProperty (display->display, display->root, 1400#endif
1083 XA_CUT_BUFFER0, XA_STRING, 1401 }
1084 8, PropModeReplace, 1402 }
1085 data, STRLEN (data)); 1403#if ENABLE_XEMBED
1086 XFree (data); 1404 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1087 selection_paste (display->root, XA_CUT_BUFFER0, True); 1405 {
1088 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1406 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1407 focus_in ();
1408 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1409 focus_out ();
1410 }
1411#endif
1089 } 1412 }
1090#endif /* OFFIX_DND */
1091 break; 1413 break;
1092 1414
1093 case MappingNotify: 1415 case MappingNotify:
1094 XRefreshKeyboardMapping (&ev.xmapping); 1416 XRefreshKeyboardMapping (&ev.xmapping);
1095 break; 1417 break;
… …
1118 break; 1440 break;
1119 } 1441 }
1120 break; 1442 break;
1121 1443
1122 case FocusIn: 1444 case FocusIn:
1123 if (!TermWin.focus) 1445 focus_in ();
1446 break;
1447
1448 case FocusOut:
1449 focus_out ();
1450 break;
1451
1452 case ConfigureNotify:
1453 if (ev.xconfigure.window == parent[0])
1124 { 1454 {
1125 TermWin.focus = 1; 1455 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1126 want_refresh = 1; 1456 ;
1127#ifdef USE_XIM 1457
1128 if (Input_Context != NULL) 1458 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 { 1459 {
1138 PixColors = PixColorsFocused; 1460 seen_resize = 1;
1139 set_colorfgbg (); 1461 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1140 scr_clear ();
1141 scr_touch (true);
1142 } 1462 }
1143#endif
1144 1463
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465
1466#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1467 if (OPTION (Opt_transparent))
1468 check_our_parents ();
1469#endif
1145 } 1470 }
1146 break; 1471 break;
1147 1472
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: 1473 case PropertyNotify:
1176 if (ev.xconfigure.window == TermWin.parent[0]) 1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1177 { 1475 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1178 int height, width; 1476 && ev.xproperty.state == PropertyNewValue)
1477 selection_property (ev.xproperty.window, ev.xproperty.atom);
1179 1478
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; 1479 break;
1201 1480
1202 case SelectionClear: 1481 case SelectionClear:
1203 selection_clear (); 1482 selection_clear ();
1204 break; 1483 break;
1205 1484
1206 case SelectionNotify: 1485 case SelectionNotify:
1207 if (selection_wait == Sel_normal) 1486 if (selection_wait == Sel_normal)
1208 selection_paste (ev.xselection.requestor, 1487 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1209 ev.xselection.property, True);
1210 break; 1488 break;
1211 1489
1212 case SelectionRequest: 1490 case SelectionRequest:
1213 selection_send (ev.xselectionrequest); 1491 selection_send (ev.xselectionrequest);
1214 break; 1492 break;
1215 1493
1494 case MapNotify:
1495 mapped = 1;
1496#ifdef TEXT_BLINK
1497 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1498#endif
1499 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1500 break;
1501
1216 case UnmapNotify: 1502 case UnmapNotify:
1217 TermWin.mapped = 0; 1503 mapped = 0;
1218#ifdef TEXT_BLINK 1504#ifdef TEXT_BLINK
1219 text_blink_ev.stop (); 1505 text_blink_ev.stop ();
1220#endif 1506#endif
1221 break; 1507 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; 1508 break;
1229 1509
1230#ifdef TRANSPARENT 1510#ifdef TRANSPARENT
1231 case ReparentNotify: 1511 case ReparentNotify:
1232 rootwin_cb (ev); 1512 rootwin_cb (ev);
1233 break; 1513 break;
1234#endif /* TRANSPARENT */ 1514#endif /* TRANSPARENT */
1235 1515
1236 case GraphicsExpose: 1516 case GraphicsExpose:
1237 case Expose: 1517 case Expose:
1238 if (ev.xany.window == TermWin.vt) 1518 if (ev.xany.window == vt)
1239 { 1519 {
1240 do 1520 do
1241 scr_expose (ev.xexpose.x, ev.xexpose.y, 1521 scr_expose (ev.xexpose.x, ev.xexpose.y,
1242 ev.xexpose.width, ev.xexpose.height, False); 1522 ev.xexpose.width, ev.xexpose.height, False);
1243 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1523 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1244 1524
1245 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1525 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1246 1526
1247 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1527 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1248 scr_expose (ev.xexpose.x, ev.xexpose.y, 1528 scr_expose (ev.xexpose.x, ev.xexpose.y,
1249 ev.xexpose.width, ev.xexpose.height, False); 1529 ev.xexpose.width, ev.xexpose.height, False);
1250 1530
1251 scr_refresh (refresh_type); 1531 want_refresh = 1;
1252 } 1532 }
1253 else 1533 else
1254 { 1534 {
1255 XEvent unused_event; 1535 XEvent unused_event;
1256 1536
1257 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1537 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1258 ; 1538 ;
1259 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1260 ; 1540 ;
1261 1541
1262 if (isScrollbarWindow (ev.xany.window)) 1542 if (isScrollbarWindow (ev.xany.window))
1263 { 1543 {
1264 scrollBar.setIdle (); 1544 scrollBar.setIdle ();
1265 scrollbar_show (0); 1545 scrollbar_show (0);
1266 } 1546 }
1267#ifdef MENUBAR
1268 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1269 menubar_expose ();
1270#endif
1271 1547
1272#ifdef TRANSPARENT 1548#ifdef TRANSPARENT
1273 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1549 if (am_transparent && ev.xany.window == parent[0])
1274 XClearWindow (display->display, ev.xany.window); 1550 XClearWindow (xdisp, ev.xany.window);
1275#endif 1551#endif
1276 } 1552 }
1277 break; 1553 break;
1278 1554
1279 case MotionNotify: 1555 case MotionNotify:
1280#ifdef POINTER_BLANK 1556#ifdef POINTER_BLANK
1281 if (hidden_pointer) 1557 if (hidden_pointer)
1282 pointer_unblank (); 1558 pointer_unblank ();
1283#endif 1559#endif
1284#if MENUBAR 1560 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1285 if (isMenuBarWindow (ev.xany.window)) 1561 break;
1562
1563 if (ev.xany.window == vt)
1286 { 1564 {
1287 menubar_control (ev.xbutton); 1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1288 break; 1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1289 } 1567 ; // 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))) 1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1297 { 1569 {
1298 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1570 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1299 ; 1571 ;
1300 1572
1301 XQueryPointer (display->display, TermWin.vt, 1573 XQueryPointer (xdisp, vt,
1302 &unused_root, &unused_child, 1574 &unused_root, &unused_child,
1303 &unused_root_x, &unused_root_y, 1575 &unused_root_x, &unused_root_y,
1304 & (ev.xbutton.x), & (ev.xbutton.y), 1576 &ev.xbutton.x, &ev.xbutton.y,
1305 &unused_mask); 1577 &ev.xbutton.state);
1306#ifdef MOUSE_THRESHOLD 1578#ifdef MOUSE_THRESHOLD
1307 /* deal with a `jumpy' mouse */ 1579 /* deal with a `jumpy' mouse */
1308 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1580 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1309 { 1581 {
1310#endif 1582#endif
1583#if ISO_14755
1584 // 5.4
1585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1586 {
1587 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1588 break;
1589 }
1590#endif
1311 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1591 selection_extend (ev.xbutton.x, ev.xbutton.y,
1312 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1592 ev.xbutton.state & Button3Mask ? 2 : 0);
1593
1313#ifdef SELECTION_SCROLLING 1594#ifdef SELECTION_SCROLLING
1314 if (ev.xbutton.y < TermWin.int_bwidth 1595 if (ev.xbutton.y < int_bwidth
1315 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1596 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1316 { 1597 {
1317 int dist; 1598 int dist;
1318 1599
1319 /* don't clobber the current delay if we are 1600 /* don't clobber the current delay if we are
1320 * already in the middle of scrolling. 1601 * already in the middle of scrolling.
… …
1323 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1604 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1324 1605
1325 /* save the event params so we can highlight 1606 /* save the event params so we can highlight
1326 * the selection in the pending-scroll loop 1607 * the selection in the pending-scroll loop
1327 */ 1608 */
1328 selection_save_x=ev.xbutton.x; 1609 selection_save_x = ev.xbutton.x;
1329 selection_save_y=ev.xbutton.y; 1610 selection_save_y = ev.xbutton.y;
1330 selection_save_state=
1331 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1611 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1332 1612
1333 /* calc number of lines to scroll */ 1613 /* calc number of lines to scroll */
1334 if (ev.xbutton.y<TermWin.int_bwidth) 1614 if (ev.xbutton.y < int_bwidth)
1335 { 1615 {
1336 scroll_selection_dir = UP; 1616 scroll_selection_dir = UP;
1337 dist = TermWin.int_bwidth - ev.xbutton.y; 1617 dist = int_bwidth - ev.xbutton.y;
1338 } 1618 }
1339 else 1619 else
1340 { 1620 {
1341 scroll_selection_dir = DN; 1621 scroll_selection_dir = DN;
1342 dist = ev.xbutton.y - 1622 dist = ev.xbutton.y - (int_bwidth + height);
1343 (TermWin.int_bwidth + TermWin.height);
1344 } 1623 }
1624
1345 scroll_selection_lines= (Pixel2Height (dist)/ 1625 scroll_selection_lines = Pixel2Height (dist)
1346 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1626 / SELECTION_SCROLL_LINE_SPEEDUP
1627 + 1;
1347 MIN_IT (scroll_selection_lines, 1628 min_it (scroll_selection_lines,
1348 SELECTION_SCROLL_MAX_LINES); 1629 SELECTION_SCROLL_MAX_LINES);
1349 } 1630 }
1350 else 1631 else
1351 { 1632 {
1352 /* we are within the text window, so we 1633 /* we are within the text window, so we
1353 * shouldn't be scrolling 1634 * shouldn't be scrolling
… …
1355 if (sel_scroll_ev.active) 1636 if (sel_scroll_ev.active)
1356 sel_scroll_ev.stop(); 1637 sel_scroll_ev.stop();
1357 } 1638 }
1358#endif 1639#endif
1359#ifdef MOUSE_THRESHOLD 1640#ifdef MOUSE_THRESHOLD
1360
1361 } 1641 }
1362#endif 1642#endif
1363
1364 } 1643 }
1365 } 1644 }
1366 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1367 { 1646 {
1368 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1647 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1369 MotionNotify, &ev)) ; 1648 MotionNotify, &ev))
1649 ;
1650
1370 XQueryPointer (display->display, scrollBar.win, 1651 XQueryPointer (xdisp, scrollBar.win,
1371 &unused_root, &unused_child, 1652 &unused_root, &unused_child,
1372 &unused_root_x, &unused_root_y, 1653 &unused_root_x, &unused_root_y,
1373 & (ev.xbutton.x), & (ev.xbutton.y), 1654 &ev.xbutton.x, &ev.xbutton.y,
1374 &unused_mask); 1655 &unused_mask);
1375 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1376 scrollbar_size ()); 1657 scrollbar_size ());
1377 scr_refresh (refresh_type); 1658 want_refresh = 1;
1378 refresh_limit = 0; 1659 refresh_limit = 0;
1379 scrollbar_show (1); 1660 scrollbar_show (1);
1380 } 1661 }
1381 break; 1662 break;
1382 } 1663 }
1383}
1384 1664
1665skip_switch: ;
1666
1667#if defined(CURSOR_BLINK)
1668 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1669 {
1670 if (hidden_cursor)
1671 {
1672 hidden_cursor = 0;
1673 want_refresh = 1;
1674 }
1675
1676 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1677 }
1678#endif
1679
1680#if defined(POINTER_BLANK)
1681 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1682 {
1683 if (ev.type == MotionNotify
1684 || ev.type == ButtonPress
1685 || ev.type == ButtonRelease)
1686 if (hidden_pointer)
1687 pointer_unblank ();
1688
1689 if (ev.type == KeyPress && hidden_pointer == 0)
1690 pointer_blank ();
1691 }
1692#endif
1693}
1694
1695void
1696rxvt_term::focus_in ()
1697{
1698 if (!focus)
1699 {
1700 focus = 1;
1701 want_refresh = 1;
1702
1703 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1704
1705#if USE_XIM
1706 if (Input_Context != NULL)
1707 {
1708 IMSetStatusPosition ();
1709 XSetICFocus (Input_Context);
1710 }
1711#endif
1712#if CURSOR_BLINK
1713 if (OPTION (Opt_cursorBlink))
1714 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1715#endif
1716#if OFF_FOCUS_FADING
1717 if (rs[Rs_fade])
1718 {
1719 pix_colors = pix_colors_focused;
1720 scr_recolour ();
1721 }
1722#endif
1723 }
1724}
1725
1726void
1727rxvt_term::focus_out ()
1728{
1729 if (focus)
1730 {
1731 focus = 0;
1732 want_refresh = 1;
1733
1734 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1735
1736#if ENABLE_FRILLS || ISO_14755
1737 if (iso14755buf)
1738 {
1739 iso14755buf = 0;
1740# if ENABLE_OVERLAY
1741 scr_overlay_off ();
1742# endif
1743 }
1744#endif
1745#if USE_XIM
1746 if (Input_Context != NULL)
1747 XUnsetICFocus (Input_Context);
1748#endif
1749#if CURSOR_BLINK
1750 if (OPTION (Opt_cursorBlink))
1751 cursor_blink_ev.stop ();
1752 hidden_cursor = 0;
1753#endif
1754#if OFF_FOCUS_FADING
1755 if (rs[Rs_fade])
1756 {
1757 pix_colors = pix_colors_unfocused;
1758 scr_recolour ();
1759 }
1760#endif
1761 }
1762}
1763
1764#if TRANSPARENT
1385void 1765void
1386rxvt_term::rootwin_cb (XEvent &ev) 1766rxvt_term::rootwin_cb (XEvent &ev)
1387{ 1767{
1388 SET_R (this); 1768 make_current ();
1389 SET_LOCALE (locale);
1390 1769
1391 switch (ev.type) 1770 switch (ev.type)
1392 { 1771 {
1393 case PropertyNotify: 1772 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 /* 1773 /*
1404 * if user used some Esetroot compatible prog to set the root bg, 1774 * 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. 1775 * use the property to determine the pixmap. We use it later on.
1406 */ 1776 */
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]) 1777 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1778 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1411 return; 1779 return;
1412 }
1413 1780
1414 /* FALLTHROUGH */ 1781 /* FALLTHROUGH */
1415 case ReparentNotify: 1782 case ReparentNotify:
1416 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1783 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1417 want_refresh = want_full_refresh = 1; 1784 want_refresh = want_full_refresh = 1;
1418 break; 1785 break;
1419#endif
1420 } 1786 }
1421} 1787}
1788#endif
1422 1789
1423void 1790void
1424rxvt_term::button_press (XButtonEvent &ev) 1791rxvt_term::button_press (XButtonEvent &ev)
1425{ 1792{
1426 int reportmode = 0, clickintime; 1793 int reportmode = 0, clickintime;
1427 1794
1428 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1795 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1796
1429 if (!bypass_keystate) 1797 if (!bypass_keystate)
1430 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1798 reportmode = !! (priv_modes & PrivMode_mouse_report);
1799
1431 /* 1800 /*
1432 * VT window processing of button press 1801 * VT window processing of button press
1433 */ 1802 */
1434 if (ev.window == TermWin.vt) 1803 if (ev.window == vt)
1435 { 1804 {
1805 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1806 return;
1807
1808#if ISO_14755
1809 // 5.4
1810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1811 {
1812 iso14755_54 (ev.x, ev.y);
1813 return;
1814 }
1815#endif
1816
1436 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1817 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1818
1437 if (reportmode) 1819 if (reportmode)
1438 { 1820 {
1439 /* mouse report from vt window */ 1821 /* mouse report from vt window */
1440 /* save the xbutton state (for ButtonRelease) */ 1822 /* save the xbutton state (for ButtonRelease) */
1441 MEvent.state = ev.state; 1823 MEvent.state = ev.state;
1442#ifdef MOUSE_REPORT_DOUBLECLICK 1824#ifdef MOUSE_REPORT_DOUBLECLICK
1443 if (ev.button == MEvent.button && clickintime) 1825 if (ev.button == MEvent.button && clickintime)
1444 { 1826 {
1445 /* same button, within alloted time */ 1827 /* same button, within alloted time */
1446 MEvent.clicks++; 1828 MEvent.clicks++;
1829
1447 if (MEvent.clicks > 1) 1830 if (MEvent.clicks > 1)
1448 { 1831 {
1449 /* only report double clicks */ 1832 /* only report double clicks */
1450 MEvent.clicks = 2; 1833 MEvent.clicks = 2;
1451 mouse_report (ev); 1834 mouse_report (ev);
… …
1470 } 1853 }
1471 else 1854 else
1472 { 1855 {
1473 if (ev.button != MEvent.button) 1856 if (ev.button != MEvent.button)
1474 MEvent.clicks = 0; 1857 MEvent.clicks = 0;
1858
1475 switch (ev.button) 1859 switch (ev.button)
1476 { 1860 {
1477 case Button1: 1861 case Button1:
1862 /* allow meta + click to select rectangular areas */
1863 /* should be done in screen.C */
1864#if ENABLE_FRILLS
1865 selection.rect = !!(ev.state & ModMetaMask);
1866#else
1867 selection.rect = false;
1868#endif
1869
1478 /* allow shift+left click to extend selection */ 1870 /* allow shift+left click to extend selection */
1479 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1871 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1480 { 1872 {
1481 if (MEvent.button == Button1 && clickintime) 1873 if (MEvent.button == Button1 && clickintime)
1482 selection_rotate (ev.x, ev.y); 1874 selection_rotate (ev.x, ev.y);
1483 else 1875 else
1484 selection_extend (ev.x, ev.y, 1); 1876 selection_extend (ev.x, ev.y, 1);
… …
1499 case Button3: 1891 case Button3:
1500 if (MEvent.button == Button3 && clickintime) 1892 if (MEvent.button == Button3 && clickintime)
1501 selection_rotate (ev.x, ev.y); 1893 selection_rotate (ev.x, ev.y);
1502 else 1894 else
1503 selection_extend (ev.x, ev.y, 1); 1895 selection_extend (ev.x, ev.y, 1);
1896
1504 MEvent.button = Button3; 1897 MEvent.button = Button3;
1505 break; 1898 break;
1506 } 1899 }
1507 } 1900 }
1901
1508 MEvent.time = ev.time; 1902 MEvent.time = ev.time;
1509 return; 1903 return;
1510 } 1904 }
1511 1905
1512 /* 1906 /*
… …
1623 case Button3: 2017 case Button3:
1624 if (scrollBar.style != R_SB_XTERM) 2018 if (scrollBar.style != R_SB_XTERM)
1625 { 2019 {
1626 if (scrollbar_above_slider (ev.y)) 2020 if (scrollbar_above_slider (ev.y))
1627# ifdef RXVT_SCROLL_FULL 2021# ifdef RXVT_SCROLL_FULL
1628 scr_page (UP, TermWin.nrow - 1); 2022 scr_page (UP, nrow - 1);
1629# else 2023# else
1630 scr_page (UP, TermWin.nrow / 4); 2024 scr_page (UP, nrow / 4);
1631# endif 2025# endif
1632 else if (scrollbar_below_slider (ev.y)) 2026 else if (scrollbar_below_slider (ev.y))
1633# ifdef RXVT_SCROLL_FULL 2027# ifdef RXVT_SCROLL_FULL
1634 scr_page (DN, TermWin.nrow - 1); 2028 scr_page (DN, nrow - 1);
1635# else 2029# else
1636 scr_page (DN, TermWin.nrow / 4); 2030 scr_page (DN, nrow / 4);
1637# endif 2031# endif
1638 else 2032 else
1639 scrollBar.setMotion (); 2033 scrollBar.setMotion ();
1640 } 2034 }
1641 else 2035 else
1642 { 2036 {
1643 scr_page ((ev.button == Button1 ? DN : UP), 2037 scr_page ((ev.button == Button1 ? DN : UP),
1644 (TermWin.nrow 2038 (nrow
1645 * scrollbar_position (ev.y) 2039 * scrollbar_position (ev.y)
1646 / scrollbar_size ())); 2040 / scrollbar_size ()));
1647 } 2041 }
1648 2042
1649 break; 2043 break;
1650 } 2044 }
1651 } 2045 }
2046
1652 return; 2047 return;
1653 } 2048 }
1654#if MENUBAR
1655 /*
1656 * Menubar window processing of button press
1657 */
1658 if (isMenuBarWindow (ev.window))
1659 menubar_control (ev);
1660#endif
1661} 2049}
1662 2050
1663void 2051void
1664rxvt_term::button_release (XButtonEvent &ev) 2052rxvt_term::button_release (XButtonEvent &ev)
1665{ 2053{
1666 int reportmode = 0; 2054 int reportmode = 0;
1667 2055
1668 csrO = 0; /* reset csr Offset */ 2056 csrO = 0; /* reset csr Offset */
1669 if (!bypass_keystate) 2057 if (!bypass_keystate)
1670 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2058 reportmode = !! (priv_modes & PrivMode_mouse_report);
1671 2059
1672 if (scrollbar_isUpDn ()) 2060 if (scrollbar_isUpDn ())
1673 { 2061 {
1674 scrollBar.setIdle (); 2062 scrollBar.setIdle ();
1675 scrollbar_show (0); 2063 scrollbar_show (0);
1676#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1677 refresh_type &= ~SMOOTH_REFRESH;
1678#endif
1679
1680 } 2064 }
2065
1681#ifdef SELECTION_SCROLLING 2066#ifdef SELECTION_SCROLLING
1682 if (sel_scroll_ev.active) 2067 if (sel_scroll_ev.active)
1683 sel_scroll_ev.stop(); 2068 sel_scroll_ev.stop();
1684#endif 2069#endif
2070
1685 if (ev.window == TermWin.vt) 2071 if (ev.window == vt)
1686 { 2072 {
2073 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2074 return;
2075
2076#if ISO_14755
2077 // 5.4
2078 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2079 return;
2080#endif
2081
1687 if (reportmode) 2082 if (reportmode)
1688 { 2083 {
1689 /* mouse report from vt window */ 2084 /* mouse report from vt window */
1690 /* don't report release of wheel "buttons" */ 2085 /* don't report release of wheel "buttons" */
1691 if (ev.button >= 4) 2086 if (ev.button >= 4)
… …
1705 MEvent.button = AnyButton; 2100 MEvent.button = AnyButton;
1706 mouse_report (ev); 2101 mouse_report (ev);
1707#endif /* MOUSE_REPORT_DOUBLECLICK */ 2102#endif /* MOUSE_REPORT_DOUBLECLICK */
1708 return; 2103 return;
1709 } 2104 }
2105
1710 /* 2106 /*
1711 * dumb hack to compensate for the failure of click-and-drag 2107 * dumb hack to compensate for the failure of click-and-drag
1712 * when overriding mouse reporting 2108 * when overriding mouse reporting
1713 */ 2109 */
1714 if (PrivateModes & PrivMode_mouse_report 2110 if (priv_modes & PrivMode_mouse_report
1715 && bypass_keystate 2111 && bypass_keystate
1716 && ev.button == Button1 && MEvent.clicks <= 1) 2112 && ev.button == Button1 && MEvent.clicks <= 1)
1717 selection_extend (ev.x, ev.y, 0); 2113 selection_extend (ev.x, ev.y, 0);
1718 2114
1719 switch (ev.button) 2115 switch (ev.button)
1720 { 2116 {
1721 case Button1: 2117 case Button1:
1722 case Button3: 2118 case Button3:
1723 selection_make (ev.time); 2119 selection_make (ev.time);
1724 break; 2120 break;
2121
1725 case Button2: 2122 case Button2:
1726 selection_request (ev.time, ev.x, ev.y); 2123 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2124 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
1727 break; 2125 break;
2126
1728#ifdef MOUSE_WHEEL 2127#ifdef MOUSE_WHEEL
1729 case Button4: 2128 case Button4:
1730 case Button5: 2129 case Button5:
1731 { 2130 {
1732 int i; 2131 int i;
… …
1734 2133
1735 v = ev.button == Button4 ? UP : DN; 2134 v = ev.button == Button4 ? UP : DN;
1736 2135
1737 if (ev.state & ShiftMask) 2136 if (ev.state & ShiftMask)
1738 i = 1; 2137 i = 1;
1739 else if (Options & Opt_mouseWheelScrollPage) 2138 else if (OPTION (Opt_mouseWheelScrollPage))
1740 i = TermWin.nrow - 1; 2139 i = nrow - 1;
1741 else 2140 else
1742 i = 5; 2141 i = 5;
1743 2142
1744# ifdef MOUSE_SLIP_WHEELING 2143# ifdef MOUSE_SLIP_WHEELING
1745 if (ev.state & ControlMask) 2144 if (ev.state & ControlMask)
1746 { 2145 {
1747 mouse_slip_wheel_speed += v ? -1 : 1; 2146 mouse_slip_wheel_speed += v ? -1 : 1;
1748 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2147 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; 2148 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
1750 2149
1751 if (slip_wheel_ev.at < NOW) 2150 if (slip_wheel_ev.at < NOW)
1752 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2151 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
1753 2152
1754 slip_wheel_ev.start (); 2153 slip_wheel_ev.start ();
1755 } 2154 }
1756 else 2155 else
1757 { 2156 {
1758# endif 2157# endif
1759# ifdef JUMP_MOUSE_WHEEL
1760 scr_page (v, i); 2158 scr_page (v, i);
1761 scr_refresh (SMOOTH_REFRESH);
1762 scrollbar_show (1); 2159 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 2160# ifdef MOUSE_SLIP_WHEELING
1772 } 2161 }
1773#endif 2162# endif
1774 } 2163 }
1775 break; 2164 break;
1776#endif 2165#endif
1777 } 2166 }
1778 } 2167 }
1779#ifdef MENUBAR
1780 else if (isMenuBarWindow (ev.window))
1781 menubar_control (ev);
1782#endif
1783} 2168}
1784 2169
1785#ifdef TRANSPARENT 2170#ifdef TRANSPARENT
1786#if TINTING 2171#if TINTING
1787/* taken from aterm-0.4.2 */ 2172/* taken from aterm-0.4.2 */
1788 2173
1789typedef uint32_t RUINT32T; 2174typedef uint32_t RUINT32T;
1790 2175
1791void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2176void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
1792{ 2177{
1793 int sh_r, sh_g, sh_b; 2178 int sh_r, sh_g, sh_b;
1794 RUINT32T mask_r, mask_g, mask_b; 2179 RUINT32T mask_r, mask_g, mask_b;
1795 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2180 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1796 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2181 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1797 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2182 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1798 int i; 2183 int i;
1799 2184
1800 Visual* visual = display->visual; 2185 Visual *visual = term->visual;
1801 2186
1802 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2187 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1803 2188
1804 /* for convenience */ 2189 /* for convenience */
1805 mask_r = visual->red_mask; 2190 mask_r = visual->red_mask;
… …
2029 Pixmap rootpixmap = None; 2414 Pixmap rootpixmap = None;
2030 XWindowAttributes wattr, wrootattr; 2415 XWindowAttributes wattr, wrootattr;
2031 2416
2032 pchanged = 0; 2417 pchanged = 0;
2033 2418
2034 if (!(Options & Opt_transparent)) 2419 if (!OPTION (Opt_transparent))
2035 return pchanged; /* Don't try any more */ 2420 return pchanged; /* Don't try any more */
2036 2421
2037 XGetWindowAttributes (display->display, display->root, &wrootattr); 2422 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2038 rootdepth = wrootattr.depth; 2423 rootdepth = wrootattr.depth;
2039 2424
2040 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2425 XGetWindowAttributes (xdisp, parent[0], &wattr);
2041 2426
2042 if (rootdepth != wattr.depth) 2427 if (rootdepth != wattr.depth)
2043 { 2428 {
2044 if (am_transparent) 2429 if (am_transparent)
2045 { 2430 {
2046 pchanged = 1; 2431 pchanged = 1;
2047 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2432 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2048 am_transparent = am_pixmap_trans = 0; 2433 am_transparent = am_pixmap_trans = 0;
2049 } 2434 }
2050 2435
2051 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
2052 } 2437 }
2053 2438
2054 /* Get all X ops out of the queue so that our information is up-to-date. */ 2439 /* Get all X ops out of the queue so that our information is up-to-date. */
2055 XSync (display->display, False); 2440 XSync (xdisp, False);
2056 2441
2057 /* 2442 /*
2058 * Make the frame window set by the window manager have 2443 * Make the frame window set by the window manager have
2059 * the root background. Some window managers put multiple nested frame 2444 * the root background. Some window managers put multiple nested frame
2060 * windows for each client, so we have to take care about that. 2445 * windows for each client, so we have to take care about that.
2061 */ 2446 */
2062 i = (xa[XA_XROOTPMAPID] 2447 i = (xa[XA_XROOTPMAP_ID]
2063 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2448 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2064 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2449 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2065 &nitems, &bytes_after, &prop) == Success); 2450 &nitems, &bytes_after, &prop) == Success);
2066 2451
2067 if (!i || prop == NULL) 2452 if (!i || prop == NULL)
2068 i = (xa[XA_XSETROOTID] 2453 i = (xa[XA_ESETROOT_PMAP_ID]
2069 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2454 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2070 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2455 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2071 &nitems, &bytes_after, &prop) == Success); 2456 &nitems, &bytes_after, &prop) == Success);
2072 2457
2073 if (!i || prop == NULL 2458 if (!i || prop == NULL
2074#if TINTING 2459#if TINTING
… …
2093 Window cr; 2478 Window cr;
2094 XImage *image; 2479 XImage *image;
2095 GC gc; 2480 GC gc;
2096 XGCValues gcvalue; 2481 XGCValues gcvalue;
2097 2482
2098 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2483 XTranslateCoordinates (xdisp, parent[0], display->root,
2099 0, 0, &sx, &sy, &cr); 2484 0, 0, &sx, &sy, &cr);
2100 nw = (unsigned int)szHint.width; 2485 nw = (unsigned int)szHint.width;
2101 nh = (unsigned int)szHint.height; 2486 nh = (unsigned int)szHint.height;
2102 nx = ny = 0; 2487 nx = ny = 0;
2103 2488
… …
2113 nh += sy; 2498 nh += sy;
2114 ny = -sy; 2499 ny = -sy;
2115 sy = 0; 2500 sy = 0;
2116 } 2501 }
2117 2502
2118 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2503 min_it (nw, (unsigned int) (wrootattr.width - sx));
2119 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2504 min_it (nh, (unsigned int) (wrootattr.height - sy));
2505
2506 XSync (xdisp, False);
2120 allowedxerror = -1; 2507 allowedxerror = -1;
2121 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2508 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2122 2509
2123 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2510 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2124 /* XXX: may need a delay here? */ 2511 /* XXX: may need a delay here? */
2125 allowedxerror = 0; 2512 allowedxerror = 0;
2126 2513
2127 if (image == NULL) 2514 if (image == NULL)
2128 { 2515 {
2129 if (am_transparent && am_pixmap_trans) 2516 if (am_transparent && am_pixmap_trans)
2130 { 2517 {
2131 pchanged = 1; 2518 pchanged = 1;
2132 if (TermWin.pixmap != None) 2519 if (pixmap != None)
2133 { 2520 {
2134 XFreePixmap (display->display, TermWin.pixmap); 2521 XFreePixmap (xdisp, pixmap);
2135 TermWin.pixmap = None; 2522 pixmap = None;
2136 } 2523 }
2137 } 2524 }
2138 2525
2139 am_pixmap_trans = 0; 2526 am_pixmap_trans = 0;
2140 } 2527 }
2141 else 2528 else
2142 { 2529 {
2143 if (TermWin.pixmap != None) 2530 if (pixmap != None)
2144 XFreePixmap (display->display, TermWin.pixmap); 2531 XFreePixmap (xdisp, pixmap);
2145 2532
2146#if TINTING 2533#if TINTING
2147 if (ISSET_PIXCOLOR (Color_tint)) 2534 if (ISSET_PIXCOLOR (Color_tint))
2148 { 2535 {
2149 unsigned short rm, gm, bm; 2536 unsigned short rm, gm, bm;
2150 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2537 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2151 2538
2152 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2539 pix_colors_focused[Color_tint].get (this, rm, gm, bm);
2153 2540
2154 ShadeXImage (display, image, shade, rm, gm, bm); 2541 ShadeXImage (this, image, shade, rm, gm, bm);
2155 } 2542 }
2156#endif 2543#endif
2157 2544
2158 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2545 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); 2546 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2161 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2547 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2162 nx, ny, image->width, image->height); 2548 nx, ny, image->width, image->height);
2163 XFreeGC (display->display, gc); 2549 XFreeGC (xdisp, gc);
2164 XDestroyImage (image); 2550 XDestroyImage (image);
2165 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2551 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2166 XClearWindow (display->display, TermWin.parent[0]); 2552 XClearWindow (xdisp, parent[0]);
2167 2553
2168 if (!am_transparent || !am_pixmap_trans) 2554 if (!am_transparent || !am_pixmap_trans)
2169 pchanged = 1; 2555 pchanged = 1;
2170 2556
2171 am_transparent = am_pixmap_trans = 1; 2557 am_transparent = am_pixmap_trans = 1;
2172 } 2558 }
2173 } 2559 }
2174 2560
2175 if (!am_pixmap_trans) 2561 if (am_pixmap_trans)
2562 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2563 else
2176 { 2564 {
2177 unsigned int n; 2565 unsigned int n;
2178 /* 2566 /*
2179 * InheritPixmap transparency 2567 * InheritPixmap transparency
2180 */ 2568 */
2181 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2182 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2569 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2183 { 2570 {
2184 oldp = TermWin.parent[i]; 2571 oldp = parent[i];
2185 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2572 XQueryTree (xdisp, parent[i - 1], &root,
2186 &TermWin.parent[i], &list, &n); 2573 &parent[i], &list, &n);
2187 XFree (list); 2574 XFree (list);
2188 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2189 2575
2190 if (TermWin.parent[i] == display->root) 2576 if (parent[i] == display->root)
2191 { 2577 {
2192 if (oldp != None) 2578 if (oldp != None)
2193 pchanged = 1; 2579 pchanged = 1;
2194 2580
2195 break; 2581 break;
2196 } 2582 }
2197 2583
2198 if (oldp != TermWin.parent[i]) 2584 if (oldp != parent[i])
2199 pchanged = 1; 2585 pchanged = 1;
2200 } 2586 }
2201 2587
2202 n = 0; 2588 n = 0;
2203 2589
2204 if (pchanged) 2590 if (pchanged)
2205 { 2591 {
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"));
2210 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2595 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2211 { 2596 {
2212 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2597 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2213 break; 2598 break;
2214 } 2599 }
2215 } 2600 }
2216 } 2601 }
2217 2602
2218 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2603 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2219 { 2604 {
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_FRILLS
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_FRILLS
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 */
2875 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3281 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3283 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions.
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 //
3289 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]);
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_FRILLS
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_FRILLS
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 3571
3153 3572
3154 /* 3573 /*
3155 * reports - some output format copied from XTerm 3574 * reports - some output format copied from XTerm
3156 */ 3575 */
3157 case 11: /* report window state */ 3576 case 11: /* report window state */
3158 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3577 XGetWindowAttributes (xdisp, parent[0], &wattr);
3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3578 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3160 break; 3579 break;
3161 case 13: /* report window position */ 3580 case 13: /* report window position */
3162 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3581 XGetWindowAttributes (xdisp, parent[0], &wattr);
3163 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3582 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3164 -wattr.border_width, -wattr.border_width, 3583 -wattr.border_width, -wattr.border_width,
3165 &x, &y, &wdummy); 3584 &x, &y, &wdummy);
3166 tt_printf ("\033[3;%d;%dt", x, y); 3585 tt_printf ("\033[3;%d;%dt", x, y);
3167 break; 3586 break;
3168 case 14: /* report window size (pixels) */ 3587 case 14: /* report window size (pixels) */
3169 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3588 XGetWindowAttributes (xdisp, parent[0], &wattr);
3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3589 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3171 break; 3590 break;
3172 case 18: /* report text area size (chars) */ 3591 case 18: /* report text area size (chars) */
3173 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3592 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3174 break; 3593 break;
3175 case 19: /* report window size (chars) */ 3594 case 19: /* report window size (chars) */
3176 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3595 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3177 break; 3596 break;
3178 case 20: /* report icon label */ 3597 case 20: /* report icon label */
3179 if (Options & Opt_insecure)
3180 { 3598 {
3181 char *s; 3599 char *s;
3182 XGetIconName (display->display, TermWin.parent[0], &s); 3600 XGetIconName (xdisp, parent[0], &s);
3183 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3601 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3602 XFree (s);
3184 } 3603 }
3185 break; 3604 break;
3186 case 21: /* report window title */ 3605 case 21: /* report window title */
3187 if (Options & Opt_insecure)
3188 { 3606 {
3189 char *s; 3607 char *s;
3190 XFetchName (display->display, TermWin.parent[0], &s); 3608 XFetchName (xdisp, parent[0], &s);
3191 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3609 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3610 XFree (s);
3192 } 3611 }
3193 break; 3612 break;
3194 } 3613 }
3195} 3614}
3196#endif 3615#endif
3197 3616
3198/*----------------------------------------------------------------------*/ 3617/*----------------------------------------------------------------------*/
3199/* 3618/*
3200 * get input up until STRING TERMINATOR (or BEL) 3619 * get input up until STRING TERMINATOR (or BEL)
3201 * ends_how is terminator used. returned input must be free()'d 3620 * ends_how is terminator used. returned input must be free()'d
3202 */ 3621 */
3203unsigned char * 3622char *
3204rxvt_term::get_to_st (unicode_t &ends_how) 3623rxvt_term::get_to_st (unicode_t &ends_how)
3205{ 3624{
3206 unicode_t prev = 0, ch; 3625 unicode_t ch;
3626 bool seen_esc = false;
3207 unsigned int n = 0; 3627 unsigned int n = 0;
3208 unsigned char *s;
3209 unsigned char string[STRING_MAX]; 3628 wchar_t string[STRING_MAX];
3210 3629
3211 while ((ch = cmd_getc ()) != NOCHAR) 3630 while ((ch = cmd_getc ()) != NOCHAR)
3212 { 3631 {
3213 if (prev == C0_ESC) 3632 if (seen_esc)
3214 { 3633 {
3215 if (ch == 0x5c) /* 7bit ST */ 3634 if (ch == 0x5c) /* 7bit ST */
3216 break; 3635 break;
3217 else 3636 else
3218 return NULL; 3637 return NULL;
3219 } 3638 }
3639 else if (ch == C0_ESC)
3640 {
3641 seen_esc = true;
3642 continue;
3643 }
3220 else if (ch == C0_BEL || ch == CHAR_ST) 3644 else if (ch == C0_BEL || ch == CHAR_ST)
3221 break; 3645 break;
3222 else if (ch < 0x20) 3646 else if (ch < 0x20)
3223 return NULL; /* other control character - exit */ 3647 return NULL; /* other control character - exit */
3224 3648
3225 if (n >= sizeof (string) - 1) 3649 seen_esc = false;
3650
3651 if (n >= STRING_MAX - 1)
3226 // stop at some sane length 3652 // stop at some sane length
3227 return NULL; 3653 return NULL;
3228 3654
3229 if (ch == C0_SYN) 3655 if (ch == C0_SYN)
3230 {
3231 string[n++] = cmd_get8 (); 3656 string[n++] = cmd_get8 ();
3232 prev = 0;
3233 }
3234 else 3657 else
3235 string[n++] = prev = ch; 3658 string[n++] = ch;
3236 } 3659 }
3237 3660
3238 string[n++] = '\0'; 3661 string[n++] = '\0';
3239 3662
3240 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3241 return NULL;
3242
3243 ends_how = (ch == 0x5c ? C0_ESC : ch); 3663 ends_how = (ch == 0x5c ? C0_ESC : ch);
3244 STRNCPY (s, string, n); 3664
3245 return s; 3665 return rxvt_wcstombs (string);
3246} 3666}
3247 3667
3248/*----------------------------------------------------------------------*/ 3668/*----------------------------------------------------------------------*/
3249/* 3669/*
3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3670 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3251 */ 3671 */
3252void 3672void
3253rxvt_term::process_dcs_seq () 3673rxvt_term::process_dcs_seq ()
3254{ 3674{
3255 unsigned char *s; 3675 char *s;
3256 unicode_t eh; 3676 unicode_t eh;
3257 3677
3258 /* 3678 /*
3259 * Not handled yet 3679 * Not handled yet
3260 */ 3680 */
… …
3279 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3699 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3280 arg = arg * 10 + (ch - '0'); 3700 arg = arg * 10 + (ch - '0');
3281 3701
3282 if (ch == ';') 3702 if (ch == ';')
3283 { 3703 {
3284 unsigned char *s = get_to_st (eh); 3704 char *s = get_to_st (eh);
3285 3705
3286 if (s) 3706 if (s)
3287 { 3707 {
3288 process_xterm_seq (arg, (char *)s, eh); 3708 process_xterm_seq (arg, s, eh);
3289 free (s); 3709 free (s);
3290 } 3710 }
3291 } 3711 }
3292} 3712}
3293 3713
3294void 3714void
3295rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3715rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3296{ 3716{
3297 if (str[0] == '?' && !str[1]) 3717 if (str[0] == '?' && !str[1])
3298 { 3718 {
3299 if (Options & Opt_insecure)
3300 {
3301 unsigned short r, g, b; 3719 unsigned short r, g, b;
3302 PixColorsFocused[color].get (display, r, g, b); 3720 pix_colors_focused[color].get (this, r, g, b);
3303 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3721 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3304 }
3305 } 3722 }
3306 else 3723 else
3307 set_window_color (color, str); 3724 set_window_color (color, str);
3308} 3725}
3309 3726
3310/* 3727/*
3311 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3728 * 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 */ 3729 */
3335void 3730void
3336rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3731rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3337{ 3732{
3338 int changed = 0;
3339 int color; 3733 int color;
3340 char *buf, *name; 3734 char *buf, *name;
3341 bool query = str[0] == '?' && !str[1]; 3735 bool query = str[0] == '?' && !str[1];
3736 int saveop = op;
3737
3738 dLocal (Display *, xdisp);
3342 3739
3343 assert (str != NULL); 3740 assert (str != NULL);
3344 switch (op) 3741 switch (op)
3345 { 3742 {
3346 case XTerm_name: 3743 case XTerm_name:
… …
3353 set_title (str); 3750 set_title (str);
3354 break; 3751 break;
3355 case XTerm_property: 3752 case XTerm_property:
3356 if (str[0] == '?') 3753 if (str[0] == '?')
3357 { 3754 {
3358 Atom prop = XInternAtom (display->display, str + 1, True); 3755 Atom prop = display->atom (str + 1);
3359 Atom actual_type; 3756 Atom actual_type;
3360 int actual_format; 3757 int actual_format;
3361 unsigned long nitems; 3758 unsigned long nitems;
3362 unsigned long bytes_after; 3759 unsigned long bytes_after;
3363 unsigned char *value = 0; 3760 unsigned char *value = 0;
3364 const char *str = ""; 3761 const char *str = "";
3365 3762
3366 if (prop 3763 if (prop
3367 && XGetWindowProperty (display->display, TermWin.parent[0], 3764 && XGetWindowProperty (xdisp, parent[0],
3368 prop, 0, 1<<16, 0, AnyPropertyType, 3765 prop, 0, 1<<16, 0, AnyPropertyType,
3369 &actual_type, &actual_format, 3766 &actual_type, &actual_format,
3370 &nitems, &bytes_after, &value) == Success 3767 &nitems, &bytes_after, &value) == Success
3371 && actual_type != None 3768 && actual_type != None
3372 && actual_format == 8) 3769 && actual_format == 8)
… …
3381 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3778 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3382 3779
3383 if (eq) 3780 if (eq)
3384 { 3781 {
3385 *eq = 0; 3782 *eq = 0;
3386 XChangeProperty (display->display, TermWin.parent[0], 3783 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 } 3784 }
3391 else 3785 else
3392 XDeleteProperty (display->display, TermWin.parent[0], 3786 XDeleteProperty (xdisp, parent[0],
3393 display->atom (str)); 3787 display->atom (str));
3394 } 3788 }
3395 break; 3789 break;
3396 3790
3397 case XTerm_Color: 3791 case XTerm_Color:
3398 for (buf = (char *)str; buf && *buf;) 3792 for (buf = (char *)str; buf && *buf;)
3399 { 3793 {
3400 if ((name = STRCHR (buf, ';')) == NULL) 3794 if ((name = strchr (buf, ';')) == NULL)
3401 break; 3795 break;
3402 3796
3403 *name++ = '\0'; 3797 *name++ = '\0';
3404 color = atoi (buf); 3798 color = atoi (buf) + minCOLOR;
3405 3799
3406 if (color < 0 || color >= TOTAL_COLORS) 3800 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3407 break; 3801 break;
3408 3802
3409 if ((buf = STRCHR (name, ';')) != NULL) 3803 if ((buf = strchr (name, ';')) != NULL)
3410 *buf++ = '\0'; 3804 *buf++ = '\0';
3411 3805
3412 if (name[0] == '?' && !name[1]) 3806 if (name[0] == '?' && !name[1])
3413 { 3807 {
3414 if (Options & Opt_insecure)
3415 {
3416 unsigned short r, g, b; 3808 unsigned short r, g, b;
3417 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3809 pix_colors_focused[color].get (this, r, g, b);
3418 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3810 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3419 }
3420 } 3811 }
3421 else 3812 else
3422 set_window_color (color + minCOLOR, name); 3813 set_window_color (color, name);
3423 } 3814 }
3424 break; 3815 break;
3425 case XTerm_Color00: 3816 case XTerm_Color00:
3426 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3817 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3427 break; 3818 break;
3428 case XTerm_Color01: 3819 case XTerm_Color01:
3429 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3820 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3430 break; 3821 break;
3431#ifndef NO_CURSORCOLOR 3822#ifndef NO_CURSORCOLOR
3432 case XTerm_Color_cursor: 3823 case XTerm_Color_cursor:
3433 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3824 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3434 break; 3825 break;
… …
3438 break; 3829 break;
3439 case XTerm_Color_pointer_bg: 3830 case XTerm_Color_pointer_bg:
3440 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3831 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3441 break; 3832 break;
3442#ifndef NO_BOLD_UNDERLINE_REVERSE 3833#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: 3834 case XTerm_Color_RV:
3450 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3835 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3451 break; 3836 break;
3837 case Rxvt_Color_BD:
3838 case URxvt_Color_BD:
3839 process_color_seq (op, Color_BD, str, resp);
3840 break;
3841 case Rxvt_Color_UL:
3842 case URxvt_Color_UL:
3843 process_color_seq (op, Color_UL, str, resp);
3844 break;
3845 case URxvt_Color_IT:
3846 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3847 break;
3452#endif 3848#endif
3849#if TRANSPARENT && TINTING
3850 case URxvt_Color_tint:
3851 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3852 check_our_parents ();
3853 if (am_transparent)
3854 want_full_refresh = want_refresh = 1;
3855 break;
3856#endif
3453 3857
3454 case XTerm_Pixmap: 3858 case Rxvt_Pixmap:
3859 {
3455 if (*str != ';') 3860 if (*str != ';')
3456 { 3861 {
3457#if XPM_BACKGROUND 3862#if XPM_BACKGROUND
3458 scale_pixmap (""); /* reset to default scaling */ 3863 scale_pixmap (""); /* reset to default scaling */
3459 set_bgPixmap (str); /* change pixmap */ 3864 set_bgPixmap (str); /* change pixmap */
3460#endif
3461 scr_touch (true); 3865 scr_touch (true);
3866#endif
3462 } 3867 }
3868
3869 int changed = 0;
3870
3463 while ((str = STRCHR (str, ';')) != NULL) 3871 while ((str = strchr (str, ';')) != NULL)
3464 { 3872 {
3465 str++; 3873 str++;
3466#if XPM_BACKGROUND 3874#if XPM_BACKGROUND
3467 changed += scale_pixmap (str); 3875 changed += scale_pixmap (str);
3468#endif 3876#endif
3469
3470 } 3877 }
3878
3471 if (changed) 3879 if (changed)
3472 { 3880 {
3473#ifdef XPM_BACKGROUND 3881#ifdef XPM_BACKGROUND
3474 resize_pixmap (); 3882 resize_pixmap ();
3475#endif
3476 scr_touch (true); 3883 scr_touch (true);
3884#endif
3477 } 3885 }
3886 }
3478 break; 3887 break;
3479 3888
3480 case XTerm_restoreFG: 3889 case Rxvt_restoreFG:
3481 set_window_color (Color_fg, str); 3890 set_window_color (Color_fg, str);
3482 break; 3891 break;
3483 case XTerm_restoreBG: 3892 case Rxvt_restoreBG:
3484 set_window_color (Color_bg, str); 3893 set_window_color (Color_bg, str);
3485 break; 3894 break;
3486 3895
3487 case XTerm_logfile: 3896 case XTerm_logfile:
3488 // TODO, when secure mode? 3897 // TODO, when secure mode?
3489 break; 3898 break;
3490 3899
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 3900#if 0
3538 case XTerm_dumpscreen: /* no error notices */ 3901 case Rxvt_dumpscreen: /* no error notices */
3539 { 3902 {
3540 int fd; 3903 int fd;
3541 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3904 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3542 { 3905 {
3543 scr_dump (fd); 3906 scr_dump (fd);
3544 close (fd); 3907 close (fd);
3545 } 3908 }
3546 } 3909 }
3910 break;
3911#endif
3912 case XTerm_font:
3913 op = URxvt_font;
3914 case URxvt_font:
3915#if ENABLE_STYLES
3916 case URxvt_boldFont:
3917 case URxvt_italicFont:
3918 case URxvt_boldItalicFont:
3919#endif
3920 if (query)
3921 tt_printf ("\33]%d;%-.250s%c", saveop,
3922 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3923 ? fontset[op - URxvt_font]->fontdesc : "",
3924 resp);
3925 else
3926 {
3927 const char *&res = rs[Rs_font + (op - URxvt_font)];
3928
3929 res = strdup (str);
3930 allocated.push_back ((void *)res);
3931 set_fonts ();
3932 }
3933 break;
3934
3935#if ENABLE_FRILLS
3936 case URxvt_locale:
3937 if (query)
3938 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3939 else
3940 {
3941 set_locale (str);
3942 pty->set_utf8_mode (enc_utf8);
3943 init_xlocale ();
3944 }
3945 break;
3946
3947 case URxvt_view_up:
3948 case URxvt_view_down:
3949 {
3950 int lines = atoi (str);
3951
3952 if (lines)
3953 scr_page (op == URxvt_view_up ? UP : DN, lines);
3954 else
3955 scr_erase_savelines ();
3956 }
3957
3958 break;
3959#endif
3960
3961#if ENABLE_PERL
3962 case URxvt_perl:
3963 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3964 ; // no responses yet
3547 break; 3965 break;
3548#endif 3966#endif
3549 } 3967 }
3550} 3968}
3551/*----------------------------------------------------------------------*/ 3969/*----------------------------------------------------------------------*/
… …
3565{ 3983{
3566 int state; 3984 int state;
3567 3985
3568 if (mode == 's') 3986 if (mode == 's')
3569 { 3987 {
3570 SavedModes |= (PrivateModes & bit); 3988 SavedModes |= (priv_modes & bit);
3571 return -1; 3989 return -1;
3572 } 3990 }
3573 else 3991 else
3574 { 3992 {
3575 if (mode == 'r') 3993 if (mode == 'r')
3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3994 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3577 else 3995 else
3578 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3996 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3579 PrivMode (state, bit); 3997 PrivMode (state, bit);
3580 } 3998 }
3581 3999
3582 return state; 4000 return state;
3583} 4001}
3584 4002
3585/* we're not using priv _yet_ */ 4003/* we're not using priv _yet_ */
3586void 4004void
3587rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4005rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3588{ 4006{
3589 unsigned int i, j; 4007 unsigned int i, j;
3590 int state; 4008 int state;
3591 4009
3592 static const struct 4010 static const struct
… …
3601 { 3, PrivMode_132 }, 4019 { 3, PrivMode_132 },
3602 { 4, PrivMode_smoothScroll }, 4020 { 4, PrivMode_smoothScroll },
3603 { 5, PrivMode_rVideo }, 4021 { 5, PrivMode_rVideo },
3604 { 6, PrivMode_relOrigin }, 4022 { 6, PrivMode_relOrigin },
3605 { 7, PrivMode_Autowrap }, 4023 { 7, PrivMode_Autowrap },
4024 // 8, bi-directional support mode
3606 { 9, PrivMode_MouseX10 }, 4025 { 9, PrivMode_MouseX10 },
3607#ifdef menuBar_esc 4026 // 18, 19 printing-related
3608 { menuBar_esc, PrivMode_menuBar }, 4027 { 25, PrivMode_VisibleCursor },
3609#endif
3610#ifdef scrollBar_esc 4028#ifdef scrollBar_esc
3611 { scrollBar_esc, PrivMode_scrollBar }, 4029 { scrollBar_esc, PrivMode_scrollBar },
3612#endif 4030#endif
3613 // 18, 19 printing-related
3614 { 25, PrivMode_VisibleCursor },
3615 // 30 show scrollbar rxvt. extension
3616 { 35, PrivMode_ShiftKeys }, // rxvt extension 4031 { 35, PrivMode_ShiftKeys }, // rxvt extension
3617 { 40, PrivMode_132OK }, 4032 { 40, PrivMode_132OK },
3618 // 41 xterm more fixes NYI 4033 // 41 xterm more fixes NYI
3619 // 45 margin bell NYI 4034 // 45 margin bell NYI
3620 // 46 start logging 4035 // 46 start logging
… …
3660 } 4075 }
3661 4076
3662 /* extra handling for values with state unkept */ 4077 /* extra handling for values with state unkept */
3663 switch (arg[i]) 4078 switch (arg[i])
3664 { 4079 {
4080#if ENABLE_STYLES
4081 case 1021:
4082 set_option (Opt_intensityStyles, mode);
4083
4084 scr_touch (true);
4085 break;
4086#endif
3665 case 1048: /* alternative cursor save */ 4087 case 1048: /* alternative cursor save */
4088 case 1049:
3666 if (Options & Opt_secondaryScreen) 4089 if (OPTION (Opt_secondaryScreen))
3667 if (mode == 0) 4090 if (mode == 0)
3668 scr_cursor (RESTORE); 4091 scr_cursor (RESTORE);
3669 else if (mode == 1) 4092 else if (mode == 1)
3670 scr_cursor (SAVE); 4093 scr_cursor (SAVE);
3671 break; 4094 break;
… …
3682 * within VT52 mode 4105 * within VT52 mode
3683 */ 4106 */
3684 PrivMode (1, PrivMode_vt52); 4107 PrivMode (1, PrivMode_vt52);
3685 break; 4108 break;
3686 case 3: /* 80/132 */ 4109 case 3: /* 80/132 */
3687 if (PrivateModes & PrivMode_132OK) 4110 if (priv_modes & PrivMode_132OK)
3688 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4111 set_widthheight (((state ? 132 : 80) * fwidth), height);
3689 break; 4112 break;
3690 case 4: /* smooth scrolling */ 4113 case 4: /* smooth scrolling */
3691 if (state) 4114 set_option (Opt_jumpScroll, !state);
3692 Options &= ~Opt_jumpScroll;
3693 else
3694 Options |= Opt_jumpScroll;
3695 break; 4115 break;
3696 case 5: /* reverse video */ 4116 case 5: /* reverse video */
3697 scr_rvideo_mode (state); 4117 scr_rvideo_mode (state);
3698 break; 4118 break;
3699 case 6: /* relative/absolute origins */ 4119 case 6: /* relative/absolute origins */
… …
3703 scr_autowrap (state); 4123 scr_autowrap (state);
3704 break; 4124 break;
3705 /* case 8: - auto repeat, can't do on a per window basis */ 4125 /* case 8: - auto repeat, can't do on a per window basis */
3706 case 9: /* X10 mouse reporting */ 4126 case 9: /* X10 mouse reporting */
3707 if (state) /* orthogonal */ 4127 if (state) /* orthogonal */
3708 PrivateModes &= ~PrivMode_MouseX11; 4128 priv_modes &= ~PrivMode_MouseX11;
3709 break; 4129 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 4130#ifdef scrollBar_esc
3718 case scrollBar_esc: 4131 case scrollBar_esc:
3719 if (scrollbar_mapping (state)) 4132 if (scrollbar_mapping (state))
3720 { 4133 {
3721 resize_all_windows (0, 0, 0); 4134 resize_all_windows (0, 0, 0);
… …
3733 break; 4146 break;
3734 /* case 66: - application key pad */ 4147 /* case 66: - application key pad */
3735 /* case 67: - backspace key */ 4148 /* case 67: - backspace key */
3736 case 1000: /* X11 mouse reporting */ 4149 case 1000: /* X11 mouse reporting */
3737 if (state) /* orthogonal */ 4150 if (state) /* orthogonal */
3738 PrivateModes &= ~PrivMode_MouseX10; 4151 priv_modes &= ~PrivMode_MouseX10;
3739 break; 4152 break;
3740#if 0 4153#if 0
3741 case 1001: 4154 case 1001:
3742 break; /* X11 mouse highlighting */ 4155 break; /* X11 mouse highlighting */
3743#endif 4156#endif
3744 case 1010: /* scroll to bottom on TTY output inhibit */ 4157 case 1010: /* scroll to bottom on TTY output inhibit */
3745 if (state)
3746 Options &= ~Opt_scrollTtyOutput;
3747 else
3748 Options |= Opt_scrollTtyOutput; 4158 set_option (Opt_scrollTtyOutput, !state);
3749 break; 4159 break;
3750 case 1011: /* scroll to bottom on key press */ 4160 case 1011: /* scroll to bottom on key press */
3751 if (state)
3752 Options |= Opt_scrollTtyKeypress; 4161 set_option (Opt_scrollTtyKeypress, state);
3753 else
3754 Options &= ~Opt_scrollTtyKeypress;
3755 break; 4162 break;
3756 case 1047: /* secondary screen w/ clearing last */ 4163 case 1047: /* secondary screen w/ clearing last */
3757 if (Options & Opt_secondaryScreen) 4164 if (OPTION (Opt_secondaryScreen))
3758 if (current_screen != PRIMARY) 4165 if (current_screen != PRIMARY)
3759 scr_erase_screen (2); 4166 scr_erase_screen (2);
3760 scr_change_screen (state); 4167 scr_change_screen (state);
3761 break; 4168 break;
3762 case 1049: /* secondary screen w/ clearing first */ 4169 case 1049: /* secondary screen w/ clearing first */
3763 scr_change_screen (state); 4170 scr_change_screen (state);
3764 if (Options & Opt_secondaryScreen) 4171 if (OPTION (Opt_secondaryScreen))
3765 if (current_screen != PRIMARY) 4172 if (current_screen != PRIMARY)
3766 scr_erase_screen (2); 4173 scr_erase_screen (2);
3767 break; 4174 break;
3768 default: 4175 default:
3769 break; 4176 break;
… …
3795 rendset = 0, rendstyle = ~RS_None; 4202 rendset = 0, rendstyle = ~RS_None;
3796 break; 4203 break;
3797 case 1: 4204 case 1:
3798 rendset = 1, rendstyle = RS_Bold; 4205 rendset = 1, rendstyle = RS_Bold;
3799 break; 4206 break;
3800 //case 2: // faint or second colour 4207 //case 2: // low intensity
4208 case 3:
4209 rendset = 1, rendstyle = RS_Italic;
4210 break;
3801 case 4: 4211 case 4:
3802 rendset = 1, rendstyle = RS_Uline; 4212 rendset = 1, rendstyle = RS_Uline;
3803 break; 4213 break;
3804 case 5: // slowly blinking 4214 case 5: // slowly blinking
3805 case 6: // rapidly blinking 4215 case 6: // rapidly blinking
… …
3817 //case 11: // scoansi acs on, first alt font 4227 //case 11: // scoansi acs on, first alt font
3818 //case 12: // scoansi acs on, |0x80, second alt font 4228 //case 12: // scoansi acs on, |0x80, second alt font
3819 //... 4229 //...
3820 //case 19: // ninth alt font 4230 //case 19: // ninth alt font
3821 //case 20: // gothic 4231 //case 20: // gothic
3822 case 21: // disable bold, faint 4232 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3823 rendset = 0, rendstyle = RS_Bold; 4233 rendset = 0, rendstyle = RS_Bold;
3824 break; 4234 break;
3825 case 22: 4235 case 22: // normal intensity
3826 rendset = 0, rendstyle = RS_Bold; 4236 rendset = 0, rendstyle = RS_Bold;
3827 break; 4237 break;
3828 //case 23: disable italic 4238 case 23: // disable italic
4239 rendset = 0, rendstyle = RS_Italic;
4240 break;
3829 case 24: 4241 case 24:
3830 rendset = 0, rendstyle = RS_Uline; 4242 rendset = 0, rendstyle = RS_Uline;
3831 break; 4243 break;
3832 case 25: 4244 case 25:
4245 rendset = 0, rendstyle = RS_Blink;
4246 break;
4247 case 26: // variable spacing (iso 8613)
3833 rendset = 0, rendstyle = RS_Blink; 4248 rendset = 0, rendstyle = RS_Blink;
3834 break; 4249 break;
3835 case 27: 4250 case 27:
3836 rendset = 0, rendstyle = RS_RVid; 4251 rendset = 0, rendstyle = RS_RVid;
3837 break; 4252 break;
… …
3855 case 35: 4270 case 35:
3856 case 36: 4271 case 36:
3857 case 37: 4272 case 37:
3858 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4273 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3859 break; 4274 break;
3860#ifdef TTY_256COLOR 4275 case 38: // set fg color, ISO 8613-6
3861 case 38:
3862 if (nargs > i + 2 && arg[i + 1] == 5) 4276 if (nargs > i + 2 && arg[i + 1] == 5)
3863 { 4277 {
3864 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4278 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3865 i += 2; 4279 i += 2;
3866 } 4280 }
3867 break; 4281 break;
3868#endif
3869 case 39: /* default fg */ 4282 case 39: /* default fg */
3870 scr_color (Color_fg, Color_fg); 4283 scr_color (Color_fg, Color_fg);
3871 break; 4284 break;
3872 4285
3873 case 40: 4286 case 40:
… …
3878 case 45: 4291 case 45:
3879 case 46: 4292 case 46:
3880 case 47: 4293 case 47:
3881 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4294 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3882 break; 4295 break;
3883#ifdef TTY_256COLOR 4296 case 48: // set bg color, ISO 8613-6
3884 case 48:
3885 if (nargs > i + 2 && arg[i + 1] == 5) 4297 if (nargs > i + 2 && arg[i + 1] == 5)
3886 { 4298 {
3887 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4299 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3888 i += 2; 4300 i += 2;
3889 } 4301 }
3890 break; 4302 break;
3891#endif
3892 case 49: /* default bg */ 4303 case 49: /* default bg */
3893 scr_color (Color_bg, Color_bg); 4304 scr_color (Color_bg, Color_bg);
3894 break; 4305 break;
3895 4306
3896#ifndef NO_BRIGHTCOLOR 4307 //case 50: // not variable spacing
4308
4309#if ENABLE_FRILLS
3897 case 90: 4310 case 90:
3898 case 91: /* set bright fg color */ 4311 case 91: /* set bright fg color */
3899 case 92: 4312 case 92:
3900 case 93: 4313 case 93:
3901 case 94: 4314 case 94:
3902 case 95: 4315 case 95:
3903 case 96: 4316 case 96:
3904 case 97: 4317 case 97:
3905 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4318 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3906 Color_fg);
3907 break; 4319 break;
3908 case 100: 4320 case 100:
3909 case 101: /* set bright bg color */ 4321 case 101: /* set bright bg color */
3910 case 102: 4322 case 102:
3911 case 103: 4323 case 103:
3912 case 104: 4324 case 104:
3913 case 105: 4325 case 105:
3914 case 106: 4326 case 106:
3915 case 107: 4327 case 107:
3916 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4328 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3917 Color_bg);
3918 break; 4329 break;
3919#endif 4330#endif
3920
3921 } 4331 }
3922 } 4332 }
3923} 4333}
3924/*}}} */ 4334/*}}} */
3925 4335
… …
3929{ 4339{
3930 unicode_t ch, cmd = cmd_getc (); 4340 unicode_t ch, cmd = cmd_getc ();
3931 4341
3932 if (cmd == 'Q') 4342 if (cmd == 'Q')
3933 { /* query graphics */ 4343 { /* query graphics */
3934 tt_printf ("\033G0\n"); /* no graphics */ 4344 tt_printf ("\033G0\012"); /* no graphics */
3935 return; 4345 return;
3936 } 4346 }
3937 /* swallow other graphics sequences until terminating ':' */ 4347 /* swallow other graphics sequences until terminating ':' */
3938 do 4348 do
3939 ch = cmd_getc (); 4349 ch = cmd_getc ();
… …
3949 */ 4359 */
3950void 4360void
3951rxvt_term::tt_printf (const char *fmt,...) 4361rxvt_term::tt_printf (const char *fmt,...)
3952{ 4362{
3953 va_list arg_ptr; 4363 va_list arg_ptr;
3954 unsigned char buf[256]; 4364 char buf[256];
3955 4365
3956 va_start (arg_ptr, fmt); 4366 va_start (arg_ptr, fmt);
3957 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4367 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3958 va_end (arg_ptr); 4368 va_end (arg_ptr);
3959 tt_write (buf, STRLEN (buf)); 4369 tt_write (buf, strlen (buf));
3960} 4370}
3961 4371
3962/* ---------------------------------------------------------------------- */ 4372/* ---------------------------------------------------------------------- */
3963/* Write data to the pty as typed by the user, pasted with the mouse, 4373/* 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. 4374 * or generated by us in response to a query ESC sequence.
3965 */ 4375 */
4376const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4377
3966void 4378void
3967rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4379rxvt_term::tt_write (const char *data, unsigned int len)
3968{ 4380{
3969 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4381 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4382 return;
3970 4383
3971 if (len) 4384 if (pty->pty < 0)
4385 return;
4386
4387 if (v_buflen == 0)
4388 {
4389 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4390
4391 if ((unsigned int)written == len)
4392 return;
4393
4394 data += written;
4395 len -= written;
3972 { 4396 }
4397
4398 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4399
4400 memcpy (v_buffer + v_buflen, data, len);
4401 v_buflen += len;
4402
4403 pty_ev.set (EVENT_READ | EVENT_WRITE);
4404}
4405
4406void rxvt_term::pty_write ()
4407{
4408 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4409
4410 if (written > 0)
4411 {
4412 v_buflen -= written;
4413
3973 if (v_buflen == 0) 4414 if (v_buflen == 0)
3974 { 4415 {
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); 4416 free (v_buffer);
4002 v_buffer = 0; 4417 v_buffer = 0;
4003 v_buflen = 0; 4418 v_buflen = 0;
4004 4419
4005 pty_ev.set (EVENT_READ); 4420 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; 4421 return;
4018 } 4422 }
4423
4424 memmove (v_buffer, v_buffer + written, v_buflen);
4019 } 4425 }
4426 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4427 pty_ev.set (EVENT_READ);
4020} 4428}
4021 4429
4022/*----------------------- end-of-file (C source) -----------------------*/ 4430/*----------------------- end-of-file (C source) -----------------------*/
4023 4431

Diff Legend

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