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.49 by pcg, Sat Feb 21 22:14:00 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
… …
52 52
53#include <wchar.h> 53#include <wchar.h>
54 54
55/*----------------------------------------------------------------------*/ 55/*----------------------------------------------------------------------*/
56 56
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58
59// exception thrown when the command parser runs out of input data
60class out_of_input { } out_of_input;
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
57/*{{{ Convert the keypress event into a string */ 258/*{{{ Convert the keypress event into a string */
58void 259void
59rxvt_term::lookup_key (XKeyEvent &ev) 260rxvt_term::lookup_key (XKeyEvent &ev)
60{ 261{
61 int ctrl, meta, shft, len; 262 int ctrl, meta, shft, len;
… …
88#ifdef USE_XIM 289#ifdef USE_XIM
89 if (Input_Context) 290 if (Input_Context)
90 { 291 {
91 Status status_return; 292 Status status_return;
92 293
294#if 0
93#ifdef X_HAVE_UTF8_STRING 295#ifdef X_HAVE_UTF8_STRING
94 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 296 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
95 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 297 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf,
96 KBUFSZ, &keysym, &status_return); 298 KBUFSZ, &keysym, &status_return);
97 else 299 else
300#endif
98#endif 301#endif
99 { 302 {
100 wchar_t wkbuf[KBUFSZ + 1]; 303 wchar_t wkbuf[KBUFSZ + 1];
101 304
102 // the XOpenIM manpage lies about hardcoding the locale 305 // the XOpenIM manpage lies about hardcoding the locale
… …
110 SET_LOCALE (locale); 313 SET_LOCALE (locale);
111 314
112 if (status_return == XLookupChars 315 if (status_return == XLookupChars
113 || status_return == XLookupBoth) 316 || status_return == XLookupBoth)
114 { 317 {
318 /* make sure the user can type ctrl-@, i.e. NUL */
319 if (len == 1 && *wkbuf == 0)
320 {
321 kbuf[0] = 0;
322 len = 1;
323 }
324 else
325 {
115 wkbuf[len] = 0; 326 wkbuf[len] = 0;
116 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ); 327 len = wcstombs ((char *)kbuf, wkbuf, KBUFSZ);
117 if (len < 0) 328 if (len < 0)
118 len = 0; 329 len = 0;
330 }
119 } 331 }
120 else 332 else
121 len = 0; 333 len = 0;
122 } 334 }
123 335
… …
131 valid_keysym = keysym != NoSymbol; 343 valid_keysym = keysym != NoSymbol;
132 } 344 }
133 345
134 if (valid_keysym) 346 if (valid_keysym)
135 { 347 {
136 /* for some backwards compatibility */
137#if defined(HOTKEY_CTRL) || defined(HOTKEY_META)
138# ifdef HOTKEY_CTRL
139 if (ctrl)
140# else
141 if (meta)
142# endif
143 {
144 if (keysym == ks_bigfont)
145 {
146 change_font (0, FONT_UP);
147 return;
148 }
149 else if (keysym == ks_smallfont)
150 {
151 change_font (0, FONT_DN);
152 return;
153 }
154 }
155#endif
156
157 if (TermWin.saveLines) 348 if (TermWin.saveLines)
158 { 349 {
159#ifdef UNSHIFTED_SCROLLKEYS 350#ifdef UNSHIFTED_SCROLLKEYS
160 if (!ctrl && !meta) 351 if (!ctrl && !meta)
161 {
162#else 352#else
163 if (IS_SCROLL_MOD) 353 if (IS_SCROLL_MOD)
354#endif
164 { 355 {
165#endif
166 int lnsppg; 356 int lnsppg;
167 357
168#ifdef PAGING_CONTEXT_LINES 358#ifdef PAGING_CONTEXT_LINES
169 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 359 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES;
170#else 360#else
… …
219 if (keysym >= XK_F1 && keysym <= XK_F10) 409 if (keysym >= XK_F1 && keysym <= XK_F10)
220 { 410 {
221 keysym += (XK_F11 - XK_F1); 411 keysym += (XK_F11 - XK_F1);
222 shft = 0; /* turn off Shift */ 412 shft = 0; /* turn off Shift */
223 } 413 }
224 else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) 414 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
225 { 415 {
226 switch (keysym) 416 switch (keysym)
227 { 417 {
228 /* normal XTerm key bindings */ 418 /* normal XTerm key bindings */
229 case XK_Insert: /* Shift+Insert = paste mouse selection */ 419 case XK_Insert: /* Shift+Insert = paste mouse selection */
230 selection_request (ev.time, 0, 0); 420 selection_request (ev.time, 0, 0);
231 return; 421 return;
422#if TODO // TODO
232 /* rxvt extras */ 423 /* rxvt extras */
233 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 424 case XK_KP_Add: /* Shift+KP_Add = bigger font */
234 change_font (0, FONT_UP); 425 change_font (FONT_UP);
235 return; 426 return;
236 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 427 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
237 change_font (0, FONT_DN); 428 change_font (FONT_DN);
238 return; 429 return;
430#endif
239 } 431 }
240 } 432 }
241 } 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
242#ifdef PRINTPIPE 481#ifdef PRINTPIPE
243 if (keysym == XK_Print) 482 if (keysym == XK_Print)
244 { 483 {
245 scr_printscreen (ctrl | shft); 484 scr_printscreen (ctrl | shft);
246 return;
247 }
248#endif
249#ifdef GREEK_SUPPORT
250 if (keysym == ks_greekmodeswith)
251 {
252 greek_mode = !greek_mode;
253 if (greek_mode)
254 {
255 xterm_seq (XTerm_title,
256 (greek_getmode () == GREEK_ELOT928
257 ? "[Greek: iso]" : "[Greek: ibm]"), CHAR_ST);
258 greek_reset ();
259 }
260 else
261 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST);
262 return; 485 return;
263 } 486 }
264#endif 487#endif
265 488
266 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 489 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
… …
268#ifdef KEYSYM_RESOURCE 491#ifdef KEYSYM_RESOURCE
269 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 492 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
270 { 493 {
271 unsigned int l; 494 unsigned int l;
272 const unsigned char *kbuf0; 495 const unsigned char *kbuf0;
273 const unsigned char ch = C0_ESC;
274 496
275 kbuf0 = (Keysym_map[keysym & 0xFF]); 497 kbuf0 = (Keysym_map[keysym & 0xFF]);
276 l = (unsigned int)*kbuf0++; 498 l = (unsigned int)*kbuf0++;
277 499
278 /* escape prefix */ 500 /* escape prefix */
279 if (meta) 501 if (meta
280# ifdef META8_OPTION 502# ifdef META8_OPTION
281 if (meta_char == C0_ESC) 503 && meta_char == C0_ESC
282# endif 504# endif
505 )
506 {
507 const unsigned char ch = C0_ESC;
283 tt_write (&ch, 1); 508 tt_write (&ch, 1);
509 }
510
284 tt_write (kbuf0, l); 511 tt_write (kbuf0, l);
285 return; 512 return;
286 } 513 }
287 else 514 else
288#endif 515#endif
… …
290 newlen = 1; 517 newlen = 1;
291 switch (keysym) 518 switch (keysym)
292 { 519 {
293#ifndef NO_BACKSPACE_KEY 520#ifndef NO_BACKSPACE_KEY
294 case XK_BackSpace: 521 case XK_BackSpace:
295 if (PrivateModes & PrivMode_HaveBackSpace) 522 if (priv_modes & PrivMode_HaveBackSpace)
296 { 523 {
297 kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) 524 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
298 ^ !!ctrl) ? '\b' : '\177'; 525 ^ !!ctrl) ? '\b' : '\177';
299 kbuf[1] = '\0'; 526 kbuf[1] = '\0';
300 } 527 }
301 else 528 else
302 STRCPY (kbuf, key_backspace); 529 strcpy (kbuf, key_backspace);
303# ifdef MULTICHAR_SET
304 if ((Options & Opt_mc_hack) && screen.cur.col > 0)
305 {
306 int col, row;
307
308 newlen = STRLEN (kbuf);
309 col = screen.cur.col - 1;
310 row = screen.cur.row + TermWin.saveLines;
311 if (IS_MULTI2 (screen.rend[row][col]))
312 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
313 }
314# endif
315 break; 530 break;
316#endif 531#endif
317#ifndef NO_DELETE_KEY 532#ifndef NO_DELETE_KEY
318 case XK_Delete: 533 case XK_Delete:
319 STRCPY (kbuf, key_delete); 534 strcpy (kbuf, key_delete);
320# ifdef MULTICHAR_SET
321 if (Options & Opt_mc_hack)
322 {
323 int col, row;
324
325 newlen = STRLEN (kbuf);
326 col = screen.cur.col;
327 row = screen.cur.row + TermWin.saveLines;
328 if (IS_MULTI1 (screen.rend[row][col]))
329 MEMMOVE (kbuf + newlen, kbuf, newlen + 1);
330 }
331# endif
332 break; 535 break;
333#endif 536#endif
334 case XK_Tab: 537 case XK_Tab:
335 if (shft) 538 if (shft)
336 STRCPY (kbuf, "\033[Z"); 539 strcpy (kbuf, "\033[Z");
337 else 540 else
338 { 541 {
339#ifdef CTRL_TAB_MAKES_META 542#ifdef CTRL_TAB_MAKES_META
340 if (ctrl) 543 if (ctrl)
341 meta = 1; 544 meta = 1;
… …
347 newlen = 0; 550 newlen = 0;
348 } 551 }
349 break; 552 break;
350 553
351#ifdef XK_KP_Left 554#ifdef XK_KP_Left
352 case XK_KP_Up: /* \033Ox or standard */ 555 case XK_KP_Up: /* \033Ox or standard */
353 case XK_KP_Down: /* \033Or or standard */ 556 case XK_KP_Down: /* \033Or or standard */
354 case XK_KP_Right: /* \033Ov or standard */ 557 case XK_KP_Right: /* \033Ov or standard */
355 case XK_KP_Left: /* \033Ot or standard */ 558 case XK_KP_Left: /* \033Ot or standard */
356 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 559 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
357 { 560 {
358 STRCPY (kbuf, "\033OZ"); 561 strcpy (kbuf, "\033OZ");
359 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 562 kbuf[2] = "txvr"[keysym - XK_KP_Left];
360 break; 563 break;
361 } 564 }
362 else 565 else
363 /* translate to std. cursor key */ 566 /* translate to std. cursor key */
… …
366#endif 569#endif
367 case XK_Up: /* "\033[A" */ 570 case XK_Up: /* "\033[A" */
368 case XK_Down: /* "\033[B" */ 571 case XK_Down: /* "\033[B" */
369 case XK_Right: /* "\033[C" */ 572 case XK_Right: /* "\033[C" */
370 case XK_Left: /* "\033[D" */ 573 case XK_Left: /* "\033[D" */
371 STRCPY (kbuf, "\033[Z"); 574 strcpy (kbuf, "\033[Z");
372 kbuf[2] = "DACB"[keysym - XK_Left]; 575 kbuf[2] = "DACB"[keysym - XK_Left];
373 /* do Shift first */ 576 /* do Shift first */
374 if (shft) 577 if (shft)
375 kbuf[2] = "dacb"[keysym - XK_Left]; 578 kbuf[2] = "dacb"[keysym - XK_Left];
376 else if (ctrl) 579 else if (ctrl)
377 { 580 {
378 kbuf[1] = 'O'; 581 kbuf[1] = 'O';
379 kbuf[2] = "dacb"[keysym - XK_Left]; 582 kbuf[2] = "dacb"[keysym - XK_Left];
380 } 583 }
381 else if (PrivateModes & PrivMode_aplCUR) 584 else if (priv_modes & PrivMode_aplCUR)
382 kbuf[1] = 'O'; 585 kbuf[1] = 'O';
383#ifdef MULTICHAR_SET
384 //TODO: ??
385 if (Options & Opt_mc_hack)
386 {
387 int col, row, m;
388
389 col = screen.cur.col;
390 row = screen.cur.row + TermWin.saveLines;
391 m = 0;
392 if (keysym == XK_Right
393 && IS_MULTI1 (screen.rend[row][col]))
394 m = 1;
395 else if (keysym == XK_Left)
396 {
397 if (col > 0)
398 {
399 if (IS_MULTI2 (screen.rend[row][col - 1]))
400 m = 1;
401 }
402 else if (screen.cur.row > 0)
403 {
404 col = screen.tlen[--row];
405 if (col == -1)
406 col = TermWin.ncol - 1;
407 else
408 col--;
409 if (col > 0
410 && IS_MULTI2 (screen.rend[row][col]))
411 m = 1;
412 }
413 }
414 if (m)
415 MEMMOVE (kbuf + 3, kbuf, 3 + 1);
416 }
417#endif
418 break; 586 break;
419 587
420#ifndef UNSHIFTED_SCROLLKEYS 588#ifndef UNSHIFTED_SCROLLKEYS
421# ifdef XK_KP_Prior 589# ifdef XK_KP_Prior
422 case XK_KP_Prior: 590 case XK_KP_Prior:
423 /* allow shift to override */ 591 /* allow shift to override */
424 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 592 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
425 { 593 {
426 STRCPY (kbuf, "\033Oy"); 594 strcpy (kbuf, "\033Oy");
427 break; 595 break;
428 } 596 }
429 /* FALLTHROUGH */ 597 /* FALLTHROUGH */
430# endif 598# endif
431 case XK_Prior: 599 case XK_Prior:
432 STRCPY (kbuf, "\033[5~"); 600 strcpy (kbuf, "\033[5~");
433 break; 601 break;
434# ifdef XK_KP_Next 602# ifdef XK_KP_Next
435 case XK_KP_Next: 603 case XK_KP_Next:
436 /* allow shift to override */ 604 /* allow shift to override */
437 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
438 { 606 {
439 STRCPY (kbuf, "\033Os"); 607 strcpy (kbuf, "\033Os");
440 break; 608 break;
441 } 609 }
442 /* FALLTHROUGH */ 610 /* FALLTHROUGH */
443# endif 611# endif
444 case XK_Next: 612 case XK_Next:
445 STRCPY (kbuf, "\033[6~"); 613 strcpy (kbuf, "\033[6~");
446 break; 614 break;
447#endif 615#endif
448 case XK_KP_Enter: 616 case XK_KP_Enter:
449 /* allow shift to override */ 617 /* allow shift to override */
450 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 618 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
451 { 619 {
452 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';
453 } 632 }
454 else 633 else
455 { 634 {
456 kbuf[0] = '\r'; 635 kbuf[0] = '\015';
457 kbuf[1] = '\0'; 636 kbuf[1] = '\0';
458 } 637 }
459 break; 638 break;
460 639
461#ifdef XK_KP_Begin 640#ifdef XK_KP_Begin
462 case XK_KP_Begin: 641 case XK_KP_Begin:
463 STRCPY (kbuf, "\033Ou"); 642 strcpy (kbuf, "\033Ou");
464 break; 643 break;
465 644
466 case XK_KP_Insert: 645 case XK_KP_Insert:
467 STRCPY (kbuf, "\033Op"); 646 strcpy (kbuf, "\033Op");
468 break; 647 break;
469 648
470 case XK_KP_Delete: 649 case XK_KP_Delete:
471 STRCPY (kbuf, "\033On"); 650 strcpy (kbuf, "\033On");
472 break; 651 break;
473#endif 652#endif
474 case XK_KP_F1: /* "\033OP" */ 653 case XK_KP_F1: /* "\033OP" */
475 case XK_KP_F2: /* "\033OQ" */ 654 case XK_KP_F2: /* "\033OQ" */
476 case XK_KP_F3: /* "\033OR" */ 655 case XK_KP_F3: /* "\033OR" */
477 case XK_KP_F4: /* "\033OS" */ 656 case XK_KP_F4: /* "\033OS" */
478 STRCPY (kbuf, "\033OP"); 657 strcpy (kbuf, "\033OP");
479 kbuf[2] += (keysym - XK_KP_F1); 658 kbuf[2] += (keysym - XK_KP_F1);
480 break; 659 break;
481 660
482 case XK_KP_Multiply: /* "\033Oj" : "*" */ 661 case XK_KP_Multiply: /* "\033Oj" : "*" */
483 case XK_KP_Add: /* "\033Ok" : "+" */ 662 case XK_KP_Add: /* "\033Ok" : "+" */
… …
494 case XK_KP_6: /* "\033Ov" : "6" */ 673 case XK_KP_6: /* "\033Ov" : "6" */
495 case XK_KP_7: /* "\033Ow" : "7" */ 674 case XK_KP_7: /* "\033Ow" : "7" */
496 case XK_KP_8: /* "\033Ox" : "8" */ 675 case XK_KP_8: /* "\033Ox" : "8" */
497 case XK_KP_9: /* "\033Oy" : "9" */ 676 case XK_KP_9: /* "\033Oy" : "9" */
498 /* allow shift to override */ 677 /* allow shift to override */
499 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 678 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
500 { 679 {
501 STRCPY (kbuf, "\033Oj"); 680 strcpy (kbuf, "\033Oj");
502 kbuf[2] += (keysym - XK_KP_Multiply); 681 kbuf[2] += (keysym - XK_KP_Multiply);
503 } 682 }
504 else 683 else
505 { 684 {
506 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 685 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
507 kbuf[1] = '\0'; 686 kbuf[1] = '\0';
508 } 687 }
509 break; 688 break;
510 689
511 case XK_Find: 690 case XK_Find:
512 STRCPY (kbuf, "\033[1~"); 691 strcpy (kbuf, "\033[1~");
513 break; 692 break;
514 case XK_Insert: 693 case XK_Insert:
515 STRCPY (kbuf, "\033[2~"); 694 strcpy (kbuf, "\033[2~");
516 break; 695 break;
517#ifdef DXK_Remove /* support for DEC remove like key */ 696#ifdef DXK_Remove /* support for DEC remove like key */
518 case DXK_Remove: 697 case DXK_Remove:
519 /* FALLTHROUGH */ 698 /* FALLTHROUGH */
520#endif 699#endif
521 case XK_Execute: 700 case XK_Execute:
522 STRCPY (kbuf, "\033[3~"); 701 strcpy (kbuf, "\033[3~");
523 break; 702 break;
524 case XK_Select: 703 case XK_Select:
525 STRCPY (kbuf, "\033[4~"); 704 strcpy (kbuf, "\033[4~");
526 break; 705 break;
527#ifdef XK_KP_End 706#ifdef XK_KP_End
528 case XK_KP_End: 707 case XK_KP_End:
529 /* allow shift to override */ 708 /* allow shift to override */
530 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
531 { 710 {
532 STRCPY (kbuf, "\033Oq"); 711 strcpy (kbuf, "\033Oq");
533 break; 712 break;
534 } 713 }
535 /* FALLTHROUGH */ 714 /* FALLTHROUGH */
536#endif 715#endif
537 case XK_End: 716 case XK_End:
538 STRCPY (kbuf, KS_END); 717 strcpy (kbuf, KS_END);
539 break; 718 break;
540#ifdef XK_KP_Home 719#ifdef XK_KP_Home
541 case XK_KP_Home: 720 case XK_KP_Home:
542 /* allow shift to override */ 721 /* allow shift to override */
543 if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) 722 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
544 { 723 {
545 STRCPY (kbuf, "\033Ow"); 724 strcpy (kbuf, "\033Ow");
546 break; 725 break;
547 } 726 }
548 /* FALLTHROUGH */ 727 /* FALLTHROUGH */
549#endif 728#endif
550 case XK_Home: 729 case XK_Home:
551 STRCPY (kbuf, KS_HOME); 730 strcpy (kbuf, KS_HOME);
552 break; 731 break;
553 732
554#define FKEY(n, fkey) \ 733#define FKEY(n, fkey) \
555 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) 734 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
556 735
… …
609 default: 788 default:
610 newlen = 0; 789 newlen = 0;
611 break; 790 break;
612 } 791 }
613 if (newlen) 792 if (newlen)
614 len = STRLEN (kbuf); 793 len = strlen (kbuf);
615 } 794 }
795
616 /* 796 /*
617 * Pass meta for all function keys, if 'meta' option set 797 * Pass meta for all function keys, if 'meta' option set
618 */ 798 */
619#ifdef META8_OPTION 799#ifdef META8_OPTION
620 if (meta && (meta_char == 0x80) && len > 0) 800 if (meta && (meta_char == 0x80) && len > 0)
… …
635 { 815 {
636 unsigned char *ch; 816 unsigned char *ch;
637 817
638 for (ch = kbuf; ch < kbuf + len; ch++) 818 for (ch = kbuf; ch < kbuf + len; ch++)
639 *ch |= 0x80; 819 *ch |= 0x80;
820
640 meta = 0; 821 meta = 0;
641 } 822 }
642#endif 823#endif
643#ifdef GREEK_SUPPORT
644 if (greek_mode)
645 len = greek_xlat (kbuf, len);
646#endif
647 /* nil */ ; 824 /* nil */ ;
648 } 825 }
649 } 826 }
650 827
651 if (len <= 0) 828 if (len <= 0)
652 return; /* not mapped */ 829 return; /* not mapped */
653 830
654 if (Options & Opt_scrollTtyKeypress) 831 if (options & Opt_scrollTtyKeypress)
655 if (TermWin.view_start) 832 if (TermWin.view_start)
656 { 833 {
657 TermWin.view_start = 0; 834 TermWin.view_start = 0;
658 want_refresh = 1; 835 want_refresh = 1;
659 } 836 }
… …
673 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~')); 850 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
674 851
675 /* escape prefix */ 852 /* escape prefix */
676 if (meta 853 if (meta
677#ifdef META8_OPTION 854#ifdef META8_OPTION
678 && (meta_char == C0_ESC) 855 && meta_char == C0_ESC
679#endif 856#endif
680 ) 857 )
681 { 858 {
682 const unsigned char ch = C0_ESC; 859 const unsigned char ch = C0_ESC;
683
684 tt_write (&ch, 1); 860 tt_write (&ch, 1);
685 } 861 }
862
686#ifdef DEBUG_CMD 863#if defined(DEBUG_CMD)
687 if (debug_key)
688 { /* Display keyboard buffer contents */ 864 /* Display keyboard buffer contents */
689 char *p; 865 unsigned char *p;
690 int i; 866 int i;
691 867
692 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); 868 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
693 for (i = 0, p = kbuf; i < len; i++, p++) 869 for (i = 0, p = kbuf; i < len; i++, p++)
694 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); 870 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
695 fprintf (stderr, "'\n"); 871 fprintf (stderr, "'\n");
696 }
697#endif /* DEBUG_CMD */ 872#endif /* DEBUG_CMD */
698 tt_write (kbuf, (unsigned int)len); 873 tt_write (kbuf, (unsigned int)len);
699} 874}
700/*}}} */ 875/*}}} */
701 876
… …
703/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 878/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
704/* attempt to `write' count to the input buffer */ 879/* attempt to `write' count to the input buffer */
705unsigned int 880unsigned int
706rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 881rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
707{ 882{
708 unsigned int n, s; 883 unsigned int n, s;
709 884
710 n = cmdbuf_ptr - cmdbuf_base; 885 n = cmdbuf_ptr - cmdbuf_base;
711 s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp; 886 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
887
712 if (n > 0 && s < count) 888 if (n > 0 && s < count)
713 { 889 {
714 MEMMOVE (cmdbuf_base, cmdbuf_ptr, 890 memmove (cmdbuf_base, cmdbuf_ptr,
715 (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); 891 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
716 cmdbuf_ptr = cmdbuf_base; 892 cmdbuf_ptr = cmdbuf_base;
717 cmdbuf_endp -= n; 893 cmdbuf_endp -= n;
718 s += n; 894 s += n;
719 } 895 }
896
720 if (count > s) 897 if (count > s)
721 { 898 {
722 rxvt_print_error ("data loss: cmd_write too large"); 899 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
723 count = s; 900 count = s;
724 } 901 }
902
725 for (; count--;) 903 for (; count--;)
726 *cmdbuf_endp++ = *str++; 904 *cmdbuf_endp++ = *str++;
905
906 cmd_parse ();
907
727 return 0; 908 return 0;
728} 909}
729#endif /* MENUBAR_MAX */ 910#endif /* MENUBAR_MAX */
730 911
731void 912void
… …
735 if (want_full_refresh) 916 if (want_full_refresh)
736 { 917 {
737 want_full_refresh = 0; 918 want_full_refresh = 0;
738 scr_clear (); 919 scr_clear ();
739 scr_touch (false); 920 scr_touch (false);
740 want_refresh = 1;
741 } 921 }
742#endif 922#endif
743 923
744 if (want_refresh) 924 if (want_refresh)
745 { 925 {
746 scr_refresh (refresh_type); 926 scr_refresh (refresh_type);
747 scrollbar_show (1); 927 scrollbar_show (1);
748#ifdef USE_XIM 928#ifdef USE_XIM
749 IMSendSpot (); 929 IMSendSpot ();
750#endif 930#endif
751
752 } 931 }
753 932
754 display->flush (); 933 display->flush ();
934
935 flush_ev.stop ();
755} 936}
756 937
757void 938void
758rxvt_term::check_cb (check_watcher &w) 939rxvt_term::check_cb (check_watcher &w)
759{ 940{
760 SET_R (this); 941 SET_R (this);
761 SET_LOCALE (locale); 942 SET_LOCALE (locale);
762 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;
763 flush (); 958 flush ();
764} 959}
765 960
766#ifdef CURSOR_BLINK 961#ifdef CURSOR_BLINK
767void 962void
… …
785 w.start (w.at + TEXT_BLINK_INTERVAL); 980 w.start (w.at + TEXT_BLINK_INTERVAL);
786 } 981 }
787} 982}
788#endif 983#endif
789 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
790bool 1028bool
791rxvt_term::pty_fill () 1029rxvt_term::pty_fill ()
792{ 1030{
793 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 }
794 1038
795 memmove (cmdbuf_base, cmdbuf_ptr, n); 1039 memmove (cmdbuf_base, cmdbuf_ptr, n);
796 cmdbuf_ptr = cmdbuf_base; 1040 cmdbuf_ptr = cmdbuf_base;
797 cmdbuf_endp = cmdbuf_ptr + n; 1041 cmdbuf_endp = cmdbuf_ptr + n;
798 1042
799 n = read (cmd_fd, cmdbuf_endp, BUFSIZ - n); 1043 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
800 1044
801 if (n > 0) 1045 if (n > 0)
802 { 1046 {
803 cmdbuf_endp += n; 1047 cmdbuf_endp += n;
804 return true; 1048 return true;
805 } 1049 }
806 else if (n < 0 && errno != EAGAIN) 1050 else if (n < 0 && errno != EAGAIN)
807 destroy (); 1051 destroy ();
808 1052
809 return false; 1053 return false;
810} 1054}
811 1055
812void 1056void
813rxvt_term::pty_cb (io_watcher &w, short revents) 1057rxvt_term::pty_cb (io_watcher &w, short revents)
… …
816 SET_LOCALE (locale); 1060 SET_LOCALE (locale);
817 1061
818 if (revents & EVENT_WRITE) 1062 if (revents & EVENT_WRITE)
819 tt_write (0, 0); 1063 tt_write (0, 0);
820 else if (revents & EVENT_READ) 1064 else if (revents & EVENT_READ)
821 {
822 bool flag = true;
823
824 // loop, but don't allow a single term to monopolize us 1065 // loop, but don't allow a single term to monopolize us
825 // the number of loops is fully arbitrary, and thus wrong
826 while (flag && pty_fill ()) 1066 while (pty_fill ())
827 { 1067 if (cmd_parse ())
828 if (!seen_input)
829 {
830 seen_input = 1;
831 /* once we know the shell is running, send the screen size. Again! */
832 tt_winch ();
833 }
834
835 uint32_t ch = NOCHAR;
836
837 for (;;)
838 {
839 if (ch == NOCHAR)
840 ch = next_char ();
841
842 if (ch == NOCHAR) // TODO: improve
843 break; 1068 break;
844
845 if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
846 {
847 /* Read a text string from the input buffer */
848 uint32_t buf[BUFSIZ];
849 bool refreshnow = false;
850 int nlines = 0;
851 uint32_t *str = buf;
852
853 *str++ = ch;
854
855 for (;;)
856 {
857 ch = next_char ();
858
859 if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
860 break;
861 else
862 {
863 *str++ = ch;
864
865 if (ch == '\n')
866 {
867 nlines++;
868 refresh_count++;
869
870 if (! (Options & Opt_jumpScroll)
871 || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
872 {
873 refreshnow = true;
874 flag = false;
875 ch = NOCHAR;
876 break;
877 }
878
879 // scr_add_lines only works for nlines < TermWin.nrow - 1.
880 if (nlines >= TermWin.nrow - 1)
881 {
882 scr_add_lines (buf, nlines, str - buf);
883 nlines = 0;
884 str = buf;
885 }
886 }
887
888 if (str >= buf + BUFSIZ)
889 {
890 ch = NOCHAR;
891 break;
892 }
893 }
894 }
895
896 scr_add_lines (buf, nlines, str - buf);
897
898 /*
899 * If there have been a lot of new lines, then update the screen
900 * What the heck I'll cheat and only refresh less than every page-full.
901 * the number of pages between refreshes is refresh_limit, which
902 * is incremented here because we must be doing flat-out scrolling.
903 *
904 * refreshing should be correct for small scrolls, because of the
905 * time-out
906 */
907 if (refreshnow)
908 {
909 if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
910 refresh_limit++;
911
912 scr_refresh (refresh_type);
913 }
914
915 }
916 else
917 {
918 switch (ch)
919 {
920 default:
921 process_nonprinting (ch);
922 break;
923 case C0_ESC: /* escape char */
924 process_escape_seq ();
925 break;
926 /*case 0x9b: */ /* CSI */
927 /* process_csi_seq (); */
928 }
929
930 ch = NOCHAR;
931 }
932 }
933 }
934 }
935} 1069}
936 1070
937// read the next character, currently handles UTF-8 1071void
938// will probably handle all sorts of other stuff in the future 1072rxvt_term::pointer_unblank ()
939uint32_t
940rxvt_term::next_char ()
941{ 1073{
942 while (cmdbuf_ptr < cmdbuf_endp) 1074 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
943 { 1075 recolour_cursor ();
944 if (*cmdbuf_ptr < 0x80) // assume < 0x80 to be ascii ALWAYS (all shift-states etc.) uh-oh
945 return *cmdbuf_ptr++;
946 1076
947 wchar_t wc; 1077#ifdef POINTER_BLANK
948 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 1078 hidden_pointer = 0;
949 1079
950 if (len == (size_t)-2) 1080 if (options & Opt_pointerBlank)
951 return NOCHAR; 1081 pointer_ev.start (NOW + pointerBlankDelay);
952 1082#endif
953 if (len == (size_t)-1)
954 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
955
956 // assume wchar == unicode
957 cmdbuf_ptr += len;
958 return wc;
959 }
960
961 return NOCHAR;
962}
963
964/* rxvt_cmd_getc () - Return next input character */
965/*
966 * Return the next input character after first passing any keyboard input
967 * to the command.
968 */
969uint32_t
970rxvt_term::cmd_getc ()
971{
972 for (;;)
973 {
974 uint32_t c = next_char ();
975 if (c != NOCHAR)
976 return c;
977
978 // incomplete sequences should occur rarely, still, a better solution
979 // would be preferred. either setjmp/longjmp or better design.
980 fcntl (cmd_fd, F_SETFL, 0);
981 pty_fill ();
982 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
983 }
984} 1083}
985 1084
986#ifdef POINTER_BLANK 1085#ifdef POINTER_BLANK
987void 1086void
988rxvt_term::pointer_unblank ()
989{
990 XDefineCursor (display->display, TermWin.vt, TermWin_cursor);
991 recolour_cursor ();
992
993 hidden_pointer = 0;
994
995 if (Options & Opt_pointerBlank)
996 pointer_ev.start (NOW + pointerBlankDelay);
997}
998
999void
1000rxvt_term::pointer_blank () 1087rxvt_term::pointer_blank ()
1001{ 1088{
1002 if (! (Options & Opt_pointerBlank)) 1089 if (! (options & Opt_pointerBlank))
1003 return; 1090 return;
1004 1091
1005 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1092 XDefineCursor (display->display, TermWin.vt, blank_cursor);
1006 XFlush (display->display); 1093 XFlush (display->display);
1007 1094
… …
1017 pointer_blank (); 1104 pointer_blank ();
1018} 1105}
1019#endif 1106#endif
1020 1107
1021void 1108void
1022rxvt_term::mouse_report (const XButtonEvent &ev) 1109rxvt_term::mouse_report (XButtonEvent &ev)
1023{ 1110{
1024 int button_number, key_state = 0; 1111 int button_number, key_state = 0;
1025 int x, y; 1112 int x, y;
1026 1113
1027 x = ev.x; 1114 x = ev.x;
1028 y = ev.y; 1115 y = ev.y;
1029 pixel_position (&x, &y); 1116 pixel_position (&x, &y);
1030 1117
1031 if (MEvent.button == AnyButton) 1118 if (MEvent.button == AnyButton)
1032 {
1033 button_number = 3; 1119 button_number = 3;
1034 }
1035 else 1120 else
1036 { 1121 {
1037 button_number = MEvent.button - Button1; 1122 button_number = MEvent.button - Button1;
1038 /* add 0x3D for wheel events, like xterm does */ 1123 /* add 0x3D for wheel events, like xterm does */
1039 if (button_number >= 3) 1124 if (button_number >= 3)
1040 button_number += (64 - 3); 1125 button_number += (64 - 3);
1041 } 1126 }
1042 1127
1043 if (PrivateModes & PrivMode_MouseX10) 1128 if (priv_modes & PrivMode_MouseX10)
1044 { 1129 {
1045 /* 1130 /*
1046 * do not report ButtonRelease 1131 * do not report ButtonRelease
1047 * no state info allowed 1132 * no state info allowed
1048 */ 1133 */
… …
1063 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1148 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1064 + ((MEvent.state & ControlMask) ? 16 : 0); 1149 + ((MEvent.state & ControlMask) ? 16 : 0);
1065#ifdef MOUSE_REPORT_DOUBLECLICK 1150#ifdef MOUSE_REPORT_DOUBLECLICK
1066 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1151 key_state += ((MEvent.clicks > 1) ? 32 : 0);
1067#endif 1152#endif
1068
1069 } 1153 }
1070 1154
1071#ifdef DEBUG_MOUSEREPORT 1155#if DEBUG_MOUSEREPORT
1072 fprintf (stderr, "Mouse ["); 1156 fprintf (stderr, "Mouse [");
1073 if (key_state & 16) 1157 if (key_state & 16)
1074 fputc ('C', stderr); 1158 fputc ('C', stderr);
1075 if (key_state & 4) 1159 if (key_state & 4)
1076 fputc ('S', stderr); 1160 fputc ('S', stderr);
… …
1080 fputc ('2', stderr); 1164 fputc ('2', stderr);
1081 fprintf (stderr, "]: <%d>, %d/%d\n", 1165 fprintf (stderr, "]: <%d>, %d/%d\n",
1082 button_number, 1166 button_number,
1083 x + 1, 1167 x + 1,
1084 y + 1); 1168 y + 1);
1085#else 1169#endif
1170
1086 tt_printf ("\033[M%c%c%c", 1171 tt_printf ("\033[M%c%c%c",
1087 (32 + button_number + key_state), 1172 (32 + button_number + key_state),
1088 (32 + x + 1), 1173 (32 + x + 1),
1089 (32 + y + 1)); 1174 (32 + y + 1));
1090#endif
1091} 1175}
1092 1176
1093#ifdef USING_W11LIB 1177#ifdef USING_W11LIB
1094void 1178void
1095rxvt_W11_process_x_event (XEvent *ev) 1179rxvt_W11_process_x_event (XEvent *ev)
… …
1106{ 1190{
1107 SET_R (this); 1191 SET_R (this);
1108 SET_LOCALE (locale); 1192 SET_LOCALE (locale);
1109 1193
1110#if defined(CURSOR_BLINK) 1194#if defined(CURSOR_BLINK)
1111 if ((Options & Opt_cursorBlink) && ev.type == KeyPress) 1195 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1112 { 1196 {
1113 if (hidden_cursor) 1197 if (hidden_cursor)
1114 { 1198 {
1115 hidden_cursor = 0; 1199 hidden_cursor = 0;
1116 want_refresh = 1; 1200 want_refresh = 1;
… …
1119 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1203 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1120 } 1204 }
1121#endif 1205#endif
1122 1206
1123#if defined(POINTER_BLANK) 1207#if defined(POINTER_BLANK)
1124 if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) 1208 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1125 { 1209 {
1126 if (ev.type == MotionNotify 1210 if (ev.type == MotionNotify
1127 || ev.type == ButtonPress 1211 || ev.type == ButtonPress
1128 || ev.type == ButtonRelease) 1212 || ev.type == ButtonRelease)
1129 if (hidden_pointer) 1213 if (hidden_pointer)
… …
1141 1225
1142 Window unused_root, unused_child; 1226 Window unused_root, unused_child;
1143 int unused_root_x, unused_root_y; 1227 int unused_root_x, unused_root_y;
1144 unsigned int unused_mask; 1228 unsigned int unused_mask;
1145 1229
1146#ifdef DEBUG_X
1147 const char *const eventnames[] =
1148 { /* mason - this matches my system */
1149 "",
1150 "",
1151 "KeyPress",
1152 "KeyRelease",
1153 "ButtonPress",
1154 "ButtonRelease",
1155 "MotionNotify",
1156 "EnterNotify",
1157 "LeaveNotify",
1158 "FocusIn",
1159 "FocusOut",
1160 "KeymapNotify",
1161 "Expose",
1162 "GraphicsExpose",
1163 "NoExpose",
1164 "VisibilityNotify",
1165 "CreateNotify",
1166 "DestroyNotify",
1167 "UnmapNotify",
1168 "MapNotify",
1169 "MapRequest",
1170 "ReparentNotify",
1171 "ConfigureNotify",
1172 "ConfigureRequest",
1173 "GravityNotify",
1174 "ResizeRequest",
1175 "CirculateNotify",
1176 "CirculateRequest",
1177 "PropertyNotify",
1178 "SelectionClear",
1179 "SelectionRequest",
1180 "SelectionNotify",
1181 "ColormapNotify",
1182 "ClientMessage",
1183 "MappingNotify"
1184 };
1185#endif
1186
1187#ifdef DEBUG_X
1188 struct timeval tp;
1189 struct tm *ltt;
1190 (void)gettimeofday (&tp, NULL);
1191 ltt = localtime (& (tp.tv_sec));
1192 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));
1193#endif
1194
1195 switch (ev.type) 1230 switch (ev.type)
1196 { 1231 {
1197 case KeyPress: 1232 case KeyPress:
1233#if ISO_14755
1234 if (!(iso14755buf & ISO_14755_52))
1235#endif
1198 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;
1199 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
1200 1301
1201#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1302#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1202 case KeyRelease:
1203 {
1204 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)
1205 mouse_slip_wheel_speed = 0; 1306 mouse_slip_wheel_speed = 0;
1206 else 1307#endif
1207 {
1208 KeySym ks;
1209
1210 ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0);
1211 if (ks == XK_Control_L || ks == XK_Control_R)
1212 mouse_slip_wheel_speed = 0;
1213 }
1214 break; 1308 break;
1215 } 1309 }
1216#endif
1217 1310
1218 case ButtonPress: 1311 case ButtonPress:
1219 button_press (ev.xbutton); 1312 button_press (ev.xbutton);
1220 break; 1313 break;
1221 1314
… …
1233 && (ev.xclient.data.l[0] == DndFile 1326 && (ev.xclient.data.l[0] == DndFile
1234 || ev.xclient.data.l[0] == DndDir 1327 || ev.xclient.data.l[0] == DndDir
1235 || ev.xclient.data.l[0] == DndLink)) 1328 || ev.xclient.data.l[0] == DndLink))
1236 { 1329 {
1237 /* Get Dnd data */ 1330 /* Get Dnd data */
1238 Atom ActualType; 1331 Atom ActualType;
1239 int ActualFormat; 1332 int ActualFormat;
1240 unsigned char *data; 1333 unsigned char *data;
1241 unsigned long Size, RemainingBytes; 1334 unsigned long Size, RemainingBytes;
1242 1335
1243 XGetWindowProperty (display->display, display->root, 1336 XGetWindowProperty (display->display, display->root,
1244 xa[XA_DNDSELECTION], 1337 xa[XA_DNDSELECTION],
1245 0L, 1000000L, 1338 0L, 1000000L,
1246 False, AnyPropertyType, 1339 False, AnyPropertyType,
… …
1248 &Size, &RemainingBytes, 1341 &Size, &RemainingBytes,
1249 &data); 1342 &data);
1250 XChangeProperty (display->display, display->root, 1343 XChangeProperty (display->display, display->root,
1251 XA_CUT_BUFFER0, XA_STRING, 1344 XA_CUT_BUFFER0, XA_STRING,
1252 8, PropModeReplace, 1345 8, PropModeReplace,
1253 data, STRLEN (data)); 1346 data, strlen (data));
1347 XFree (data);
1254 selection_paste (display->root, XA_CUT_BUFFER0, True); 1348 selection_paste (display->root, XA_CUT_BUFFER0, True);
1255 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1349 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime);
1256 } 1350 }
1257#endif /* OFFIX_DND */ 1351#endif /* OFFIX_DND */
1258 break; 1352 break;
1259 1353
1260 case MappingNotify: 1354 case MappingNotify:
1261 XRefreshKeyboardMapping (& (ev.xmapping)); 1355 XRefreshKeyboardMapping (&ev.xmapping);
1262 break; 1356 break;
1263 1357
1264 /* 1358 /*
1265 * XXX: this is not the _current_ arrangement 1359 * XXX: this is not the _current_ arrangement
1266 * Here's my conclusion: 1360 * Here's my conclusion:
… …
1291 { 1385 {
1292 TermWin.focus = 1; 1386 TermWin.focus = 1;
1293 want_refresh = 1; 1387 want_refresh = 1;
1294#ifdef USE_XIM 1388#ifdef USE_XIM
1295 if (Input_Context != NULL) 1389 if (Input_Context != NULL)
1390 {
1391 IMSetStatusPosition ();
1296 XSetICFocus (Input_Context); 1392 XSetICFocus (Input_Context);
1393 }
1297#endif 1394#endif
1298#ifdef CURSOR_BLINK 1395#ifdef CURSOR_BLINK
1299 if (Options & Opt_cursorBlink) 1396 if (options & Opt_cursorBlink)
1300 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 }
1301#endif 1405#endif
1302 1406
1303 } 1407 }
1304 break; 1408 break;
1305 1409
1306 case FocusOut: 1410 case FocusOut:
1307 if (TermWin.focus) 1411 if (TermWin.focus)
1308 { 1412 {
1309 TermWin.focus = 0; 1413 TermWin.focus = 0;
1310 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
1311#ifdef USE_XIM 1422#ifdef USE_XIM
1312 if (Input_Context != NULL) 1423 if (Input_Context != NULL)
1313 XUnsetICFocus (Input_Context); 1424 XUnsetICFocus (Input_Context);
1314#endif 1425#endif
1315#ifdef CURSOR_BLINK 1426#ifdef CURSOR_BLINK
1316 if (Options & Opt_cursorBlink) 1427 if (options & Opt_cursorBlink)
1317 cursor_blink_ev.stop (); 1428 cursor_blink_ev.stop ();
1318 hidden_cursor = 0; 1429 hidden_cursor = 0;
1319#endif 1430#endif
1320 1431#ifdef OFF_FOCUS_FADING
1432 if (rs[Rs_fade])
1433 {
1434 pix_colors = pix_colors_unfocused;
1435 scr_recolour ();
1436 }
1437#endif
1321 } 1438 }
1322 break; 1439 break;
1323 1440
1324 case ConfigureNotify: 1441 case ConfigureNotify:
1325 if (ev.xconfigure.window == TermWin.parent[0]) 1442 if (ev.xconfigure.window == TermWin.parent[0])
… …
1334 } 1451 }
1335 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1452 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev));
1336 1453
1337 if (szHint.width != width || szHint.height != height) 1454 if (szHint.width != width || szHint.height != height)
1338 { 1455 {
1339 D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); 1456 seen_resize = 1;
1340 resize_all_windows (width, height, 1); 1457 resize_all_windows (width, height, 1);
1341 } 1458 }
1342#ifdef DEBUG_SIZE 1459
1343 else
1344 {
1345 D_SIZE ((stderr, "Size: Not resizing"));
1346 }
1347#endif
1348#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1460#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1349 if (Options & Opt_transparent) 1461 if (options & Opt_transparent)
1350 { 1462 {
1351 check_our_parents (); 1463 check_our_parents ();
1352 if (am_transparent) 1464 if (am_transparent)
1353 want_full_refresh = 1; 1465 want_refresh = want_full_refresh = 1;
1354 } 1466 }
1355#endif 1467#endif
1356
1357 } 1468 }
1358 break; 1469 break;
1359 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
1476 break;
1477
1360 case SelectionClear: 1478 case SelectionClear:
1361 display->set_selection_owner (0); 1479 selection_clear ();
1362 break; 1480 break;
1363 1481
1364 case SelectionNotify: 1482 case SelectionNotify:
1365 if (selection_wait == Sel_normal) 1483 if (selection_wait == Sel_normal)
1366 selection_paste (ev.xselection.requestor, 1484 selection_paste (ev.xselection.requestor,
… …
1393 1511
1394 case GraphicsExpose: 1512 case GraphicsExpose:
1395 case Expose: 1513 case Expose:
1396 if (ev.xany.window == TermWin.vt) 1514 if (ev.xany.window == TermWin.vt)
1397 { 1515 {
1398#ifdef NO_SLOW_LINK_SUPPORT 1516 do
1399 scr_expose (ev.xexpose.x, ev.xexpose.y, 1517 scr_expose (ev.xexpose.x, ev.xexpose.y,
1400 ev.xexpose.width, ev.xexpose.height, False); 1518 ev.xexpose.width, ev.xexpose.height, False);
1401#else 1519 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev));
1402 // 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))
1403 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1404 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1405 //scr_expose (ev.xexpose.x, 0, 1526
1406 // ev.xexpose.width, TermWin.height, False); 1527 scr_refresh (refresh_type);
1407#endif
1408 want_refresh = 1;
1409 } 1528 }
1410 else 1529 else
1411 { 1530 {
1412 XEvent unused_event; 1531 XEvent unused_event;
1413 1532
1414 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1533 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event))
1415 Expose, 1534 ;
1416 &unused_event)) ;
1417 while (XCheckTypedWindowEvent (display->display, ev.xany.window, 1535 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event))
1418 GraphicsExpose, 1536 ;
1419 &unused_event)) ; 1537
1420 if (isScrollbarWindow (ev.xany.window)) 1538 if (isScrollbarWindow (ev.xany.window))
1421 { 1539 {
1422 scrollBar.setIdle (); 1540 scrollBar.setIdle ();
1423 scrollbar_show (0); 1541 scrollbar_show (0);
1424 } 1542 }
1425#ifdef MENUBAR 1543#ifdef MENUBAR
1426 if (menubar_visible () && isMenuBarWindow (ev.xany.window)) 1544 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1427 menubar_expose (); 1545 menubar_expose ();
1428#endif 1546#endif
1429#ifdef RXVT_GRAPHICS
1430 Gr_expose (ev.xany.window);
1431#endif
1432 1547
1548#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == TermWin.parent[0])
1550 XClearWindow (display->display, ev.xany.window);
1551#endif
1433 } 1552 }
1434 break; 1553 break;
1435 1554
1436 case MotionNotify: 1555 case MotionNotify:
1437#ifdef POINTER_BLANK 1556#ifdef POINTER_BLANK
… …
1439 pointer_unblank (); 1558 pointer_unblank ();
1440#endif 1559#endif
1441#if MENUBAR 1560#if MENUBAR
1442 if (isMenuBarWindow (ev.xany.window)) 1561 if (isMenuBarWindow (ev.xany.window))
1443 { 1562 {
1444 menubar_control (& (ev.xbutton)); 1563 menubar_control (ev.xbutton);
1445 break; 1564 break;
1446 } 1565 }
1447#endif 1566#endif
1448 if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) 1567 if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate))
1449 break; 1568 break;
1450 1569
1451 if (ev.xany.window == TermWin.vt) 1570 if (ev.xany.window == TermWin.vt)
1452 { 1571 {
1453 if ((ev.xbutton.state & (Button1Mask | Button3Mask))) 1572 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1454 { 1573 {
1455 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1574 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev))
1456 ; 1575 ;
1457 1576
1458 XQueryPointer (display->display, TermWin.vt, 1577 XQueryPointer (display->display, TermWin.vt,
1459 &unused_root, &unused_child, 1578 &unused_root, &unused_child,
1460 &unused_root_x, &unused_root_y, 1579 &unused_root_x, &unused_root_y,
1461 & (ev.xbutton.x), & (ev.xbutton.y), 1580 & (ev.xbutton.x), & (ev.xbutton.y),
1462 &unused_mask); 1581 &unused_mask);
1463#ifdef MOUSE_THRESHOLD 1582#ifdef MOUSE_THRESHOLD
1464 /* deal with a `jumpy' mouse */ 1583 /* deal with a `jumpy' mouse */
1465 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1584 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD)
1466 { 1585 {
1467#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
1468 selection_extend ((ev.xbutton.x), (ev.xbutton.y), 1595 selection_extend (ev.xbutton.x, ev.xbutton.y,
1469 (ev.xbutton.state & Button3Mask) ? 2 : 0); 1596 (ev.xbutton.state & Button3Mask) ? 2 : 0);
1470#ifdef SELECTION_SCROLLING 1597#ifdef SELECTION_SCROLLING
1471 if (ev.xbutton.y < TermWin.int_bwidth 1598 if (ev.xbutton.y < TermWin.int_bwidth
1472 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1599 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1))
1473 { 1600 {
1474 int dist; 1601 int dist;
1475 1602
1476 pending_scroll_selection=1;
1477
1478 /* don't clobber the current delay if we are 1603 /* don't clobber the current delay if we are
1479 * already in the middle of scrolling. 1604 * already in the middle of scrolling.
1480 */ 1605 */
1481 if (scroll_selection_delay<=0) 1606 if (!sel_scroll_ev.active)
1482 scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; 1607 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1483 1608
1484 /* save the event params so we can highlight 1609 /* save the event params so we can highlight
1485 * the selection in the pending-scroll loop 1610 * the selection in the pending-scroll loop
1486 */ 1611 */
1487 selection_save_x=ev.xbutton.x; 1612 selection_save_x = ev.xbutton.x;
1488 selection_save_y=ev.xbutton.y; 1613 selection_save_y = ev.xbutton.y;
1489 selection_save_state=
1490 (ev.xbutton.state & Button3Mask) ? 2 : 0; 1614 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1491 1615
1492 /* calc number of lines to scroll */ 1616 /* calc number of lines to scroll */
1493 if (ev.xbutton.y<TermWin.int_bwidth) 1617 if (ev.xbutton.y<TermWin.int_bwidth)
1494 { 1618 {
1495 scroll_selection_dir = UP; 1619 scroll_selection_dir = UP;
1496 dist = TermWin.int_bwidth - ev.xbutton.y; 1620 dist = TermWin.int_bwidth - ev.xbutton.y;
1497 } 1621 }
1498 else 1622 else
1499 { 1623 {
1500 scroll_selection_dir = DN; 1624 scroll_selection_dir = DN;
1501 dist = ev.xbutton.y -
1502 (TermWin.int_bwidth + TermWin.height); 1625 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height);
1503 } 1626 }
1627
1504 scroll_selection_lines= (Pixel2Height (dist)/ 1628 scroll_selection_lines = Pixel2Height (dist)
1505 SELECTION_SCROLL_LINE_SPEEDUP)+1; 1629 / SELECTION_SCROLL_LINE_SPEEDUP
1630 + 1;
1506 MIN_IT (scroll_selection_lines, 1631 MIN_IT (scroll_selection_lines,
1507 SELECTION_SCROLL_MAX_LINES); 1632 SELECTION_SCROLL_MAX_LINES);
1508 } 1633 }
1509 else 1634 else
1510 { 1635 {
1511 /* we are within the text window, so we 1636 /* we are within the text window, so we
1512 * shouldn't be scrolling 1637 * shouldn't be scrolling
1513 */ 1638 */
1514 pending_scroll_selection = 0; 1639 if (sel_scroll_ev.active)
1640 sel_scroll_ev.stop();
1515 } 1641 }
1516#endif 1642#endif
1517#ifdef MOUSE_THRESHOLD 1643#ifdef MOUSE_THRESHOLD
1518
1519 } 1644 }
1520#endif 1645#endif
1521
1522 } 1646 }
1523 } 1647 }
1524 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1648 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1525 { 1649 {
1526 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1650 while (XCheckTypedWindowEvent (display->display, scrollBar.win,
1527 MotionNotify, &ev)) ; 1651 MotionNotify, &ev)) ;
1528 XQueryPointer (display->display, scrollBar.win, 1652 XQueryPointer (display->display, scrollBar.win,
1529 &unused_root, &unused_child, 1653 &unused_root, &unused_child,
1530 &unused_root_x, &unused_root_y, 1654 &unused_root_x, &unused_root_y,
1531 & (ev.xbutton.x), & (ev.xbutton.y), 1655 & (ev.xbutton.x), & (ev.xbutton.y),
1532 &unused_mask); 1656 &unused_mask);
… …
1538 } 1662 }
1539 break; 1663 break;
1540 } 1664 }
1541} 1665}
1542 1666
1667#if TRANSPARENT
1543void 1668void
1544rxvt_term::rootwin_cb (XEvent &ev) 1669rxvt_term::rootwin_cb (XEvent &ev)
1545{ 1670{
1546 SET_R (this); 1671 SET_R (this);
1547 SET_LOCALE (locale); 1672 SET_LOCALE (locale);
1548 1673
1549 switch (ev.type) 1674 switch (ev.type)
1550 { 1675 {
1551 case PropertyNotify: 1676 case PropertyNotify:
1552 if (ev.xproperty.atom == xa[XA_VT_SELECTION])
1553 {
1554 if (ev.xproperty.state == PropertyNewValue)
1555 selection_property (ev.xproperty.window, ev.xproperty.atom);
1556 break;
1557 }
1558#ifdef TRANSPARENT
1559 else
1560 {
1561 /* 1677 /*
1562 * 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,
1563 * 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.
1564 */ 1680 */
1565 if (xa[XA_XROOTPMAPID] == 0) 1681 if (xa[XA_XROOTPMAPID] == 0)
1566 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); 1682 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1567 1683
1568 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1684 if (ev.xproperty.atom != xa[XA_XROOTPMAPID])
1569 return; 1685 return;
1570 }
1571 1686
1572 /* FALLTHROUGH */ 1687 /* FALLTHROUGH */
1573 case ReparentNotify: 1688 case ReparentNotify:
1574 if ((Options & Opt_transparent) && check_our_parents ()) 1689 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
1575 if (am_transparent)
1576 want_full_refresh = 1; 1690 want_refresh = want_full_refresh = 1;
1577 break; 1691 break;
1578#endif
1579 } 1692 }
1580} 1693}
1694#endif
1581 1695
1582void 1696void
1583rxvt_term::button_press (const XButtonEvent &ev) 1697rxvt_term::button_press (XButtonEvent &ev)
1584{ 1698{
1585 int reportmode = 0, clickintime; 1699 int reportmode = 0, clickintime;
1586 1700
1587 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1701 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1588 if (!bypass_keystate) 1702 if (!bypass_keystate)
1589 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1703 reportmode = !! (priv_modes & PrivMode_mouse_report);
1704
1590 /* 1705 /*
1591 * VT window processing of button press 1706 * VT window processing of button press
1592 */ 1707 */
1593 if (ev.window == TermWin.vt) 1708 if (ev.window == TermWin.vt)
1594 { 1709 {
1595#if RXVT_GRAPHICS 1710#if ISO_14755
1596 if (ev.subwindow != None) 1711 // 5.4
1597 rxvt_Gr_ButtonPress (ev.x, ev.y); 1712 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1598 else 1713 {
1599#endif 1714 iso14755_54 (ev.x, ev.y);
1600 1715 return;
1601 { 1716 }
1717#endif
1718
1602 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1719 clickintime = ev.time - MEvent.time < MULTICLICK_TIME;
1603 if (reportmode) 1720 if (reportmode)
1721 {
1722 /* mouse report from vt window */
1723 /* save the xbutton state (for ButtonRelease) */
1724 MEvent.state = ev.state;
1725#ifdef MOUSE_REPORT_DOUBLECLICK
1726 if (ev.button == MEvent.button && clickintime)
1604 { 1727 {
1605 /* mouse report from vt window */ 1728 /* same button, within alloted time */
1606 /* save the xbutton state (for ButtonRelease) */ 1729 MEvent.clicks++;
1607 MEvent.state = ev.state; 1730 if (MEvent.clicks > 1)
1608#ifdef MOUSE_REPORT_DOUBLECLICK
1609 if (ev.button == MEvent.button && clickintime)
1610 { 1731 {
1611 /* same button, within alloted time */
1612 MEvent.clicks++;
1613 if (MEvent.clicks > 1)
1614 {
1615 /* only report double clicks */ 1732 /* only report double clicks */
1616 MEvent.clicks = 2; 1733 MEvent.clicks = 2;
1617 mouse_report (ev); 1734 mouse_report (ev);
1618 1735
1619 /* don't report the release */ 1736 /* don't report the release */
1620 MEvent.clicks = 0; 1737 MEvent.clicks = 0;
1621 MEvent.button = AnyButton; 1738 MEvent.button = AnyButton;
1622 }
1623 } 1739 }
1624 else
1625 {
1626 /* different button, or time expired */
1627 MEvent.clicks = 1;
1628 MEvent.button = ev.button;
1629 mouse_report (ev);
1630 }
1631#else
1632 MEvent.button = ev.button;
1633 mouse_report (ev);
1634#endif /* MOUSE_REPORT_DOUBLECLICK */
1635
1636 } 1740 }
1637 else 1741 else
1638 { 1742 {
1743 /* different button, or time expired */
1744 MEvent.clicks = 1;
1745 MEvent.button = ev.button;
1746 mouse_report (ev);
1747 }
1748#else
1749 MEvent.button = ev.button;
1750 mouse_report (ev);
1751#endif /* MOUSE_REPORT_DOUBLECLICK */
1752
1753 }
1754 else
1755 {
1639 if (ev.button != MEvent.button) 1756 if (ev.button != MEvent.button)
1640 MEvent.clicks = 0; 1757 MEvent.clicks = 0;
1641 switch (ev.button) 1758 switch (ev.button)
1642 { 1759 {
1643 case Button1: 1760 case Button1:
1644 /* allow shift+left click to extend selection */ 1761 /* allow shift+left click to extend selection */
1645 if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) 1762 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1646 { 1763 {
1647 if (MEvent.button == Button1 && clickintime)
1648 selection_rotate (ev.x, ev.y);
1649 else
1650 selection_extend (ev.x, ev.y, 1);
1651 }
1652 else
1653 {
1654 if (MEvent.button == Button1 && clickintime)
1655 MEvent.clicks++;
1656 else
1657 MEvent.clicks = 1;
1658
1659 selection_click (MEvent.clicks, ev.x, ev.y);
1660 }
1661
1662 MEvent.button = Button1;
1663 break;
1664
1665 case Button3:
1666 if (MEvent.button == Button3 && clickintime) 1764 if (MEvent.button == Button1 && clickintime)
1667 selection_rotate (ev.x, ev.y); 1765 selection_rotate (ev.x, ev.y);
1668 else 1766 else
1669 selection_extend (ev.x, ev.y, 1); 1767 selection_extend (ev.x, ev.y, 1);
1768 }
1769 else
1770 {
1771 if (MEvent.button == Button1 && clickintime)
1772 MEvent.clicks++;
1773 else
1774 MEvent.clicks = 1;
1775
1776 selection_click (MEvent.clicks, ev.x, ev.y);
1777 }
1778
1779 MEvent.button = Button1;
1780 break;
1781
1782 case Button3:
1783 if (MEvent.button == Button3 && clickintime)
1784 selection_rotate (ev.x, ev.y);
1785 else
1786 selection_extend (ev.x, ev.y, 1);
1787
1670 MEvent.button = Button3; 1788 MEvent.button = Button3;
1671 break; 1789 break;
1672 }
1673 } 1790 }
1791 }
1792
1674 MEvent.time = ev.time; 1793 MEvent.time = ev.time;
1675 return; 1794 return;
1676 }
1677 } 1795 }
1678 1796
1679 /* 1797 /*
1680 * Scrollbar window processing of button press 1798 * Scrollbar window processing of button press
1681 */ 1799 */
… …
1745 upordown = 1; /* down */ 1863 upordown = 1; /* down */
1746 } 1864 }
1747 if (upordown) 1865 if (upordown)
1748 { 1866 {
1749#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1867#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1750 scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; 1868 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY);
1751#endif 1869#endif
1752 if (scr_page (upordown < 0 ? UP : DN, 1)) 1870 if (scr_page (upordown < 0 ? UP : DN, 1))
1753 { 1871 {
1754 if (upordown < 0) 1872 if (upordown < 0)
1755 scrollBar.setUp (); 1873 scrollBar.setUp ();
… …
1771 break; 1889 break;
1772 case R_SB_ALIGN_BOTTOM: 1890 case R_SB_ALIGN_BOTTOM:
1773 csrO = scrollBar.bot - scrollBar.top; 1891 csrO = scrollBar.bot - scrollBar.top;
1774 break; 1892 break;
1775 } 1893 }
1894
1776 if (scrollBar.style == R_SB_XTERM 1895 if (scrollBar.style == R_SB_XTERM
1777 || scrollbar_above_slider (ev.y) 1896 || scrollbar_above_slider (ev.y)
1778 || scrollbar_below_slider (ev.y)) 1897 || scrollbar_below_slider (ev.y))
1779 scr_move_to ( scrollbar_position (ev.y) - csrO, 1898 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1780 scrollbar_size ()); 1899
1781 scrollBar.setMotion (); 1900 scrollBar.setMotion ();
1782 break; 1901 break;
1783 1902
1784 case Button1: 1903 case Button1:
1785 if (scrollbar_align == R_SB_ALIGN_CENTRE) 1904 if (scrollbar_align == R_SB_ALIGN_CENTRE)
… …
1809 scr_page ((ev.button == Button1 ? DN : UP), 1928 scr_page ((ev.button == Button1 ? DN : UP),
1810 (TermWin.nrow 1929 (TermWin.nrow
1811 * scrollbar_position (ev.y) 1930 * scrollbar_position (ev.y)
1812 / scrollbar_size ())); 1931 / scrollbar_size ()));
1813 } 1932 }
1933
1814 break; 1934 break;
1815 } 1935 }
1816 } 1936 }
1817 return; 1937 return;
1818 } 1938 }
… …
1824 menubar_control (ev); 1944 menubar_control (ev);
1825#endif 1945#endif
1826} 1946}
1827 1947
1828void 1948void
1829rxvt_term::button_release (const XButtonEvent &ev) 1949rxvt_term::button_release (XButtonEvent &ev)
1830{ 1950{
1831 int reportmode = 0; 1951 int reportmode = 0;
1832 1952
1833 csrO = 0; /* reset csr Offset */ 1953 csrO = 0; /* reset csr Offset */
1834 if (!bypass_keystate) 1954 if (!bypass_keystate)
1835 reportmode = !! (PrivateModes & PrivMode_mouse_report); 1955 reportmode = !! (priv_modes & PrivMode_mouse_report);
1836 1956
1837 if (scrollbar_isUpDn ()) 1957 if (scrollbar_isUpDn ())
1838 { 1958 {
1839 scrollBar.setIdle (); 1959 scrollBar.setIdle ();
1840 scrollbar_show (0); 1960 scrollbar_show (0);
1841#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1961#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1842 refresh_type &= ~SMOOTH_REFRESH; 1962 refresh_type &= ~SMOOTH_REFRESH;
1843#endif 1963#endif
1844
1845 } 1964 }
1965
1846#ifdef SELECTION_SCROLLING 1966#ifdef SELECTION_SCROLLING
1847 pending_scroll_selection=0; 1967 if (sel_scroll_ev.active)
1968 sel_scroll_ev.stop();
1848#endif 1969#endif
1970
1849 if (ev.window == TermWin.vt) 1971 if (ev.window == TermWin.vt)
1850 { 1972 {
1851#ifdef RXVT_GRAPHICS 1973#if ISO_14755
1852 if (ev.subwindow != None) 1974 // 5.4
1853 rxvt_Gr_ButtonRelease (ev.x, ev.y); 1975 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1854 else 1976 return;
1855#endif 1977#endif
1856
1857 {
1858 if (reportmode) 1978 if (reportmode)
1979 {
1980 /* mouse report from vt window */
1981 /* don't report release of wheel "buttons" */
1982 if (ev.button >= 4)
1983 return;
1984#ifdef MOUSE_REPORT_DOUBLECLICK
1985 /* only report the release of 'slow' single clicks */
1986 if (MEvent.button != AnyButton
1987 && (ev.button != MEvent.button
1988 || (ev.time - MEvent.time
1989 > MULTICLICK_TIME / 2)))
1859 { 1990 {
1860 /* mouse report from vt window */
1861 /* don't report release of wheel "buttons" */
1862 if (ev.button >= 4)
1863 return;
1864#ifdef MOUSE_REPORT_DOUBLECLICK
1865 /* only report the release of 'slow' single clicks */
1866 if (MEvent.button != AnyButton
1867 && (ev.button != MEvent.button
1868 || (ev.time - MEvent.time
1869 > MULTICLICK_TIME / 2)))
1870 {
1871 MEvent.clicks = 0; 1991 MEvent.clicks = 0;
1872 MEvent.button = AnyButton;
1873 mouse_report (ev);
1874 }
1875#else /* MOUSE_REPORT_DOUBLECLICK */
1876 MEvent.button = AnyButton; 1992 MEvent.button = AnyButton;
1877 mouse_report (ev); 1993 mouse_report (ev);
1994 }
1995#else /* MOUSE_REPORT_DOUBLECLICK */
1996 MEvent.button = AnyButton;
1997 mouse_report (ev);
1878#endif /* MOUSE_REPORT_DOUBLECLICK */ 1998#endif /* MOUSE_REPORT_DOUBLECLICK */
1879 return; 1999 return;
1880 } 2000 }
2001
1881 /* 2002 /*
1882 * dumb hack to compensate for the failure of click-and-drag 2003 * dumb hack to compensate for the failure of click-and-drag
1883 * when overriding mouse reporting 2004 * when overriding mouse reporting
1884 */ 2005 */
1885 if (PrivateModes & PrivMode_mouse_report 2006 if (priv_modes & PrivMode_mouse_report
1886 && bypass_keystate 2007 && bypass_keystate
1887 && ev.button == Button1 && MEvent.clicks <= 1) 2008 && ev.button == Button1 && MEvent.clicks <= 1)
1888 selection_extend (ev.x, ev.y, 0); 2009 selection_extend (ev.x, ev.y, 0);
1889 2010
1890 switch (ev.button) 2011 switch (ev.button)
2012 {
2013 case Button1:
2014 case Button3:
2015 selection_make (ev.time);
2016 break;
2017 case Button2:
2018 selection_request (ev.time, ev.x, ev.y);
2019 break;
2020#ifdef MOUSE_WHEEL
2021 case Button4:
2022 case Button5:
1891 { 2023 {
1892 case Button1: 2024 int i;
1893 case Button3: 2025 page_dirn v;
1894 selection_make (ev.time); 2026
2027 v = ev.button == Button4 ? UP : DN;
2028
2029 if (ev.state & ShiftMask)
1895 break; 2030 i = 1;
1896 case Button2: 2031 else if (options & Opt_mouseWheelScrollPage)
1897 selection_request (ev.time, ev.x, ev.y); 2032 i = TermWin.nrow - 1;
2033 else
1898 break; 2034 i = 5;
2035
1899#ifdef MOUSE_WHEEL 2036# ifdef MOUSE_SLIP_WHEELING
1900 case Button4: 2037 if (ev.state & ControlMask)
1901 case Button5:
1902 { 2038 {
1903 int i;
1904 page_dirn v;
1905
1906 v = (ev.button == Button4) ? UP : DN;
1907 if (ev.state & ShiftMask)
1908 i = 1;
1909 else if ((Options & Opt_mouseWheelScrollPage))
1910 i = TermWin.nrow - 1;
1911 else
1912 i = 5;
1913# ifdef MOUSE_SLIP_WHEELING
1914 if (ev.state & ControlMask)
1915 {
1916 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)
1917 mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; 2044 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2045
2046 slip_wheel_ev.start ();
1918 } 2047 }
2048 else
2049 {
1919# endif 2050# endif
1920# ifdef JUMP_MOUSE_WHEEL 2051# ifdef JUMP_MOUSE_WHEEL
1921 scr_page (v, i); 2052 scr_page (v, i);
1922 scr_refresh (SMOOTH_REFRESH); 2053 scr_refresh (SMOOTH_REFRESH);
1923 scrollbar_show (1); 2054 scrollbar_show (1);
… …
1927 scr_page (v, 1); 2058 scr_page (v, 1);
1928 scr_refresh (SMOOTH_REFRESH); 2059 scr_refresh (SMOOTH_REFRESH);
1929 scrollbar_show (1); 2060 scrollbar_show (1);
1930 } 2061 }
1931# endif 2062# endif
1932 2063# ifdef MOUSE_SLIP_WHEELING
1933 } 2064 }
1934 break;
1935#endif 2065#endif
1936
1937 } 2066 }
2067 break;
2068#endif
1938 } 2069 }
1939 } 2070 }
1940#ifdef MENUBAR 2071#ifdef MENUBAR
1941 else if (isMenuBarWindow (ev.window)) 2072 else if (isMenuBarWindow (ev.window))
1942 menubar_control (ev); 2073 menubar_control (ev);
1943#endif 2074#endif
1944} 2075}
1945 2076
1946
1947#ifdef TRANSPARENT 2077#ifdef TRANSPARENT
2078#if TINTING
2079/* taken from aterm-0.4.2 */
2080
2081typedef uint32_t RUINT32T;
2082
2083void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2084{
2085 int sh_r, sh_g, sh_b;
2086 RUINT32T mask_r, mask_g, mask_b;
2087 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_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;
2091
2092 Visual* visual = display->visual;
2093
2094 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2095
2096 /* for convenience */
2097 mask_r = visual->red_mask;
2098 mask_g = visual->green_mask;
2099 mask_b = visual->blue_mask;
2100
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;
2174 } else {
2175 if (shade < 0) shade = 0;
2176 if (shade > 100) shade = 100;
2177
2178 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2179
2180 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2181 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2182 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2183 }
2184
2185 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2186 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2187 {
2188 unsigned int tmp;
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++)
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);
2241 }
2242 break;
2243 }
2244 case 16:
2245 {
2246 unsigned short *p1, *pf, *p, *pl;
2247 p1 = (unsigned short *) srcImage->data;
2248 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2249 while (p1 < pf)
2250 {
2251 p = p1;
2252 pl = p1 + srcImage->width;
2253 for (; p < pl; p++)
2254 {
2255 *p = lookup_r[(*p & 0xf800)>>11] |
2256 lookup_g[(*p & 0x07e0)>> 5] |
2257 lookup_b[(*p & 0x001f)];
2258 }
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)
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);
2279 }
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);
2287
2288 while (p1 < pf)
2289 {
2290 p = p1;
2291 pl = p1 + srcImage->width;
2292 for (; p < pl; p++)
2293 {
2294 *p = lookup_r[(*p & 0xff0000)>>16] |
2295 lookup_g[(*p & 0x00ff00)>> 8] |
2296 lookup_b[(*p & 0x0000ff)] |
2297 (*p & ~0xffffff);
2298 }
2299 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2300 }
2301 break;
2302 }
2303 }
2304
2305 free (lookup);
2306}
2307#endif
2308
1948/* 2309/*
1949 * Check our parents are still who we think they are. 2310 * Check our parents are still who we think they are.
1950 * Do transparency updates if required 2311 * Do transparency updates if required
1951 */ 2312 */
1952int 2313int
1953rxvt_term::check_our_parents () 2314rxvt_term::check_our_parents ()
1954{ 2315{
1955 int i, pchanged, aformat, have_pixmap, rootdepth; 2316 int i, pchanged, aformat, have_pixmap, rootdepth;
1956 unsigned long nitems, bytes_after; 2317 unsigned long nitems, bytes_after;
1957 Atom atype; 2318 Atom atype;
1958 unsigned char *prop = NULL; 2319 unsigned char *prop = NULL;
1959 Window root, oldp, *list; 2320 Window root, oldp, *list;
1960 Pixmap rootpixmap = None; 2321 Pixmap rootpixmap = None;
1961 XWindowAttributes wattr, wrootattr; 2322 XWindowAttributes wattr, wrootattr;
1962 2323
1963 pchanged = 0; 2324 pchanged = 0;
1964 2325
1965 if (! (Options & Opt_transparent)) 2326 if (!(options & Opt_transparent))
1966 return pchanged; /* Don't try any more */ 2327 return pchanged; /* Don't try any more */
1967 2328
1968 XGetWindowAttributes (display->display, display->root, &wrootattr); 2329 XGetWindowAttributes (display->display, display->root, &wrootattr);
1969 rootdepth = wrootattr.depth; 2330 rootdepth = wrootattr.depth;
1970 2331
1971 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2332 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2333
1972 if (rootdepth != wattr.depth) 2334 if (rootdepth != wattr.depth)
1973 { 2335 {
1974 if (am_transparent) 2336 if (am_transparent)
1975 { 2337 {
1976 pchanged = 1; 2338 pchanged = 1;
1977 XSetWindowBackground (display->display, TermWin.vt, 2339 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
1978 PixColors[Color_bg]);
1979 am_transparent = am_pixmap_trans = 0; 2340 am_transparent = am_pixmap_trans = 0;
1980 } 2341 }
2342
1981 return pchanged; /* Don't try any more */ 2343 return pchanged; /* Don't try any more */
1982 } 2344 }
1983 2345
1984 /* Get all X ops out of the queue so that our information is up-to-date. */ 2346 /* Get all X ops out of the queue so that our information is up-to-date. */
1985 XSync (display->display, False); 2347 XSync (display->display, False);
… …
1987 /* 2349 /*
1988 * Make the frame window set by the window manager have 2350 * Make the frame window set by the window manager have
1989 * the root background. Some window managers put multiple nested frame 2351 * the root background. Some window managers put multiple nested frame
1990 * windows for each client, so we have to take care about that. 2352 * windows for each client, so we have to take care about that.
1991 */ 2353 */
1992 i = (xa[XA_XROOTPMAPID] != 0 2354 i = (xa[XA_XROOTPMAPID]
1993 && (XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2355 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID],
1994 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1995 &nitems, &bytes_after, &prop) == Success)); 2357 &nitems, &bytes_after, &prop) == Success);
2358
1996 if (!i || prop == NULL) 2359 if (!i || prop == NULL)
2360 i = (xa[XA_XSETROOTID]
2361 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID],
2362 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2363 &nitems, &bytes_after, &prop) == Success);
2364
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 }
2377
2004 if (have_pixmap) 2378 if (have_pixmap)
2005 { 2379 {
2006 /* 2380 /*
2007 * Copy display->root pixmap transparency 2381 * Copy display->root pixmap transparency
2008 */ 2382 */
2009 int sx, sy, nx, ny; 2383 int sx, sy, nx, ny;
2010 unsigned int nw, nh; 2384 unsigned int nw, nh;
2011 Window cr; 2385 Window cr;
2012 XImage *image; 2386 XImage *image;
2013 GC gc; 2387 GC gc;
2014 XGCValues gcvalue; 2388 XGCValues gcvalue;
2015 2389
2016 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2390 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
2017 0, 0, &sx, &sy, &cr); 2391 0, 0, &sx, &sy, &cr);
2018 nw = (unsigned int)szHint.width; 2392 nw = (unsigned int)szHint.width;
2019 nh = (unsigned int)szHint.height; 2393 nh = (unsigned int)szHint.height;
2020 nx = ny = 0; 2394 nx = ny = 0;
2395
2021 if (sx < 0) 2396 if (sx < 0)
2022 { 2397 {
2023 nw += sx; 2398 nw += sx;
2024 nx = -sx; 2399 nx = -sx;
2025 sx = 0; 2400 sx = 0;
2026 } 2401 }
2402
2027 if (sy < 0) 2403 if (sy < 0)
2028 { 2404 {
2029 nh += sy; 2405 nh += sy;
2030 ny = -sy; 2406 ny = -sy;
2031 sy = 0; 2407 sy = 0;
2032 } 2408 }
2409
2033 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2410 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2034 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2411 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2035 allowedxerror = -1; 2412 allowedxerror = -1;
2036 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, 2413 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2037 ZPixmap); 2414
2038 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2415 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2039 /* XXX: may need a delay here? */ 2416 /* XXX: may need a delay here? */
2040 allowedxerror = 0; 2417 allowedxerror = 0;
2418
2041 if (image == NULL) 2419 if (image == NULL)
2042 { 2420 {
2043 if (am_transparent && am_pixmap_trans) 2421 if (am_transparent && am_pixmap_trans)
2044 { 2422 {
2045 pchanged = 1; 2423 pchanged = 1;
… …
2047 { 2425 {
2048 XFreePixmap (display->display, TermWin.pixmap); 2426 XFreePixmap (display->display, TermWin.pixmap);
2049 TermWin.pixmap = None; 2427 TermWin.pixmap = None;
2050 } 2428 }
2051 } 2429 }
2430
2052 am_pixmap_trans = 0; 2431 am_pixmap_trans = 0;
2053 } 2432 }
2054 else 2433 else
2055 { 2434 {
2056 if (TermWin.pixmap != None) 2435 if (TermWin.pixmap != None)
2057 XFreePixmap (display->display, TermWin.pixmap); 2436 XFreePixmap (display->display, TermWin.pixmap);
2437
2438#if TINTING
2439 if (ISSET_PIXCOLOR (Color_tint))
2440 {
2441 unsigned short rm, gm, bm;
2442 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2443
2444 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2445
2446 ShadeXImage (display, image, shade, rm, gm, bm);
2447 }
2448#endif
2449
2058 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2450 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt,
2059 (unsigned int)szHint.width,
2060 (unsigned int)szHint.height, 2451 szHint.width, szHint.height, image->depth);
2061 (unsigned int)image->depth);
2062 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2452 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue);
2063 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2453 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0,
2064 nx, ny, (unsigned int)image->width,
2065 (unsigned int)image->height); 2454 nx, ny, image->width, image->height);
2066 XFreeGC (display->display, gc); 2455 XFreeGC (display->display, gc);
2067 XDestroyImage (image); 2456 XDestroyImage (image);
2068 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2457 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap);
2069 TermWin.pixmap); 2458 XClearWindow (display->display, TermWin.parent[0]);
2459
2070 if (!am_transparent || !am_pixmap_trans) 2460 if (!am_transparent || !am_pixmap_trans)
2071 pchanged = 1; 2461 pchanged = 1;
2462
2072 am_transparent = am_pixmap_trans = 1; 2463 am_transparent = am_pixmap_trans = 1;
2073 } 2464 }
2074 } 2465 }
2466
2075 if (!am_pixmap_trans) 2467 if (!am_pixmap_trans)
2076 { 2468 {
2077 unsigned int n; 2469 unsigned int n;
2078 /* 2470 /*
2079 * InheritPixmap transparency 2471 * InheritPixmap transparency
2080 */ 2472 */
2081 D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root));
2082 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); 2473 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2083 i++)
2084 { 2474 {
2085 oldp = TermWin.parent[i]; 2475 oldp = TermWin.parent[i];
2086 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2476 XQueryTree (display->display, TermWin.parent[i - 1], &root,
2087 &TermWin.parent[i], &list, &n); 2477 &TermWin.parent[i], &list, &n);
2088 XFree (list); 2478 XFree (list);
2089 D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); 2479
2090 if (TermWin.parent[i] == display->root) 2480 if (TermWin.parent[i] == display->root)
2091 { 2481 {
2092 if (oldp != None) 2482 if (oldp != None)
2093 pchanged = 1; 2483 pchanged = 1;
2484
2094 break; 2485 break;
2095 } 2486 }
2487
2096 if (oldp != TermWin.parent[i]) 2488 if (oldp != TermWin.parent[i])
2097 pchanged = 1; 2489 pchanged = 1;
2098 } 2490 }
2491
2099 n = 0; 2492 n = 0;
2493
2100 if (pchanged) 2494 if (pchanged)
2101 { 2495 {
2102 for (; n < (unsigned int)i; n++) 2496 for (; n < (unsigned int)i; n++)
2103 { 2497 {
2104 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2498 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr);
2105 D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL"));
2106 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2499 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2107 { 2500 {
2108 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2501 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2109 break; 2502 break;
2110 } 2503 }
2111 } 2504 }
2112 } 2505 }
2113 if (n > (int) (sizeof (TermWin.parent) 2506
2114 / sizeof (TermWin.parent[0]))) 2507 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2115 { 2508 {
2116 D_X ((stderr, "InheritPixmap Turning off"));
2117 XSetWindowBackground (display->display, TermWin.parent[0], 2509 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]);
2118 PixColors[Color_fg]);
2119 XSetWindowBackground (display->display, TermWin.vt, 2510 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]);
2120 PixColors[Color_bg]);
2121 am_transparent = 0; 2511 am_transparent = 0;
2122 /* XXX: also turn off Opt_transparent? */ 2512 /* XXX: also turn off Opt_transparent? */
2123 } 2513 }
2124 else 2514 else
2125 { 2515 {
2516#if WAIT_FOR_WM
2126 /* wait (an arbitrary period) for the WM to do its thing 2517 /* wait (an arbitrary period) for the WM to do its thing
2127 * needed for fvwm2.2.2 (and before?) */ 2518 * needed for fvwm2.2.2 (and before?) */
2128# ifdef HAVE_NANOSLEEP
2129 struct timespec rqt;
2130
2131 rqt.tv_sec = 1;
2132 rqt.tv_nsec = 0;
2133 nanosleep (&rqt, NULL);
2134# else
2135 sleep (1); 2519 sleep (1);
2136# endif 2520#endif
2137 D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1));
2138 for (n = 0; n < (unsigned int)i; n++) 2521 for (n = 0; n < (unsigned int)i; n++)
2522 {
2139 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], 2523 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative);
2140 ParentRelative); 2524 XClearWindow (display->display, TermWin.parent[n]);
2525 }
2526
2141 XSetWindowBackgroundPixmap (display->display, TermWin.vt, 2527 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative);
2142 ParentRelative);
2143 am_transparent = 1; 2528 am_transparent = 1;
2144 } 2529 }
2530
2145 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2531 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2146 TermWin.parent[i] = None; 2532 TermWin.parent[i] = None;
2147 } 2533 }
2534
2535 if (scrollBar.win)
2536 {
2537 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative);
2538 scrollBar.setIdle ();
2539 scrollbar_show (0);
2540 }
2541
2148 return pchanged; 2542 return pchanged;
2149} 2543}
2150#endif 2544#endif
2151 2545
2152/*}}} */ 2546/*}}} */
2547
2548bool
2549rxvt_term::cmd_parse ()
2550{
2551 bool flag = false;
2552 unicode_t ch = NOCHAR;
2553 unsigned char *seq_begin; // remember start of esc-sequence here
2554
2555 for (;;)
2556 {
2557 if (ch == NOCHAR)
2558 {
2559 seq_begin = cmdbuf_ptr;
2560 ch = next_char ();
2561 }
2562
2563 if (ch == NOCHAR) // TODO: improve
2564 break;
2565
2566 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2567 {
2568 if (!seen_input)
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
2582 /* Read a text string from the input buffer */
2583 unicode_t buf[UBUFSIZ];
2584 bool refreshnow = false;
2585 int nlines = 0;
2586 unicode_t *str = buf;
2587
2588 for (;;)
2589 {
2590 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2591 break;
2592
2593 *str++ = ch;
2594
2595 if (ch == C0_LF)
2596 {
2597 nlines++;
2598 refresh_count++;
2599
2600 if (!(options & Opt_jumpScroll)
2601 || (refresh_count >= refresh_limit * (TermWin.nrow - 1)))
2602 {
2603 refreshnow = true;
2604 ch = NOCHAR;
2605 break;
2606 }
2607
2608 // scr_add_lines only works for nlines <= TermWin.nrow - 1.
2609 if (nlines >= TermWin.nrow - 1)
2610 {
2611 scr_add_lines (buf, nlines, str - buf);
2612 nlines = 0;
2613 str = buf;
2614 }
2615 }
2616
2617 if (str >= buf + UBUFSIZ)
2618 {
2619 ch = NOCHAR;
2620 break;
2621 }
2622
2623 seq_begin = cmdbuf_ptr;
2624 ch = next_char ();
2625 }
2626
2627 scr_add_lines (buf, nlines, str - buf);
2628
2629 /*
2630 * If there have been a lot of new lines, then update the screen
2631 * What the heck I'll cheat and only refresh less than every page-full.
2632 * the number of pages between refreshes is refresh_limit, which
2633 * is incremented here because we must be doing flat-out scrolling.
2634 */
2635 if (refreshnow)
2636 {
2637 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2638 refresh_limit++;
2639 else
2640 {
2641 flag = true;
2642 scr_refresh (refresh_type);
2643 }
2644 }
2645
2646 }
2647 else
2648 {
2649 try
2650 {
2651 process_nonprinting (ch);
2652 }
2653 catch (const class out_of_input &o)
2654 {
2655 // we ran out of input, retry later
2656 cmdbuf_ptr = seq_begin;
2657 break;
2658 }
2659
2660 ch = NOCHAR;
2661 }
2662 }
2663
2664 return flag;
2665}
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
2676// read the next character
2677unicode_t
2678rxvt_term::next_char ()
2679{
2680 while (cmdbuf_ptr < cmdbuf_endp)
2681 {
2682 // assume 7-bit to be ascii ALWAYS
2683 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2684 return *cmdbuf_ptr++;
2685
2686 wchar_t wc;
2687 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2688
2689 if (len == (size_t)-2)
2690 {
2691 // the mbstate stores incomplete sequences. didn't know this :/
2692 cmdbuf_ptr = cmdbuf_endp;
2693 break;
2694 }
2695
2696 if (len == (size_t)-1)
2697 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2698
2699 // assume wchar == unicode
2700 cmdbuf_ptr += len;
2701 return wc;
2702 }
2703
2704 return NOCHAR;
2705}
2706
2707/* rxvt_cmd_getc () - Return next input character */
2708/*
2709 * Return the next input character after first passing any keyboard input
2710 * to the command.
2711 */
2712unicode_t
2713rxvt_term::cmd_getc ()
2714{
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 ();
2727
2728 if (c == NOCHAR)
2729 throw out_of_input;
2730
2731 return c;
2732}
2153 2733
2154/*{{{ print pipe */ 2734/*{{{ print pipe */
2155/*----------------------------------------------------------------------*/ 2735/*----------------------------------------------------------------------*/
2156#ifdef PRINTPIPE 2736#ifdef PRINTPIPE
2157FILE * 2737FILE *
2158rxvt_term::popen_printer () 2738rxvt_term::popen_printer ()
2159{ 2739{
2160 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2740 FILE *stream = popen (rs[Rs_print_pipe], "w");
2161 2741
2162 if (stream == NULL) 2742 if (stream == NULL)
2163 rxvt_print_error ("can't open printer pipe"); 2743 rxvt_warn ("can't open printer pipe, not printing.\n");
2744
2164 return stream; 2745 return stream;
2165} 2746}
2166 2747
2167int 2748int
2168rxvt_term::pclose_printer (FILE *stream) 2749rxvt_term::pclose_printer (FILE *stream)
2169{ 2750{
2170 fflush (stream); 2751 fflush (stream);
2171 /* pclose () reported not to work on SunOS 4.1.3 */
2172# if defined (__sun__) /* TODO: RESOLVE THIS */
2173 /* pclose works provided SIGCHLD handler uses waitpid */
2174 return pclose (stream); /* return fclose (stream); */
2175# else
2176 return pclose (stream); 2752 return pclose (stream);
2177# endif
2178} 2753}
2179 2754
2180/* 2755/*
2181 * simulate attached vt100 printer 2756 * simulate attached vt100 printer
2182 */ 2757 */
2183void 2758void
2184rxvt_term::process_print_pipe () 2759rxvt_term::process_print_pipe ()
2185{ 2760{
2186 int done; 2761 int done;
2187 FILE *fd; 2762 FILE *fd;
2188 2763
2189 if ((fd = popen_printer ()) == NULL) 2764 if ((fd = popen_printer ()) == NULL)
2190 return; 2765 return;
2191 2766
2192 /* 2767 /*
2193 * Send all input to the printer until either ESC[4i or ESC[?4i 2768 * Send all input to the printer until either ESC[4i or ESC[?4i
2194 * is received. 2769 * is received.
2195 */ 2770 */
2196 for (done = 0; !done;) 2771 for (done = 0; !done;)
2197 { 2772 {
2198 unsigned char buf[8]; 2773 unsigned char buf[8];
2199 unsigned char ch; 2774 unicode_t ch;
2200 unsigned int i, len; 2775 unsigned int i, len;
2201 2776
2202 if ((ch = cmd_getc ()) != C0_ESC) 2777 if ((ch = cmd_getc ()) != C0_ESC)
2203 { 2778 {
2204 if (putc (ch, fd) == EOF) 2779 if (putc (ch, fd) == EOF)
2205 break; /* done = 1 */ 2780 break; /* done = 1 */
… …
2220 { 2795 {
2221 if ((buf[len++] = cmd_getc ()) == 'i') 2796 if ((buf[len++] = cmd_getc ()) == 'i')
2222 break; /* done = 1 */ 2797 break; /* done = 1 */
2223 } 2798 }
2224 } 2799 }
2800
2225 for (i = 0; i < len; i++) 2801 for (i = 0; i < len; i++)
2226 if (putc (buf[i], fd) == EOF) 2802 if (putc (buf[i], fd) == EOF)
2227 { 2803 {
2228 done = 1; 2804 done = 1;
2229 break; 2805 break;
2230 } 2806 }
2231 } 2807 }
2232 } 2808 }
2809
2233 pclose_printer (fd); 2810 pclose_printer (fd);
2234} 2811}
2235#endif /* PRINTPIPE */ 2812#endif /* PRINTPIPE */
2236/*}}} */ 2813/*}}} */
2237 2814
2238/* *INDENT-OFF* */ 2815/* *INDENT-OFF* */
2239enum { 2816enum {
2240 C1_40 = 0x40, 2817 C1_40 = 0x40,
2241 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2818 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2242 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2819 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2243 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2820 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2244 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC 2821 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2245}; 2822};
2246/* *INDENT-ON* */ 2823/* *INDENT-ON* */
2247 2824
2248/*{{{ process non-printing single characters */ 2825/*{{{ process non-printing single characters */
2249void 2826void
2250rxvt_term::process_nonprinting (unsigned char ch) 2827rxvt_term::process_nonprinting (unicode_t ch)
2251{ 2828{
2252 switch (ch) 2829 switch (ch)
2253 { 2830 {
2831 case C0_ESC:
2832 process_escape_seq ();
2833 break;
2254 case C0_ENQ: /* terminal Status */ 2834 case C0_ENQ: /* terminal Status */
2255 if (rs[Rs_answerbackstring]) 2835 if (rs[Rs_answerbackstring])
2256 tt_write (
2257 (const unsigned char *)rs[Rs_answerbackstring], 2836 tt_write ((const unsigned char *)rs[Rs_answerbackstring],
2258 (unsigned int)STRLEN (rs[Rs_answerbackstring])); 2837 (unsigned int)strlen (rs[Rs_answerbackstring]));
2259 else 2838 else
2260 tt_write ((unsigned char *)VT100_ANS, 2839 tt_write ((unsigned char *)VT100_ANS,
2261 (unsigned int)STRLEN (VT100_ANS)); 2840 (unsigned int)strlen (VT100_ANS));
2262 break; 2841 break;
2263 case C0_BEL: /* bell */ 2842 case C0_BEL: /* bell */
2264 scr_bell (); 2843 scr_bell ();
2265 break; 2844 break;
2266 case C0_BS: /* backspace */ 2845 case C0_BS: /* backspace */
… …
2281 scr_charset_choose (1); 2860 scr_charset_choose (1);
2282 break; 2861 break;
2283 case C0_SI: /* shift in - acs */ 2862 case C0_SI: /* shift in - acs */
2284 scr_charset_choose (0); 2863 scr_charset_choose (0);
2285 break; 2864 break;
2865
2866#ifdef EIGHT_BIT_CONTROLS
2867 // 8-bit controls
2868 case 0x90: /* DCS */
2869 process_dcs_seq ();
2870 break;
2871 case 0x9b: /* CSI */
2872 process_csi_seq ();
2873 break;
2874 case 0x9d: /* CSI */
2875 process_osc_seq ();
2876 break;
2877#endif
2286 } 2878 }
2287} 2879}
2288/*}}} */ 2880/*}}} */
2289 2881
2290 2882
2291/*{{{ process VT52 escape sequences */ 2883/*{{{ process VT52 escape sequences */
2292void 2884void
2293rxvt_term::process_escape_vt52 (unsigned char ch) 2885rxvt_term::process_escape_vt52 (unicode_t ch)
2294{ 2886{
2295 int row, col; 2887 int row, col;
2296 2888
2297 switch (ch) 2889 switch (ch)
2298 { 2890 {
… …
2350 2942
2351/*{{{ process escape sequences */ 2943/*{{{ process escape sequences */
2352void 2944void
2353rxvt_term::process_escape_seq () 2945rxvt_term::process_escape_seq ()
2354{ 2946{
2355 unsigned char ch = cmd_getc (); 2947 unicode_t ch = cmd_getc ();
2356 2948
2357 if (PrivateModes & PrivMode_vt52) 2949 if (priv_modes & PrivMode_vt52)
2358 { 2950 {
2359 process_escape_vt52 (ch); 2951 process_escape_vt52 (ch);
2360 return; 2952 return;
2361 } 2953 }
2362 2954
… …
2377 scr_charset_set (2, (unsigned int)cmd_getc ()); 2969 scr_charset_set (2, (unsigned int)cmd_getc ());
2378 break; 2970 break;
2379 case '+': 2971 case '+':
2380 scr_charset_set (3, (unsigned int)cmd_getc ()); 2972 scr_charset_set (3, (unsigned int)cmd_getc ());
2381 break; 2973 break;
2382#ifdef MULTICHAR_SET 2974#if ENABLE_FRILLS
2383 case '$':
2384 scr_charset_set (-2, (unsigned int)cmd_getc ());
2385 break;
2386#endif
2387#ifndef NO_FRILLS
2388 case '6': 2975 case '6':
2389 scr_backindex (); 2976 scr_backindex ();
2390 break; 2977 break;
2391#endif 2978#endif
2392 case '7': 2979 case '7':
2393 scr_cursor (SAVE); 2980 scr_cursor (SAVE);
2394 break; 2981 break;
2395 case '8': 2982 case '8':
2396 scr_cursor (RESTORE); 2983 scr_cursor (RESTORE);
2397 break; 2984 break;
2398#ifndef NO_FRILLS 2985#if ENABLE_FRILLS
2399 case '9': 2986 case '9':
2400 scr_forwardindex (); 2987 scr_forwardindex ();
2401 break; 2988 break;
2402#endif 2989#endif
2403 case '=': 2990 case '=':
… …
2413 break; 3000 break;
2414 3001
2415 /* 8.3.87: NEXT LINE */ 3002 /* 8.3.87: NEXT LINE */
2416 case C1_NEL: /* ESC E */ 3003 case C1_NEL: /* ESC E */
2417 { 3004 {
2418 uint32_t nlcr[] = { '\n', '\r' }; 3005 unicode_t nlcr[] = { C0_LF, C0_CR };
2419 scr_add_lines (nlcr, 1, 2); 3006 scr_add_lines (nlcr, 1, 2);
2420 } 3007 }
2421 break; 3008 break;
2422 3009
2423 /* kidnapped escape sequence: Should be 8.3.48 */ 3010 /* kidnapped escape sequence: Should be 8.3.48 */
… …
2434 case C1_RI: /* ESC M */ 3021 case C1_RI: /* ESC M */
2435 scr_index (DN); 3022 scr_index (DN);
2436 break; 3023 break;
2437 3024
2438 /* 8.3.142: SINGLE-SHIFT TWO */ 3025 /* 8.3.142: SINGLE-SHIFT TWO */
2439 /*case C1_SS2: scr_single_shift (2); break; */ 3026 /*case C1_SS2: scr_single_shift (2); break; */
2440 3027
2441 /* 8.3.143: SINGLE-SHIFT THREE */ 3028 /* 8.3.143: SINGLE-SHIFT THREE */
2442 /*case C1_SS3: scr_single_shift (3); break; */ 3029 /*case C1_SS3: scr_single_shift (3); break; */
2443 3030
2444 /* 8.3.27: DEVICE CONTROL STRING */ 3031 /* 8.3.27: DEVICE CONTROL STRING */
2445 case C1_DCS: /* ESC P */ 3032 case C1_DCS: /* ESC P */
2446 process_dcs_seq (); 3033 process_dcs_seq ();
2447 break; 3034 break;
… …
2462 process_osc_seq (); 3049 process_osc_seq ();
2463 break; 3050 break;
2464 3051
2465 /* 8.3.106: RESET TO INITIAL STATE */ 3052 /* 8.3.106: RESET TO INITIAL STATE */
2466 case 'c': 3053 case 'c':
3054 mbstate.reset ();
2467 scr_poweron (); 3055 scr_poweron ();
2468 scrollbar_show (1); 3056 scrollbar_show (1);
2469 break; 3057 break;
2470 3058
2471 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 3059 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
… …
2483 3071
2484/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 3072/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2485/* *INDENT-OFF* */ 3073/* *INDENT-OFF* */
2486enum { 3074enum {
2487 CSI_ICH = 0x40, 3075 CSI_ICH = 0x40,
2488 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,
2489 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 ,
2490 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,
2491 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,
2492 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,
2493 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,
… …
2508 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 3096 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2509 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 3097 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2510 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 3098 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2511 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 3099 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2512 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 3100 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2513 make_byte (0,0,0,0,0,0,0,0) /* x, y, z, {, |, }, ~, */ 3101 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2514 }; 3102 };
2515/* *INDENT-ON* */ 3103/* *INDENT-ON* */
2516 3104
2517void 3105void
2518rxvt_term::process_csi_seq () 3106rxvt_term::process_csi_seq ()
2519{ 3107{
2520 unsigned char ch, priv, i; 3108 unicode_t ch, priv, i;
2521 unsigned int nargs, p; 3109 unsigned int nargs, p;
2522 int n, ndef; 3110 int n, ndef;
2523 int arg[ESC_ARGS]; 3111 int arg[ESC_ARGS];
2524 3112
2525 for (nargs = ESC_ARGS; nargs > 0;) 3113 for (nargs = ESC_ARGS; nargs > 0;)
2526 arg[--nargs] = 0; 3114 arg[--nargs] = 0;
2527 3115
2528 priv = 0; 3116 priv = 0;
… …
2530 if (ch >= '<' && ch <= '?') 3118 if (ch >= '<' && ch <= '?')
2531 { /* '<' '=' '>' '?' */ 3119 { /* '<' '=' '>' '?' */
2532 priv = ch; 3120 priv = ch;
2533 ch = cmd_getc (); 3121 ch = cmd_getc ();
2534 } 3122 }
3123
2535 /* read any numerical arguments */ 3124 /* read any numerical arguments */
2536 for (n = -1; ch < CSI_ICH; ) 3125 for (n = -1; ch < CSI_ICH; )
2537 { 3126 {
2538 if (isdigit (ch)) 3127 if (isdigit (ch))
2539 { 3128 {
… …
2546 { 3135 {
2547 if (nargs < ESC_ARGS) 3136 if (nargs < ESC_ARGS)
2548 arg[nargs++] = n; 3137 arg[nargs++] = n;
2549 n = -1; 3138 n = -1;
2550 } 3139 }
2551 else if (ch == '\b') 3140 else if (IS_CONTROL (ch))
2552 {
2553 scr_backspace ();
2554 }
2555 else if (ch == C0_ESC)
2556 {
2557 process_escape_seq ();
2558 return;
2559 }
2560 else if (ch < ' ')
2561 {
2562 process_nonprinting (ch); 3141 process_nonprinting (ch);
2563 } 3142
2564 ch = cmd_getc (); 3143 ch = cmd_getc ();
2565 } 3144 }
2566 3145
2567 if (ch > CSI_7F) 3146 if (ch > CSI_7F)
2568 return; 3147 return;
… …
2710 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3289 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0);
2711 break; 3290 break;
2712 3291
2713 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3292 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
2714 tt_write ((const unsigned char *)VT100_ANS, 3293 tt_write ((const unsigned char *)VT100_ANS,
2715 (unsigned int) (sizeof (VT100_ANS) - 1)); 3294 (unsigned int) (sizeof (VT100_ANS) - 1));
2716 break; 3295 break;
2717 3296
2718 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3297 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
2719 process_sgr_mode (nargs, arg); 3298 process_sgr_mode (nargs, arg);
2720 break; 3299 break;
… …
2726 tt_printf ("\033[0n"); 3305 tt_printf ("\033[0n");
2727 break; 3306 break;
2728 case 6: /* CPR requested */ 3307 case 6: /* CPR requested */
2729 scr_report_position (); 3308 scr_report_position ();
2730 break; 3309 break;
2731#if defined (ENABLE_DISPLAY_ANSWER)
2732 case 7: /* unofficial extension */ 3310 case 7: /* unofficial extension */
3311 if (options & Opt_insecure)
2733 tt_printf ("%-.250s\n", rs[Rs_display_name]); 3312 tt_printf ("%-.250s\012", rs[Rs_display_name]);
2734 break; 3313 break;
2735#endif
2736 case 8: /* unofficial extension */ 3314 case 8: /* unofficial extension */
2737 xterm_seq (XTerm_title, APL_NAME "-" VERSION, CHAR_ST); 3315 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
2738 break; 3316 break;
2739 } 3317 }
2740 break; 3318 break;
2741 3319
2742 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3320 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
… …
2775 break; 3353 break;
2776 3354
2777 case CSI_RM: /* 8.3.107: RESET MODE */ 3355 case CSI_RM: /* 8.3.107: RESET MODE */
2778 if (arg[0] == 4) 3356 if (arg[0] == 4)
2779 scr_insert_mode (0); 3357 scr_insert_mode (0);
3358 else if (arg[0] == 20)
3359 priv_modes &= ~PrivMode_LFNL;
2780 break; 3360 break;
2781 3361
2782 case CSI_SM: /* 8.3.126: SET MODE */ 3362 case CSI_SM: /* 8.3.126: SET MODE */
2783 if (arg[0] == 4) 3363 if (arg[0] == 4)
2784 scr_insert_mode (1); 3364 scr_insert_mode (1);
3365 else if (arg[0] == 20)
3366 priv_modes |= PrivMode_LFNL;
2785 break; 3367 break;
2786 3368
2787 /* 3369 /*
2788 * PRIVATE USE beyond this point. All CSI_7? sequences here 3370 * PRIVATE USE beyond this point. All CSI_7? sequences here
2789 */ 3371 */
… …
2801 break; 3383 break;
2802 case CSI_75: 3384 case CSI_75:
2803 scr_cursor (RESTORE); 3385 scr_cursor (RESTORE);
2804 break; 3386 break;
2805 3387
2806#ifndef NO_FRILLS 3388#if ENABLE_FRILLS
2807 case CSI_74: 3389 case CSI_74:
2808 process_window_ops (arg, nargs); 3390 process_window_ops (arg, nargs);
2809 break; 3391 break;
2810#endif 3392#endif
2811 3393
2812 case CSI_78: /* DECREQTPARM */ 3394 case CSI_78: /* DECREQTPARM */
2813 if (arg[0] == 0 || arg[0] == 1) 3395 if (arg[0] == 0 || arg[0] == 1)
2814 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2); 3396 tt_printf ("\033[%d;1;1;128;128;1;0x", arg[0] + 2);
2815 /* FALLTHROUGH */ 3397 break;
2816 3398
2817 default: 3399 default:
2818 break; 3400 break;
2819 } 3401 }
2820} 3402}
2821/*}}} */ 3403/*}}} */
2822 3404
2823#ifndef NO_FRILLS 3405#if ENABLE_FRILLS
2824/* ARGSUSED */ 3406/* ARGSUSED */
2825void 3407void
2826rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3408rxvt_term::process_window_ops (const int *args, unsigned int nargs)
2827{ 3409{
2828 int x, y; 3410 int x, y;
2829#if 0
2830 char *s;
2831#endif
2832 XWindowAttributes wattr; 3411 XWindowAttributes wattr;
2833 Window wdummy; 3412 Window wdummy;
2834 3413
2835 if (nargs == 0) 3414 if (nargs == 0)
2836 return; 3415 return;
3416
2837 switch (args[0]) 3417 switch (args[0])
2838 { 3418 {
2839 /* 3419 /*
2840 * commands 3420 * commands
2841 */ 3421 */
2842 case 1: /* deiconify window */ 3422 case 1: /* deiconify window */
2843 XMapWindow (display->display, TermWin.parent[0]); 3423 XMapWindow (display->display, TermWin.parent[0]);
2844 break; 3424 break;
2845 case 2: /* iconify window */ 3425 case 2: /* iconify window */
2846 XIconifyWindow (display->display, TermWin.parent[0], 3426 XIconifyWindow (display->display, TermWin.parent[0],
… …
2863 break; 3443 break;
2864 case 8: /* set size (chars) */ 3444 case 8: /* set size (chars) */
2865 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3445 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth),
2866 (unsigned int) (args[1] * TermWin.fheight)); 3446 (unsigned int) (args[1] * TermWin.fheight));
2867 break; 3447 break;
3448
3449 //case 9: NYI, TODO, restore maximized window or maximize window
2868 default: 3450 default:
2869 if (args[0] >= 24) /* set height (chars) */ 3451 if (args[0] >= 24) /* set height (chars) */
2870 set_widthheight ((unsigned int)TermWin.width, 3452 set_widthheight ((unsigned int)TermWin.width,
2871 (unsigned int) (args[1] * TermWin.fheight)); 3453 (unsigned int) (args[1] * TermWin.fheight));
2872 break; 3454 break;
3455
3456
2873 /* 3457 /*
2874 * reports - some output format copied from XTerm 3458 * reports - some output format copied from XTerm
2875 */ 3459 */
2876 case 11: /* report window state */ 3460 case 11: /* report window state */
2877 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3461 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2878 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3462 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
2879 break; 3463 break;
2880 case 13: /* report window position */ 3464 case 13: /* report window position */
2881 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3465 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2882 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3466 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root,
2883 -wattr.border_width, -wattr.border_width, 3467 -wattr.border_width, -wattr.border_width,
2884 &x, &y, &wdummy); 3468 &x, &y, &wdummy);
2885 tt_printf ("\033[3;%d;%dt", x, y); 3469 tt_printf ("\033[3;%d;%dt", x, y);
2886 break; 3470 break;
2887 case 14: /* report window size (pixels) */ 3471 case 14: /* report window size (pixels) */
2888 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3472 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr);
2889 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3473 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
2890 break; 3474 break;
2891 case 18: /* report window size (chars) */ 3475 case 18: /* report text area size (chars) */
2892 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3476 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
2893 break; 3477 break;
2894#if 0 /* XXX: currently disabled due to security concerns */ 3478 case 19: /* report window size (chars) */
3479 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3480 break;
2895 case 20: /* report icon label */ 3481 case 20: /* report icon label */
3482 {
3483 char *s;
2896 XGetIconName (display->display, TermWin.parent[0], &s); 3484 XGetIconName (display->display, TermWin.parent[0], &s);
2897 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);
3487 }
2898 break; 3488 break;
2899 case 21: /* report window title */ 3489 case 21: /* report window title */
3490 {
3491 char *s;
2900 XFetchName (display->display, TermWin.parent[0], &s); 3492 XFetchName (display->display, TermWin.parent[0], &s);
2901 tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ 3493 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3494 XFree (s);
3495 }
2902 break; 3496 break;
2903#endif
2904
2905 } 3497 }
2906} 3498}
2907#endif 3499#endif
2908 3500
2909/*----------------------------------------------------------------------*/ 3501/*----------------------------------------------------------------------*/
2910/* 3502/*
2911 * get input up until STRING TERMINATOR (or BEL) 3503 * get input up until STRING TERMINATOR (or BEL)
2912 * ends_how is terminator used. returned input must be free ()d 3504 * ends_how is terminator used. returned input must be free()'d
2913 */ 3505 */
2914unsigned char * 3506unsigned char *
2915rxvt_term::get_to_st (unsigned char *ends_how) 3507rxvt_term::get_to_st (unicode_t &ends_how)
2916{ 3508{
2917 int seen_esc = 0; /* seen escape? */ 3509 unicode_t seen_esc = 0, ch;
2918 unsigned int n = 0; 3510 unsigned int n = 0;
2919 unsigned char *s; 3511 unsigned char *s;
2920 unsigned char ch, string[STRING_MAX]; 3512 unsigned char string[STRING_MAX];
2921 3513
2922 for (; (ch = cmd_getc ());) 3514 while ((ch = cmd_getc ()) != NOCHAR)
2923 { 3515 {
2924 if (ch == C0_BEL 3516 if (seen_esc)
2925 || ch == CHAR_ST 3517 {
2926 || (ch == 0x5c && seen_esc)) /* 7bit ST */ 3518 if (ch == 0x5c) /* 7bit ST */
2927 break; 3519 break;
3520 else
3521 return NULL;
3522 }
2928 if (ch == C0_ESC) 3523 else if (ch == C0_ESC)
2929 { 3524 {
2930 seen_esc = 1; 3525 seen_esc = 1;
2931 continue; 3526 continue;
2932 } 3527 }
2933 else if (ch == '\t') 3528 else if (ch == C0_BEL || ch == CHAR_ST)
2934 ch = ' '; /* translate '\t' to space */ 3529 break;
2935 else if (ch < 0x08 || (ch > 0x0d && ch < 0x20)) 3530 else if (ch < 0x20)
2936 return NULL; /* other control character - exit */ 3531 return NULL; /* other control character - exit */
3532
3533 seen_esc = 0;
3534
2937 if (n < sizeof (string) - 1) 3535 if (n >= sizeof (string) - 1)
3536 // stop at some sane length
3537 return NULL;
3538
3539 if (ch == C0_SYN)
3540 string[n++] = cmd_get8 ();
3541 else
2938 string[n++] = ch; 3542 string[n++] = ch;
2939 seen_esc = 0;
2940 } 3543 }
3544
2941 string[n++] = '\0'; 3545 string[n++] = '\0';
3546
2942 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) 3547 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
2943 return NULL; 3548 return NULL;
3549
2944 *ends_how = (ch == 0x5c ? C0_ESC : ch); 3550 ends_how = (ch == 0x5c ? C0_ESC : ch);
2945 STRNCPY (s, string, n); 3551 strncpy (s, string, n);
2946 return s; 3552 return s;
2947} 3553}
2948 3554
2949/*----------------------------------------------------------------------*/ 3555/*----------------------------------------------------------------------*/
2950/* 3556/*
2951 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3557 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
2952 */ 3558 */
2953void 3559void
2954rxvt_term::process_dcs_seq () 3560rxvt_term::process_dcs_seq ()
2955{ 3561{
2956 unsigned char eh, *s; 3562 unsigned char *s;
3563 unicode_t eh;
3564
2957 /* 3565 /*
2958 * Not handled yet 3566 * Not handled yet
2959 */ 3567 */
2960 s = get_to_st (&eh); 3568 s = get_to_st (eh);
2961 if (s) 3569 if (s)
2962 free (s); 3570 free (s);
3571
2963 return; 3572 return;
2964} 3573}
2965 3574
2966/*----------------------------------------------------------------------*/ 3575/*----------------------------------------------------------------------*/
2967/* 3576/*
2968 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3577 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
2969 */ 3578 */
2970void 3579void
2971rxvt_term::process_osc_seq () 3580rxvt_term::process_osc_seq ()
2972{ 3581{
2973 unsigned char ch, eh, *s; 3582 unicode_t ch, eh;
2974 int arg; 3583 int arg;
2975 3584
2976 ch = cmd_getc (); 3585 ch = cmd_getc ();
2977 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3586 for (arg = 0; isdigit (ch); ch = cmd_getc ())
2978 arg = arg * 10 + (ch - '0'); 3587 arg = arg * 10 + (ch - '0');
2979 3588
2980 if (ch == ';') 3589 if (ch == ';')
2981 { 3590 {
2982 s = get_to_st (&eh); 3591 unsigned char *s = get_to_st (eh);
3592
2983 if (s) 3593 if (s)
2984 { 3594 {
2985 /*
2986 * rxvt_menubar_dispatch () violates the constness of the string,
2987 * so do it here
2988 */
2989 if (arg == XTerm_Menu)
2990#if 0 /* XXX: currently disabled due to security concerns */
2991 menubar_dispatch ((char *)s);
2992#else
2993 (void)0;
2994#endif
2995 else
2996 xterm_seq (arg, (char *)s, eh); 3595 process_xterm_seq (arg, (char *)s, eh);
2997 free (s); 3596 free (s);
2998 } 3597 }
2999 } 3598 }
3000} 3599}
3600
3601void
3602rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp)
3603{
3604 if (str[0] == '?' && !str[1])
3605 {
3606 unsigned short r, g, b;
3607 pix_colors_focused[color].get (display, r, g, b);
3608 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp);
3609 }
3610 else
3611 set_window_color (color, str);
3612}
3613
3001/* 3614/*
3002 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3615 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3003 * 0 = change iconName/title 3616 * 0 = change iconName/title
3004 * 1 = change iconName 3617 * 1 = change iconName
3005 * 2 = change title 3618 * 2 = change title
3006 * 4 = change color 3619 * 4 = change color
3620 * 10 = change fg color
3621 * 11 = change bg color
3007 * 12 = change text color 3622 * 12 = change text color
3008 * 13 = change mouse foreground color 3623 * 13 = change mouse foreground color
3009 * 17 = change highlight character colour 3624 * 17 = change highlight character colour
3010 * 18 = change bold character color 3625 * 18 = change bold character color
3011 * 19 = change underlined character color 3626 * 19 = change underlined character color
3012 * 46 = change logfile (not implemented) 3627 * 46 = change logfile (not implemented)
3013 * 50 = change font 3628 * 50 = change font
3014 * 3629 *
3015 * rxvt extensions: 3630 * rxvt extensions:
3016 * 10 = menu (may change in future)
3017 * 20 = bg pixmap 3631 * 20 = bg pixmap
3018 * 39 = change default fg color 3632 * 39 = change default fg color
3019 * 49 = change default bg color 3633 * 49 = change default bg color
3020 * 55 = dump scrollback buffer and all of screen 3634 * 55 = dump scrollback buffer and all of screen
3635 * 701 = change locale
3636 * 702 = find font
3637 * 703 = menu
3021 */ 3638 */
3022void 3639void
3023rxvt_term::xterm_seq (int op, const char *str, unsigned char resp __attribute__ ((unused))) 3640rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3024{ 3641{
3025 int changed = 0; 3642 int changed = 0;
3026 int color; 3643 int color;
3027 char *buf, *name; 3644 char *buf, *name;
3645 bool query = str[0] == '?' && !str[1];
3646 int saveop = op;
3028 3647
3029 assert (str != NULL); 3648 assert (str != NULL);
3030 switch (op) 3649 switch (op)
3031 { 3650 {
3032 case XTerm_name: 3651 case XTerm_name:
3033 set_title (str); 3652 set_title (str);
3034 /* FALLTHROUGH */ 3653 /* FALLTHROUGH */
3035 case XTerm_iconName: 3654 case XTerm_iconName:
3036 set_iconName (str); 3655 set_icon_name (str);
3037 break; 3656 break;
3038 case XTerm_title: 3657 case XTerm_title:
3039 set_title (str); 3658 set_title (str);
3040 break; 3659 break;
3660 case XTerm_property:
3661 if (str[0] == '?')
3662 {
3663 Atom prop = XInternAtom (display->display, str + 1, True);
3664 Atom actual_type;
3665 int actual_format;
3666 unsigned long nitems;
3667 unsigned long bytes_after;
3668 unsigned char *value = 0;
3669 const char *str = "";
3670
3671 if (prop
3672 && XGetWindowProperty (display->display, TermWin.parent[0],
3673 prop, 0, 1<<16, 0, AnyPropertyType,
3674 &actual_type, &actual_format,
3675 &nitems, &bytes_after, &value) == Success
3676 && actual_type != None
3677 && actual_format == 8)
3678 str = (const char *)(value);
3679
3680 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp);
3681
3682 XFree (value);
3683 }
3684 else
3685 {
3686 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3687
3688 if (eq)
3689 {
3690 *eq = 0;
3691 XChangeProperty (display->display, TermWin.parent[0],
3692 display->atom (str), XA_STRING, 8,
3693 PropModeReplace, (unsigned char *)eq + 1,
3694 strlen (eq + 1));
3695 }
3696 else
3697 XDeleteProperty (display->display, TermWin.parent[0],
3698 display->atom (str));
3699 }
3700 break;
3701
3041 case XTerm_Color: 3702 case XTerm_Color:
3042 for (buf = (char *)str; buf && *buf;) 3703 for (buf = (char *)str; buf && *buf;)
3043 { 3704 {
3044 if ((name = STRCHR (buf, ';')) == NULL) 3705 if ((name = strchr (buf, ';')) == NULL)
3045 break; 3706 break;
3707
3046 *name++ = '\0'; 3708 *name++ = '\0';
3047 color = atoi (buf); 3709 color = atoi (buf);
3710
3048 if (color < 0 || color >= TOTAL_COLORS) 3711 if (color < 0 || color >= TOTAL_COLORS)
3049 break; 3712 break;
3713
3050 if ((buf = STRCHR (name, ';')) != NULL) 3714 if ((buf = strchr (name, ';')) != NULL)
3051 *buf++ = '\0'; 3715 *buf++ = '\0';
3716
3717 if (name[0] == '?' && !name[1])
3718 {
3719 unsigned short r, g, b;
3720 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3721 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3722 }
3723 else
3052 set_window_color (color + minCOLOR, name); 3724 set_window_color (color + minCOLOR, name);
3053 } 3725 }
3726 break;
3727 case XTerm_Color00:
3728 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3729 break;
3730 case XTerm_Color01:
3731 process_color_seq (XTerm_Color00, Color_bg, str, resp);
3054 break; 3732 break;
3055#ifndef NO_CURSORCOLOR 3733#ifndef NO_CURSORCOLOR
3056 case XTerm_Color_cursor: 3734 case XTerm_Color_cursor:
3057 set_window_color (Color_cursor, str); 3735 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3058 break; 3736 break;
3059#endif 3737#endif
3060 case XTerm_Color_pointer: 3738 case XTerm_Color_pointer_fg:
3061 set_window_color (Color_pointer, str); 3739 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp);
3740 break;
3741 case XTerm_Color_pointer_bg:
3742 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3062 break; 3743 break;
3063#ifndef NO_BOLD_UNDERLINE_REVERSE 3744#ifndef NO_BOLD_UNDERLINE_REVERSE
3064 case XTerm_Color_BD: 3745 case XTerm_Color_BD:
3065 set_window_color (Color_BD, str); 3746 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3747 break;
3748 case XTerm_Color_IT:
3749 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3066 break; 3750 break;
3067 case XTerm_Color_UL: 3751 case XTerm_Color_UL:
3068 set_window_color (Color_UL, str); 3752 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3069 break; 3753 break;
3070 case XTerm_Color_RV: 3754 case XTerm_Color_RV:
3071 set_window_color (Color_RV, str); 3755 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3072 break; 3756 break;
3073#endif 3757#endif
3074 3758#if TRANSPARENT || TINTING
3075 case XTerm_Menu: 3759 case XTerm_Color_tint:
3076 /* 3760 process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
3077 * rxvt_menubar_dispatch () violates the constness of the string, 3761 check_our_parents ();
3078 * so DON'T do it here 3762 if (am_transparent)
3079 */ 3763 want_full_refresh = want_refresh = 1;
3080 break; 3764 break;
3765#endif
3766
3081 case XTerm_Pixmap: 3767 case XTerm_Pixmap:
3082 if (*str != ';') 3768 if (*str != ';')
3083 { 3769 {
3084#if XPM_BACKGROUND 3770#if XPM_BACKGROUND
3085 scale_pixmap (""); /* reset to default scaling */ 3771 scale_pixmap (""); /* reset to default scaling */
3086 set_bgPixmap (str); /* change pixmap */ 3772 set_bgPixmap (str); /* change pixmap */
3087#endif 3773#endif
3088 scr_touch (true); 3774 scr_touch (true);
3089 } 3775 }
3090 while ((str = STRCHR (str, ';')) != NULL) 3776 while ((str = strchr (str, ';')) != NULL)
3091 { 3777 {
3092 str++; 3778 str++;
3093#if XPM_BACKGROUND 3779#if XPM_BACKGROUND
3094 changed += scale_pixmap (str); 3780 changed += scale_pixmap (str);
3095#endif 3781#endif
… …
3108 set_window_color (Color_fg, str); 3794 set_window_color (Color_fg, str);
3109 break; 3795 break;
3110 case XTerm_restoreBG: 3796 case XTerm_restoreBG:
3111 set_window_color (Color_bg, str); 3797 set_window_color (Color_bg, str);
3112 break; 3798 break;
3799
3113 case XTerm_logfile: 3800 case XTerm_logfile:
3801 // TODO, when secure mode?
3114 break; 3802 break;
3803
3115 case XTerm_font: 3804 case XTerm_font:
3116 change_font (0, str); 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
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
3818 {
3819 const char *&res = rs[Rs_font + (op - URxvt_font)];
3820
3821 res = strdup (str);
3822 allocated.push_back ((void *)res);
3823 set_fonts ();
3824 }
3825 break;
3826
3827#if ENABLE_FRILLS
3828 case XTerm_locale:
3829 if (query)
3830 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp);
3831 else
3832 {
3833 set_locale (str);
3834# ifdef USE_XIM
3835 im_cb ();
3836# endif
3837 }
3838 break;
3839#endif
3840
3841#ifdef MENUBAR
3842 case XTerm_Menu:
3843 if (options & Opt_insecure)
3844 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3117 break; 3845 break;
3846#endif
3118#if 0 3847#if 0
3119 case XTerm_dumpscreen: /* no error notices */ 3848 case XTerm_dumpscreen: /* no error notices */
3120 { 3849 {
3121 int fd; 3850 int fd;
3122 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3851 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3123 { 3852 {
3124 scr_dump (fd); 3853 scr_dump (fd);
3125 close (fd); 3854 close (fd);
3126 } 3855 }
3127 } 3856 }
3128 break; 3857 break;
3129#endif 3858#endif
3130
3131 } 3859 }
3132} 3860}
3133/*----------------------------------------------------------------------*/ 3861/*----------------------------------------------------------------------*/
3134 3862
3135/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3863/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
3143 * so no need for fancy checking 3871 * so no need for fancy checking
3144 */ 3872 */
3145int 3873int
3146rxvt_term::privcases (int mode, unsigned long bit) 3874rxvt_term::privcases (int mode, unsigned long bit)
3147{ 3875{
3148 int state; 3876 int state;
3149 3877
3150 if (mode == 's') 3878 if (mode == 's')
3151 { 3879 {
3152 SavedModes |= (PrivateModes & bit); 3880 SavedModes |= (priv_modes & bit);
3153 return -1; 3881 return -1;
3154 } 3882 }
3155 else 3883 else
3156 { 3884 {
3157 if (mode == 'r') 3885 if (mode == 'r')
3158 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3886 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3159 else 3887 else
3160 state = (mode == 't') ? ! (PrivateModes & bit) : mode; 3888 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3161 PrivMode (state, bit); 3889 PrivMode (state, bit);
3162 } 3890 }
3891
3163 return state; 3892 return state;
3164} 3893}
3165 3894
3166/* we're not using priv _yet_ */ 3895/* we're not using priv _yet_ */
3167void 3896void
3168rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3897rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg)
3169{ 3898{
3170 unsigned int i, j; 3899 unsigned int i, j;
3171 int state; 3900 int state;
3901
3172 static const struct 3902 static const struct
3173 { 3903 {
3174 const int argval; 3904 const int argval;
3175 const unsigned long bit; 3905 const unsigned long bit;
3176 } 3906 }
3907
3177 argtopriv[] = { 3908 argtopriv[] = {
3178 { 1, PrivMode_aplCUR }, 3909 { 1, PrivMode_aplCUR },
3179 { 2, PrivMode_vt52 }, 3910 { 2, PrivMode_vt52 },
3180 { 3, PrivMode_132 }, 3911 { 3, PrivMode_132 },
3181 { 4, PrivMode_smoothScroll }, 3912 { 4, PrivMode_smoothScroll },
3182 { 5, PrivMode_rVideo }, 3913 { 5, PrivMode_rVideo },
3183 { 6, PrivMode_relOrigin }, 3914 { 6, PrivMode_relOrigin },
3184 { 7, PrivMode_Autowrap }, 3915 { 7, PrivMode_Autowrap },
3916 // 8, bi-directional support mode
3185 { 9, PrivMode_MouseX10 }, 3917 { 9, PrivMode_MouseX10 },
3186#ifdef menuBar_esc 3918#ifdef menuBar_esc
3187 { menuBar_esc, PrivMode_menuBar }, 3919 { menuBar_esc, PrivMode_menuBar },
3188#endif 3920#endif
3921 // 18, 19 printing-related
3922 { 25, PrivMode_VisibleCursor },
3189#ifdef scrollBar_esc 3923#ifdef scrollBar_esc
3190 { scrollBar_esc, PrivMode_scrollBar }, 3924 { scrollBar_esc, PrivMode_scrollBar },
3191#endif 3925#endif
3192 { 25, PrivMode_VisibleCursor },
3193 { 35, PrivMode_ShiftKeys }, 3926 { 35, PrivMode_ShiftKeys }, // rxvt extension
3194 { 40, PrivMode_132OK }, 3927 { 40, PrivMode_132OK },
3928 // 41 xterm more fixes NYI
3929 // 45 margin bell NYI
3930 // 46 start logging
3195 { 47, PrivMode_Screen }, 3931 { 47, PrivMode_Screen },
3196 { 66, PrivMode_aplKP }, 3932 { 66, PrivMode_aplKP },
3197#ifndef NO_BACKSPACE_KEY 3933#ifndef NO_BACKSPACE_KEY
3198 { 67, PrivMode_BackSpace }, 3934 { 67, PrivMode_BackSpace },
3199#endif 3935#endif
3200 { 1000, PrivMode_MouseX11 }, 3936 { 1000, PrivMode_MouseX11 },
3937 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3938 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO
3939 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3201 { 1010, PrivMode_TtyOutputInh }, 3940 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3202 { 1011, PrivMode_Keypress }, 3941 { 1011, PrivMode_Keypress }, // rxvt extension
3942 // 1035 enable modifiers for alt, numlock NYI
3943 // 1036 send ESC for meta keys NYI
3944 // 1037 send DEL for keypad delete NYI
3203 { 1047, PrivMode_Screen }, 3945 { 1047, PrivMode_Screen },
3946 // 1048 save and restore cursor
3204 { 1049, PrivMode_Screen }, /* xterm extension, not fully implemented */ 3947 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3948 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3205 }; 3949 };
3206 3950
3207 if (nargs == 0) 3951 if (nargs == 0)
3208 return; 3952 return;
3209 3953
… …
3224 state = privcases (mode, argtopriv[j].bit); 3968 state = privcases (mode, argtopriv[j].bit);
3225 break; 3969 break;
3226 } 3970 }
3227 3971
3228 /* extra handling for values with state unkept */ 3972 /* extra handling for values with state unkept */
3229 if (state == -1)
3230 switch (arg[i]) 3973 switch (arg[i])
3231 { 3974 {
3232 case 1048: /* alternative cursor save */ 3975 case 1048: /* alternative cursor save */
3976 case 1049:
3977 if (options & Opt_secondaryScreen)
3233 if (mode == 0) 3978 if (mode == 0)
3234 scr_cursor (RESTORE); 3979 scr_cursor (RESTORE);
3235 else if (mode == 1) 3980 else if (mode == 1)
3236 scr_cursor (SAVE); 3981 scr_cursor (SAVE);
3237 /* FALLTHROUGH */
3238 default:
3239 continue; /* for (;i;) */
3240 }
3241
3242 /* extra handling for values with valid 0 or 1 state */
3243 switch (arg[i])
3244 {
3245 /* case 1: - application cursor keys */
3246 case 2: /* VT52 mode */
3247 /* oddball mode. should be set regardless of set/reset
3248 * parameter. Return from VT52 mode with an ESC < from
3249 * within VT52 mode
3250 */
3251 PrivMode (1, PrivMode_vt52);
3252 break; 3982 break;
3983 }
3984
3985 if (state >= 0)
3986 /* extra handling for values with valid 0 or 1 state */
3987 switch (arg[i])
3988 {
3989 /* case 1: - application cursor keys */
3990 case 2: /* VT52 mode */
3991 /* oddball mode. should be set regardless of set/reset
3992 * parameter. Return from VT52 mode with an ESC < from
3993 * within VT52 mode
3994 */
3995 PrivMode (1, PrivMode_vt52);
3996 break;
3253 case 3: /* 80/132 */ 3997 case 3: /* 80/132 */
3254 if (PrivateModes & PrivMode_132OK) 3998 if (priv_modes & PrivMode_132OK)
3255 set_widthheight ( (unsigned int) ((state ? 132 : 80) * TermWin.fwidth), 3999 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height);
3256 (unsigned int)TermWin.height);
3257 break; 4000 break;
3258 case 4: /* smooth scrolling */ 4001 case 4: /* smooth scrolling */
3259 if (state) 4002 if (state)
3260 Options &= ~Opt_jumpScroll; 4003 options &= ~Opt_jumpScroll;
3261 else 4004 else
3262 Options |= Opt_jumpScroll; 4005 options |= Opt_jumpScroll;
3263 break; 4006 break;
3264 case 5: /* reverse video */ 4007 case 5: /* reverse video */
3265 scr_rvideo_mode (state); 4008 scr_rvideo_mode (state);
3266 break; 4009 break;
3267 case 6: /* relative/absolute origins */ 4010 case 6: /* relative/absolute origins */
3268 scr_relative_origin (state); 4011 scr_relative_origin (state);
3269 break; 4012 break;
3270 case 7: /* autowrap */ 4013 case 7: /* autowrap */
3271 scr_autowrap (state); 4014 scr_autowrap (state);
3272 break; 4015 break;
3273 /* 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 */
3274 case 9: /* X10 mouse reporting */ 4017 case 9: /* X10 mouse reporting */
3275 if (state) /* orthogonal */ 4018 if (state) /* orthogonal */
3276 PrivateModes &= ~ (PrivMode_MouseX11); 4019 priv_modes &= ~PrivMode_MouseX11;
3277 break; 4020 break;
3278#ifdef menuBar_esc 4021#ifdef menuBar_esc
3279 case menuBar_esc: 4022 case menuBar_esc:
3280#ifdef MENUBAR 4023#ifdef MENUBAR
3281 map_menuBar (state); 4024 map_menuBar (state);
3282#endif 4025#endif
3283 break; 4026 break;
3284#endif 4027#endif
3285#ifdef scrollBar_esc 4028#ifdef scrollBar_esc
3286 case scrollBar_esc: 4029 case scrollBar_esc:
3287 if (scrollbar_mapping (state)) 4030 if (scrollbar_mapping (state))
3288 { 4031 {
3289 resize_all_windows (0, 0, 0); 4032 resize_all_windows (0, 0, 0);
3290 scr_touch (true); 4033 scr_touch (true);
3291 } 4034 }
3292 break; 4035 break;
3293#endif 4036#endif
3294 case 25: /* visible/invisible cursor */ 4037 case 25: /* visible/invisible cursor */
3295 scr_cursor_visible (state); 4038 scr_cursor_visible (state);
3296 break; 4039 break;
3297 /* case 35: - shift keys */ 4040 /* case 35: - shift keys */
3298 /* case 40: - 80 <--> 132 mode */ 4041 /* case 40: - 80 <--> 132 mode */
3299 case 47: /* secondary screen */ 4042 case 47: /* secondary screen */
3300 scr_change_screen (state); 4043 scr_change_screen (state);
3301 break; 4044 break;
3302 /* case 66: - application key pad */ 4045 /* case 66: - application key pad */
3303 /* case 67: - backspace key */ 4046 /* case 67: - backspace key */
3304 case 1000: /* X11 mouse reporting */ 4047 case 1000: /* X11 mouse reporting */
3305 if (state) /* orthogonal */ 4048 if (state) /* orthogonal */
3306 PrivateModes &= ~ (PrivMode_MouseX10); 4049 priv_modes &= ~PrivMode_MouseX10;
3307 break; 4050 break;
3308#if 0 4051#if 0
3309 case 1001: 4052 case 1001:
3310 break; /* X11 mouse highlighting */ 4053 break; /* X11 mouse highlighting */
3311#endif 4054#endif
3312 case 1010: /* scroll to bottom on TTY output inhibit */ 4055 case 1010: /* scroll to bottom on TTY output inhibit */
3313 if (state) 4056 if (state)
3314 Options &= ~Opt_scrollTtyOutput; 4057 options &= ~Opt_scrollTtyOutput;
3315 else 4058 else
3316 Options |= Opt_scrollTtyOutput; 4059 options |= Opt_scrollTtyOutput;
3317 break; 4060 break;
3318 case 1011: /* scroll to bottom on key press */ 4061 case 1011: /* scroll to bottom on key press */
3319 if (state) 4062 if (state)
3320 Options |= Opt_scrollTtyKeypress; 4063 options |= Opt_scrollTtyKeypress;
3321 else 4064 else
3322 Options &= ~Opt_scrollTtyKeypress; 4065 options &= ~Opt_scrollTtyKeypress;
3323 break; 4066 break;
3324 case 1047: /* secondary screen w/ clearing */ 4067 case 1047: /* secondary screen w/ clearing last */
3325 case 1049: /* better secondary screen w/ clearing, but not fully implemented */ 4068 if (options & Opt_secondaryScreen)
3326 if (current_screen != PRIMARY) 4069 if (current_screen != PRIMARY)
3327 scr_erase_screen (2); 4070 scr_erase_screen (2);
3328 scr_change_screen (state); 4071 scr_change_screen (state);
3329 /* FALLTHROUGH */
3330 default:
3331 break; 4072 break;
4073 case 1049: /* secondary screen w/ clearing first */
4074 scr_change_screen (state);
4075 if (options & Opt_secondaryScreen)
4076 if (current_screen != PRIMARY)
4077 scr_erase_screen (2);
4078 break;
4079 default:
4080 break;
3332 } 4081 }
3333 } 4082 }
3334} 4083}
3335/*}}} */ 4084/*}}} */
3336 4085
3337/*{{{ process sgr sequences */ 4086/*{{{ process sgr sequences */
3338void 4087void
3339rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 4088rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3340{ 4089{
3341 unsigned int i; 4090 unsigned int i;
3342 short rendset; 4091 short rendset;
3343 int rendstyle; 4092 int rendstyle;
3344 4093
3345 if (nargs == 0) 4094 if (nargs == 0)
3346 { 4095 {
3347 scr_rendition (0, ~RS_None); 4096 scr_rendition (0, ~RS_None);
3348 return; 4097 return;
3349 } 4098 }
4099
3350 for (i = 0; i < nargs; i++) 4100 for (i = 0; i < nargs; i++)
3351 { 4101 {
3352 rendset = -1; 4102 rendset = -1;
3353 switch (arg[i]) 4103 switch (arg[i])
3354 { 4104 {
… …
3356 rendset = 0, rendstyle = ~RS_None; 4106 rendset = 0, rendstyle = ~RS_None;
3357 break; 4107 break;
3358 case 1: 4108 case 1:
3359 rendset = 1, rendstyle = RS_Bold; 4109 rendset = 1, rendstyle = RS_Bold;
3360 break; 4110 break;
4111 //case 2: // low intensity
4112 case 3:
4113 rendset = 1, rendstyle = RS_Italic;
4114 break;
3361 case 4: 4115 case 4:
3362 rendset = 1, rendstyle = RS_Uline; 4116 rendset = 1, rendstyle = RS_Uline;
3363 break; 4117 break;
3364 case 5: 4118 case 5: // slowly blinking
4119 case 6: // rapidly blinking
3365 rendset = 1, rendstyle = RS_Blink; 4120 rendset = 1, rendstyle = RS_Blink;
3366 break; 4121 break;
4122 //case 6: // scoansi light background
3367 case 7: 4123 case 7:
3368 rendset = 1, rendstyle = RS_RVid; 4124 rendset = 1, rendstyle = RS_RVid;
3369 break; 4125 break;
3370 case 22: 4126 case 8:
4127 // invisible. NYI
4128 break;
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)
3371 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;
3372 break; 4144 break;
3373 case 24: 4145 case 24:
3374 rendset = 0, rendstyle = RS_Uline; 4146 rendset = 0, rendstyle = RS_Uline;
3375 break; 4147 break;
3376 case 25: 4148 case 25:
3377 rendset = 0, rendstyle = RS_Blink; 4149 rendset = 0, rendstyle = RS_Blink;
3378 break; 4150 break;
4151 case 26: // variable spacing (iso 8613)
4152 rendset = 0, rendstyle = RS_Blink;
4153 break;
3379 case 27: 4154 case 27:
3380 rendset = 0, rendstyle = RS_RVid; 4155 rendset = 0, rendstyle = RS_RVid;
3381 break; 4156 break;
4157 //case 28: // visible. NYI
4158 //case 29: // not crossed-out
3382 } 4159 }
4160
3383 if (rendset != -1) 4161 if (rendset != -1)
3384 { 4162 {
3385 scr_rendition (rendset, rendstyle); 4163 scr_rendition (rendset, rendstyle);
3386 continue; /* for (;i;) */ 4164 continue; /* for (;i;) */
3387 } 4165 }
… …
3394 case 33: 4172 case 33:
3395 case 34: 4173 case 34:
3396 case 35: 4174 case 35:
3397 case 36: 4175 case 36:
3398 case 37: 4176 case 37:
3399 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), 4177 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3400 Color_fg);
3401 break; 4178 break;
3402#ifdef TTY_256COLOR 4179 case 38: // set fg color, ISO 8613-6
3403 case 38:
3404 if (nargs > i + 2 && arg[i + 1] == 5) 4180 if (nargs > i + 2 && arg[i + 1] == 5)
3405 { 4181 {
3406 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4182 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3407 Color_fg);
3408 i += 2; 4183 i += 2;
3409 } 4184 }
3410 break; 4185 break;
3411#endif
3412 case 39: /* default fg */ 4186 case 39: /* default fg */
3413 scr_color (Color_fg, Color_fg); 4187 scr_color (Color_fg, Color_fg);
3414 break; 4188 break;
3415 4189
3416 case 40: 4190 case 40:
… …
3419 case 43: 4193 case 43:
3420 case 44: 4194 case 44:
3421 case 45: 4195 case 45:
3422 case 46: 4196 case 46:
3423 case 47: 4197 case 47:
3424 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), 4198 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3425 Color_bg);
3426 break; 4199 break;
3427#ifdef TTY_256COLOR 4200 case 48: // set bg color, ISO 8613-6
3428 case 48:
3429 if (nargs > i + 2 && arg[i + 1] == 5) 4201 if (nargs > i + 2 && arg[i + 1] == 5)
3430 { 4202 {
3431 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), 4203 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3432 Color_bg);
3433 i += 2; 4204 i += 2;
3434 } 4205 }
3435 break; 4206 break;
3436#endif
3437 case 49: /* default bg */ 4207 case 49: /* default bg */
3438 scr_color (Color_bg, Color_bg); 4208 scr_color (Color_bg, Color_bg);
3439 break; 4209 break;
4210
4211 //case 50: // not variable spacing
3440 4212
3441#ifndef NO_BRIGHTCOLOR 4213#ifndef NO_BRIGHTCOLOR
3442 case 90: 4214 case 90:
3443 case 91: /* set bright fg color */ 4215 case 91: /* set bright fg color */
3444 case 92: 4216 case 92:
3445 case 93: 4217 case 93:
3446 case 94: 4218 case 94:
3447 case 95: 4219 case 95:
3448 case 96: 4220 case 96:
3449 case 97: 4221 case 97:
3450 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), 4222 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg);
3451 Color_fg);
3452 break; 4223 break;
3453 case 100: 4224 case 100:
3454 case 101: /* set bright bg color */ 4225 case 101: /* set bright bg color */
3455 case 102: 4226 case 102:
3456 case 103: 4227 case 103:
3457 case 104: 4228 case 104:
3458 case 105: 4229 case 105:
3459 case 106: 4230 case 106:
3460 case 107: 4231 case 107:
3461 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), 4232 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
3462 Color_bg);
3463 break; 4233 break;
3464#endif 4234#endif
3465 4235
3466 } 4236 }
3467 } 4237 }
3468} 4238}
3469/*}}} */ 4239/*}}} */
3470 4240
3471/*{{{ process Rob Nation's own graphics mode sequences */ 4241/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3472void 4242void
3473rxvt_term::process_graphics () 4243rxvt_term::process_graphics ()
3474{ 4244{
3475 unsigned char ch, cmd = cmd_getc (); 4245 unicode_t ch, cmd = cmd_getc ();
3476 4246
3477#ifndef RXVT_GRAPHICS
3478 if (cmd == 'Q') 4247 if (cmd == 'Q')
3479 { /* query graphics */ 4248 { /* query graphics */
3480 tt_printf ("\033G0\n"); /* no graphics */ 4249 tt_printf ("\033G0\012"); /* no graphics */
3481 return; 4250 return;
3482 } 4251 }
3483 /* swallow other graphics sequences until terminating ':' */ 4252 /* swallow other graphics sequences until terminating ':' */
3484 do 4253 do
3485 ch = cmd_getc (); 4254 ch = cmd_getc ();
3486 while (ch != ':'); 4255 while (ch != ':');
3487#else
3488 unsigned int nargs;
3489 int args[NGRX_PTS];
3490 unsigned char *text = NULL;
3491
3492 if (cmd == 'Q')
3493 { /* query graphics */
3494 tt_printf ("\033G1\n"); /* yes, graphics (color) */
3495 return;
3496 }
3497 for (nargs = 0; nargs < (sizeof (args) / sizeof (args[0])) - 1;)
3498 {
3499 int neg;
3500
3501 ch = cmd_getc ();
3502 neg = (ch == '-');
3503 if (neg || ch == '+')
3504 ch = cmd_getc ();
3505
3506 for (args[nargs] = 0; isdigit (ch); ch = cmd_getc ())
3507 args[nargs] = args[nargs] * 10 + (ch - '0');
3508 if (neg)
3509 args[nargs] = -args[nargs];
3510
3511 nargs++;
3512 args[nargs] = 0;
3513 if (ch != ';')
3514 break;
3515 }
3516
3517 if ((cmd == 'T') && (nargs >= 5))
3518 {
3519 int i, len = args[4];
3520
3521 text = (unsigned char *)rxvt_malloc ((len + 1) * sizeof (char));
3522
3523 if (text != NULL)
3524 {
3525 for (i = 0; i < len; i++)
3526 text[i] = cmd_getc ();
3527 text[len] = '\0';
3528 }
3529 }
3530 Gr_do_graphics (cmd, nargs, args, text);
3531#endif
3532} 4256}
3533/*}}} */ 4257/*}}} */
3534 4258
3535/* ------------------------------------------------------------------------- */ 4259/* ------------------------------------------------------------------------- */
3536 4260
… …
3545 unsigned char buf[256]; 4269 unsigned char buf[256];
3546 4270
3547 va_start (arg_ptr, fmt); 4271 va_start (arg_ptr, fmt);
3548 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4272 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3549 va_end (arg_ptr); 4273 va_end (arg_ptr);
3550 tt_write (buf, STRLEN (buf)); 4274 tt_write (buf, strlen (buf));
3551} 4275}
3552 4276
3553/* ---------------------------------------------------------------------- */ 4277/* ---------------------------------------------------------------------- */
3554/* 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,
3555 * or generated by us in response to a query ESC sequence. 4279 * or generated by us in response to a query ESC sequence.
3556 */ 4280 */
3557void 4281void
3558rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4282rxvt_term::tt_write (const unsigned char *data, unsigned int len)
3559{ 4283{
3560 enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT 4284 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3561 4285
3562 if (len) 4286 if (len)
3563 { 4287 {
3564 if (v_buflen == 0) 4288 if (v_buflen == 0)
3565 { 4289 {
3566 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));
3567 4291
3568 if ((unsigned int)written == len) 4292 if ((unsigned int)written == len)
3569 return; 4293 return;
3570 4294
3571 data += written; 4295 data += written;
… …
3579 v_buflen += len; 4303 v_buflen += len;
3580 } 4304 }
3581 4305
3582 for (;;) 4306 for (;;)
3583 { 4307 {
3584 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));
3585 4309
3586 if (written > 0) 4310 if (written > 0)
3587 { 4311 {
3588 v_buflen -= written; 4312 v_buflen -= written;
3589 4313

Diff Legend

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