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

Diff Legend

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