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.171 by root, Wed Dec 1 02:12:18 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;
… …
742 SET_LOCALE (locale); 1061 SET_LOCALE (locale);
743 1062
744 if (revents & EVENT_WRITE) 1063 if (revents & EVENT_WRITE)
745 tt_write (0, 0); 1064 tt_write (0, 0);
746 else if (revents & EVENT_READ) 1065 else if (revents & EVENT_READ)
747 {
748 // loop, but don't allow a single term to monopolize us 1066 // 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 ()) 1067 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
760 if (cmd_parse ()) 1068 if (cmd_parse ())
761 break; 1069 break;
762 } 1070}
763 } 1071
1072void
1073rxvt_term::pointer_unblank ()
1074{
1075 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
1076 recolour_cursor ();
1077
1078#ifdef POINTER_BLANK
1079 hidden_pointer = 0;
1080
1081 if (options & Opt_pointerBlank)
1082 pointer_ev.start (NOW + pointerBlankDelay);
1083#endif
764} 1084}
765 1085
766#ifdef POINTER_BLANK 1086#ifdef POINTER_BLANK
767void 1087void
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 () 1088rxvt_term::pointer_blank ()
781{ 1089{
782 if (! (Options & Opt_pointerBlank)) 1090 if (! (options & Opt_pointerBlank))
783 return; 1091 return;
784 1092
785 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1093 XDefineCursor (display->display, TermWin.vt, blank_cursor);
786 XFlush (display->display); 1094 XFlush (display->display);
787 1095
… …
807 x = ev.x; 1115 x = ev.x;
808 y = ev.y; 1116 y = ev.y;
809 pixel_position (&x, &y); 1117 pixel_position (&x, &y);
810 1118
811 if (MEvent.button == AnyButton) 1119 if (MEvent.button == AnyButton)
812 {
813 button_number = 3; 1120 button_number = 3;
814 }
815 else 1121 else
816 { 1122 {
817 button_number = MEvent.button - Button1; 1123 button_number = MEvent.button - Button1;
818 /* add 0x3D for wheel events, like xterm does */ 1124 /* add 0x3D for wheel events, like xterm does */
819 if (button_number >= 3) 1125 if (button_number >= 3)
820 button_number += (64 - 3); 1126 button_number += (64 - 3);
821 } 1127 }
822 1128
823 if (PrivateModes & PrivMode_MouseX10) 1129 if (priv_modes & PrivMode_MouseX10)
824 { 1130 {
825 /* 1131 /*
826 * do not report ButtonRelease 1132 * do not report ButtonRelease
827 * no state info allowed 1133 * no state info allowed
828 */ 1134 */
… …
843 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1149 + ((MEvent.state & ModMetaMask) ? 8 : 0)
844 + ((MEvent.state & ControlMask) ? 16 : 0); 1150 + ((MEvent.state & ControlMask) ? 16 : 0);
845#ifdef MOUSE_REPORT_DOUBLECLICK 1151#ifdef MOUSE_REPORT_DOUBLECLICK
846 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1152 key_state += ((MEvent.clicks > 1) ? 32 : 0);
847#endif 1153#endif
848
849 } 1154 }
850 1155
851#ifdef DEBUG_MOUSEREPORT 1156#if DEBUG_MOUSEREPORT
852 fprintf (stderr, "Mouse ["); 1157 fprintf (stderr, "Mouse [");
853 if (key_state & 16) 1158 if (key_state & 16)
854 fputc ('C', stderr); 1159 fputc ('C', stderr);
855 if (key_state & 4) 1160 if (key_state & 4)
856 fputc ('S', stderr); 1161 fputc ('S', stderr);
… …
860 fputc ('2', stderr); 1165 fputc ('2', stderr);
861 fprintf (stderr, "]: <%d>, %d/%d\n", 1166 fprintf (stderr, "]: <%d>, %d/%d\n",
862 button_number, 1167 button_number,
863 x + 1, 1168 x + 1,
864 y + 1); 1169 y + 1);
865#else 1170#endif
1171
866 tt_printf ("\033[M%c%c%c", 1172 tt_printf ("\033[M%c%c%c",
867 (32 + button_number + key_state), 1173 (32 + button_number + key_state),
868 (32 + x + 1), 1174 (32 + x + 1),
869 (32 + y + 1)); 1175 (32 + y + 1));
870#endif
871} 1176}
872 1177
873#ifdef USING_W11LIB 1178#ifdef USING_W11LIB
874void 1179void
875rxvt_W11_process_x_event (XEvent *ev) 1180rxvt_W11_process_x_event (XEvent *ev)
… …
886{ 1191{
887 SET_R (this); 1192 SET_R (this);
888 SET_LOCALE (locale); 1193 SET_LOCALE (locale);
889 1194
890#if defined(CURSOR_BLINK) 1195#if defined(CURSOR_BLINK)
891 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1196 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
892 { 1197 {
893 if (hidden_cursor) 1198 if (hidden_cursor)
894 { 1199 {
895 hidden_cursor = 0; 1200 hidden_cursor = 0;
896 want_refresh = 1; 1201 want_refresh = 1;
… …
899 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1204 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
900 } 1205 }
901#endif 1206#endif
902 1207
903#if defined(POINTER_BLANK) 1208#if defined(POINTER_BLANK)
904 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1209 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
905 { 1210 {
906 if (ev.type == MotionNotify 1211 if (ev.type == MotionNotify
907 || ev.type == ButtonPress 1212 || ev.type == ButtonPress
908 || ev.type == ButtonRelease) 1213 || ev.type == ButtonRelease)
909 if (hidden_pointer) 1214 if (hidden_pointer)
… …
912 if (ev.type == KeyPress && hidden_pointer == 0) 1217 if (ev.type == KeyPress && hidden_pointer == 0)
913 pointer_blank (); 1218 pointer_blank ();
914 } 1219 }
915#endif 1220#endif
916 1221
917#ifdef USE_XIM
918 if (XFilterEvent (&ev, None))
919 return;
920#endif
921
922 Window unused_root, unused_child; 1222 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1223 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1224 unsigned int unused_mask;
925 1225
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
975 switch (ev.type) 1226 switch (ev.type)
976 { 1227 {
977 case KeyPress: 1228 case KeyPress:
1229#if ISO_14755
1230 if (!(iso14755buf & ISO_14755_52))
1231#endif
978 lookup_key (ev.xkey); 1232 lookup_key (ev.xkey);
1233
1234 break;
1235
1236 case KeyRelease:
1237 {
1238#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1239 KeySym ks;
1240
1241 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1242#endif
1243
1244#if ENABLE_FRILLS || ISO_14755
1245 // ISO 14755 support
1246 if (iso14755buf)
1247 if (iso14755buf & ISO_14755_52)
1248 {
1249# if ENABLE_OVERLAY
1250 scr_overlay_off ();
1251# endif
1252# if ISO_14755
1253 // iso14755 part 5.2 handling: release time
1254 // first: controls
1255 if ((ev.xkey.state & ControlMask)
1256 && ((ks >= 0x40 && ks <= 0x5f)
1257 || (ks >= 0x61 && ks <= 0x7f)))
1258 {
1259 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1260 commit_iso14755 ();
1261 return; // case-break;
1262 }
1263
1264 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1265 if (i[0] == ks)
1266 {
1267 iso14755buf = ISO_14755_51 | i[1];
1268 commit_iso14755 ();
1269 return; // case-break;
1270 }
1271
1272 scr_bell ();
1273# endif
1274 iso14755buf = 0;
979 break; 1275 break;
1276 }
1277 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1278 {
1279# if ENABLE_OVERLAY
1280 scr_overlay_off ();
1281# endif
1282 if (iso14755buf & ISO_14755_51)
1283 commit_iso14755 ();
1284#if ISO_14755
1285 else if (iso14755buf & ISO_14755_STARTED)
1286 {
1287 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1288
1289 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1290 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1291 }
1292# endif
1293 else
1294 iso14755buf = 0;
1295 }
1296#endif
980 1297
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1298#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 if (! (ev.xkey.state & ControlMask)) 1299 if (!(ev.xkey.state & ControlMask))
1300 slip_wheel_ev.stop ();
1301 else if (ks == XK_Control_L || ks == XK_Control_R)
985 mouse_slip_wheel_speed = 0; 1302 mouse_slip_wheel_speed = 0;
986 else 1303#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; 1304 break;
995 } 1305 }
996#endif
997 1306
998 case ButtonPress: 1307 case ButtonPress:
999 button_press (ev.xbutton); 1308 button_press (ev.xbutton);
1000 break; 1309 break;
1001 1310
… …
1013 && (ev.xclient.data.l[0] == DndFile 1322 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1323 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1324 || ev.xclient.data.l[0] == DndLink))
1016 { 1325 {
1017 /* Get Dnd data */ 1326 /* Get Dnd data */
1018 Atom ActualType; 1327 Atom ActualType;
1019 int ActualFormat; 1328 int ActualFormat;
1020 unsigned char *data; 1329 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1330 unsigned long Size, RemainingBytes;
1022 1331
1023 XGetWindowProperty (display->display, display->root, 1332 XGetWindowProperty (display->display, display->root,
1024 xa[XA_DNDSELECTION], 1333 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1334 0L, 1000000L,
1026 False, AnyPropertyType, 1335 False, AnyPropertyType,
… …
1028 &Size, &RemainingBytes, 1337 &Size, &RemainingBytes,
1029 &data); 1338 &data);
1030 XChangeProperty (display->display, display->root, 1339 XChangeProperty (display->display, display->root,
1031 XA_CUT_BUFFER0, XA_STRING, 1340 XA_CUT_BUFFER0, XA_STRING,
1032 8, PropModeReplace, 1341 8, PropModeReplace,
1033 data, STRLEN (data)); 1342 data, strlen (data));
1343 XFree (data);
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1344 selection_paste (display->root, XA_CUT_BUFFER0, True);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1345 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1036 } 1346 }
1037#endif /* OFFIX_DND */ 1347#endif /* OFFIX_DND */
1038 break; 1348 break;
1039 1349
1040 case MappingNotify: 1350 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1351 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1352 break;
1043 1353
1044 /* 1354 /*
1045 * XXX: this is not the _current_ arrangement 1355 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1356 * Here's my conclusion:
… …
1071 { 1381 {
1072 TermWin.focus = 1; 1382 TermWin.focus = 1;
1073 want_refresh = 1; 1383 want_refresh = 1;
1074#ifdef USE_XIM 1384#ifdef USE_XIM
1075 if (Input_Context != NULL) 1385 if (Input_Context != NULL)
1386 {
1387 IMSetStatusPosition ();
1076 XSetICFocus (Input_Context); 1388 XSetICFocus (Input_Context);
1389 }
1077#endif 1390#endif
1078#ifdef CURSOR_BLINK 1391#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink) 1392 if (options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1393 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1394#endif
1395#ifdef OFF_FOCUS_FADING
1396 if (rs[Rs_fade])
1397 {
1398 pix_colors = pix_colors_focused;
1399 scr_recolour ();
1400 }
1081#endif 1401#endif
1082 1402
1083 } 1403 }
1084 break; 1404 break;
1085 1405
1086 case FocusOut: 1406 case FocusOut:
1087 if (TermWin.focus) 1407 if (TermWin.focus)
1088 { 1408 {
1089 TermWin.focus = 0; 1409 TermWin.focus = 0;
1090 want_refresh = 1; 1410 want_refresh = 1;
1411
1412#if ENABLE_FRILLS || ISO_14755
1413 iso14755buf = 0;
1414#endif
1415#if ENABLE_OVERLAY
1416 scr_overlay_off ();
1417#endif
1091#ifdef USE_XIM 1418#ifdef USE_XIM
1092 if (Input_Context != NULL) 1419 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context); 1420 XUnsetICFocus (Input_Context);
1094#endif 1421#endif
1095#ifdef CURSOR_BLINK 1422#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink) 1423 if (options & Opt_cursorBlink)
1097 cursor_blink_ev.stop (); 1424 cursor_blink_ev.stop ();
1098 hidden_cursor = 0; 1425 hidden_cursor = 0;
1099#endif 1426#endif
1100 1427#ifdef OFF_FOCUS_FADING
1428 if (rs[Rs_fade])
1429 {
1430 pix_colors = pix_colors_unfocused;
1431 scr_recolour ();
1432 }
1433#endif
1101 } 1434 }
1102 break; 1435 break;
1103 1436
1104 case ConfigureNotify: 1437 case ConfigureNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1438 if (ev.xconfigure.window == TermWin.parent[0])
… …
1114 } 1447 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1448 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1116 1449
1117 if (szHint.width != width || szHint.height != height) 1450 if (szHint.width != width || szHint.height != height)
1118 { 1451 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1452 seen_resize = 1;
1120 resize_all_windows (width, height, 1); 1453 resize_all_windows (width, height, 1);
1121 } 1454 }
1122#ifdef DEBUG_SIZE 1455
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1456#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent) 1457 if (options & Opt_transparent)
1130 { 1458 {
1131 check_our_parents (); 1459 check_our_parents ();
1132 if (am_transparent) 1460 if (am_transparent)
1133 want_full_refresh = 1; 1461 want_refresh = want_full_refresh = 1;
1134 } 1462 }
1135#endif 1463#endif
1136
1137 } 1464 }
1465 break;
1466
1467 case PropertyNotify:
1468 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1469 && ev.xproperty.state == PropertyNewValue)
1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1471
1138 break; 1472 break;
1139 1473
1140 case SelectionClear: 1474 case SelectionClear:
1141 selection_clear (); 1475 selection_clear ();
1142 break; 1476 break;
… …
1173 1507
1174 case GraphicsExpose: 1508 case GraphicsExpose:
1175 case Expose: 1509 case Expose:
1176 if (ev.xany.window == TermWin.vt) 1510 if (ev.xany.window == TermWin.vt)
1177 { 1511 {
1178#ifdef NO_SLOW_LINK_SUPPORT 1512 do
1179 scr_expose (ev.xexpose.x, ev.xexpose.y, 1513 scr_expose (ev.xexpose.x, ev.xexpose.y,
1180 ev.xexpose.width, ev.xexpose.height, False); 1514 ev.xexpose.width, ev.xexpose.height, False);
1181#else 1515 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1182 // don't understand this, so commented it out 1516
1517 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1518
1519 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1183 scr_expose (ev.xexpose.x, ev.xexpose.y, 1520 scr_expose (ev.xexpose.x, ev.xexpose.y,
1184 ev.xexpose.width, ev.xexpose.height, False); 1521 ev.xexpose.width, ev.xexpose.height, False);
1185 //scr_expose (ev.xexpose.x, 0, 1522
1186 // ev.xexpose.width, TermWin.height, False); 1523 scr_refresh (refresh_type);
1187#endif
1188 want_refresh = 1;
1189 } 1524 }
1190 else 1525 else
1191 { 1526 {
1192 XEvent unused_event; 1527 XEvent unused_event;
1193 1528
1194 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1529 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1195 Expose, 1530 ;
1196 &unused_event)) ;
1197 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1531 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1198 GraphicsExpose, 1532 ;
1199 &unused_event)) ; 1533
1200 if (isScrollbarWindow (ev.xany.window)) 1534 if (isScrollbarWindow (ev.xany.window))
1201 { 1535 {
1202 scrollBar.setIdle (); 1536 scrollBar.setIdle ();
1203 scrollbar_show (0); 1537 scrollbar_show (0);
1204 } 1538 }
1205#ifdef MENUBAR 1539#ifdef MENUBAR
1206 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1540 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1207 menubar_expose (); 1541 menubar_expose ();
1208#endif 1542#endif
1543
1544#ifdef TRANSPARENT
1545 if (am_transparent && ev.xany.window == TermWin.parent[0])
1546 XClearWindow (display->display, ev.xany.window);
1547#endif
1209 } 1548 }
1210 break; 1549 break;
1211 1550
1212 case MotionNotify: 1551 case MotionNotify:
1213#ifdef POINTER_BLANK 1552#ifdef POINTER_BLANK
… …
1219 { 1558 {
1220 menubar_control (ev.xbutton); 1559 menubar_control (ev.xbutton);
1221 break; 1560 break;
1222 } 1561 }
1223#endif 1562#endif
1224 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1563 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1225 break; 1564 break;
1226 1565
1227 if (ev.xany.window == TermWin.vt) 1566 if (ev.xany.window == TermWin.vt)
1228 { 1567 {
1229 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1568 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1230 { 1569 {
1231 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1570 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1232 ; 1571 ;
1233 1572
1234 XQueryPointer (display->display, TermWin.vt, 1573 XQueryPointer (display->display, TermWin.vt,
1235 &unused_root, &unused_child, 1574 &unused_root, &unused_child,
1236 &unused_root_x, &unused_root_y, 1575 &unused_root_x, &unused_root_y,
1237 & (ev.xbutton.x), & (ev.xbutton.y), 1576 &ev.xbutton.x, &ev.xbutton.y,
1238 &unused_mask); 1577 &ev.xbutton.state);
1239#ifdef MOUSE_THRESHOLD 1578#ifdef MOUSE_THRESHOLD
1240 /* deal with a `jumpy' mouse */ 1579 /* deal with a `jumpy' mouse */
1241 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1580 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1242 { 1581 {
1243#endif 1582#endif
1583#if ISO_14755
1584 // 5.4
1585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1586 {
1587 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1588 break;
1589 }
1590#endif
1244 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1591 selection_extend (ev.xbutton.x, ev.xbutton.y,
1245 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1592 ev.xbutton.state & Button3Mask ? 2 : 0);
1593
1246#ifdef SELECTION_SCROLLING 1594#ifdef SELECTION_SCROLLING
1247 if (ev.xbutton.y < TermWin.int_bwidth 1595 if (ev.xbutton.y < TermWin.int_bwidth
1248 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1596 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1249 { 1597 {
1250 int dist; 1598 int dist;
1251 1599
1252 pending_scroll_selection=1;
1253
1254 /* don't clobber the current delay if we are 1600 /* don't clobber the current delay if we are
1255 * already in the middle of scrolling. 1601 * already in the middle of scrolling.
1256 */ 1602 */
1257 if (scroll_selection_delay<=0) 1603 if (!sel_scroll_ev.active)
1258 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1604 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1259 1605
1260 /* save the event params so we can highlight 1606 /* save the event params so we can highlight
1261 * the selection in the pending-scroll loop 1607 * the selection in the pending-scroll loop
1262 */ 1608 */
1263 selection_save_x=ev.xbutton.x; 1609 selection_save_x = ev.xbutton.x;
1264 selection_save_y=ev.xbutton.y; 1610 selection_save_y = ev.xbutton.y;
1265 selection_save_state=
1266 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1611 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1267 1612
1268 /* calc number of lines to scroll */ 1613 /* calc number of lines to scroll */
1269 if (ev.xbutton.y<TermWin.int_bwidth) 1614 if (ev.xbutton.y < TermWin.int_bwidth)
1270 { 1615 {
1271 scroll_selection_dir = UP; 1616 scroll_selection_dir = UP;
1272 dist = TermWin.int_bwidth - ev.xbutton.y; 1617 dist = TermWin.int_bwidth - ev.xbutton.y;
1273 } 1618 }
1274 else 1619 else
1275 { 1620 {
1276 scroll_selection_dir = DN; 1621 scroll_selection_dir = DN;
1277 dist = ev.xbutton.y -
1278 (TermWin.int_bwidth + TermWin.height); 1622 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1279 } 1623 }
1624
1280 scroll_selection_lines= (Pixel2Height (dist)/ 1625 scroll_selection_lines = Pixel2Height (dist)
1281 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1626 / SELECTION_SCROLL_LINE_SPEEDUP
1627 + 1;
1282 MIN_IT (scroll_selection_lines, 1628 MIN_IT (scroll_selection_lines,
1283 SELECTION_SCROLL_MAX_LINES); 1629 SELECTION_SCROLL_MAX_LINES);
1284 } 1630 }
1285 else 1631 else
1286 { 1632 {
1287 /* we are within the text window, so we 1633 /* we are within the text window, so we
1288 * shouldn't be scrolling 1634 * shouldn't be scrolling
1289 */ 1635 */
1290 pending_scroll_selection = 0; 1636 if (sel_scroll_ev.active)
1637 sel_scroll_ev.stop();
1291 } 1638 }
1292#endif 1639#endif
1293#ifdef MOUSE_THRESHOLD 1640#ifdef MOUSE_THRESHOLD
1294
1295 } 1641 }
1296#endif 1642#endif
1297
1298 } 1643 }
1299 } 1644 }
1300 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1301 { 1646 {
1302 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1647 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1303 MotionNotify, &ev)) ; 1648 MotionNotify, &ev))
1649 ;
1650
1304 XQueryPointer (display->display, scrollBar.win, 1651 XQueryPointer (display->display, scrollBar.win,
1305 &unused_root, &unused_child, 1652 &unused_root, &unused_child,
1306 &unused_root_x, &unused_root_y, 1653 &unused_root_x, &unused_root_y,
1307 & (ev.xbutton.x), & (ev.xbutton.y), 1654 &ev.xbutton.x, &ev.xbutton.y,
1308 &unused_mask); 1655 &unused_mask);
1309 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1310 scrollbar_size ()); 1657 scrollbar_size ());
1311 scr_refresh (refresh_type); 1658 scr_refresh (refresh_type);
1312 refresh_limit = 0; 1659 refresh_limit = 0;
… …
1314 } 1661 }
1315 break; 1662 break;
1316 } 1663 }
1317} 1664}
1318 1665
1666#if TRANSPARENT
1319void 1667void
1320rxvt_term::rootwin_cb (XEvent &ev) 1668rxvt_term::rootwin_cb (XEvent &ev)
1321{ 1669{
1322 SET_R (this); 1670 SET_R (this);
1323 SET_LOCALE (locale); 1671 SET_LOCALE (locale);
1324 1672
1325 switch (ev.type) 1673 switch (ev.type)
1326 { 1674 {
1327 case PropertyNotify: 1675 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 /* 1676 /*
1338 * if user used some Esetroot compatible prog to set the root bg, 1677 * 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. 1678 * use the property to determine the pixmap. We use it later on.
1340 */ 1679 */
1341 if (xa[XA_XROOTPMAPID] == 0) 1680 if (xa[XA_XROOTPMAPID] == 0)
1342 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1681 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1343 1682
1344 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1683 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1345 return; 1684 return;
1346 }
1347 1685
1348 /* FALLTHROUGH */ 1686 /* FALLTHROUGH */
1349 case ReparentNotify: 1687 case ReparentNotify:
1350 if ((Options & Opt_transparent) && check_our_parents ()) 1688 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1351 if (am_transparent)
1352 want_full_refresh = 1; 1689 want_refresh = want_full_refresh = 1;
1353 break; 1690 break;
1354#endif
1355 } 1691 }
1356} 1692}
1693#endif
1357 1694
1358void 1695void
1359rxvt_term::button_press (XButtonEvent &ev) 1696rxvt_term::button_press (XButtonEvent &ev)
1360{ 1697{
1361 int reportmode = 0, clickintime; 1698 int reportmode = 0, clickintime;
1362 1699
1363 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1700 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1364 if (!bypass_keystate) 1701 if (!bypass_keystate)
1365 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1702 reportmode = !! (priv_modes & PrivMode_mouse_report);
1703
1366 /* 1704 /*
1367 * VT window processing of button press 1705 * VT window processing of button press
1368 */ 1706 */
1369 if (ev.window == TermWin.vt) 1707 if (ev.window == TermWin.vt)
1370 { 1708 {
1709#if ISO_14755
1710 // 5.4
1711 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1712 {
1713 iso14755_54 (ev.x, ev.y);
1714 return;
1715 }
1716#endif
1717
1371 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1718 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1719
1372 if (reportmode) 1720 if (reportmode)
1373 { 1721 {
1374 /* mouse report from vt window */ 1722 /* mouse report from vt window */
1375 /* save the xbutton state (for ButtonRelease) */ 1723 /* save the xbutton state (for ButtonRelease) */
1376 MEvent.state = ev.state; 1724 MEvent.state = ev.state;
… …
1405 } 1753 }
1406 else 1754 else
1407 { 1755 {
1408 if (ev.button != MEvent.button) 1756 if (ev.button != MEvent.button)
1409 MEvent.clicks = 0; 1757 MEvent.clicks = 0;
1758
1410 switch (ev.button) 1759 switch (ev.button)
1411 { 1760 {
1412 case Button1: 1761 case Button1:
1762 /* allow meta + click to select rectangular areas */
1763 /* should be done in screen.C */
1764#if ENABLE_FRILLS
1765 selection.rect = !! (ev.state & ModMetaMask);
1766#else
1767 selection.rect = false;
1768#endif
1769
1413 /* allow shift+left click to extend selection */ 1770 /* allow shift+left click to extend selection */
1414 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1771 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1415 { 1772 {
1416 if (MEvent.button == Button1 && clickintime) 1773 if (MEvent.button == Button1 && clickintime)
1417 selection_rotate (ev.x, ev.y); 1774 selection_rotate (ev.x, ev.y);
1418 else 1775 else
1419 selection_extend (ev.x, ev.y, 1); 1776 selection_extend (ev.x, ev.y, 1);
… …
1434 case Button3: 1791 case Button3:
1435 if (MEvent.button == Button3 && clickintime) 1792 if (MEvent.button == Button3 && clickintime)
1436 selection_rotate (ev.x, ev.y); 1793 selection_rotate (ev.x, ev.y);
1437 else 1794 else
1438 selection_extend (ev.x, ev.y, 1); 1795 selection_extend (ev.x, ev.y, 1);
1796
1439 MEvent.button = Button3; 1797 MEvent.button = Button3;
1440 break; 1798 break;
1441 } 1799 }
1442 } 1800 }
1801
1443 MEvent.time = ev.time; 1802 MEvent.time = ev.time;
1444 return; 1803 return;
1445 } 1804 }
1446 1805
1447 /* 1806 /*
… …
1513 upordown = 1; /* down */ 1872 upordown = 1; /* down */
1514 } 1873 }
1515 if (upordown) 1874 if (upordown)
1516 { 1875 {
1517#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1876#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1518 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1877 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1519#endif 1878#endif
1520 if (scr_page (upordown < 0 ? UP : DN, 1)) 1879 if (scr_page (upordown < 0 ? UP : DN, 1))
1521 { 1880 {
1522 if (upordown < 0) 1881 if (upordown < 0)
1523 scrollBar.setUp (); 1882 scrollBar.setUp ();
… …
1539 break; 1898 break;
1540 case R_SB_ALIGN_BOTTOM: 1899 case R_SB_ALIGN_BOTTOM:
1541 csrO = scrollBar.bot - scrollBar.top; 1900 csrO = scrollBar.bot - scrollBar.top;
1542 break; 1901 break;
1543 } 1902 }
1903
1544 if (scrollBar.style == R_SB_XTERM 1904 if (scrollBar.style == R_SB_XTERM
1545 || scrollbar_above_slider (ev.y) 1905 || scrollbar_above_slider (ev.y)
1546 || scrollbar_below_slider (ev.y)) 1906 || scrollbar_below_slider (ev.y))
1547 scr_move_to ( scrollbar_position (ev.y) - csrO, 1907 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1548 scrollbar_size ()); 1908
1549 scrollBar.setMotion (); 1909 scrollBar.setMotion ();
1550 break; 1910 break;
1551 1911
1552 case Button1: 1912 case Button1:
1553 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1913 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1577 scr_page ((ev.button == Button1 ? DN : UP), 1937 scr_page ((ev.button == Button1 ? DN : UP),
1578 (TermWin.nrow 1938 (TermWin.nrow
1579 * scrollbar_position (ev.y) 1939 * scrollbar_position (ev.y)
1580 / scrollbar_size ())); 1940 / scrollbar_size ()));
1581 } 1941 }
1942
1582 break; 1943 break;
1583 } 1944 }
1584 } 1945 }
1585 return; 1946 return;
1586 } 1947 }
… …
1598{ 1959{
1599 int reportmode = 0; 1960 int reportmode = 0;
1600 1961
1601 csrO = 0; /* reset csr Offset */ 1962 csrO = 0; /* reset csr Offset */
1602 if (!bypass_keystate) 1963 if (!bypass_keystate)
1603 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1964 reportmode = !! (priv_modes & PrivMode_mouse_report);
1604 1965
1605 if (scrollbar_isUpDn ()) 1966 if (scrollbar_isUpDn ())
1606 { 1967 {
1607 scrollBar.setIdle (); 1968 scrollBar.setIdle ();
1608 scrollbar_show (0); 1969 scrollbar_show (0);
1609#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1970#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1610 refresh_type &= ~SMOOTH_REFRESH; 1971 refresh_type &= ~SMOOTH_REFRESH;
1611#endif 1972#endif
1612
1613 } 1973 }
1974
1614#ifdef SELECTION_SCROLLING 1975#ifdef SELECTION_SCROLLING
1615 pending_scroll_selection=0; 1976 if (sel_scroll_ev.active)
1977 sel_scroll_ev.stop();
1616#endif 1978#endif
1979
1617 if (ev.window == TermWin.vt) 1980 if (ev.window == TermWin.vt)
1618 { 1981 {
1982#if ISO_14755
1983 // 5.4
1984 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1985 return;
1986#endif
1619 if (reportmode) 1987 if (reportmode)
1620 { 1988 {
1621 /* mouse report from vt window */ 1989 /* mouse report from vt window */
1622 /* don't report release of wheel "buttons" */ 1990 /* don't report release of wheel "buttons" */
1623 if (ev.button >= 4) 1991 if (ev.button >= 4)
… …
1637 MEvent.button = AnyButton; 2005 MEvent.button = AnyButton;
1638 mouse_report (ev); 2006 mouse_report (ev);
1639#endif /* MOUSE_REPORT_DOUBLECLICK */ 2007#endif /* MOUSE_REPORT_DOUBLECLICK */
1640 return; 2008 return;
1641 } 2009 }
2010
1642 /* 2011 /*
1643 * dumb hack to compensate for the failure of click-and-drag 2012 * dumb hack to compensate for the failure of click-and-drag
1644 * when overriding mouse reporting 2013 * when overriding mouse reporting
1645 */ 2014 */
1646 if (PrivateModes & PrivMode_mouse_report 2015 if (priv_modes & PrivMode_mouse_report
1647 && bypass_keystate 2016 && bypass_keystate
1648 && ev.button == Button1 && MEvent.clicks <= 1) 2017 && ev.button == Button1 && MEvent.clicks <= 1)
1649 selection_extend (ev.x, ev.y, 0); 2018 selection_extend (ev.x, ev.y, 0);
1650 2019
1651 switch (ev.button) 2020 switch (ev.button)
… …
1662 case Button5: 2031 case Button5:
1663 { 2032 {
1664 int i; 2033 int i;
1665 page_dirn v; 2034 page_dirn v;
1666 2035
1667 v = (ev.button == Button4) ? UP : DN; 2036 v = ev.button == Button4 ? UP : DN;
2037
1668 if (ev.state & ShiftMask) 2038 if (ev.state & ShiftMask)
1669 i = 1; 2039 i = 1;
1670 else if ((Options & Opt_mouseWheelScrollPage)) 2040 else if (options & Opt_mouseWheelScrollPage)
1671 i = TermWin.nrow - 1; 2041 i = TermWin.nrow - 1;
1672 else 2042 else
1673 i = 5; 2043 i = 5;
2044
1674# ifdef MOUSE_SLIP_WHEELING 2045# ifdef MOUSE_SLIP_WHEELING
1675 if (ev.state & ControlMask) 2046 if (ev.state & ControlMask)
1676 { 2047 {
1677 mouse_slip_wheel_speed += (v ? -1 : 1); 2048 mouse_slip_wheel_speed += v ? -1 : 1;
2049 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2050 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2051
2052 if (slip_wheel_ev.at < NOW)
1678 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2053 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2054
2055 slip_wheel_ev.start ();
1679 } 2056 }
2057 else
2058 {
1680# endif 2059# endif
1681# ifdef JUMP_MOUSE_WHEEL 2060# 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); 2061 scr_page (v, i);
1689 scr_refresh (SMOOTH_REFRESH); 2062 scr_refresh (SMOOTH_REFRESH);
1690 scrollbar_show (1); 2063 scrollbar_show (1);
2064# else
2065 while (i--)
2066 {
2067 scr_page (v, 1);
2068 scr_refresh (SMOOTH_REFRESH);
2069 scrollbar_show (1);
2070 }
2071# endif
2072# ifdef MOUSE_SLIP_WHEELING
1691 } 2073 }
1692# endif 2074#endif
1693
1694 } 2075 }
1695 break; 2076 break;
1696#endif 2077#endif
1697
1698 } 2078 }
1699 } 2079 }
1700#ifdef MENUBAR 2080#ifdef MENUBAR
1701 else if (isMenuBarWindow (ev.window)) 2081 else if (isMenuBarWindow (ev.window))
1702 menubar_control (ev); 2082 menubar_control (ev);
1703#endif 2083#endif
1704} 2084}
1705 2085
1706
1707#ifdef TRANSPARENT 2086#ifdef TRANSPARENT
2087#if TINTING
2088/* taken from aterm-0.4.2 */
2089
2090typedef uint32_t RUINT32T;
2091
2092void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2093{
2094 int sh_r, sh_g, sh_b;
2095 RUINT32T mask_r, mask_g, mask_b;
2096 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2097 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2098 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2099 int i;
2100
2101 Visual* visual = display->visual;
2102
2103 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2104
2105 /* for convenience */
2106 mask_r = visual->red_mask;
2107 mask_g = visual->green_mask;
2108 mask_b = visual->blue_mask;
2109
2110 /* boring lookup table pre-initialization */
2111 switch (srcImage->bits_per_pixel) {
2112 case 15:
2113 if ((mask_r != 0x7c00) ||
2114 (mask_g != 0x03e0) ||
2115 (mask_b != 0x001f))
2116 return;
2117 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2118 lookup_r = lookup;
2119 lookup_g = lookup+32;
2120 lookup_b = lookup+32+32;
2121 sh_r = 10;
2122 sh_g = 5;
2123 sh_b = 0;
2124 break;
2125 case 16:
2126 if ((mask_r != 0xf800) ||
2127 (mask_g != 0x07e0) ||
2128 (mask_b != 0x001f))
2129 return;
2130 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2131 lookup_r = lookup;
2132 lookup_g = lookup+32;
2133 lookup_b = lookup+32+64;
2134 sh_r = 11;
2135 sh_g = 5;
2136 sh_b = 0;
2137 break;
2138 case 24:
2139 if ((mask_r != 0xff0000) ||
2140 (mask_g != 0x00ff00) ||
2141 (mask_b != 0x0000ff))
2142 return;
2143 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2144 lookup_r = lookup;
2145 lookup_g = lookup+256;
2146 lookup_b = lookup+256+256;
2147 sh_r = 16;
2148 sh_g = 8;
2149 sh_b = 0;
2150 break;
2151 case 32:
2152 if ((mask_r != 0xff0000) ||
2153 (mask_g != 0x00ff00) ||
2154 (mask_b != 0x0000ff))
2155 return;
2156 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2157 lookup_r = lookup;
2158 lookup_g = lookup+256;
2159 lookup_b = lookup+256+256;
2160 sh_r = 16;
2161 sh_g = 8;
2162 sh_b = 0;
2163 break;
2164 default:
2165 return; /* we do not support this color depth */
2166 }
2167
2168 /* prepare limits for color transformation (each channel is handled separately) */
2169 if (shade < 0) {
2170 shade = -shade;
2171 if (shade < 0) shade = 0;
2172 if (shade > 100) shade = 100;
2173
2174 lower_lim_r = 65535-rm;
2175 lower_lim_g = 65535-gm;
2176 lower_lim_b = 65535-bm;
2177
2178 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2179 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2180 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2181
2182 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2183 } else {
2184 if (shade < 0) shade = 0;
2185 if (shade > 100) shade = 100;
2186
2187 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2188
2189 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2190 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2191 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2192 }
2193
2194 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2195 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2196 {
2197 unsigned int tmp;
2198
2199 tmp = lower_lim_r;
2200 lower_lim_r = lower_lim_b;
2201 lower_lim_b = tmp;
2202
2203 tmp = upper_lim_r;
2204 upper_lim_r = upper_lim_b;
2205 upper_lim_b = tmp;
2206 }
2207
2208 /* fill our lookup tables */
2209 for (i = 0; i <= mask_r>>sh_r; i++)
2210 {
2211 RUINT32T tmp;
2212 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2213 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2214 lookup_r[i] = (tmp/65535)<<sh_r;
2215 }
2216 for (i = 0; i <= mask_g>>sh_g; i++)
2217 {
2218 RUINT32T tmp;
2219 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2220 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2221 lookup_g[i] = (tmp/65535)<<sh_g;
2222 }
2223 for (i = 0; i <= mask_b>>sh_b; i++)
2224 {
2225 RUINT32T tmp;
2226 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2227 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2228 lookup_b[i] = (tmp/65535)<<sh_b;
2229 }
2230
2231 /* apply table to input image (replacing colors by newly calculated ones) */
2232 switch (srcImage->bits_per_pixel)
2233 {
2234 case 15:
2235 {
2236 unsigned short *p1, *pf, *p, *pl;
2237 p1 = (unsigned short *) srcImage->data;
2238 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2239 while (p1 < pf)
2240 {
2241 p = p1;
2242 pl = p1 + srcImage->width;
2243 for (; p < pl; p++)
2244 {
2245 *p = lookup_r[(*p & 0x7c00)>>10] |
2246 lookup_g[(*p & 0x03e0)>> 5] |
2247 lookup_b[(*p & 0x001f)];
2248 }
2249 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2250 }
2251 break;
2252 }
2253 case 16:
2254 {
2255 unsigned short *p1, *pf, *p, *pl;
2256 p1 = (unsigned short *) srcImage->data;
2257 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2258 while (p1 < pf)
2259 {
2260 p = p1;
2261 pl = p1 + srcImage->width;
2262 for (; p < pl; p++)
2263 {
2264 *p = lookup_r[(*p & 0xf800)>>11] |
2265 lookup_g[(*p & 0x07e0)>> 5] |
2266 lookup_b[(*p & 0x001f)];
2267 }
2268 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2269 }
2270 break;
2271 }
2272 case 24:
2273 {
2274 unsigned char *p1, *pf, *p, *pl;
2275 p1 = (unsigned char *) srcImage->data;
2276 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2277 while (p1 < pf)
2278 {
2279 p = p1;
2280 pl = p1 + srcImage->width * 3;
2281 for (; p < pl; p += 3)
2282 {
2283 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2284 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2285 p[2] = lookup_r[(p[2] & 0x0000ff)];
2286 }
2287 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2288 }
2289 break;
2290 }
2291 case 32:
2292 {
2293 RUINT32T *p1, *pf, *p, *pl;
2294 p1 = (RUINT32T *) srcImage->data;
2295 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2296
2297 while (p1 < pf)
2298 {
2299 p = p1;
2300 pl = p1 + srcImage->width;
2301 for (; p < pl; p++)
2302 {
2303 *p = lookup_r[(*p & 0xff0000)>>16] |
2304 lookup_g[(*p & 0x00ff00)>> 8] |
2305 lookup_b[(*p & 0x0000ff)] |
2306 (*p & ~0xffffff);
2307 }
2308 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2309 }
2310 break;
2311 }
2312 }
2313
2314 free (lookup);
2315}
2316#endif
2317
1708/* 2318/*
1709 * Check our parents are still who we think they are. 2319 * Check our parents are still who we think they are.
1710 * Do transparency updates if required 2320 * Do transparency updates if required
1711 */ 2321 */
1712int 2322int
1713rxvt_term::check_our_parents () 2323rxvt_term::check_our_parents ()
1714{ 2324{
1715 int i, pchanged, aformat, have_pixmap, rootdepth; 2325 int i, pchanged, aformat, have_pixmap, rootdepth;
1716 unsigned long nitems, bytes_after; 2326 unsigned long nitems, bytes_after;
1717 Atom atype; 2327 Atom atype;
1718 unsigned char *prop = NULL; 2328 unsigned char *prop = NULL;
1719 Window root, oldp, *list; 2329 Window root, oldp, *list;
1720 Pixmap rootpixmap = None; 2330 Pixmap rootpixmap = None;
1721 XWindowAttributes wattr, wrootattr; 2331 XWindowAttributes wattr, wrootattr;
1722 2332
1723 pchanged = 0; 2333 pchanged = 0;
1724 2334
1725 if (! (Options & Opt_transparent)) 2335 if (!(options & Opt_transparent))
1726 return pchanged; /* Don't try any more */ 2336 return pchanged; /* Don't try any more */
1727 2337
1728 XGetWindowAttributes (display->display, display->root, &wrootattr); 2338 XGetWindowAttributes (display->display, display->root, &wrootattr);
1729 rootdepth = wrootattr.depth; 2339 rootdepth = wrootattr.depth;
1730 2340
1731 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2341 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2342
1732 if (rootdepth != wattr.depth) 2343 if (rootdepth != wattr.depth)
1733 { 2344 {
1734 if (am_transparent) 2345 if (am_transparent)
1735 { 2346 {
1736 pchanged = 1; 2347 pchanged = 1;
1737 XSetWindowBackground (display->display, TermWin.vt, 2348 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1738 PixColors[Color_bg]);
1739 am_transparent = am_pixmap_trans = 0; 2349 am_transparent = am_pixmap_trans = 0;
1740 } 2350 }
2351
1741 return pchanged; /* Don't try any more */ 2352 return pchanged; /* Don't try any more */
1742 } 2353 }
1743 2354
1744 /* Get all X ops out of the queue so that our information is up-to-date. */ 2355 /* Get all X ops out of the queue so that our information is up-to-date. */
1745 XSync (display->display, False); 2356 XSync (display->display, False);
… …
1747 /* 2358 /*
1748 * Make the frame window set by the window manager have 2359 * Make the frame window set by the window manager have
1749 * the root background. Some window managers put multiple nested frame 2360 * the root background. Some window managers put multiple nested frame
1750 * windows for each client, so we have to take care about that. 2361 * windows for each client, so we have to take care about that.
1751 */ 2362 */
1752 i = (xa[XA_XROOTPMAPID] != 0 2363 i = (xa[XA_XROOTPMAPID]
1753 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2364 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1754 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2365 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1755 &nitems, &bytes_after, &prop) == Success)); 2366 &nitems, &bytes_after, &prop) == Success);
2367
1756 if (!i || prop == NULL) 2368 if (!i || prop == NULL)
2369 i = (xa[XA_XSETROOTID]
2370 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2371 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2372 &nitems, &bytes_after, &prop) == Success);
2373
2374 if (!i || prop == NULL
2375#if TINTING
2376 || !rs[Rs_color + Color_tint]
2377#endif
2378 )
1757 have_pixmap = 0; 2379 have_pixmap = 0;
1758 else 2380 else
1759 { 2381 {
1760 have_pixmap = 1; 2382 have_pixmap = 1;
1761 rootpixmap = * ((Pixmap *)prop); 2383 rootpixmap = *(Pixmap *)prop;
1762 XFree (prop); 2384 XFree (prop);
1763 } 2385 }
2386
1764 if (have_pixmap) 2387 if (have_pixmap)
1765 { 2388 {
1766 /* 2389 /*
1767 * Copy display->root pixmap transparency 2390 * Copy display->root pixmap transparency
1768 */ 2391 */
… …
1772 XImage *image; 2395 XImage *image;
1773 GC gc; 2396 GC gc;
1774 XGCValues gcvalue; 2397 XGCValues gcvalue;
1775 2398
1776 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2399 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
1777 0, 0, &sx, &sy, &cr); 2400 0, 0, &sx, &sy, &cr);
1778 nw = (unsigned int)szHint.width; 2401 nw = (unsigned int)szHint.width;
1779 nh = (unsigned int)szHint.height; 2402 nh = (unsigned int)szHint.height;
1780 nx = ny = 0; 2403 nx = ny = 0;
1781 2404
1782 if (sx < 0) 2405 if (sx < 0)
… …
1794 } 2417 }
1795 2418
1796 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2419 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
1797 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2420 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
1798 allowedxerror = -1; 2421 allowedxerror = -1;
1799 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2422 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1800 ZPixmap); 2423
1801 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2424 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1802 /* XXX: may need a delay here? */ 2425 /* XXX: may need a delay here? */
1803 allowedxerror = 0; 2426 allowedxerror = 0;
2427
1804 if (image == NULL) 2428 if (image == NULL)
1805 { 2429 {
1806 if (am_transparent && am_pixmap_trans) 2430 if (am_transparent && am_pixmap_trans)
1807 { 2431 {
1808 pchanged = 1; 2432 pchanged = 1;
… …
1810 { 2434 {
1811 XFreePixmap (display->display, TermWin.pixmap); 2435 XFreePixmap (display->display, TermWin.pixmap);
1812 TermWin.pixmap = None; 2436 TermWin.pixmap = None;
1813 } 2437 }
1814 } 2438 }
2439
1815 am_pixmap_trans = 0; 2440 am_pixmap_trans = 0;
1816 } 2441 }
1817 else 2442 else
1818 { 2443 {
1819 if (TermWin.pixmap != None) 2444 if (TermWin.pixmap != None)
1820 XFreePixmap (display->display, TermWin.pixmap); 2445 XFreePixmap (display->display, TermWin.pixmap);
2446
2447#if TINTING
2448 if (ISSET_PIXCOLOR (Color_tint))
2449 {
2450 unsigned short rm, gm, bm;
2451 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2452
2453 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2454
2455 ShadeXImage (display, image, shade, rm, gm, bm);
2456 }
2457#endif
2458
1821 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2459 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
1822 (unsigned int)szHint.width,
1823 (unsigned int)szHint.height, 2460 szHint.width, szHint.height, image->depth);
1824 (unsigned int)image->depth);
1825 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2461 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
1826 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2462 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
1827 nx, ny, (unsigned int)image->width,
1828 (unsigned int)image->height); 2463 nx, ny, image->width, image->height);
1829 XFreeGC (display->display, gc); 2464 XFreeGC (display->display, gc);
1830 XDestroyImage (image); 2465 XDestroyImage (image);
1831 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2466 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
1832 TermWin.pixmap); 2467 XClearWindow (display->display, TermWin.parent[0]);
2468
1833 if (!am_transparent || !am_pixmap_trans) 2469 if (!am_transparent || !am_pixmap_trans)
1834 pchanged = 1; 2470 pchanged = 1;
2471
1835 am_transparent = am_pixmap_trans = 1; 2472 am_transparent = am_pixmap_trans = 1;
1836 } 2473 }
1837 } 2474 }
1838 2475
1839 if (!am_pixmap_trans) 2476 if (!am_pixmap_trans)
1840 { 2477 {
1841 unsigned int n; 2478 unsigned int n;
1842 /* 2479 /*
1843 * InheritPixmap transparency 2480 * InheritPixmap transparency
1844 */ 2481 */
1845 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
1846 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2482 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1847 i++)
1848 { 2483 {
1849 oldp = TermWin.parent[i]; 2484 oldp = TermWin.parent[i];
1850 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2485 XQueryTree (display->display, TermWin.parent[i - 1], &root,
1851 &TermWin.parent[i], &list, &n); 2486 &TermWin.parent[i], &list, &n);
1852 XFree (list); 2487 XFree (list);
1853 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2488
1854 if (TermWin.parent[i] == display->root) 2489 if (TermWin.parent[i] == display->root)
1855 { 2490 {
1856 if (oldp != None) 2491 if (oldp != None)
1857 pchanged = 1; 2492 pchanged = 1;
2493
1858 break; 2494 break;
1859 } 2495 }
2496
1860 if (oldp != TermWin.parent[i]) 2497 if (oldp != TermWin.parent[i])
1861 pchanged = 1; 2498 pchanged = 1;
1862 } 2499 }
1863 2500
1864 n = 0; 2501 n = 0;
… …
1866 if (pchanged) 2503 if (pchanged)
1867 { 2504 {
1868 for (; n < (unsigned int)i; n++) 2505 for (; n < (unsigned int)i; n++)
1869 { 2506 {
1870 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2507 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) 2508 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
1873 { 2509 {
1874 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2510 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
1875 break; 2511 break;
1876 } 2512 }
1877 } 2513 }
1878 } 2514 }
1879 2515
1880 if (n > (int) (sizeof (TermWin.parent) 2516 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
1881 / sizeof (TermWin.parent[0])))
1882 { 2517 {
1883 D_X ((stderr, "InheritPixmap Turning off"));
1884 XSetWindowBackground (display->display, TermWin.parent[0], 2518 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
1885 PixColors[Color_fg]);
1886 XSetWindowBackground (display->display, TermWin.vt, 2519 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1887 PixColors[Color_bg]);
1888 am_transparent = 0; 2520 am_transparent = 0;
1889 /* XXX: also turn off Opt_transparent? */ 2521 /* XXX: also turn off Opt_transparent? */
1890 } 2522 }
1891 else 2523 else
1892 { 2524 {
2525#if WAIT_FOR_WM
1893 /* wait (an arbitrary period) for the WM to do its thing 2526 /* wait (an arbitrary period) for the WM to do its thing
1894 * needed for fvwm2.2.2 (and before?) */ 2527 * 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); 2528 sleep (1);
1903# endif 2529#endif
1904 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
1905 for (n = 0; n < (unsigned int)i; n++) 2530 for (n = 0; n < (unsigned int)i; n++)
2531 {
1906 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2532 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
1907 ParentRelative); 2533 XClearWindow (display->display, TermWin.parent[n]);
2534 }
2535
1908 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2536 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
1909 ParentRelative);
1910 am_transparent = 1; 2537 am_transparent = 1;
1911 } 2538 }
1912 2539
1913 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2540 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
1914 TermWin.parent[i] = None; 2541 TermWin.parent[i] = None;
1915 } 2542 }
2543
2544 if (scrollBar.win)
2545 {
2546 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2547 scrollBar.setIdle ();
2548 scrollbar_show (0);
2549 }
2550
1916 return pchanged; 2551 return pchanged;
1917} 2552}
1918#endif 2553#endif
1919 2554
1920/*}}} */ 2555/*}}} */
… …
1935 } 2570 }
1936 2571
1937 if (ch == NOCHAR) // TODO: improve 2572 if (ch == NOCHAR) // TODO: improve
1938 break; 2573 break;
1939 2574
1940 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2575 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2576 {
2577 if (!seen_input)
1941 { 2578 {
2579 seen_input = 1;
2580 // many badly-written programs (e.g. jed) contain a race condition:
2581 // they first read the screensize and then install a SIGWINCH handler.
2582 // some window managers resize the window early, and these programs
2583 // then sometimes get the size wrong.
2584 // unfortunately other programs are even more buggy and dislike
2585 // being sent SIGWINCH, so only do it when we were in fact being
2586 // resized.
2587 if (seen_resize)
2588 kill (-cmd_pid, SIGWINCH);
2589 }
2590
1942 /* Read a text string from the input buffer */ 2591 /* Read a text string from the input buffer */
1943 unicode_t buf[UBUFSIZ]; 2592 unicode_t buf[UBUFSIZ];
1944 bool refreshnow = false; 2593 bool refreshnow = false;
1945 int nlines = 0; 2594 int nlines = 0;
1946 unicode_t *str = buf; 2595 unicode_t *str = buf;
1947 2596
1948 *str++ = ch;
1949
1950 for (;;) 2597 for (;;)
1951 { 2598 {
1952 seq_begin = cmdbuf_ptr;
1953 ch = next_char ();
1954
1955 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2599 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
1956 break; 2600 break;
1957 2601
1958 *str++ = ch; 2602 *str++ = ch;
1959 2603
1960 if (ch == '\n') 2604 if (ch == C0_LF)
1961 { 2605 {
1962 nlines++; 2606 nlines++;
1963 refresh_count++; 2607 refresh_count++;
1964 2608
1965 if (! (Options & Opt_jumpScroll) 2609 if (!(options & Opt_jumpScroll)
1966 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2610 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
1967 { 2611 {
1968 refreshnow = true; 2612 refreshnow = true;
1969 flag = true;
1970 ch = NOCHAR; 2613 ch = NOCHAR;
1971 break; 2614 break;
1972 } 2615 }
1973 2616
1974 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2617 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
1975 if (nlines >= TermWin.nrow - 1) 2618 if (nlines >= TermWin.nrow - 1)
1976 { 2619 {
1977 scr_add_lines (buf, nlines, str - buf); 2620 scr_add_lines (buf, nlines, str - buf);
1978 nlines = 0; 2621 nlines = 0;
1979 str = buf; 2622 str = buf;
… …
1983 if (str >= buf + UBUFSIZ) 2626 if (str >= buf + UBUFSIZ)
1984 { 2627 {
1985 ch = NOCHAR; 2628 ch = NOCHAR;
1986 break; 2629 break;
1987 } 2630 }
2631
2632 seq_begin = cmdbuf_ptr;
2633 ch = next_char ();
1988 } 2634 }
1989 2635
1990 scr_add_lines (buf, nlines, str - buf); 2636 scr_add_lines (buf, nlines, str - buf);
1991 2637
1992 /* 2638 /*
1993 * If there have been a lot of new lines, then update the screen 2639 * 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. 2640 * 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 2641 * the number of pages between refreshes is refresh_limit, which
1996 * is incremented here because we must be doing flat-out scrolling. 2642 * 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 */ 2643 */
2001 if (refreshnow) 2644 if (refreshnow)
2002 { 2645 {
2003 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2646 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2004 refresh_limit++; 2647 refresh_limit++;
2005 2648 else
2649 {
2650 flag = true;
2006 scr_refresh (refresh_type); 2651 scr_refresh (refresh_type);
2652 }
2007 } 2653 }
2008 2654
2009 } 2655 }
2010 else 2656 else
2011 { 2657 {
… …
2025 } 2671 }
2026 2672
2027 return flag; 2673 return flag;
2028} 2674}
2029 2675
2676// read the next octet
2677unicode_t
2678rxvt_term::next_octet ()
2679{
2680 return cmdbuf_ptr < cmdbuf_endp
2681 ? *cmdbuf_ptr++
2682 : NOCHAR;
2683}
2684
2030// read the next character 2685// read the next character
2031unicode_t 2686unicode_t
2032rxvt_term::next_char () 2687rxvt_term::next_char ()
2033{ 2688{
2034 while (cmdbuf_ptr < cmdbuf_endp) 2689 while (cmdbuf_ptr < cmdbuf_endp)
… …
2065 */ 2720 */
2066unicode_t 2721unicode_t
2067rxvt_term::cmd_getc () 2722rxvt_term::cmd_getc ()
2068{ 2723{
2069 unicode_t c = next_char (); 2724 unicode_t c = next_char ();
2725
2726 if (c == NOCHAR)
2727 throw out_of_input;
2728
2729 return c;
2730}
2731
2732unicode_t
2733rxvt_term::cmd_get8 ()
2734{
2735 unicode_t c = next_octet ();
2070 2736
2071 if (c == NOCHAR) 2737 if (c == NOCHAR)
2072 throw out_of_input; 2738 throw out_of_input;
2073 2739
2074 return c; 2740 return c;
… …
2156/*}}} */ 2822/*}}} */
2157 2823
2158/* *INDENT-OFF* */ 2824/* *INDENT-OFF* */
2159enum { 2825enum {
2160 C1_40 = 0x40, 2826 C1_40 = 0x40,
2161 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2827 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, 2828 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, 2829 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 2830 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2165}; 2831};
2166/* *INDENT-ON* */ 2832/* *INDENT-ON* */
2167 2833
2168/*{{{ process non-printing single characters */ 2834/*{{{ process non-printing single characters */
2169void 2835void
… …
2174 case C0_ESC: 2840 case C0_ESC:
2175 process_escape_seq (); 2841 process_escape_seq ();
2176 break; 2842 break;
2177 case C0_ENQ: /* terminal Status */ 2843 case C0_ENQ: /* terminal Status */
2178 if (rs[Rs_answerbackstring]) 2844 if (rs[Rs_answerbackstring])
2179 tt_write (
2180 (const unsigned char *)rs[Rs_answerbackstring], 2845 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2181 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2846 (unsigned int)strlen (rs[Rs_answerbackstring]));
2182 else 2847 else
2183 tt_write ((unsigned char *)VT100_ANS, 2848 tt_write ((unsigned char *)VT100_ANS,
2184 (unsigned int)STRLEN (VT100_ANS)); 2849 (unsigned int)strlen (VT100_ANS));
2185 break; 2850 break;
2186 case C0_BEL: /* bell */ 2851 case C0_BEL: /* bell */
2187 scr_bell (); 2852 scr_bell ();
2188 break; 2853 break;
2189 case C0_BS: /* backspace */ 2854 case C0_BS: /* backspace */
… …
2205 break; 2870 break;
2206 case C0_SI: /* shift in - acs */ 2871 case C0_SI: /* shift in - acs */
2207 scr_charset_choose (0); 2872 scr_charset_choose (0);
2208 break; 2873 break;
2209 2874
2875#ifdef EIGHT_BIT_CONTROLS
2210 // 8-bit controls 2876 // 8-bit controls
2211 case 0x90: /* DCS */ 2877 case 0x90: /* DCS */
2212 process_dcs_seq (); 2878 process_dcs_seq ();
2213 break; 2879 break;
2214 case 0x9b: /* CSI */ 2880 case 0x9b: /* CSI */
2215 process_csi_seq (); 2881 process_csi_seq ();
2216 break; 2882 break;
2217 case 0x9d: /* CSI */ 2883 case 0x9d: /* CSI */
2218 process_osc_seq (); 2884 process_osc_seq ();
2219 break; 2885 break;
2886#endif
2220 } 2887 }
2221} 2888}
2222/*}}} */ 2889/*}}} */
2223 2890
2224 2891
… …
2286void 2953void
2287rxvt_term::process_escape_seq () 2954rxvt_term::process_escape_seq ()
2288{ 2955{
2289 unicode_t ch = cmd_getc (); 2956 unicode_t ch = cmd_getc ();
2290 2957
2291 if (PrivateModes & PrivMode_vt52) 2958 if (priv_modes & PrivMode_vt52)
2292 { 2959 {
2293 process_escape_vt52 (ch); 2960 process_escape_vt52 (ch);
2294 return; 2961 return;
2295 } 2962 }
2296 2963
… …
2311 scr_charset_set (2, (unsigned int)cmd_getc ()); 2978 scr_charset_set (2, (unsigned int)cmd_getc ());
2312 break; 2979 break;
2313 case '+': 2980 case '+':
2314 scr_charset_set (3, (unsigned int)cmd_getc ()); 2981 scr_charset_set (3, (unsigned int)cmd_getc ());
2315 break; 2982 break;
2316#ifndef NO_FRILLS 2983#if ENABLE_FRILLS
2317 case '6': 2984 case '6':
2318 scr_backindex (); 2985 scr_backindex ();
2319 break; 2986 break;
2320#endif 2987#endif
2321 case '7': 2988 case '7':
2322 scr_cursor (SAVE); 2989 scr_cursor (SAVE);
2323 break; 2990 break;
2324 case '8': 2991 case '8':
2325 scr_cursor (RESTORE); 2992 scr_cursor (RESTORE);
2326 break; 2993 break;
2327#ifndef NO_FRILLS 2994#if ENABLE_FRILLS
2328 case '9': 2995 case '9':
2329 scr_forwardindex (); 2996 scr_forwardindex ();
2330 break; 2997 break;
2331#endif 2998#endif
2332 case '=': 2999 case '=':
… …
2342 break; 3009 break;
2343 3010
2344 /* 8.3.87: NEXT LINE */ 3011 /* 8.3.87: NEXT LINE */
2345 case C1_NEL: /* ESC E */ 3012 case C1_NEL: /* ESC E */
2346 { 3013 {
2347 unicode_t nlcr[] = { L'\n', L'\r' }; 3014 unicode_t nlcr[] = { C0_LF, C0_CR };
2348 scr_add_lines (nlcr, 1, 2); 3015 scr_add_lines (nlcr, 1, 2);
2349 } 3016 }
2350 break; 3017 break;
2351 3018
2352 /* kidnapped escape sequence: Should be 8.3.48 */ 3019 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2363 case C1_RI: /* ESC M */ 3030 case C1_RI: /* ESC M */
2364 scr_index (DN); 3031 scr_index (DN);
2365 break; 3032 break;
2366 3033
2367 /* 8.3.142: SINGLE-SHIFT TWO */ 3034 /* 8.3.142: SINGLE-SHIFT TWO */
2368 /*case C1_SS2: scr_single_shift (2); break; */ 3035 /*case C1_SS2: scr_single_shift (2); break; */
2369 3036
2370 /* 8.3.143: SINGLE-SHIFT THREE */ 3037 /* 8.3.143: SINGLE-SHIFT THREE */
2371 /*case C1_SS3: scr_single_shift (3); break; */ 3038 /*case C1_SS3: scr_single_shift (3); break; */
2372 3039
2373 /* 8.3.27: DEVICE CONTROL STRING */ 3040 /* 8.3.27: DEVICE CONTROL STRING */
2374 case C1_DCS: /* ESC P */ 3041 case C1_DCS: /* ESC P */
2375 process_dcs_seq (); 3042 process_dcs_seq ();
2376 break; 3043 break;
… …
2391 process_osc_seq (); 3058 process_osc_seq ();
2392 break; 3059 break;
2393 3060
2394 /* 8.3.106: RESET TO INITIAL STATE */ 3061 /* 8.3.106: RESET TO INITIAL STATE */
2395 case 'c': 3062 case 'c':
3063 mbstate.reset ();
2396 scr_poweron (); 3064 scr_poweron ();
2397 scrollbar_show (1); 3065 scrollbar_show (1);
2398 break; 3066 break;
2399 3067
2400 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3068 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2412 3080
2413/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3081/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2414/* *INDENT-OFF* */ 3082/* *INDENT-OFF* */
2415enum { 3083enum {
2416 CSI_ICH = 0x40, 3084 CSI_ICH = 0x40,
2417 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3085 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 , 3086 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, 3087 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, 3088 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, 3089 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, 3090 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, */ 3105 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, [, \, ], ^, _, */ 3106 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, */ 3107 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, */ 3108 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, */ 3109 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, {, |, }, ~, */ 3110 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2443 }; 3111 };
2444/* *INDENT-ON* */ 3112/* *INDENT-ON* */
2445 3113
2446void 3114void
2447rxvt_term::process_csi_seq () 3115rxvt_term::process_csi_seq ()
… …
2630 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3298 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2631 break; 3299 break;
2632 3300
2633 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3301 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2634 tt_write ((const unsigned char *)VT100_ANS, 3302 tt_write ((const unsigned char *)VT100_ANS,
2635 (unsigned int) (sizeof (VT100_ANS) - 1)); 3303 (unsigned int) (sizeof (VT100_ANS) - 1));
2636 break; 3304 break;
2637 3305
2638 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3306 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2639 process_sgr_mode (nargs, arg); 3307 process_sgr_mode (nargs, arg);
2640 break; 3308 break;
… …
2646 tt_printf ("\033[0n"); 3314 tt_printf ("\033[0n");
2647 break; 3315 break;
2648 case 6: /* CPR requested */ 3316 case 6: /* CPR requested */
2649 scr_report_position (); 3317 scr_report_position ();
2650 break; 3318 break;
2651#if defined (ENABLE_DISPLAY_ANSWER)
2652 case 7: /* unofficial extension */ 3319 case 7: /* unofficial extension */
3320 if (options & Opt_insecure)
2653 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3321 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2654 break; 3322 break;
2655#endif
2656 case 8: /* unofficial extension */ 3323 case 8: /* unofficial extension */
2657 xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3324 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2658 break; 3325 break;
2659 } 3326 }
2660 break; 3327 break;
2661 3328
2662 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3329 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2695 break; 3362 break;
2696 3363
2697 case CSI_RM: /* 8.3.107: RESET MODE */ 3364 case CSI_RM: /* 8.3.107: RESET MODE */
2698 if (arg[0] == 4) 3365 if (arg[0] == 4)
2699 scr_insert_mode (0); 3366 scr_insert_mode (0);
3367 else if (arg[0] == 20)
3368 priv_modes &= ~PrivMode_LFNL;
2700 break; 3369 break;
2701 3370
2702 case CSI_SM: /* 8.3.126: SET MODE */ 3371 case CSI_SM: /* 8.3.126: SET MODE */
2703 if (arg[0] == 4) 3372 if (arg[0] == 4)
2704 scr_insert_mode (1); 3373 scr_insert_mode (1);
3374 else if (arg[0] == 20)
3375 priv_modes |= PrivMode_LFNL;
2705 break; 3376 break;
2706 3377
2707 /* 3378 /*
2708 * PRIVATE USE beyond this point. All CSI_7? sequences here 3379 * PRIVATE USE beyond this point. All CSI_7? sequences here
2709 */ 3380 */
… …
2721 break; 3392 break;
2722 case CSI_75: 3393 case CSI_75:
2723 scr_cursor (RESTORE); 3394 scr_cursor (RESTORE);
2724 break; 3395 break;
2725 3396
2726#ifndef NO_FRILLS 3397#if ENABLE_FRILLS
2727 case CSI_74: 3398 case CSI_74:
2728 process_window_ops (arg, nargs); 3399 process_window_ops (arg, nargs);
2729 break; 3400 break;
2730#endif 3401#endif
2731 3402
… …
2738 break; 3409 break;
2739 } 3410 }
2740} 3411}
2741/*}}} */ 3412/*}}} */
2742 3413
2743#ifndef NO_FRILLS 3414#if ENABLE_FRILLS
2744/* ARGSUSED */ 3415/* ARGSUSED */
2745void 3416void
2746rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3417rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2747{ 3418{
2748 int x, y; 3419 int x, y;
… …
2800 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3471 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2801 break; 3472 break;
2802 case 13: /* report window position */ 3473 case 13: /* report window position */
2803 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3474 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2804 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3475 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2805 -wattr.border_width, -wattr.border_width, 3476 -wattr.border_width, -wattr.border_width,
2806 &x, &y, &wdummy); 3477 &x, &y, &wdummy);
2807 tt_printf ("\033[3;%d;%dt", x, y); 3478 tt_printf ("\033[3;%d;%dt", x, y);
2808 break; 3479 break;
2809 case 14: /* report window size (pixels) */ 3480 case 14: /* report window size (pixels) */
2810 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3481 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2811 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3482 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
… …
2814 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3485 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2815 break; 3486 break;
2816 case 19: /* report window size (chars) */ 3487 case 19: /* report window size (chars) */
2817 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3488 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
2818 break; 3489 break;
2819#if 0 /* XXX: currently disabled due to security concerns */
2820 case 20: /* report icon label */ 3490 case 20: /* report icon label */
3491 {
3492 char *s;
2821 XGetIconName (display->display, TermWin.parent[0], &s); 3493 XGetIconName (display->display, TermWin.parent[0], &s);
2822 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3494 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3495 XFree (s);
3496 }
2823 break; 3497 break;
2824 case 21: /* report window title */ 3498 case 21: /* report window title */
3499 {
3500 char *s;
2825 XFetchName (display->display, TermWin.parent[0], &s); 3501 XFetchName (display->display, TermWin.parent[0], &s);
2826 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3502 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3503 XFree (s);
3504 }
2827 break; 3505 break;
2828#endif
2829 } 3506 }
2830} 3507}
2831#endif 3508#endif
2832 3509
2833/*----------------------------------------------------------------------*/ 3510/*----------------------------------------------------------------------*/
2834/* 3511/*
2835 * get input up until STRING TERMINATOR (or BEL) 3512 * get input up until STRING TERMINATOR (or BEL)
2836 * ends_how is terminator used. returned input must be free ()d 3513 * ends_how is terminator used. returned input must be free()'d
2837 */ 3514 */
2838unsigned char * 3515unsigned char *
2839rxvt_term::get_to_st (unicode_t &ends_how) 3516rxvt_term::get_to_st (unicode_t &ends_how)
2840{ 3517{
2841 int seen_esc = 0; /* seen escape? */ 3518 unicode_t seen_esc = 0, ch;
2842 unsigned int n = 0; 3519 unsigned int n = 0;
2843 unsigned char *s; 3520 unsigned char *s;
2844 unicode_t ch;
2845 unsigned char string[STRING_MAX]; 3521 unsigned char string[STRING_MAX];
2846 3522
2847 while ((ch = cmd_getc ())) 3523 while ((ch = cmd_getc ()) != NOCHAR)
2848 { 3524 {
2849 if (ch == C0_BEL 3525 if (seen_esc)
2850 || ch == CHAR_ST 3526 {
2851 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3527 if (ch == 0x5c) /* 7bit ST */
2852 break; 3528 break;
2853 3529 else
3530 return NULL;
3531 }
2854 if (ch == C0_ESC) 3532 else if (ch == C0_ESC)
2855 { 3533 {
2856 seen_esc = 1; 3534 seen_esc = 1;
2857 continue; 3535 continue;
2858 } 3536 }
2859 else if (ch == '\t') 3537 else if (ch == C0_BEL || ch == CHAR_ST)
2860 ch = ' '; /* translate '\t' to space */ 3538 break;
2861 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3539 else if (ch < 0x20)
2862 return NULL; /* other control character - exit */ 3540 return NULL; /* other control character - exit */
2863 3541
3542 seen_esc = 0;
3543
2864 if (n < sizeof (string) - 1) 3544 if (n >= sizeof (string) - 1)
3545 // stop at some sane length
3546 return NULL;
3547
3548 if (ch == C0_SYN)
3549 string[n++] = cmd_get8 ();
3550 else
2865 string[n++] = ch; 3551 string[n++] = ch;
2866
2867 seen_esc = 0;
2868 } 3552 }
2869 3553
2870 string[n++] = '\0'; 3554 string[n++] = '\0';
2871 3555
2872 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3556 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2873 return NULL; 3557 return NULL;
2874 3558
2875 ends_how = (ch == 0x5c ? C0_ESC : ch); 3559 ends_how = (ch == 0x5c ? C0_ESC : ch);
2876 STRNCPY (s, string, n); 3560 strncpy (s, string, n);
2877 return s; 3561 return s;
2878} 3562}
2879 3563
2880/*----------------------------------------------------------------------*/ 3564/*----------------------------------------------------------------------*/
2881/* 3565/*
… …
2915 { 3599 {
2916 unsigned char *s = get_to_st (eh); 3600 unsigned char *s = get_to_st (eh);
2917 3601
2918 if (s) 3602 if (s)
2919 { 3603 {
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); 3604 process_xterm_seq (arg, (char *)s, eh);
2932
2933 free (s); 3605 free (s);
2934 } 3606 }
2935 } 3607 }
2936} 3608}
3609
3610void
3611rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3612{
3613 if (str[0] == '?' && !str[1])
3614 {
3615 unsigned short r, g, b;
3616 pix_colors_focused[color].get (display, r, g, b);
3617 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3618 }
3619 else
3620 set_window_color (color, str);
3621}
3622
2937/* 3623/*
2938 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3624 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
2939 * 0 = change iconName/title 3625 * 0 = change iconName/title
2940 * 1 = change iconName 3626 * 1 = change iconName
2941 * 2 = change title 3627 * 2 = change title
2942 * 4 = change color 3628 * 4 = change color
3629 * 10 = change fg color
3630 * 11 = change bg color
2943 * 12 = change text color 3631 * 12 = change text color
2944 * 13 = change mouse foreground color 3632 * 13 = change mouse foreground color
2945 * 17 = change highlight character colour 3633 * 17 = change highlight character colour
2946 * 18 = change bold character color 3634 * 18 = change bold character color
2947 * 19 = change underlined character color 3635 * 19 = change underlined character color
2948 * 46 = change logfile (not implemented) 3636 * 46 = change logfile (not implemented)
2949 * 50 = change font 3637 * 50 = change font
2950 * 3638 *
2951 * rxvt extensions: 3639 * rxvt extensions:
2952 * 10 = menu (may change in future)
2953 * 20 = bg pixmap 3640 * 20 = bg pixmap
2954 * 39 = change default fg color 3641 * 39 = change default fg color
2955 * 49 = change default bg color 3642 * 49 = change default bg color
2956 * 55 = dump scrollback buffer and all of screen 3643 * 55 = dump scrollback buffer and all of screen
2957 * 701 = change locale 3644 * 701 = change locale
2958 * 702 = find font 3645 * 702 = find font
3646 * 703 = menu
2959 */ 3647 */
2960void 3648void
2961rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3649rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
2962{ 3650{
2963 int changed = 0; 3651 int changed = 0;
2964 int color; 3652 int color;
2965 char *buf, *name; 3653 char *buf, *name;
3654 bool query = str[0] == '?' && !str[1];
3655 int saveop = op;
2966 3656
2967 assert (str != NULL); 3657 assert (str != NULL);
2968 switch (op) 3658 switch (op)
2969 { 3659 {
2970 case XTerm_name: 3660 case XTerm_name:
… …
2974 set_icon_name (str); 3664 set_icon_name (str);
2975 break; 3665 break;
2976 case XTerm_title: 3666 case XTerm_title:
2977 set_title (str); 3667 set_title (str);
2978 break; 3668 break;
3669 case XTerm_property:
3670 if (str[0] == '?')
3671 {
3672 Atom prop = XInternAtom (display->display, str + 1, True);
3673 Atom actual_type;
3674 int actual_format;
3675 unsigned long nitems;
3676 unsigned long bytes_after;
3677 unsigned char *value = 0;
3678 const char *str = "";
3679
3680 if (prop
3681 && XGetWindowProperty (display->display, TermWin.parent[0],
3682 prop, 0, 1<<16, 0, AnyPropertyType,
3683 &actual_type, &actual_format,
3684 &nitems, &bytes_after, &value) == Success
3685 && actual_type != None
3686 && actual_format == 8)
3687 str = (const char *)(value);
3688
3689 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3690
3691 XFree (value);
3692 }
3693 else
3694 {
3695 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3696
3697 if (eq)
3698 {
3699 *eq = 0;
3700 XChangeProperty (display->display, TermWin.parent[0],
3701 display->atom (str), XA_STRING, 8,
3702 PropModeReplace, (unsigned char *)eq + 1,
3703 strlen (eq + 1));
3704 }
3705 else
3706 XDeleteProperty (display->display, TermWin.parent[0],
3707 display->atom (str));
3708 }
3709 break;
3710
2979 case XTerm_Color: 3711 case XTerm_Color:
2980 for (buf = (char *)str; buf && *buf;) 3712 for (buf = (char *)str; buf && *buf;)
2981 { 3713 {
2982 if ((name = STRCHR (buf, ';')) == NULL) 3714 if ((name = strchr (buf, ';')) == NULL)
2983 break; 3715 break;
2984 3716
2985 *name++ = '\0'; 3717 *name++ = '\0';
2986 color = atoi (buf); 3718 color = atoi (buf);
2987 3719
2988 if (color < 0 || color >= TOTAL_COLORS) 3720 if (color < 0 || color >= TOTAL_COLORS)
2989 break; 3721 break;
2990 3722
2991 if ((buf = STRCHR (name, ';')) != NULL) 3723 if ((buf = strchr (name, ';')) != NULL)
2992 *buf++ = '\0'; 3724 *buf++ = '\0';
2993 3725
3726 if (name[0] == '?' && !name[1])
3727 {
3728 unsigned short r, g, b;
3729 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3730 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3731 }
3732 else
2994 set_window_color (color + minCOLOR, name); 3733 set_window_color (color + minCOLOR, name);
2995 } 3734 }
3735 break;
3736 case XTerm_Color00:
3737 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3738 break;
3739 case XTerm_Color01:
3740 process_color_seq (XTerm_Color00, Color_bg, str, resp);
2996 break; 3741 break;
2997#ifndef NO_CURSORCOLOR 3742#ifndef NO_CURSORCOLOR
2998 case XTerm_Color_cursor: 3743 case XTerm_Color_cursor:
2999 set_window_color (Color_cursor, str); 3744 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3000 break; 3745 break;
3001#endif 3746#endif
3002 case XTerm_Color_pointer: 3747 case XTerm_Color_pointer_fg:
3003 set_window_color (Color_pointer, str); 3748 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3749 break;
3750 case XTerm_Color_pointer_bg:
3751 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3004 break; 3752 break;
3005#ifndef NO_BOLD_UNDERLINE_REVERSE 3753#ifndef NO_BOLD_UNDERLINE_REVERSE
3006 case XTerm_Color_BD: 3754 case XTerm_Color_BD:
3007 set_window_color (Color_BD, str); 3755 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3756 break;
3757 case XTerm_Color_IT:
3758 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3008 break; 3759 break;
3009 case XTerm_Color_UL: 3760 case XTerm_Color_UL:
3010 set_window_color (Color_UL, str); 3761 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3011 break; 3762 break;
3012 case XTerm_Color_RV: 3763 case XTerm_Color_RV:
3013 set_window_color (Color_RV, str); 3764 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3014 break; 3765 break;
3015#endif 3766#endif
3016 3767#if TRANSPARENT && TINTING
3017 case XTerm_Menu: 3768 case XTerm_Color_tint:
3018 /* 3769 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3019 * rxvt_menubar_dispatch () violates the constness of the string, 3770 check_our_parents ();
3020 * so DON'T do it here 3771 if (am_transparent)
3021 */ 3772 want_full_refresh = want_refresh = 1;
3022 break; 3773 break;
3774#endif
3775
3023 case XTerm_Pixmap: 3776 case XTerm_Pixmap:
3024 if (*str != ';') 3777 if (*str != ';')
3025 { 3778 {
3026#if XPM_BACKGROUND 3779#if XPM_BACKGROUND
3027 scale_pixmap (""); /* reset to default scaling */ 3780 scale_pixmap (""); /* reset to default scaling */
3028 set_bgPixmap (str); /* change pixmap */ 3781 set_bgPixmap (str); /* change pixmap */
3029#endif 3782#endif
3030 scr_touch (true); 3783 scr_touch (true);
3031 } 3784 }
3032 while ((str = STRCHR (str, ';')) != NULL) 3785 while ((str = strchr (str, ';')) != NULL)
3033 { 3786 {
3034 str++; 3787 str++;
3035#if XPM_BACKGROUND 3788#if XPM_BACKGROUND
3036 changed += scale_pixmap (str); 3789 changed += scale_pixmap (str);
3037#endif 3790#endif
… …
3050 set_window_color (Color_fg, str); 3803 set_window_color (Color_fg, str);
3051 break; 3804 break;
3052 case XTerm_restoreBG: 3805 case XTerm_restoreBG:
3053 set_window_color (Color_bg, str); 3806 set_window_color (Color_bg, str);
3054 break; 3807 break;
3808
3055 case XTerm_logfile: 3809 case XTerm_logfile:
3056 // TODO, when secure mode? 3810 // TODO, when secure mode?
3057 break; 3811 break;
3812
3058 case XTerm_font: 3813 case XTerm_font:
3059 change_font (str); 3814 op = URxvt_font;
3815 case URxvt_font:
3816#if ENABLE_STYLES
3817 case URxvt_boldFont:
3818 case URxvt_italicFont:
3819 case URxvt_boldItalicFont:
3820#endif
3821 if (query)
3822 tt_printf ("\33]%d;%-.250s%c", saveop,
3823 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3824 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3825 resp);
3826 else
3827 {
3828 const char *&res = rs[Rs_font + (op - URxvt_font)];
3829
3830 res = strdup (str);
3831 allocated.push_back ((void *)res);
3832 set_fonts ();
3833 }
3060 break; 3834 break;
3061#ifndef NO_FRILLS 3835
3836#if ENABLE_FRILLS
3062 case XTerm_locale: 3837 case XTerm_locale:
3063 if (str[0] == '?' && !str[1]) 3838 if (query)
3064 tt_printf ("%-.250s\n", locale); 3839 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3065 else 3840 else
3066 { 3841 {
3067 set_locale (str); 3842 set_locale (str);
3068# ifdef USE_XIM 3843# ifdef USE_XIM
3069 im_cb (); 3844 im_cb ();
3070# endif 3845# endif
3071 } 3846 }
3072 break; 3847 break;
3848#endif
3849
3850#ifdef MENUBAR
3073 case XTerm_findfont: 3851 case XTerm_Menu:
3074 { 3852 if (options & Opt_insecure)
3075 int fid = TermWin.fontset->find_font (atoi (str)); 3853 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; 3854 break;
3079#endif 3855#endif
3080#if 0 3856#if 0
3081 case XTerm_dumpscreen: /* no error notices */ 3857 case XTerm_dumpscreen: /* no error notices */
3082 { 3858 {
3083 int fd; 3859 int fd;
3084 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3860 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3085 { 3861 {
3086 scr_dump (fd); 3862 scr_dump (fd);
3087 close (fd); 3863 close (fd);
3088 } 3864 }
… …
3108{ 3884{
3109 int state; 3885 int state;
3110 3886
3111 if (mode == 's') 3887 if (mode == 's')
3112 { 3888 {
3113 SavedModes |= (PrivateModes & bit); 3889 SavedModes |= (priv_modes & bit);
3114 return -1; 3890 return -1;
3115 } 3891 }
3116 else 3892 else
3117 { 3893 {
3118 if (mode == 'r') 3894 if (mode == 'r')
3119 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3895 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3120 else 3896 else
3121 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3897 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3122 PrivMode (state, bit); 3898 PrivMode (state, bit);
3123 } 3899 }
3124 3900
3125 return state; 3901 return state;
3126} 3902}
… …
3144 { 3, PrivMode_132 }, 3920 { 3, PrivMode_132 },
3145 { 4, PrivMode_smoothScroll }, 3921 { 4, PrivMode_smoothScroll },
3146 { 5, PrivMode_rVideo }, 3922 { 5, PrivMode_rVideo },
3147 { 6, PrivMode_relOrigin }, 3923 { 6, PrivMode_relOrigin },
3148 { 7, PrivMode_Autowrap }, 3924 { 7, PrivMode_Autowrap },
3925 // 8, bi-directional support mode
3149 { 9, PrivMode_MouseX10 }, 3926 { 9, PrivMode_MouseX10 },
3150#ifdef menuBar_esc 3927#ifdef menuBar_esc
3151 { menuBar_esc, PrivMode_menuBar }, 3928 { menuBar_esc, PrivMode_menuBar },
3152#endif 3929#endif
3930 // 18, 19 printing-related
3931 { 25, PrivMode_VisibleCursor },
3153#ifdef scrollBar_esc 3932#ifdef scrollBar_esc
3154 { scrollBar_esc, PrivMode_scrollBar }, 3933 { scrollBar_esc, PrivMode_scrollBar },
3155#endif 3934#endif
3156 // 18, 19 printing-related
3157 { 25, PrivMode_VisibleCursor },
3158 // 30 show scrollbar rxvt. extension
3159 { 35, PrivMode_ShiftKeys }, // rxvt extension 3935 { 35, PrivMode_ShiftKeys }, // rxvt extension
3160 { 40, PrivMode_132OK }, 3936 { 40, PrivMode_132OK },
3161 // 41 xterm more fixes NYI 3937 // 41 xterm more fixes NYI
3162 // 45 margin bell NYI 3938 // 45 margin bell NYI
3163 // 46 start logging 3939 // 46 start logging
… …
3175 // 1035 enable modifiers for alt, numlock NYI 3951 // 1035 enable modifiers for alt, numlock NYI
3176 // 1036 send ESC for meta keys NYI 3952 // 1036 send ESC for meta keys NYI
3177 // 1037 send DEL for keypad delete NYI 3953 // 1037 send DEL for keypad delete NYI
3178 { 1047, PrivMode_Screen }, 3954 { 1047, PrivMode_Screen },
3179 // 1048 save and restore cursor 3955 // 1048 save and restore cursor
3180 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3956 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3181 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3957 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3182 }; 3958 };
3183 3959
3184 if (nargs == 0) 3960 if (nargs == 0)
3185 return; 3961 return;
… …
3205 /* extra handling for values with state unkept */ 3981 /* extra handling for values with state unkept */
3206 switch (arg[i]) 3982 switch (arg[i])
3207 { 3983 {
3208 case 1048: /* alternative cursor save */ 3984 case 1048: /* alternative cursor save */
3209 case 1049: 3985 case 1049:
3986 if (options & Opt_secondaryScreen)
3210 if (mode == 0) 3987 if (mode == 0)
3211 scr_cursor (RESTORE); 3988 scr_cursor (RESTORE);
3212 else if (mode == 1) 3989 else if (mode == 1)
3213 scr_cursor (SAVE); 3990 scr_cursor (SAVE);
3214 /* FALLTHROUGH */ 3991 break;
3215 } 3992 }
3216 3993
3217 if (state >= 0) 3994 if (state >= 0)
3218 /* extra handling for values with valid 0 or 1 state */ 3995 /* extra handling for values with valid 0 or 1 state */
3219 switch (arg[i]) 3996 switch (arg[i])
… …
3225 * within VT52 mode 4002 * within VT52 mode
3226 */ 4003 */
3227 PrivMode (1, PrivMode_vt52); 4004 PrivMode (1, PrivMode_vt52);
3228 break; 4005 break;
3229 case 3: /* 80/132 */ 4006 case 3: /* 80/132 */
3230 if (PrivateModes & PrivMode_132OK) 4007 if (priv_modes & PrivMode_132OK)
3231 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4008 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3232 break; 4009 break;
3233 case 4: /* smooth scrolling */ 4010 case 4: /* smooth scrolling */
3234 if (state) 4011 if (state)
3235 Options &= ~Opt_jumpScroll; 4012 options &= ~Opt_jumpScroll;
3236 else 4013 else
3237 Options |= Opt_jumpScroll; 4014 options |= Opt_jumpScroll;
3238 break; 4015 break;
3239 case 5: /* reverse video */ 4016 case 5: /* reverse video */
3240 scr_rvideo_mode (state); 4017 scr_rvideo_mode (state);
3241 break; 4018 break;
3242 case 6: /* relative/absolute origins */ 4019 case 6: /* relative/absolute origins */
3243 scr_relative_origin (state); 4020 scr_relative_origin (state);
3244 break; 4021 break;
3245 case 7: /* autowrap */ 4022 case 7: /* autowrap */
3246 scr_autowrap (state); 4023 scr_autowrap (state);
3247 break; 4024 break;
3248 /* case 8: - auto repeat, can't do on a per window basis */ 4025 /* case 8: - auto repeat, can't do on a per window basis */
3249 case 9: /* X10 mouse reporting */ 4026 case 9: /* X10 mouse reporting */
3250 if (state) /* orthogonal */ 4027 if (state) /* orthogonal */
3251 PrivateModes &= ~PrivMode_MouseX11; 4028 priv_modes &= ~PrivMode_MouseX11;
3252 break; 4029 break;
3253#ifdef menuBar_esc 4030#ifdef menuBar_esc
3254 case menuBar_esc: 4031 case menuBar_esc:
3255#ifdef MENUBAR 4032#ifdef MENUBAR
3256 map_menuBar (state); 4033 map_menuBar (state);
… …
3267 break; 4044 break;
3268#endif 4045#endif
3269 case 25: /* visible/invisible cursor */ 4046 case 25: /* visible/invisible cursor */
3270 scr_cursor_visible (state); 4047 scr_cursor_visible (state);
3271 break; 4048 break;
3272 /* case 35: - shift keys */ 4049 /* case 35: - shift keys */
3273 /* case 40: - 80 <--> 132 mode */ 4050 /* case 40: - 80 <--> 132 mode */
3274 case 47: /* secondary screen */ 4051 case 47: /* secondary screen */
3275 scr_change_screen (state); 4052 scr_change_screen (state);
3276 break; 4053 break;
3277 /* case 66: - application key pad */ 4054 /* case 66: - application key pad */
3278 /* case 67: - backspace key */ 4055 /* case 67: - backspace key */
3279 case 1000: /* X11 mouse reporting */ 4056 case 1000: /* X11 mouse reporting */
3280 if (state) /* orthogonal */ 4057 if (state) /* orthogonal */
3281 PrivateModes &= ~PrivMode_MouseX10; 4058 priv_modes &= ~PrivMode_MouseX10;
3282 break; 4059 break;
3283#if 0 4060#if 0
3284 case 1001: 4061 case 1001:
3285 break; /* X11 mouse highlighting */ 4062 break; /* X11 mouse highlighting */
3286#endif 4063#endif
3287 case 1010: /* scroll to bottom on TTY output inhibit */ 4064 case 1010: /* scroll to bottom on TTY output inhibit */
3288 if (state) 4065 if (state)
3289 Options &= ~Opt_scrollTtyOutput; 4066 options &= ~Opt_scrollTtyOutput;
3290 else 4067 else
3291 Options |= Opt_scrollTtyOutput; 4068 options |= Opt_scrollTtyOutput;
3292 break; 4069 break;
3293 case 1011: /* scroll to bottom on key press */ 4070 case 1011: /* scroll to bottom on key press */
3294 if (state) 4071 if (state)
3295 Options |= Opt_scrollTtyKeypress; 4072 options |= Opt_scrollTtyKeypress;
3296 else 4073 else
3297 Options &= ~Opt_scrollTtyKeypress; 4074 options &= ~Opt_scrollTtyKeypress;
3298 break; 4075 break;
3299 case 1047: /* secondary screen w/ clearing */ 4076 case 1047: /* secondary screen w/ clearing last */
3300 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4077 if (options & Opt_secondaryScreen)
3301 if (current_screen != PRIMARY) 4078 if (current_screen != PRIMARY)
3302 scr_erase_screen (2); 4079 scr_erase_screen (2);
3303
3304 scr_change_screen (state); 4080 scr_change_screen (state);
3305 /* FALLTHROUGH */ 4081 break;
4082 case 1049: /* secondary screen w/ clearing first */
4083 scr_change_screen (state);
4084 if (options & Opt_secondaryScreen)
4085 if (current_screen != PRIMARY)
4086 scr_erase_screen (2);
4087 break;
3306 default: 4088 default:
3307 break; 4089 break;
3308 } 4090 }
3309 } 4091 }
3310} 4092}
… …
3333 rendset = 0, rendstyle = ~RS_None; 4115 rendset = 0, rendstyle = ~RS_None;
3334 break; 4116 break;
3335 case 1: 4117 case 1:
3336 rendset = 1, rendstyle = RS_Bold; 4118 rendset = 1, rendstyle = RS_Bold;
3337 break; 4119 break;
4120 //case 2: // low intensity
4121 case 3:
4122 rendset = 1, rendstyle = RS_Italic;
4123 break;
3338 case 4: 4124 case 4:
3339 rendset = 1, rendstyle = RS_Uline; 4125 rendset = 1, rendstyle = RS_Uline;
3340 break; 4126 break;
3341 case 5: 4127 case 5: // slowly blinking
4128 case 6: // rapidly blinking
3342 rendset = 1, rendstyle = RS_Blink; 4129 rendset = 1, rendstyle = RS_Blink;
3343 break; 4130 break;
4131 //case 6: // scoansi light background
3344 case 7: 4132 case 7:
3345 rendset = 1, rendstyle = RS_RVid; 4133 rendset = 1, rendstyle = RS_RVid;
3346 break; 4134 break;
3347 case 8: 4135 case 8:
3348 // invisible. NYI 4136 // invisible. NYI
3349 break; 4137 break;
3350 case 22: 4138 //case 9: // crossed out
4139 //case 10: // scoansi acs off, primary font
4140 //case 11: // scoansi acs on, first alt font
4141 //case 12: // scoansi acs on, |0x80, second alt font
4142 //...
4143 //case 19: // ninth alt font
4144 //case 20: // gothic
4145 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3351 rendset = 0, rendstyle = RS_Bold; 4146 rendset = 0, rendstyle = RS_Bold;
4147 break;
4148 case 22: // normal intensity
4149 rendset = 0, rendstyle = RS_Bold;
4150 break;
4151 case 23: // disable italic
4152 rendset = 0, rendstyle = RS_Italic;
3352 break; 4153 break;
3353 case 24: 4154 case 24:
3354 rendset = 0, rendstyle = RS_Uline; 4155 rendset = 0, rendstyle = RS_Uline;
3355 break; 4156 break;
3356 case 25: 4157 case 25:
3357 rendset = 0, rendstyle = RS_Blink; 4158 rendset = 0, rendstyle = RS_Blink;
3358 break; 4159 break;
4160 case 26: // variable spacing (iso 8613)
4161 rendset = 0, rendstyle = RS_Blink;
4162 break;
3359 case 27: 4163 case 27:
3360 rendset = 0, rendstyle = RS_RVid; 4164 rendset = 0, rendstyle = RS_RVid;
3361 break; 4165 break;
3362 case 28:
3363 // visible. NYI 4166 //case 28: // visible. NYI
3364 break; 4167 //case 29: // not crossed-out
3365 } 4168 }
3366 4169
3367 if (rendset != -1) 4170 if (rendset != -1)
3368 { 4171 {
3369 scr_rendition (rendset, rendstyle); 4172 scr_rendition (rendset, rendstyle);
… …
3380 case 35: 4183 case 35:
3381 case 36: 4184 case 36:
3382 case 37: 4185 case 37:
3383 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4186 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3384 break; 4187 break;
3385#ifdef TTY_256COLOR 4188 case 38: // set fg color, ISO 8613-6
3386 case 38:
3387 if (nargs > i + 2 && arg[i + 1] == 5) 4189 if (nargs > i + 2 && arg[i + 1] == 5)
3388 { 4190 {
3389 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4191 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3390 i += 2; 4192 i += 2;
3391 } 4193 }
3392 break; 4194 break;
3393#endif
3394 case 39: /* default fg */ 4195 case 39: /* default fg */
3395 scr_color (Color_fg, Color_fg); 4196 scr_color (Color_fg, Color_fg);
3396 break; 4197 break;
3397 4198
3398 case 40: 4199 case 40:
… …
3403 case 45: 4204 case 45:
3404 case 46: 4205 case 46:
3405 case 47: 4206 case 47:
3406 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4207 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3407 break; 4208 break;
3408#ifdef TTY_256COLOR 4209 case 48: // set bg color, ISO 8613-6
3409 case 48:
3410 if (nargs > i + 2 && arg[i + 1] == 5) 4210 if (nargs > i + 2 && arg[i + 1] == 5)
3411 { 4211 {
3412 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4212 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3413 i += 2; 4213 i += 2;
3414 } 4214 }
3415 break; 4215 break;
3416#endif
3417 case 49: /* default bg */ 4216 case 49: /* default bg */
3418 scr_color (Color_bg, Color_bg); 4217 scr_color (Color_bg, Color_bg);
3419 break; 4218 break;
4219
4220 //case 50: // not variable spacing
3420 4221
3421#ifndef NO_BRIGHTCOLOR 4222#ifndef NO_BRIGHTCOLOR
3422 case 90: 4223 case 90:
3423 case 91: /* set bright fg color */ 4224 case 91: /* set bright fg color */
3424 case 92: 4225 case 92:
3425 case 93: 4226 case 93:
3426 case 94: 4227 case 94:
3427 case 95: 4228 case 95:
3428 case 96: 4229 case 96:
3429 case 97: 4230 case 97:
3430 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4231 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3431 Color_fg);
3432 break; 4232 break;
3433 case 100: 4233 case 100:
3434 case 101: /* set bright bg color */ 4234 case 101: /* set bright bg color */
3435 case 102: 4235 case 102:
3436 case 103: 4236 case 103:
3437 case 104: 4237 case 104:
3438 case 105: 4238 case 105:
3439 case 106: 4239 case 106:
3440 case 107: 4240 case 107:
3441 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4241 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3442 Color_bg);
3443 break; 4242 break;
3444#endif 4243#endif
3445 4244
3446 } 4245 }
3447 } 4246 }
3448} 4247}
3449/*}}} */ 4248/*}}} */
3450 4249
3451/*{{{ process Rob Nation's own graphics mode sequences */ 4250/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3452void 4251void
3453rxvt_term::process_graphics () 4252rxvt_term::process_graphics ()
3454{ 4253{
3455 unicode_t ch, cmd = cmd_getc (); 4254 unicode_t ch, cmd = cmd_getc ();
3456 4255
3457 if (cmd == 'Q') 4256 if (cmd == 'Q')
3458 { /* query graphics */ 4257 { /* query graphics */
3459 tt_printf ("\033G0\n"); /* no graphics */ 4258 tt_printf ("\033G0\012"); /* no graphics */
3460 return; 4259 return;
3461 } 4260 }
3462 /* swallow other graphics sequences until terminating ':' */ 4261 /* swallow other graphics sequences until terminating ':' */
3463 do 4262 do
3464 ch = cmd_getc (); 4263 ch = cmd_getc ();
… …
3479 unsigned char buf[256]; 4278 unsigned char buf[256];
3480 4279
3481 va_start (arg_ptr, fmt); 4280 va_start (arg_ptr, fmt);
3482 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4281 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3483 va_end (arg_ptr); 4282 va_end (arg_ptr);
3484 tt_write (buf, STRLEN (buf)); 4283 tt_write (buf, strlen (buf));
3485} 4284}
3486 4285
3487/* ---------------------------------------------------------------------- */ 4286/* ---------------------------------------------------------------------- */
3488/* Write data to the pty as typed by the user, pasted with the mouse, 4287/* 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. 4288 * or generated by us in response to a query ESC sequence.
3490 */ 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 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3495 4294
3496 if (len) 4295 if (len)
3497 { 4296 {
3498 if (v_buflen == 0) 4297 if (v_buflen == 0)
3499 { 4298 {
3500 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 4299 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3501 4300
3502 if ((unsigned int)written == len) 4301 if ((unsigned int)written == len)
3503 return; 4302 return;
3504 4303
3505 data += written; 4304 data += written;
… …
3513 v_buflen += len; 4312 v_buflen += len;
3514 } 4313 }
3515 4314
3516 for (;;) 4315 for (;;)
3517 { 4316 {
3518 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); 4317 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3519 4318
3520 if (written > 0) 4319 if (written > 0)
3521 { 4320 {
3522 v_buflen -= written; 4321 v_buflen -= written;
3523 4322

Diff Legend

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