ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.116 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.278 by root, Fri Jan 20 18:50:49 2006 UTC

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

Diff Legend

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