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.53 by pcg, Sun Feb 22 12:34:53 2004 UTC vs.
Revision 1.235 by root, Wed Jan 4 20:43:37 2006 UTC

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

Diff Legend

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