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.81 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.191 by root, Wed Jan 26 07:08:15 2005 UTC

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

Diff Legend

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