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

Diff Legend

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