ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.93 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.201 by root, Mon Feb 21 19:26:07 2005 UTC

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

Diff Legend

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