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

Diff Legend

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