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.49 by pcg, Sat Feb 21 22:14:00 2004 UTC vs.
Revision 1.223 by root, Sun Jan 1 05:28:28 2006 UTC

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

Diff Legend

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