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

Diff Legend

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