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.107 by root, Sat Jul 31 00:01:12 2004 UTC vs.
Revision 1.145 by root, Mon Aug 16 12:04:57 2004 UTC

… …
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 iso14755buf = ISO_14755_54;
140 break;
141 }
142
143 x--;
144 }
145
146}
147#endif
148
149#if ENABLE_OVERLAY
150void
151rxvt_term::iso14755_51 (wchar_t ch)
152{
153 wchar_t *chr, *alloc;
154 int len;
155
156#if ENABLE_COMBINING
157 if (IS_COMPOSE (ch))
158 {
159 len = rxvt_composite.expand (ch, 0);
160 alloc = chr = new wchar_t[len];
161 rxvt_composite.expand (ch, chr);
162 }
163 else
164#endif
165 {
166 alloc = 0;
167 chr = &ch;
168 len = 1;
169 }
170
171 scr_overlay_new (0, -1, 8 + 5, len);
172
173 for (int y = 0; y < len; y++)
174 {
175 char buf[9];
176
177 ch = *chr++;
178
179 sprintf (buf, "%8x", ch);
180 scr_overlay_set (0, y, buf);
181 scr_overlay_set (9, y, '=');
182#if !UNICODE3
183 if (ch >= 0x10000)
184 ch = 0xfffd;
185#endif
186 scr_overlay_set (11, y, ch);
187 scr_overlay_set (12, y, NOCHAR);
188 }
189
190#if ENABLE_COMBINING
191 if (alloc)
192 delete [] alloc;
193#endif
194}
195#endif
196
197void
198rxvt_term::commit_iso14755 ()
199{
200 wchar_t ch[2];
201
202 ch[0] = iso14755buf & ISO_14755_MASK;
203 ch[1] = 0;
204
205 if (iso14755buf & ISO_14755_51)
206 {
207 char mb[16];
208 int len;
209
210 // allow verbatim 0-bytes and control-bytes to be entered
211 if (ch[0] >= 0x20)
212 len = wcstombs (mb, ch, 16);
213 else
214 {
215 mb[0] = ch[0];
216 len = 1;
217 }
218
219 if (len > 0)
220 tt_write ((unsigned char *)mb, len);
221 else
222 scr_bell ();
223 }
224
225 iso14755buf = 0;
226}
227
228int
229rxvt_term::hex_keyval (XKeyEvent &ev)
230{
231 // check wether this event corresponds to a hex digit
232 // if the modifiers had not been pressed.
233 for (int index = 0; index < 8; index++)
234 {
235 KeySym k = XLookupKeysym (&ev, index);
236
237 if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0;
238 else if (k >= XK_0 && k <= XK_9) return k - XK_0;
239 else if (k >= XK_a && k <= XK_f) return k - XK_a + 10;
240 else if (k >= XK_A && k <= XK_F) return k - XK_A + 10;
241 }
242
243 return -1;
244}
245#endif
246
62/*{{{ Convert the keypress event into a string */ 247/*{{{ Convert the keypress event into a string */
63void 248void
64rxvt_term::lookup_key (XKeyEvent &ev) 249rxvt_term::lookup_key (XKeyEvent &ev)
65{ 250{
66 int ctrl, meta, shft, len; 251 int ctrl, meta, shft, len;
… …
151 { 336 {
152 if (TermWin.saveLines) 337 if (TermWin.saveLines)
153 { 338 {
154#ifdef UNSHIFTED_SCROLLKEYS 339#ifdef UNSHIFTED_SCROLLKEYS
155 if (!ctrl && !meta) 340 if (!ctrl && !meta)
156 {
157#else 341#else
158 if (IS_SCROLL_MOD) 342 if (IS_SCROLL_MOD)
343#endif
159 { 344 {
160#endif
161 int lnsppg; 345 int lnsppg;
162 346
163#ifdef PAGING_CONTEXT_LINES 347#ifdef PAGING_CONTEXT_LINES
164 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 348 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
165#else 349#else
… …
214 if (keysym >= XK_F1 && keysym <= XK_F10) 398 if (keysym >= XK_F1 && keysym <= XK_F10)
215 { 399 {
216 keysym += (XK_F11 - XK_F1); 400 keysym += (XK_F11 - XK_F1);
217 shft = 0; /* turn off Shift */ 401 shft = 0; /* turn off Shift */
218 } 402 }
219 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 403 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
220 { 404 {
221 switch (keysym) 405 switch (keysym)
222 { 406 {
223 /* normal XTerm key bindings */ 407 /* normal XTerm key bindings */
224 case XK_Insert: /* Shift+Insert = paste mouse selection */ 408 case XK_Insert: /* Shift+Insert = paste mouse selection */
225 selection_request (ev.time, 0, 0); 409 selection_request (ev.time, 0, 0);
226 return; 410 return;
411#if TODO // TODO
227 /* rxvt extras */ 412 /* rxvt extras */
228 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 413 case XK_KP_Add: /* Shift+KP_Add = bigger font */
229 change_font (FONT_UP); 414 change_font (FONT_UP);
230 return; 415 return;
231 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 416 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
232 change_font (FONT_DN); 417 change_font (FONT_DN);
233 return; 418 return;
419#endif
234 } 420 }
235 } 421 }
236 } 422 }
423
424#if ENABLE_FRILLS || ISO_14755
425 // ISO 14755 support
426 if (shft && ctrl)
427 {
428 int hv;
429
430 if (iso14755buf & ISO_14755_51
431 && (keysym == XK_space || keysym == XK_KP_Space
432 || keysym == XK_Return || keysym == XK_KP_Enter))
433 {
434 commit_iso14755 ();
435 iso14755buf = ISO_14755_51;
436# if ISO_14755
437 iso14755_51 (0);
438# endif
439 return;
440 }
441 else if ((hv = hex_keyval (ev)) >= 0)
442 {
443 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
444 | hv | ISO_14755_51;
445# if ISO_14755
446 iso14755_51 (iso14755buf & ISO_14755_MASK);
447# endif
448 return;
449 }
450 else
451 {
452# if ENABLE_OVERLAY
453 scr_overlay_off ();
454# endif
455 iso14755buf = 0;
456 }
457 }
458 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
459 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
460 if (!(iso14755buf & ISO_14755_STARTED))
461 {
462 iso14755buf |= ISO_14755_STARTED;
463# if ENABLE_OVERLAY
464 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
465 scr_overlay_set (0, 0, "ISO 14755 mode");
466# endif
467 }
468#endif
469
237#ifdef PRINTPIPE 470#ifdef PRINTPIPE
238 if (keysym == XK_Print) 471 if (keysym == XK_Print)
239 { 472 {
240 scr_printscreen (ctrl | shft); 473 scr_printscreen (ctrl | shft);
241 return; 474 return;
… …
273 newlen = 1; 506 newlen = 1;
274 switch (keysym) 507 switch (keysym)
275 { 508 {
276#ifndef NO_BACKSPACE_KEY 509#ifndef NO_BACKSPACE_KEY
277 case XK_BackSpace: 510 case XK_BackSpace:
278 if (PrivateModes & PrivMode_HaveBackSpace) 511 if (priv_modes & PrivMode_HaveBackSpace)
279 { 512 {
280 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 513 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
281 ^ !!ctrl) ? '\b' : '\177'; 514 ^ !!ctrl) ? '\b' : '\177';
282 kbuf[1] = '\0'; 515 kbuf[1] = '\0';
283 } 516 }
284 else 517 else
285 STRCPY (kbuf, key_backspace); 518 strcpy (kbuf, key_backspace);
286 break; 519 break;
287#endif 520#endif
288#ifndef NO_DELETE_KEY 521#ifndef NO_DELETE_KEY
289 case XK_Delete: 522 case XK_Delete:
290 STRCPY (kbuf, key_delete); 523 strcpy (kbuf, key_delete);
291 break; 524 break;
292#endif 525#endif
293 case XK_Tab: 526 case XK_Tab:
294 if (shft) 527 if (shft)
295 STRCPY (kbuf, "\033[Z"); 528 strcpy (kbuf, "\033[Z");
296 else 529 else
297 { 530 {
298#ifdef CTRL_TAB_MAKES_META 531#ifdef CTRL_TAB_MAKES_META
299 if (ctrl) 532 if (ctrl)
300 meta = 1; 533 meta = 1;
… …
306 newlen = 0; 539 newlen = 0;
307 } 540 }
308 break; 541 break;
309 542
310#ifdef XK_KP_Left 543#ifdef XK_KP_Left
311 case XK_KP_Up: /* \033Ox or standard */ 544 case XK_KP_Up: /* \033Ox or standard */
312 case XK_KP_Down: /* \033Or or standard */ 545 case XK_KP_Down: /* \033Or or standard */
313 case XK_KP_Right: /* \033Ov or standard */ 546 case XK_KP_Right: /* \033Ov or standard */
314 case XK_KP_Left: /* \033Ot or standard */ 547 case XK_KP_Left: /* \033Ot or standard */
315 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 548 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
316 { 549 {
317 STRCPY (kbuf, "\033OZ"); 550 strcpy (kbuf, "\033OZ");
318 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 551 kbuf[2] = "txvr"[keysym - XK_KP_Left];
319 break; 552 break;
320 } 553 }
321 else 554 else
322 /* translate to std. cursor key */ 555 /* translate to std. cursor key */
… …
325#endif 558#endif
326 case XK_Up: /* "\033[A" */ 559 case XK_Up: /* "\033[A" */
327 case XK_Down: /* "\033[B" */ 560 case XK_Down: /* "\033[B" */
328 case XK_Right: /* "\033[C" */ 561 case XK_Right: /* "\033[C" */
329 case XK_Left: /* "\033[D" */ 562 case XK_Left: /* "\033[D" */
330 STRCPY (kbuf, "\033[Z"); 563 strcpy (kbuf, "\033[Z");
331 kbuf[2] = "DACB"[keysym - XK_Left]; 564 kbuf[2] = "DACB"[keysym - XK_Left];
332 /* do Shift first */ 565 /* do Shift first */
333 if (shft) 566 if (shft)
334 kbuf[2] = "dacb"[keysym - XK_Left]; 567 kbuf[2] = "dacb"[keysym - XK_Left];
335 else if (ctrl) 568 else if (ctrl)
336 { 569 {
337 kbuf[1] = 'O'; 570 kbuf[1] = 'O';
338 kbuf[2] = "dacb"[keysym - XK_Left]; 571 kbuf[2] = "dacb"[keysym - XK_Left];
339 } 572 }
340 else if (PrivateModes & PrivMode_aplCUR) 573 else if (priv_modes & PrivMode_aplCUR)
341 kbuf[1] = 'O'; 574 kbuf[1] = 'O';
342 break; 575 break;
343 576
344#ifndef UNSHIFTED_SCROLLKEYS 577#ifndef UNSHIFTED_SCROLLKEYS
345# ifdef XK_KP_Prior 578# ifdef XK_KP_Prior
346 case XK_KP_Prior: 579 case XK_KP_Prior:
347 /* allow shift to override */ 580 /* allow shift to override */
348 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 581 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
349 { 582 {
350 STRCPY (kbuf, "\033Oy"); 583 strcpy (kbuf, "\033Oy");
351 break; 584 break;
352 } 585 }
353 /* FALLTHROUGH */ 586 /* FALLTHROUGH */
354# endif 587# endif
355 case XK_Prior: 588 case XK_Prior:
356 STRCPY (kbuf, "\033[5~"); 589 strcpy (kbuf, "\033[5~");
357 break; 590 break;
358# ifdef XK_KP_Next 591# ifdef XK_KP_Next
359 case XK_KP_Next: 592 case XK_KP_Next:
360 /* allow shift to override */ 593 /* allow shift to override */
361 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 594 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
362 { 595 {
363 STRCPY (kbuf, "\033Os"); 596 strcpy (kbuf, "\033Os");
364 break; 597 break;
365 } 598 }
366 /* FALLTHROUGH */ 599 /* FALLTHROUGH */
367# endif 600# endif
368 case XK_Next: 601 case XK_Next:
369 STRCPY (kbuf, "\033[6~"); 602 strcpy (kbuf, "\033[6~");
370 break; 603 break;
371#endif 604#endif
372 case XK_KP_Enter: 605 case XK_KP_Enter:
373 /* allow shift to override */ 606 /* allow shift to override */
374 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 607 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
375 { 608 {
376 STRCPY (kbuf, "\033OM"); 609 strcpy (kbuf, "\033OM");
610 break;
611 }
612
613 /* FALLTHROUGH */
614
615 case XK_Return:
616 if (priv_modes & PrivMode_LFNL)
617 {
618 kbuf[0] = '\015';
619 kbuf[1] = '\012';
620 kbuf[2] = '\0';
377 } 621 }
378 else 622 else
379 { 623 {
380 kbuf[0] = '\r'; 624 kbuf[0] = '\015';
381 kbuf[1] = '\0'; 625 kbuf[1] = '\0';
382 } 626 }
383 break; 627 break;
384 628
385#ifdef XK_KP_Begin 629#ifdef XK_KP_Begin
386 case XK_KP_Begin: 630 case XK_KP_Begin:
387 STRCPY (kbuf, "\033Ou"); 631 strcpy (kbuf, "\033Ou");
388 break; 632 break;
389 633
390 case XK_KP_Insert: 634 case XK_KP_Insert:
391 STRCPY (kbuf, "\033Op"); 635 strcpy (kbuf, "\033Op");
392 break; 636 break;
393 637
394 case XK_KP_Delete: 638 case XK_KP_Delete:
395 STRCPY (kbuf, "\033On"); 639 strcpy (kbuf, "\033On");
396 break; 640 break;
397#endif 641#endif
398 case XK_KP_F1: /* "\033OP" */ 642 case XK_KP_F1: /* "\033OP" */
399 case XK_KP_F2: /* "\033OQ" */ 643 case XK_KP_F2: /* "\033OQ" */
400 case XK_KP_F3: /* "\033OR" */ 644 case XK_KP_F3: /* "\033OR" */
401 case XK_KP_F4: /* "\033OS" */ 645 case XK_KP_F4: /* "\033OS" */
402 STRCPY (kbuf, "\033OP"); 646 strcpy (kbuf, "\033OP");
403 kbuf[2] += (keysym - XK_KP_F1); 647 kbuf[2] += (keysym - XK_KP_F1);
404 break; 648 break;
405 649
406 case XK_KP_Multiply: /* "\033Oj" : "*" */ 650 case XK_KP_Multiply: /* "\033Oj" : "*" */
407 case XK_KP_Add: /* "\033Ok" : "+" */ 651 case XK_KP_Add: /* "\033Ok" : "+" */
… …
418 case XK_KP_6: /* "\033Ov" : "6" */ 662 case XK_KP_6: /* "\033Ov" : "6" */
419 case XK_KP_7: /* "\033Ow" : "7" */ 663 case XK_KP_7: /* "\033Ow" : "7" */
420 case XK_KP_8: /* "\033Ox" : "8" */ 664 case XK_KP_8: /* "\033Ox" : "8" */
421 case XK_KP_9: /* "\033Oy" : "9" */ 665 case XK_KP_9: /* "\033Oy" : "9" */
422 /* allow shift to override */ 666 /* allow shift to override */
423 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 667 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
424 { 668 {
425 STRCPY (kbuf, "\033Oj"); 669 strcpy (kbuf, "\033Oj");
426 kbuf[2] += (keysym - XK_KP_Multiply); 670 kbuf[2] += (keysym - XK_KP_Multiply);
427 } 671 }
428 else 672 else
429 { 673 {
430 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 674 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
431 kbuf[1] = '\0'; 675 kbuf[1] = '\0';
432 } 676 }
433 break; 677 break;
434 678
435 case XK_Find: 679 case XK_Find:
436 STRCPY (kbuf, "\033[1~"); 680 strcpy (kbuf, "\033[1~");
437 break; 681 break;
438 case XK_Insert: 682 case XK_Insert:
439 STRCPY (kbuf, "\033[2~"); 683 strcpy (kbuf, "\033[2~");
440 break; 684 break;
441#ifdef DXK_Remove /* support for DEC remove like key */ 685#ifdef DXK_Remove /* support for DEC remove like key */
442 case DXK_Remove: 686 case DXK_Remove:
443 /* FALLTHROUGH */ 687 /* FALLTHROUGH */
444#endif 688#endif
445 case XK_Execute: 689 case XK_Execute:
446 STRCPY (kbuf, "\033[3~"); 690 strcpy (kbuf, "\033[3~");
447 break; 691 break;
448 case XK_Select: 692 case XK_Select:
449 STRCPY (kbuf, "\033[4~"); 693 strcpy (kbuf, "\033[4~");
450 break; 694 break;
451#ifdef XK_KP_End 695#ifdef XK_KP_End
452 case XK_KP_End: 696 case XK_KP_End:
453 /* allow shift to override */ 697 /* allow shift to override */
454 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
455 { 699 {
456 STRCPY (kbuf, "\033Oq"); 700 strcpy (kbuf, "\033Oq");
457 break; 701 break;
458 } 702 }
459 /* FALLTHROUGH */ 703 /* FALLTHROUGH */
460#endif 704#endif
461 case XK_End: 705 case XK_End:
462 STRCPY (kbuf, KS_END); 706 strcpy (kbuf, KS_END);
463 break; 707 break;
464#ifdef XK_KP_Home 708#ifdef XK_KP_Home
465 case XK_KP_Home: 709 case XK_KP_Home:
466 /* allow shift to override */ 710 /* allow shift to override */
467 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 711 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
468 { 712 {
469 STRCPY (kbuf, "\033Ow"); 713 strcpy (kbuf, "\033Ow");
470 break; 714 break;
471 } 715 }
472 /* FALLTHROUGH */ 716 /* FALLTHROUGH */
473#endif 717#endif
474 case XK_Home: 718 case XK_Home:
475 STRCPY (kbuf, KS_HOME); 719 strcpy (kbuf, KS_HOME);
476 break; 720 break;
477 721
478#define FKEY(n, fkey) \ 722#define FKEY(n, fkey) \
479 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 723 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
480 724
… …
533 default: 777 default:
534 newlen = 0; 778 newlen = 0;
535 break; 779 break;
536 } 780 }
537 if (newlen) 781 if (newlen)
538 len = STRLEN (kbuf); 782 len = strlen (kbuf);
539 } 783 }
540 784
541 /* 785 /*
542 * Pass meta for all function keys, if 'meta' option set 786 * Pass meta for all function keys, if 'meta' option set
543 */ 787 */
… …
571 } 815 }
572 816
573 if (len <= 0) 817 if (len <= 0)
574 return; /* not mapped */ 818 return; /* not mapped */
575 819
576 if (Options & Opt_scrollTtyKeypress) 820 if (options & Opt_scrollTtyKeypress)
577 if (TermWin.view_start) 821 if (TermWin.view_start)
578 { 822 {
579 TermWin.view_start = 0; 823 TermWin.view_start = 0;
580 want_refresh = 1; 824 want_refresh = 1;
581 } 825 }
… …
630 n = cmdbuf_ptr - cmdbuf_base; 874 n = cmdbuf_ptr - cmdbuf_base;
631 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 875 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
632 876
633 if (n > 0 && s < count) 877 if (n > 0 && s < count)
634 { 878 {
635 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 879 memmove (cmdbuf_base, cmdbuf_ptr,
636 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 880 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
637 cmdbuf_ptr = cmdbuf_base; 881 cmdbuf_ptr = cmdbuf_base;
638 cmdbuf_endp -= n; 882 cmdbuf_endp -= n;
639 s += n; 883 s += n;
640 } 884 }
… …
661 if (want_full_refresh) 905 if (want_full_refresh)
662 { 906 {
663 want_full_refresh = 0; 907 want_full_refresh = 0;
664 scr_clear (); 908 scr_clear ();
665 scr_touch (false); 909 scr_touch (false);
666 want_refresh = 1;
667 } 910 }
668#endif 911#endif
669 912
670 if (want_refresh) 913 if (want_refresh)
671 { 914 {
… …
675 IMSendSpot (); 918 IMSendSpot ();
676#endif 919#endif
677 } 920 }
678 921
679 display->flush (); 922 display->flush ();
923
924 flush_ev.stop ();
680} 925}
681 926
682void 927void
683rxvt_term::check_cb (check_watcher &w) 928rxvt_term::check_cb (check_watcher &w)
684{ 929{
685 SET_R (this); 930 SET_R (this);
686 SET_LOCALE (locale); 931 SET_LOCALE (locale);
687 932
933 display->flush ();
934
935 if (want_refresh && !flush_ev.active)
936 flush_ev.start (NOW + 0.01);
937}
938
939void
940rxvt_term::flush_cb (time_watcher &w)
941{
942 SET_R (this);
943 SET_LOCALE (locale);
944
945 refresh_limit = 1;
946 refresh_count = 0;
688 flush (); 947 flush ();
689} 948}
690 949
691#ifdef CURSOR_BLINK 950#ifdef CURSOR_BLINK
692void 951void
… …
768 1027
769 memmove (cmdbuf_base, cmdbuf_ptr, n); 1028 memmove (cmdbuf_base, cmdbuf_ptr, n);
770 cmdbuf_ptr = cmdbuf_base; 1029 cmdbuf_ptr = cmdbuf_base;
771 cmdbuf_endp = cmdbuf_ptr + n; 1030 cmdbuf_endp = cmdbuf_ptr + n;
772 1031
773 n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); 1032 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
774 1033
775 if (n > 0) 1034 if (n > 0)
776 { 1035 {
777 cmdbuf_endp += n; 1036 cmdbuf_endp += n;
778 return true; 1037 return true;
… …
805 recolour_cursor (); 1064 recolour_cursor ();
806 1065
807#ifdef POINTER_BLANK 1066#ifdef POINTER_BLANK
808 hidden_pointer = 0; 1067 hidden_pointer = 0;
809 1068
810 if (Options & Opt_pointerBlank) 1069 if (options & Opt_pointerBlank)
811 pointer_ev.start (NOW + pointerBlankDelay); 1070 pointer_ev.start (NOW + pointerBlankDelay);
812#endif 1071#endif
813} 1072}
814 1073
815#ifdef POINTER_BLANK 1074#ifdef POINTER_BLANK
816void 1075void
817rxvt_term::pointer_blank () 1076rxvt_term::pointer_blank ()
818{ 1077{
819 if (! (Options & Opt_pointerBlank)) 1078 if (! (options & Opt_pointerBlank))
820 return; 1079 return;
821 1080
822 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1081 XDefineCursor (display->display, TermWin.vt, blank_cursor);
823 XFlush (display->display); 1082 XFlush (display->display);
824 1083
… …
844 x = ev.x; 1103 x = ev.x;
845 y = ev.y; 1104 y = ev.y;
846 pixel_position (&x, &y); 1105 pixel_position (&x, &y);
847 1106
848 if (MEvent.button == AnyButton) 1107 if (MEvent.button == AnyButton)
849 {
850 button_number = 3; 1108 button_number = 3;
851 }
852 else 1109 else
853 { 1110 {
854 button_number = MEvent.button - Button1; 1111 button_number = MEvent.button - Button1;
855 /* add 0x3D for wheel events, like xterm does */ 1112 /* add 0x3D for wheel events, like xterm does */
856 if (button_number >= 3) 1113 if (button_number >= 3)
857 button_number += (64 - 3); 1114 button_number += (64 - 3);
858 } 1115 }
859 1116
860 if (PrivateModes & PrivMode_MouseX10) 1117 if (priv_modes & PrivMode_MouseX10)
861 { 1118 {
862 /* 1119 /*
863 * do not report ButtonRelease 1120 * do not report ButtonRelease
864 * no state info allowed 1121 * no state info allowed
865 */ 1122 */
… …
923{ 1180{
924 SET_R (this); 1181 SET_R (this);
925 SET_LOCALE (locale); 1182 SET_LOCALE (locale);
926 1183
927#if defined(CURSOR_BLINK) 1184#if defined(CURSOR_BLINK)
928 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1185 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
929 { 1186 {
930 if (hidden_cursor) 1187 if (hidden_cursor)
931 { 1188 {
932 hidden_cursor = 0; 1189 hidden_cursor = 0;
933 want_refresh = 1; 1190 want_refresh = 1;
… …
936 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1193 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
937 } 1194 }
938#endif 1195#endif
939 1196
940#if defined(POINTER_BLANK) 1197#if defined(POINTER_BLANK)
941 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1198 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
942 { 1199 {
943 if (ev.type == MotionNotify 1200 if (ev.type == MotionNotify
944 || ev.type == ButtonPress 1201 || ev.type == ButtonPress
945 || ev.type == ButtonRelease) 1202 || ev.type == ButtonRelease)
946 if (hidden_pointer) 1203 if (hidden_pointer)
… …
958 1215
959 Window unused_root, unused_child; 1216 Window unused_root, unused_child;
960 int unused_root_x, unused_root_y; 1217 int unused_root_x, unused_root_y;
961 unsigned int unused_mask; 1218 unsigned int unused_mask;
962 1219
963#ifdef DEBUG_X
964 const char *const eventnames[] =
965 { /* mason - this matches my system */
966 "",
967 "",
968 "KeyPress",
969 "KeyRelease",
970 "ButtonPress",
971 "ButtonRelease",
972 "MotionNotify",
973 "EnterNotify",
974 "LeaveNotify",
975 "FocusIn",
976 "FocusOut",
977 "KeymapNotify",
978 "Expose",
979 "GraphicsExpose",
980 "NoExpose",
981 "VisibilityNotify",
982 "CreateNotify",
983 "DestroyNotify",
984 "UnmapNotify",
985 "MapNotify",
986 "MapRequest",
987 "ReparentNotify",
988 "ConfigureNotify",
989 "ConfigureRequest",
990 "GravityNotify",
991 "ResizeRequest",
992 "CirculateNotify",
993 "CirculateRequest",
994 "PropertyNotify",
995 "SelectionClear",
996 "SelectionRequest",
997 "SelectionNotify",
998 "ColormapNotify",
999 "ClientMessage",
1000 "MappingNotify"
1001 };
1002#endif
1003
1004#ifdef DEBUG_X
1005 struct timeval tp;
1006 struct tm *ltt;
1007 (void)gettimeofday (&tp, NULL);
1008 ltt = localtime (& (tp.tv_sec));
1009 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));
1010#endif
1011
1012 switch (ev.type) 1220 switch (ev.type)
1013 { 1221 {
1014 case KeyPress: 1222 case KeyPress:
1223#if ISO_14755
1224 if (!(iso14755buf & ISO_14755_52))
1225#endif
1015 lookup_key (ev.xkey); 1226 lookup_key (ev.xkey);
1227
1228 break;
1229
1230 case KeyRelease:
1231 {
1232#if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || defined (ENABLE_FRILLS)
1233 KeySym ks;
1234
1235 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1236#endif
1237
1238#if ENABLE_FRILLS || ISO_14755
1239 // ISO 14755 support
1240 if (iso14755buf)
1241 if (iso14755buf & ISO_14755_52)
1242 {
1243# if ENABLE_OVERLAY
1244 scr_overlay_off ();
1245# endif
1246# if ISO_14755
1247 // iso14755 part 5.2 handling: release time
1248 // first: controls
1249 if ((ev.xkey.state & ControlMask)
1250 && ((ks >= 0x40 && ks <= 0x5f)
1251 || (ks >= 0x61 && ks <= 0x7f)))
1252 {
1253 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1254 commit_iso14755 ();
1255 return; // case-break;
1256 }
1257
1258 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1259 if (i[0] == ks)
1260 {
1261 iso14755buf = ISO_14755_51 | i[1];
1262 commit_iso14755 ();
1263 return; // case-break;
1264 }
1265
1266 scr_bell ();
1267# endif
1268 iso14755buf = 0;
1016 break; 1269 break;
1270 }
1271 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1272 {
1273# if ENABLE_OVERLAY
1274 scr_overlay_off ();
1275# endif
1276 if (iso14755buf & ISO_14755_51)
1277 commit_iso14755 ();
1278#if ISO_14755
1279 else if (iso14755buf & ISO_14755_STARTED)
1280 {
1281 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1282
1283 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1284 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1285 }
1286# endif
1287 else
1288 iso14755buf = 0;
1289 }
1290#endif
1017 1291
1018#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1292#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1019 case KeyRelease:
1020 {
1021 if (!(ev.xkey.state & ControlMask)) 1293 if (!(ev.xkey.state & ControlMask))
1022 slip_wheel_ev.stop (); 1294 slip_wheel_ev.stop ();
1023 else
1024 {
1025 KeySym ks;
1026
1027 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1028 if (ks == XK_Control_L || ks == XK_Control_R) 1295 else if (ks == XK_Control_L || ks == XK_Control_R)
1029 mouse_slip_wheel_speed = 0; 1296 mouse_slip_wheel_speed = 0;
1030 } 1297#endif
1031 break; 1298 break;
1032 } 1299 }
1033#endif
1034 1300
1035 case ButtonPress: 1301 case ButtonPress:
1036 button_press (ev.xbutton); 1302 button_press (ev.xbutton);
1037 break; 1303 break;
1038 1304
… …
1065 &Size, &RemainingBytes, 1331 &Size, &RemainingBytes,
1066 &data); 1332 &data);
1067 XChangeProperty (display->display, display->root, 1333 XChangeProperty (display->display, display->root,
1068 XA_CUT_BUFFER0, XA_STRING, 1334 XA_CUT_BUFFER0, XA_STRING,
1069 8, PropModeReplace, 1335 8, PropModeReplace,
1070 data, STRLEN (data)); 1336 data, strlen (data));
1071 XFree (data); 1337 XFree (data);
1072 selection_paste (display->root, XA_CUT_BUFFER0, True); 1338 selection_paste (display->root, XA_CUT_BUFFER0, True);
1073 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1339 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1074 } 1340 }
1075#endif /* OFFIX_DND */ 1341#endif /* OFFIX_DND */
1076 break; 1342 break;
1077 1343
1078 case MappingNotify: 1344 case MappingNotify:
1079 XRefreshKeyboardMapping (& (ev.xmapping)); 1345 XRefreshKeyboardMapping (&ev.xmapping);
1080 break; 1346 break;
1081 1347
1082 /* 1348 /*
1083 * XXX: this is not the _current_ arrangement 1349 * XXX: this is not the _current_ arrangement
1084 * Here's my conclusion: 1350 * Here's my conclusion:
… …
1109 { 1375 {
1110 TermWin.focus = 1; 1376 TermWin.focus = 1;
1111 want_refresh = 1; 1377 want_refresh = 1;
1112#ifdef USE_XIM 1378#ifdef USE_XIM
1113 if (Input_Context != NULL) 1379 if (Input_Context != NULL)
1380 {
1381 IMSetStatusPosition ();
1114 XSetICFocus (Input_Context); 1382 XSetICFocus (Input_Context);
1383 }
1115#endif 1384#endif
1116#ifdef CURSOR_BLINK 1385#ifdef CURSOR_BLINK
1117 if (Options & Opt_cursorBlink) 1386 if (options & Opt_cursorBlink)
1118 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1387 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1119#endif 1388#endif
1120#ifdef OFF_FOCUS_FADING 1389#ifdef OFF_FOCUS_FADING
1121 if (rs[Rs_fade]) 1390 if (rs[Rs_fade])
1122 { 1391 {
1123 PixColors = PixColorsFocused; 1392 pix_colors = pix_colors_focused;
1124 set_colorfgbg (); 1393 set_colorfgbg ();
1125 scr_clear (); 1394 scr_clear ();
1126 scr_touch (true); 1395 scr_touch (true);
1127 } 1396 }
1128#endif 1397#endif
… …
1138#ifdef USE_XIM 1407#ifdef USE_XIM
1139 if (Input_Context != NULL) 1408 if (Input_Context != NULL)
1140 XUnsetICFocus (Input_Context); 1409 XUnsetICFocus (Input_Context);
1141#endif 1410#endif
1142#ifdef CURSOR_BLINK 1411#ifdef CURSOR_BLINK
1143 if (Options & Opt_cursorBlink) 1412 if (options & Opt_cursorBlink)
1144 cursor_blink_ev.stop (); 1413 cursor_blink_ev.stop ();
1145 hidden_cursor = 0; 1414 hidden_cursor = 0;
1146#endif 1415#endif
1147#ifdef OFF_FOCUS_FADING 1416#ifdef OFF_FOCUS_FADING
1148 if (rs[Rs_fade]) 1417 if (rs[Rs_fade])
1149 { 1418 {
1150 PixColors = PixColorsUnFocused; 1419 pix_colors = pix_colors_unfocused;
1151 set_colorfgbg (); 1420 set_colorfgbg ();
1152 scr_clear (); 1421 scr_clear ();
1153 scr_touch (true); 1422 scr_touch (true);
1154 } 1423 }
1155#endif 1424#endif
… …
1169 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1438 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1170 } 1439 }
1171 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1440 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1172 1441
1173 if (szHint.width != width || szHint.height != height) 1442 if (szHint.width != width || szHint.height != height)
1174 {
1175 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height));
1176 resize_all_windows (width, height, 1); 1443 resize_all_windows (width, height, 1);
1177 } 1444
1178#ifdef DEBUG_SIZE
1179 else
1180 {
1181 D_SIZE ((stderr, "Size: Not resizing"));
1182 }
1183#endif
1184#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1185 if (Options & Opt_transparent) 1446 if (options & Opt_transparent)
1186 { 1447 {
1187 check_our_parents (); 1448 check_our_parents ();
1188 if (am_transparent) 1449 if (am_transparent)
1189 want_full_refresh = 1; 1450 want_refresh = want_full_refresh = 1;
1190 } 1451 }
1191#endif 1452#endif
1192 } 1453 }
1454 break;
1455
1456 case PropertyNotify:
1457 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1458 && ev.xproperty.state == PropertyNewValue)
1459 selection_property (ev.xproperty.window, ev.xproperty.atom);
1460
1193 break; 1461 break;
1194 1462
1195 case SelectionClear: 1463 case SelectionClear:
1196 selection_clear (); 1464 selection_clear ();
1197 break; 1465 break;
… …
1228 1496
1229 case GraphicsExpose: 1497 case GraphicsExpose:
1230 case Expose: 1498 case Expose:
1231 if (ev.xany.window == TermWin.vt) 1499 if (ev.xany.window == TermWin.vt)
1232 { 1500 {
1233#ifdef NO_SLOW_LINK_SUPPORT 1501 do
1234 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1235 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1236#else 1504 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1237 // I don't understand this, so I changed it :) 1505
1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1507
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev))
1238 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1239 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1240 //scr_expose (ev.xexpose.x, 0, 1511
1241 // ev.xexpose.width, TermWin.height, False); 1512 scr_refresh (refresh_type);
1242#endif
1243 want_refresh = 1;
1244 } 1513 }
1245 else 1514 else
1246 { 1515 {
1247 XEvent unused_event; 1516 XEvent unused_event;
1248 1517
… …
1258 } 1527 }
1259#ifdef MENUBAR 1528#ifdef MENUBAR
1260 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1529 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1261 menubar_expose (); 1530 menubar_expose ();
1262#endif 1531#endif
1532
1533#ifdef TRANSPARENT
1534 if (am_transparent && ev.xany.window == TermWin.parent[0])
1535 XClearWindow (display->display, ev.xany.window);
1536#endif
1263 } 1537 }
1264 break; 1538 break;
1265 1539
1266 case MotionNotify: 1540 case MotionNotify:
1267#ifdef POINTER_BLANK 1541#ifdef POINTER_BLANK
… …
1273 { 1547 {
1274 menubar_control (ev.xbutton); 1548 menubar_control (ev.xbutton);
1275 break; 1549 break;
1276 } 1550 }
1277#endif 1551#endif
1278 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1552 if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate))
1279 break; 1553 break;
1280 1554
1281 if (ev.xany.window == TermWin.vt) 1555 if (ev.xany.window == TermWin.vt)
1282 { 1556 {
1283 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1557 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1284 { 1558 {
1285 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1559 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1286 ; 1560 ;
1287 1561
1288 XQueryPointer (display->display, TermWin.vt, 1562 XQueryPointer (display->display, TermWin.vt,
1289 &unused_root, &unused_child, 1563 &unused_root, &unused_child,
1290 &unused_root_x, &unused_root_y, 1564 &unused_root_x, &unused_root_y,
1291 & (ev.xbutton.x), & (ev.xbutton.y), 1565 & (ev.xbutton.x), & (ev.xbutton.y),
1292 &unused_mask); 1566 &unused_mask);
1293#ifdef MOUSE_THRESHOLD 1567#ifdef MOUSE_THRESHOLD
1294 /* deal with a `jumpy' mouse */ 1568 /* deal with a `jumpy' mouse */
1295 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1569 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1296 { 1570 {
1297#endif 1571#endif
1572#if ISO_14755
1573 // 5.4
1574 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1575 {
1576 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
1577 break;
1578 }
1579#endif
1298 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1580 selection_extend (ev.xbutton.x, ev.xbutton.y,
1299 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1581 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1300#ifdef SELECTION_SCROLLING 1582#ifdef SELECTION_SCROLLING
1301 if (ev.xbutton.y < TermWin.int_bwidth 1583 if (ev.xbutton.y < TermWin.int_bwidth
1302 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1584 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1303 { 1585 {
… …
1310 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1592 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1311 1593
1312 /* save the event params so we can highlight 1594 /* save the event params so we can highlight
1313 * the selection in the pending-scroll loop 1595 * the selection in the pending-scroll loop
1314 */ 1596 */
1315 selection_save_x=ev.xbutton.x; 1597 selection_save_x = ev.xbutton.x;
1316 selection_save_y=ev.xbutton.y; 1598 selection_save_y = ev.xbutton.y;
1317 selection_save_state=
1318 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1599 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1319 1600
1320 /* calc number of lines to scroll */ 1601 /* calc number of lines to scroll */
1321 if (ev.xbutton.y<TermWin.int_bwidth) 1602 if (ev.xbutton.y<TermWin.int_bwidth)
1322 { 1603 {
1323 scroll_selection_dir = UP; 1604 scroll_selection_dir = UP;
1324 dist = TermWin.int_bwidth - ev.xbutton.y; 1605 dist = TermWin.int_bwidth - ev.xbutton.y;
1325 } 1606 }
1326 else 1607 else
1327 { 1608 {
1328 scroll_selection_dir = DN; 1609 scroll_selection_dir = DN;
1329 dist = ev.xbutton.y -
1330 (TermWin.int_bwidth + TermWin.height); 1610 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1331 } 1611 }
1612
1332 scroll_selection_lines= (Pixel2Height (dist)/ 1613 scroll_selection_lines = Pixel2Height (dist)
1333 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1614 / SELECTION_SCROLL_LINE_SPEEDUP
1615 + 1;
1334 MIN_IT (scroll_selection_lines, 1616 MIN_IT (scroll_selection_lines,
1335 SELECTION_SCROLL_MAX_LINES); 1617 SELECTION_SCROLL_MAX_LINES);
1336 } 1618 }
1337 else 1619 else
1338 { 1620 {
1339 /* we are within the text window, so we 1621 /* we are within the text window, so we
1340 * shouldn't be scrolling 1622 * shouldn't be scrolling
… …
1342 if (sel_scroll_ev.active) 1624 if (sel_scroll_ev.active)
1343 sel_scroll_ev.stop(); 1625 sel_scroll_ev.stop();
1344 } 1626 }
1345#endif 1627#endif
1346#ifdef MOUSE_THRESHOLD 1628#ifdef MOUSE_THRESHOLD
1347
1348 } 1629 }
1349#endif 1630#endif
1350
1351 } 1631 }
1352 } 1632 }
1353 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1354 { 1634 {
1355 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1635 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1356 MotionNotify, &ev)) ; 1636 MotionNotify, &ev)) ;
1357 XQueryPointer (display->display, scrollBar.win, 1637 XQueryPointer (display->display, scrollBar.win,
1358 &unused_root, &unused_child, 1638 &unused_root, &unused_child,
1359 &unused_root_x, &unused_root_y, 1639 &unused_root_x, &unused_root_y,
1360 & (ev.xbutton.x), & (ev.xbutton.y), 1640 & (ev.xbutton.x), & (ev.xbutton.y),
1361 &unused_mask); 1641 &unused_mask);
… …
1367 } 1647 }
1368 break; 1648 break;
1369 } 1649 }
1370} 1650}
1371 1651
1652#if TRANSPARENT
1372void 1653void
1373rxvt_term::rootwin_cb (XEvent &ev) 1654rxvt_term::rootwin_cb (XEvent &ev)
1374{ 1655{
1375 SET_R (this); 1656 SET_R (this);
1376 SET_LOCALE (locale); 1657 SET_LOCALE (locale);
1377 1658
1378 switch (ev.type) 1659 switch (ev.type)
1379 { 1660 {
1380 case PropertyNotify: 1661 case PropertyNotify:
1381 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1382 {
1383 if (ev.xproperty.state == PropertyNewValue)
1384 selection_property (ev.xproperty.window, ev.xproperty.atom);
1385 break;
1386 }
1387#ifdef TRANSPARENT
1388 else
1389 {
1390 /* 1662 /*
1391 * if user used some Esetroot compatible prog to set the root bg, 1663 * if user used some Esetroot compatible prog to set the root bg,
1392 * use the property to determine the pixmap. We use it later on. 1664 * use the property to determine the pixmap. We use it later on.
1393 */ 1665 */
1394 if (xa[XA_XROOTPMAPID] == 0) 1666 if (xa[XA_XROOTPMAPID] == 0)
1395 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1667 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1396 1668
1397 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1669 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1398 return; 1670 return;
1399 }
1400 1671
1401 /* FALLTHROUGH */ 1672 /* FALLTHROUGH */
1402 case ReparentNotify: 1673 case ReparentNotify:
1403 if ((Options & Opt_transparent) && check_our_parents () && am_transparent) 1674 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1404 want_full_refresh = 1; 1675 want_refresh = want_full_refresh = 1;
1405 break; 1676 break;
1406#endif
1407 } 1677 }
1408} 1678}
1679#endif
1409 1680
1410void 1681void
1411rxvt_term::button_press (XButtonEvent &ev) 1682rxvt_term::button_press (XButtonEvent &ev)
1412{ 1683{
1413 int reportmode = 0, clickintime; 1684 int reportmode = 0, clickintime;
1414 1685
1415 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1686 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1416 if (!bypass_keystate) 1687 if (!bypass_keystate)
1417 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1688 reportmode = !! (priv_modes & PrivMode_mouse_report);
1689
1418 /* 1690 /*
1419 * VT window processing of button press 1691 * VT window processing of button press
1420 */ 1692 */
1421 if (ev.window == TermWin.vt) 1693 if (ev.window == TermWin.vt)
1422 { 1694 {
1695#if ISO_14755
1696 // 5.4
1697 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1698 {
1699 iso14755_54 (ev.x, ev.y);
1700 return;
1701 }
1702#endif
1703
1423 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1704 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1424 if (reportmode) 1705 if (reportmode)
1425 { 1706 {
1426 /* mouse report from vt window */ 1707 /* mouse report from vt window */
1427 /* save the xbutton state (for ButtonRelease) */ 1708 /* save the xbutton state (for ButtonRelease) */
… …
1461 MEvent.clicks = 0; 1742 MEvent.clicks = 0;
1462 switch (ev.button) 1743 switch (ev.button)
1463 { 1744 {
1464 case Button1: 1745 case Button1:
1465 /* allow shift+left click to extend selection */ 1746 /* allow shift+left click to extend selection */
1466 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1747 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1467 { 1748 {
1468 if (MEvent.button == Button1 && clickintime) 1749 if (MEvent.button == Button1 && clickintime)
1469 selection_rotate (ev.x, ev.y); 1750 selection_rotate (ev.x, ev.y);
1470 else 1751 else
1471 selection_extend (ev.x, ev.y, 1); 1752 selection_extend (ev.x, ev.y, 1);
… …
1486 case Button3: 1767 case Button3:
1487 if (MEvent.button == Button3 && clickintime) 1768 if (MEvent.button == Button3 && clickintime)
1488 selection_rotate (ev.x, ev.y); 1769 selection_rotate (ev.x, ev.y);
1489 else 1770 else
1490 selection_extend (ev.x, ev.y, 1); 1771 selection_extend (ev.x, ev.y, 1);
1772
1491 MEvent.button = Button3; 1773 MEvent.button = Button3;
1492 break; 1774 break;
1493 } 1775 }
1494 } 1776 }
1777
1495 MEvent.time = ev.time; 1778 MEvent.time = ev.time;
1496 return; 1779 return;
1497 } 1780 }
1498 1781
1499 /* 1782 /*
… …
1591 break; 1874 break;
1592 case R_SB_ALIGN_BOTTOM: 1875 case R_SB_ALIGN_BOTTOM:
1593 csrO = scrollBar.bot - scrollBar.top; 1876 csrO = scrollBar.bot - scrollBar.top;
1594 break; 1877 break;
1595 } 1878 }
1879
1596 if (scrollBar.style == R_SB_XTERM 1880 if (scrollBar.style == R_SB_XTERM
1597 || scrollbar_above_slider (ev.y) 1881 || scrollbar_above_slider (ev.y)
1598 || scrollbar_below_slider (ev.y)) 1882 || scrollbar_below_slider (ev.y))
1599 scr_move_to ( scrollbar_position (ev.y) - csrO, 1883 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1600 scrollbar_size ()); 1884
1601 scrollBar.setMotion (); 1885 scrollBar.setMotion ();
1602 break; 1886 break;
1603 1887
1604 case Button1: 1888 case Button1:
1605 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1889 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1629 scr_page ((ev.button == Button1 ? DN : UP), 1913 scr_page ((ev.button == Button1 ? DN : UP),
1630 (TermWin.nrow 1914 (TermWin.nrow
1631 * scrollbar_position (ev.y) 1915 * scrollbar_position (ev.y)
1632 / scrollbar_size ())); 1916 / scrollbar_size ()));
1633 } 1917 }
1918
1634 break; 1919 break;
1635 } 1920 }
1636 } 1921 }
1637 return; 1922 return;
1638 } 1923 }
… …
1650{ 1935{
1651 int reportmode = 0; 1936 int reportmode = 0;
1652 1937
1653 csrO = 0; /* reset csr Offset */ 1938 csrO = 0; /* reset csr Offset */
1654 if (!bypass_keystate) 1939 if (!bypass_keystate)
1655 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1940 reportmode = !! (priv_modes & PrivMode_mouse_report);
1656 1941
1657 if (scrollbar_isUpDn ()) 1942 if (scrollbar_isUpDn ())
1658 { 1943 {
1659 scrollBar.setIdle (); 1944 scrollBar.setIdle ();
1660 scrollbar_show (0); 1945 scrollbar_show (0);
1661#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1946#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1662 refresh_type &= ~SMOOTH_REFRESH; 1947 refresh_type &= ~SMOOTH_REFRESH;
1663#endif 1948#endif
1664
1665 } 1949 }
1950
1666#ifdef SELECTION_SCROLLING 1951#ifdef SELECTION_SCROLLING
1667 if (sel_scroll_ev.active) 1952 if (sel_scroll_ev.active)
1668 sel_scroll_ev.stop(); 1953 sel_scroll_ev.stop();
1669#endif 1954#endif
1955
1670 if (ev.window == TermWin.vt) 1956 if (ev.window == TermWin.vt)
1671 { 1957 {
1958#if ISO_14755
1959 // 5.4
1960 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1961 return;
1962#endif
1672 if (reportmode) 1963 if (reportmode)
1673 { 1964 {
1674 /* mouse report from vt window */ 1965 /* mouse report from vt window */
1675 /* don't report release of wheel "buttons" */ 1966 /* don't report release of wheel "buttons" */
1676 if (ev.button >= 4) 1967 if (ev.button >= 4)
… …
1690 MEvent.button = AnyButton; 1981 MEvent.button = AnyButton;
1691 mouse_report (ev); 1982 mouse_report (ev);
1692#endif /* MOUSE_REPORT_DOUBLECLICK */ 1983#endif /* MOUSE_REPORT_DOUBLECLICK */
1693 return; 1984 return;
1694 } 1985 }
1986
1695 /* 1987 /*
1696 * dumb hack to compensate for the failure of click-and-drag 1988 * dumb hack to compensate for the failure of click-and-drag
1697 * when overriding mouse reporting 1989 * when overriding mouse reporting
1698 */ 1990 */
1699 if (PrivateModes & PrivMode_mouse_report 1991 if (priv_modes & PrivMode_mouse_report
1700 && bypass_keystate 1992 && bypass_keystate
1701 && ev.button == Button1 && MEvent.clicks <= 1) 1993 && ev.button == Button1 && MEvent.clicks <= 1)
1702 selection_extend (ev.x, ev.y, 0); 1994 selection_extend (ev.x, ev.y, 0);
1703 1995
1704 switch (ev.button) 1996 switch (ev.button)
… …
1719 2011
1720 v = ev.button == Button4 ? UP : DN; 2012 v = ev.button == Button4 ? UP : DN;
1721 2013
1722 if (ev.state & ShiftMask) 2014 if (ev.state & ShiftMask)
1723 i = 1; 2015 i = 1;
1724 else if (Options & Opt_mouseWheelScrollPage) 2016 else if (options & Opt_mouseWheelScrollPage)
1725 i = TermWin.nrow - 1; 2017 i = TermWin.nrow - 1;
1726 else 2018 else
1727 i = 5; 2019 i = 5;
1728 2020
1729# ifdef MOUSE_SLIP_WHEELING 2021# ifdef MOUSE_SLIP_WHEELING
… …
1767#endif 2059#endif
1768} 2060}
1769 2061
1770#ifdef TRANSPARENT 2062#ifdef TRANSPARENT
1771#if TINTING 2063#if TINTING
1772/* shading taken from eterm-0.9.2 */ 2064/* taken from aterm-0.4.2 */
1773/* RGB 15 */
1774 2065
1775static void 2066typedef uint32_t RUINT32T;
1776shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1777{
1778 unsigned char *ptr;
1779 int x, y;
1780 2067
1781 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2068void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
1782 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2069{
1783 /* No saturation */ 2070 int sh_r, sh_g, sh_b;
1784 for (y = h; --y >= 0;) { 2071 RUINT32T mask_r, mask_g, mask_b;
1785 for (x = -w; x < 0; x++) { 2072 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1786 int r, g, b; 2073 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2074 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2075 int i;
1787 2076
1788 b = ((uint16_t *) ptr)[x]; 2077 Visual* visual = display->visual;
1789 r = (b & 0x7c00) * rm; 2078
1790 g = (b & 0x3e0) * gm; 2079 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
1791 b = (b & 0x1f) * bm; 2080
1792 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2081 /* for convenience */
1793 | ((g >> 8) & 0x3e0) 2082 mask_r = visual->red_mask;
1794 | ((b >> 8) & 0x1f); 2083 mask_g = visual->green_mask;
1795 } 2084 mask_b = visual->blue_mask;
1796 ptr += bpl; 2085
1797 } 2086 /* boring lookup table pre-initialization */
2087 switch (srcImage->bits_per_pixel) {
2088 case 15:
2089 if ((mask_r != 0x7c00) ||
2090 (mask_g != 0x03e0) ||
2091 (mask_b != 0x001f))
2092 return;
2093 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2094 lookup_r = lookup;
2095 lookup_g = lookup+32;
2096 lookup_b = lookup+32+32;
2097 sh_r = 10;
2098 sh_g = 5;
2099 sh_b = 0;
2100 break;
2101 case 16:
2102 if ((mask_r != 0xf800) ||
2103 (mask_g != 0x07e0) ||
2104 (mask_b != 0x001f))
2105 return;
2106 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2107 lookup_r = lookup;
2108 lookup_g = lookup+32;
2109 lookup_b = lookup+32+64;
2110 sh_r = 11;
2111 sh_g = 5;
2112 sh_b = 0;
2113 break;
2114 case 24:
2115 if ((mask_r != 0xff0000) ||
2116 (mask_g != 0x00ff00) ||
2117 (mask_b != 0x0000ff))
2118 return;
2119 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2120 lookup_r = lookup;
2121 lookup_g = lookup+256;
2122 lookup_b = lookup+256+256;
2123 sh_r = 16;
2124 sh_g = 8;
2125 sh_b = 0;
2126 break;
2127 case 32:
2128 if ((mask_r != 0xff0000) ||
2129 (mask_g != 0x00ff00) ||
2130 (mask_b != 0x0000ff))
2131 return;
2132 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2133 lookup_r = lookup;
2134 lookup_g = lookup+256;
2135 lookup_b = lookup+256+256;
2136 sh_r = 16;
2137 sh_g = 8;
2138 sh_b = 0;
2139 break;
2140 default:
2141 return; /* we do not support this color depth */
2142 }
2143
2144 /* prepare limits for color transformation (each channel is handled separately) */
2145 if (shade < 0) {
2146 shade = -shade;
2147 if (shade < 0) shade = 0;
2148 if (shade > 100) shade = 100;
2149
2150 lower_lim_r = 65535-rm;
2151 lower_lim_g = 65535-gm;
2152 lower_lim_b = 65535-bm;
2153
2154 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2155 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2156 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2157
2158 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1798 } else { 2159 } else {
1799 for (y = h; --y >= 0;) { 2160 if (shade < 0) shade = 0;
1800 for (x = -w; x < 0; x++) { 2161 if (shade > 100) shade = 100;
1801 int r, g, b;
1802 2162
1803 b = ((uint16_t *) ptr)[x]; 2163 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1804 r = (b & 0x7c00) * rm; 2164
1805 g = (b & 0x3e0) * gm; 2165 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1806 b = (b & 0x1f) * bm; 2166 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1807 r |= (!(r >> 15) - 1); 2167 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1808 g |= (!(g >> 10) - 1); 2168 }
1809 b |= (!(b >> 5) - 1); 2169
1810 ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) 2170 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1811 | ((g >> 8) & 0x3e0) 2171 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1812 | ((b >> 8) & 0x1f); 2172 {
1813 } 2173 unsigned int tmp;
1814 ptr += bpl; 2174
2175 tmp = lower_lim_r;
2176 lower_lim_r = lower_lim_b;
2177 lower_lim_b = tmp;
2178
2179 tmp = upper_lim_r;
2180 upper_lim_r = upper_lim_b;
2181 upper_lim_b = tmp;
2182 }
2183
2184 /* fill our lookup tables */
2185 for (i = 0; i <= mask_r>>sh_r; i++)
2186 {
2187 RUINT32T tmp;
2188 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2189 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2190 lookup_r[i] = (tmp/65535)<<sh_r;
2191 }
2192 for (i = 0; i <= mask_g>>sh_g; i++)
2193 {
2194 RUINT32T tmp;
2195 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2196 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2197 lookup_g[i] = (tmp/65535)<<sh_g;
2198 }
2199 for (i = 0; i <= mask_b>>sh_b; i++)
2200 {
2201 RUINT32T tmp;
2202 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2203 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2204 lookup_b[i] = (tmp/65535)<<sh_b;
2205 }
2206
2207 /* apply table to input image (replacing colors by newly calculated ones) */
2208 switch (srcImage->bits_per_pixel)
2209 {
2210 case 15:
2211 {
2212 unsigned short *p1, *pf, *p, *pl;
2213 p1 = (unsigned short *) srcImage->data;
2214 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2215 while (p1 < pf)
2216 {
2217 p = p1;
2218 pl = p1 + srcImage->width;
2219 for (; p < pl; p++)
1815 } 2220 {
2221 *p = lookup_r[(*p & 0x7c00)>>10] |
2222 lookup_g[(*p & 0x03e0)>> 5] |
2223 lookup_b[(*p & 0x001f)];
2224 }
2225 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1816 } 2226 }
1817} 2227 break;
1818 2228 }
1819/* RGB 16 */ 2229 case 16:
1820static void 2230 {
1821shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2231 unsigned short *p1, *pf, *p, *pl;
1822{ 2232 p1 = (unsigned short *) srcImage->data;
1823 unsigned char *ptr; 2233 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1824 int x, y; 2234 while (p1 < pf)
1825 2235 {
1826 ptr = (unsigned char *)data + (w * sizeof(uint16_t)); 2236 p = p1;
1827 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { 2237 pl = p1 + srcImage->width;
1828 /* No saturation */ 2238 for (; p < pl; p++)
1829 for (y = h; --y >= 0;) {
1830 for (x = -w; x < 0; x++) {
1831 int r, g, b;
1832
1833 b = ((uint16_t *) ptr)[x];
1834 r = (b & 0xf800) * rm;
1835 g = (b & 0x7e0) * gm;
1836 b = (b & 0x1f) * bm;
1837 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1838 | ((g >> 8) & 0x7e0)
1839 | ((b >> 8) & 0x1f);
1840 }
1841 ptr += bpl;
1842 } 2239 {
1843 } else { 2240 *p = lookup_r[(*p & 0xf800)>>11] |
1844 for (y = h; --y >= 0;) { 2241 lookup_g[(*p & 0x07e0)>> 5] |
1845 for (x = -w; x < 0; x++) { 2242 lookup_b[(*p & 0x001f)];
1846 int r, g, b;
1847
1848 b = ((uint16_t *) ptr)[x];
1849 r = (b & 0xf800) * rm;
1850 g = (b & 0x7e0) * gm;
1851 b = (b & 0x1f) * bm;
1852 r |= (!(r >> 16) - 1);
1853 g |= (!(g >> 11) - 1);
1854 b |= (!(b >> 5) - 1);
1855 ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800)
1856 | ((g >> 8) & 0x7e0)
1857 | ((b >> 8) & 0x1f);
1858 } 2243 }
1859 ptr += bpl; 2244 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2245 }
2246 break;
2247 }
2248 case 24:
2249 {
2250 unsigned char *p1, *pf, *p, *pl;
2251 p1 = (unsigned char *) srcImage->data;
2252 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2253 while (p1 < pf)
2254 {
2255 p = p1;
2256 pl = p1 + srcImage->width * 3;
2257 for (; p < pl; p += 3)
1860 } 2258 {
2259 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2260 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2261 p[2] = lookup_r[(p[2] & 0x0000ff)];
2262 }
2263 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1861 } 2264 }
1862} 2265 break;
2266 }
2267 case 32:
2268 {
2269 RUINT32T *p1, *pf, *p, *pl;
2270 p1 = (RUINT32T *) srcImage->data;
2271 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1863 2272
1864/* RGB 24 */ 2273 while (p1 < pf)
1865static void 2274 {
1866shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) 2275 p = p1;
1867{ 2276 pl = p1 + srcImage->width;
1868 unsigned char *ptr; 2277 for (; p < pl; p++)
1869 int x, y;
1870
1871 ptr = (unsigned char *)data + (w * 3);
1872 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1873 /* No saturation */
1874 for (y = h; --y >= 0;) {
1875 for (x = -(w * 3); x < 0; x += 3) {
1876 int r, g, b;
1877
1878 if (byteorder.big_endian()) {
1879 r = (ptr[x + 0] * rm) >> 8;
1880 g = (ptr[x + 1] * gm) >> 8;
1881 b = (ptr[x + 2] * bm) >> 8;
1882 ptr[x + 0] = r;
1883 ptr[x + 1] = g;
1884 ptr[x + 2] = b;
1885 } else {
1886 r = (ptr[x + 2] * rm) >> 8;
1887 g = (ptr[x + 1] * gm) >> 8;
1888 b = (ptr[x + 0] * bm) >> 8;
1889 ptr[x + 2] = r;
1890 ptr[x + 1] = g;
1891 ptr[x + 0] = b;
1892 }
1893 }
1894 ptr += bpl;
1895 } 2278 {
1896 } else { 2279 *p = lookup_r[(*p & 0xff0000)>>16] |
1897 for (y = h; --y >= 0;) { 2280 lookup_g[(*p & 0x00ff00)>> 8] |
1898 for (x = -(w * 3); x < 0; x += 3) { 2281 lookup_b[(*p & 0x0000ff)] |
1899 int r, g, b; 2282 (*p & ~0xffffff);
1900
1901 if (byteorder.big_endian()) {
1902 r = (ptr[x + 0] * rm) >> 8;
1903 g = (ptr[x + 1] * gm) >> 8;
1904 b = (ptr[x + 2] * bm) >> 8;
1905
1906 r |= (!(r >> 8) - 1);
1907 g |= (!(g >> 8) - 1);
1908 b |= (!(b >> 8) - 1);
1909
1910 ptr[x + 0] = r;
1911 ptr[x + 1] = g;
1912 ptr[x + 2] = b;
1913 } else {
1914 r = (ptr[x + 2] * rm) >> 8;
1915 g = (ptr[x + 1] * gm) >> 8;
1916 b = (ptr[x + 0] * bm) >> 8;
1917
1918 r |= (!(r >> 8) - 1);
1919 g |= (!(g >> 8) - 1);
1920 b |= (!(b >> 8) - 1);
1921
1922 ptr[x + 2] = r;
1923 ptr[x + 1] = g;
1924 ptr[x + 0] = b;
1925 }
1926 } 2283 }
1927 ptr += bpl; 2284 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1928 } 2285 }
2286 break;
2287 }
1929 } 2288 }
1930}
1931 2289
1932/* RGB 32 */ 2290 free (lookup);
1933static void
1934shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm)
1935{
1936 unsigned char *ptr;
1937 int x, y;
1938
1939 ptr = (unsigned char *)data + (w * 4);
1940 if ((rm <= 256) && (gm <= 256) && (bm <= 256)) {
1941 /* No saturation */
1942 for (y = h; --y >= 0;) {
1943 if (byteorder.big_endian()) {
1944 for (x = -(w * 4); x < 0; x += 4) {
1945 int r, g, b;
1946
1947 r = (ptr[x + 1] * rm) >> 8;
1948 g = (ptr[x + 2] * gm) >> 8;
1949 b = (ptr[x + 3] * bm) >> 8;
1950 ptr[x + 1] = r;
1951 ptr[x + 2] = g;
1952 ptr[x + 3] = b;
1953 }
1954 } else {
1955 for (x = -(w * 4); x < 0; x += 4) {
1956 int r, g, b;
1957
1958 r = (ptr[x + 2] * rm) >> 8;
1959 g = (ptr[x + 1] * gm) >> 8;
1960 b = (ptr[x + 0] * bm) >> 8;
1961 ptr[x + 2] = r;
1962 ptr[x + 1] = g;
1963 ptr[x + 0] = b;
1964 }
1965 }
1966 ptr += bpl;
1967 }
1968 } else {
1969 for (y = h; --y >= 0;) {
1970 for (x = -(w * 4); x < 0; x += 4) {
1971 int r, g, b;
1972
1973 if (byteorder.big_endian()) {
1974 r = (ptr[x + 1] * rm) >> 8;
1975 g = (ptr[x + 2] * gm) >> 8;
1976 b = (ptr[x + 3] * bm) >> 8;
1977
1978 r |= (!(r >> 8) - 1);
1979 g |= (!(g >> 8) - 1);
1980 b |= (!(b >> 8) - 1);
1981
1982 ptr[x + 1] = r;
1983 ptr[x + 2] = g;
1984 ptr[x + 3] = b;
1985 } else {
1986 r = (ptr[x + 2] * rm) >> 8;
1987 g = (ptr[x + 1] * gm) >> 8;
1988 b = (ptr[x + 0] * bm) >> 8;
1989
1990 r |= (!(r >> 8) - 1);
1991 g |= (!(g >> 8) - 1);
1992 b |= (!(b >> 8) - 1);
1993
1994 ptr[x + 2] = r;
1995 ptr[x + 1] = g;
1996 ptr[x + 0] = b;
1997 }
1998 }
1999 ptr += bpl;
2000 }
2001 }
2002} 2291}
2003
2004#endif 2292#endif
2005 2293
2006/* 2294/*
2007 * Check our parents are still who we think they are. 2295 * Check our parents are still who we think they are.
2008 * Do transparency updates if required 2296 * Do transparency updates if required
… …
2018 Pixmap rootpixmap = None; 2306 Pixmap rootpixmap = None;
2019 XWindowAttributes wattr, wrootattr; 2307 XWindowAttributes wattr, wrootattr;
2020 2308
2021 pchanged = 0; 2309 pchanged = 0;
2022 2310
2023 if (!(Options & Opt_transparent)) 2311 if (!(options & Opt_transparent))
2024 return pchanged; /* Don't try any more */ 2312 return pchanged; /* Don't try any more */
2025 2313
2026 XGetWindowAttributes (display->display, display->root, &wrootattr); 2314 XGetWindowAttributes (display->display, display->root, &wrootattr);
2027 rootdepth = wrootattr.depth; 2315 rootdepth = wrootattr.depth;
2028 2316
… …
2031 if (rootdepth != wattr.depth) 2319 if (rootdepth != wattr.depth)
2032 { 2320 {
2033 if (am_transparent) 2321 if (am_transparent)
2034 { 2322 {
2035 pchanged = 1; 2323 pchanged = 1;
2036 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2324 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2037 am_transparent = am_pixmap_trans = 0; 2325 am_transparent = am_pixmap_trans = 0;
2038 } 2326 }
2039 2327
2040 return pchanged; /* Don't try any more */ 2328 return pchanged; /* Don't try any more */
2041 } 2329 }
… …
2057 i = (xa[XA_XSETROOTID] 2345 i = (xa[XA_XSETROOTID]
2058 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2346 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2059 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2347 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2060 &nitems, &bytes_after, &prop) == Success); 2348 &nitems, &bytes_after, &prop) == Success);
2061 2349
2062 if (!i || prop == NULL || !rs[Rs_color + Color_tint]) 2350 if (!i || prop == NULL
2351#if TINTING
2352 || !rs[Rs_color + Color_tint]
2353#endif
2354 )
2063 have_pixmap = 0; 2355 have_pixmap = 0;
2064 else 2356 else
2065 { 2357 {
2066 have_pixmap = 1; 2358 have_pixmap = 1;
2067 rootpixmap = *(Pixmap *)prop; 2359 rootpixmap = *(Pixmap *)prop;
… …
2078 Window cr; 2370 Window cr;
2079 XImage *image; 2371 XImage *image;
2080 GC gc; 2372 GC gc;
2081 XGCValues gcvalue; 2373 XGCValues gcvalue;
2082 2374
2083 XTranslateCoordinates (display->display, TermWin.vt, display->root, 2375 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2084 0, 0, &sx, &sy, &cr); 2376 0, 0, &sx, &sy, &cr);
2085 nw = (unsigned int)szHint.width; 2377 nw = (unsigned int)szHint.width;
2086 nh = (unsigned int)szHint.height; 2378 nh = (unsigned int)szHint.height;
2087 nx = ny = 0; 2379 nx = ny = 0;
2088 2380
… …
2130 2422
2131#if TINTING 2423#if TINTING
2132 if (ISSET_PIXCOLOR (Color_tint)) 2424 if (ISSET_PIXCOLOR (Color_tint))
2133 { 2425 {
2134 unsigned short rm, gm, bm; 2426 unsigned short rm, gm, bm;
2135 if (rs[Rs_shade]) 2427 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2136 PixColorsFocused[Color_tint].fade (display, atoi (rs[Rs_shade])).get (display, rm, gm, bm); 2428
2137 else
2138 PixColorsFocused[Color_tint].get (display, rm, gm, bm); 2429 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2139 2430
2140 rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... 2431 ShadeXImage (display, image, shade, rm, gm, bm);
2141
2142 /* Determine bitshift and bitmask values */
2143 switch (image->bits_per_pixel)
2144 {
2145 case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2146 case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2147 case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2148 case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break;
2149 }
2150 } 2432 }
2151#endif 2433#endif
2152 2434
2153 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2435 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2154 szHint.width, szHint.height, image->depth); 2436 szHint.width, szHint.height, image->depth);
2155 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2437 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2156 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2438 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2157 nx, ny, image->width, image->height); 2439 nx, ny, image->width, image->height);
2158 XFreeGC (display->display, gc); 2440 XFreeGC (display->display, gc);
2159 XDestroyImage (image); 2441 XDestroyImage (image);
2160 XSetWindowBackgroundPixmap (display->display, TermWin.vt, TermWin.pixmap); 2442 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2443 XClearWindow (display->display, TermWin.parent[0]);
2161 2444
2162 if (!am_transparent || !am_pixmap_trans) 2445 if (!am_transparent || !am_pixmap_trans)
2163 pchanged = 1; 2446 pchanged = 1;
2164 2447
2165 am_transparent = am_pixmap_trans = 1; 2448 am_transparent = am_pixmap_trans = 1;
… …
2170 { 2453 {
2171 unsigned int n; 2454 unsigned int n;
2172 /* 2455 /*
2173 * InheritPixmap transparency 2456 * InheritPixmap transparency
2174 */ 2457 */
2175 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2176 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2458 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2177 { 2459 {
2178 oldp = TermWin.parent[i]; 2460 oldp = TermWin.parent[i];
2179 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2461 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2180 &TermWin.parent[i], &list, &n); 2462 &TermWin.parent[i], &list, &n);
2181 XFree (list); 2463 XFree (list);
2182 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i]));
2183 2464
2184 if (TermWin.parent[i] == display->root) 2465 if (TermWin.parent[i] == display->root)
2185 { 2466 {
2186 if (oldp != None) 2467 if (oldp != None)
2187 pchanged = 1; 2468 pchanged = 1;
… …
2198 if (pchanged) 2479 if (pchanged)
2199 { 2480 {
2200 for (; n < (unsigned int)i; n++) 2481 for (; n < (unsigned int)i; n++)
2201 { 2482 {
2202 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2483 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2203 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2204 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2484 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2205 { 2485 {
2206 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2486 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2207 break; 2487 break;
2208 } 2488 }
2209 } 2489 }
2210 } 2490 }
2211 2491
2212 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2492 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2213 { 2493 {
2214 D_X ((stderr, "InheritPixmap Turning off")); /* Mikachu? */
2215 XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); 2494 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2216 XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); 2495 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2217 am_transparent = 0; 2496 am_transparent = 0;
2218 /* XXX: also turn off Opt_transparent? */ 2497 /* XXX: also turn off Opt_transparent? */
2219 } 2498 }
2220 else 2499 else
2221 { 2500 {
2222#if WAIT_FOR_WM 2501#if WAIT_FOR_WM
2223 /* wait (an arbitrary period) for the WM to do its thing 2502 /* wait (an arbitrary period) for the WM to do its thing
2224 * needed for fvwm2.2.2 (and before?) */ 2503 * needed for fvwm2.2.2 (and before?) */
2225 sleep (1); 2504 sleep (1);
2226#endif 2505#endif
2227 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2228 for (n = 0; n < (unsigned int)i; n++) 2506 for (n = 0; n < (unsigned int)i; n++)
2507 {
2229 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2508 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2509 XClearWindow (display->display, TermWin.parent[n]);
2510 }
2230 2511
2231 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2512 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2232 am_transparent = 1; 2513 am_transparent = 1;
2233 } 2514 }
2234 2515
2235 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2516 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2236 TermWin.parent[i] = None; 2517 TermWin.parent[i] = None;
2518 }
2519
2520 // this is experimental
2521 if (scrollBar.win)
2522 {
2523 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2524 XClearWindow (display->display, scrollBar.win);
2525 scrollBar.setIdle ();
2526 scrollbar_show (0);
2237 } 2527 }
2238 2528
2239 return pchanged; 2529 return pchanged;
2240} 2530}
2241#endif 2531#endif
… …
2260 if (ch == NOCHAR) // TODO: improve 2550 if (ch == NOCHAR) // TODO: improve
2261 break; 2551 break;
2262 2552
2263 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2553 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2264 { 2554 {
2555 if (!seen_input)
2556 {
2557 seen_input = 1;
2558 // many badly-written programs (e.g. jed) contain a race condition:
2559 // they first read the screensize and then install a SIGWINCH handler.
2560 // some window managers resize the window early, and these programs
2561 // then sometimes get the size wrong.
2562 kill (-cmd_pid, SIGWINCH);
2563 }
2564
2265 /* Read a text string from the input buffer */ 2565 /* Read a text string from the input buffer */
2266 unicode_t buf[UBUFSIZ]; 2566 unicode_t buf[UBUFSIZ];
2267 bool refreshnow = false; 2567 bool refreshnow = false;
2268 int nlines = 0; 2568 int nlines = 0;
2269 unicode_t *str = buf; 2569 unicode_t *str = buf;
2270 2570
2271 *str++ = ch;
2272
2273 for (;;) 2571 for (;;)
2274 { 2572 {
2275 seq_begin = cmdbuf_ptr;
2276 ch = next_char ();
2277
2278 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2573 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2279 break; 2574 break;
2280 2575
2281 *str++ = ch; 2576 *str++ = ch;
2282 2577
2283 if (ch == C0_LF) 2578 if (ch == C0_LF)
2284 { 2579 {
2285 nlines++; 2580 nlines++;
2286 refresh_count++; 2581 refresh_count++;
2287 2582
2288 if (! (Options & Opt_jumpScroll) 2583 if (!(options & Opt_jumpScroll)
2289 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) 2584 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2290 { 2585 {
2291 refreshnow = true; 2586 refreshnow = true;
2292 flag = true;
2293 ch = NOCHAR; 2587 ch = NOCHAR;
2294 break; 2588 break;
2295 } 2589 }
2296 2590
2297 // scr_add_lines only works for nlines < TermWin.nrow - 1. 2591 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2298 if (nlines >= TermWin.nrow - 1) 2592 if (nlines >= TermWin.nrow - 1)
2299 { 2593 {
2300 scr_add_lines (buf, nlines, str - buf); 2594 scr_add_lines (buf, nlines, str - buf);
2301 nlines = 0; 2595 nlines = 0;
2302 str = buf; 2596 str = buf;
… …
2306 if (str >= buf + UBUFSIZ) 2600 if (str >= buf + UBUFSIZ)
2307 { 2601 {
2308 ch = NOCHAR; 2602 ch = NOCHAR;
2309 break; 2603 break;
2310 } 2604 }
2605
2606 seq_begin = cmdbuf_ptr;
2607 ch = next_char ();
2311 } 2608 }
2312 2609
2313 scr_add_lines (buf, nlines, str - buf); 2610 scr_add_lines (buf, nlines, str - buf);
2314 2611
2315 /* 2612 /*
2316 * If there have been a lot of new lines, then update the screen 2613 * If there have been a lot of new lines, then update the screen
2317 * What the heck I'll cheat and only refresh less than every page-full. 2614 * What the heck I'll cheat and only refresh less than every page-full.
2318 * the number of pages between refreshes is refresh_limit, which 2615 * the number of pages between refreshes is refresh_limit, which
2319 * is incremented here because we must be doing flat-out scrolling. 2616 * is incremented here because we must be doing flat-out scrolling.
2320 *
2321 * refreshing should be correct for small scrolls, because of the
2322 * time-out
2323 */ 2617 */
2324 if (refreshnow) 2618 if (refreshnow)
2325 { 2619 {
2326 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2620 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2327 refresh_limit++; 2621 refresh_limit++;
2328 else 2622 else
2623 {
2624 flag = true;
2329 scr_refresh (refresh_type); 2625 scr_refresh (refresh_type);
2626 }
2330 } 2627 }
2331 2628
2332 } 2629 }
2333 else 2630 else
2334 { 2631 {
… …
2518 process_escape_seq (); 2815 process_escape_seq ();
2519 break; 2816 break;
2520 case C0_ENQ: /* terminal Status */ 2817 case C0_ENQ: /* terminal Status */
2521 if (rs[Rs_answerbackstring]) 2818 if (rs[Rs_answerbackstring])
2522 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2819 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2523 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2820 (unsigned int)strlen (rs[Rs_answerbackstring]));
2524 else 2821 else
2525 tt_write ((unsigned char *)VT100_ANS, 2822 tt_write ((unsigned char *)VT100_ANS,
2526 (unsigned int)STRLEN (VT100_ANS)); 2823 (unsigned int)strlen (VT100_ANS));
2527 break; 2824 break;
2528 case C0_BEL: /* bell */ 2825 case C0_BEL: /* bell */
2529 scr_bell (); 2826 scr_bell ();
2530 break; 2827 break;
2531 case C0_BS: /* backspace */ 2828 case C0_BS: /* backspace */
… …
2630void 2927void
2631rxvt_term::process_escape_seq () 2928rxvt_term::process_escape_seq ()
2632{ 2929{
2633 unicode_t ch = cmd_getc (); 2930 unicode_t ch = cmd_getc ();
2634 2931
2635 if (PrivateModes & PrivMode_vt52) 2932 if (priv_modes & PrivMode_vt52)
2636 { 2933 {
2637 process_escape_vt52 (ch); 2934 process_escape_vt52 (ch);
2638 return; 2935 return;
2639 } 2936 }
2640 2937
… …
2655 scr_charset_set (2, (unsigned int)cmd_getc ()); 2952 scr_charset_set (2, (unsigned int)cmd_getc ());
2656 break; 2953 break;
2657 case '+': 2954 case '+':
2658 scr_charset_set (3, (unsigned int)cmd_getc ()); 2955 scr_charset_set (3, (unsigned int)cmd_getc ());
2659 break; 2956 break;
2660#ifndef NO_FRILLS 2957#if ENABLE_FRILLS
2661 case '6': 2958 case '6':
2662 scr_backindex (); 2959 scr_backindex ();
2663 break; 2960 break;
2664#endif 2961#endif
2665 case '7': 2962 case '7':
2666 scr_cursor (SAVE); 2963 scr_cursor (SAVE);
2667 break; 2964 break;
2668 case '8': 2965 case '8':
2669 scr_cursor (RESTORE); 2966 scr_cursor (RESTORE);
2670 break; 2967 break;
2671#ifndef NO_FRILLS 2968#if ENABLE_FRILLS
2672 case '9': 2969 case '9':
2673 scr_forwardindex (); 2970 scr_forwardindex ();
2674 break; 2971 break;
2675#endif 2972#endif
2676 case '=': 2973 case '=':
… …
2975 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3272 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2976 break; 3273 break;
2977 3274
2978 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3275 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2979 tt_write ((const unsigned char *)VT100_ANS, 3276 tt_write ((const unsigned char *)VT100_ANS,
2980 (unsigned int) (sizeof (VT100_ANS) - 1)); 3277 (unsigned int) (sizeof (VT100_ANS) - 1));
2981 break; 3278 break;
2982 3279
2983 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3280 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2984 process_sgr_mode (nargs, arg); 3281 process_sgr_mode (nargs, arg);
2985 break; 3282 break;
… …
2992 break; 3289 break;
2993 case 6: /* CPR requested */ 3290 case 6: /* CPR requested */
2994 scr_report_position (); 3291 scr_report_position ();
2995 break; 3292 break;
2996 case 7: /* unofficial extension */ 3293 case 7: /* unofficial extension */
2997 if (Options & Opt_insecure) 3294 if (options & Opt_insecure)
2998 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3295 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2999 break; 3296 break;
3000 case 8: /* unofficial extension */ 3297 case 8: /* unofficial extension */
3001 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3298 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3002 break; 3299 break;
3003 } 3300 }
… …
3039 break; 3336 break;
3040 3337
3041 case CSI_RM: /* 8.3.107: RESET MODE */ 3338 case CSI_RM: /* 8.3.107: RESET MODE */
3042 if (arg[0] == 4) 3339 if (arg[0] == 4)
3043 scr_insert_mode (0); 3340 scr_insert_mode (0);
3341 else if (arg[0] == 20)
3342 priv_modes &= ~PrivMode_LFNL;
3044 break; 3343 break;
3045 3344
3046 case CSI_SM: /* 8.3.126: SET MODE */ 3345 case CSI_SM: /* 8.3.126: SET MODE */
3047 if (arg[0] == 4) 3346 if (arg[0] == 4)
3048 scr_insert_mode (1); 3347 scr_insert_mode (1);
3348 else if (arg[0] == 20)
3349 priv_modes |= PrivMode_LFNL;
3049 break; 3350 break;
3050 3351
3051 /* 3352 /*
3052 * PRIVATE USE beyond this point. All CSI_7? sequences here 3353 * PRIVATE USE beyond this point. All CSI_7? sequences here
3053 */ 3354 */
… …
3065 break; 3366 break;
3066 case CSI_75: 3367 case CSI_75:
3067 scr_cursor (RESTORE); 3368 scr_cursor (RESTORE);
3068 break; 3369 break;
3069 3370
3070#ifndef NO_FRILLS 3371#if ENABLE_FRILLS
3071 case CSI_74: 3372 case CSI_74:
3072 process_window_ops (arg, nargs); 3373 process_window_ops (arg, nargs);
3073 break; 3374 break;
3074#endif 3375#endif
3075 3376
… …
3082 break; 3383 break;
3083 } 3384 }
3084} 3385}
3085/*}}} */ 3386/*}}} */
3086 3387
3087#ifndef NO_FRILLS 3388#if ENABLE_FRILLS
3088/* ARGSUSED */ 3389/* ARGSUSED */
3089void 3390void
3090rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3391rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3091{ 3392{
3092 int x, y; 3393 int x, y;
… …
3159 break; 3460 break;
3160 case 19: /* report window size (chars) */ 3461 case 19: /* report window size (chars) */
3161 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3462 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3162 break; 3463 break;
3163 case 20: /* report icon label */ 3464 case 20: /* report icon label */
3164 if (Options & Opt_insecure)
3165 { 3465 {
3166 char *s; 3466 char *s;
3167 XGetIconName (display->display, TermWin.parent[0], &s); 3467 XGetIconName (display->display, TermWin.parent[0], &s);
3168 tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ 3468 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3469 XFree (s);
3169 } 3470 }
3170 break; 3471 break;
3171 case 21: /* report window title */ 3472 case 21: /* report window title */
3172 if (Options & Opt_insecure)
3173 { 3473 {
3174 char *s; 3474 char *s;
3175 XFetchName (display->display, TermWin.parent[0], &s); 3475 XFetchName (display->display, TermWin.parent[0], &s);
3176 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3476 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3477 XFree (s);
3177 } 3478 }
3178 break; 3479 break;
3179 } 3480 }
3180} 3481}
3181#endif 3482#endif
3182 3483
… …
3224 3525
3225 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3526 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3226 return NULL; 3527 return NULL;
3227 3528
3228 ends_how = (ch == 0x5c ? C0_ESC : ch); 3529 ends_how = (ch == 0x5c ? C0_ESC : ch);
3229 STRNCPY (s, string, n); 3530 strncpy (s, string, n);
3230 return s; 3531 return s;
3231} 3532}
3232 3533
3233/*----------------------------------------------------------------------*/ 3534/*----------------------------------------------------------------------*/
3234/* 3535/*
… …
3279void 3580void
3280rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3581rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3281{ 3582{
3282 if (str[0] == '?' && !str[1]) 3583 if (str[0] == '?' && !str[1])
3283 { 3584 {
3284 if (Options & Opt_insecure)
3285 {
3286 unsigned short r, g, b; 3585 unsigned short r, g, b;
3287 PixColorsFocused[color].get (display, r, g, b); 3586 pix_colors_focused[color].get (display, r, g, b);
3288 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3587 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3289 }
3290 } 3588 }
3291 else 3589 else
3292 set_window_color (color, str); 3590 set_window_color (color, str);
3293} 3591}
3294 3592
… …
3380 break; 3678 break;
3381 3679
3382 case XTerm_Color: 3680 case XTerm_Color:
3383 for (buf = (char *)str; buf && *buf;) 3681 for (buf = (char *)str; buf && *buf;)
3384 { 3682 {
3385 if ((name = STRCHR (buf, ';')) == NULL) 3683 if ((name = strchr (buf, ';')) == NULL)
3386 break; 3684 break;
3387 3685
3388 *name++ = '\0'; 3686 *name++ = '\0';
3389 color = atoi (buf); 3687 color = atoi (buf);
3390 3688
3391 if (color < 0 || color >= TOTAL_COLORS) 3689 if (color < 0 || color >= TOTAL_COLORS)
3392 break; 3690 break;
3393 3691
3394 if ((buf = STRCHR (name, ';')) != NULL) 3692 if ((buf = strchr (name, ';')) != NULL)
3395 *buf++ = '\0'; 3693 *buf++ = '\0';
3396 3694
3397 if (name[0] == '?' && !name[1]) 3695 if (name[0] == '?' && !name[1])
3398 { 3696 {
3399 if (Options & Opt_insecure)
3400 {
3401 unsigned short r, g, b; 3697 unsigned short r, g, b;
3402 PixColorsFocused[color + minCOLOR].get (display, r, g, b); 3698 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3403 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3699 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3404 }
3405 } 3700 }
3406 else 3701 else
3407 set_window_color (color + minCOLOR, name); 3702 set_window_color (color + minCOLOR, name);
3408 } 3703 }
3409 break; 3704 break;
… …
3443 scale_pixmap (""); /* reset to default scaling */ 3738 scale_pixmap (""); /* reset to default scaling */
3444 set_bgPixmap (str); /* change pixmap */ 3739 set_bgPixmap (str); /* change pixmap */
3445#endif 3740#endif
3446 scr_touch (true); 3741 scr_touch (true);
3447 } 3742 }
3448 while ((str = STRCHR (str, ';')) != NULL) 3743 while ((str = strchr (str, ';')) != NULL)
3449 { 3744 {
3450 str++; 3745 str++;
3451#if XPM_BACKGROUND 3746#if XPM_BACKGROUND
3452 changed += scale_pixmap (str); 3747 changed += scale_pixmap (str);
3453#endif 3748#endif
… …
3473 // TODO, when secure mode? 3768 // TODO, when secure mode?
3474 break; 3769 break;
3475 3770
3476 case XTerm_font: 3771 case XTerm_font:
3477 if (query) 3772 if (query)
3478 {
3479 if (Options & Opt_insecure)
3480 tt_printf ("\33]%d;%-.250s%c", XTerm_font, 3773 tt_printf ("\33]%d;%-.250s%c", XTerm_font,
3774 (options & Opt_insecure) && TermWin.fontset->fontdesc
3481 TermWin.fontset->fontdesc 3775 ? TermWin.fontset->fontdesc : "",
3482 ? TermWin.fontset->fontdesc
3483 : "",
3484 resp); 3776 resp);
3485 }
3486 else 3777 else
3487 change_font (str); 3778 change_font (str);
3488 break; 3779 break;
3489 3780
3490#ifndef NO_FRILLS 3781#if ENABLE_FRILLS
3491 case XTerm_locale: 3782 case XTerm_locale:
3492 if (query) 3783 if (query)
3493 {
3494 if (Options & Opt_insecure)
3495 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); 3784 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3496 }
3497 else 3785 else
3498 { 3786 {
3499 set_locale (str); 3787 set_locale (str);
3500# ifdef USE_XIM 3788# ifdef USE_XIM
3501 im_cb (); 3789 im_cb ();
3502# endif 3790# endif
3503 } 3791 }
3504 break; 3792 break;
3505 3793
3506 case XTerm_findfont: 3794 case XTerm_findfont:
3507 if (Options & Opt_insecure)
3508 { 3795 {
3509 int fid = TermWin.fontset->find_font (atoi (str)); 3796 int fid = TermWin.fontset->find_font (atoi (str));
3510 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont, 3797 tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont,
3511 fid, (*TermWin.fontset)[fid]->name, resp); 3798 fid,
3799 (options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "",
3800 resp);
3512 } 3801 }
3513 break; 3802 break;
3514#endif 3803#endif
3515 3804
3516#ifdef MENUBAR 3805#ifdef MENUBAR
3517 case XTerm_Menu: 3806 case XTerm_Menu:
3518 if (Options & Opt_insecure) 3807 if (options & Opt_insecure)
3519 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3808 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3520 break; 3809 break;
3521#endif 3810#endif
3522#if 0 3811#if 0
3523 case XTerm_dumpscreen: /* no error notices */ 3812 case XTerm_dumpscreen: /* no error notices */
… …
3550{ 3839{
3551 int state; 3840 int state;
3552 3841
3553 if (mode == 's') 3842 if (mode == 's')
3554 { 3843 {
3555 SavedModes |= (PrivateModes & bit); 3844 SavedModes |= (priv_modes & bit);
3556 return -1; 3845 return -1;
3557 } 3846 }
3558 else 3847 else
3559 { 3848 {
3560 if (mode == 'r') 3849 if (mode == 'r')
3561 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3850 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3562 else 3851 else
3563 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3852 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3564 PrivMode (state, bit); 3853 PrivMode (state, bit);
3565 } 3854 }
3566 3855
3567 return state; 3856 return state;
3568} 3857}
… …
3586 { 3, PrivMode_132 }, 3875 { 3, PrivMode_132 },
3587 { 4, PrivMode_smoothScroll }, 3876 { 4, PrivMode_smoothScroll },
3588 { 5, PrivMode_rVideo }, 3877 { 5, PrivMode_rVideo },
3589 { 6, PrivMode_relOrigin }, 3878 { 6, PrivMode_relOrigin },
3590 { 7, PrivMode_Autowrap }, 3879 { 7, PrivMode_Autowrap },
3880 // 8, bi-directional support mode
3591 { 9, PrivMode_MouseX10 }, 3881 { 9, PrivMode_MouseX10 },
3592#ifdef menuBar_esc 3882#ifdef menuBar_esc
3593 { menuBar_esc, PrivMode_menuBar }, 3883 { menuBar_esc, PrivMode_menuBar },
3594#endif 3884#endif
3885 // 18, 19 printing-related
3886 { 25, PrivMode_VisibleCursor },
3595#ifdef scrollBar_esc 3887#ifdef scrollBar_esc
3596 { scrollBar_esc, PrivMode_scrollBar }, 3888 { scrollBar_esc, PrivMode_scrollBar },
3597#endif 3889#endif
3598 // 18, 19 printing-related
3599 { 25, PrivMode_VisibleCursor },
3600 // 30 show scrollbar rxvt. extension
3601 { 35, PrivMode_ShiftKeys }, // rxvt extension 3890 { 35, PrivMode_ShiftKeys }, // rxvt extension
3602 { 40, PrivMode_132OK }, 3891 { 40, PrivMode_132OK },
3603 // 41 xterm more fixes NYI 3892 // 41 xterm more fixes NYI
3604 // 45 margin bell NYI 3893 // 45 margin bell NYI
3605 // 46 start logging 3894 // 46 start logging
… …
3646 3935
3647 /* extra handling for values with state unkept */ 3936 /* extra handling for values with state unkept */
3648 switch (arg[i]) 3937 switch (arg[i])
3649 { 3938 {
3650 case 1048: /* alternative cursor save */ 3939 case 1048: /* alternative cursor save */
3651 if (Options & Opt_secondaryScreen) 3940 if (options & Opt_secondaryScreen)
3652 if (mode == 0) 3941 if (mode == 0)
3653 scr_cursor (RESTORE); 3942 scr_cursor (RESTORE);
3654 else if (mode == 1) 3943 else if (mode == 1)
3655 scr_cursor (SAVE); 3944 scr_cursor (SAVE);
3656 break; 3945 break;
… …
3667 * within VT52 mode 3956 * within VT52 mode
3668 */ 3957 */
3669 PrivMode (1, PrivMode_vt52); 3958 PrivMode (1, PrivMode_vt52);
3670 break; 3959 break;
3671 case 3: /* 80/132 */ 3960 case 3: /* 80/132 */
3672 if (PrivateModes & PrivMode_132OK) 3961 if (priv_modes & PrivMode_132OK)
3673 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 3962 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3674 break; 3963 break;
3675 case 4: /* smooth scrolling */ 3964 case 4: /* smooth scrolling */
3676 if (state) 3965 if (state)
3677 Options &= ~Opt_jumpScroll; 3966 options &= ~Opt_jumpScroll;
3678 else 3967 else
3679 Options |= Opt_jumpScroll; 3968 options |= Opt_jumpScroll;
3680 break; 3969 break;
3681 case 5: /* reverse video */ 3970 case 5: /* reverse video */
3682 scr_rvideo_mode (state); 3971 scr_rvideo_mode (state);
3683 break; 3972 break;
3684 case 6: /* relative/absolute origins */ 3973 case 6: /* relative/absolute origins */
… …
3688 scr_autowrap (state); 3977 scr_autowrap (state);
3689 break; 3978 break;
3690 /* case 8: - auto repeat, can't do on a per window basis */ 3979 /* case 8: - auto repeat, can't do on a per window basis */
3691 case 9: /* X10 mouse reporting */ 3980 case 9: /* X10 mouse reporting */
3692 if (state) /* orthogonal */ 3981 if (state) /* orthogonal */
3693 PrivateModes &= ~PrivMode_MouseX11; 3982 priv_modes &= ~PrivMode_MouseX11;
3694 break; 3983 break;
3695#ifdef menuBar_esc 3984#ifdef menuBar_esc
3696 case menuBar_esc: 3985 case menuBar_esc:
3697#ifdef MENUBAR 3986#ifdef MENUBAR
3698 map_menuBar (state); 3987 map_menuBar (state);
… …
3718 break; 4007 break;
3719 /* case 66: - application key pad */ 4008 /* case 66: - application key pad */
3720 /* case 67: - backspace key */ 4009 /* case 67: - backspace key */
3721 case 1000: /* X11 mouse reporting */ 4010 case 1000: /* X11 mouse reporting */
3722 if (state) /* orthogonal */ 4011 if (state) /* orthogonal */
3723 PrivateModes &= ~PrivMode_MouseX10; 4012 priv_modes &= ~PrivMode_MouseX10;
3724 break; 4013 break;
3725#if 0 4014#if 0
3726 case 1001: 4015 case 1001:
3727 break; /* X11 mouse highlighting */ 4016 break; /* X11 mouse highlighting */
3728#endif 4017#endif
3729 case 1010: /* scroll to bottom on TTY output inhibit */ 4018 case 1010: /* scroll to bottom on TTY output inhibit */
3730 if (state) 4019 if (state)
3731 Options &= ~Opt_scrollTtyOutput; 4020 options &= ~Opt_scrollTtyOutput;
3732 else 4021 else
3733 Options |= Opt_scrollTtyOutput; 4022 options |= Opt_scrollTtyOutput;
3734 break; 4023 break;
3735 case 1011: /* scroll to bottom on key press */ 4024 case 1011: /* scroll to bottom on key press */
3736 if (state) 4025 if (state)
3737 Options |= Opt_scrollTtyKeypress; 4026 options |= Opt_scrollTtyKeypress;
3738 else 4027 else
3739 Options &= ~Opt_scrollTtyKeypress; 4028 options &= ~Opt_scrollTtyKeypress;
3740 break; 4029 break;
3741 case 1047: /* secondary screen w/ clearing last */ 4030 case 1047: /* secondary screen w/ clearing last */
3742 if (Options & Opt_secondaryScreen) 4031 if (options & Opt_secondaryScreen)
3743 if (current_screen != PRIMARY) 4032 if (current_screen != PRIMARY)
3744 scr_erase_screen (2); 4033 scr_erase_screen (2);
3745 scr_change_screen (state); 4034 scr_change_screen (state);
3746 break; 4035 break;
3747 case 1049: /* secondary screen w/ clearing first */ 4036 case 1049: /* secondary screen w/ clearing first */
3748 scr_change_screen (state); 4037 scr_change_screen (state);
3749 if (Options & Opt_secondaryScreen) 4038 if (options & Opt_secondaryScreen)
3750 if (current_screen != PRIMARY) 4039 if (current_screen != PRIMARY)
3751 scr_erase_screen (2); 4040 scr_erase_screen (2);
3752 break; 4041 break;
3753 default: 4042 default:
3754 break; 4043 break;
… …
3781 break; 4070 break;
3782 case 1: 4071 case 1:
3783 rendset = 1, rendstyle = RS_Bold; 4072 rendset = 1, rendstyle = RS_Bold;
3784 break; 4073 break;
3785 //case 2: // faint or second colour 4074 //case 2: // faint or second colour
4075 //case 3: // italic
3786 case 4: 4076 case 4:
3787 rendset = 1, rendstyle = RS_Uline; 4077 rendset = 1, rendstyle = RS_Uline;
3788 break; 4078 break;
3789 case 5: // slowly blinking 4079 case 5: // slowly blinking
3790 case 6: // rapidly blinking 4080 case 6: // rapidly blinking
… …
3815 rendset = 0, rendstyle = RS_Uline; 4105 rendset = 0, rendstyle = RS_Uline;
3816 break; 4106 break;
3817 case 25: 4107 case 25:
3818 rendset = 0, rendstyle = RS_Blink; 4108 rendset = 0, rendstyle = RS_Blink;
3819 break; 4109 break;
4110 case 26:
4111 rendset = 0, rendstyle = RS_Blink;
4112 break;
3820 case 27: 4113 case 27:
3821 rendset = 0, rendstyle = RS_RVid; 4114 rendset = 0, rendstyle = RS_RVid;
3822 break; 4115 break;
3823 //case 28: // visible. NYI 4116 //case 28: // visible. NYI
3824 //case 29: // not crossed-out 4117 //case 29: // not crossed-out
… …
3914{ 4207{
3915 unicode_t ch, cmd = cmd_getc (); 4208 unicode_t ch, cmd = cmd_getc ();
3916 4209
3917 if (cmd == 'Q') 4210 if (cmd == 'Q')
3918 { /* query graphics */ 4211 { /* query graphics */
3919 tt_printf ("\033G0\n"); /* no graphics */ 4212 tt_printf ("\033G0\012"); /* no graphics */
3920 return; 4213 return;
3921 } 4214 }
3922 /* swallow other graphics sequences until terminating ':' */ 4215 /* swallow other graphics sequences until terminating ':' */
3923 do 4216 do
3924 ch = cmd_getc (); 4217 ch = cmd_getc ();
… …
3939 unsigned char buf[256]; 4232 unsigned char buf[256];
3940 4233
3941 va_start (arg_ptr, fmt); 4234 va_start (arg_ptr, fmt);
3942 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4235 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3943 va_end (arg_ptr); 4236 va_end (arg_ptr);
3944 tt_write (buf, STRLEN (buf)); 4237 tt_write (buf, strlen (buf));
3945} 4238}
3946 4239
3947/* ---------------------------------------------------------------------- */ 4240/* ---------------------------------------------------------------------- */
3948/* Write data to the pty as typed by the user, pasted with the mouse, 4241/* Write data to the pty as typed by the user, pasted with the mouse,
3949 * or generated by us in response to a query ESC sequence. 4242 * or generated by us in response to a query ESC sequence.
… …
3955 4248
3956 if (len) 4249 if (len)
3957 { 4250 {
3958 if (v_buflen == 0) 4251 if (v_buflen == 0)
3959 { 4252 {
3960 ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); 4253 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
3961 4254
3962 if ((unsigned int)written == len) 4255 if ((unsigned int)written == len)
3963 return; 4256 return;
3964 4257
3965 data += written; 4258 data += written;
… …
3973 v_buflen += len; 4266 v_buflen += len;
3974 } 4267 }
3975 4268
3976 for (;;) 4269 for (;;)
3977 { 4270 {
3978 int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); 4271 int written = write (pty.pty, v_buffer, min (MAX_PTY_WRITE, v_buflen));
3979 4272
3980 if (written > 0) 4273 if (written > 0)
3981 { 4274 {
3982 v_buflen -= written; 4275 v_buflen -= written;
3983 4276

Diff Legend

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