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

Diff Legend

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