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

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

Diff Legend

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