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

Diff Legend

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