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.55 by pcg, Sun Feb 22 20:08:18 2004 UTC vs.
Revision 1.228 by root, Mon Jan 2 16:08:34 2006 UTC

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

Diff Legend

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