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.93 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.202 by root, Sat Mar 12 23:35:14 2005 UTC

… …
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 {
… …
683rxvt_term::check_cb (check_watcher &w) 953rxvt_term::check_cb (check_watcher &w)
684{ 954{
685 SET_R (this); 955 SET_R (this);
686 SET_LOCALE (locale); 956 SET_LOCALE (locale);
687 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;
688 flush (); 972 flush ();
689} 973}
690 974
691#ifdef CURSOR_BLINK 975#ifdef CURSOR_BLINK
692void 976void
… …
710 w.start (w.at + TEXT_BLINK_INTERVAL); 994 w.start (w.at + TEXT_BLINK_INTERVAL);
711 } 995 }
712} 996}
713#endif 997#endif
714 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
715bool 1046bool
716rxvt_term::pty_fill () 1047rxvt_term::pty_fill ()
717{ 1048{
718 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1049 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
719 1050
… …
725 1056
726 memmove (cmdbuf_base, cmdbuf_ptr, n); 1057 memmove (cmdbuf_base, cmdbuf_ptr, n);
727 cmdbuf_ptr = cmdbuf_base; 1058 cmdbuf_ptr = cmdbuf_base;
728 cmdbuf_endp = cmdbuf_ptr + n; 1059 cmdbuf_endp = cmdbuf_ptr + n;
729 1060
730 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1061 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
731 1062
732 if (n > 0) 1063 if (n > 0)
733 { 1064 {
734 cmdbuf_endp += n; 1065 cmdbuf_endp += n;
735 return true; 1066 return true;
… …
744rxvt_term::pty_cb (io_watcher &w, short revents) 1075rxvt_term::pty_cb (io_watcher &w, short revents)
745{ 1076{
746 SET_R (this); 1077 SET_R (this);
747 SET_LOCALE (locale); 1078 SET_LOCALE (locale);
748 1079
749 if (revents & EVENT_WRITE)
750 tt_write (0, 0);
751 else if (revents & EVENT_READ) 1080 if (revents & EVENT_READ)
752 // loop, but don't allow a single term to monopolize us 1081 // loop, but don't allow a single term to monopolize us
753 while (pty_fill ()) 1082 while (pty_fill ())
754 if (cmd_parse ()) 1083 if (cmd_parse ())
755 break; 1084 break;
1085
1086 if (revents & EVENT_WRITE)
1087 pty_write ();
1088}
1089
1090void
1091rxvt_term::pointer_unblank ()
1092{
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
756} 1102}
757 1103
758#ifdef POINTER_BLANK 1104#ifdef POINTER_BLANK
759void 1105void
760rxvt_term::pointer_unblank ()
761{
762 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
763 recolour_cursor ();
764
765 hidden_pointer = 0;
766
767 if (Options & Opt_pointerBlank)
768 pointer_ev.start (NOW + pointerBlankDelay);
769}
770
771void
772rxvt_term::pointer_blank () 1106rxvt_term::pointer_blank ()
773{ 1107{
774 if (! (Options & Opt_pointerBlank)) 1108 if (! (options & Opt_pointerBlank))
775 return; 1109 return;
776 1110
777 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1111 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
778 XFlush (display->display); 1112 XFlush (display->display);
779 1113
780 hidden_pointer = 1; 1114 hidden_pointer = 1;
781} 1115}
782 1116
… …
799 x = ev.x; 1133 x = ev.x;
800 y = ev.y; 1134 y = ev.y;
801 pixel_position (&x, &y); 1135 pixel_position (&x, &y);
802 1136
803 if (MEvent.button == AnyButton) 1137 if (MEvent.button == AnyButton)
804 {
805 button_number = 3; 1138 button_number = 3;
806 }
807 else 1139 else
808 { 1140 {
809 button_number = MEvent.button - Button1; 1141 button_number = MEvent.button - Button1;
810 /* add 0x3D for wheel events, like xterm does */ 1142 /* add 0x3D for wheel events, like xterm does */
811 if (button_number >= 3) 1143 if (button_number >= 3)
812 button_number += (64 - 3); 1144 button_number += (64 - 3);
813 } 1145 }
814 1146
815 if (PrivateModes & PrivMode_MouseX10) 1147 if (priv_modes & PrivMode_MouseX10)
816 { 1148 {
817 /* 1149 /*
818 * do not report ButtonRelease 1150 * do not report ButtonRelease
819 * no state info allowed 1151 * no state info allowed
820 */ 1152 */
… …
835 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1167 + ((MEvent.state & ModMetaMask) ? 8 : 0)
836 + ((MEvent.state & ControlMask) ? 16 : 0); 1168 + ((MEvent.state & ControlMask) ? 16 : 0);
837#ifdef MOUSE_REPORT_DOUBLECLICK 1169#ifdef MOUSE_REPORT_DOUBLECLICK
838 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1170 key_state += ((MEvent.clicks > 1) ? 32 : 0);
839#endif 1171#endif
840
841 } 1172 }
842 1173
843#ifdef DEBUG_MOUSEREPORT 1174#if DEBUG_MOUSEREPORT
844 fprintf (stderr, "Mouse ["); 1175 fprintf (stderr, "Mouse [");
845 if (key_state & 16) 1176 if (key_state & 16)
846 fputc ('C', stderr); 1177 fputc ('C', stderr);
847 if (key_state & 4) 1178 if (key_state & 4)
848 fputc ('S', stderr); 1179 fputc ('S', stderr);
… …
852 fputc ('2', stderr); 1183 fputc ('2', stderr);
853 fprintf (stderr, "]: <%d>, %d/%d\n", 1184 fprintf (stderr, "]: <%d>, %d/%d\n",
854 button_number, 1185 button_number,
855 x + 1, 1186 x + 1,
856 y + 1); 1187 y + 1);
857#else 1188#endif
1189
858 tt_printf ("\033[M%c%c%c", 1190 tt_printf ("\033[M%c%c%c",
859 (32 + button_number + key_state), 1191 (32 + button_number + key_state),
860 (32 + x + 1), 1192 (32 + x + 1),
861 (32 + y + 1)); 1193 (32 + y + 1));
862#endif
863} 1194}
864 1195
865#ifdef USING_W11LIB 1196#ifdef USING_W11LIB
866void 1197void
867rxvt_W11_process_x_event (XEvent *ev) 1198rxvt_W11_process_x_event (XEvent *ev)
… …
874 1205
875/*{{{ process an X event */ 1206/*{{{ process an X event */
876void 1207void
877rxvt_term::x_cb (XEvent &ev) 1208rxvt_term::x_cb (XEvent &ev)
878{ 1209{
1210 dDisp;
1211
879 SET_R (this); 1212 SET_R (this);
880 SET_LOCALE (locale); 1213 SET_LOCALE (locale);
881 1214
882#if defined(CURSOR_BLINK) 1215#if defined(CURSOR_BLINK)
883 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1216 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
884 { 1217 {
885 if (hidden_cursor) 1218 if (hidden_cursor)
886 { 1219 {
887 hidden_cursor = 0; 1220 hidden_cursor = 0;
888 want_refresh = 1; 1221 want_refresh = 1;
… …
891 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1224 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
892 } 1225 }
893#endif 1226#endif
894 1227
895#if defined(POINTER_BLANK) 1228#if defined(POINTER_BLANK)
896 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1229 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
897 { 1230 {
898 if (ev.type == MotionNotify 1231 if (ev.type == MotionNotify
899 || ev.type == ButtonPress 1232 || ev.type == ButtonPress
900 || ev.type == ButtonRelease) 1233 || ev.type == ButtonRelease)
901 if (hidden_pointer) 1234 if (hidden_pointer)
… …
904 if (ev.type == KeyPress && hidden_pointer == 0) 1237 if (ev.type == KeyPress && hidden_pointer == 0)
905 pointer_blank (); 1238 pointer_blank ();
906 } 1239 }
907#endif 1240#endif
908 1241
909#ifdef USE_XIM
910 if (XFilterEvent (&ev, None))
911 return;
912#endif
913
914 Window unused_root, unused_child; 1242 Window unused_root, unused_child;
915 int unused_root_x, unused_root_y; 1243 int unused_root_x, unused_root_y;
916 unsigned int unused_mask; 1244 unsigned int unused_mask;
917
918#ifdef DEBUG_X
919 const char *const eventnames[] =
920 { /* mason - this matches my system */
921 "",
922 "",
923 "KeyPress",
924 "KeyRelease",
925 "ButtonPress",
926 "ButtonRelease",
927 "MotionNotify",
928 "EnterNotify",
929 "LeaveNotify",
930 "FocusIn",
931 "FocusOut",
932 "KeymapNotify",
933 "Expose",
934 "GraphicsExpose",
935 "NoExpose",
936 "VisibilityNotify",
937 "CreateNotify",
938 "DestroyNotify",
939 "UnmapNotify",
940 "MapNotify",
941 "MapRequest",
942 "ReparentNotify",
943 "ConfigureNotify",
944 "ConfigureRequest",
945 "GravityNotify",
946 "ResizeRequest",
947 "CirculateNotify",
948 "CirculateRequest",
949 "PropertyNotify",
950 "SelectionClear",
951 "SelectionRequest",
952 "SelectionNotify",
953 "ColormapNotify",
954 "ClientMessage",
955 "MappingNotify"
956 };
957#endif
958
959#ifdef DEBUG_X
960 struct timeval tp;
961 struct tm *ltt;
962 (void)gettimeofday (&tp, NULL);
963 ltt = localtime (& (tp.tv_sec));
964 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));
965#endif
966 1245
967 switch (ev.type) 1246 switch (ev.type)
968 { 1247 {
969 case KeyPress: 1248 case KeyPress:
1249#if ISO_14755
1250 if (!(iso14755buf & ISO_14755_52))
1251#endif
970 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;
971 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
972 1317
973#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1318#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
974 case KeyRelease:
975 {
976 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)
977 mouse_slip_wheel_speed = 0; 1322 mouse_slip_wheel_speed = 0;
978 else 1323#endif
979 {
980 KeySym ks;
981
982 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
983 if (ks == XK_Control_L || ks == XK_Control_R)
984 mouse_slip_wheel_speed = 0;
985 }
986 break; 1324 break;
987 } 1325 }
988#endif
989 1326
990 case ButtonPress: 1327 case ButtonPress:
991 button_press (ev.xbutton); 1328 button_press (ev.xbutton);
992 break; 1329 break;
993 1330
… …
995 button_release (ev.xbutton); 1332 button_release (ev.xbutton);
996 break; 1333 break;
997 1334
998 case ClientMessage: 1335 case ClientMessage:
999 if (ev.xclient.format == 32 1336 if (ev.xclient.format == 32
1337 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1338 {
1000 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1339 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1001 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
1002#ifdef OFFIX_DND 1357#ifdef OFFIX_DND
1003 /* OffiX Dnd (drag 'n' drop) protocol */ 1358 /* OffiX Dnd (drag 'n' drop) protocol */
1004 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1359 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1005 && (ev.xclient.data.l[0] == DndFile 1360 && (ev.xclient.data.l[0] == DndFile
1006 || ev.xclient.data.l[0] == DndDir 1361 || ev.xclient.data.l[0] == DndDir
1007 || ev.xclient.data.l[0] == DndLink)) 1362 || ev.xclient.data.l[0] == DndLink))
1008 { 1363 {
1009 /* Get Dnd data */ 1364 /* Get Dnd data */
1010 Atom ActualType; 1365 Atom ActualType;
1011 int ActualFormat; 1366 int ActualFormat;
1012 unsigned char *data; 1367 unsigned char *data;
1013 unsigned long Size, RemainingBytes; 1368 unsigned long Size, RemainingBytes;
1014 1369
1015 XGetWindowProperty (display->display, display->root, 1370 XGetWindowProperty (disp, display->root,
1016 xa[XA_DNDSELECTION], 1371 xa[XA_DNDSELECTION],
1017 0L, 1000000L, 1372 0L, 1000000L,
1018 False, AnyPropertyType, 1373 False, AnyPropertyType,
1019 &ActualType, &ActualFormat, 1374 &ActualType, &ActualFormat,
1020 &Size, &RemainingBytes, 1375 &Size, &RemainingBytes,
1021 &data); 1376 &data);
1022 XChangeProperty (display->display, display->root, 1377 set_string_property (XA_CUT_BUFFER0, data);
1023 XA_CUT_BUFFER0, XA_STRING,
1024 8, PropModeReplace,
1025 data, STRLEN (data));
1026 XFree (data); 1378 XFree (data);
1027 selection_paste (display->root, XA_CUT_BUFFER0, True); 1379 selection_paste (display->root, XA_CUT_BUFFER0, true);
1028 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1380 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1029 } 1381 }
1030#endif /* OFFIX_DND */ 1382#endif /* OFFIX_DND */
1031 break; 1383 break;
1032 1384
1033 case MappingNotify: 1385 case MappingNotify:
1034 XRefreshKeyboardMapping (& (ev.xmapping)); 1386 XRefreshKeyboardMapping (&ev.xmapping);
1035 break; 1387 break;
1036 1388
1037 /* 1389 /*
1038 * XXX: this is not the _current_ arrangement 1390 * XXX: this is not the _current_ arrangement
1039 * Here's my conclusion: 1391 * Here's my conclusion:
… …
1058 break; 1410 break;
1059 } 1411 }
1060 break; 1412 break;
1061 1413
1062 case FocusIn: 1414 case FocusIn:
1063 if (!TermWin.focus) 1415 focus_in ();
1064 {
1065 TermWin.focus = 1;
1066 want_refresh = 1;
1067#ifdef USE_XIM
1068 if (Input_Context != NULL)
1069 XSetICFocus (Input_Context);
1070#endif
1071#ifdef CURSOR_BLINK
1072 if (Options & Opt_cursorBlink)
1073 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1074#endif
1075
1076 }
1077 break; 1416 break;
1078 1417
1079 case FocusOut: 1418 case FocusOut:
1080 if (TermWin.focus) 1419 focus_out ();
1081 {
1082 TermWin.focus = 0;
1083 want_refresh = 1;
1084#ifdef USE_XIM
1085 if (Input_Context != NULL)
1086 XUnsetICFocus (Input_Context);
1087#endif
1088#ifdef CURSOR_BLINK
1089 if (Options & Opt_cursorBlink)
1090 cursor_blink_ev.stop ();
1091 hidden_cursor = 0;
1092#endif
1093
1094 }
1095 break; 1420 break;
1096 1421
1097 case ConfigureNotify: 1422 case ConfigureNotify:
1098 if (ev.xconfigure.window == TermWin.parent[0]) 1423 if (ev.xconfigure.window == TermWin.parent[0])
1099 { 1424 {
… …
1103 { /* Wrap lots of configures into one */ 1428 { /* Wrap lots of configures into one */
1104 width = ev.xconfigure.width; 1429 width = ev.xconfigure.width;
1105 height = ev.xconfigure.height; 1430 height = ev.xconfigure.height;
1106 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1431 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1107 } 1432 }
1108 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1433 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1109 1434
1110 if (szHint.width != width || szHint.height != height) 1435 if (szHint.width != width || szHint.height != height)
1111 { 1436 {
1112 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1437 seen_resize = 1;
1113 resize_all_windows (width, height, 1); 1438 resize_all_windows (width, height, 1);
1114 } 1439 }
1115#ifdef DEBUG_SIZE 1440
1116 else
1117 {
1118 D_SIZE ((stderr, "Size: Not resizing"));
1119 }
1120#endif
1121#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1441#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1122 if (Options & Opt_transparent) 1442 if (options & Opt_transparent)
1123 {
1124 check_our_parents (); 1443 check_our_parents ();
1125 if (am_transparent)
1126 want_full_refresh = 1;
1127 }
1128#endif 1444#endif
1129 } 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
1130 break; 1453 break;
1131 1454
1132 case SelectionClear: 1455 case SelectionClear:
1133 selection_clear (); 1456 selection_clear ();
1134 break; 1457 break;
1135 1458
1136 case SelectionNotify: 1459 case SelectionNotify:
1137 if (selection_wait == Sel_normal) 1460 if (selection_wait == Sel_normal)
1138 selection_paste (ev.xselection.requestor, 1461 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1139 ev.xselection.property, True);
1140 break; 1462 break;
1141 1463
1142 case SelectionRequest: 1464 case SelectionRequest:
1143 selection_send (ev.xselectionrequest); 1465 selection_send (ev.xselectionrequest);
1144 break; 1466 break;
… …
1165 1487
1166 case GraphicsExpose: 1488 case GraphicsExpose:
1167 case Expose: 1489 case Expose:
1168 if (ev.xany.window == TermWin.vt) 1490 if (ev.xany.window == TermWin.vt)
1169 { 1491 {
1170#ifdef NO_SLOW_LINK_SUPPORT 1492 do
1171 scr_expose (ev.xexpose.x, ev.xexpose.y, 1493 scr_expose (ev.xexpose.x, ev.xexpose.y,
1172 ev.xexpose.width, ev.xexpose.height, False); 1494 ev.xexpose.width, ev.xexpose.height, False);
1173#else 1495 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1174 // 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))
1175 scr_expose (ev.xexpose.x, ev.xexpose.y, 1500 scr_expose (ev.xexpose.x, ev.xexpose.y,
1176 ev.xexpose.width, ev.xexpose.height, False); 1501 ev.xexpose.width, ev.xexpose.height, False);
1177 //scr_expose (ev.xexpose.x, 0, 1502
1178 // ev.xexpose.width, TermWin.height, False); 1503 scr_refresh (refresh_type);
1179#endif
1180 want_refresh = 1;
1181 } 1504 }
1182 else 1505 else
1183 { 1506 {
1184 XEvent unused_event; 1507 XEvent unused_event;
1185 1508
1186 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1509 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1187 Expose, 1510 ;
1188 &unused_event)) ; 1511 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1189 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1512 ;
1190 GraphicsExpose, 1513
1191 &unused_event)) ;
1192 if (isScrollbarWindow (ev.xany.window)) 1514 if (isScrollbarWindow (ev.xany.window))
1193 { 1515 {
1194 scrollBar.setIdle (); 1516 scrollBar.setIdle ();
1195 scrollbar_show (0); 1517 scrollbar_show (0);
1196 } 1518 }
1197#ifdef MENUBAR 1519#ifdef MENUBAR
1198 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1520 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1199 menubar_expose (); 1521 menubar_expose ();
1200#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
1201 } 1528 }
1202 break; 1529 break;
1203 1530
1204 case MotionNotify: 1531 case MotionNotify:
1205#ifdef POINTER_BLANK 1532#ifdef POINTER_BLANK
… …
1211 { 1538 {
1212 menubar_control (ev.xbutton); 1539 menubar_control (ev.xbutton);
1213 break; 1540 break;
1214 } 1541 }
1215#endif 1542#endif
1216 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1543 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1217 break; 1544 break;
1218 1545
1219 if (ev.xany.window == TermWin.vt) 1546 if (ev.xany.window == TermWin.vt)
1220 { 1547 {
1221 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1548 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1222 { 1549 {
1223 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1550 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1224 ; 1551 ;
1225 1552
1226 XQueryPointer (display->display, TermWin.vt, 1553 XQueryPointer (disp, TermWin.vt,
1227 &unused_root, &unused_child, 1554 &unused_root, &unused_child,
1228 &unused_root_x, &unused_root_y, 1555 &unused_root_x, &unused_root_y,
1229 & (ev.xbutton.x), & (ev.xbutton.y), 1556 &ev.xbutton.x, &ev.xbutton.y,
1230 &unused_mask); 1557 &ev.xbutton.state);
1231#ifdef MOUSE_THRESHOLD 1558#ifdef MOUSE_THRESHOLD
1232 /* deal with a `jumpy' mouse */ 1559 /* deal with a `jumpy' mouse */
1233 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1560 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1234 { 1561 {
1235#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
1236 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1571 selection_extend (ev.xbutton.x, ev.xbutton.y,
1237 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1572 ev.xbutton.state & Button3Mask ? 2 : 0);
1573
1238#ifdef SELECTION_SCROLLING 1574#ifdef SELECTION_SCROLLING
1239 if (ev.xbutton.y < TermWin.int_bwidth 1575 if (ev.xbutton.y < TermWin.int_bwidth
1240 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1576 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1241 { 1577 {
1242 int dist; 1578 int dist;
1243 1579
1244 pending_scroll_selection=1;
1245
1246 /* don't clobber the current delay if we are 1580 /* don't clobber the current delay if we are
1247 * already in the middle of scrolling. 1581 * already in the middle of scrolling.
1248 */ 1582 */
1249 if (scroll_selection_delay<=0) 1583 if (!sel_scroll_ev.active)
1250 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1584 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1251 1585
1252 /* save the event params so we can highlight 1586 /* save the event params so we can highlight
1253 * the selection in the pending-scroll loop 1587 * the selection in the pending-scroll loop
1254 */ 1588 */
1255 selection_save_x=ev.xbutton.x; 1589 selection_save_x = ev.xbutton.x;
1256 selection_save_y=ev.xbutton.y; 1590 selection_save_y = ev.xbutton.y;
1257 selection_save_state=
1258 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1591 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1259 1592
1260 /* calc number of lines to scroll */ 1593 /* calc number of lines to scroll */
1261 if (ev.xbutton.y<TermWin.int_bwidth) 1594 if (ev.xbutton.y < TermWin.int_bwidth)
1262 { 1595 {
1263 scroll_selection_dir = UP; 1596 scroll_selection_dir = UP;
1264 dist = TermWin.int_bwidth - ev.xbutton.y; 1597 dist = TermWin.int_bwidth - ev.xbutton.y;
1265 } 1598 }
1266 else 1599 else
1267 { 1600 {
1268 scroll_selection_dir = DN; 1601 scroll_selection_dir = DN;
1269 dist = ev.xbutton.y -
1270 (TermWin.int_bwidth + TermWin.height); 1602 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1271 } 1603 }
1604
1272 scroll_selection_lines= (Pixel2Height (dist)/ 1605 scroll_selection_lines = Pixel2Height (dist)
1273 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1606 / SELECTION_SCROLL_LINE_SPEEDUP
1607 + 1;
1274 MIN_IT (scroll_selection_lines, 1608 MIN_IT (scroll_selection_lines,
1275 SELECTION_SCROLL_MAX_LINES); 1609 SELECTION_SCROLL_MAX_LINES);
1276 } 1610 }
1277 else 1611 else
1278 { 1612 {
1279 /* we are within the text window, so we 1613 /* we are within the text window, so we
1280 * shouldn't be scrolling 1614 * shouldn't be scrolling
1281 */ 1615 */
1282 pending_scroll_selection = 0; 1616 if (sel_scroll_ev.active)
1617 sel_scroll_ev.stop();
1283 } 1618 }
1284#endif 1619#endif
1285#ifdef MOUSE_THRESHOLD 1620#ifdef MOUSE_THRESHOLD
1286
1287 } 1621 }
1288#endif 1622#endif
1289
1290 } 1623 }
1291 } 1624 }
1292 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1625 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1293 { 1626 {
1294 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1627 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1295 MotionNotify, &ev)) ; 1628 MotionNotify, &ev))
1629 ;
1630
1296 XQueryPointer (display->display, scrollBar.win, 1631 XQueryPointer (disp, scrollBar.win,
1297 &unused_root, &unused_child, 1632 &unused_root, &unused_child,
1298 &unused_root_x, &unused_root_y, 1633 &unused_root_x, &unused_root_y,
1299 & (ev.xbutton.x), & (ev.xbutton.y), 1634 &ev.xbutton.x, &ev.xbutton.y,
1300 &unused_mask); 1635 &unused_mask);
1301 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1636 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1302 scrollbar_size ()); 1637 scrollbar_size ());
1303 scr_refresh (refresh_type); 1638 scr_refresh (refresh_type);
1304 refresh_limit = 0; 1639 refresh_limit = 0;
… …
1307 break; 1642 break;
1308 } 1643 }
1309} 1644}
1310 1645
1311void 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
1312rxvt_term::rootwin_cb (XEvent &ev) 1709rxvt_term::rootwin_cb (XEvent &ev)
1313{ 1710{
1314 SET_R (this); 1711 SET_R (this);
1315 SET_LOCALE (locale); 1712 SET_LOCALE (locale);
1316 1713
1317 switch (ev.type) 1714 switch (ev.type)
1318 { 1715 {
1319 case PropertyNotify: 1716 case PropertyNotify:
1320 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1321 {
1322 if (ev.xproperty.state == PropertyNewValue)
1323 selection_property (ev.xproperty.window, ev.xproperty.atom);
1324 break;
1325 }
1326#ifdef TRANSPARENT
1327 else
1328 {
1329 /* 1717 /*
1330 * 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,
1331 * 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.
1332 */ 1720 */
1333 if (xa[XA_XROOTPMAPID] == 0)
1334 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1335
1336 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])
1337 return; 1723 return;
1338 }
1339 1724
1340 /* FALLTHROUGH */ 1725 /* FALLTHROUGH */
1341 case ReparentNotify: 1726 case ReparentNotify:
1342 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1727 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1343 want_full_refresh = 1; 1728 want_refresh = want_full_refresh = 1;
1344 break; 1729 break;
1345#endif
1346 } 1730 }
1347} 1731}
1732#endif
1348 1733
1349void 1734void
1350rxvt_term::button_press (XButtonEvent &ev) 1735rxvt_term::button_press (XButtonEvent &ev)
1351{ 1736{
1352 int reportmode = 0, clickintime; 1737 int reportmode = 0, clickintime;
1353 1738
1354 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1739 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1355 if (!bypass_keystate) 1740 if (!bypass_keystate)
1356 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1741 reportmode = !! (priv_modes & PrivMode_mouse_report);
1742
1357 /* 1743 /*
1358 * VT window processing of button press 1744 * VT window processing of button press
1359 */ 1745 */
1360 if (ev.window == TermWin.vt) 1746 if (ev.window == TermWin.vt)
1361 { 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
1362 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1757 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1758
1363 if (reportmode) 1759 if (reportmode)
1364 { 1760 {
1365 /* mouse report from vt window */ 1761 /* mouse report from vt window */
1366 /* save the xbutton state (for ButtonRelease) */ 1762 /* save the xbutton state (for ButtonRelease) */
1367 MEvent.state = ev.state; 1763 MEvent.state = ev.state;
… …
1396 } 1792 }
1397 else 1793 else
1398 { 1794 {
1399 if (ev.button != MEvent.button) 1795 if (ev.button != MEvent.button)
1400 MEvent.clicks = 0; 1796 MEvent.clicks = 0;
1797
1401 switch (ev.button) 1798 switch (ev.button)
1402 { 1799 {
1403 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
1404 /* allow shift+left click to extend selection */ 1809 /* allow shift+left click to extend selection */
1405 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1810 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1406 { 1811 {
1407 if (MEvent.button == Button1 && clickintime) 1812 if (MEvent.button == Button1 && clickintime)
1408 selection_rotate (ev.x, ev.y); 1813 selection_rotate (ev.x, ev.y);
1409 else 1814 else
1410 selection_extend (ev.x, ev.y, 1); 1815 selection_extend (ev.x, ev.y, 1);
… …
1425 case Button3: 1830 case Button3:
1426 if (MEvent.button == Button3 && clickintime) 1831 if (MEvent.button == Button3 && clickintime)
1427 selection_rotate (ev.x, ev.y); 1832 selection_rotate (ev.x, ev.y);
1428 else 1833 else
1429 selection_extend (ev.x, ev.y, 1); 1834 selection_extend (ev.x, ev.y, 1);
1835
1430 MEvent.button = Button3; 1836 MEvent.button = Button3;
1431 break; 1837 break;
1432 } 1838 }
1433 } 1839 }
1840
1434 MEvent.time = ev.time; 1841 MEvent.time = ev.time;
1435 return; 1842 return;
1436 } 1843 }
1437 1844
1438 /* 1845 /*
… …
1504 upordown = 1; /* down */ 1911 upordown = 1; /* down */
1505 } 1912 }
1506 if (upordown) 1913 if (upordown)
1507 { 1914 {
1508#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1915#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1509 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1916 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1510#endif 1917#endif
1511 if (scr_page (upordown < 0 ? UP : DN, 1)) 1918 if (scr_page (upordown < 0 ? UP : DN, 1))
1512 { 1919 {
1513 if (upordown < 0) 1920 if (upordown < 0)
1514 scrollBar.setUp (); 1921 scrollBar.setUp ();
… …
1530 break; 1937 break;
1531 case R_SB_ALIGN_BOTTOM: 1938 case R_SB_ALIGN_BOTTOM:
1532 csrO = scrollBar.bot - scrollBar.top; 1939 csrO = scrollBar.bot - scrollBar.top;
1533 break; 1940 break;
1534 } 1941 }
1942
1535 if (scrollBar.style == R_SB_XTERM 1943 if (scrollBar.style == R_SB_XTERM
1536 || scrollbar_above_slider (ev.y) 1944 || scrollbar_above_slider (ev.y)
1537 || scrollbar_below_slider (ev.y)) 1945 || scrollbar_below_slider (ev.y))
1538 scr_move_to ( scrollbar_position (ev.y) - csrO, 1946 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1539 scrollbar_size ()); 1947
1540 scrollBar.setMotion (); 1948 scrollBar.setMotion ();
1541 break; 1949 break;
1542 1950
1543 case Button1: 1951 case Button1:
1544 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1952 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1568 scr_page ((ev.button == Button1 ? DN : UP), 1976 scr_page ((ev.button == Button1 ? DN : UP),
1569 (TermWin.nrow 1977 (TermWin.nrow
1570 * scrollbar_position (ev.y) 1978 * scrollbar_position (ev.y)
1571 / scrollbar_size ())); 1979 / scrollbar_size ()));
1572 } 1980 }
1981
1573 break; 1982 break;
1574 } 1983 }
1575 } 1984 }
1576 return; 1985 return;
1577 } 1986 }
… …
1589{ 1998{
1590 int reportmode = 0; 1999 int reportmode = 0;
1591 2000
1592 csrO = 0; /* reset csr Offset */ 2001 csrO = 0; /* reset csr Offset */
1593 if (!bypass_keystate) 2002 if (!bypass_keystate)
1594 reportmode = !! (PrivateModes & PrivMode_mouse_report); 2003 reportmode = !! (priv_modes & PrivMode_mouse_report);
1595 2004
1596 if (scrollbar_isUpDn ()) 2005 if (scrollbar_isUpDn ())
1597 { 2006 {
1598 scrollBar.setIdle (); 2007 scrollBar.setIdle ();
1599 scrollbar_show (0); 2008 scrollbar_show (0);
1600#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2009#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1601 refresh_type &= ~SMOOTH_REFRESH; 2010 refresh_type &= ~SMOOTH_REFRESH;
1602#endif 2011#endif
1603
1604 } 2012 }
2013
1605#ifdef SELECTION_SCROLLING 2014#ifdef SELECTION_SCROLLING
1606 pending_scroll_selection=0; 2015 if (sel_scroll_ev.active)
2016 sel_scroll_ev.stop();
1607#endif 2017#endif
2018
1608 if (ev.window == TermWin.vt) 2019 if (ev.window == TermWin.vt)
1609 { 2020 {
2021#if ISO_14755
2022 // 5.4
2023 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2024 return;
2025#endif
1610 if (reportmode) 2026 if (reportmode)
1611 { 2027 {
1612 /* mouse report from vt window */ 2028 /* mouse report from vt window */
1613 /* don't report release of wheel "buttons" */ 2029 /* don't report release of wheel "buttons" */
1614 if (ev.button >= 4) 2030 if (ev.button >= 4)
… …
1628 MEvent.button = AnyButton; 2044 MEvent.button = AnyButton;
1629 mouse_report (ev); 2045 mouse_report (ev);
1630#endif /* MOUSE_REPORT_DOUBLECLICK */ 2046#endif /* MOUSE_REPORT_DOUBLECLICK */
1631 return; 2047 return;
1632 } 2048 }
2049
1633 /* 2050 /*
1634 * dumb hack to compensate for the failure of click-and-drag 2051 * dumb hack to compensate for the failure of click-and-drag
1635 * when overriding mouse reporting 2052 * when overriding mouse reporting
1636 */ 2053 */
1637 if (PrivateModes & PrivMode_mouse_report 2054 if (priv_modes & PrivMode_mouse_report
1638 && bypass_keystate 2055 && bypass_keystate
1639 && ev.button == Button1 && MEvent.clicks <= 1) 2056 && ev.button == Button1 && MEvent.clicks <= 1)
1640 selection_extend (ev.x, ev.y, 0); 2057 selection_extend (ev.x, ev.y, 0);
1641 2058
1642 switch (ev.button) 2059 switch (ev.button)
… …
1653 case Button5: 2070 case Button5:
1654 { 2071 {
1655 int i; 2072 int i;
1656 page_dirn v; 2073 page_dirn v;
1657 2074
1658 v = (ev.button == Button4) ? UP : DN; 2075 v = ev.button == Button4 ? UP : DN;
2076
1659 if (ev.state & ShiftMask) 2077 if (ev.state & ShiftMask)
1660 i = 1; 2078 i = 1;
1661 else if ((Options & Opt_mouseWheelScrollPage)) 2079 else if (options & Opt_mouseWheelScrollPage)
1662 i = TermWin.nrow - 1; 2080 i = TermWin.nrow - 1;
1663 else 2081 else
1664 i = 5; 2082 i = 5;
2083
1665# ifdef MOUSE_SLIP_WHEELING 2084# ifdef MOUSE_SLIP_WHEELING
1666 if (ev.state & ControlMask) 2085 if (ev.state & ControlMask)
1667 { 2086 {
1668 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)
1669 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2092 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2093
2094 slip_wheel_ev.start ();
1670 } 2095 }
2096 else
2097 {
1671# endif 2098# endif
1672# ifdef JUMP_MOUSE_WHEEL 2099# ifdef JUMP_MOUSE_WHEEL
1673 scr_page (v, i);
1674 scr_refresh (SMOOTH_REFRESH);
1675 scrollbar_show (1);
1676# else
1677 while (i--)
1678 {
1679 scr_page (v, 1); 2100 scr_page (v, i);
1680 scr_refresh (SMOOTH_REFRESH); 2101 scr_refresh (SMOOTH_REFRESH);
1681 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
1682 } 2112 }
1683# endif 2113#endif
1684
1685 } 2114 }
1686 break; 2115 break;
1687#endif 2116#endif
1688
1689 } 2117 }
1690 } 2118 }
1691#ifdef MENUBAR 2119#ifdef MENUBAR
1692 else if (isMenuBarWindow (ev.window)) 2120 else if (isMenuBarWindow (ev.window))
1693 menubar_control (ev); 2121 menubar_control (ev);
1694#endif 2122#endif
1695} 2123}
1696 2124
1697#ifdef TRANSPARENT 2125#ifdef TRANSPARENT
1698#if TINTING 2126#if TINTING
1699/* shading taken from eterm-0.9.2 */ 2127/* taken from aterm-0.4.2 */
1700/* RGB 15 */
1701 2128
1702static void 2129typedef uint32_t RUINT32T;
1703shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1704{
1705 unsigned char *ptr;
1706 int x, y;
1707 2130
1708 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2131void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1709 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2132{
1710 /* No saturation */ 2133 int sh_r, sh_g, sh_b;
1711 for (y = h; --y >= 0;) { 2134 RUINT32T mask_r, mask_g, mask_b;
1712 for (x = -w; x < 0; x++) { 2135 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1713 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;
1714 2139
1715 b = ((uint16_t *) ptr)[x]; 2140 Visual *visual = display->visual;
1716 r = (b & 0x7c00) * rm; 2141
1717 g = (b & 0x3e0) * gm; 2142 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1718 b = (b & 0x1f) * bm; 2143
1719 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2144 /* for convenience */
1720 | ((g >> 8) & 0x3e0) 2145 mask_r = visual->red_mask;
1721 | ((b >> 8) & 0x1f); 2146 mask_g = visual->green_mask;
1722 } 2147 mask_b = visual->blue_mask;
1723 ptr += bpl; 2148
1724 } 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;
1725 } else { 2222 } else {
1726 for (y = h; --y >= 0;) { 2223 if (shade < 0) shade = 0;
1727 for (x = -w; x < 0; x++) { 2224 if (shade > 100) shade = 100;
1728 int r, g, b;
1729 2225
1730 b = ((uint16_t *) ptr)[x]; 2226 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1731 r = (b & 0x7c00) * rm; 2227
1732 g = (b & 0x3e0) * gm; 2228 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1733 b = (b & 0x1f) * bm; 2229 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1734 r |= (!(r >> 15) - 1); 2230 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1735 g |= (!(g >> 10) - 1); 2231 }
1736 b |= (!(b >> 5) - 1); 2232
1737 ((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 */
1738 | ((g >> 8) & 0x3e0) 2234 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1739 | ((b >> 8) & 0x1f); 2235 {
1740 } 2236 unsigned int tmp;
1741 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++)
1742 } 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);
1743 } 2289 }
1744} 2290 break;
1745 2291 }
1746/* RGB 16 */ 2292 case 16:
1747static void 2293 {
1748shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2294 unsigned short *p1, *pf, *p, *pl;
1749{ 2295 p1 = (unsigned short *) srcImage->data;
1750 unsigned char *ptr; 2296 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1751 int x, y; 2297 while (p1 < pf)
1752 2298 {
1753 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2299 p = p1;
1754 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2300 pl = p1 + srcImage->width;
1755 /* No saturation */ 2301 for (; p < pl; p++)
1756 for (y = h; --y >= 0;) {
1757 for (x = -w; x < 0; x++) {
1758 int r, g, b;
1759
1760 b = ((uint16_t *) ptr)[x];
1761 r = (b & 0xf800) * rm;
1762 g = (b & 0x7e0) * gm;
1763 b = (b & 0x1f) * bm;
1764 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1765 | ((g >> 8) & 0x7e0)
1766 | ((b >> 8) & 0x1f);
1767 }
1768 ptr += bpl;
1769 } 2302 {
1770 } else { 2303 *p = lookup_r[(*p & 0xf800)>>11] |
1771 for (y = h; --y >= 0;) { 2304 lookup_g[(*p & 0x07e0)>> 5] |
1772 for (x = -w; x < 0; x++) { 2305 lookup_b[(*p & 0x001f)];
1773 int r, g, b;
1774
1775 b = ((uint16_t *) ptr)[x];
1776 r = (b & 0xf800) * rm;
1777 g = (b & 0x7e0) * gm;
1778 b = (b & 0x1f) * bm;
1779 r |= (!(r >> 16) - 1);
1780 g |= (!(g >> 11) - 1);
1781 b |= (!(b >> 5) - 1);
1782 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1783 | ((g >> 8) & 0x7e0)
1784 | ((b >> 8) & 0x1f);
1785 } 2306 }
1786 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)
1787 } 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);
1788 } 2327 }
1789} 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);
1790 2335
1791/* RGB 24 */ 2336 while (p1 < pf)
1792static void 2337 {
1793shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2338 p = p1;
1794{ 2339 pl = p1 + srcImage->width;
1795 unsigned char *ptr; 2340 for (; p < pl; p++)
1796 int x, y;
1797
1798 ptr = (unsigned char *)data + (w * 3);
1799 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1800 /* No saturation */
1801 for (y = h; --y >= 0;) {
1802 for (x = -(w * 3); x < 0; x += 3) {
1803 int r, g, b;
1804
1805 if (byteorder.big_endian()) {
1806 r = (ptr[x + 0] * rm) >> 8;
1807 g = (ptr[x + 1] * gm) >> 8;
1808 b = (ptr[x + 2] * bm) >> 8;
1809 ptr[x + 0] = r;
1810 ptr[x + 1] = g;
1811 ptr[x + 2] = b;
1812 } else {
1813 r = (ptr[x + 2] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 0] * bm) >> 8;
1816 ptr[x + 2] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 0] = b;
1819 }
1820 }
1821 ptr += bpl;
1822 } 2341 {
1823 } else { 2342 *p = lookup_r[(*p & 0xff0000)>>16] |
1824 for (y = h; --y >= 0;) { 2343 lookup_g[(*p & 0x00ff00)>> 8] |
1825 for (x = -(w * 3); x < 0; x += 3) { 2344 lookup_b[(*p & 0x0000ff)] |
1826 int r, g, b; 2345 (*p & ~0xffffff);
1827
1828 if (byteorder.big_endian()) {
1829 r = (ptr[x + 0] * rm) >> 8;
1830 g = (ptr[x + 1] * gm) >> 8;
1831 b = (ptr[x + 2] * bm) >> 8;
1832
1833 r |= (!(r >> 8) - 1);
1834 g |= (!(g >> 8) - 1);
1835 b |= (!(b >> 8) - 1);
1836
1837 ptr[x + 0] = r;
1838 ptr[x + 1] = g;
1839 ptr[x + 2] = b;
1840 } else {
1841 r = (ptr[x + 2] * rm) >> 8;
1842 g = (ptr[x + 1] * gm) >> 8;
1843 b = (ptr[x + 0] * bm) >> 8;
1844
1845 r |= (!(r >> 8) - 1);
1846 g |= (!(g >> 8) - 1);
1847 b |= (!(b >> 8) - 1);
1848
1849 ptr[x + 2] = r;
1850 ptr[x + 1] = g;
1851 ptr[x + 0] = b;
1852 }
1853 } 2346 }
1854 ptr += bpl; 2347 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1855 } 2348 }
2349 break;
2350 }
1856 } 2351 }
1857}
1858 2352
1859/* RGB 32 */ 2353 free (lookup);
1860static void
1861shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1862{
1863 unsigned char *ptr;
1864 int x, y;
1865
1866 ptr = (unsigned char *)data + (w * 4);
1867 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1868 /* No saturation */
1869 for (y = h; --y >= 0;) {
1870 if (byteorder.big_endian()) {
1871 for (x = -(w * 4); x < 0; x += 4) {
1872 int r, g, b;
1873
1874 r = (ptr[x + 1] * rm) >> 8;
1875 g = (ptr[x + 2] * gm) >> 8;
1876 b = (ptr[x + 3] * bm) >> 8;
1877 ptr[x + 1] = r;
1878 ptr[x + 2] = g;
1879 ptr[x + 3] = b;
1880 }
1881 } else {
1882 for (x = -(w * 4); x < 0; x += 4) {
1883 int r, g, b;
1884
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888 ptr[x + 2] = r;
1889 ptr[x + 1] = g;
1890 ptr[x + 0] = b;
1891 }
1892 }
1893 ptr += bpl;
1894 }
1895 } else {
1896 for (y = h; --y >= 0;) {
1897 for (x = -(w * 4); x < 0; x += 4) {
1898 int r, g, b;
1899
1900 if (byteorder.big_endian()) {
1901 r = (ptr[x + 1] * rm) >> 8;
1902 g = (ptr[x + 2] * gm) >> 8;
1903 b = (ptr[x + 3] * bm) >> 8;
1904
1905 r |= (!(r >> 8) - 1);
1906 g |= (!(g >> 8) - 1);
1907 b |= (!(b >> 8) - 1);
1908
1909 ptr[x + 1] = r;
1910 ptr[x + 2] = g;
1911 ptr[x + 3] = b;
1912 } else {
1913 r = (ptr[x + 2] * rm) >> 8;
1914 g = (ptr[x + 1] * gm) >> 8;
1915 b = (ptr[x + 0] * bm) >> 8;
1916
1917 r |= (!(r >> 8) - 1);
1918 g |= (!(g >> 8) - 1);
1919 b |= (!(b >> 8) - 1);
1920
1921 ptr[x + 2] = r;
1922 ptr[x + 1] = g;
1923 ptr[x + 0] = b;
1924 }
1925 }
1926 ptr += bpl;
1927 }
1928 }
1929} 2354}
1930
1931#endif 2355#endif
1932 2356
1933/* 2357/*
1934 * Check our parents are still who we think they are. 2358 * Check our parents are still who we think they are.
1935 * Do transparency updates if required 2359 * Do transparency updates if required
… …
1942 Atom atype; 2366 Atom atype;
1943 unsigned char *prop = NULL; 2367 unsigned char *prop = NULL;
1944 Window root, oldp, *list; 2368 Window root, oldp, *list;
1945 Pixmap rootpixmap = None; 2369 Pixmap rootpixmap = None;
1946 XWindowAttributes wattr, wrootattr; 2370 XWindowAttributes wattr, wrootattr;
2371 dDisp;
1947 2372
1948 pchanged = 0; 2373 pchanged = 0;
1949 2374
1950 if (!(Options & Opt_transparent)) 2375 if (!(options & Opt_transparent))
1951 return pchanged; /* Don't try any more */ 2376 return pchanged; /* Don't try any more */
1952 2377
1953 XGetWindowAttributes (display->display, display->root, &wrootattr); 2378 XGetWindowAttributes (disp, display->root, &wrootattr);
1954 rootdepth = wrootattr.depth; 2379 rootdepth = wrootattr.depth;
1955 2380
1956 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2381 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
1957 2382
1958 if (rootdepth != wattr.depth) 2383 if (rootdepth != wattr.depth)
1959 { 2384 {
1960 if (am_transparent) 2385 if (am_transparent)
1961 { 2386 {
1962 pchanged = 1; 2387 pchanged = 1;
1963 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2388 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
1964 am_transparent = am_pixmap_trans = 0; 2389 am_transparent = am_pixmap_trans = 0;
1965 } 2390 }
1966 2391
1967 return pchanged; /* Don't try any more */ 2392 return pchanged; /* Don't try any more */
1968 } 2393 }
1969 2394
1970 /* 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. */
1971 XSync (display->display, False); 2396 XSync (disp, False);
1972 2397
1973 /* 2398 /*
1974 * Make the frame window set by the window manager have 2399 * Make the frame window set by the window manager have
1975 * the root background. Some window managers put multiple nested frame 2400 * the root background. Some window managers put multiple nested frame
1976 * 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.
1977 */ 2402 */
1978 i = (xa[XA_XROOTPMAPID] 2403 i = (xa[XA_XROOTPMAP_ID]
1979 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2404 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
1980 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2405 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1981 &nitems, &bytes_after, &prop) == Success); 2406 &nitems, &bytes_after, &prop) == Success);
1982 2407
1983 if (!i || prop == NULL) 2408 if (!i || prop == NULL)
1984 i = (xa[XA_XSETROOTID] 2409 i = (xa[XA_ESETROOT_PMAP_ID]
1985 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2410 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
1986 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2411 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1987 &nitems, &bytes_after, &prop) == Success); 2412 &nitems, &bytes_after, &prop) == Success);
1988 2413
1989 if (!i || prop == NULL) 2414 if (!i || prop == NULL
2415#if TINTING
2416 || !rs[Rs_color + Color_tint]
2417#endif
2418 )
1990 have_pixmap = 0; 2419 have_pixmap = 0;
1991 else 2420 else
1992 { 2421 {
1993 have_pixmap = 1; 2422 have_pixmap = 1;
1994 rootpixmap = *(Pixmap *)prop; 2423 rootpixmap = *(Pixmap *)prop;
… …
2005 Window cr; 2434 Window cr;
2006 XImage *image; 2435 XImage *image;
2007 GC gc; 2436 GC gc;
2008 XGCValues gcvalue; 2437 XGCValues gcvalue;
2009 2438
2010 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2439 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2011 0, 0, &sx, &sy, &cr); 2440 0, 0, &sx, &sy, &cr);
2012 nw = (unsigned int)szHint.width; 2441 nw = (unsigned int)szHint.width;
2013 nh = (unsigned int)szHint.height; 2442 nh = (unsigned int)szHint.height;
2014 nx = ny = 0; 2443 nx = ny = 0;
2015 2444
… …
2027 sy = 0; 2456 sy = 0;
2028 } 2457 }
2029 2458
2030 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2459 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2031 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2460 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2461
2462 XSync (disp, False);
2032 allowedxerror = -1; 2463 allowedxerror = -1;
2033 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2464 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2034 2465
2035 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2466 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2036 /* XXX: may need a delay here? */ 2467 /* XXX: may need a delay here? */
2037 allowedxerror = 0; 2468 allowedxerror = 0;
2038 2469
… …
2041 if (am_transparent && am_pixmap_trans) 2472 if (am_transparent && am_pixmap_trans)
2042 { 2473 {
2043 pchanged = 1; 2474 pchanged = 1;
2044 if (TermWin.pixmap != None) 2475 if (TermWin.pixmap != None)
2045 { 2476 {
2046 XFreePixmap (display->display, TermWin.pixmap); 2477 XFreePixmap (disp, TermWin.pixmap);
2047 TermWin.pixmap = None; 2478 TermWin.pixmap = None;
2048 } 2479 }
2049 } 2480 }
2050 2481
2051 am_pixmap_trans = 0; 2482 am_pixmap_trans = 0;
2052 } 2483 }
2053 else 2484 else
2054 { 2485 {
2055 if (TermWin.pixmap != None) 2486 if (TermWin.pixmap != None)
2056 XFreePixmap (display->display, TermWin.pixmap); 2487 XFreePixmap (disp, TermWin.pixmap);
2057 2488
2058#if TINTING 2489#if TINTING
2059 if (ISSET_PIXCOLOR (Color_tint)) 2490 if (ISSET_PIXCOLOR (Color_tint))
2060 { 2491 {
2061 unsigned short shade, rm, gm, bm; 2492 unsigned short rm, gm, bm;
2493 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2062 2494
2063 PixColors[Color_tint].get (display, rm, gm, bm); 2495 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2064 2496
2065 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2497 ShadeXImage (display, image, shade, rm, gm, bm);
2066
2067 /* Determine bitshift and bitmask values */
2068 switch (image->bits_per_pixel)
2069 {
2070 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2071 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2072 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2073 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2074 }
2075 } 2498 }
2076#endif 2499#endif
2077 2500
2078 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2501 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2079 szHint.width, szHint.height, image->depth); 2502 szHint.width, szHint.height, image->depth);
2080 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2503 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2081 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2504 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2082 nx, ny, image->width, image->height); 2505 nx, ny, image->width, image->height);
2083 XFreeGC (display->display, gc); 2506 XFreeGC (disp, gc);
2084 XDestroyImage (image); 2507 XDestroyImage (image);
2085 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2508 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2086 TermWin.pixmap); 2509 XClearWindow (disp, TermWin.parent[0]);
2087 2510
2088 if (!am_transparent || !am_pixmap_trans) 2511 if (!am_transparent || !am_pixmap_trans)
2089 pchanged = 1; 2512 pchanged = 1;
2090 2513
2091 am_transparent = am_pixmap_trans = 1; 2514 am_transparent = am_pixmap_trans = 1;
2092 } 2515 }
2093 } 2516 }
2094 2517
2095 if (!am_pixmap_trans) 2518 if (am_pixmap_trans)
2519 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2520 else
2096 { 2521 {
2097 unsigned int n; 2522 unsigned int n;
2098 /* 2523 /*
2099 * InheritPixmap transparency 2524 * InheritPixmap transparency
2100 */ 2525 */
2101 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2102 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2526 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2103 { 2527 {
2104 oldp = TermWin.parent[i]; 2528 oldp = TermWin.parent[i];
2105 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2529 XQueryTree (disp, TermWin.parent[i - 1], &root,
2106 &TermWin.parent[i], &list, &n); 2530 &TermWin.parent[i], &list, &n);
2107 XFree (list); 2531 XFree (list);
2108 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2109 2532
2110 if (TermWin.parent[i] == display->root) 2533 if (TermWin.parent[i] == display->root)
2111 { 2534 {
2112 if (oldp != None) 2535 if (oldp != None)
2113 pchanged = 1; 2536 pchanged = 1;
… …
2123 2546
2124 if (pchanged) 2547 if (pchanged)
2125 { 2548 {
2126 for (; n < (unsigned int)i; n++) 2549 for (; n < (unsigned int)i; n++)
2127 { 2550 {
2128 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2551 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2129 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2130 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2552 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2131 { 2553 {
2132 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2554 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2133 break; 2555 break;
2134 } 2556 }
2135 } 2557 }
2136 } 2558 }
2137 2559
2138 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2560 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2139 { 2561 {
2140 D_X ((stderr, "InheritPixmap Turning off"));
2141 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2562 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2142 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2563 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2143 am_transparent = 0; 2564 am_transparent = 0;
2144 /* XXX: also turn off Opt_transparent? */ 2565 /* XXX: also turn off Opt_transparent? */
2145 } 2566 }
2146 else 2567 else
2147 { 2568 {
2148#if WAIT_FOR_WM 2569#if WAIT_FOR_WM
2149 /* wait (an arbitrary period) for the WM to do its thing 2570 /* wait (an arbitrary period) for the WM to do its thing
2150 * needed for fvwm2.2.2 (and before?) */ 2571 * needed for fvwm2.2.2 (and before?) */
2151 sleep (1); 2572 sleep (1);
2152#endif 2573#endif
2153 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2154 for (n = 0; n < (unsigned int)i; n++) 2574 for (n = 0; n < (unsigned int)i; n++)
2575 {
2155 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2576 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2577 XClearWindow (disp, TermWin.parent[n]);
2578 }
2156 2579
2157 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2580 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2158 am_transparent = 1; 2581 am_transparent = 1;
2159 } 2582 }
2160 2583
2161 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2584 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2162 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 ();
2163 } 2600 }
2164 2601
2165 return pchanged; 2602 return pchanged;
2166} 2603}
2167#endif 2604#endif
… …
2186 if (ch == NOCHAR) // TODO: improve 2623 if (ch == NOCHAR) // TODO: improve
2187 break; 2624 break;
2188 2625
2189 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2626 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2190 { 2627 {
2628 if (!seen_input)
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
2191 /* Read a text string from the input buffer */ 2642 /* Read a text string from the input buffer */
2192 unicode_t buf[UBUFSIZ]; 2643 unicode_t buf[UBUFSIZ];
2193 bool refreshnow = false; 2644 bool refreshnow = false;
2194 int nlines = 0; 2645 int nlines = 0;
2195 unicode_t *str = buf; 2646 unicode_t *str = buf;
2196 2647
2197 *str++ = ch;
2198
2199 for (;;) 2648 for (;;)
2200 { 2649 {
2201 seq_begin = cmdbuf_ptr;
2202 ch = next_char ();
2203
2204 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2650 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2205 break; 2651 break;
2206 2652
2207 *str++ = ch; 2653 *str++ = ch;
2208 2654
2209 if (ch == C0_LF) 2655 if (ch == C0_LF)
2210 { 2656 {
2211 nlines++; 2657 nlines++;
2212 refresh_count++; 2658 refresh_count++;
2213 2659
2214 if (! (Options & Opt_jumpScroll) 2660 if (!(options & Opt_jumpScroll)
2215 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2661 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2216 { 2662 {
2217 refreshnow = true; 2663 refreshnow = true;
2218 flag = true;
2219 ch = NOCHAR; 2664 ch = NOCHAR;
2220 break; 2665 break;
2221 } 2666 }
2222 2667
2223 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2668 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2224 if (nlines >= TermWin.nrow - 1) 2669 if (nlines >= TermWin.nrow - 1)
2225 { 2670 {
2226 scr_add_lines (buf, nlines, str - buf); 2671 scr_add_lines (buf, nlines, str - buf);
2227 nlines = 0; 2672 nlines = 0;
2228 str = buf; 2673 str = buf;
… …
2232 if (str >= buf + UBUFSIZ) 2677 if (str >= buf + UBUFSIZ)
2233 { 2678 {
2234 ch = NOCHAR; 2679 ch = NOCHAR;
2235 break; 2680 break;
2236 } 2681 }
2682
2683 seq_begin = cmdbuf_ptr;
2684 ch = next_char ();
2237 } 2685 }
2238 2686
2239 scr_add_lines (buf, nlines, str - buf); 2687 scr_add_lines (buf, nlines, str - buf);
2240 2688
2241 /* 2689 /*
2242 * 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
2243 * 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.
2244 * the number of pages between refreshes is refresh_limit, which 2692 * the number of pages between refreshes is refresh_limit, which
2245 * is incremented here because we must be doing flat-out scrolling. 2693 * is incremented here because we must be doing flat-out scrolling.
2246 *
2247 * refreshing should be correct for small scrolls, because of the
2248 * time-out
2249 */ 2694 */
2250 if (refreshnow) 2695 if (refreshnow)
2251 { 2696 {
2252 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2697 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2253 refresh_limit++; 2698 refresh_limit++;
2254 else 2699 else
2700 {
2701 flag = true;
2255 scr_refresh (refresh_type); 2702 scr_refresh (refresh_type);
2703 }
2256 } 2704 }
2257 2705
2258 } 2706 }
2259 else 2707 else
2260 { 2708 {
… …
2274 } 2722 }
2275 2723
2276 return flag; 2724 return flag;
2277} 2725}
2278 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
2279// read the next character 2736// read the next character
2280unicode_t 2737unicode_t
2281rxvt_term::next_char () 2738rxvt_term::next_char ()
2282{ 2739{
2283 while (cmdbuf_ptr < cmdbuf_endp) 2740 while (cmdbuf_ptr < cmdbuf_endp)
… …
2299 if (len == (size_t)-1) 2756 if (len == (size_t)-1)
2300 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
2301 2758
2302 // assume wchar == unicode 2759 // assume wchar == unicode
2303 cmdbuf_ptr += len; 2760 cmdbuf_ptr += len;
2304 return wc; 2761 return wc & UNICODE_MASK;
2305 } 2762 }
2306 2763
2307 return NOCHAR; 2764 return NOCHAR;
2308} 2765}
2309 2766
… …
2314 */ 2771 */
2315unicode_t 2772unicode_t
2316rxvt_term::cmd_getc () 2773rxvt_term::cmd_getc ()
2317{ 2774{
2318 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 ();
2319 2787
2320 if (c == NOCHAR) 2788 if (c == NOCHAR)
2321 throw out_of_input; 2789 throw out_of_input;
2322 2790
2323 return c; 2791 return c;
… …
2424 process_escape_seq (); 2892 process_escape_seq ();
2425 break; 2893 break;
2426 case C0_ENQ: /* terminal Status */ 2894 case C0_ENQ: /* terminal Status */
2427 if (rs[Rs_answerbackstring]) 2895 if (rs[Rs_answerbackstring])
2428 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2896 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2429 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2897 (unsigned int)strlen (rs[Rs_answerbackstring]));
2430 else 2898 else
2431 tt_write ((unsigned char *)VT100_ANS, 2899 tt_write ((unsigned char *)VT100_ANS,
2432 (unsigned int)STRLEN (VT100_ANS)); 2900 (unsigned int)strlen (VT100_ANS));
2433 break; 2901 break;
2434 case C0_BEL: /* bell */ 2902 case C0_BEL: /* bell */
2435 scr_bell (); 2903 scr_bell ();
2436 break; 2904 break;
2437 case C0_BS: /* backspace */ 2905 case C0_BS: /* backspace */
… …
2453 break; 2921 break;
2454 case C0_SI: /* shift in - acs */ 2922 case C0_SI: /* shift in - acs */
2455 scr_charset_choose (0); 2923 scr_charset_choose (0);
2456 break; 2924 break;
2457 2925
2926#ifdef EIGHT_BIT_CONTROLS
2458 // 8-bit controls 2927 // 8-bit controls
2459 case 0x90: /* DCS */ 2928 case 0x90: /* DCS */
2460 process_dcs_seq (); 2929 process_dcs_seq ();
2461 break; 2930 break;
2462 case 0x9b: /* CSI */ 2931 case 0x9b: /* CSI */
2463 process_csi_seq (); 2932 process_csi_seq ();
2464 break; 2933 break;
2465 case 0x9d: /* CSI */ 2934 case 0x9d: /* CSI */
2466 process_osc_seq (); 2935 process_osc_seq ();
2467 break; 2936 break;
2937#endif
2468 } 2938 }
2469} 2939}
2470/*}}} */ 2940/*}}} */
2471 2941
2472 2942
… …
2534void 3004void
2535rxvt_term::process_escape_seq () 3005rxvt_term::process_escape_seq ()
2536{ 3006{
2537 unicode_t ch = cmd_getc (); 3007 unicode_t ch = cmd_getc ();
2538 3008
2539 if (PrivateModes & PrivMode_vt52) 3009 if (priv_modes & PrivMode_vt52)
2540 { 3010 {
2541 process_escape_vt52 (ch); 3011 process_escape_vt52 (ch);
2542 return; 3012 return;
2543 } 3013 }
2544 3014
… …
2559 scr_charset_set (2, (unsigned int)cmd_getc ()); 3029 scr_charset_set (2, (unsigned int)cmd_getc ());
2560 break; 3030 break;
2561 case '+': 3031 case '+':
2562 scr_charset_set (3, (unsigned int)cmd_getc ()); 3032 scr_charset_set (3, (unsigned int)cmd_getc ());
2563 break; 3033 break;
2564#ifndef NO_FRILLS 3034#if ENABLE_FRILLS
2565 case '6': 3035 case '6':
2566 scr_backindex (); 3036 scr_backindex ();
2567 break; 3037 break;
2568#endif 3038#endif
2569 case '7': 3039 case '7':
2570 scr_cursor (SAVE); 3040 scr_cursor (SAVE);
2571 break; 3041 break;
2572 case '8': 3042 case '8':
2573 scr_cursor (RESTORE); 3043 scr_cursor (RESTORE);
2574 break; 3044 break;
2575#ifndef NO_FRILLS 3045#if ENABLE_FRILLS
2576 case '9': 3046 case '9':
2577 scr_forwardindex (); 3047 scr_forwardindex ();
2578 break; 3048 break;
2579#endif 3049#endif
2580 case '=': 3050 case '=':
… …
2661 3131
2662/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3132/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2663/* *INDENT-OFF* */ 3133/* *INDENT-OFF* */
2664enum { 3134enum {
2665 CSI_ICH = 0x40, 3135 CSI_ICH = 0x40,
2666 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,
2667 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 ,
2668 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,
2669 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,
2670 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,
2671 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,
… …
2759 { 3229 {
2760 switch (priv) 3230 switch (priv)
2761 { 3231 {
2762 case '>': 3232 case '>':
2763 if (ch == CSI_DA) /* secondary device attributes */ 3233 if (ch == CSI_DA) /* secondary device attributes */
2764 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3234 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2765 break; 3235 break;
2766 case '?': 3236 case '?':
2767 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3237 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2768 process_terminal_mode (ch, priv, nargs, arg); 3238 process_terminal_mode (ch, priv, nargs, arg);
2769 break; 3239 break;
… …
2879 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3349 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2880 break; 3350 break;
2881 3351
2882 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3352 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2883 tt_write ((const unsigned char *)VT100_ANS, 3353 tt_write ((const unsigned char *)VT100_ANS,
2884 (unsigned int) (sizeof (VT100_ANS) - 1)); 3354 (unsigned int) (sizeof (VT100_ANS) - 1));
2885 break; 3355 break;
2886 3356
2887 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3357 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2888 process_sgr_mode (nargs, arg); 3358 process_sgr_mode (nargs, arg);
2889 break; 3359 break;
… …
2896 break; 3366 break;
2897 case 6: /* CPR requested */ 3367 case 6: /* CPR requested */
2898 scr_report_position (); 3368 scr_report_position ();
2899 break; 3369 break;
2900 case 7: /* unofficial extension */ 3370 case 7: /* unofficial extension */
2901 if (Options & Opt_insecure) 3371 if (options & Opt_insecure)
2902 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3372 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2903 break; 3373 break;
2904 case 8: /* unofficial extension */ 3374 case 8: /* unofficial extension */
2905 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3375 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2906 break; 3376 break;
2907 } 3377 }
… …
2943 break; 3413 break;
2944 3414
2945 case CSI_RM: /* 8.3.107: RESET MODE */ 3415 case CSI_RM: /* 8.3.107: RESET MODE */
2946 if (arg[0] == 4) 3416 if (arg[0] == 4)
2947 scr_insert_mode (0); 3417 scr_insert_mode (0);
3418 else if (arg[0] == 20)
3419 priv_modes &= ~PrivMode_LFNL;
2948 break; 3420 break;
2949 3421
2950 case CSI_SM: /* 8.3.126: SET MODE */ 3422 case CSI_SM: /* 8.3.126: SET MODE */
2951 if (arg[0] == 4) 3423 if (arg[0] == 4)
2952 scr_insert_mode (1); 3424 scr_insert_mode (1);
3425 else if (arg[0] == 20)
3426 priv_modes |= PrivMode_LFNL;
2953 break; 3427 break;
2954 3428
2955 /* 3429 /*
2956 * PRIVATE USE beyond this point. All CSI_7? sequences here 3430 * PRIVATE USE beyond this point. All CSI_7? sequences here
2957 */ 3431 */
… …
2969 break; 3443 break;
2970 case CSI_75: 3444 case CSI_75:
2971 scr_cursor (RESTORE); 3445 scr_cursor (RESTORE);
2972 break; 3446 break;
2973 3447
2974#ifndef NO_FRILLS 3448#if ENABLE_FRILLS
2975 case CSI_74: 3449 case CSI_74:
2976 process_window_ops (arg, nargs); 3450 process_window_ops (arg, nargs);
2977 break; 3451 break;
2978#endif 3452#endif
2979 3453
… …
2986 break; 3460 break;
2987 } 3461 }
2988} 3462}
2989/*}}} */ 3463/*}}} */
2990 3464
2991#ifndef NO_FRILLS 3465#if ENABLE_FRILLS
2992/* ARGSUSED */ 3466/* ARGSUSED */
2993void 3467void
2994rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3468rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2995{ 3469{
2996 int x, y; 3470 int x, y;
2997 XWindowAttributes wattr; 3471 XWindowAttributes wattr;
2998 Window wdummy; 3472 Window wdummy;
3473 dDisp;
2999 3474
3000 if (nargs == 0) 3475 if (nargs == 0)
3001 return; 3476 return;
3002 3477
3003 switch (args[0]) 3478 switch (args[0])
3004 { 3479 {
3005 /* 3480 /*
3006 * commands 3481 * commands
3007 */ 3482 */
3008 case 1: /* deiconify window */ 3483 case 1: /* deiconify window */
3009 XMapWindow (display->display, TermWin.parent[0]); 3484 XMapWindow (disp, TermWin.parent[0]);
3010 break; 3485 break;
3011 case 2: /* iconify window */ 3486 case 2: /* iconify window */
3012 XIconifyWindow (display->display, TermWin.parent[0], 3487 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3013 DefaultScreen (display->display));
3014 break; 3488 break;
3015 case 3: /* set position (pixels) */ 3489 case 3: /* set position (pixels) */
3016 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3490 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3017 break; 3491 break;
3018 case 4: /* set size (pixels) */ 3492 case 4: /* set size (pixels) */
3019 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3493 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3020 break; 3494 break;
3021 case 5: /* raise window */ 3495 case 5: /* raise window */
3022 XRaiseWindow (display->display, TermWin.parent[0]); 3496 XRaiseWindow (disp, TermWin.parent[0]);
3023 break; 3497 break;
3024 case 6: /* lower window */ 3498 case 6: /* lower window */
3025 XLowerWindow (display->display, TermWin.parent[0]); 3499 XLowerWindow (disp, TermWin.parent[0]);
3026 break; 3500 break;
3027 case 7: /* refresh window */ 3501 case 7: /* refresh window */
3028 scr_touch (true); 3502 scr_touch (true);
3029 break; 3503 break;
3030 case 8: /* set size (chars) */ 3504 case 8: /* set size (chars) */
… …
3042 3516
3043 /* 3517 /*
3044 * reports - some output format copied from XTerm 3518 * reports - some output format copied from XTerm
3045 */ 3519 */
3046 case 11: /* report window state */ 3520 case 11: /* report window state */
3047 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3521 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3048 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3522 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3049 break; 3523 break;
3050 case 13: /* report window position */ 3524 case 13: /* report window position */
3051 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3525 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3052 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3526 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3053 -wattr.border_width, -wattr.border_width, 3527 -wattr.border_width, -wattr.border_width,
3054 &x, &y, &wdummy); 3528 &x, &y, &wdummy);
3055 tt_printf ("\033[3;%d;%dt", x, y); 3529 tt_printf ("\033[3;%d;%dt", x, y);
3056 break; 3530 break;
3057 case 14: /* report window size (pixels) */ 3531 case 14: /* report window size (pixels) */
3058 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3532 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3059 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3533 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3060 break; 3534 break;
3061 case 18: /* report text area size (chars) */ 3535 case 18: /* report text area size (chars) */
3062 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3536 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3063 break; 3537 break;
3064 case 19: /* report window size (chars) */ 3538 case 19: /* report window size (chars) */
3065 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3539 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3066 break; 3540 break;
3067 case 20: /* report icon label */ 3541 case 20: /* report icon label */
3068 if (Options & Opt_insecure)
3069 { 3542 {
3070 char *s; 3543 char *s;
3071 XGetIconName (display->display, TermWin.parent[0], &s); 3544 XGetIconName (disp, TermWin.parent[0], &s);
3072 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);
3073 } 3547 }
3074 break; 3548 break;
3075 case 21: /* report window title */ 3549 case 21: /* report window title */
3076 if (Options & Opt_insecure)
3077 { 3550 {
3078 char *s; 3551 char *s;
3079 XFetchName (display->display, TermWin.parent[0], &s); 3552 XFetchName (disp, TermWin.parent[0], &s);
3080 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);
3081 } 3555 }
3082 break; 3556 break;
3083 } 3557 }
3084} 3558}
3085#endif 3559#endif
3086 3560
… …
3090 * ends_how is terminator used. returned input must be free()'d 3564 * ends_how is terminator used. returned input must be free()'d
3091 */ 3565 */
3092unsigned char * 3566unsigned char *
3093rxvt_term::get_to_st (unicode_t &ends_how) 3567rxvt_term::get_to_st (unicode_t &ends_how)
3094{ 3568{
3095 int seen_esc = 0; /* seen escape? */ 3569 unicode_t ch;
3570 bool seen_esc = false;
3096 unsigned int n = 0; 3571 unsigned int n = 0;
3097 unsigned char *s;
3098 unicode_t ch;
3099 unsigned char string[STRING_MAX]; 3572 wchar_t string[STRING_MAX];
3100 3573
3101 while ((ch = cmd_getc ())) 3574 while ((ch = cmd_getc ()) != NOCHAR)
3102 { 3575 {
3103 if (ch == C0_BEL || ch == CHAR_ST)
3104 break;
3105
3106 if (seen_esc) 3576 if (seen_esc)
3577 {
3107 if (ch == 0x5c) /* 7bit ST */ 3578 if (ch == 0x5c) /* 7bit ST */
3108 break; 3579 break;
3109 else 3580 else
3110 return NULL; 3581 return NULL;
3111 3582 }
3112 if (ch == C0_ESC) 3583 else if (ch == C0_ESC)
3113 { 3584 {
3114 seen_esc = 1; 3585 seen_esc = true;
3115 continue; 3586 continue;
3116 } 3587 }
3588 else if (ch == C0_BEL || ch == CHAR_ST)
3589 break;
3117 else if (ch == C0_HT) 3590 else if (ch < 0x20)
3118 ch = ' '; /* translate '\t' to space */
3119 else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR))
3120 return NULL; /* other control character - exit */ 3591 return NULL; /* other control character - exit */
3121 3592
3122 if (n >= sizeof (string) - 1) 3593 seen_esc = false;
3594
3595 if (n >= STRING_MAX - 1)
3123 // stop at some sane length 3596 // stop at some sane length
3124 return NULL; 3597 return NULL;
3125 3598
3599 if (ch == C0_SYN)
3600 string[n++] = cmd_get8 ();
3601 else
3126 string[n++] = ch; 3602 string[n++] = ch;
3127 seen_esc = 0;
3128 } 3603 }
3129 3604
3130 string[n++] = '\0'; 3605 string[n++] = '\0';
3131 3606
3132 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3133 return NULL;
3134
3135 ends_how = (ch == 0x5c ? C0_ESC : ch); 3607 ends_how = (ch == 0x5c ? C0_ESC : ch);
3136 STRNCPY (s, string, n); 3608
3137 return s; 3609 return (unsigned char *)rxvt_wcstombs (string);
3138} 3610}
3139 3611
3140/*----------------------------------------------------------------------*/ 3612/*----------------------------------------------------------------------*/
3141/* 3613/*
3142 * 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)'
… …
3186void 3658void
3187rxvt_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)
3188{ 3660{
3189 if (str[0] == '?' && !str[1]) 3661 if (str[0] == '?' && !str[1])
3190 { 3662 {
3191 if (Options & Opt_insecure)
3192 {
3193 unsigned short r, g, b; 3663 unsigned short r, g, b;
3194 PixColors[color].get (display, r, g, b); 3664 pix_colors_focused[color].get (display, r, g, b);
3195 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);
3196 }
3197 } 3666 }
3198 else 3667 else
3199 set_window_color (color, str); 3668 set_window_color (color, str);
3200} 3669}
3201 3670
3202/* 3671/*
3203 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3672 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3204 * 0 = change iconName/title
3205 * 1 = change iconName
3206 * 2 = change title
3207 * 4 = change color
3208 * 10 = change fg color
3209 * 11 = change bg color
3210 * 12 = change text color
3211 * 13 = change mouse foreground color
3212 * 17 = change highlight character colour
3213 * 18 = change bold character color
3214 * 19 = change underlined character color
3215 * 46 = change logfile (not implemented)
3216 * 50 = change font
3217 *
3218 * rxvt extensions:
3219 * 20 = bg pixmap
3220 * 39 = change default fg color
3221 * 49 = change default bg color
3222 * 55 = dump scrollback buffer and all of screen
3223 * 701 = change locale
3224 * 702 = find font
3225 * 703 = menu
3226 */ 3673 */
3227void 3674void
3228rxvt_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)
3229{ 3676{
3230 int changed = 0; 3677 int changed = 0;
3231 int color; 3678 int color;
3232 char *buf, *name; 3679 char *buf, *name;
3233 bool query = str[0] == '?' && !str[1]; 3680 bool query = str[0] == '?' && !str[1];
3681 int saveop = op;
3682 dDisp;
3234 3683
3235 assert (str != NULL); 3684 assert (str != NULL);
3236 switch (op) 3685 switch (op)
3237 { 3686 {
3238 case XTerm_name: 3687 case XTerm_name:
… …
3245 set_title (str); 3694 set_title (str);
3246 break; 3695 break;
3247 case XTerm_property: 3696 case XTerm_property:
3248 if (str[0] == '?') 3697 if (str[0] == '?')
3249 { 3698 {
3250 Atom prop = XInternAtom (display->display, str + 1, True); 3699 Atom prop = display->atom (str + 1);
3251 Atom actual_type; 3700 Atom actual_type;
3252 int actual_format; 3701 int actual_format;
3253 unsigned long nitems; 3702 unsigned long nitems;
3254 unsigned long bytes_after; 3703 unsigned long bytes_after;
3255 unsigned char *value = 0; 3704 unsigned char *value = 0;
3256 const char *str = ""; 3705 const char *str = "";
3257 3706
3258 if (prop 3707 if (prop
3259 && XGetWindowProperty (display->display, TermWin.parent[0], 3708 && XGetWindowProperty (disp, TermWin.parent[0],
3260 prop, 0, 1<<16, 0, AnyPropertyType, 3709 prop, 0, 1<<16, 0, AnyPropertyType,
3261 &actual_type, &actual_format, 3710 &actual_type, &actual_format,
3262 &nitems, &bytes_after, &value) == Success 3711 &nitems, &bytes_after, &value) == Success
3263 && actual_type != None 3712 && actual_type != None
3264 && actual_format == 8) 3713 && actual_format == 8)
… …
3273 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3722 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3274 3723
3275 if (eq) 3724 if (eq)
3276 { 3725 {
3277 *eq = 0; 3726 *eq = 0;
3278 XChangeProperty (display->display, TermWin.parent[0], 3727 set_utf8_property (display->atom (str), eq + 1);
3279 display->atom (str), XA_STRING, 8,
3280 PropModeReplace, (unsigned char *)eq + 1,
3281 strlen (eq + 1));
3282 } 3728 }
3283 else 3729 else
3284 XDeleteProperty (display->display, TermWin.parent[0], 3730 XDeleteProperty (disp, TermWin.parent[0],
3285 display->atom (str)); 3731 display->atom (str));
3286 } 3732 }
3287 break; 3733 break;
3288 3734
3289 case XTerm_Color: 3735 case XTerm_Color:
3290 for (buf = (char *)str; buf && *buf;) 3736 for (buf = (char *)str; buf && *buf;)
3291 { 3737 {
3292 if ((name = STRCHR (buf, ';')) == NULL) 3738 if ((name = strchr (buf, ';')) == NULL)
3293 break; 3739 break;
3294 3740
3295 *name++ = '\0'; 3741 *name++ = '\0';
3296 color = atoi (buf); 3742 color = atoi (buf);
3297 3743
3298 if (color < 0 || color >= TOTAL_COLORS) 3744 if (color < 0 || color >= TOTAL_COLORS)
3299 break; 3745 break;
3300 3746
3301 if ((buf = STRCHR (name, ';')) != NULL) 3747 if ((buf = strchr (name, ';')) != NULL)
3302 *buf++ = '\0'; 3748 *buf++ = '\0';
3303 3749
3304 if (name[0] == '?' && !name[1]) 3750 if (name[0] == '?' && !name[1])
3305 { 3751 {
3306 if (Options & Opt_insecure)
3307 {
3308 unsigned short r, g, b; 3752 unsigned short r, g, b;
3309 PixColors[color + minCOLOR].get (display, r, g, b); 3753 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3310 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);
3311 }
3312 } 3755 }
3313 else 3756 else
3314 set_window_color (color + minCOLOR, name); 3757 set_window_color (color + minCOLOR, name);
3315 } 3758 }
3316 break; 3759 break;
… …
3338 case XTerm_Color_UL: 3781 case XTerm_Color_UL:
3339 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3782 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3340 break; 3783 break;
3341 case XTerm_Color_RV: 3784 case XTerm_Color_RV:
3342 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;
3343 break; 3797 break;
3344#endif 3798#endif
3345 3799
3346 case XTerm_Pixmap: 3800 case XTerm_Pixmap:
3347 if (*str != ';') 3801 if (*str != ';')
… …
3350 scale_pixmap (""); /* reset to default scaling */ 3804 scale_pixmap (""); /* reset to default scaling */
3351 set_bgPixmap (str); /* change pixmap */ 3805 set_bgPixmap (str); /* change pixmap */
3352#endif 3806#endif
3353 scr_touch (true); 3807 scr_touch (true);
3354 } 3808 }
3355 while ((str = STRCHR (str, ';')) != NULL) 3809 while ((str = strchr (str, ';')) != NULL)
3356 { 3810 {
3357 str++; 3811 str++;
3358#if XPM_BACKGROUND 3812#if XPM_BACKGROUND
3359 changed += scale_pixmap (str); 3813 changed += scale_pixmap (str);
3360#endif 3814#endif
3361
3362 } 3815 }
3816
3363 if (changed) 3817 if (changed)
3364 { 3818 {
3365#ifdef XPM_BACKGROUND 3819#ifdef XPM_BACKGROUND
3366 resize_pixmap (); 3820 resize_pixmap ();
3367#endif 3821#endif
… …
3378 3832
3379 case XTerm_logfile: 3833 case XTerm_logfile:
3380 // TODO, when secure mode? 3834 // TODO, when secure mode?
3381 break; 3835 break;
3382 3836
3383 case XTerm_font:
3384 if (query)
3385 {
3386 if (Options & Opt_insecure)
3387 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3388 TermWin.fontset->fontdesc
3389 ? TermWin.fontset->fontdesc
3390 : "",
3391 resp);
3392 }
3393 else
3394 change_font (str);
3395 break;
3396
3397#ifndef NO_FRILLS
3398 case XTerm_locale:
3399 if (query)
3400 {
3401 if (Options & Opt_insecure)
3402 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp);
3403 }
3404 else
3405 {
3406 set_locale (str);
3407# ifdef USE_XIM
3408 im_cb ();
3409# endif
3410 }
3411 break;
3412
3413 case XTerm_findfont:
3414 if (Options & Opt_insecure)
3415 {
3416 int fid = TermWin.fontset->find_font (atoi (str));
3417 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3418 fid, (*TermWin.fontset)[fid]->name, resp);
3419 }
3420 break;
3421#endif
3422
3423#ifdef MENUBAR 3837#ifdef MENUBAR
3424 case XTerm_Menu: 3838 case URxvt_Menu:
3425 if (Options & Opt_insecure) 3839 if (options & Opt_insecure)
3426 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3840 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3427 break; 3841 break;
3428#endif 3842#endif
3429#if 0 3843#if 0
3430 case XTerm_dumpscreen: /* no error notices */ 3844 case XTerm_dumpscreen: /* no error notices */
… …
3434 { 3848 {
3435 scr_dump (fd); 3849 scr_dump (fd);
3436 close (fd); 3850 close (fd);
3437 } 3851 }
3438 } 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
3439 break; 3901 break;
3440#endif 3902#endif
3441 } 3903 }
3442} 3904}
3443/*----------------------------------------------------------------------*/ 3905/*----------------------------------------------------------------------*/
… …
3457{ 3919{
3458 int state; 3920 int state;
3459 3921
3460 if (mode == 's') 3922 if (mode == 's')
3461 { 3923 {
3462 SavedModes |= (PrivateModes & bit); 3924 SavedModes |= (priv_modes & bit);
3463 return -1; 3925 return -1;
3464 } 3926 }
3465 else 3927 else
3466 { 3928 {
3467 if (mode == 'r') 3929 if (mode == 'r')
3468 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3930 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3469 else 3931 else
3470 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3932 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3471 PrivMode (state, bit); 3933 PrivMode (state, bit);
3472 } 3934 }
3473 3935
3474 return state; 3936 return state;
3475} 3937}
… …
3493 { 3, PrivMode_132 }, 3955 { 3, PrivMode_132 },
3494 { 4, PrivMode_smoothScroll }, 3956 { 4, PrivMode_smoothScroll },
3495 { 5, PrivMode_rVideo }, 3957 { 5, PrivMode_rVideo },
3496 { 6, PrivMode_relOrigin }, 3958 { 6, PrivMode_relOrigin },
3497 { 7, PrivMode_Autowrap }, 3959 { 7, PrivMode_Autowrap },
3960 // 8, bi-directional support mode
3498 { 9, PrivMode_MouseX10 }, 3961 { 9, PrivMode_MouseX10 },
3499#ifdef menuBar_esc 3962#ifdef menuBar_esc
3500 { menuBar_esc, PrivMode_menuBar }, 3963 { menuBar_esc, PrivMode_menuBar },
3501#endif 3964#endif
3965 // 18, 19 printing-related
3966 { 25, PrivMode_VisibleCursor },
3502#ifdef scrollBar_esc 3967#ifdef scrollBar_esc
3503 { scrollBar_esc, PrivMode_scrollBar }, 3968 { scrollBar_esc, PrivMode_scrollBar },
3504#endif 3969#endif
3505 // 18, 19 printing-related
3506 { 25, PrivMode_VisibleCursor },
3507 // 30 show scrollbar rxvt. extension
3508 { 35, PrivMode_ShiftKeys }, // rxvt extension 3970 { 35, PrivMode_ShiftKeys }, // rxvt extension
3509 { 40, PrivMode_132OK }, 3971 { 40, PrivMode_132OK },
3510 // 41 xterm more fixes NYI 3972 // 41 xterm more fixes NYI
3511 // 45 margin bell NYI 3973 // 45 margin bell NYI
3512 // 46 start logging 3974 // 46 start logging
… …
3553 4015
3554 /* extra handling for values with state unkept */ 4016 /* extra handling for values with state unkept */
3555 switch (arg[i]) 4017 switch (arg[i])
3556 { 4018 {
3557 case 1048: /* alternative cursor save */ 4019 case 1048: /* alternative cursor save */
4020 case 1049:
3558 if (Options & Opt_secondaryScreen) 4021 if (options & Opt_secondaryScreen)
3559 if (mode == 0) 4022 if (mode == 0)
3560 scr_cursor (RESTORE); 4023 scr_cursor (RESTORE);
3561 else if (mode == 1) 4024 else if (mode == 1)
3562 scr_cursor (SAVE); 4025 scr_cursor (SAVE);
3563 break; 4026 break;
… …
3574 * within VT52 mode 4037 * within VT52 mode
3575 */ 4038 */
3576 PrivMode (1, PrivMode_vt52); 4039 PrivMode (1, PrivMode_vt52);
3577 break; 4040 break;
3578 case 3: /* 80/132 */ 4041 case 3: /* 80/132 */
3579 if (PrivateModes & PrivMode_132OK) 4042 if (priv_modes & PrivMode_132OK)
3580 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4043 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3581 break; 4044 break;
3582 case 4: /* smooth scrolling */ 4045 case 4: /* smooth scrolling */
3583 if (state) 4046 if (state)
3584 Options &= ~Opt_jumpScroll; 4047 options &= ~Opt_jumpScroll;
3585 else 4048 else
3586 Options |= Opt_jumpScroll; 4049 options |= Opt_jumpScroll;
3587 break; 4050 break;
3588 case 5: /* reverse video */ 4051 case 5: /* reverse video */
3589 scr_rvideo_mode (state); 4052 scr_rvideo_mode (state);
3590 break; 4053 break;
3591 case 6: /* relative/absolute origins */ 4054 case 6: /* relative/absolute origins */
… …
3595 scr_autowrap (state); 4058 scr_autowrap (state);
3596 break; 4059 break;
3597 /* 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 */
3598 case 9: /* X10 mouse reporting */ 4061 case 9: /* X10 mouse reporting */
3599 if (state) /* orthogonal */ 4062 if (state) /* orthogonal */
3600 PrivateModes &= ~PrivMode_MouseX11; 4063 priv_modes &= ~PrivMode_MouseX11;
3601 break; 4064 break;
3602#ifdef menuBar_esc 4065#ifdef menuBar_esc
3603 case menuBar_esc: 4066 case menuBar_esc:
3604#ifdef MENUBAR 4067#ifdef MENUBAR
3605 map_menuBar (state); 4068 map_menuBar (state);
… …
3625 break; 4088 break;
3626 /* case 66: - application key pad */ 4089 /* case 66: - application key pad */
3627 /* case 67: - backspace key */ 4090 /* case 67: - backspace key */
3628 case 1000: /* X11 mouse reporting */ 4091 case 1000: /* X11 mouse reporting */
3629 if (state) /* orthogonal */ 4092 if (state) /* orthogonal */
3630 PrivateModes &= ~PrivMode_MouseX10; 4093 priv_modes &= ~PrivMode_MouseX10;
3631 break; 4094 break;
3632#if 0 4095#if 0
3633 case 1001: 4096 case 1001:
3634 break; /* X11 mouse highlighting */ 4097 break; /* X11 mouse highlighting */
3635#endif 4098#endif
3636 case 1010: /* scroll to bottom on TTY output inhibit */ 4099 case 1010: /* scroll to bottom on TTY output inhibit */
3637 if (state) 4100 if (state)
3638 Options &= ~Opt_scrollTtyOutput; 4101 options &= ~Opt_scrollTtyOutput;
3639 else 4102 else
3640 Options |= Opt_scrollTtyOutput; 4103 options |= Opt_scrollTtyOutput;
3641 break; 4104 break;
3642 case 1011: /* scroll to bottom on key press */ 4105 case 1011: /* scroll to bottom on key press */
3643 if (state) 4106 if (state)
3644 Options |= Opt_scrollTtyKeypress; 4107 options |= Opt_scrollTtyKeypress;
3645 else 4108 else
3646 Options &= ~Opt_scrollTtyKeypress; 4109 options &= ~Opt_scrollTtyKeypress;
3647 break; 4110 break;
3648 case 1047: /* secondary screen w/ clearing last */ 4111 case 1047: /* secondary screen w/ clearing last */
3649 if (Options & Opt_secondaryScreen) 4112 if (options & Opt_secondaryScreen)
3650 if (current_screen != PRIMARY) 4113 if (current_screen != PRIMARY)
3651 scr_erase_screen (2); 4114 scr_erase_screen (2);
3652 scr_change_screen (state); 4115 scr_change_screen (state);
3653 break; 4116 break;
3654 case 1049: /* secondary screen w/ clearing first */ 4117 case 1049: /* secondary screen w/ clearing first */
3655 scr_change_screen (state); 4118 scr_change_screen (state);
3656 if (Options & Opt_secondaryScreen) 4119 if (options & Opt_secondaryScreen)
3657 if (current_screen != PRIMARY) 4120 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4121 scr_erase_screen (2);
3659 break; 4122 break;
3660 default: 4123 default:
3661 break; 4124 break;
… …
3687 rendset = 0, rendstyle = ~RS_None; 4150 rendset = 0, rendstyle = ~RS_None;
3688 break; 4151 break;
3689 case 1: 4152 case 1:
3690 rendset = 1, rendstyle = RS_Bold; 4153 rendset = 1, rendstyle = RS_Bold;
3691 break; 4154 break;
4155 //case 2: // low intensity
4156 case 3:
4157 rendset = 1, rendstyle = RS_Italic;
4158 break;
3692 case 4: 4159 case 4:
3693 rendset = 1, rendstyle = RS_Uline; 4160 rendset = 1, rendstyle = RS_Uline;
3694 break; 4161 break;
3695 case 5: 4162 case 5: // slowly blinking
4163 case 6: // rapidly blinking
3696 rendset = 1, rendstyle = RS_Blink; 4164 rendset = 1, rendstyle = RS_Blink;
3697 break; 4165 break;
3698 //case 6: // scoansi light background 4166 //case 6: // scoansi light background
3699 case 7: 4167 case 7:
3700 rendset = 1, rendstyle = RS_RVid; 4168 rendset = 1, rendstyle = RS_RVid;
3701 break; 4169 break;
3702 case 8: 4170 case 8:
3703 // invisible. NYI 4171 // invisible. NYI
3704 break; 4172 break;
4173 //case 9: // crossed out
3705 //case 10: // scoansi acs off 4174 //case 10: // scoansi acs off, primary font
3706 //case 11: // scoansi acs on 4175 //case 11: // scoansi acs on, first alt font
3707 //case 12: // scoansi acs on, |0x80 4176 //case 12: // scoansi acs on, |0x80, second alt font
3708 case 21: // disable bold, blink and invis (some terminals use this) 4177 //...
4178 //case 19: // ninth alt font
4179 //case 20: // gothic
4180 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3709 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4181 rendset = 0, rendstyle = RS_Bold;
3710 break; 4182 break;
3711 case 22: 4183 case 22: // normal intensity
3712 rendset = 0, rendstyle = RS_Bold; 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 }
… …
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