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

Diff Legend

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