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

Diff Legend

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