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.90 by pcg, Fri Apr 2 19:09:52 2004 UTC vs.
Revision 1.163 by root, Wed Aug 25 03:47:20 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 }
… …
661 if (want_full_refresh) 916 if (want_full_refresh)
662 { 917 {
663 want_full_refresh = 0; 918 want_full_refresh = 0;
664 scr_clear (); 919 scr_clear ();
665 scr_touch (false); 920 scr_touch (false);
666 want_refresh = 1;
667 } 921 }
668#endif 922#endif
669 923
670 if (want_refresh) 924 if (want_refresh)
671 { 925 {
672 scr_refresh (refresh_type); 926 scr_refresh (refresh_type);
673 scrollbar_show (1); 927 scrollbar_show (1);
674#ifdef USE_XIM 928#ifdef USE_XIM
675 IMSendSpot (); 929 IMSendSpot ();
676#endif 930#endif
677
678 } 931 }
679 932
680 display->flush (); 933 display->flush ();
934
935 flush_ev.stop ();
681} 936}
682 937
683void 938void
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)
… …
921 1225
922 Window unused_root, unused_child; 1226 Window unused_root, unused_child;
923 int unused_root_x, unused_root_y; 1227 int unused_root_x, unused_root_y;
924 unsigned int unused_mask; 1228 unsigned int unused_mask;
925 1229
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) 1230 switch (ev.type)
976 { 1231 {
977 case KeyPress: 1232 case KeyPress:
1233#if ISO_14755
1234 if (!(iso14755buf & ISO_14755_52))
1235#endif
978 lookup_key (ev.xkey); 1236 lookup_key (ev.xkey);
1237
1238 break;
1239
1240 case KeyRelease:
1241 {
1242#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1243 KeySym ks;
1244
1245 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1246#endif
1247
1248#if ENABLE_FRILLS || ISO_14755
1249 // ISO 14755 support
1250 if (iso14755buf)
1251 if (iso14755buf & ISO_14755_52)
1252 {
1253# if ENABLE_OVERLAY
1254 scr_overlay_off ();
1255# endif
1256# if ISO_14755
1257 // iso14755 part 5.2 handling: release time
1258 // first: controls
1259 if ((ev.xkey.state & ControlMask)
1260 && ((ks >= 0x40 && ks <= 0x5f)
1261 || (ks >= 0x61 && ks <= 0x7f)))
1262 {
1263 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1264 commit_iso14755 ();
1265 return; // case-break;
1266 }
1267
1268 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1269 if (i[0] == ks)
1270 {
1271 iso14755buf = ISO_14755_51 | i[1];
1272 commit_iso14755 ();
1273 return; // case-break;
1274 }
1275
1276 scr_bell ();
1277# endif
1278 iso14755buf = 0;
979 break; 1279 break;
1280 }
1281 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1282 {
1283# if ENABLE_OVERLAY
1284 scr_overlay_off ();
1285# endif
1286 if (iso14755buf & ISO_14755_51)
1287 commit_iso14755 ();
1288#if ISO_14755
1289 else if (iso14755buf & ISO_14755_STARTED)
1290 {
1291 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1292
1293 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1294 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1295 }
1296# endif
1297 else
1298 iso14755buf = 0;
1299 }
1300#endif
980 1301
981#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1302#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
982 case KeyRelease:
983 {
984 if (! (ev.xkey.state & ControlMask)) 1303 if (!(ev.xkey.state & ControlMask))
1304 slip_wheel_ev.stop ();
1305 else if (ks == XK_Control_L || ks == XK_Control_R)
985 mouse_slip_wheel_speed = 0; 1306 mouse_slip_wheel_speed = 0;
986 else 1307#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; 1308 break;
995 } 1309 }
996#endif
997 1310
998 case ButtonPress: 1311 case ButtonPress:
999 button_press (ev.xbutton); 1312 button_press (ev.xbutton);
1000 break; 1313 break;
1001 1314
… …
1013 && (ev.xclient.data.l[0] == DndFile 1326 && (ev.xclient.data.l[0] == DndFile
1014 || ev.xclient.data.l[0] == DndDir 1327 || ev.xclient.data.l[0] == DndDir
1015 || ev.xclient.data.l[0] == DndLink)) 1328 || ev.xclient.data.l[0] == DndLink))
1016 { 1329 {
1017 /* Get Dnd data */ 1330 /* Get Dnd data */
1018 Atom ActualType; 1331 Atom ActualType;
1019 int ActualFormat; 1332 int ActualFormat;
1020 unsigned char *data; 1333 unsigned char *data;
1021 unsigned long Size, RemainingBytes; 1334 unsigned long Size, RemainingBytes;
1022 1335
1023 XGetWindowProperty (display->display, display->root, 1336 XGetWindowProperty (display->display, display->root,
1024 xa[XA_DNDSELECTION], 1337 xa[XA_DNDSELECTION],
1025 0L, 1000000L, 1338 0L, 1000000L,
1026 False, AnyPropertyType, 1339 False, AnyPropertyType,
… …
1028 &Size, &RemainingBytes, 1341 &Size, &RemainingBytes,
1029 &data); 1342 &data);
1030 XChangeProperty (display->display, display->root, 1343 XChangeProperty (display->display, display->root,
1031 XA_CUT_BUFFER0, XA_STRING, 1344 XA_CUT_BUFFER0, XA_STRING,
1032 8, PropModeReplace, 1345 8, PropModeReplace,
1033 data, STRLEN (data)); 1346 data, strlen (data));
1347 XFree (data);
1034 selection_paste (display->root, XA_CUT_BUFFER0, True); 1348 selection_paste (display->root, XA_CUT_BUFFER0, True);
1035 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1349 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1036 } 1350 }
1037#endif /* OFFIX_DND */ 1351#endif /* OFFIX_DND */
1038 break; 1352 break;
1039 1353
1040 case MappingNotify: 1354 case MappingNotify:
1041 XRefreshKeyboardMapping (& (ev.xmapping)); 1355 XRefreshKeyboardMapping (&ev.xmapping);
1042 break; 1356 break;
1043 1357
1044 /* 1358 /*
1045 * XXX: this is not the _current_ arrangement 1359 * XXX: this is not the _current_ arrangement
1046 * Here's my conclusion: 1360 * Here's my conclusion:
… …
1071 { 1385 {
1072 TermWin.focus = 1; 1386 TermWin.focus = 1;
1073 want_refresh = 1; 1387 want_refresh = 1;
1074#ifdef USE_XIM 1388#ifdef USE_XIM
1075 if (Input_Context != NULL) 1389 if (Input_Context != NULL)
1390 {
1391 IMSetStatusPosition ();
1076 XSetICFocus (Input_Context); 1392 XSetICFocus (Input_Context);
1393 }
1077#endif 1394#endif
1078#ifdef CURSOR_BLINK 1395#ifdef CURSOR_BLINK
1079 if (Options & Opt_cursorBlink) 1396 if (options & Opt_cursorBlink)
1080 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1397 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1398#endif
1399#ifdef OFF_FOCUS_FADING
1400 if (rs[Rs_fade])
1401 {
1402 pix_colors = pix_colors_focused;
1403 scr_recolour ();
1404 }
1081#endif 1405#endif
1082 1406
1083 } 1407 }
1084 break; 1408 break;
1085 1409
1086 case FocusOut: 1410 case FocusOut:
1087 if (TermWin.focus) 1411 if (TermWin.focus)
1088 { 1412 {
1089 TermWin.focus = 0; 1413 TermWin.focus = 0;
1090 want_refresh = 1; 1414 want_refresh = 1;
1415
1416#if ENABLE_FRILLS || ISO_14755
1417 iso14755buf = 0;
1418#endif
1419#if ENABLE_OVERLAY
1420 scr_overlay_off ();
1421#endif
1091#ifdef USE_XIM 1422#ifdef USE_XIM
1092 if (Input_Context != NULL) 1423 if (Input_Context != NULL)
1093 XUnsetICFocus (Input_Context); 1424 XUnsetICFocus (Input_Context);
1094#endif 1425#endif
1095#ifdef CURSOR_BLINK 1426#ifdef CURSOR_BLINK
1096 if (Options & Opt_cursorBlink) 1427 if (options & Opt_cursorBlink)
1097 cursor_blink_ev.stop (); 1428 cursor_blink_ev.stop ();
1098 hidden_cursor = 0; 1429 hidden_cursor = 0;
1099#endif 1430#endif
1100 1431#ifdef OFF_FOCUS_FADING
1432 if (rs[Rs_fade])
1433 {
1434 pix_colors = pix_colors_unfocused;
1435 scr_recolour ();
1436 }
1437#endif
1101 } 1438 }
1102 break; 1439 break;
1103 1440
1104 case ConfigureNotify: 1441 case ConfigureNotify:
1105 if (ev.xconfigure.window == TermWin.parent[0]) 1442 if (ev.xconfigure.window == TermWin.parent[0])
… …
1114 } 1451 }
1115 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1452 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1116 1453
1117 if (szHint.width != width || szHint.height != height) 1454 if (szHint.width != width || szHint.height != height)
1118 { 1455 {
1119 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1456 seen_resize = 1;
1120 resize_all_windows (width, height, 1); 1457 resize_all_windows (width, height, 1);
1121 } 1458 }
1122#ifdef DEBUG_SIZE 1459
1123 else
1124 {
1125 D_SIZE ((stderr, "Size: Not resizing"));
1126 }
1127#endif
1128#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1460#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1129 if (Options & Opt_transparent) 1461 if (options & Opt_transparent)
1130 { 1462 {
1131 check_our_parents (); 1463 check_our_parents ();
1132 if (am_transparent) 1464 if (am_transparent)
1133 want_full_refresh = 1; 1465 want_refresh = want_full_refresh = 1;
1134 } 1466 }
1135#endif 1467#endif
1136 } 1468 }
1469 break;
1470
1471 case PropertyNotify:
1472 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1473 && ev.xproperty.state == PropertyNewValue)
1474 selection_property (ev.xproperty.window, ev.xproperty.atom);
1475
1137 break; 1476 break;
1138 1477
1139 case SelectionClear: 1478 case SelectionClear:
1140 selection_clear (); 1479 selection_clear ();
1141 break; 1480 break;
… …
1172 1511
1173 case GraphicsExpose: 1512 case GraphicsExpose:
1174 case Expose: 1513 case Expose:
1175 if (ev.xany.window == TermWin.vt) 1514 if (ev.xany.window == TermWin.vt)
1176 { 1515 {
1177#ifdef NO_SLOW_LINK_SUPPORT 1516 do
1178 scr_expose (ev.xexpose.x, ev.xexpose.y, 1517 scr_expose (ev.xexpose.x, ev.xexpose.y,
1179 ev.xexpose.width, ev.xexpose.height, False); 1518 ev.xexpose.width, ev.xexpose.height, False);
1180#else 1519 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1181 // don't understand this, so commented it out 1520
1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1522
1523 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1182 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1183 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1184 //scr_expose (ev.xexpose.x, 0, 1526
1185 // ev.xexpose.width, TermWin.height, False); 1527 scr_refresh (refresh_type);
1186#endif
1187 want_refresh = 1;
1188 } 1528 }
1189 else 1529 else
1190 { 1530 {
1191 XEvent unused_event; 1531 XEvent unused_event;
1192 1532
1193 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1533 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1194 Expose, 1534 ;
1195 &unused_event)) ;
1196 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1535 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1197 GraphicsExpose, 1536 ;
1198 &unused_event)) ; 1537
1199 if (isScrollbarWindow (ev.xany.window)) 1538 if (isScrollbarWindow (ev.xany.window))
1200 { 1539 {
1201 scrollBar.setIdle (); 1540 scrollBar.setIdle ();
1202 scrollbar_show (0); 1541 scrollbar_show (0);
1203 } 1542 }
1204#ifdef MENUBAR 1543#ifdef MENUBAR
1205 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1544 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1206 menubar_expose (); 1545 menubar_expose ();
1207#endif 1546#endif
1547
1548#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == TermWin.parent[0])
1550 XClearWindow (display->display, ev.xany.window);
1551#endif
1208 } 1552 }
1209 break; 1553 break;
1210 1554
1211 case MotionNotify: 1555 case MotionNotify:
1212#ifdef POINTER_BLANK 1556#ifdef POINTER_BLANK
… …
1218 { 1562 {
1219 menubar_control (ev.xbutton); 1563 menubar_control (ev.xbutton);
1220 break; 1564 break;
1221 } 1565 }
1222#endif 1566#endif
1223 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1567 if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate))
1224 break; 1568 break;
1225 1569
1226 if (ev.xany.window == TermWin.vt) 1570 if (ev.xany.window == TermWin.vt)
1227 { 1571 {
1228 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1572 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1229 { 1573 {
1230 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1574 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1231 ; 1575 ;
1232 1576
1233 XQueryPointer (display->display, TermWin.vt, 1577 XQueryPointer (display->display, TermWin.vt,
1234 &unused_root, &unused_child, 1578 &unused_root, &unused_child,
1235 &unused_root_x, &unused_root_y, 1579 &unused_root_x, &unused_root_y,
1236 & (ev.xbutton.x), & (ev.xbutton.y), 1580 & (ev.xbutton.x), & (ev.xbutton.y),
1237 &unused_mask); 1581 &unused_mask);
1238#ifdef MOUSE_THRESHOLD 1582#ifdef MOUSE_THRESHOLD
1239 /* deal with a `jumpy' mouse */ 1583 /* deal with a `jumpy' mouse */
1240 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1584 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1241 { 1585 {
1242#endif 1586#endif
1587#if ISO_14755
1588 // 5.4
1589 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1590 {
1591 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1592 break;
1593 }
1594#endif
1243 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1595 selection_extend (ev.xbutton.x, ev.xbutton.y,
1244 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1596 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1245#ifdef SELECTION_SCROLLING 1597#ifdef SELECTION_SCROLLING
1246 if (ev.xbutton.y < TermWin.int_bwidth 1598 if (ev.xbutton.y < TermWin.int_bwidth
1247 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1599 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1248 { 1600 {
1249 int dist; 1601 int dist;
1250 1602
1251 pending_scroll_selection=1;
1252
1253 /* don't clobber the current delay if we are 1603 /* don't clobber the current delay if we are
1254 * already in the middle of scrolling. 1604 * already in the middle of scrolling.
1255 */ 1605 */
1256 if (scroll_selection_delay<=0) 1606 if (!sel_scroll_ev.active)
1257 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1607 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1258 1608
1259 /* save the event params so we can highlight 1609 /* save the event params so we can highlight
1260 * the selection in the pending-scroll loop 1610 * the selection in the pending-scroll loop
1261 */ 1611 */
1262 selection_save_x=ev.xbutton.x; 1612 selection_save_x = ev.xbutton.x;
1263 selection_save_y=ev.xbutton.y; 1613 selection_save_y = ev.xbutton.y;
1264 selection_save_state=
1265 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1614 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1266 1615
1267 /* calc number of lines to scroll */ 1616 /* calc number of lines to scroll */
1268 if (ev.xbutton.y<TermWin.int_bwidth) 1617 if (ev.xbutton.y<TermWin.int_bwidth)
1269 { 1618 {
1270 scroll_selection_dir = UP; 1619 scroll_selection_dir = UP;
1271 dist = TermWin.int_bwidth - ev.xbutton.y; 1620 dist = TermWin.int_bwidth - ev.xbutton.y;
1272 } 1621 }
1273 else 1622 else
1274 { 1623 {
1275 scroll_selection_dir = DN; 1624 scroll_selection_dir = DN;
1276 dist = ev.xbutton.y -
1277 (TermWin.int_bwidth + TermWin.height); 1625 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1278 } 1626 }
1627
1279 scroll_selection_lines= (Pixel2Height (dist)/ 1628 scroll_selection_lines = Pixel2Height (dist)
1280 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1629 / SELECTION_SCROLL_LINE_SPEEDUP
1630 + 1;
1281 MIN_IT (scroll_selection_lines, 1631 MIN_IT (scroll_selection_lines,
1282 SELECTION_SCROLL_MAX_LINES); 1632 SELECTION_SCROLL_MAX_LINES);
1283 } 1633 }
1284 else 1634 else
1285 { 1635 {
1286 /* we are within the text window, so we 1636 /* we are within the text window, so we
1287 * shouldn't be scrolling 1637 * shouldn't be scrolling
1288 */ 1638 */
1289 pending_scroll_selection = 0; 1639 if (sel_scroll_ev.active)
1640 sel_scroll_ev.stop();
1290 } 1641 }
1291#endif 1642#endif
1292#ifdef MOUSE_THRESHOLD 1643#ifdef MOUSE_THRESHOLD
1293
1294 } 1644 }
1295#endif 1645#endif
1296
1297 } 1646 }
1298 } 1647 }
1299 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1648 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1300 { 1649 {
1301 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1650 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1302 MotionNotify, &ev)) ; 1651 MotionNotify, &ev)) ;
1303 XQueryPointer (display->display, scrollBar.win, 1652 XQueryPointer (display->display, scrollBar.win,
1304 &unused_root, &unused_child, 1653 &unused_root, &unused_child,
1305 &unused_root_x, &unused_root_y, 1654 &unused_root_x, &unused_root_y,
1306 & (ev.xbutton.x), & (ev.xbutton.y), 1655 & (ev.xbutton.x), & (ev.xbutton.y),
1307 &unused_mask); 1656 &unused_mask);
… …
1313 } 1662 }
1314 break; 1663 break;
1315 } 1664 }
1316} 1665}
1317 1666
1667#if TRANSPARENT
1318void 1668void
1319rxvt_term::rootwin_cb (XEvent &ev) 1669rxvt_term::rootwin_cb (XEvent &ev)
1320{ 1670{
1321 SET_R (this); 1671 SET_R (this);
1322 SET_LOCALE (locale); 1672 SET_LOCALE (locale);
1323 1673
1324 switch (ev.type) 1674 switch (ev.type)
1325 { 1675 {
1326 case PropertyNotify: 1676 case PropertyNotify:
1327 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1328 {
1329 if (ev.xproperty.state == PropertyNewValue)
1330 selection_property (ev.xproperty.window, ev.xproperty.atom);
1331 break;
1332 }
1333#ifdef TRANSPARENT
1334 else
1335 {
1336 /* 1677 /*
1337 * if user used some Esetroot compatible prog to set the root bg, 1678 * if user used some Esetroot compatible prog to set the root bg,
1338 * use the property to determine the pixmap. We use it later on. 1679 * use the property to determine the pixmap. We use it later on.
1339 */ 1680 */
1340 if (xa[XA_XROOTPMAPID] == 0) 1681 if (xa[XA_XROOTPMAPID] == 0)
1341 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1682 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1342 1683
1343 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1684 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1344 return; 1685 return;
1345 }
1346 1686
1347 /* FALLTHROUGH */ 1687 /* FALLTHROUGH */
1348 case ReparentNotify: 1688 case ReparentNotify:
1349 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1689 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1350 want_full_refresh = 1; 1690 want_refresh = want_full_refresh = 1;
1351 break; 1691 break;
1352#endif
1353 } 1692 }
1354} 1693}
1694#endif
1355 1695
1356void 1696void
1357rxvt_term::button_press (XButtonEvent &ev) 1697rxvt_term::button_press (XButtonEvent &ev)
1358{ 1698{
1359 int reportmode = 0, clickintime; 1699 int reportmode = 0, clickintime;
1360 1700
1361 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1701 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1362 if (!bypass_keystate) 1702 if (!bypass_keystate)
1363 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1703 reportmode = !! (priv_modes & PrivMode_mouse_report);
1704
1364 /* 1705 /*
1365 * VT window processing of button press 1706 * VT window processing of button press
1366 */ 1707 */
1367 if (ev.window == TermWin.vt) 1708 if (ev.window == TermWin.vt)
1368 { 1709 {
1710#if ISO_14755
1711 // 5.4
1712 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1713 {
1714 iso14755_54 (ev.x, ev.y);
1715 return;
1716 }
1717#endif
1718
1369 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1719 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1370 if (reportmode) 1720 if (reportmode)
1371 { 1721 {
1372 /* mouse report from vt window */ 1722 /* mouse report from vt window */
1373 /* save the xbutton state (for ButtonRelease) */ 1723 /* save the xbutton state (for ButtonRelease) */
… …
1407 MEvent.clicks = 0; 1757 MEvent.clicks = 0;
1408 switch (ev.button) 1758 switch (ev.button)
1409 { 1759 {
1410 case Button1: 1760 case Button1:
1411 /* allow shift+left click to extend selection */ 1761 /* allow shift+left click to extend selection */
1412 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1762 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1413 { 1763 {
1414 if (MEvent.button == Button1 && clickintime) 1764 if (MEvent.button == Button1 && clickintime)
1415 selection_rotate (ev.x, ev.y); 1765 selection_rotate (ev.x, ev.y);
1416 else 1766 else
1417 selection_extend (ev.x, ev.y, 1); 1767 selection_extend (ev.x, ev.y, 1);
… …
1432 case Button3: 1782 case Button3:
1433 if (MEvent.button == Button3 && clickintime) 1783 if (MEvent.button == Button3 && clickintime)
1434 selection_rotate (ev.x, ev.y); 1784 selection_rotate (ev.x, ev.y);
1435 else 1785 else
1436 selection_extend (ev.x, ev.y, 1); 1786 selection_extend (ev.x, ev.y, 1);
1787
1437 MEvent.button = Button3; 1788 MEvent.button = Button3;
1438 break; 1789 break;
1439 } 1790 }
1440 } 1791 }
1792
1441 MEvent.time = ev.time; 1793 MEvent.time = ev.time;
1442 return; 1794 return;
1443 } 1795 }
1444 1796
1445 /* 1797 /*
… …
1511 upordown = 1; /* down */ 1863 upordown = 1; /* down */
1512 } 1864 }
1513 if (upordown) 1865 if (upordown)
1514 { 1866 {
1515#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1867#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1516 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1868 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1517#endif 1869#endif
1518 if (scr_page (upordown < 0 ? UP : DN, 1)) 1870 if (scr_page (upordown < 0 ? UP : DN, 1))
1519 { 1871 {
1520 if (upordown < 0) 1872 if (upordown < 0)
1521 scrollBar.setUp (); 1873 scrollBar.setUp ();
… …
1537 break; 1889 break;
1538 case R_SB_ALIGN_BOTTOM: 1890 case R_SB_ALIGN_BOTTOM:
1539 csrO = scrollBar.bot - scrollBar.top; 1891 csrO = scrollBar.bot - scrollBar.top;
1540 break; 1892 break;
1541 } 1893 }
1894
1542 if (scrollBar.style == R_SB_XTERM 1895 if (scrollBar.style == R_SB_XTERM
1543 || scrollbar_above_slider (ev.y) 1896 || scrollbar_above_slider (ev.y)
1544 || scrollbar_below_slider (ev.y)) 1897 || scrollbar_below_slider (ev.y))
1545 scr_move_to ( scrollbar_position (ev.y) - csrO, 1898 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1546 scrollbar_size ()); 1899
1547 scrollBar.setMotion (); 1900 scrollBar.setMotion ();
1548 break; 1901 break;
1549 1902
1550 case Button1: 1903 case Button1:
1551 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1904 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1575 scr_page ((ev.button == Button1 ? DN : UP), 1928 scr_page ((ev.button == Button1 ? DN : UP),
1576 (TermWin.nrow 1929 (TermWin.nrow
1577 * scrollbar_position (ev.y) 1930 * scrollbar_position (ev.y)
1578 / scrollbar_size ())); 1931 / scrollbar_size ()));
1579 } 1932 }
1933
1580 break; 1934 break;
1581 } 1935 }
1582 } 1936 }
1583 return; 1937 return;
1584 } 1938 }
… …
1596{ 1950{
1597 int reportmode = 0; 1951 int reportmode = 0;
1598 1952
1599 csrO = 0; /* reset csr Offset */ 1953 csrO = 0; /* reset csr Offset */
1600 if (!bypass_keystate) 1954 if (!bypass_keystate)
1601 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1955 reportmode = !! (priv_modes & PrivMode_mouse_report);
1602 1956
1603 if (scrollbar_isUpDn ()) 1957 if (scrollbar_isUpDn ())
1604 { 1958 {
1605 scrollBar.setIdle (); 1959 scrollBar.setIdle ();
1606 scrollbar_show (0); 1960 scrollbar_show (0);
1607#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1961#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1608 refresh_type &= ~SMOOTH_REFRESH; 1962 refresh_type &= ~SMOOTH_REFRESH;
1609#endif 1963#endif
1610
1611 } 1964 }
1965
1612#ifdef SELECTION_SCROLLING 1966#ifdef SELECTION_SCROLLING
1613 pending_scroll_selection=0; 1967 if (sel_scroll_ev.active)
1968 sel_scroll_ev.stop();
1614#endif 1969#endif
1970
1615 if (ev.window == TermWin.vt) 1971 if (ev.window == TermWin.vt)
1616 { 1972 {
1973#if ISO_14755
1974 // 5.4
1975 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1976 return;
1977#endif
1617 if (reportmode) 1978 if (reportmode)
1618 { 1979 {
1619 /* mouse report from vt window */ 1980 /* mouse report from vt window */
1620 /* don't report release of wheel "buttons" */ 1981 /* don't report release of wheel "buttons" */
1621 if (ev.button >= 4) 1982 if (ev.button >= 4)
… …
1635 MEvent.button = AnyButton; 1996 MEvent.button = AnyButton;
1636 mouse_report (ev); 1997 mouse_report (ev);
1637#endif /* MOUSE_REPORT_DOUBLECLICK */ 1998#endif /* MOUSE_REPORT_DOUBLECLICK */
1638 return; 1999 return;
1639 } 2000 }
2001
1640 /* 2002 /*
1641 * dumb hack to compensate for the failure of click-and-drag 2003 * dumb hack to compensate for the failure of click-and-drag
1642 * when overriding mouse reporting 2004 * when overriding mouse reporting
1643 */ 2005 */
1644 if (PrivateModes & PrivMode_mouse_report 2006 if (priv_modes & PrivMode_mouse_report
1645 && bypass_keystate 2007 && bypass_keystate
1646 && ev.button == Button1 && MEvent.clicks <= 1) 2008 && ev.button == Button1 && MEvent.clicks <= 1)
1647 selection_extend (ev.x, ev.y, 0); 2009 selection_extend (ev.x, ev.y, 0);
1648 2010
1649 switch (ev.button) 2011 switch (ev.button)
… …
1660 case Button5: 2022 case Button5:
1661 { 2023 {
1662 int i; 2024 int i;
1663 page_dirn v; 2025 page_dirn v;
1664 2026
1665 v = (ev.button == Button4) ? UP : DN; 2027 v = ev.button == Button4 ? UP : DN;
2028
1666 if (ev.state & ShiftMask) 2029 if (ev.state & ShiftMask)
1667 i = 1; 2030 i = 1;
1668 else if ((Options & Opt_mouseWheelScrollPage)) 2031 else if (options & Opt_mouseWheelScrollPage)
1669 i = TermWin.nrow - 1; 2032 i = TermWin.nrow - 1;
1670 else 2033 else
1671 i = 5; 2034 i = 5;
2035
1672# ifdef MOUSE_SLIP_WHEELING 2036# ifdef MOUSE_SLIP_WHEELING
1673 if (ev.state & ControlMask) 2037 if (ev.state & ControlMask)
1674 { 2038 {
1675 mouse_slip_wheel_speed += (v ? -1 : 1); 2039 mouse_slip_wheel_speed += v ? -1 : 1;
2040 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow;
2041 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow;
2042
2043 if (slip_wheel_ev.at < NOW)
1676 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2044 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2045
2046 slip_wheel_ev.start ();
1677 } 2047 }
2048 else
2049 {
1678# endif 2050# endif
1679# ifdef JUMP_MOUSE_WHEEL 2051# ifdef JUMP_MOUSE_WHEEL
1680 scr_page (v, i);
1681 scr_refresh (SMOOTH_REFRESH);
1682 scrollbar_show (1);
1683# else
1684 while (i--)
1685 {
1686 scr_page (v, 1); 2052 scr_page (v, i);
1687 scr_refresh (SMOOTH_REFRESH); 2053 scr_refresh (SMOOTH_REFRESH);
1688 scrollbar_show (1); 2054 scrollbar_show (1);
2055# else
2056 while (i--)
2057 {
2058 scr_page (v, 1);
2059 scr_refresh (SMOOTH_REFRESH);
2060 scrollbar_show (1);
2061 }
2062# endif
2063# ifdef MOUSE_SLIP_WHEELING
1689 } 2064 }
1690# endif 2065#endif
1691
1692 } 2066 }
1693 break; 2067 break;
1694#endif 2068#endif
1695
1696 } 2069 }
1697 } 2070 }
1698#ifdef MENUBAR 2071#ifdef MENUBAR
1699 else if (isMenuBarWindow (ev.window)) 2072 else if (isMenuBarWindow (ev.window))
1700 menubar_control (ev); 2073 menubar_control (ev);
1701#endif 2074#endif
1702} 2075}
1703 2076
1704#ifdef TRANSPARENT 2077#ifdef TRANSPARENT
1705#if TINTING 2078#if TINTING
1706/* shading taken from eterm-0.9.2 */ 2079/* taken from aterm-0.4.2 */
1707/* RGB 15 */
1708 2080
1709static void 2081typedef uint32_t RUINT32T;
1710shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1711{
1712 unsigned char *ptr;
1713 int x, y;
1714 2082
1715 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2083void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1716 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2084{
1717 /* No saturation */ 2085 int sh_r, sh_g, sh_b;
1718 for (y = h; --y >= 0;) { 2086 RUINT32T mask_r, mask_g, mask_b;
1719 for (x = -w; x < 0; x++) { 2087 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1720 int r, g, b; 2088 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2089 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2090 int i;
1721 2091
1722 b = ((uint16_t *) ptr)[x]; 2092 Visual* visual = display->visual;
1723 r = (b & 0x7c00) * rm; 2093
1724 g = (b & 0x3e0) * gm; 2094 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1725 b = (b & 0x1f) * bm; 2095
1726 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2096 /* for convenience */
1727 | ((g >> 8) & 0x3e0) 2097 mask_r = visual->red_mask;
1728 | ((b >> 8) & 0x1f); 2098 mask_g = visual->green_mask;
1729 } 2099 mask_b = visual->blue_mask;
1730 ptr += bpl; 2100
1731 } 2101 /* boring lookup table pre-initialization */
2102 switch (srcImage->bits_per_pixel) {
2103 case 15:
2104 if ((mask_r != 0x7c00) ||
2105 (mask_g != 0x03e0) ||
2106 (mask_b != 0x001f))
2107 return;
2108 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2109 lookup_r = lookup;
2110 lookup_g = lookup+32;
2111 lookup_b = lookup+32+32;
2112 sh_r = 10;
2113 sh_g = 5;
2114 sh_b = 0;
2115 break;
2116 case 16:
2117 if ((mask_r != 0xf800) ||
2118 (mask_g != 0x07e0) ||
2119 (mask_b != 0x001f))
2120 return;
2121 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2122 lookup_r = lookup;
2123 lookup_g = lookup+32;
2124 lookup_b = lookup+32+64;
2125 sh_r = 11;
2126 sh_g = 5;
2127 sh_b = 0;
2128 break;
2129 case 24:
2130 if ((mask_r != 0xff0000) ||
2131 (mask_g != 0x00ff00) ||
2132 (mask_b != 0x0000ff))
2133 return;
2134 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2135 lookup_r = lookup;
2136 lookup_g = lookup+256;
2137 lookup_b = lookup+256+256;
2138 sh_r = 16;
2139 sh_g = 8;
2140 sh_b = 0;
2141 break;
2142 case 32:
2143 if ((mask_r != 0xff0000) ||
2144 (mask_g != 0x00ff00) ||
2145 (mask_b != 0x0000ff))
2146 return;
2147 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2148 lookup_r = lookup;
2149 lookup_g = lookup+256;
2150 lookup_b = lookup+256+256;
2151 sh_r = 16;
2152 sh_g = 8;
2153 sh_b = 0;
2154 break;
2155 default:
2156 return; /* we do not support this color depth */
2157 }
2158
2159 /* prepare limits for color transformation (each channel is handled separately) */
2160 if (shade < 0) {
2161 shade = -shade;
2162 if (shade < 0) shade = 0;
2163 if (shade > 100) shade = 100;
2164
2165 lower_lim_r = 65535-rm;
2166 lower_lim_g = 65535-gm;
2167 lower_lim_b = 65535-bm;
2168
2169 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2170 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2171 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2172
2173 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1732 } else { 2174 } else {
1733 for (y = h; --y >= 0;) { 2175 if (shade < 0) shade = 0;
1734 for (x = -w; x < 0; x++) { 2176 if (shade > 100) shade = 100;
1735 int r, g, b;
1736 2177
1737 b = ((uint16_t *) ptr)[x]; 2178 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1738 r = (b & 0x7c00) * rm; 2179
1739 g = (b & 0x3e0) * gm; 2180 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1740 b = (b & 0x1f) * bm; 2181 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1741 r |= (!(r >> 15) - 1); 2182 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1742 g |= (!(g >> 10) - 1); 2183 }
1743 b |= (!(b >> 5) - 1); 2184
1744 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2185 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1745 | ((g >> 8) & 0x3e0) 2186 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1746 | ((b >> 8) & 0x1f); 2187 {
1747 } 2188 unsigned int tmp;
1748 ptr += bpl; 2189
2190 tmp = lower_lim_r;
2191 lower_lim_r = lower_lim_b;
2192 lower_lim_b = tmp;
2193
2194 tmp = upper_lim_r;
2195 upper_lim_r = upper_lim_b;
2196 upper_lim_b = tmp;
2197 }
2198
2199 /* fill our lookup tables */
2200 for (i = 0; i <= mask_r>>sh_r; i++)
2201 {
2202 RUINT32T tmp;
2203 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2204 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2205 lookup_r[i] = (tmp/65535)<<sh_r;
2206 }
2207 for (i = 0; i <= mask_g>>sh_g; i++)
2208 {
2209 RUINT32T tmp;
2210 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2211 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2212 lookup_g[i] = (tmp/65535)<<sh_g;
2213 }
2214 for (i = 0; i <= mask_b>>sh_b; i++)
2215 {
2216 RUINT32T tmp;
2217 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2218 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2219 lookup_b[i] = (tmp/65535)<<sh_b;
2220 }
2221
2222 /* apply table to input image (replacing colors by newly calculated ones) */
2223 switch (srcImage->bits_per_pixel)
2224 {
2225 case 15:
2226 {
2227 unsigned short *p1, *pf, *p, *pl;
2228 p1 = (unsigned short *) srcImage->data;
2229 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2230 while (p1 < pf)
2231 {
2232 p = p1;
2233 pl = p1 + srcImage->width;
2234 for (; p < pl; p++)
1749 } 2235 {
2236 *p = lookup_r[(*p & 0x7c00)>>10] |
2237 lookup_g[(*p & 0x03e0)>> 5] |
2238 lookup_b[(*p & 0x001f)];
2239 }
2240 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1750 } 2241 }
1751} 2242 break;
1752 2243 }
1753/* RGB 16 */ 2244 case 16:
1754static void 2245 {
1755shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2246 unsigned short *p1, *pf, *p, *pl;
1756{ 2247 p1 = (unsigned short *) srcImage->data;
1757 unsigned char *ptr; 2248 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1758 int x, y; 2249 while (p1 < pf)
1759 2250 {
1760 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2251 p = p1;
1761 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2252 pl = p1 + srcImage->width;
1762 /* No saturation */ 2253 for (; p < pl; p++)
1763 for (y = h; --y >= 0;) {
1764 for (x = -w; x < 0; x++) {
1765 int r, g, b;
1766
1767 b = ((uint16_t *) ptr)[x];
1768 r = (b & 0xf800) * rm;
1769 g = (b & 0x7e0) * gm;
1770 b = (b & 0x1f) * bm;
1771 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1772 | ((g >> 8) & 0x7e0)
1773 | ((b >> 8) & 0x1f);
1774 }
1775 ptr += bpl;
1776 } 2254 {
1777 } else { 2255 *p = lookup_r[(*p & 0xf800)>>11] |
1778 for (y = h; --y >= 0;) { 2256 lookup_g[(*p & 0x07e0)>> 5] |
1779 for (x = -w; x < 0; x++) { 2257 lookup_b[(*p & 0x001f)];
1780 int r, g, b;
1781
1782 b = ((uint16_t *) ptr)[x];
1783 r = (b & 0xf800) * rm;
1784 g = (b & 0x7e0) * gm;
1785 b = (b & 0x1f) * bm;
1786 r |= (!(r >> 16) - 1);
1787 g |= (!(g >> 11) - 1);
1788 b |= (!(b >> 5) - 1);
1789 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1790 | ((g >> 8) & 0x7e0)
1791 | ((b >> 8) & 0x1f);
1792 } 2258 }
1793 ptr += bpl; 2259 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2260 }
2261 break;
2262 }
2263 case 24:
2264 {
2265 unsigned char *p1, *pf, *p, *pl;
2266 p1 = (unsigned char *) srcImage->data;
2267 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2268 while (p1 < pf)
2269 {
2270 p = p1;
2271 pl = p1 + srcImage->width * 3;
2272 for (; p < pl; p += 3)
1794 } 2273 {
2274 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2275 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2276 p[2] = lookup_r[(p[2] & 0x0000ff)];
2277 }
2278 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1795 } 2279 }
1796} 2280 break;
2281 }
2282 case 32:
2283 {
2284 RUINT32T *p1, *pf, *p, *pl;
2285 p1 = (RUINT32T *) srcImage->data;
2286 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1797 2287
1798/* RGB 24 */ 2288 while (p1 < pf)
1799static void 2289 {
1800shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2290 p = p1;
1801{ 2291 pl = p1 + srcImage->width;
1802 unsigned char *ptr; 2292 for (; p < pl; p++)
1803 int x, y;
1804
1805 ptr = (unsigned char *)data + (w * 3);
1806 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1807 /* No saturation */
1808 for (y = h; --y >= 0;) {
1809 for (x = -(w * 3); x < 0; x += 3) {
1810 int r, g, b;
1811
1812 if (byteorder.big_endian()) {
1813 r = (ptr[x + 0] * rm) >> 8;
1814 g = (ptr[x + 1] * gm) >> 8;
1815 b = (ptr[x + 2] * bm) >> 8;
1816 ptr[x + 0] = r;
1817 ptr[x + 1] = g;
1818 ptr[x + 2] = b;
1819 } else {
1820 r = (ptr[x + 2] * rm) >> 8;
1821 g = (ptr[x + 1] * gm) >> 8;
1822 b = (ptr[x + 0] * bm) >> 8;
1823 ptr[x + 2] = r;
1824 ptr[x + 1] = g;
1825 ptr[x + 0] = b;
1826 }
1827 }
1828 ptr += bpl;
1829 } 2293 {
1830 } else { 2294 *p = lookup_r[(*p & 0xff0000)>>16] |
1831 for (y = h; --y >= 0;) { 2295 lookup_g[(*p & 0x00ff00)>> 8] |
1832 for (x = -(w * 3); x < 0; x += 3) { 2296 lookup_b[(*p & 0x0000ff)] |
1833 int r, g, b; 2297 (*p & ~0xffffff);
1834
1835 if (byteorder.big_endian()) {
1836 r = (ptr[x + 0] * rm) >> 8;
1837 g = (ptr[x + 1] * gm) >> 8;
1838 b = (ptr[x + 2] * bm) >> 8;
1839
1840 r |= (!(r >> 8) - 1);
1841 g |= (!(g >> 8) - 1);
1842 b |= (!(b >> 8) - 1);
1843
1844 ptr[x + 0] = r;
1845 ptr[x + 1] = g;
1846 ptr[x + 2] = b;
1847 } else {
1848 r = (ptr[x + 2] * rm) >> 8;
1849 g = (ptr[x + 1] * gm) >> 8;
1850 b = (ptr[x + 0] * bm) >> 8;
1851
1852 r |= (!(r >> 8) - 1);
1853 g |= (!(g >> 8) - 1);
1854 b |= (!(b >> 8) - 1);
1855
1856 ptr[x + 2] = r;
1857 ptr[x + 1] = g;
1858 ptr[x + 0] = b;
1859 }
1860 } 2298 }
1861 ptr += bpl; 2299 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1862 } 2300 }
2301 break;
2302 }
1863 } 2303 }
1864}
1865 2304
1866/* RGB 32 */ 2305 free (lookup);
1867static void
1868shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1869{
1870 unsigned char *ptr;
1871 int x, y;
1872
1873 ptr = (unsigned char *)data + (w * 4);
1874 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1875 /* No saturation */
1876 for (y = h; --y >= 0;) {
1877 if (byteorder.big_endian()) {
1878 for (x = -(w * 4); x < 0; x += 4) {
1879 int r, g, b;
1880
1881 r = (ptr[x + 1] * rm) >> 8;
1882 g = (ptr[x + 2] * gm) >> 8;
1883 b = (ptr[x + 3] * bm) >> 8;
1884 ptr[x + 1] = r;
1885 ptr[x + 2] = g;
1886 ptr[x + 3] = b;
1887 }
1888 } else {
1889 for (x = -(w * 4); x < 0; x += 4) {
1890 int r, g, b;
1891
1892 r = (ptr[x + 2] * rm) >> 8;
1893 g = (ptr[x + 1] * gm) >> 8;
1894 b = (ptr[x + 0] * bm) >> 8;
1895 ptr[x + 2] = r;
1896 ptr[x + 1] = g;
1897 ptr[x + 0] = b;
1898 }
1899 }
1900 ptr += bpl;
1901 }
1902 } else {
1903 for (y = h; --y >= 0;) {
1904 for (x = -(w * 4); x < 0; x += 4) {
1905 int r, g, b;
1906
1907 if (byteorder.big_endian()) {
1908 r = (ptr[x + 1] * rm) >> 8;
1909 g = (ptr[x + 2] * gm) >> 8;
1910 b = (ptr[x + 3] * bm) >> 8;
1911
1912 r |= (!(r >> 8) - 1);
1913 g |= (!(g >> 8) - 1);
1914 b |= (!(b >> 8) - 1);
1915
1916 ptr[x + 1] = r;
1917 ptr[x + 2] = g;
1918 ptr[x + 3] = b;
1919 } else {
1920 r = (ptr[x + 2] * rm) >> 8;
1921 g = (ptr[x + 1] * gm) >> 8;
1922 b = (ptr[x + 0] * bm) >> 8;
1923
1924 r |= (!(r >> 8) - 1);
1925 g |= (!(g >> 8) - 1);
1926 b |= (!(b >> 8) - 1);
1927
1928 ptr[x + 2] = r;
1929 ptr[x + 1] = g;
1930 ptr[x + 0] = b;
1931 }
1932 }
1933 ptr += bpl;
1934 }
1935 }
1936} 2306}
1937
1938#endif 2307#endif
1939 2308
1940/* 2309/*
1941 * Check our parents are still who we think they are. 2310 * Check our parents are still who we think they are.
1942 * Do transparency updates if required 2311 * Do transparency updates if required
… …
1952 Pixmap rootpixmap = None; 2321 Pixmap rootpixmap = None;
1953 XWindowAttributes wattr, wrootattr; 2322 XWindowAttributes wattr, wrootattr;
1954 2323
1955 pchanged = 0; 2324 pchanged = 0;
1956 2325
1957 if (!(Options & Opt_transparent)) 2326 if (!(options & Opt_transparent))
1958 return pchanged; /* Don't try any more */ 2327 return pchanged; /* Don't try any more */
1959 2328
1960 XGetWindowAttributes (display->display, display->root, &wrootattr); 2329 XGetWindowAttributes (display->display, display->root, &wrootattr);
1961 rootdepth = wrootattr.depth; 2330 rootdepth = wrootattr.depth;
1962 2331
… …
1965 if (rootdepth != wattr.depth) 2334 if (rootdepth != wattr.depth)
1966 { 2335 {
1967 if (am_transparent) 2336 if (am_transparent)
1968 { 2337 {
1969 pchanged = 1; 2338 pchanged = 1;
1970 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2339 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1971 am_transparent = am_pixmap_trans = 0; 2340 am_transparent = am_pixmap_trans = 0;
1972 } 2341 }
1973 2342
1974 return pchanged; /* Don't try any more */ 2343 return pchanged; /* Don't try any more */
1975 } 2344 }
… …
1991 i = (xa[XA_XSETROOTID] 2360 i = (xa[XA_XSETROOTID]
1992 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2361 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
1993 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2362 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1994 &nitems, &bytes_after, &prop) == Success); 2363 &nitems, &bytes_after, &prop) == Success);
1995 2364
1996 if (!i || prop == NULL) 2365 if (!i || prop == NULL
2366#if TINTING
2367 || !rs[Rs_color + Color_tint]
2368#endif
2369 )
1997 have_pixmap = 0; 2370 have_pixmap = 0;
1998 else 2371 else
1999 { 2372 {
2000 have_pixmap = 1; 2373 have_pixmap = 1;
2001 rootpixmap = * ((Pixmap *)prop); 2374 rootpixmap = *(Pixmap *)prop;
2002 XFree (prop); 2375 XFree (prop);
2003 } 2376 }
2004 2377
2005 if (have_pixmap) 2378 if (have_pixmap)
2006 { 2379 {
… …
2063 XFreePixmap (display->display, TermWin.pixmap); 2436 XFreePixmap (display->display, TermWin.pixmap);
2064 2437
2065#if TINTING 2438#if TINTING
2066 if (ISSET_PIXCOLOR (Color_tint)) 2439 if (ISSET_PIXCOLOR (Color_tint))
2067 { 2440 {
2068 unsigned short shade, rm, gm, bm; 2441 unsigned short rm, gm, bm;
2442 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2069 2443
2070 PixColors[Color_tint].get (display, rm, gm, bm); 2444 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2071 2445
2072 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2446 ShadeXImage (display, image, shade, rm, gm, bm);
2073
2074 /* Determine bitshift and bitmask values */
2075 switch (image->bits_per_pixel)
2076 {
2077 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2078 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2079 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2080 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2081 }
2082 } 2447 }
2083#endif 2448#endif
2084 2449
2085 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2450 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2086 szHint.width, szHint.height, image->depth); 2451 szHint.width, szHint.height, image->depth);
2087 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2452 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2088 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2453 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2089 nx, ny, image->width, image->height); 2454 nx, ny, image->width, image->height);
2090 XFreeGC (display->display, gc); 2455 XFreeGC (display->display, gc);
2091 XDestroyImage (image); 2456 XDestroyImage (image);
2092 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2457 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2093 TermWin.pixmap); 2458 XClearWindow (display->display, TermWin.parent[0]);
2094 2459
2095 if (!am_transparent || !am_pixmap_trans) 2460 if (!am_transparent || !am_pixmap_trans)
2096 pchanged = 1; 2461 pchanged = 1;
2097 2462
2098 am_transparent = am_pixmap_trans = 1; 2463 am_transparent = am_pixmap_trans = 1;
… …
2103 { 2468 {
2104 unsigned int n; 2469 unsigned int n;
2105 /* 2470 /*
2106 * InheritPixmap transparency 2471 * InheritPixmap transparency
2107 */ 2472 */
2108 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2109 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2473 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2110 { 2474 {
2111 oldp = TermWin.parent[i]; 2475 oldp = TermWin.parent[i];
2112 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2476 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2113 &TermWin.parent[i], &list, &n); 2477 &TermWin.parent[i], &list, &n);
2114 XFree (list); 2478 XFree (list);
2115 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2116 2479
2117 if (TermWin.parent[i] == display->root) 2480 if (TermWin.parent[i] == display->root)
2118 { 2481 {
2119 if (oldp != None) 2482 if (oldp != None)
2120 pchanged = 1; 2483 pchanged = 1;
… …
2131 if (pchanged) 2494 if (pchanged)
2132 { 2495 {
2133 for (; n < (unsigned int)i; n++) 2496 for (; n < (unsigned int)i; n++)
2134 { 2497 {
2135 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2498 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2136 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2137 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2499 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2138 { 2500 {
2139 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2501 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2140 break; 2502 break;
2141 } 2503 }
2142 } 2504 }
2143 } 2505 }
2144 2506
2145 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2507 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2146 { 2508 {
2147 D_X ((stderr, "InheritPixmap Turning off"));
2148 XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); 2509 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2149 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); 2510 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2150 am_transparent = 0; 2511 am_transparent = 0;
2151 /* XXX: also turn off Opt_transparent? */ 2512 /* XXX: also turn off Opt_transparent? */
2152 } 2513 }
2153 else 2514 else
2154 { 2515 {
2155#if WAIT_FOR_WM 2516#if WAIT_FOR_WM
2156 /* wait (an arbitrary period) for the WM to do its thing 2517 /* wait (an arbitrary period) for the WM to do its thing
2157 * needed for fvwm2.2.2 (and before?) */ 2518 * needed for fvwm2.2.2 (and before?) */
2158 sleep (1); 2519 sleep (1);
2159#endif 2520#endif
2160 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2161 for (n = 0; n < (unsigned int)i; n++) 2521 for (n = 0; n < (unsigned int)i; n++)
2522 {
2162 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2523 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2524 XClearWindow (display->display, TermWin.parent[n]);
2525 }
2163 2526
2164 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2527 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2165 am_transparent = 1; 2528 am_transparent = 1;
2166 } 2529 }
2167 2530
2168 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2531 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2169 TermWin.parent[i] = None; 2532 TermWin.parent[i] = None;
2533 }
2534
2535 if (scrollBar.win)
2536 {
2537 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2538 scrollBar.setIdle ();
2539 scrollbar_show (0);
2170 } 2540 }
2171 2541
2172 return pchanged; 2542 return pchanged;
2173} 2543}
2174#endif 2544#endif
… …
2191 } 2561 }
2192 2562
2193 if (ch == NOCHAR) // TODO: improve 2563 if (ch == NOCHAR) // TODO: improve
2194 break; 2564 break;
2195 2565
2196 if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') 2566 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2567 {
2568 if (!seen_input)
2197 { 2569 {
2570 seen_input = 1;
2571 // many badly-written programs (e.g. jed) contain a race condition:
2572 // they first read the screensize and then install a SIGWINCH handler.
2573 // some window managers resize the window early, and these programs
2574 // then sometimes get the size wrong.
2575 // unfortunately other programs are even more buggy and dislike
2576 // being sent SIGWINCH, so only do it when we were in fact being
2577 // resized.
2578 if (seen_resize)
2579 kill (-cmd_pid, SIGWINCH);
2580 }
2581
2198 /* Read a text string from the input buffer */ 2582 /* Read a text string from the input buffer */
2199 unicode_t buf[UBUFSIZ]; 2583 unicode_t buf[UBUFSIZ];
2200 bool refreshnow = false; 2584 bool refreshnow = false;
2201 int nlines = 0; 2585 int nlines = 0;
2202 unicode_t *str = buf; 2586 unicode_t *str = buf;
2203 2587
2204 *str++ = ch;
2205
2206 for (;;) 2588 for (;;)
2207 { 2589 {
2208 seq_begin = cmdbuf_ptr;
2209 ch = next_char ();
2210
2211 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) 2590 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2212 break; 2591 break;
2213 2592
2214 *str++ = ch; 2593 *str++ = ch;
2215 2594
2216 if (ch == '\n') 2595 if (ch == C0_LF)
2217 { 2596 {
2218 nlines++; 2597 nlines++;
2219 refresh_count++; 2598 refresh_count++;
2220 2599
2221 if (! (Options & Opt_jumpScroll) 2600 if (!(options & Opt_jumpScroll)
2222 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2601 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2223 { 2602 {
2224 refreshnow = true; 2603 refreshnow = true;
2225 flag = true;
2226 ch = NOCHAR; 2604 ch = NOCHAR;
2227 break; 2605 break;
2228 } 2606 }
2229 2607
2230 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2608 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2231 if (nlines >= TermWin.nrow - 1) 2609 if (nlines >= TermWin.nrow - 1)
2232 { 2610 {
2233 scr_add_lines (buf, nlines, str - buf); 2611 scr_add_lines (buf, nlines, str - buf);
2234 nlines = 0; 2612 nlines = 0;
2235 str = buf; 2613 str = buf;
… …
2239 if (str >= buf + UBUFSIZ) 2617 if (str >= buf + UBUFSIZ)
2240 { 2618 {
2241 ch = NOCHAR; 2619 ch = NOCHAR;
2242 break; 2620 break;
2243 } 2621 }
2622
2623 seq_begin = cmdbuf_ptr;
2624 ch = next_char ();
2244 } 2625 }
2245 2626
2246 scr_add_lines (buf, nlines, str - buf); 2627 scr_add_lines (buf, nlines, str - buf);
2247 2628
2248 /* 2629 /*
2249 * If there have been a lot of new lines, then update the screen 2630 * If there have been a lot of new lines, then update the screen
2250 * What the heck I'll cheat and only refresh less than every page-full. 2631 * What the heck I'll cheat and only refresh less than every page-full.
2251 * the number of pages between refreshes is refresh_limit, which 2632 * the number of pages between refreshes is refresh_limit, which
2252 * is incremented here because we must be doing flat-out scrolling. 2633 * is incremented here because we must be doing flat-out scrolling.
2253 *
2254 * refreshing should be correct for small scrolls, because of the
2255 * time-out
2256 */ 2634 */
2257 if (refreshnow) 2635 if (refreshnow)
2258 { 2636 {
2259 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2637 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2260 refresh_limit++; 2638 refresh_limit++;
2261 2639 else
2640 {
2641 flag = true;
2262 scr_refresh (refresh_type); 2642 scr_refresh (refresh_type);
2643 }
2263 } 2644 }
2264 2645
2265 } 2646 }
2266 else 2647 else
2267 { 2648 {
… …
2281 } 2662 }
2282 2663
2283 return flag; 2664 return flag;
2284} 2665}
2285 2666
2667// read the next octet
2668unicode_t
2669rxvt_term::next_octet ()
2670{
2671 return cmdbuf_ptr < cmdbuf_endp
2672 ? *cmdbuf_ptr++
2673 : NOCHAR;
2674}
2675
2286// read the next character 2676// read the next character
2287unicode_t 2677unicode_t
2288rxvt_term::next_char () 2678rxvt_term::next_char ()
2289{ 2679{
2290 while (cmdbuf_ptr < cmdbuf_endp) 2680 while (cmdbuf_ptr < cmdbuf_endp)
… …
2321 */ 2711 */
2322unicode_t 2712unicode_t
2323rxvt_term::cmd_getc () 2713rxvt_term::cmd_getc ()
2324{ 2714{
2325 unicode_t c = next_char (); 2715 unicode_t c = next_char ();
2716
2717 if (c == NOCHAR)
2718 throw out_of_input;
2719
2720 return c;
2721}
2722
2723unicode_t
2724rxvt_term::cmd_get8 ()
2725{
2726 unicode_t c = next_octet ();
2326 2727
2327 if (c == NOCHAR) 2728 if (c == NOCHAR)
2328 throw out_of_input; 2729 throw out_of_input;
2329 2730
2330 return c; 2731 return c;
… …
2431 process_escape_seq (); 2832 process_escape_seq ();
2432 break; 2833 break;
2433 case C0_ENQ: /* terminal Status */ 2834 case C0_ENQ: /* terminal Status */
2434 if (rs[Rs_answerbackstring]) 2835 if (rs[Rs_answerbackstring])
2435 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2836 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2436 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2837 (unsigned int)strlen (rs[Rs_answerbackstring]));
2437 else 2838 else
2438 tt_write ((unsigned char *)VT100_ANS, 2839 tt_write ((unsigned char *)VT100_ANS,
2439 (unsigned int)STRLEN (VT100_ANS)); 2840 (unsigned int)strlen (VT100_ANS));
2440 break; 2841 break;
2441 case C0_BEL: /* bell */ 2842 case C0_BEL: /* bell */
2442 scr_bell (); 2843 scr_bell ();
2443 break; 2844 break;
2444 case C0_BS: /* backspace */ 2845 case C0_BS: /* backspace */
… …
2460 break; 2861 break;
2461 case C0_SI: /* shift in - acs */ 2862 case C0_SI: /* shift in - acs */
2462 scr_charset_choose (0); 2863 scr_charset_choose (0);
2463 break; 2864 break;
2464 2865
2866#ifdef EIGHT_BIT_CONTROLS
2465 // 8-bit controls 2867 // 8-bit controls
2466 case 0x90: /* DCS */ 2868 case 0x90: /* DCS */
2467 process_dcs_seq (); 2869 process_dcs_seq ();
2468 break; 2870 break;
2469 case 0x9b: /* CSI */ 2871 case 0x9b: /* CSI */
2470 process_csi_seq (); 2872 process_csi_seq ();
2471 break; 2873 break;
2472 case 0x9d: /* CSI */ 2874 case 0x9d: /* CSI */
2473 process_osc_seq (); 2875 process_osc_seq ();
2474 break; 2876 break;
2877#endif
2475 } 2878 }
2476} 2879}
2477/*}}} */ 2880/*}}} */
2478 2881
2479 2882
… …
2541void 2944void
2542rxvt_term::process_escape_seq () 2945rxvt_term::process_escape_seq ()
2543{ 2946{
2544 unicode_t ch = cmd_getc (); 2947 unicode_t ch = cmd_getc ();
2545 2948
2546 if (PrivateModes & PrivMode_vt52) 2949 if (priv_modes & PrivMode_vt52)
2547 { 2950 {
2548 process_escape_vt52 (ch); 2951 process_escape_vt52 (ch);
2549 return; 2952 return;
2550 } 2953 }
2551 2954
… …
2566 scr_charset_set (2, (unsigned int)cmd_getc ()); 2969 scr_charset_set (2, (unsigned int)cmd_getc ());
2567 break; 2970 break;
2568 case '+': 2971 case '+':
2569 scr_charset_set (3, (unsigned int)cmd_getc ()); 2972 scr_charset_set (3, (unsigned int)cmd_getc ());
2570 break; 2973 break;
2571#ifndef NO_FRILLS 2974#if ENABLE_FRILLS
2572 case '6': 2975 case '6':
2573 scr_backindex (); 2976 scr_backindex ();
2574 break; 2977 break;
2575#endif 2978#endif
2576 case '7': 2979 case '7':
2577 scr_cursor (SAVE); 2980 scr_cursor (SAVE);
2578 break; 2981 break;
2579 case '8': 2982 case '8':
2580 scr_cursor (RESTORE); 2983 scr_cursor (RESTORE);
2581 break; 2984 break;
2582#ifndef NO_FRILLS 2985#if ENABLE_FRILLS
2583 case '9': 2986 case '9':
2584 scr_forwardindex (); 2987 scr_forwardindex ();
2585 break; 2988 break;
2586#endif 2989#endif
2587 case '=': 2990 case '=':
… …
2597 break; 3000 break;
2598 3001
2599 /* 8.3.87: NEXT LINE */ 3002 /* 8.3.87: NEXT LINE */
2600 case C1_NEL: /* ESC E */ 3003 case C1_NEL: /* ESC E */
2601 { 3004 {
2602 unicode_t nlcr[] = { L'\n', L'\r' }; 3005 unicode_t nlcr[] = { C0_LF, C0_CR };
2603 scr_add_lines (nlcr, 1, 2); 3006 scr_add_lines (nlcr, 1, 2);
2604 } 3007 }
2605 break; 3008 break;
2606 3009
2607 /* kidnapped escape sequence: Should be 8.3.48 */ 3010 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2668 3071
2669/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3072/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2670/* *INDENT-OFF* */ 3073/* *INDENT-OFF* */
2671enum { 3074enum {
2672 CSI_ICH = 0x40, 3075 CSI_ICH = 0x40,
2673 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 3076 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2674 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 3077 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2675 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 3078 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2676 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, 3079 CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F,
2677 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, 3080 CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC,
2678 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 3081 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
… …
2886 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3289 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2887 break; 3290 break;
2888 3291
2889 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3292 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2890 tt_write ((const unsigned char *)VT100_ANS, 3293 tt_write ((const unsigned char *)VT100_ANS,
2891 (unsigned int) (sizeof (VT100_ANS) - 1)); 3294 (unsigned int) (sizeof (VT100_ANS) - 1));
2892 break; 3295 break;
2893 3296
2894 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3297 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2895 process_sgr_mode (nargs, arg); 3298 process_sgr_mode (nargs, arg);
2896 break; 3299 break;
… …
2903 break; 3306 break;
2904 case 6: /* CPR requested */ 3307 case 6: /* CPR requested */
2905 scr_report_position (); 3308 scr_report_position ();
2906 break; 3309 break;
2907 case 7: /* unofficial extension */ 3310 case 7: /* unofficial extension */
2908 if (Options & Opt_insecure) 3311 if (options & Opt_insecure)
2909 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3312 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2910 break; 3313 break;
2911 case 8: /* unofficial extension */ 3314 case 8: /* unofficial extension */
2912 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3315 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2913 break; 3316 break;
2914 } 3317 }
… …
2950 break; 3353 break;
2951 3354
2952 case CSI_RM: /* 8.3.107: RESET MODE */ 3355 case CSI_RM: /* 8.3.107: RESET MODE */
2953 if (arg[0] == 4) 3356 if (arg[0] == 4)
2954 scr_insert_mode (0); 3357 scr_insert_mode (0);
3358 else if (arg[0] == 20)
3359 priv_modes &= ~PrivMode_LFNL;
2955 break; 3360 break;
2956 3361
2957 case CSI_SM: /* 8.3.126: SET MODE */ 3362 case CSI_SM: /* 8.3.126: SET MODE */
2958 if (arg[0] == 4) 3363 if (arg[0] == 4)
2959 scr_insert_mode (1); 3364 scr_insert_mode (1);
3365 else if (arg[0] == 20)
3366 priv_modes |= PrivMode_LFNL;
2960 break; 3367 break;
2961 3368
2962 /* 3369 /*
2963 * PRIVATE USE beyond this point. All CSI_7? sequences here 3370 * PRIVATE USE beyond this point. All CSI_7? sequences here
2964 */ 3371 */
… …
2976 break; 3383 break;
2977 case CSI_75: 3384 case CSI_75:
2978 scr_cursor (RESTORE); 3385 scr_cursor (RESTORE);
2979 break; 3386 break;
2980 3387
2981#ifndef NO_FRILLS 3388#if ENABLE_FRILLS
2982 case CSI_74: 3389 case CSI_74:
2983 process_window_ops (arg, nargs); 3390 process_window_ops (arg, nargs);
2984 break; 3391 break;
2985#endif 3392#endif
2986 3393
… …
2993 break; 3400 break;
2994 } 3401 }
2995} 3402}
2996/*}}} */ 3403/*}}} */
2997 3404
2998#ifndef NO_FRILLS 3405#if ENABLE_FRILLS
2999/* ARGSUSED */ 3406/* ARGSUSED */
3000void 3407void
3001rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3408rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3002{ 3409{
3003 int x, y; 3410 int x, y;
… …
3070 break; 3477 break;
3071 case 19: /* report window size (chars) */ 3478 case 19: /* report window size (chars) */
3072 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3479 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3073 break; 3480 break;
3074 case 20: /* report icon label */ 3481 case 20: /* report icon label */
3075 if (Options & Opt_insecure)
3076 { 3482 {
3077 char *s; 3483 char *s;
3078 XGetIconName (display->display, TermWin.parent[0], &s); 3484 XGetIconName (display->display, TermWin.parent[0], &s);
3079 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3485 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3486 XFree (s);
3080 } 3487 }
3081 break; 3488 break;
3082 case 21: /* report window title */ 3489 case 21: /* report window title */
3083 if (Options & Opt_insecure)
3084 { 3490 {
3085 char *s; 3491 char *s;
3086 XFetchName (display->display, TermWin.parent[0], &s); 3492 XFetchName (display->display, TermWin.parent[0], &s);
3087 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);
3088 } 3495 }
3089 break; 3496 break;
3090 } 3497 }
3091} 3498}
3092#endif 3499#endif
3093 3500
3094/*----------------------------------------------------------------------*/ 3501/*----------------------------------------------------------------------*/
3095/* 3502/*
3096 * get input up until STRING TERMINATOR (or BEL) 3503 * get input up until STRING TERMINATOR (or BEL)
3097 * ends_how is terminator used. returned input must be free ()d 3504 * ends_how is terminator used. returned input must be free()'d
3098 */ 3505 */
3099unsigned char * 3506unsigned char *
3100rxvt_term::get_to_st (unicode_t &ends_how) 3507rxvt_term::get_to_st (unicode_t &ends_how)
3101{ 3508{
3102 int seen_esc = 0; /* seen escape? */ 3509 unicode_t seen_esc = 0, ch;
3103 unsigned int n = 0; 3510 unsigned int n = 0;
3104 unsigned char *s; 3511 unsigned char *s;
3105 unicode_t ch;
3106 unsigned char string[STRING_MAX]; 3512 unsigned char string[STRING_MAX];
3107 3513
3108 while ((ch = cmd_getc ())) 3514 while ((ch = cmd_getc ()) != NOCHAR)
3109 { 3515 {
3110 if (ch == C0_BEL || ch == CHAR_ST)
3111 break;
3112
3113 if (seen_esc) 3516 if (seen_esc)
3517 {
3114 if (ch == 0x5c) /* 7bit ST */ 3518 if (ch == 0x5c) /* 7bit ST */
3115 break; 3519 break;
3116 else 3520 else
3117 return NULL; 3521 return NULL;
3118 3522 }
3119 if (ch == C0_ESC) 3523 else if (ch == C0_ESC)
3120 { 3524 {
3121 seen_esc = 1; 3525 seen_esc = 1;
3122 continue; 3526 continue;
3123 } 3527 }
3124 else if (ch == '\t') 3528 else if (ch == C0_BEL || ch == CHAR_ST)
3125 ch = ' '; /* translate '\t' to space */ 3529 break;
3126 else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d)) 3530 else if (ch < 0x20)
3127 return NULL; /* other control character - exit */ 3531 return NULL; /* other control character - exit */
3532
3533 seen_esc = 0;
3128 3534
3129 if (n >= sizeof (string) - 1) 3535 if (n >= sizeof (string) - 1)
3130 // stop at some sane length 3536 // stop at some sane length
3131 return NULL; 3537 return NULL;
3132 3538
3539 if (ch == C0_SYN)
3540 string[n++] = cmd_get8 ();
3541 else
3133 string[n++] = ch; 3542 string[n++] = ch;
3134 seen_esc = 0;
3135 } 3543 }
3136 3544
3137 string[n++] = '\0'; 3545 string[n++] = '\0';
3138 3546
3139 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3547 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3140 return NULL; 3548 return NULL;
3141 3549
3142 ends_how = (ch == 0x5c ? C0_ESC : ch); 3550 ends_how = (ch == 0x5c ? C0_ESC : ch);
3143 STRNCPY (s, string, n); 3551 strncpy (s, string, n);
3144 return s; 3552 return s;
3145} 3553}
3146 3554
3147/*----------------------------------------------------------------------*/ 3555/*----------------------------------------------------------------------*/
3148/* 3556/*
… …
3193void 3601void
3194rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3602rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3195{ 3603{
3196 if (str[0] == '?' && !str[1]) 3604 if (str[0] == '?' && !str[1])
3197 { 3605 {
3198 if (Options & Opt_insecure)
3199 {
3200 unsigned short r, g, b; 3606 unsigned short r, g, b;
3201 PixColors[color].get (display, r, g, b); 3607 pix_colors_focused[color].get (display, r, g, b);
3202 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3608 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3203 }
3204 } 3609 }
3205 else 3610 else
3206 set_window_color (color, str); 3611 set_window_color (color, str);
3207} 3612}
3208 3613
… …
3236{ 3641{
3237 int changed = 0; 3642 int changed = 0;
3238 int color; 3643 int color;
3239 char *buf, *name; 3644 char *buf, *name;
3240 bool query = str[0] == '?' && !str[1]; 3645 bool query = str[0] == '?' && !str[1];
3646 int saveop = op;
3241 3647
3242 assert (str != NULL); 3648 assert (str != NULL);
3243 switch (op) 3649 switch (op)
3244 { 3650 {
3245 case XTerm_name: 3651 case XTerm_name:
… …
3294 break; 3700 break;
3295 3701
3296 case XTerm_Color: 3702 case XTerm_Color:
3297 for (buf = (char *)str; buf && *buf;) 3703 for (buf = (char *)str; buf && *buf;)
3298 { 3704 {
3299 if ((name = STRCHR (buf, ';')) == NULL) 3705 if ((name = strchr (buf, ';')) == NULL)
3300 break; 3706 break;
3301 3707
3302 *name++ = '\0'; 3708 *name++ = '\0';
3303 color = atoi (buf); 3709 color = atoi (buf);
3304 3710
3305 if (color < 0 || color >= TOTAL_COLORS) 3711 if (color < 0 || color >= TOTAL_COLORS)
3306 break; 3712 break;
3307 3713
3308 if ((buf = STRCHR (name, ';')) != NULL) 3714 if ((buf = strchr (name, ';')) != NULL)
3309 *buf++ = '\0'; 3715 *buf++ = '\0';
3310 3716
3311 if (name[0] == '?' && !name[1]) 3717 if (name[0] == '?' && !name[1])
3312 { 3718 {
3313 if (Options & Opt_insecure)
3314 {
3315 unsigned short r, g, b; 3719 unsigned short r, g, b;
3316 PixColors[color + minCOLOR].get (display, r, g, b); 3720 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3317 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3721 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3318 }
3319 } 3722 }
3320 else 3723 else
3321 set_window_color (color + minCOLOR, name); 3724 set_window_color (color + minCOLOR, name);
3322 } 3725 }
3323 break; 3726 break;
… …
3340 break; 3743 break;
3341#ifndef NO_BOLD_UNDERLINE_REVERSE 3744#ifndef NO_BOLD_UNDERLINE_REVERSE
3342 case XTerm_Color_BD: 3745 case XTerm_Color_BD:
3343 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3746 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3344 break; 3747 break;
3748 case XTerm_Color_IT:
3749 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3750 break;
3345 case XTerm_Color_UL: 3751 case XTerm_Color_UL:
3346 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3752 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3347 break; 3753 break;
3348 case XTerm_Color_RV: 3754 case XTerm_Color_RV:
3349 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3755 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3756 break;
3757#endif
3758#if TRANSPARENT || TINTING
3759 case XTerm_Color_tint:
3760 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3761 check_our_parents ();
3762 if (am_transparent)
3763 want_full_refresh = want_refresh = 1;
3350 break; 3764 break;
3351#endif 3765#endif
3352 3766
3353 case XTerm_Pixmap: 3767 case XTerm_Pixmap:
3354 if (*str != ';') 3768 if (*str != ';')
… …
3357 scale_pixmap (""); /* reset to default scaling */ 3771 scale_pixmap (""); /* reset to default scaling */
3358 set_bgPixmap (str); /* change pixmap */ 3772 set_bgPixmap (str); /* change pixmap */
3359#endif 3773#endif
3360 scr_touch (true); 3774 scr_touch (true);
3361 } 3775 }
3362 while ((str = STRCHR (str, ';')) != NULL) 3776 while ((str = strchr (str, ';')) != NULL)
3363 { 3777 {
3364 str++; 3778 str++;
3365#if XPM_BACKGROUND 3779#if XPM_BACKGROUND
3366 changed += scale_pixmap (str); 3780 changed += scale_pixmap (str);
3367#endif 3781#endif
… …
3386 case XTerm_logfile: 3800 case XTerm_logfile:
3387 // TODO, when secure mode? 3801 // TODO, when secure mode?
3388 break; 3802 break;
3389 3803
3390 case XTerm_font: 3804 case XTerm_font:
3805 op = URxvt_font;
3806 case URxvt_font:
3807#if ENABLE_STYLES
3808 case URxvt_boldFont:
3809 case URxvt_italicFont:
3810 case URxvt_boldItalicFont:
3811#endif
3391 if (query) 3812 if (query)
3813 tt_printf ("\33]%d;%-.250s%c", saveop,
3814 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc
3815 ? TermWin.fontset[op - URxvt_font]->fontdesc : "",
3816 resp);
3817 else
3392 { 3818 {
3393 if (Options & Opt_insecure) 3819 const char *&res = rs[Rs_font + (op - URxvt_font)];
3394 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3820
3395 TermWin.fontset->fontdesc 3821 res = strdup (str);
3396 ? TermWin.fontset->fontdesc 3822 allocated.push_back ((void *)res);
3397 : "", 3823 set_fonts ();
3398 resp);
3399 } 3824 }
3400 else
3401 change_font (str);
3402 break; 3825 break;
3403 3826
3404#ifndef NO_FRILLS 3827#if ENABLE_FRILLS
3405 case XTerm_locale: 3828 case XTerm_locale:
3406 if (query) 3829 if (query)
3407 {
3408 if (Options & Opt_insecure)
3409 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3830 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3410 }
3411 else 3831 else
3412 { 3832 {
3413 set_locale (str); 3833 set_locale (str);
3414# ifdef USE_XIM 3834# ifdef USE_XIM
3415 im_cb (); 3835 im_cb ();
3416# endif 3836# endif
3417 } 3837 }
3418 break; 3838 break;
3419
3420 case XTerm_findfont:
3421 if (Options & Opt_insecure)
3422 {
3423 int fid = TermWin.fontset->find_font (atoi (str));
3424 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3425 fid, (*TermWin.fontset)[fid]->name, resp);
3426 }
3427 break;
3428#endif 3839#endif
3429 3840
3430#ifdef MENUBAR 3841#ifdef MENUBAR
3431 case XTerm_Menu: 3842 case XTerm_Menu:
3432 if (Options & Opt_insecure) 3843 if (options & Opt_insecure)
3433 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3844 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3434 break; 3845 break;
3435#endif 3846#endif
3436#if 0 3847#if 0
3437 case XTerm_dumpscreen: /* no error notices */ 3848 case XTerm_dumpscreen: /* no error notices */
… …
3464{ 3875{
3465 int state; 3876 int state;
3466 3877
3467 if (mode == 's') 3878 if (mode == 's')
3468 { 3879 {
3469 SavedModes |= (PrivateModes & bit); 3880 SavedModes |= (priv_modes & bit);
3470 return -1; 3881 return -1;
3471 } 3882 }
3472 else 3883 else
3473 { 3884 {
3474 if (mode == 'r') 3885 if (mode == 'r')
3475 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3886 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3476 else 3887 else
3477 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3888 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3478 PrivMode (state, bit); 3889 PrivMode (state, bit);
3479 } 3890 }
3480 3891
3481 return state; 3892 return state;
3482} 3893}
… …
3500 { 3, PrivMode_132 }, 3911 { 3, PrivMode_132 },
3501 { 4, PrivMode_smoothScroll }, 3912 { 4, PrivMode_smoothScroll },
3502 { 5, PrivMode_rVideo }, 3913 { 5, PrivMode_rVideo },
3503 { 6, PrivMode_relOrigin }, 3914 { 6, PrivMode_relOrigin },
3504 { 7, PrivMode_Autowrap }, 3915 { 7, PrivMode_Autowrap },
3916 // 8, bi-directional support mode
3505 { 9, PrivMode_MouseX10 }, 3917 { 9, PrivMode_MouseX10 },
3506#ifdef menuBar_esc 3918#ifdef menuBar_esc
3507 { menuBar_esc, PrivMode_menuBar }, 3919 { menuBar_esc, PrivMode_menuBar },
3508#endif 3920#endif
3921 // 18, 19 printing-related
3922 { 25, PrivMode_VisibleCursor },
3509#ifdef scrollBar_esc 3923#ifdef scrollBar_esc
3510 { scrollBar_esc, PrivMode_scrollBar }, 3924 { scrollBar_esc, PrivMode_scrollBar },
3511#endif 3925#endif
3512 // 18, 19 printing-related
3513 { 25, PrivMode_VisibleCursor },
3514 // 30 show scrollbar rxvt. extension
3515 { 35, PrivMode_ShiftKeys }, // rxvt extension 3926 { 35, PrivMode_ShiftKeys }, // rxvt extension
3516 { 40, PrivMode_132OK }, 3927 { 40, PrivMode_132OK },
3517 // 41 xterm more fixes NYI 3928 // 41 xterm more fixes NYI
3518 // 45 margin bell NYI 3929 // 45 margin bell NYI
3519 // 46 start logging 3930 // 46 start logging
… …
3560 3971
3561 /* extra handling for values with state unkept */ 3972 /* extra handling for values with state unkept */
3562 switch (arg[i]) 3973 switch (arg[i])
3563 { 3974 {
3564 case 1048: /* alternative cursor save */ 3975 case 1048: /* alternative cursor save */
3976 case 1049:
3565 if (Options & Opt_secondaryScreen) 3977 if (options & Opt_secondaryScreen)
3566 if (mode == 0) 3978 if (mode == 0)
3567 scr_cursor (RESTORE); 3979 scr_cursor (RESTORE);
3568 else if (mode == 1) 3980 else if (mode == 1)
3569 scr_cursor (SAVE); 3981 scr_cursor (SAVE);
3570 break; 3982 break;
… …
3581 * within VT52 mode 3993 * within VT52 mode
3582 */ 3994 */
3583 PrivMode (1, PrivMode_vt52); 3995 PrivMode (1, PrivMode_vt52);
3584 break; 3996 break;
3585 case 3: /* 80/132 */ 3997 case 3: /* 80/132 */
3586 if (PrivateModes & PrivMode_132OK) 3998 if (priv_modes & PrivMode_132OK)
3587 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3999 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3588 break; 4000 break;
3589 case 4: /* smooth scrolling */ 4001 case 4: /* smooth scrolling */
3590 if (state) 4002 if (state)
3591 Options &= ~Opt_jumpScroll; 4003 options &= ~Opt_jumpScroll;
3592 else 4004 else
3593 Options |= Opt_jumpScroll; 4005 options |= Opt_jumpScroll;
3594 break; 4006 break;
3595 case 5: /* reverse video */ 4007 case 5: /* reverse video */
3596 scr_rvideo_mode (state); 4008 scr_rvideo_mode (state);
3597 break; 4009 break;
3598 case 6: /* relative/absolute origins */ 4010 case 6: /* relative/absolute origins */
… …
3602 scr_autowrap (state); 4014 scr_autowrap (state);
3603 break; 4015 break;
3604 /* case 8: - auto repeat, can't do on a per window basis */ 4016 /* case 8: - auto repeat, can't do on a per window basis */
3605 case 9: /* X10 mouse reporting */ 4017 case 9: /* X10 mouse reporting */
3606 if (state) /* orthogonal */ 4018 if (state) /* orthogonal */
3607 PrivateModes &= ~PrivMode_MouseX11; 4019 priv_modes &= ~PrivMode_MouseX11;
3608 break; 4020 break;
3609#ifdef menuBar_esc 4021#ifdef menuBar_esc
3610 case menuBar_esc: 4022 case menuBar_esc:
3611#ifdef MENUBAR 4023#ifdef MENUBAR
3612 map_menuBar (state); 4024 map_menuBar (state);
… …
3632 break; 4044 break;
3633 /* case 66: - application key pad */ 4045 /* case 66: - application key pad */
3634 /* case 67: - backspace key */ 4046 /* case 67: - backspace key */
3635 case 1000: /* X11 mouse reporting */ 4047 case 1000: /* X11 mouse reporting */
3636 if (state) /* orthogonal */ 4048 if (state) /* orthogonal */
3637 PrivateModes &= ~PrivMode_MouseX10; 4049 priv_modes &= ~PrivMode_MouseX10;
3638 break; 4050 break;
3639#if 0 4051#if 0
3640 case 1001: 4052 case 1001:
3641 break; /* X11 mouse highlighting */ 4053 break; /* X11 mouse highlighting */
3642#endif 4054#endif
3643 case 1010: /* scroll to bottom on TTY output inhibit */ 4055 case 1010: /* scroll to bottom on TTY output inhibit */
3644 if (state) 4056 if (state)
3645 Options &= ~Opt_scrollTtyOutput; 4057 options &= ~Opt_scrollTtyOutput;
3646 else 4058 else
3647 Options |= Opt_scrollTtyOutput; 4059 options |= Opt_scrollTtyOutput;
3648 break; 4060 break;
3649 case 1011: /* scroll to bottom on key press */ 4061 case 1011: /* scroll to bottom on key press */
3650 if (state) 4062 if (state)
3651 Options |= Opt_scrollTtyKeypress; 4063 options |= Opt_scrollTtyKeypress;
3652 else 4064 else
3653 Options &= ~Opt_scrollTtyKeypress; 4065 options &= ~Opt_scrollTtyKeypress;
3654 break; 4066 break;
3655 case 1047: /* secondary screen w/ clearing last */ 4067 case 1047: /* secondary screen w/ clearing last */
3656 if (Options & Opt_secondaryScreen) 4068 if (options & Opt_secondaryScreen)
3657 if (current_screen != PRIMARY) 4069 if (current_screen != PRIMARY)
3658 scr_erase_screen (2); 4070 scr_erase_screen (2);
3659 scr_change_screen (state); 4071 scr_change_screen (state);
3660 break; 4072 break;
3661 case 1049: /* secondary screen w/ clearing first */ 4073 case 1049: /* secondary screen w/ clearing first */
3662 scr_change_screen (state); 4074 scr_change_screen (state);
3663 if (Options & Opt_secondaryScreen) 4075 if (options & Opt_secondaryScreen)
3664 if (current_screen != PRIMARY) 4076 if (current_screen != PRIMARY)
3665 scr_erase_screen (2); 4077 scr_erase_screen (2);
3666 break; 4078 break;
3667 default: 4079 default:
3668 break; 4080 break;
… …
3694 rendset = 0, rendstyle = ~RS_None; 4106 rendset = 0, rendstyle = ~RS_None;
3695 break; 4107 break;
3696 case 1: 4108 case 1:
3697 rendset = 1, rendstyle = RS_Bold; 4109 rendset = 1, rendstyle = RS_Bold;
3698 break; 4110 break;
4111 //case 2: // low intensity
4112 case 3:
4113 rendset = 1, rendstyle = RS_Italic;
4114 break;
3699 case 4: 4115 case 4:
3700 rendset = 1, rendstyle = RS_Uline; 4116 rendset = 1, rendstyle = RS_Uline;
3701 break; 4117 break;
3702 case 5: 4118 case 5: // slowly blinking
4119 case 6: // rapidly blinking
3703 rendset = 1, rendstyle = RS_Blink; 4120 rendset = 1, rendstyle = RS_Blink;
3704 break; 4121 break;
4122 //case 6: // scoansi light background
3705 case 7: 4123 case 7:
3706 rendset = 1, rendstyle = RS_RVid; 4124 rendset = 1, rendstyle = RS_RVid;
3707 break; 4125 break;
3708 case 8: 4126 case 8:
3709 // invisible. NYI 4127 // invisible. NYI
3710 break; 4128 break;
3711 case 22: 4129 //case 9: // crossed out
4130 //case 10: // scoansi acs off, primary font
4131 //case 11: // scoansi acs on, first alt font
4132 //case 12: // scoansi acs on, |0x80, second alt font
4133 //...
4134 //case 19: // ninth alt font
4135 //case 20: // gothic
4136 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3712 rendset = 0, rendstyle = RS_Bold; 4137 rendset = 0, rendstyle = RS_Bold;
4138 break;
4139 case 22: // normal intensity
4140 rendset = 0, rendstyle = RS_Bold;
4141 break;
4142 case 23: // disable italic
4143 rendset = 0, rendstyle = RS_Italic;
3713 break; 4144 break;
3714 case 24: 4145 case 24:
3715 rendset = 0, rendstyle = RS_Uline; 4146 rendset = 0, rendstyle = RS_Uline;
3716 break; 4147 break;
3717 case 25: 4148 case 25:
3718 rendset = 0, rendstyle = RS_Blink; 4149 rendset = 0, rendstyle = RS_Blink;
3719 break; 4150 break;
4151 case 26: // variable spacing (iso 8613)
4152 rendset = 0, rendstyle = RS_Blink;
4153 break;
3720 case 27: 4154 case 27:
3721 rendset = 0, rendstyle = RS_RVid; 4155 rendset = 0, rendstyle = RS_RVid;
3722 break; 4156 break;
3723 case 28:
3724 // visible. NYI 4157 //case 28: // visible. NYI
3725 break; 4158 //case 29: // not crossed-out
3726 } 4159 }
3727 4160
3728 if (rendset != -1) 4161 if (rendset != -1)
3729 { 4162 {
3730 scr_rendition (rendset, rendstyle); 4163 scr_rendition (rendset, rendstyle);
… …
3741 case 35: 4174 case 35:
3742 case 36: 4175 case 36:
3743 case 37: 4176 case 37:
3744 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4177 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3745 break; 4178 break;
3746#ifdef TTY_256COLOR 4179 case 38: // set fg color, ISO 8613-6
3747 case 38:
3748 if (nargs > i + 2 && arg[i + 1] == 5) 4180 if (nargs > i + 2 && arg[i + 1] == 5)
3749 { 4181 {
3750 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4182 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3751 i += 2; 4183 i += 2;
3752 } 4184 }
3753 break; 4185 break;
3754#endif
3755 case 39: /* default fg */ 4186 case 39: /* default fg */
3756 scr_color (Color_fg, Color_fg); 4187 scr_color (Color_fg, Color_fg);
3757 break; 4188 break;
3758 4189
3759 case 40: 4190 case 40:
… …
3764 case 45: 4195 case 45:
3765 case 46: 4196 case 46:
3766 case 47: 4197 case 47:
3767 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4198 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3768 break; 4199 break;
3769#ifdef TTY_256COLOR 4200 case 48: // set bg color, ISO 8613-6
3770 case 48:
3771 if (nargs > i + 2 && arg[i + 1] == 5) 4201 if (nargs > i + 2 && arg[i + 1] == 5)
3772 { 4202 {
3773 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4203 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3774 i += 2; 4204 i += 2;
3775 } 4205 }
3776 break; 4206 break;
3777#endif
3778 case 49: /* default bg */ 4207 case 49: /* default bg */
3779 scr_color (Color_bg, Color_bg); 4208 scr_color (Color_bg, Color_bg);
3780 break; 4209 break;
4210
4211 //case 50: // not variable spacing
3781 4212
3782#ifndef NO_BRIGHTCOLOR 4213#ifndef NO_BRIGHTCOLOR
3783 case 90: 4214 case 90:
3784 case 91: /* set bright fg color */ 4215 case 91: /* set bright fg color */
3785 case 92: 4216 case 92:
3786 case 93: 4217 case 93:
3787 case 94: 4218 case 94:
3788 case 95: 4219 case 95:
3789 case 96: 4220 case 96:
3790 case 97: 4221 case 97:
3791 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4222 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3792 Color_fg);
3793 break; 4223 break;
3794 case 100: 4224 case 100:
3795 case 101: /* set bright bg color */ 4225 case 101: /* set bright bg color */
3796 case 102: 4226 case 102:
3797 case 103: 4227 case 103:
3798 case 104: 4228 case 104:
3799 case 105: 4229 case 105:
3800 case 106: 4230 case 106:
3801 case 107: 4231 case 107:
3802 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4232 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3803 Color_bg);
3804 break; 4233 break;
3805#endif 4234#endif
3806 4235
3807 } 4236 }
3808 } 4237 }
3809} 4238}
3810/*}}} */ 4239/*}}} */
3811 4240
3812/*{{{ process Rob Nation's own graphics mode sequences */ 4241/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3813void 4242void
3814rxvt_term::process_graphics () 4243rxvt_term::process_graphics ()
3815{ 4244{
3816 unicode_t ch, cmd = cmd_getc (); 4245 unicode_t ch, cmd = cmd_getc ();
3817 4246
3818 if (cmd == 'Q') 4247 if (cmd == 'Q')
3819 { /* query graphics */ 4248 { /* query graphics */
3820 tt_printf ("\033G0\n"); /* no graphics */ 4249 tt_printf ("\033G0\012"); /* no graphics */
3821 return; 4250 return;
3822 } 4251 }
3823 /* swallow other graphics sequences until terminating ':' */ 4252 /* swallow other graphics sequences until terminating ':' */
3824 do 4253 do
3825 ch = cmd_getc (); 4254 ch = cmd_getc ();
… …
3840 unsigned char buf[256]; 4269 unsigned char buf[256];
3841 4270
3842 va_start (arg_ptr, fmt); 4271 va_start (arg_ptr, fmt);
3843 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4272 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3844 va_end (arg_ptr); 4273 va_end (arg_ptr);
3845 tt_write (buf, STRLEN (buf)); 4274 tt_write (buf, strlen (buf));
3846} 4275}
3847 4276
3848/* ---------------------------------------------------------------------- */ 4277/* ---------------------------------------------------------------------- */
3849/* Write data to the pty as typed by the user, pasted with the mouse, 4278/* Write data to the pty as typed by the user, pasted with the mouse,
3850 * or generated by us in response to a query ESC sequence. 4279 * or generated by us in response to a query ESC sequence.
3851 */ 4280 */
3852void 4281void
3853rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4282rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3854{ 4283{
3855 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4284 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3856 4285
3857 if (len) 4286 if (len)
3858 { 4287 {
3859 if (v_buflen == 0) 4288 if (v_buflen == 0)
3860 { 4289 {
3861 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 4290 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3862 4291
3863 if ((unsigned int)written == len) 4292 if ((unsigned int)written == len)
3864 return; 4293 return;
3865 4294
3866 data += written; 4295 data += written;
… …
3874 v_buflen += len; 4303 v_buflen += len;
3875 } 4304 }
3876 4305
3877 for (;;) 4306 for (;;)
3878 { 4307 {
3879 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); 4308 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
3880 4309
3881 if (written > 0) 4310 if (written > 0)
3882 { 4311 {
3883 v_buflen -= written; 4312 v_buflen -= written;
3884 4313

Diff Legend

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