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.97 by root, Mon Jul 26 18:01:19 2004 UTC vs.
Revision 1.199 by root, Sun Feb 20 02:00:43 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
… …
746{ 1028{
747 if (mouse_slip_wheel_speed == 0 1029 if (mouse_slip_wheel_speed == 0
748 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1030 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
749 : scr_page (UP, mouse_slip_wheel_speed)) 1031 : scr_page (UP, mouse_slip_wheel_speed))
750 { 1032 {
1033 if (TermWin.view_start == TermWin.nscrolled ||
1034 TermWin.view_start == 0)
1035 mouse_slip_wheel_speed = 0;
1036
751 refresh_type |= SMOOTH_REFRESH; 1037 refresh_type |= SMOOTH_REFRESH;
752 want_refresh = 1; 1038 want_refresh = 1;
753 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1039 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
754 } 1040 }
755} 1041}
… …
768 1054
769 memmove (cmdbuf_base, cmdbuf_ptr, n); 1055 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base; 1056 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 1057 cmdbuf_endp = cmdbuf_ptr + n;
772 1058
773 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1059 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
774 1060
775 if (n > 0) 1061 if (n > 0)
776 { 1062 {
777 cmdbuf_endp += n; 1063 cmdbuf_endp += n;
778 return true; 1064 return true;
… …
787rxvt_term::pty_cb (io_watcher &w, short revents) 1073rxvt_term::pty_cb (io_watcher &w, short revents)
788{ 1074{
789 SET_R (this); 1075 SET_R (this);
790 SET_LOCALE (locale); 1076 SET_LOCALE (locale);
791 1077
792 if (revents & EVENT_WRITE)
793 tt_write (0, 0);
794 else if (revents & EVENT_READ) 1078 if (revents & EVENT_READ)
795 // loop, but don't allow a single term to monopolize us 1079 // loop, but don't allow a single term to monopolize us
796 while (pty_fill ()) 1080 while (pty_fill ())
797 if (cmd_parse ()) 1081 if (cmd_parse ())
798 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
799} 1100}
800 1101
801#ifdef POINTER_BLANK 1102#ifdef POINTER_BLANK
802void 1103void
803rxvt_term::pointer_unblank ()
804{
805 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
806 recolour_cursor ();
807
808 hidden_pointer = 0;
809
810 if (Options & Opt_pointerBlank)
811 pointer_ev.start (NOW + pointerBlankDelay);
812}
813
814void
815rxvt_term::pointer_blank () 1104rxvt_term::pointer_blank ()
816{ 1105{
817 if (! (Options & Opt_pointerBlank)) 1106 if (! (options & Opt_pointerBlank))
818 return; 1107 return;
819 1108
820 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1109 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
821 XFlush (display->display); 1110 XFlush (display->display);
822 1111
823 hidden_pointer = 1; 1112 hidden_pointer = 1;
824} 1113}
825 1114
… …
842 x = ev.x; 1131 x = ev.x;
843 y = ev.y; 1132 y = ev.y;
844 pixel_position (&x, &y); 1133 pixel_position (&x, &y);
845 1134
846 if (MEvent.button == AnyButton) 1135 if (MEvent.button == AnyButton)
847 {
848 button_number = 3; 1136 button_number = 3;
849 }
850 else 1137 else
851 { 1138 {
852 button_number = MEvent.button - Button1; 1139 button_number = MEvent.button - Button1;
853 /* add 0x3D for wheel events, like xterm does */ 1140 /* add 0x3D for wheel events, like xterm does */
854 if (button_number >= 3) 1141 if (button_number >= 3)
855 button_number += (64 - 3); 1142 button_number += (64 - 3);
856 } 1143 }
857 1144
858 if (PrivateModes & PrivMode_MouseX10) 1145 if (priv_modes & PrivMode_MouseX10)
859 { 1146 {
860 /* 1147 /*
861 * do not report ButtonRelease 1148 * do not report ButtonRelease
862 * no state info allowed 1149 * no state info allowed
863 */ 1150 */
… …
878 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1165 + ((MEvent.state & ModMetaMask) ? 8 : 0)
879 + ((MEvent.state & ControlMask) ? 16 : 0); 1166 + ((MEvent.state & ControlMask) ? 16 : 0);
880#ifdef MOUSE_REPORT_DOUBLECLICK 1167#ifdef MOUSE_REPORT_DOUBLECLICK
881 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1168 key_state += ((MEvent.clicks > 1) ? 32 : 0);
882#endif 1169#endif
883
884 } 1170 }
885 1171
886#ifdef DEBUG_MOUSEREPORT 1172#if DEBUG_MOUSEREPORT
887 fprintf (stderr, "Mouse ["); 1173 fprintf (stderr, "Mouse [");
888 if (key_state & 16) 1174 if (key_state & 16)
889 fputc ('C', stderr); 1175 fputc ('C', stderr);
890 if (key_state & 4) 1176 if (key_state & 4)
891 fputc ('S', stderr); 1177 fputc ('S', stderr);
… …
895 fputc ('2', stderr); 1181 fputc ('2', stderr);
896 fprintf (stderr, "]: <%d>, %d/%d\n", 1182 fprintf (stderr, "]: <%d>, %d/%d\n",
897 button_number, 1183 button_number,
898 x + 1, 1184 x + 1,
899 y + 1); 1185 y + 1);
900#else 1186#endif
1187
901 tt_printf ("\033[M%c%c%c", 1188 tt_printf ("\033[M%c%c%c",
902 (32 + button_number + key_state), 1189 (32 + button_number + key_state),
903 (32 + x + 1), 1190 (32 + x + 1),
904 (32 + y + 1)); 1191 (32 + y + 1));
905#endif
906} 1192}
907 1193
908#ifdef USING_W11LIB 1194#ifdef USING_W11LIB
909void 1195void
910rxvt_W11_process_x_event (XEvent *ev) 1196rxvt_W11_process_x_event (XEvent *ev)
… …
917 1203
918/*{{{ process an X event */ 1204/*{{{ process an X event */
919void 1205void
920rxvt_term::x_cb (XEvent &ev) 1206rxvt_term::x_cb (XEvent &ev)
921{ 1207{
1208 dDisp;
1209
922 SET_R (this); 1210 SET_R (this);
923 SET_LOCALE (locale); 1211 SET_LOCALE (locale);
924 1212
925#if defined(CURSOR_BLINK) 1213#if defined(CURSOR_BLINK)
926 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1214 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
927 { 1215 {
928 if (hidden_cursor) 1216 if (hidden_cursor)
929 { 1217 {
930 hidden_cursor = 0; 1218 hidden_cursor = 0;
931 want_refresh = 1; 1219 want_refresh = 1;
… …
934 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1222 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
935 } 1223 }
936#endif 1224#endif
937 1225
938#if defined(POINTER_BLANK) 1226#if defined(POINTER_BLANK)
939 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1227 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
940 { 1228 {
941 if (ev.type == MotionNotify 1229 if (ev.type == MotionNotify
942 || ev.type == ButtonPress 1230 || ev.type == ButtonPress
943 || ev.type == ButtonRelease) 1231 || ev.type == ButtonRelease)
944 if (hidden_pointer) 1232 if (hidden_pointer)
… …
947 if (ev.type == KeyPress && hidden_pointer == 0) 1235 if (ev.type == KeyPress && hidden_pointer == 0)
948 pointer_blank (); 1236 pointer_blank ();
949 } 1237 }
950#endif 1238#endif
951 1239
952#ifdef USE_XIM
953 if (XFilterEvent (&ev, None))
954 return;
955#endif
956
957 Window unused_root, unused_child; 1240 Window unused_root, unused_child;
958 int unused_root_x, unused_root_y; 1241 int unused_root_x, unused_root_y;
959 unsigned int unused_mask; 1242 unsigned int unused_mask;
960
961#ifdef DEBUG_X
962 const char *const eventnames[] =
963 { /* mason - this matches my system */
964 "",
965 "",
966 "KeyPress",
967 "KeyRelease",
968 "ButtonPress",
969 "ButtonRelease",
970 "MotionNotify",
971 "EnterNotify",
972 "LeaveNotify",
973 "FocusIn",
974 "FocusOut",
975 "KeymapNotify",
976 "Expose",
977 "GraphicsExpose",
978 "NoExpose",
979 "VisibilityNotify",
980 "CreateNotify",
981 "DestroyNotify",
982 "UnmapNotify",
983 "MapNotify",
984 "MapRequest",
985 "ReparentNotify",
986 "ConfigureNotify",
987 "ConfigureRequest",
988 "GravityNotify",
989 "ResizeRequest",
990 "CirculateNotify",
991 "CirculateRequest",
992 "PropertyNotify",
993 "SelectionClear",
994 "SelectionRequest",
995 "SelectionNotify",
996 "ColormapNotify",
997 "ClientMessage",
998 "MappingNotify"
999 };
1000#endif
1001
1002#ifdef DEBUG_X
1003 struct timeval tp;
1004 struct tm *ltt;
1005 (void)gettimeofday (&tp, NULL);
1006 ltt = localtime (& (tp.tv_sec));
1007 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));
1008#endif
1009 1243
1010 switch (ev.type) 1244 switch (ev.type)
1011 { 1245 {
1012 case KeyPress: 1246 case KeyPress:
1247#if ISO_14755
1248 if (!(iso14755buf & ISO_14755_52))
1249#endif
1013 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;
1014 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
1015 1315
1016#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1316#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1017 case KeyRelease:
1018 {
1019 if (!(ev.xkey.state & ControlMask)) 1317 if (!(ev.xkey.state & ControlMask))
1020 slip_wheel_ev.stop (); 1318 slip_wheel_ev.stop ();
1021 else
1022 {
1023 KeySym ks;
1024
1025 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1026 if (ks == XK_Control_L || ks == XK_Control_R) 1319 else if (ks == XK_Control_L || ks == XK_Control_R)
1027 mouse_slip_wheel_speed = 0; 1320 mouse_slip_wheel_speed = 0;
1028 } 1321#endif
1029 break; 1322 break;
1030 } 1323 }
1031#endif
1032 1324
1033 case ButtonPress: 1325 case ButtonPress:
1034 button_press (ev.xbutton); 1326 button_press (ev.xbutton);
1035 break; 1327 break;
1036 1328
… …
1038 button_release (ev.xbutton); 1330 button_release (ev.xbutton);
1039 break; 1331 break;
1040 1332
1041 case ClientMessage: 1333 case ClientMessage:
1042 if (ev.xclient.format == 32 1334 if (ev.xclient.format == 32
1335 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]
1043 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1336 && ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1044 destroy (); 1337 destroy ();
1338#if ENABLE_XEMBED
1339 else if (ev.xclient.format == 32
1340 && ev.xclient.message_type == xa[XA_XEMBED])
1341 {
1342 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1343 focus_in ();
1344 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1345 focus_out ();
1346 }
1347#endif
1045#ifdef OFFIX_DND 1348#ifdef OFFIX_DND
1046 /* OffiX Dnd (drag 'n' drop) protocol */ 1349 /* OffiX Dnd (drag 'n' drop) protocol */
1047 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1350 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1048 && (ev.xclient.data.l[0] == DndFile 1351 && (ev.xclient.data.l[0] == DndFile
1049 || ev.xclient.data.l[0] == DndDir 1352 || ev.xclient.data.l[0] == DndDir
1050 || ev.xclient.data.l[0] == DndLink)) 1353 || ev.xclient.data.l[0] == DndLink))
1051 { 1354 {
1052 /* Get Dnd data */ 1355 /* Get Dnd data */
1053 Atom ActualType; 1356 Atom ActualType;
1054 int ActualFormat; 1357 int ActualFormat;
1055 unsigned char *data; 1358 unsigned char *data;
1056 unsigned long Size, RemainingBytes; 1359 unsigned long Size, RemainingBytes;
1057 1360
1058 XGetWindowProperty (display->display, display->root, 1361 XGetWindowProperty (disp, display->root,
1059 xa[XA_DNDSELECTION], 1362 xa[XA_DNDSELECTION],
1060 0L, 1000000L, 1363 0L, 1000000L,
1061 False, AnyPropertyType, 1364 False, AnyPropertyType,
1062 &ActualType, &ActualFormat, 1365 &ActualType, &ActualFormat,
1063 &Size, &RemainingBytes, 1366 &Size, &RemainingBytes,
1064 &data); 1367 &data);
1065 XChangeProperty (display->display, display->root, 1368 set_string_property (XA_CUT_BUFFER0, data);
1066 XA_CUT_BUFFER0, XA_STRING,
1067 8, PropModeReplace,
1068 data, STRLEN (data));
1069 XFree (data); 1369 XFree (data);
1070 selection_paste (display->root, XA_CUT_BUFFER0, True); 1370 selection_paste (display->root, XA_CUT_BUFFER0, true);
1071 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1371 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1072 } 1372 }
1073#endif /* OFFIX_DND */ 1373#endif /* OFFIX_DND */
1074 break; 1374 break;
1075 1375
1076 case MappingNotify: 1376 case MappingNotify:
1077 XRefreshKeyboardMapping (& (ev.xmapping)); 1377 XRefreshKeyboardMapping (&ev.xmapping);
1078 break; 1378 break;
1079 1379
1080 /* 1380 /*
1081 * XXX: this is not the _current_ arrangement 1381 * XXX: this is not the _current_ arrangement
1082 * Here's my conclusion: 1382 * Here's my conclusion:
… …
1101 break; 1401 break;
1102 } 1402 }
1103 break; 1403 break;
1104 1404
1105 case FocusIn: 1405 case FocusIn:
1106 if (!TermWin.focus) 1406 focus_in ();
1107 {
1108 TermWin.focus = 1;
1109 want_refresh = 1;
1110#ifdef USE_XIM
1111 if (Input_Context != NULL)
1112 XSetICFocus (Input_Context);
1113#endif
1114#ifdef CURSOR_BLINK
1115 if (Options & Opt_cursorBlink)
1116 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1117#endif
1118
1119 }
1120 break; 1407 break;
1121 1408
1122 case FocusOut: 1409 case FocusOut:
1123 if (TermWin.focus) 1410 focus_out ();
1124 {
1125 TermWin.focus = 0;
1126 want_refresh = 1;
1127#ifdef USE_XIM
1128 if (Input_Context != NULL)
1129 XUnsetICFocus (Input_Context);
1130#endif
1131#ifdef CURSOR_BLINK
1132 if (Options & Opt_cursorBlink)
1133 cursor_blink_ev.stop ();
1134 hidden_cursor = 0;
1135#endif
1136
1137 }
1138 break; 1411 break;
1139 1412
1140 case ConfigureNotify: 1413 case ConfigureNotify:
1141 if (ev.xconfigure.window == TermWin.parent[0]) 1414 if (ev.xconfigure.window == TermWin.parent[0])
1142 { 1415 {
… …
1146 { /* Wrap lots of configures into one */ 1419 { /* Wrap lots of configures into one */
1147 width = ev.xconfigure.width; 1420 width = ev.xconfigure.width;
1148 height = ev.xconfigure.height; 1421 height = ev.xconfigure.height;
1149 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1422 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1150 } 1423 }
1151 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1424 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1152 1425
1153 if (szHint.width != width || szHint.height != height) 1426 if (szHint.width != width || szHint.height != height)
1154 { 1427 {
1155 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1428 seen_resize = 1;
1156 resize_all_windows (width, height, 1); 1429 resize_all_windows (width, height, 1);
1157 } 1430 }
1158#ifdef DEBUG_SIZE 1431
1159 else
1160 {
1161 D_SIZE ((stderr, "Size: Not resizing"));
1162 }
1163#endif
1164#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1432#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1165 if (Options & Opt_transparent) 1433 if (options & Opt_transparent)
1166 {
1167 check_our_parents (); 1434 check_our_parents ();
1168 if (am_transparent)
1169 want_full_refresh = 1;
1170 }
1171#endif 1435#endif
1172 } 1436 }
1437 break;
1438
1439 case PropertyNotify:
1440 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1441 && ev.xproperty.state == PropertyNewValue)
1442 selection_property (ev.xproperty.window, ev.xproperty.atom);
1443
1173 break; 1444 break;
1174 1445
1175 case SelectionClear: 1446 case SelectionClear:
1176 selection_clear (); 1447 selection_clear ();
1177 break; 1448 break;
1178 1449
1179 case SelectionNotify: 1450 case SelectionNotify:
1180 if (selection_wait == Sel_normal) 1451 if (selection_wait == Sel_normal)
1181 selection_paste (ev.xselection.requestor, 1452 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1182 ev.xselection.property, True);
1183 break; 1453 break;
1184 1454
1185 case SelectionRequest: 1455 case SelectionRequest:
1186 selection_send (ev.xselectionrequest); 1456 selection_send (ev.xselectionrequest);
1187 break; 1457 break;
… …
1208 1478
1209 case GraphicsExpose: 1479 case GraphicsExpose:
1210 case Expose: 1480 case Expose:
1211 if (ev.xany.window == TermWin.vt) 1481 if (ev.xany.window == TermWin.vt)
1212 { 1482 {
1213#ifdef NO_SLOW_LINK_SUPPORT 1483 do
1214 scr_expose (ev.xexpose.x, ev.xexpose.y, 1484 scr_expose (ev.xexpose.x, ev.xexpose.y,
1215 ev.xexpose.width, ev.xexpose.height, False); 1485 ev.xexpose.width, ev.xexpose.height, False);
1216#else 1486 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1217 // I don't understand this, so I changed it :) 1487
1488 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1489
1490 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1218 scr_expose (ev.xexpose.x, ev.xexpose.y, 1491 scr_expose (ev.xexpose.x, ev.xexpose.y,
1219 ev.xexpose.width, ev.xexpose.height, False); 1492 ev.xexpose.width, ev.xexpose.height, False);
1220 //scr_expose (ev.xexpose.x, 0, 1493
1221 // ev.xexpose.width, TermWin.height, False); 1494 scr_refresh (refresh_type);
1222#endif
1223 want_refresh = 1;
1224 } 1495 }
1225 else 1496 else
1226 { 1497 {
1227 XEvent unused_event; 1498 XEvent unused_event;
1228 1499
1229 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1500 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1230 ; 1501 ;
1231 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1502 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1232 ; 1503 ;
1233 1504
1234 if (isScrollbarWindow (ev.xany.window)) 1505 if (isScrollbarWindow (ev.xany.window))
1235 { 1506 {
1236 scrollBar.setIdle (); 1507 scrollBar.setIdle ();
… …
1238 } 1509 }
1239#ifdef MENUBAR 1510#ifdef MENUBAR
1240 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1511 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1241 menubar_expose (); 1512 menubar_expose ();
1242#endif 1513#endif
1514
1515#ifdef TRANSPARENT
1516 if (am_transparent && ev.xany.window == TermWin.parent[0])
1517 XClearWindow (disp, ev.xany.window);
1518#endif
1243 } 1519 }
1244 break; 1520 break;
1245 1521
1246 case MotionNotify: 1522 case MotionNotify:
1247#ifdef POINTER_BLANK 1523#ifdef POINTER_BLANK
… …
1253 { 1529 {
1254 menubar_control (ev.xbutton); 1530 menubar_control (ev.xbutton);
1255 break; 1531 break;
1256 } 1532 }
1257#endif 1533#endif
1258 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1534 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1259 break; 1535 break;
1260 1536
1261 if (ev.xany.window == TermWin.vt) 1537 if (ev.xany.window == TermWin.vt)
1262 { 1538 {
1263 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1539 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1264 { 1540 {
1265 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1541 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1266 ; 1542 ;
1267 1543
1268 XQueryPointer (display->display, TermWin.vt, 1544 XQueryPointer (disp, TermWin.vt,
1269 &unused_root, &unused_child, 1545 &unused_root, &unused_child,
1270 &unused_root_x, &unused_root_y, 1546 &unused_root_x, &unused_root_y,
1271 & (ev.xbutton.x), & (ev.xbutton.y), 1547 &ev.xbutton.x, &ev.xbutton.y,
1272 &unused_mask); 1548 &ev.xbutton.state);
1273#ifdef MOUSE_THRESHOLD 1549#ifdef MOUSE_THRESHOLD
1274 /* deal with a `jumpy' mouse */ 1550 /* deal with a `jumpy' mouse */
1275 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1551 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1276 { 1552 {
1277#endif 1553#endif
1554#if ISO_14755
1555 // 5.4
1556 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1557 {
1558 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1559 break;
1560 }
1561#endif
1278 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1562 selection_extend (ev.xbutton.x, ev.xbutton.y,
1279 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1563 ev.xbutton.state & Button3Mask ? 2 : 0);
1564
1280#ifdef SELECTION_SCROLLING 1565#ifdef SELECTION_SCROLLING
1281 if (ev.xbutton.y < TermWin.int_bwidth 1566 if (ev.xbutton.y < TermWin.int_bwidth
1282 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1567 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1283 { 1568 {
1284 int dist; 1569 int dist;
… …
1290 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1575 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1291 1576
1292 /* save the event params so we can highlight 1577 /* save the event params so we can highlight
1293 * the selection in the pending-scroll loop 1578 * the selection in the pending-scroll loop
1294 */ 1579 */
1295 selection_save_x=ev.xbutton.x; 1580 selection_save_x = ev.xbutton.x;
1296 selection_save_y=ev.xbutton.y; 1581 selection_save_y = ev.xbutton.y;
1297 selection_save_state=
1298 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1582 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1299 1583
1300 /* calc number of lines to scroll */ 1584 /* calc number of lines to scroll */
1301 if (ev.xbutton.y<TermWin.int_bwidth) 1585 if (ev.xbutton.y < TermWin.int_bwidth)
1302 { 1586 {
1303 scroll_selection_dir = UP; 1587 scroll_selection_dir = UP;
1304 dist = TermWin.int_bwidth - ev.xbutton.y; 1588 dist = TermWin.int_bwidth - ev.xbutton.y;
1305 } 1589 }
1306 else 1590 else
1307 { 1591 {
1308 scroll_selection_dir = DN; 1592 scroll_selection_dir = DN;
1309 dist = ev.xbutton.y -
1310 (TermWin.int_bwidth + TermWin.height); 1593 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1311 } 1594 }
1595
1312 scroll_selection_lines= (Pixel2Height (dist)/ 1596 scroll_selection_lines = Pixel2Height (dist)
1313 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1597 / SELECTION_SCROLL_LINE_SPEEDUP
1598 + 1;
1314 MIN_IT (scroll_selection_lines, 1599 MIN_IT (scroll_selection_lines,
1315 SELECTION_SCROLL_MAX_LINES); 1600 SELECTION_SCROLL_MAX_LINES);
1316 } 1601 }
1317 else 1602 else
1318 { 1603 {
1319 /* we are within the text window, so we 1604 /* we are within the text window, so we
1320 * shouldn't be scrolling 1605 * shouldn't be scrolling
… …
1322 if (sel_scroll_ev.active) 1607 if (sel_scroll_ev.active)
1323 sel_scroll_ev.stop(); 1608 sel_scroll_ev.stop();
1324 } 1609 }
1325#endif 1610#endif
1326#ifdef MOUSE_THRESHOLD 1611#ifdef MOUSE_THRESHOLD
1327
1328 } 1612 }
1329#endif 1613#endif
1330
1331 } 1614 }
1332 } 1615 }
1333 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1616 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1334 { 1617 {
1335 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1618 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1336 MotionNotify, &ev)) ; 1619 MotionNotify, &ev))
1620 ;
1621
1337 XQueryPointer (display->display, scrollBar.win, 1622 XQueryPointer (disp, scrollBar.win,
1338 &unused_root, &unused_child, 1623 &unused_root, &unused_child,
1339 &unused_root_x, &unused_root_y, 1624 &unused_root_x, &unused_root_y,
1340 & (ev.xbutton.x), & (ev.xbutton.y), 1625 &ev.xbutton.x, &ev.xbutton.y,
1341 &unused_mask); 1626 &unused_mask);
1342 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1627 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1343 scrollbar_size ()); 1628 scrollbar_size ());
1344 scr_refresh (refresh_type); 1629 scr_refresh (refresh_type);
1345 refresh_limit = 0; 1630 refresh_limit = 0;
… …
1348 break; 1633 break;
1349 } 1634 }
1350} 1635}
1351 1636
1352void 1637void
1638rxvt_term::focus_in ()
1639{
1640 if (!TermWin.focus)
1641 {
1642 TermWin.focus = 1;
1643 want_refresh = 1;
1644#ifdef USE_XIM
1645 if (Input_Context != NULL)
1646 {
1647 IMSetStatusPosition ();
1648 XSetICFocus (Input_Context);
1649 }
1650#endif
1651#ifdef CURSOR_BLINK
1652 if (options & Opt_cursorBlink)
1653 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1654#endif
1655#ifdef OFF_FOCUS_FADING
1656 if (rs[Rs_fade])
1657 {
1658 pix_colors = pix_colors_focused;
1659 scr_recolour ();
1660 }
1661#endif
1662 }
1663}
1664
1665void
1666rxvt_term::focus_out ()
1667{
1668 if (TermWin.focus)
1669 {
1670 TermWin.focus = 0;
1671 want_refresh = 1;
1672
1673#if ENABLE_FRILLS || ISO_14755
1674 iso14755buf = 0;
1675#endif
1676#if ENABLE_OVERLAY
1677 scr_overlay_off ();
1678#endif
1679#ifdef USE_XIM
1680 if (Input_Context != NULL)
1681 XUnsetICFocus (Input_Context);
1682#endif
1683#ifdef CURSOR_BLINK
1684 if (options & Opt_cursorBlink)
1685 cursor_blink_ev.stop ();
1686 hidden_cursor = 0;
1687#endif
1688#ifdef OFF_FOCUS_FADING
1689 if (rs[Rs_fade])
1690 {
1691 pix_colors = pix_colors_unfocused;
1692 scr_recolour ();
1693 }
1694#endif
1695 }
1696}
1697
1698#if TRANSPARENT
1699void
1353rxvt_term::rootwin_cb (XEvent &ev) 1700rxvt_term::rootwin_cb (XEvent &ev)
1354{ 1701{
1355 SET_R (this); 1702 SET_R (this);
1356 SET_LOCALE (locale); 1703 SET_LOCALE (locale);
1357 1704
1358 switch (ev.type) 1705 switch (ev.type)
1359 { 1706 {
1360 case PropertyNotify: 1707 case PropertyNotify:
1361 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1362 {
1363 if (ev.xproperty.state == PropertyNewValue)
1364 selection_property (ev.xproperty.window, ev.xproperty.atom);
1365 break;
1366 }
1367#ifdef TRANSPARENT
1368 else
1369 {
1370 /* 1708 /*
1371 * if user used some Esetroot compatible prog to set the root bg, 1709 * if user used some Esetroot compatible prog to set the root bg,
1372 * use the property to determine the pixmap. We use it later on. 1710 * use the property to determine the pixmap. We use it later on.
1373 */ 1711 */
1374 if (xa[XA_XROOTPMAPID] == 0)
1375 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1376
1377 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1712 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1713 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1378 return; 1714 return;
1379 }
1380 1715
1381 /* FALLTHROUGH */ 1716 /* FALLTHROUGH */
1382 case ReparentNotify: 1717 case ReparentNotify:
1383 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1718 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1384 want_full_refresh = 1; 1719 want_refresh = want_full_refresh = 1;
1385 break; 1720 break;
1386#endif
1387 } 1721 }
1388} 1722}
1723#endif
1389 1724
1390void 1725void
1391rxvt_term::button_press (XButtonEvent &ev) 1726rxvt_term::button_press (XButtonEvent &ev)
1392{ 1727{
1393 int reportmode = 0, clickintime; 1728 int reportmode = 0, clickintime;
1394 1729
1395 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1730 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1396 if (!bypass_keystate) 1731 if (!bypass_keystate)
1397 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1732 reportmode = !! (priv_modes & PrivMode_mouse_report);
1733
1398 /* 1734 /*
1399 * VT window processing of button press 1735 * VT window processing of button press
1400 */ 1736 */
1401 if (ev.window == TermWin.vt) 1737 if (ev.window == TermWin.vt)
1402 { 1738 {
1739#if ISO_14755
1740 // 5.4
1741 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1742 {
1743 iso14755_54 (ev.x, ev.y);
1744 return;
1745 }
1746#endif
1747
1403 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1748 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1749
1404 if (reportmode) 1750 if (reportmode)
1405 { 1751 {
1406 /* mouse report from vt window */ 1752 /* mouse report from vt window */
1407 /* save the xbutton state (for ButtonRelease) */ 1753 /* save the xbutton state (for ButtonRelease) */
1408 MEvent.state = ev.state; 1754 MEvent.state = ev.state;
… …
1437 } 1783 }
1438 else 1784 else
1439 { 1785 {
1440 if (ev.button != MEvent.button) 1786 if (ev.button != MEvent.button)
1441 MEvent.clicks = 0; 1787 MEvent.clicks = 0;
1788
1442 switch (ev.button) 1789 switch (ev.button)
1443 { 1790 {
1444 case Button1: 1791 case Button1:
1792 /* allow meta + click to select rectangular areas */
1793 /* should be done in screen.C */
1794#if ENABLE_FRILLS
1795 selection.rect = !!(ev.state & ModMetaMask);
1796#else
1797 selection.rect = false;
1798#endif
1799
1445 /* allow shift+left click to extend selection */ 1800 /* allow shift+left click to extend selection */
1446 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1801 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1447 { 1802 {
1448 if (MEvent.button == Button1 && clickintime) 1803 if (MEvent.button == Button1 && clickintime)
1449 selection_rotate (ev.x, ev.y); 1804 selection_rotate (ev.x, ev.y);
1450 else 1805 else
1451 selection_extend (ev.x, ev.y, 1); 1806 selection_extend (ev.x, ev.y, 1);
… …
1466 case Button3: 1821 case Button3:
1467 if (MEvent.button == Button3 && clickintime) 1822 if (MEvent.button == Button3 && clickintime)
1468 selection_rotate (ev.x, ev.y); 1823 selection_rotate (ev.x, ev.y);
1469 else 1824 else
1470 selection_extend (ev.x, ev.y, 1); 1825 selection_extend (ev.x, ev.y, 1);
1826
1471 MEvent.button = Button3; 1827 MEvent.button = Button3;
1472 break; 1828 break;
1473 } 1829 }
1474 } 1830 }
1831
1475 MEvent.time = ev.time; 1832 MEvent.time = ev.time;
1476 return; 1833 return;
1477 } 1834 }
1478 1835
1479 /* 1836 /*
… …
1571 break; 1928 break;
1572 case R_SB_ALIGN_BOTTOM: 1929 case R_SB_ALIGN_BOTTOM:
1573 csrO = scrollBar.bot - scrollBar.top; 1930 csrO = scrollBar.bot - scrollBar.top;
1574 break; 1931 break;
1575 } 1932 }
1933
1576 if (scrollBar.style == R_SB_XTERM 1934 if (scrollBar.style == R_SB_XTERM
1577 || scrollbar_above_slider (ev.y) 1935 || scrollbar_above_slider (ev.y)
1578 || scrollbar_below_slider (ev.y)) 1936 || scrollbar_below_slider (ev.y))
1579 scr_move_to ( scrollbar_position (ev.y) - csrO, 1937 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1580 scrollbar_size ()); 1938
1581 scrollBar.setMotion (); 1939 scrollBar.setMotion ();
1582 break; 1940 break;
1583 1941
1584 case Button1: 1942 case Button1:
1585 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1943 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1609 scr_page ((ev.button == Button1 ? DN : UP), 1967 scr_page ((ev.button == Button1 ? DN : UP),
1610 (TermWin.nrow 1968 (TermWin.nrow
1611 * scrollbar_position (ev.y) 1969 * scrollbar_position (ev.y)
1612 / scrollbar_size ())); 1970 / scrollbar_size ()));
1613 } 1971 }
1972
1614 break; 1973 break;
1615 } 1974 }
1616 } 1975 }
1617 return; 1976 return;
1618 } 1977 }
… …
1630{ 1989{
1631 int reportmode = 0; 1990 int reportmode = 0;
1632 1991
1633 csrO = 0; /* reset csr Offset */ 1992 csrO = 0; /* reset csr Offset */
1634 if (!bypass_keystate) 1993 if (!bypass_keystate)
1635 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1994 reportmode = !! (priv_modes & PrivMode_mouse_report);
1636 1995
1637 if (scrollbar_isUpDn ()) 1996 if (scrollbar_isUpDn ())
1638 { 1997 {
1639 scrollBar.setIdle (); 1998 scrollBar.setIdle ();
1640 scrollbar_show (0); 1999 scrollbar_show (0);
1641#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1642 refresh_type &= ~SMOOTH_REFRESH; 2001 refresh_type &= ~SMOOTH_REFRESH;
1643#endif 2002#endif
1644
1645 } 2003 }
2004
1646#ifdef SELECTION_SCROLLING 2005#ifdef SELECTION_SCROLLING
1647 if (sel_scroll_ev.active) 2006 if (sel_scroll_ev.active)
1648 sel_scroll_ev.stop(); 2007 sel_scroll_ev.stop();
1649#endif 2008#endif
2009
1650 if (ev.window == TermWin.vt) 2010 if (ev.window == TermWin.vt)
1651 { 2011 {
2012#if ISO_14755
2013 // 5.4
2014 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2015 return;
2016#endif
1652 if (reportmode) 2017 if (reportmode)
1653 { 2018 {
1654 /* mouse report from vt window */ 2019 /* mouse report from vt window */
1655 /* don't report release of wheel "buttons" */ 2020 /* don't report release of wheel "buttons" */
1656 if (ev.button >= 4) 2021 if (ev.button >= 4)
… …
1670 MEvent.button = AnyButton; 2035 MEvent.button = AnyButton;
1671 mouse_report (ev); 2036 mouse_report (ev);
1672#endif /* MOUSE_REPORT_DOUBLECLICK */ 2037#endif /* MOUSE_REPORT_DOUBLECLICK */
1673 return; 2038 return;
1674 } 2039 }
2040
1675 /* 2041 /*
1676 * dumb hack to compensate for the failure of click-and-drag 2042 * dumb hack to compensate for the failure of click-and-drag
1677 * when overriding mouse reporting 2043 * when overriding mouse reporting
1678 */ 2044 */
1679 if (PrivateModes & PrivMode_mouse_report 2045 if (priv_modes & PrivMode_mouse_report
1680 && bypass_keystate 2046 && bypass_keystate
1681 && ev.button == Button1 && MEvent.clicks <= 1) 2047 && ev.button == Button1 && MEvent.clicks <= 1)
1682 selection_extend (ev.x, ev.y, 0); 2048 selection_extend (ev.x, ev.y, 0);
1683 2049
1684 switch (ev.button) 2050 switch (ev.button)
… …
1699 2065
1700 v = ev.button == Button4 ? UP : DN; 2066 v = ev.button == Button4 ? UP : DN;
1701 2067
1702 if (ev.state & ShiftMask) 2068 if (ev.state & ShiftMask)
1703 i = 1; 2069 i = 1;
1704 else if (Options & Opt_mouseWheelScrollPage) 2070 else if (options & Opt_mouseWheelScrollPage)
1705 i = TermWin.nrow - 1; 2071 i = TermWin.nrow - 1;
1706 else 2072 else
1707 i = 5; 2073 i = 5;
1708 2074
1709# ifdef MOUSE_SLIP_WHEELING 2075# ifdef MOUSE_SLIP_WHEELING
1710 if (ev.state & ControlMask) 2076 if (ev.state & ControlMask)
1711 { 2077 {
1712 mouse_slip_wheel_speed += v ? -1 : 1; 2078 mouse_slip_wheel_speed += v ? -1 : 1;
2079 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2080 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2081
2082 if (slip_wheel_ev.at < NOW)
1713 slip_wheel_ev.start (NOW + SCROLLBAR_CONTINUOUS_DELAY); 2083 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2084
2085 slip_wheel_ev.start ();
1714 } 2086 }
2087 else
2088 {
1715# endif 2089# endif
1716# ifdef JUMP_MOUSE_WHEEL 2090# ifdef JUMP_MOUSE_WHEEL
1717 scr_page (v, i);
1718 scr_refresh (SMOOTH_REFRESH);
1719 scrollbar_show (1);
1720# else
1721 while (i--)
1722 {
1723 scr_page (v, 1); 2091 scr_page (v, i);
1724 scr_refresh (SMOOTH_REFRESH); 2092 scr_refresh (SMOOTH_REFRESH);
1725 scrollbar_show (1); 2093 scrollbar_show (1);
2094# else
2095 while (i--)
2096 {
2097 scr_page (v, 1);
2098 scr_refresh (SMOOTH_REFRESH);
2099 scrollbar_show (1);
2100 }
2101# endif
2102# ifdef MOUSE_SLIP_WHEELING
1726 } 2103 }
1727# endif 2104#endif
1728
1729 } 2105 }
1730 break; 2106 break;
1731#endif 2107#endif
1732
1733 } 2108 }
1734 } 2109 }
1735#ifdef MENUBAR 2110#ifdef MENUBAR
1736 else if (isMenuBarWindow (ev.window)) 2111 else if (isMenuBarWindow (ev.window))
1737 menubar_control (ev); 2112 menubar_control (ev);
1738#endif 2113#endif
1739} 2114}
1740 2115
1741#ifdef TRANSPARENT 2116#ifdef TRANSPARENT
1742#if TINTING 2117#if TINTING
1743/* shading taken from eterm-0.9.2 */ 2118/* taken from aterm-0.4.2 */
1744/* RGB 15 */
1745 2119
1746static void 2120typedef uint32_t RUINT32T;
1747shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1748{
1749 unsigned char *ptr;
1750 int x, y;
1751 2121
1752 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2122void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1753 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2123{
1754 /* No saturation */ 2124 int sh_r, sh_g, sh_b;
1755 for (y = h; --y >= 0;) { 2125 RUINT32T mask_r, mask_g, mask_b;
1756 for (x = -w; x < 0; x++) { 2126 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1757 int r, g, b; 2127 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2128 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2129 int i;
1758 2130
1759 b = ((uint16_t *) ptr)[x]; 2131 Visual *visual = display->visual;
1760 r = (b & 0x7c00) * rm; 2132
1761 g = (b & 0x3e0) * gm; 2133 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1762 b = (b & 0x1f) * bm; 2134
1763 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2135 /* for convenience */
1764 | ((g >> 8) & 0x3e0) 2136 mask_r = visual->red_mask;
1765 | ((b >> 8) & 0x1f); 2137 mask_g = visual->green_mask;
1766 } 2138 mask_b = visual->blue_mask;
1767 ptr += bpl; 2139
1768 } 2140 /* boring lookup table pre-initialization */
2141 switch (srcImage->bits_per_pixel) {
2142 case 15:
2143 if ((mask_r != 0x7c00) ||
2144 (mask_g != 0x03e0) ||
2145 (mask_b != 0x001f))
2146 return;
2147 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2148 lookup_r = lookup;
2149 lookup_g = lookup+32;
2150 lookup_b = lookup+32+32;
2151 sh_r = 10;
2152 sh_g = 5;
2153 sh_b = 0;
2154 break;
2155 case 16:
2156 if ((mask_r != 0xf800) ||
2157 (mask_g != 0x07e0) ||
2158 (mask_b != 0x001f))
2159 return;
2160 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2161 lookup_r = lookup;
2162 lookup_g = lookup+32;
2163 lookup_b = lookup+32+64;
2164 sh_r = 11;
2165 sh_g = 5;
2166 sh_b = 0;
2167 break;
2168 case 24:
2169 if ((mask_r != 0xff0000) ||
2170 (mask_g != 0x00ff00) ||
2171 (mask_b != 0x0000ff))
2172 return;
2173 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2174 lookup_r = lookup;
2175 lookup_g = lookup+256;
2176 lookup_b = lookup+256+256;
2177 sh_r = 16;
2178 sh_g = 8;
2179 sh_b = 0;
2180 break;
2181 case 32:
2182 if ((mask_r != 0xff0000) ||
2183 (mask_g != 0x00ff00) ||
2184 (mask_b != 0x0000ff))
2185 return;
2186 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2187 lookup_r = lookup;
2188 lookup_g = lookup+256;
2189 lookup_b = lookup+256+256;
2190 sh_r = 16;
2191 sh_g = 8;
2192 sh_b = 0;
2193 break;
2194 default:
2195 return; /* we do not support this color depth */
2196 }
2197
2198 /* prepare limits for color transformation (each channel is handled separately) */
2199 if (shade < 0) {
2200 shade = -shade;
2201 if (shade < 0) shade = 0;
2202 if (shade > 100) shade = 100;
2203
2204 lower_lim_r = 65535-rm;
2205 lower_lim_g = 65535-gm;
2206 lower_lim_b = 65535-bm;
2207
2208 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2209 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2210 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2211
2212 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1769 } else { 2213 } else {
1770 for (y = h; --y >= 0;) { 2214 if (shade < 0) shade = 0;
1771 for (x = -w; x < 0; x++) { 2215 if (shade > 100) shade = 100;
1772 int r, g, b;
1773 2216
1774 b = ((uint16_t *) ptr)[x]; 2217 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1775 r = (b & 0x7c00) * rm; 2218
1776 g = (b & 0x3e0) * gm; 2219 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1777 b = (b & 0x1f) * bm; 2220 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1778 r |= (!(r >> 15) - 1); 2221 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1779 g |= (!(g >> 10) - 1); 2222 }
1780 b |= (!(b >> 5) - 1); 2223
1781 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2224 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1782 | ((g >> 8) & 0x3e0) 2225 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1783 | ((b >> 8) & 0x1f); 2226 {
1784 } 2227 unsigned int tmp;
1785 ptr += bpl; 2228
2229 tmp = lower_lim_r;
2230 lower_lim_r = lower_lim_b;
2231 lower_lim_b = tmp;
2232
2233 tmp = upper_lim_r;
2234 upper_lim_r = upper_lim_b;
2235 upper_lim_b = tmp;
2236 }
2237
2238 /* fill our lookup tables */
2239 for (i = 0; i <= mask_r>>sh_r; i++)
2240 {
2241 RUINT32T tmp;
2242 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2243 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2244 lookup_r[i] = (tmp/65535)<<sh_r;
2245 }
2246 for (i = 0; i <= mask_g>>sh_g; i++)
2247 {
2248 RUINT32T tmp;
2249 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2250 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2251 lookup_g[i] = (tmp/65535)<<sh_g;
2252 }
2253 for (i = 0; i <= mask_b>>sh_b; i++)
2254 {
2255 RUINT32T tmp;
2256 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2257 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2258 lookup_b[i] = (tmp/65535)<<sh_b;
2259 }
2260
2261 /* apply table to input image (replacing colors by newly calculated ones) */
2262 switch (srcImage->bits_per_pixel)
2263 {
2264 case 15:
2265 {
2266 unsigned short *p1, *pf, *p, *pl;
2267 p1 = (unsigned short *) srcImage->data;
2268 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2269 while (p1 < pf)
2270 {
2271 p = p1;
2272 pl = p1 + srcImage->width;
2273 for (; p < pl; p++)
1786 } 2274 {
2275 *p = lookup_r[(*p & 0x7c00)>>10] |
2276 lookup_g[(*p & 0x03e0)>> 5] |
2277 lookup_b[(*p & 0x001f)];
2278 }
2279 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1787 } 2280 }
1788} 2281 break;
1789 2282 }
1790/* RGB 16 */ 2283 case 16:
1791static void 2284 {
1792shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2285 unsigned short *p1, *pf, *p, *pl;
1793{ 2286 p1 = (unsigned short *) srcImage->data;
1794 unsigned char *ptr; 2287 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1795 int x, y; 2288 while (p1 < pf)
1796 2289 {
1797 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2290 p = p1;
1798 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2291 pl = p1 + srcImage->width;
1799 /* No saturation */ 2292 for (; p < pl; p++)
1800 for (y = h; --y >= 0;) {
1801 for (x = -w; x < 0; x++) {
1802 int r, g, b;
1803
1804 b = ((uint16_t *) ptr)[x];
1805 r = (b & 0xf800) * rm;
1806 g = (b & 0x7e0) * gm;
1807 b = (b & 0x1f) * bm;
1808 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1809 | ((g >> 8) & 0x7e0)
1810 | ((b >> 8) & 0x1f);
1811 }
1812 ptr += bpl;
1813 } 2293 {
1814 } else { 2294 *p = lookup_r[(*p & 0xf800)>>11] |
1815 for (y = h; --y >= 0;) { 2295 lookup_g[(*p & 0x07e0)>> 5] |
1816 for (x = -w; x < 0; x++) { 2296 lookup_b[(*p & 0x001f)];
1817 int r, g, b;
1818
1819 b = ((uint16_t *) ptr)[x];
1820 r = (b & 0xf800) * rm;
1821 g = (b & 0x7e0) * gm;
1822 b = (b & 0x1f) * bm;
1823 r |= (!(r >> 16) - 1);
1824 g |= (!(g >> 11) - 1);
1825 b |= (!(b >> 5) - 1);
1826 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1827 | ((g >> 8) & 0x7e0)
1828 | ((b >> 8) & 0x1f);
1829 } 2297 }
1830 ptr += bpl; 2298 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2299 }
2300 break;
2301 }
2302 case 24:
2303 {
2304 unsigned char *p1, *pf, *p, *pl;
2305 p1 = (unsigned char *) srcImage->data;
2306 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2307 while (p1 < pf)
2308 {
2309 p = p1;
2310 pl = p1 + srcImage->width * 3;
2311 for (; p < pl; p += 3)
1831 } 2312 {
2313 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2314 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2315 p[2] = lookup_r[(p[2] & 0x0000ff)];
2316 }
2317 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1832 } 2318 }
1833} 2319 break;
2320 }
2321 case 32:
2322 {
2323 RUINT32T *p1, *pf, *p, *pl;
2324 p1 = (RUINT32T *) srcImage->data;
2325 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1834 2326
1835/* RGB 24 */ 2327 while (p1 < pf)
1836static void 2328 {
1837shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2329 p = p1;
1838{ 2330 pl = p1 + srcImage->width;
1839 unsigned char *ptr; 2331 for (; p < pl; p++)
1840 int x, y;
1841
1842 ptr = (unsigned char *)data + (w * 3);
1843 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1844 /* No saturation */
1845 for (y = h; --y >= 0;) {
1846 for (x = -(w * 3); x < 0; x += 3) {
1847 int r, g, b;
1848
1849 if (byteorder.big_endian()) {
1850 r = (ptr[x + 0] * rm) >> 8;
1851 g = (ptr[x + 1] * gm) >> 8;
1852 b = (ptr[x + 2] * bm) >> 8;
1853 ptr[x + 0] = r;
1854 ptr[x + 1] = g;
1855 ptr[x + 2] = b;
1856 } else {
1857 r = (ptr[x + 2] * rm) >> 8;
1858 g = (ptr[x + 1] * gm) >> 8;
1859 b = (ptr[x + 0] * bm) >> 8;
1860 ptr[x + 2] = r;
1861 ptr[x + 1] = g;
1862 ptr[x + 0] = b;
1863 }
1864 }
1865 ptr += bpl;
1866 } 2332 {
1867 } else { 2333 *p = lookup_r[(*p & 0xff0000)>>16] |
1868 for (y = h; --y >= 0;) { 2334 lookup_g[(*p & 0x00ff00)>> 8] |
1869 for (x = -(w * 3); x < 0; x += 3) { 2335 lookup_b[(*p & 0x0000ff)] |
1870 int r, g, b; 2336 (*p & ~0xffffff);
1871
1872 if (byteorder.big_endian()) {
1873 r = (ptr[x + 0] * rm) >> 8;
1874 g = (ptr[x + 1] * gm) >> 8;
1875 b = (ptr[x + 2] * bm) >> 8;
1876
1877 r |= (!(r >> 8) - 1);
1878 g |= (!(g >> 8) - 1);
1879 b |= (!(b >> 8) - 1);
1880
1881 ptr[x + 0] = r;
1882 ptr[x + 1] = g;
1883 ptr[x + 2] = b;
1884 } else {
1885 r = (ptr[x + 2] * rm) >> 8;
1886 g = (ptr[x + 1] * gm) >> 8;
1887 b = (ptr[x + 0] * bm) >> 8;
1888
1889 r |= (!(r >> 8) - 1);
1890 g |= (!(g >> 8) - 1);
1891 b |= (!(b >> 8) - 1);
1892
1893 ptr[x + 2] = r;
1894 ptr[x + 1] = g;
1895 ptr[x + 0] = b;
1896 }
1897 } 2337 }
1898 ptr += bpl; 2338 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1899 } 2339 }
2340 break;
2341 }
1900 } 2342 }
1901}
1902 2343
1903/* RGB 32 */ 2344 free (lookup);
1904static void
1905shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1906{
1907 unsigned char *ptr;
1908 int x, y;
1909
1910 ptr = (unsigned char *)data + (w * 4);
1911 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1912 /* No saturation */
1913 for (y = h; --y >= 0;) {
1914 if (byteorder.big_endian()) {
1915 for (x = -(w * 4); x < 0; x += 4) {
1916 int r, g, b;
1917
1918 r = (ptr[x + 1] * rm) >> 8;
1919 g = (ptr[x + 2] * gm) >> 8;
1920 b = (ptr[x + 3] * bm) >> 8;
1921 ptr[x + 1] = r;
1922 ptr[x + 2] = g;
1923 ptr[x + 3] = b;
1924 }
1925 } else {
1926 for (x = -(w * 4); x < 0; x += 4) {
1927 int r, g, b;
1928
1929 r = (ptr[x + 2] * rm) >> 8;
1930 g = (ptr[x + 1] * gm) >> 8;
1931 b = (ptr[x + 0] * bm) >> 8;
1932 ptr[x + 2] = r;
1933 ptr[x + 1] = g;
1934 ptr[x + 0] = b;
1935 }
1936 }
1937 ptr += bpl;
1938 }
1939 } else {
1940 for (y = h; --y >= 0;) {
1941 for (x = -(w * 4); x < 0; x += 4) {
1942 int r, g, b;
1943
1944 if (byteorder.big_endian()) {
1945 r = (ptr[x + 1] * rm) >> 8;
1946 g = (ptr[x + 2] * gm) >> 8;
1947 b = (ptr[x + 3] * bm) >> 8;
1948
1949 r |= (!(r >> 8) - 1);
1950 g |= (!(g >> 8) - 1);
1951 b |= (!(b >> 8) - 1);
1952
1953 ptr[x + 1] = r;
1954 ptr[x + 2] = g;
1955 ptr[x + 3] = b;
1956 } else {
1957 r = (ptr[x + 2] * rm) >> 8;
1958 g = (ptr[x + 1] * gm) >> 8;
1959 b = (ptr[x + 0] * bm) >> 8;
1960
1961 r |= (!(r >> 8) - 1);
1962 g |= (!(g >> 8) - 1);
1963 b |= (!(b >> 8) - 1);
1964
1965 ptr[x + 2] = r;
1966 ptr[x + 1] = g;
1967 ptr[x + 0] = b;
1968 }
1969 }
1970 ptr += bpl;
1971 }
1972 }
1973} 2345}
1974
1975#endif 2346#endif
1976 2347
1977/* 2348/*
1978 * Check our parents are still who we think they are. 2349 * Check our parents are still who we think they are.
1979 * Do transparency updates if required 2350 * Do transparency updates if required
… …
1986 Atom atype; 2357 Atom atype;
1987 unsigned char *prop = NULL; 2358 unsigned char *prop = NULL;
1988 Window root, oldp, *list; 2359 Window root, oldp, *list;
1989 Pixmap rootpixmap = None; 2360 Pixmap rootpixmap = None;
1990 XWindowAttributes wattr, wrootattr; 2361 XWindowAttributes wattr, wrootattr;
2362 dDisp;
1991 2363
1992 pchanged = 0; 2364 pchanged = 0;
1993 2365
1994 if (!(Options & Opt_transparent)) 2366 if (!(options & Opt_transparent))
1995 return pchanged; /* Don't try any more */ 2367 return pchanged; /* Don't try any more */
1996 2368
1997 XGetWindowAttributes (display->display, display->root, &wrootattr); 2369 XGetWindowAttributes (disp, display->root, &wrootattr);
1998 rootdepth = wrootattr.depth; 2370 rootdepth = wrootattr.depth;
1999 2371
2000 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2372 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2001 2373
2002 if (rootdepth != wattr.depth) 2374 if (rootdepth != wattr.depth)
2003 { 2375 {
2004 if (am_transparent) 2376 if (am_transparent)
2005 { 2377 {
2006 pchanged = 1; 2378 pchanged = 1;
2007 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2379 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2008 am_transparent = am_pixmap_trans = 0; 2380 am_transparent = am_pixmap_trans = 0;
2009 } 2381 }
2010 2382
2011 return pchanged; /* Don't try any more */ 2383 return pchanged; /* Don't try any more */
2012 } 2384 }
2013 2385
2014 /* Get all X ops out of the queue so that our information is up-to-date. */ 2386 /* Get all X ops out of the queue so that our information is up-to-date. */
2015 XSync (display->display, False); 2387 XSync (disp, False);
2016 2388
2017 /* 2389 /*
2018 * Make the frame window set by the window manager have 2390 * Make the frame window set by the window manager have
2019 * the root background. Some window managers put multiple nested frame 2391 * the root background. Some window managers put multiple nested frame
2020 * windows for each client, so we have to take care about that. 2392 * windows for each client, so we have to take care about that.
2021 */ 2393 */
2022 i = (xa[XA_XROOTPMAPID] 2394 i = (xa[XA_XROOTPMAP_ID]
2023 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2395 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2024 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2396 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2025 &nitems, &bytes_after, &prop) == Success); 2397 &nitems, &bytes_after, &prop) == Success);
2026 2398
2027 if (!i || prop == NULL) 2399 if (!i || prop == NULL)
2028 i = (xa[XA_XSETROOTID] 2400 i = (xa[XA_ESETROOT_PMAP_ID]
2029 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2401 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2030 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2402 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2031 &nitems, &bytes_after, &prop) == Success); 2403 &nitems, &bytes_after, &prop) == Success);
2032 2404
2033 if (!i || prop == NULL) 2405 if (!i || prop == NULL
2406#if TINTING
2407 || !rs[Rs_color + Color_tint]
2408#endif
2409 )
2034 have_pixmap = 0; 2410 have_pixmap = 0;
2035 else 2411 else
2036 { 2412 {
2037 have_pixmap = 1; 2413 have_pixmap = 1;
2038 rootpixmap = *(Pixmap *)prop; 2414 rootpixmap = *(Pixmap *)prop;
… …
2049 Window cr; 2425 Window cr;
2050 XImage *image; 2426 XImage *image;
2051 GC gc; 2427 GC gc;
2052 XGCValues gcvalue; 2428 XGCValues gcvalue;
2053 2429
2054 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2430 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2055 0, 0, &sx, &sy, &cr); 2431 0, 0, &sx, &sy, &cr);
2056 nw = (unsigned int)szHint.width; 2432 nw = (unsigned int)szHint.width;
2057 nh = (unsigned int)szHint.height; 2433 nh = (unsigned int)szHint.height;
2058 nx = ny = 0; 2434 nx = ny = 0;
2059 2435
… …
2071 sy = 0; 2447 sy = 0;
2072 } 2448 }
2073 2449
2074 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2450 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2075 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2451 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2452
2453 XSync (disp, False);
2076 allowedxerror = -1; 2454 allowedxerror = -1;
2077 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2455 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2078 2456
2079 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2457 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2080 /* XXX: may need a delay here? */ 2458 /* XXX: may need a delay here? */
2081 allowedxerror = 0; 2459 allowedxerror = 0;
2082 2460
… …
2085 if (am_transparent && am_pixmap_trans) 2463 if (am_transparent && am_pixmap_trans)
2086 { 2464 {
2087 pchanged = 1; 2465 pchanged = 1;
2088 if (TermWin.pixmap != None) 2466 if (TermWin.pixmap != None)
2089 { 2467 {
2090 XFreePixmap (display->display, TermWin.pixmap); 2468 XFreePixmap (disp, TermWin.pixmap);
2091 TermWin.pixmap = None; 2469 TermWin.pixmap = None;
2092 } 2470 }
2093 } 2471 }
2094 2472
2095 am_pixmap_trans = 0; 2473 am_pixmap_trans = 0;
2096 } 2474 }
2097 else 2475 else
2098 { 2476 {
2099 if (TermWin.pixmap != None) 2477 if (TermWin.pixmap != None)
2100 XFreePixmap (display->display, TermWin.pixmap); 2478 XFreePixmap (disp, TermWin.pixmap);
2101 2479
2102#if TINTING 2480#if TINTING
2103 if (ISSET_PIXCOLOR (Color_tint)) 2481 if (ISSET_PIXCOLOR (Color_tint))
2104 { 2482 {
2105 unsigned short shade, rm, gm, bm; 2483 unsigned short rm, gm, bm;
2484 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2106 2485
2107 PixColors[Color_tint].get (display, rm, gm, bm); 2486 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2108 2487
2109 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2488 ShadeXImage (display, image, shade, rm, gm, bm);
2110
2111 /* Determine bitshift and bitmask values */
2112 switch (image->bits_per_pixel)
2113 {
2114 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2115 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2116 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2117 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2118 }
2119 } 2489 }
2120#endif 2490#endif
2121 2491
2122 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2492 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2123 szHint.width, szHint.height, image->depth); 2493 szHint.width, szHint.height, image->depth);
2124 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2494 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2125 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2495 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2126 nx, ny, image->width, image->height); 2496 nx, ny, image->width, image->height);
2127 XFreeGC (display->display, gc); 2497 XFreeGC (disp, gc);
2128 XDestroyImage (image); 2498 XDestroyImage (image);
2129 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2499 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2130 TermWin.pixmap); 2500 XClearWindow (disp, TermWin.parent[0]);
2131 2501
2132 if (!am_transparent || !am_pixmap_trans) 2502 if (!am_transparent || !am_pixmap_trans)
2133 pchanged = 1; 2503 pchanged = 1;
2134 2504
2135 am_transparent = am_pixmap_trans = 1; 2505 am_transparent = am_pixmap_trans = 1;
2136 } 2506 }
2137 } 2507 }
2138 2508
2139 if (!am_pixmap_trans) 2509 if (am_pixmap_trans)
2510 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2511 else
2140 { 2512 {
2141 unsigned int n; 2513 unsigned int n;
2142 /* 2514 /*
2143 * InheritPixmap transparency 2515 * InheritPixmap transparency
2144 */ 2516 */
2145 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2146 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2517 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2147 { 2518 {
2148 oldp = TermWin.parent[i]; 2519 oldp = TermWin.parent[i];
2149 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2520 XQueryTree (disp, TermWin.parent[i - 1], &root,
2150 &TermWin.parent[i], &list, &n); 2521 &TermWin.parent[i], &list, &n);
2151 XFree (list); 2522 XFree (list);
2152 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2153 2523
2154 if (TermWin.parent[i] == display->root) 2524 if (TermWin.parent[i] == display->root)
2155 { 2525 {
2156 if (oldp != None) 2526 if (oldp != None)
2157 pchanged = 1; 2527 pchanged = 1;
… …
2167 2537
2168 if (pchanged) 2538 if (pchanged)
2169 { 2539 {
2170 for (; n < (unsigned int)i; n++) 2540 for (; n < (unsigned int)i; n++)
2171 { 2541 {
2172 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2542 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2173 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2174 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2543 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2175 { 2544 {
2176 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2545 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2177 break; 2546 break;
2178 } 2547 }
2179 } 2548 }
2180 } 2549 }
2181 2550
2182 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2551 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2183 { 2552 {
2184 D_X ((stderr, "InheritPixmap Turning off"));
2185 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2553 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2186 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2554 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2187 am_transparent = 0; 2555 am_transparent = 0;
2188 /* XXX: also turn off Opt_transparent? */ 2556 /* XXX: also turn off Opt_transparent? */
2189 } 2557 }
2190 else 2558 else
2191 { 2559 {
2192#if WAIT_FOR_WM 2560#if WAIT_FOR_WM
2193 /* wait (an arbitrary period) for the WM to do its thing 2561 /* wait (an arbitrary period) for the WM to do its thing
2194 * needed for fvwm2.2.2 (and before?) */ 2562 * needed for fvwm2.2.2 (and before?) */
2195 sleep (1); 2563 sleep (1);
2196#endif 2564#endif
2197 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2198 for (n = 0; n < (unsigned int)i; n++) 2565 for (n = 0; n < (unsigned int)i; n++)
2566 {
2199 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2567 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2568 XClearWindow (disp, TermWin.parent[n]);
2569 }
2200 2570
2201 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2571 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2202 am_transparent = 1; 2572 am_transparent = 1;
2203 } 2573 }
2204 2574
2205 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2575 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2206 TermWin.parent[i] = None; 2576 TermWin.parent[i] = None;
2577 }
2578
2579 if (scrollBar.win)
2580 {
2581 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2582 scrollBar.setIdle ();
2583 scrollbar_show (0);
2584 }
2585
2586 if (am_transparent)
2587 {
2588 want_refresh = want_full_refresh = 1;
2589 if (am_pixmap_trans)
2590 flush ();
2207 } 2591 }
2208 2592
2209 return pchanged; 2593 return pchanged;
2210} 2594}
2211#endif 2595#endif
… …
2230 if (ch == NOCHAR) // TODO: improve 2614 if (ch == NOCHAR) // TODO: improve
2231 break; 2615 break;
2232 2616
2233 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2617 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2234 { 2618 {
2619 if (!seen_input)
2620 {
2621 seen_input = 1;
2622 // many badly-written programs (e.g. jed) contain a race condition:
2623 // they first read the screensize and then install a SIGWINCH handler.
2624 // some window managers resize the window early, and these programs
2625 // then sometimes get the size wrong.
2626 // unfortunately other programs are even more buggy and dislike
2627 // being sent SIGWINCH, so only do it when we were in fact being
2628 // resized.
2629 if (seen_resize && cmd_pid)
2630 kill (-cmd_pid, SIGWINCH);
2631 }
2632
2235 /* Read a text string from the input buffer */ 2633 /* Read a text string from the input buffer */
2236 unicode_t buf[UBUFSIZ]; 2634 unicode_t buf[UBUFSIZ];
2237 bool refreshnow = false; 2635 bool refreshnow = false;
2238 int nlines = 0; 2636 int nlines = 0;
2239 unicode_t *str = buf; 2637 unicode_t *str = buf;
2240 2638
2241 *str++ = ch;
2242
2243 for (;;) 2639 for (;;)
2244 { 2640 {
2245 seq_begin = cmdbuf_ptr;
2246 ch = next_char ();
2247
2248 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2641 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2249 break; 2642 break;
2250 2643
2251 *str++ = ch; 2644 *str++ = ch;
2252 2645
2253 if (ch == C0_LF) 2646 if (ch == C0_LF)
2254 { 2647 {
2255 nlines++; 2648 nlines++;
2256 refresh_count++; 2649 refresh_count++;
2257 2650
2258 if (! (Options & Opt_jumpScroll) 2651 if (!(options & Opt_jumpScroll)
2259 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2652 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2260 { 2653 {
2261 refreshnow = true; 2654 refreshnow = true;
2262 flag = true;
2263 ch = NOCHAR; 2655 ch = NOCHAR;
2264 break; 2656 break;
2265 } 2657 }
2266 2658
2267 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2659 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2268 if (nlines >= TermWin.nrow - 1) 2660 if (nlines >= TermWin.nrow - 1)
2269 { 2661 {
2270 scr_add_lines (buf, nlines, str - buf); 2662 scr_add_lines (buf, nlines, str - buf);
2271 nlines = 0; 2663 nlines = 0;
2272 str = buf; 2664 str = buf;
… …
2276 if (str >= buf + UBUFSIZ) 2668 if (str >= buf + UBUFSIZ)
2277 { 2669 {
2278 ch = NOCHAR; 2670 ch = NOCHAR;
2279 break; 2671 break;
2280 } 2672 }
2673
2674 seq_begin = cmdbuf_ptr;
2675 ch = next_char ();
2281 } 2676 }
2282 2677
2283 scr_add_lines (buf, nlines, str - buf); 2678 scr_add_lines (buf, nlines, str - buf);
2284 2679
2285 /* 2680 /*
2286 * If there have been a lot of new lines, then update the screen 2681 * If there have been a lot of new lines, then update the screen
2287 * What the heck I'll cheat and only refresh less than every page-full. 2682 * What the heck I'll cheat and only refresh less than every page-full.
2288 * the number of pages between refreshes is refresh_limit, which 2683 * the number of pages between refreshes is refresh_limit, which
2289 * is incremented here because we must be doing flat-out scrolling. 2684 * is incremented here because we must be doing flat-out scrolling.
2290 *
2291 * refreshing should be correct for small scrolls, because of the
2292 * time-out
2293 */ 2685 */
2294 if (refreshnow) 2686 if (refreshnow)
2295 { 2687 {
2296 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2688 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2297 refresh_limit++; 2689 refresh_limit++;
2298 else 2690 else
2691 {
2692 flag = true;
2299 scr_refresh (refresh_type); 2693 scr_refresh (refresh_type);
2694 }
2300 } 2695 }
2301 2696
2302 } 2697 }
2303 else 2698 else
2304 { 2699 {
… …
2352 if (len == (size_t)-1) 2747 if (len == (size_t)-1)
2353 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2748 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2354 2749
2355 // assume wchar == unicode 2750 // assume wchar == unicode
2356 cmdbuf_ptr += len; 2751 cmdbuf_ptr += len;
2357 return wc; 2752 return wc & UNICODE_MASK;
2358 } 2753 }
2359 2754
2360 return NOCHAR; 2755 return NOCHAR;
2361} 2756}
2362 2757
… …
2488 process_escape_seq (); 2883 process_escape_seq ();
2489 break; 2884 break;
2490 case C0_ENQ: /* terminal Status */ 2885 case C0_ENQ: /* terminal Status */
2491 if (rs[Rs_answerbackstring]) 2886 if (rs[Rs_answerbackstring])
2492 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2887 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2493 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2888 (unsigned int)strlen (rs[Rs_answerbackstring]));
2494 else 2889 else
2495 tt_write ((unsigned char *)VT100_ANS, 2890 tt_write ((unsigned char *)VT100_ANS,
2496 (unsigned int)STRLEN (VT100_ANS)); 2891 (unsigned int)strlen (VT100_ANS));
2497 break; 2892 break;
2498 case C0_BEL: /* bell */ 2893 case C0_BEL: /* bell */
2499 scr_bell (); 2894 scr_bell ();
2500 break; 2895 break;
2501 case C0_BS: /* backspace */ 2896 case C0_BS: /* backspace */
… …
2600void 2995void
2601rxvt_term::process_escape_seq () 2996rxvt_term::process_escape_seq ()
2602{ 2997{
2603 unicode_t ch = cmd_getc (); 2998 unicode_t ch = cmd_getc ();
2604 2999
2605 if (PrivateModes & PrivMode_vt52) 3000 if (priv_modes & PrivMode_vt52)
2606 { 3001 {
2607 process_escape_vt52 (ch); 3002 process_escape_vt52 (ch);
2608 return; 3003 return;
2609 } 3004 }
2610 3005
… …
2625 scr_charset_set (2, (unsigned int)cmd_getc ()); 3020 scr_charset_set (2, (unsigned int)cmd_getc ());
2626 break; 3021 break;
2627 case '+': 3022 case '+':
2628 scr_charset_set (3, (unsigned int)cmd_getc ()); 3023 scr_charset_set (3, (unsigned int)cmd_getc ());
2629 break; 3024 break;
2630#ifndef NO_FRILLS 3025#if ENABLE_FRILLS
2631 case '6': 3026 case '6':
2632 scr_backindex (); 3027 scr_backindex ();
2633 break; 3028 break;
2634#endif 3029#endif
2635 case '7': 3030 case '7':
2636 scr_cursor (SAVE); 3031 scr_cursor (SAVE);
2637 break; 3032 break;
2638 case '8': 3033 case '8':
2639 scr_cursor (RESTORE); 3034 scr_cursor (RESTORE);
2640 break; 3035 break;
2641#ifndef NO_FRILLS 3036#if ENABLE_FRILLS
2642 case '9': 3037 case '9':
2643 scr_forwardindex (); 3038 scr_forwardindex ();
2644 break; 3039 break;
2645#endif 3040#endif
2646 case '=': 3041 case '=':
… …
2825 { 3220 {
2826 switch (priv) 3221 switch (priv)
2827 { 3222 {
2828 case '>': 3223 case '>':
2829 if (ch == CSI_DA) /* secondary device attributes */ 3224 if (ch == CSI_DA) /* secondary device attributes */
2830 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3225 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
2831 break; 3226 break;
2832 case '?': 3227 case '?':
2833 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3228 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2834 process_terminal_mode (ch, priv, nargs, arg); 3229 process_terminal_mode (ch, priv, nargs, arg);
2835 break; 3230 break;
… …
2945 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3340 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2946 break; 3341 break;
2947 3342
2948 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3343 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2949 tt_write ((const unsigned char *)VT100_ANS, 3344 tt_write ((const unsigned char *)VT100_ANS,
2950 (unsigned int) (sizeof (VT100_ANS) - 1)); 3345 (unsigned int) (sizeof (VT100_ANS) - 1));
2951 break; 3346 break;
2952 3347
2953 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3348 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2954 process_sgr_mode (nargs, arg); 3349 process_sgr_mode (nargs, arg);
2955 break; 3350 break;
… …
2962 break; 3357 break;
2963 case 6: /* CPR requested */ 3358 case 6: /* CPR requested */
2964 scr_report_position (); 3359 scr_report_position ();
2965 break; 3360 break;
2966 case 7: /* unofficial extension */ 3361 case 7: /* unofficial extension */
2967 if (Options & Opt_insecure) 3362 if (options & Opt_insecure)
2968 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3363 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2969 break; 3364 break;
2970 case 8: /* unofficial extension */ 3365 case 8: /* unofficial extension */
2971 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3366 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2972 break; 3367 break;
2973 } 3368 }
… …
3009 break; 3404 break;
3010 3405
3011 case CSI_RM: /* 8.3.107: RESET MODE */ 3406 case CSI_RM: /* 8.3.107: RESET MODE */
3012 if (arg[0] == 4) 3407 if (arg[0] == 4)
3013 scr_insert_mode (0); 3408 scr_insert_mode (0);
3409 else if (arg[0] == 20)
3410 priv_modes &= ~PrivMode_LFNL;
3014 break; 3411 break;
3015 3412
3016 case CSI_SM: /* 8.3.126: SET MODE */ 3413 case CSI_SM: /* 8.3.126: SET MODE */
3017 if (arg[0] == 4) 3414 if (arg[0] == 4)
3018 scr_insert_mode (1); 3415 scr_insert_mode (1);
3416 else if (arg[0] == 20)
3417 priv_modes |= PrivMode_LFNL;
3019 break; 3418 break;
3020 3419
3021 /* 3420 /*
3022 * PRIVATE USE beyond this point. All CSI_7? sequences here 3421 * PRIVATE USE beyond this point. All CSI_7? sequences here
3023 */ 3422 */
… …
3035 break; 3434 break;
3036 case CSI_75: 3435 case CSI_75:
3037 scr_cursor (RESTORE); 3436 scr_cursor (RESTORE);
3038 break; 3437 break;
3039 3438
3040#ifndef NO_FRILLS 3439#if ENABLE_FRILLS
3041 case CSI_74: 3440 case CSI_74:
3042 process_window_ops (arg, nargs); 3441 process_window_ops (arg, nargs);
3043 break; 3442 break;
3044#endif 3443#endif
3045 3444
… …
3052 break; 3451 break;
3053 } 3452 }
3054} 3453}
3055/*}}} */ 3454/*}}} */
3056 3455
3057#ifndef NO_FRILLS 3456#if ENABLE_FRILLS
3058/* ARGSUSED */ 3457/* ARGSUSED */
3059void 3458void
3060rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3459rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3061{ 3460{
3062 int x, y; 3461 int x, y;
3063 XWindowAttributes wattr; 3462 XWindowAttributes wattr;
3064 Window wdummy; 3463 Window wdummy;
3464 dDisp;
3065 3465
3066 if (nargs == 0) 3466 if (nargs == 0)
3067 return; 3467 return;
3068 3468
3069 switch (args[0]) 3469 switch (args[0])
3070 { 3470 {
3071 /* 3471 /*
3072 * commands 3472 * commands
3073 */ 3473 */
3074 case 1: /* deiconify window */ 3474 case 1: /* deiconify window */
3075 XMapWindow (display->display, TermWin.parent[0]); 3475 XMapWindow (disp, TermWin.parent[0]);
3076 break; 3476 break;
3077 case 2: /* iconify window */ 3477 case 2: /* iconify window */
3078 XIconifyWindow (display->display, TermWin.parent[0], 3478 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3079 DefaultScreen (display->display));
3080 break; 3479 break;
3081 case 3: /* set position (pixels) */ 3480 case 3: /* set position (pixels) */
3082 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3481 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3083 break; 3482 break;
3084 case 4: /* set size (pixels) */ 3483 case 4: /* set size (pixels) */
3085 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3484 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3086 break; 3485 break;
3087 case 5: /* raise window */ 3486 case 5: /* raise window */
3088 XRaiseWindow (display->display, TermWin.parent[0]); 3487 XRaiseWindow (disp, TermWin.parent[0]);
3089 break; 3488 break;
3090 case 6: /* lower window */ 3489 case 6: /* lower window */
3091 XLowerWindow (display->display, TermWin.parent[0]); 3490 XLowerWindow (disp, TermWin.parent[0]);
3092 break; 3491 break;
3093 case 7: /* refresh window */ 3492 case 7: /* refresh window */
3094 scr_touch (true); 3493 scr_touch (true);
3095 break; 3494 break;
3096 case 8: /* set size (chars) */ 3495 case 8: /* set size (chars) */
… …
3108 3507
3109 /* 3508 /*
3110 * reports - some output format copied from XTerm 3509 * reports - some output format copied from XTerm
3111 */ 3510 */
3112 case 11: /* report window state */ 3511 case 11: /* report window state */
3113 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3512 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3114 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3513 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3115 break; 3514 break;
3116 case 13: /* report window position */ 3515 case 13: /* report window position */
3117 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3516 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3118 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3517 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3119 -wattr.border_width, -wattr.border_width, 3518 -wattr.border_width, -wattr.border_width,
3120 &x, &y, &wdummy); 3519 &x, &y, &wdummy);
3121 tt_printf ("\033[3;%d;%dt", x, y); 3520 tt_printf ("\033[3;%d;%dt", x, y);
3122 break; 3521 break;
3123 case 14: /* report window size (pixels) */ 3522 case 14: /* report window size (pixels) */
3124 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3523 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3125 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3524 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3126 break; 3525 break;
3127 case 18: /* report text area size (chars) */ 3526 case 18: /* report text area size (chars) */
3128 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3527 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3129 break; 3528 break;
3130 case 19: /* report window size (chars) */ 3529 case 19: /* report window size (chars) */
3131 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3530 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3132 break; 3531 break;
3133 case 20: /* report icon label */ 3532 case 20: /* report icon label */
3134 if (Options & Opt_insecure)
3135 { 3533 {
3136 char *s; 3534 char *s;
3137 XGetIconName (display->display, TermWin.parent[0], &s); 3535 XGetIconName (disp, TermWin.parent[0], &s);
3138 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3536 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3537 XFree (s);
3139 } 3538 }
3140 break; 3539 break;
3141 case 21: /* report window title */ 3540 case 21: /* report window title */
3142 if (Options & Opt_insecure)
3143 { 3541 {
3144 char *s; 3542 char *s;
3145 XFetchName (display->display, TermWin.parent[0], &s); 3543 XFetchName (disp, TermWin.parent[0], &s);
3146 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3544 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3545 XFree (s);
3147 } 3546 }
3148 break; 3547 break;
3149 } 3548 }
3150} 3549}
3151#endif 3550#endif
3152 3551
… …
3156 * ends_how is terminator used. returned input must be free()'d 3555 * ends_how is terminator used. returned input must be free()'d
3157 */ 3556 */
3158unsigned char * 3557unsigned char *
3159rxvt_term::get_to_st (unicode_t &ends_how) 3558rxvt_term::get_to_st (unicode_t &ends_how)
3160{ 3559{
3161 unicode_t prev = 0, ch; 3560 unicode_t ch;
3561 bool seen_esc = false;
3162 unsigned int n = 0; 3562 unsigned int n = 0;
3163 unsigned char *s;
3164 unsigned char string[STRING_MAX]; 3563 wchar_t string[STRING_MAX];
3165 3564
3166 while ((ch = cmd_getc ()) != NOCHAR) 3565 while ((ch = cmd_getc ()) != NOCHAR)
3167 { 3566 {
3168 if (prev == C0_ESC) 3567 if (seen_esc)
3169 { 3568 {
3170 if (ch == 0x5c) /* 7bit ST */ 3569 if (ch == 0x5c) /* 7bit ST */
3171 break; 3570 break;
3172 else 3571 else
3173 return NULL; 3572 return NULL;
3174 } 3573 }
3574 else if (ch == C0_ESC)
3575 {
3576 seen_esc = true;
3577 continue;
3578 }
3175 else if (ch == C0_BEL || ch == CHAR_ST) 3579 else if (ch == C0_BEL || ch == CHAR_ST)
3176 break; 3580 break;
3177 else if (ch < 0x20) 3581 else if (ch < 0x20)
3178 return NULL; /* other control character - exit */ 3582 return NULL; /* other control character - exit */
3583
3584 seen_esc = false;
3179 3585
3180 if (n >= sizeof (string) - 1) 3586 if (n >= sizeof (string) - 1)
3181 // stop at some sane length 3587 // stop at some sane length
3182 return NULL; 3588 return NULL;
3183 3589
3184 if (ch == C0_SYN) 3590 if (ch == C0_SYN)
3185 {
3186 string[n++] = cmd_get8 (); 3591 string[n++] = cmd_get8 ();
3187 prev = 0;
3188 }
3189 else 3592 else
3190 string[n++] = prev = ch; 3593 string[n++] = ch;
3191 } 3594 }
3192 3595
3193 string[n++] = '\0'; 3596 string[n++] = '\0';
3194 3597
3195 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3196 return NULL;
3197
3198 ends_how = (ch == 0x5c ? C0_ESC : ch); 3598 ends_how = (ch == 0x5c ? C0_ESC : ch);
3199 STRNCPY (s, string, n); 3599
3200 return s; 3600 return (unsigned char *)rxvt_wcstombs (string);
3201} 3601}
3202 3602
3203/*----------------------------------------------------------------------*/ 3603/*----------------------------------------------------------------------*/
3204/* 3604/*
3205 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3605 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3249void 3649void
3250rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3650rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3251{ 3651{
3252 if (str[0] == '?' && !str[1]) 3652 if (str[0] == '?' && !str[1])
3253 { 3653 {
3254 if (Options & Opt_insecure)
3255 {
3256 unsigned short r, g, b; 3654 unsigned short r, g, b;
3257 PixColors[color].get (display, r, g, b); 3655 pix_colors_focused[color].get (display, r, g, b);
3258 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3656 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3259 }
3260 } 3657 }
3261 else 3658 else
3262 set_window_color (color, str); 3659 set_window_color (color, str);
3263} 3660}
3264 3661
… …
3292{ 3689{
3293 int changed = 0; 3690 int changed = 0;
3294 int color; 3691 int color;
3295 char *buf, *name; 3692 char *buf, *name;
3296 bool query = str[0] == '?' && !str[1]; 3693 bool query = str[0] == '?' && !str[1];
3694 int saveop = op;
3695 dDisp;
3297 3696
3298 assert (str != NULL); 3697 assert (str != NULL);
3299 switch (op) 3698 switch (op)
3300 { 3699 {
3301 case XTerm_name: 3700 case XTerm_name:
… …
3308 set_title (str); 3707 set_title (str);
3309 break; 3708 break;
3310 case XTerm_property: 3709 case XTerm_property:
3311 if (str[0] == '?') 3710 if (str[0] == '?')
3312 { 3711 {
3313 Atom prop = XInternAtom (display->display, str + 1, True); 3712 Atom prop = display->atom (str + 1);
3314 Atom actual_type; 3713 Atom actual_type;
3315 int actual_format; 3714 int actual_format;
3316 unsigned long nitems; 3715 unsigned long nitems;
3317 unsigned long bytes_after; 3716 unsigned long bytes_after;
3318 unsigned char *value = 0; 3717 unsigned char *value = 0;
3319 const char *str = ""; 3718 const char *str = "";
3320 3719
3321 if (prop 3720 if (prop
3322 && XGetWindowProperty (display->display, TermWin.parent[0], 3721 && XGetWindowProperty (disp, TermWin.parent[0],
3323 prop, 0, 1<<16, 0, AnyPropertyType, 3722 prop, 0, 1<<16, 0, AnyPropertyType,
3324 &actual_type, &actual_format, 3723 &actual_type, &actual_format,
3325 &nitems, &bytes_after, &value) == Success 3724 &nitems, &bytes_after, &value) == Success
3326 && actual_type != None 3725 && actual_type != None
3327 && actual_format == 8) 3726 && actual_format == 8)
… …
3336 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3735 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3337 3736
3338 if (eq) 3737 if (eq)
3339 { 3738 {
3340 *eq = 0; 3739 *eq = 0;
3341 XChangeProperty (display->display, TermWin.parent[0], 3740 set_utf8_property (display->atom (str), eq + 1);
3342 display->atom (str), XA_STRING, 8,
3343 PropModeReplace, (unsigned char *)eq + 1,
3344 strlen (eq + 1));
3345 } 3741 }
3346 else 3742 else
3347 XDeleteProperty (display->display, TermWin.parent[0], 3743 XDeleteProperty (disp, TermWin.parent[0],
3348 display->atom (str)); 3744 display->atom (str));
3349 } 3745 }
3350 break; 3746 break;
3351 3747
3352 case XTerm_Color: 3748 case XTerm_Color:
3353 for (buf = (char *)str; buf && *buf;) 3749 for (buf = (char *)str; buf && *buf;)
3354 { 3750 {
3355 if ((name = STRCHR (buf, ';')) == NULL) 3751 if ((name = strchr (buf, ';')) == NULL)
3356 break; 3752 break;
3357 3753
3358 *name++ = '\0'; 3754 *name++ = '\0';
3359 color = atoi (buf); 3755 color = atoi (buf);
3360 3756
3361 if (color < 0 || color >= TOTAL_COLORS) 3757 if (color < 0 || color >= TOTAL_COLORS)
3362 break; 3758 break;
3363 3759
3364 if ((buf = STRCHR (name, ';')) != NULL) 3760 if ((buf = strchr (name, ';')) != NULL)
3365 *buf++ = '\0'; 3761 *buf++ = '\0';
3366 3762
3367 if (name[0] == '?' && !name[1]) 3763 if (name[0] == '?' && !name[1])
3368 { 3764 {
3369 if (Options & Opt_insecure)
3370 {
3371 unsigned short r, g, b; 3765 unsigned short r, g, b;
3372 PixColors[color + minCOLOR].get (display, r, g, b); 3766 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3373 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3767 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3374 }
3375 } 3768 }
3376 else 3769 else
3377 set_window_color (color + minCOLOR, name); 3770 set_window_color (color + minCOLOR, name);
3378 } 3771 }
3379 break; 3772 break;
… …
3396 break; 3789 break;
3397#ifndef NO_BOLD_UNDERLINE_REVERSE 3790#ifndef NO_BOLD_UNDERLINE_REVERSE
3398 case XTerm_Color_BD: 3791 case XTerm_Color_BD:
3399 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3792 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3400 break; 3793 break;
3794 case XTerm_Color_IT:
3795 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3796 break;
3401 case XTerm_Color_UL: 3797 case XTerm_Color_UL:
3402 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3798 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3403 break; 3799 break;
3404 case XTerm_Color_RV: 3800 case XTerm_Color_RV:
3405 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3801 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3802 break;
3803#endif
3804#if TRANSPARENT && TINTING
3805 case XTerm_Color_tint:
3806 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3807 check_our_parents ();
3808 if (am_transparent)
3809 want_full_refresh = want_refresh = 1;
3406 break; 3810 break;
3407#endif 3811#endif
3408 3812
3409 case XTerm_Pixmap: 3813 case XTerm_Pixmap:
3410 if (*str != ';') 3814 if (*str != ';')
… …
3413 scale_pixmap (""); /* reset to default scaling */ 3817 scale_pixmap (""); /* reset to default scaling */
3414 set_bgPixmap (str); /* change pixmap */ 3818 set_bgPixmap (str); /* change pixmap */
3415#endif 3819#endif
3416 scr_touch (true); 3820 scr_touch (true);
3417 } 3821 }
3418 while ((str = STRCHR (str, ';')) != NULL) 3822 while ((str = strchr (str, ';')) != NULL)
3419 { 3823 {
3420 str++; 3824 str++;
3421#if XPM_BACKGROUND 3825#if XPM_BACKGROUND
3422 changed += scale_pixmap (str); 3826 changed += scale_pixmap (str);
3423#endif 3827#endif
3424
3425 } 3828 }
3829
3426 if (changed) 3830 if (changed)
3427 { 3831 {
3428#ifdef XPM_BACKGROUND 3832#ifdef XPM_BACKGROUND
3429 resize_pixmap (); 3833 resize_pixmap ();
3430#endif 3834#endif
… …
3442 case XTerm_logfile: 3846 case XTerm_logfile:
3443 // TODO, when secure mode? 3847 // TODO, when secure mode?
3444 break; 3848 break;
3445 3849
3446 case XTerm_font: 3850 case XTerm_font:
3851 op = URxvt_font;
3852 case URxvt_font:
3853#if ENABLE_STYLES
3854 case URxvt_boldFont:
3855 case URxvt_italicFont:
3856 case URxvt_boldItalicFont:
3857#endif
3447 if (query) 3858 if (query)
3859 tt_printf ("\33]%d;%-.250s%c", saveop,
3860 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3861 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3862 resp);
3863 else
3448 { 3864 {
3449 if (Options & Opt_insecure) 3865 const char *&res = rs[Rs_font + (op - URxvt_font)];
3450 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3866
3451 TermWin.fontset->fontdesc 3867 res = strdup (str);
3452 ? TermWin.fontset->fontdesc 3868 allocated.push_back ((void *)res);
3453 : "", 3869 set_fonts ();
3454 resp);
3455 } 3870 }
3456 else
3457 change_font (str);
3458 break; 3871 break;
3459 3872
3460#ifndef NO_FRILLS 3873#if ENABLE_FRILLS
3461 case XTerm_locale: 3874 case XTerm_locale:
3462 if (query) 3875 if (query)
3463 {
3464 if (Options & Opt_insecure)
3465 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3876 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3466 }
3467 else 3877 else
3468 { 3878 {
3469 set_locale (str); 3879 set_locale (str);
3470# ifdef USE_XIM 3880 pty.set_utf8_mode (enc_utf8);
3471 im_cb (); 3881 init_xlocale ();
3472# endif
3473 }
3474 break;
3475
3476 case XTerm_findfont:
3477 if (Options & Opt_insecure)
3478 {
3479 int fid = TermWin.fontset->find_font (atoi (str));
3480 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3481 fid, (*TermWin.fontset)[fid]->name, resp);
3482 } 3882 }
3483 break; 3883 break;
3484#endif 3884#endif
3485 3885
3486#ifdef MENUBAR 3886#ifdef MENUBAR
3487 case XTerm_Menu: 3887 case XTerm_Menu:
3488 if (Options & Opt_insecure) 3888 if (options & Opt_insecure)
3489 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3889 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3490 break; 3890 break;
3491#endif 3891#endif
3492#if 0 3892#if 0
3493 case XTerm_dumpscreen: /* no error notices */ 3893 case XTerm_dumpscreen: /* no error notices */
… …
3520{ 3920{
3521 int state; 3921 int state;
3522 3922
3523 if (mode == 's') 3923 if (mode == 's')
3524 { 3924 {
3525 SavedModes |= (PrivateModes & bit); 3925 SavedModes |= (priv_modes & bit);
3526 return -1; 3926 return -1;
3527 } 3927 }
3528 else 3928 else
3529 { 3929 {
3530 if (mode == 'r') 3930 if (mode == 'r')
3531 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3931 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3532 else 3932 else
3533 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3933 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3534 PrivMode (state, bit); 3934 PrivMode (state, bit);
3535 } 3935 }
3536 3936
3537 return state; 3937 return state;
3538} 3938}
… …
3556 { 3, PrivMode_132 }, 3956 { 3, PrivMode_132 },
3557 { 4, PrivMode_smoothScroll }, 3957 { 4, PrivMode_smoothScroll },
3558 { 5, PrivMode_rVideo }, 3958 { 5, PrivMode_rVideo },
3559 { 6, PrivMode_relOrigin }, 3959 { 6, PrivMode_relOrigin },
3560 { 7, PrivMode_Autowrap }, 3960 { 7, PrivMode_Autowrap },
3961 // 8, bi-directional support mode
3561 { 9, PrivMode_MouseX10 }, 3962 { 9, PrivMode_MouseX10 },
3562#ifdef menuBar_esc 3963#ifdef menuBar_esc
3563 { menuBar_esc, PrivMode_menuBar }, 3964 { menuBar_esc, PrivMode_menuBar },
3564#endif 3965#endif
3966 // 18, 19 printing-related
3967 { 25, PrivMode_VisibleCursor },
3565#ifdef scrollBar_esc 3968#ifdef scrollBar_esc
3566 { scrollBar_esc, PrivMode_scrollBar }, 3969 { scrollBar_esc, PrivMode_scrollBar },
3567#endif 3970#endif
3568 // 18, 19 printing-related
3569 { 25, PrivMode_VisibleCursor },
3570 // 30 show scrollbar rxvt. extension
3571 { 35, PrivMode_ShiftKeys }, // rxvt extension 3971 { 35, PrivMode_ShiftKeys }, // rxvt extension
3572 { 40, PrivMode_132OK }, 3972 { 40, PrivMode_132OK },
3573 // 41 xterm more fixes NYI 3973 // 41 xterm more fixes NYI
3574 // 45 margin bell NYI 3974 // 45 margin bell NYI
3575 // 46 start logging 3975 // 46 start logging
… …
3616 4016
3617 /* extra handling for values with state unkept */ 4017 /* extra handling for values with state unkept */
3618 switch (arg[i]) 4018 switch (arg[i])
3619 { 4019 {
3620 case 1048: /* alternative cursor save */ 4020 case 1048: /* alternative cursor save */
4021 case 1049:
3621 if (Options & Opt_secondaryScreen) 4022 if (options & Opt_secondaryScreen)
3622 if (mode == 0) 4023 if (mode == 0)
3623 scr_cursor (RESTORE); 4024 scr_cursor (RESTORE);
3624 else if (mode == 1) 4025 else if (mode == 1)
3625 scr_cursor (SAVE); 4026 scr_cursor (SAVE);
3626 break; 4027 break;
… …
3637 * within VT52 mode 4038 * within VT52 mode
3638 */ 4039 */
3639 PrivMode (1, PrivMode_vt52); 4040 PrivMode (1, PrivMode_vt52);
3640 break; 4041 break;
3641 case 3: /* 80/132 */ 4042 case 3: /* 80/132 */
3642 if (PrivateModes & PrivMode_132OK) 4043 if (priv_modes & PrivMode_132OK)
3643 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4044 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3644 break; 4045 break;
3645 case 4: /* smooth scrolling */ 4046 case 4: /* smooth scrolling */
3646 if (state) 4047 if (state)
3647 Options &= ~Opt_jumpScroll; 4048 options &= ~Opt_jumpScroll;
3648 else 4049 else
3649 Options |= Opt_jumpScroll; 4050 options |= Opt_jumpScroll;
3650 break; 4051 break;
3651 case 5: /* reverse video */ 4052 case 5: /* reverse video */
3652 scr_rvideo_mode (state); 4053 scr_rvideo_mode (state);
3653 break; 4054 break;
3654 case 6: /* relative/absolute origins */ 4055 case 6: /* relative/absolute origins */
… …
3658 scr_autowrap (state); 4059 scr_autowrap (state);
3659 break; 4060 break;
3660 /* case 8: - auto repeat, can't do on a per window basis */ 4061 /* case 8: - auto repeat, can't do on a per window basis */
3661 case 9: /* X10 mouse reporting */ 4062 case 9: /* X10 mouse reporting */
3662 if (state) /* orthogonal */ 4063 if (state) /* orthogonal */
3663 PrivateModes &= ~PrivMode_MouseX11; 4064 priv_modes &= ~PrivMode_MouseX11;
3664 break; 4065 break;
3665#ifdef menuBar_esc 4066#ifdef menuBar_esc
3666 case menuBar_esc: 4067 case menuBar_esc:
3667#ifdef MENUBAR 4068#ifdef MENUBAR
3668 map_menuBar (state); 4069 map_menuBar (state);
… …
3688 break; 4089 break;
3689 /* case 66: - application key pad */ 4090 /* case 66: - application key pad */
3690 /* case 67: - backspace key */ 4091 /* case 67: - backspace key */
3691 case 1000: /* X11 mouse reporting */ 4092 case 1000: /* X11 mouse reporting */
3692 if (state) /* orthogonal */ 4093 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX10; 4094 priv_modes &= ~PrivMode_MouseX10;
3694 break; 4095 break;
3695#if 0 4096#if 0
3696 case 1001: 4097 case 1001:
3697 break; /* X11 mouse highlighting */ 4098 break; /* X11 mouse highlighting */
3698#endif 4099#endif
3699 case 1010: /* scroll to bottom on TTY output inhibit */ 4100 case 1010: /* scroll to bottom on TTY output inhibit */
3700 if (state) 4101 if (state)
3701 Options &= ~Opt_scrollTtyOutput; 4102 options &= ~Opt_scrollTtyOutput;
3702 else 4103 else
3703 Options |= Opt_scrollTtyOutput; 4104 options |= Opt_scrollTtyOutput;
3704 break; 4105 break;
3705 case 1011: /* scroll to bottom on key press */ 4106 case 1011: /* scroll to bottom on key press */
3706 if (state) 4107 if (state)
3707 Options |= Opt_scrollTtyKeypress; 4108 options |= Opt_scrollTtyKeypress;
3708 else 4109 else
3709 Options &= ~Opt_scrollTtyKeypress; 4110 options &= ~Opt_scrollTtyKeypress;
3710 break; 4111 break;
3711 case 1047: /* secondary screen w/ clearing last */ 4112 case 1047: /* secondary screen w/ clearing last */
3712 if (Options & Opt_secondaryScreen) 4113 if (options & Opt_secondaryScreen)
3713 if (current_screen != PRIMARY) 4114 if (current_screen != PRIMARY)
3714 scr_erase_screen (2); 4115 scr_erase_screen (2);
3715 scr_change_screen (state); 4116 scr_change_screen (state);
3716 break; 4117 break;
3717 case 1049: /* secondary screen w/ clearing first */ 4118 case 1049: /* secondary screen w/ clearing first */
3718 scr_change_screen (state); 4119 scr_change_screen (state);
3719 if (Options & Opt_secondaryScreen) 4120 if (options & Opt_secondaryScreen)
3720 if (current_screen != PRIMARY) 4121 if (current_screen != PRIMARY)
3721 scr_erase_screen (2); 4122 scr_erase_screen (2);
3722 break; 4123 break;
3723 default: 4124 default:
3724 break; 4125 break;
… …
3750 rendset = 0, rendstyle = ~RS_None; 4151 rendset = 0, rendstyle = ~RS_None;
3751 break; 4152 break;
3752 case 1: 4153 case 1:
3753 rendset = 1, rendstyle = RS_Bold; 4154 rendset = 1, rendstyle = RS_Bold;
3754 break; 4155 break;
4156 //case 2: // low intensity
4157 case 3:
4158 rendset = 1, rendstyle = RS_Italic;
4159 break;
3755 case 4: 4160 case 4:
3756 rendset = 1, rendstyle = RS_Uline; 4161 rendset = 1, rendstyle = RS_Uline;
3757 break; 4162 break;
3758 case 5: 4163 case 5: // slowly blinking
4164 case 6: // rapidly blinking
3759 rendset = 1, rendstyle = RS_Blink; 4165 rendset = 1, rendstyle = RS_Blink;
3760 break; 4166 break;
3761 //case 6: // scoansi light background 4167 //case 6: // scoansi light background
3762 case 7: 4168 case 7:
3763 rendset = 1, rendstyle = RS_RVid; 4169 rendset = 1, rendstyle = RS_RVid;
3764 break; 4170 break;
3765 case 8: 4171 case 8:
3766 // invisible. NYI 4172 // invisible. NYI
3767 break; 4173 break;
4174 //case 9: // crossed out
3768 //case 10: // scoansi acs off 4175 //case 10: // scoansi acs off, primary font
3769 //case 11: // scoansi acs on 4176 //case 11: // scoansi acs on, first alt font
3770 //case 12: // scoansi acs on, |0x80 4177 //case 12: // scoansi acs on, |0x80, second alt font
3771 case 21: // disable bold, blink and invis (some terminals use this) 4178 //...
4179 //case 19: // ninth alt font
4180 //case 20: // gothic
4181 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3772 rendset = 0, rendstyle = RS_Bold | RS_Blink; 4182 rendset = 0, rendstyle = RS_Bold;
3773 break; 4183 break;
3774 case 22: 4184 case 22: // normal intensity
3775 rendset = 0, rendstyle = RS_Bold; 4185 rendset = 0, rendstyle = RS_Bold;
4186 break;
4187 case 23: // disable italic
4188 rendset = 0, rendstyle = RS_Italic;
3776 break; 4189 break;
3777 case 24: 4190 case 24:
3778 rendset = 0, rendstyle = RS_Uline; 4191 rendset = 0, rendstyle = RS_Uline;
3779 break; 4192 break;
3780 case 25: 4193 case 25:
3781 rendset = 0, rendstyle = RS_Blink; 4194 rendset = 0, rendstyle = RS_Blink;
3782 break; 4195 break;
4196 case 26: // variable spacing (iso 8613)
4197 rendset = 0, rendstyle = RS_Blink;
4198 break;
3783 case 27: 4199 case 27:
3784 rendset = 0, rendstyle = RS_RVid; 4200 rendset = 0, rendstyle = RS_RVid;
3785 break; 4201 break;
3786 case 28:
3787 // visible. NYI 4202 //case 28: // visible. NYI
3788 break; 4203 //case 29: // not crossed-out
3789 } 4204 }
3790 4205
3791 if (rendset != -1) 4206 if (rendset != -1)
3792 { 4207 {
3793 scr_rendition (rendset, rendstyle); 4208 scr_rendition (rendset, rendstyle);
… …
3804 case 35: 4219 case 35:
3805 case 36: 4220 case 36:
3806 case 37: 4221 case 37:
3807 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4222 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3808 break; 4223 break;
3809#ifdef TTY_256COLOR 4224 case 38: // set fg color, ISO 8613-6
3810 case 38:
3811 if (nargs > i + 2 && arg[i + 1] == 5) 4225 if (nargs > i + 2 && arg[i + 1] == 5)
3812 { 4226 {
3813 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4227 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3814 i += 2; 4228 i += 2;
3815 } 4229 }
3816 break; 4230 break;
3817#endif
3818 case 39: /* default fg */ 4231 case 39: /* default fg */
3819 scr_color (Color_fg, Color_fg); 4232 scr_color (Color_fg, Color_fg);
3820 break; 4233 break;
3821 4234
3822 case 40: 4235 case 40:
… …
3827 case 45: 4240 case 45:
3828 case 46: 4241 case 46:
3829 case 47: 4242 case 47:
3830 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4243 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3831 break; 4244 break;
3832#ifdef TTY_256COLOR 4245 case 48: // set bg color, ISO 8613-6
3833 case 48:
3834 if (nargs > i + 2 && arg[i + 1] == 5) 4246 if (nargs > i + 2 && arg[i + 1] == 5)
3835 { 4247 {
3836 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4248 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3837 i += 2; 4249 i += 2;
3838 } 4250 }
3839 break; 4251 break;
3840#endif
3841 case 49: /* default bg */ 4252 case 49: /* default bg */
3842 scr_color (Color_bg, Color_bg); 4253 scr_color (Color_bg, Color_bg);
3843 break; 4254 break;
4255
4256 //case 50: // not variable spacing
3844 4257
3845#ifndef NO_BRIGHTCOLOR 4258#ifndef NO_BRIGHTCOLOR
3846 case 90: 4259 case 90:
3847 case 91: /* set bright fg color */ 4260 case 91: /* set bright fg color */
3848 case 92: 4261 case 92:
3849 case 93: 4262 case 93:
3850 case 94: 4263 case 94:
3851 case 95: 4264 case 95:
3852 case 96: 4265 case 96:
3853 case 97: 4266 case 97:
3854 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4267 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3855 Color_fg);
3856 break; 4268 break;
3857 case 100: 4269 case 100:
3858 case 101: /* set bright bg color */ 4270 case 101: /* set bright bg color */
3859 case 102: 4271 case 102:
3860 case 103: 4272 case 103:
3861 case 104: 4273 case 104:
3862 case 105: 4274 case 105:
3863 case 106: 4275 case 106:
3864 case 107: 4276 case 107:
3865 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4277 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3866 Color_bg);
3867 break; 4278 break;
3868#endif 4279#endif
3869 4280
3870 } 4281 }
3871 } 4282 }
… …
3878{ 4289{
3879 unicode_t ch, cmd = cmd_getc (); 4290 unicode_t ch, cmd = cmd_getc ();
3880 4291
3881 if (cmd == 'Q') 4292 if (cmd == 'Q')
3882 { /* query graphics */ 4293 { /* query graphics */
3883 tt_printf ("\033G0\n"); /* no graphics */ 4294 tt_printf ("\033G0\012"); /* no graphics */
3884 return; 4295 return;
3885 } 4296 }
3886 /* swallow other graphics sequences until terminating ':' */ 4297 /* swallow other graphics sequences until terminating ':' */
3887 do 4298 do
3888 ch = cmd_getc (); 4299 ch = cmd_getc ();
… …
3903 unsigned char buf[256]; 4314 unsigned char buf[256];
3904 4315
3905 va_start (arg_ptr, fmt); 4316 va_start (arg_ptr, fmt);
3906 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4317 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3907 va_end (arg_ptr); 4318 va_end (arg_ptr);
3908 tt_write (buf, STRLEN (buf)); 4319 tt_write (buf, strlen (buf));
3909} 4320}
3910 4321
3911/* ---------------------------------------------------------------------- */ 4322/* ---------------------------------------------------------------------- */
3912/* Write data to the pty as typed by the user, pasted with the mouse, 4323/* Write data to the pty as typed by the user, pasted with the mouse,
3913 * or generated by us in response to a query ESC sequence. 4324 * or generated by us in response to a query ESC sequence.
3914 */ 4325 */
4326const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4327
3915void 4328void
3916rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4329rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3917{ 4330{
3918 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4331 if (v_buflen == 0)
4332 {
4333 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3919 4334
3920 if (len) 4335 if ((unsigned int)written == len)
4336 return;
4337
4338 data += written;
4339 len -= written;
3921 { 4340 }
4341
4342 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4343
4344 memcpy (v_buffer + v_buflen, data, len);
4345 v_buflen += len;
4346
4347 pty_ev.set (EVENT_READ | EVENT_WRITE);
4348}
4349
4350void rxvt_term::pty_write ()
4351{
4352 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4353
4354 if (written > 0)
4355 {
4356 v_buflen -= written;
4357
3922 if (v_buflen == 0) 4358 if (v_buflen == 0)
3923 { 4359 {
3924 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len));
3925
3926 if ((unsigned int)written == len)
3927 return;
3928
3929 data += written;
3930 len -= written;
3931 }
3932
3933
3934 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
3935
3936 memcpy (v_buffer + v_buflen, data, len);
3937 v_buflen += len;
3938 }
3939
3940 for (;;)
3941 {
3942 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3943
3944 if (written > 0)
3945 {
3946 v_buflen -= written;
3947
3948 if (v_buflen == 0)
3949 {
3950 free (v_buffer); 4360 free (v_buffer);
3951 v_buffer = 0; 4361 v_buffer = 0;
3952 v_buflen = 0; 4362 v_buflen = 0;
3953 4363
3954 pty_ev.set (EVENT_READ); 4364 pty_ev.set (EVENT_READ);
3955 return;
3956 }
3957
3958 memmove (v_buffer, v_buffer + written, v_buflen);
3959 }
3960 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
3961 // original code just ignores this...
3962 destroy ();
3963 else
3964 {
3965 pty_ev.set (EVENT_READ | EVENT_WRITE);
3966 return; 4365 return;
3967 } 4366 }
4367
4368 memmove (v_buffer, v_buffer + written, v_buflen);
3968 } 4369 }
4370 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4371 // original code just ignores this...
4372 destroy ();
3969} 4373}
3970 4374
3971/*----------------------- end-of-file (C source) -----------------------*/ 4375/*----------------------- end-of-file (C source) -----------------------*/
3972 4376

Diff Legend

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