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

Diff Legend

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