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

Diff Legend

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