… | |
… | |
25 | * - extensive modifications |
25 | * - extensive modifications |
26 | * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> |
26 | * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> |
27 | * Copyright (c) 2001 Marius Gedminas |
27 | * Copyright (c) 2001 Marius Gedminas |
28 | * - Ctrl/Mod4+Tab works like Meta+Tab (options) |
28 | * - Ctrl/Mod4+Tab works like Meta+Tab (options) |
29 | * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> |
29 | * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> |
30 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
30 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
31 | * |
31 | * |
32 | * This program is free software; you can redistribute it and/or modify |
32 | * This program is free software; you can redistribute it and/or modify |
33 | * it under the terms of the GNU General Public License as published by |
33 | * it under the terms of the GNU General Public License as published by |
34 | * the Free Software Foundation; either version 2 of the License, or |
34 | * the Free Software Foundation; either version 2 of the License, or |
35 | * (at your option) any later version. |
35 | * (at your option) any later version. |
… | |
… | |
43 | * along with this program; if not, write to the Free Software |
43 | * along with this program; if not, write to the Free Software |
44 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
44 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
45 | *----------------------------------------------------------------------*/ |
45 | *----------------------------------------------------------------------*/ |
46 | |
46 | |
47 | /*{{{ includes: */ |
47 | /*{{{ includes: */ |
48 | #include "../config.h" /* NECESSARY */ |
48 | #include "../config.h" |
49 | #include "rxvt.h" /* NECESSARY */ |
49 | #include "rxvt.h" |
|
|
50 | #include "rxvtperl.h" |
50 | #include "version.h" |
51 | #include "version.h" |
51 | #include "command.h" |
52 | #include "command.h" |
52 | |
53 | |
|
|
54 | #if HAVE_SCHED_YIELD |
|
|
55 | #undef HAVE_SCHED_YIELD // disabled for the time being |
53 | #include <wchar.h> |
56 | //# include <sched.h> |
|
|
57 | #endif |
|
|
58 | |
|
|
59 | #ifdef KEYSYM_RESOURCE |
|
|
60 | # include "keyboard.h" |
|
|
61 | #endif |
|
|
62 | |
54 | #include <signal.h> |
63 | #include <csignal> |
55 | |
64 | |
56 | /*----------------------------------------------------------------------*/ |
65 | /*----------------------------------------------------------------------*/ |
57 | |
66 | |
58 | #define IS_CONTROL(ch) !((ch) & 0xffffff60UL) |
67 | #define IS_CONTROL(ch) !((ch) & 0xffffff60UL) |
59 | |
68 | |
… | |
… | |
114 | XK_Escape, 0x238b, |
123 | XK_Escape, 0x238b, |
115 | XK_Undo, 0x238c, |
124 | XK_Undo, 0x238c, |
116 | XK_Print, 0x2399, |
125 | XK_Print, 0x2399, |
117 | |
126 | |
118 | XK_space, 0x2423, |
127 | XK_space, 0x2423, |
|
|
128 | |
|
|
129 | #ifdef XK_KP_Begin |
|
|
130 | XK_KP_Prior, 0x21de, |
|
|
131 | XK_KP_Next, 0x21df, |
|
|
132 | XK_KP_Begin, 0x2320, |
|
|
133 | XK_KP_Insert, 0x2380, |
|
|
134 | XK_KP_Delete, 0x2326, |
119 | XK_KP_Space, 0x2422, |
135 | XK_KP_Space, 0x2422, |
|
|
136 | #endif |
120 | 0, |
137 | 0, |
121 | }; |
138 | }; |
122 | |
139 | |
123 | void |
140 | void |
124 | rxvt_term::iso14755_54 (int x, int y) |
141 | rxvt_term::iso14755_54 (int x, int y) |
125 | { |
142 | { |
126 | x = Pixel2Col (x); |
143 | x = Pixel2Col (x); |
127 | y = Pixel2Row (y); |
144 | y = Pixel2Row (y); |
128 | |
145 | |
129 | if (x < 0 || x >= TermWin.ncol |
146 | if (!IN_RANGE_EXC (x, 0, ncol) |
130 | || y < 0 || y >= TermWin.nrow) |
147 | || !IN_RANGE_EXC (y, 0, nrow)) |
131 | return; |
148 | return; |
132 | |
149 | |
133 | for (;;) |
150 | for (;;) |
134 | { |
151 | { |
135 | text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; |
152 | const line_t &l = ROW(y + view_start); |
|
|
153 | |
|
|
154 | text_t t = l.t[x]; |
136 | |
155 | |
137 | if (t != NOCHAR || !x) |
156 | if (t != NOCHAR || !x) |
138 | { |
157 | { |
139 | iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], |
158 | iso14755_51 (l.t[x], l.r[x], x, y); |
140 | screen.rend[y + TermWin.saveLines - TermWin.view_start][x]); |
|
|
141 | iso14755buf = ISO_14755_54; |
159 | iso14755buf = ISO_14755_54; |
142 | break; |
160 | break; |
143 | } |
161 | } |
144 | |
162 | |
145 | x--; |
163 | x--; |
146 | } |
164 | } |
147 | |
|
|
148 | } |
165 | } |
149 | #endif |
|
|
150 | |
166 | |
151 | #if ENABLE_OVERLAY |
|
|
152 | void |
167 | void |
153 | rxvt_term::iso14755_51 (unicode_t ch, rend_t r) |
168 | rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) |
154 | { |
169 | { |
155 | rxvt_fontset *fs = FONTSET (r); |
170 | rxvt_fontset *fs = FONTSET (r); |
156 | rxvt_font *f = (*fs)[fs->find_font (ch)]; |
171 | rxvt_font *f = (*fs)[fs->find_font (ch)]; |
157 | wchar_t *chr, *alloc, ch2; |
172 | wchar_t *chr, *alloc, ch2, *fname; |
158 | int len; |
173 | int len; |
159 | |
174 | |
|
|
175 | fname = rxvt_utf8towcs (f->name); |
|
|
176 | |
160 | #if ENABLE_COMBINING |
177 | # if ENABLE_COMBINING |
161 | if (IS_COMPOSE (ch)) |
178 | if (IS_COMPOSE (ch)) |
162 | { |
179 | { |
163 | len = rxvt_composite.expand (ch, 0); |
180 | len = rxvt_composite.expand (ch, 0); |
164 | alloc = chr = new wchar_t[len]; |
181 | alloc = chr = new wchar_t[len]; |
165 | rxvt_composite.expand (ch, chr); |
182 | rxvt_composite.expand (ch, chr); |
166 | } |
183 | } |
167 | else |
184 | else |
168 | #endif |
185 | # endif |
169 | { |
186 | { |
170 | ch2 = ch; |
187 | ch2 = ch; |
171 | |
188 | |
172 | alloc = 0; |
189 | alloc = 0; |
173 | chr = &ch2; |
190 | chr = &ch2; |
174 | len = 1; |
191 | len = 1; |
175 | } |
192 | } |
176 | |
193 | |
177 | int width = strlen (f->name); |
194 | char attr[80]; // plenty |
178 | |
195 | |
179 | scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); |
196 | sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", |
|
|
197 | (int)r, |
|
|
198 | fgcolor_of (r), bgcolor_of (r), |
|
|
199 | r & RS_Bold ? " bold" : "", |
|
|
200 | r & RS_Italic ? " italic" : "", |
|
|
201 | r & RS_Blink ? " blink" : "", |
|
|
202 | r & RS_RVid ? " rvid" : "", |
|
|
203 | r & RS_Uline ? " uline" : "", |
|
|
204 | r & RS_Careful ? " careful" : ""); |
|
|
205 | |
|
|
206 | int width = wcswidth (fname, wcslen (fname)); |
|
|
207 | |
|
|
208 | max_it (width, 8+5); // for char + hey |
|
|
209 | max_it (width, strlen (attr)); |
|
|
210 | |
|
|
211 | if (y >= 0) |
|
|
212 | { |
|
|
213 | y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; |
|
|
214 | x = 0; |
|
|
215 | } |
|
|
216 | |
|
|
217 | scr_overlay_new (x, y, width, len + 2); |
180 | |
218 | |
181 | r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); |
219 | r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); |
182 | |
220 | |
183 | for (int y = 0; y < len; y++) |
221 | for (int y = 0; y < len; y++) |
184 | { |
222 | { |
… | |
… | |
187 | ch = *chr++; |
225 | ch = *chr++; |
188 | |
226 | |
189 | sprintf (buf, "%8x", ch); |
227 | sprintf (buf, "%8x", ch); |
190 | scr_overlay_set (0, y, buf); |
228 | scr_overlay_set (0, y, buf); |
191 | scr_overlay_set (9, y, '='); |
229 | scr_overlay_set (9, y, '='); |
192 | #if !UNICODE3 |
230 | # if !UNICODE3 |
193 | if (ch >= 0x10000) |
231 | if (ch >= 0x10000) |
194 | ch = 0xfffd; |
232 | ch = 0xfffd; |
195 | #endif |
233 | # endif |
196 | scr_overlay_set (11, y, ch, r); |
234 | scr_overlay_set (11, y, ch, r); |
197 | scr_overlay_set (12, y, NOCHAR, r); |
235 | scr_overlay_set (12, y, NOCHAR, r); |
198 | } |
236 | } |
199 | |
237 | |
|
|
238 | scr_overlay_set (0, len , attr); |
200 | scr_overlay_set (0, len, f->name); |
239 | scr_overlay_set (0, len + 1, fname); |
201 | |
240 | |
|
|
241 | free (fname); |
|
|
242 | |
202 | #if ENABLE_COMBINING |
243 | # if ENABLE_COMBINING |
203 | if (alloc) |
244 | if (alloc) |
204 | delete [] alloc; |
245 | delete [] alloc; |
205 | #endif |
246 | # endif |
206 | } |
247 | } |
207 | #endif |
248 | #endif |
208 | |
249 | |
209 | void |
250 | void |
210 | rxvt_term::commit_iso14755 () |
251 | rxvt_term::commit_iso14755 () |
… | |
… | |
227 | mb[0] = ch[0]; |
268 | mb[0] = ch[0]; |
228 | len = 1; |
269 | len = 1; |
229 | } |
270 | } |
230 | |
271 | |
231 | if (len > 0) |
272 | if (len > 0) |
232 | tt_write ((unsigned char *)mb, len); |
273 | tt_write (mb, len); |
233 | else |
274 | else |
234 | scr_bell (); |
275 | scr_bell (); |
235 | } |
276 | } |
236 | |
277 | |
237 | iso14755buf = 0; |
278 | iso14755buf = 0; |
… | |
… | |
265 | KeySym keysym; |
306 | KeySym keysym; |
266 | #ifdef DEBUG_CMD |
307 | #ifdef DEBUG_CMD |
267 | static int debug_key = 1; /* accessible by a debugger only */ |
308 | static int debug_key = 1; /* accessible by a debugger only */ |
268 | #endif |
309 | #endif |
269 | int valid_keysym; |
310 | int valid_keysym; |
270 | unsigned char kbuf[KBUFSZ]; |
311 | char kbuf[KBUFSZ]; |
271 | |
312 | |
272 | /* |
313 | /* |
273 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
314 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
274 | * escape sequence to toggle the Keypad. |
315 | * escape sequence to toggle the Keypad. |
275 | * |
316 | * |
276 | * Always permit `shift' to override the current setting |
317 | * Always permit `shift' to override the current setting |
277 | */ |
318 | */ |
278 | shft = (ev.state & ShiftMask); |
319 | shft = ev.state & ShiftMask; |
279 | ctrl = (ev.state & ControlMask); |
320 | ctrl = ev.state & ControlMask; |
280 | meta = (ev.state & ModMetaMask); |
321 | meta = ev.state & ModMetaMask; |
281 | |
322 | |
282 | if (numlock_state || (ev.state & ModNumLockMask)) |
323 | if (numlock_state || (ev.state & ModNumLockMask)) |
283 | { |
324 | { |
284 | numlock_state = (ev.state & ModNumLockMask); |
325 | numlock_state = (ev.state & ModNumLockMask); |
285 | PrivMode ((!numlock_state), PrivMode_aplKP); |
326 | PrivMode ((!numlock_state), PrivMode_aplKP); |
… | |
… | |
293 | Status status_return; |
334 | Status status_return; |
294 | |
335 | |
295 | #if 0 |
336 | #if 0 |
296 | #ifdef X_HAVE_UTF8_STRING |
337 | #ifdef X_HAVE_UTF8_STRING |
297 | if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful |
338 | if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful |
298 | len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, |
339 | len = Xutf8LookupString (Input_Context, &ev, kbuf, |
299 | KBUFSZ, &keysym, &status_return); |
340 | KBUFSZ, &keysym, &status_return); |
300 | else |
341 | else |
301 | #endif |
342 | #endif |
302 | #endif |
343 | #endif |
303 | { |
344 | { |
… | |
… | |
305 | |
346 | |
306 | // the XOpenIM manpage lies about hardcoding the locale |
347 | // the XOpenIM manpage lies about hardcoding the locale |
307 | // at the point of XOpenIM, so temporarily switch locales |
348 | // at the point of XOpenIM, so temporarily switch locales |
308 | if (rs[Rs_imLocale]) |
349 | if (rs[Rs_imLocale]) |
309 | SET_LOCALE (rs[Rs_imLocale]); |
350 | SET_LOCALE (rs[Rs_imLocale]); |
|
|
351 | |
310 | // assume wchar_t == unicode or better |
352 | // assume wchar_t == unicode or better |
311 | len = XwcLookupString (Input_Context, &ev, wkbuf, |
353 | len = XwcLookupString (Input_Context, &ev, wkbuf, |
312 | KBUFSZ, &keysym, &status_return); |
354 | KBUFSZ, &keysym, &status_return); |
|
|
355 | |
313 | if (rs[Rs_imLocale]) |
356 | if (rs[Rs_imLocale]) |
314 | SET_LOCALE (locale); |
357 | SET_LOCALE (locale); |
315 | |
358 | |
316 | if (status_return == XLookupChars |
359 | if (status_return == XLookupChars |
317 | || status_return == XLookupBoth) |
360 | || status_return == XLookupBoth) |
… | |
… | |
338 | || status_return == XLookupBoth; |
381 | || status_return == XLookupBoth; |
339 | } |
382 | } |
340 | else |
383 | else |
341 | #endif |
384 | #endif |
342 | { |
385 | { |
343 | len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); |
386 | len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); |
344 | valid_keysym = keysym != NoSymbol; |
387 | valid_keysym = keysym != NoSymbol; |
345 | } |
388 | } |
346 | |
389 | |
347 | if (valid_keysym) |
390 | if (valid_keysym) |
348 | { |
391 | { |
|
|
392 | #ifdef KEYSYM_RESOURCE |
|
|
393 | if (keyboard->dispatch (this, keysym, ev.state)) |
|
|
394 | return; |
|
|
395 | #endif |
|
|
396 | |
349 | if (TermWin.saveLines) |
397 | if (saveLines) |
350 | { |
398 | { |
351 | #ifdef UNSHIFTED_SCROLLKEYS |
399 | #ifdef UNSHIFTED_SCROLLKEYS |
352 | if (!ctrl && !meta) |
400 | if (!ctrl && !meta) |
353 | #else |
401 | #else |
354 | if (IS_SCROLL_MOD) |
402 | if (IS_SCROLL_MOD) |
355 | #endif |
403 | #endif |
356 | { |
404 | { |
357 | int lnsppg; |
405 | int lnsppg; |
358 | |
406 | |
359 | #ifdef PAGING_CONTEXT_LINES |
407 | #ifdef PAGING_CONTEXT_LINES |
360 | lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; |
408 | lnsppg = nrow - PAGING_CONTEXT_LINES; |
361 | #else |
409 | #else |
362 | lnsppg = TermWin.nrow * 4 / 5; |
410 | lnsppg = nrow * 4 / 5; |
363 | #endif |
411 | #endif |
364 | if (keysym == XK_Prior) |
412 | if (keysym == XK_Prior) |
365 | { |
413 | { |
366 | scr_page (UP, lnsppg); |
414 | scr_page (UP, lnsppg); |
367 | return; |
415 | return; |
… | |
… | |
395 | scr_move_to (0, 1); |
443 | scr_move_to (0, 1); |
396 | return; |
444 | return; |
397 | } |
445 | } |
398 | else if (keysym == XK_End) |
446 | else if (keysym == XK_End) |
399 | { |
447 | { |
400 | scr_move_to (1, 0); |
448 | scr_move_to (1, 1); |
401 | return; |
449 | return; |
402 | } |
450 | } |
403 | } |
451 | } |
404 | #endif |
452 | #endif |
405 | } |
453 | } |
… | |
… | |
487 | } |
535 | } |
488 | #endif |
536 | #endif |
489 | |
537 | |
490 | if (keysym >= 0xFF00 && keysym <= 0xFFFF) |
538 | if (keysym >= 0xFF00 && keysym <= 0xFFFF) |
491 | { |
539 | { |
492 | #ifdef KEYSYM_RESOURCE |
|
|
493 | if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) |
|
|
494 | { |
|
|
495 | unsigned int l; |
|
|
496 | const unsigned char *kbuf0; |
|
|
497 | |
|
|
498 | kbuf0 = (Keysym_map[keysym & 0xFF]); |
|
|
499 | l = (unsigned int)*kbuf0++; |
|
|
500 | |
|
|
501 | /* escape prefix */ |
|
|
502 | if (meta |
|
|
503 | # ifdef META8_OPTION |
|
|
504 | && meta_char == C0_ESC |
|
|
505 | # endif |
|
|
506 | ) |
|
|
507 | { |
|
|
508 | const unsigned char ch = C0_ESC; |
|
|
509 | tt_write (&ch, 1); |
|
|
510 | } |
|
|
511 | |
|
|
512 | tt_write (kbuf0, l); |
|
|
513 | return; |
|
|
514 | } |
|
|
515 | else |
|
|
516 | #endif |
|
|
517 | { |
540 | { |
518 | newlen = 1; |
541 | newlen = 1; |
519 | switch (keysym) |
542 | switch (keysym) |
520 | { |
543 | { |
521 | #ifndef NO_BACKSPACE_KEY |
544 | #ifndef NO_BACKSPACE_KEY |
… | |
… | |
529 | else |
552 | else |
530 | strcpy (kbuf, key_backspace); |
553 | strcpy (kbuf, key_backspace); |
531 | break; |
554 | break; |
532 | #endif |
555 | #endif |
533 | #ifndef NO_DELETE_KEY |
556 | #ifndef NO_DELETE_KEY |
|
|
557 | # ifdef XK_KP_Prior |
|
|
558 | case XK_KP_Delete: |
|
|
559 | /* allow shift to override */ |
|
|
560 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
|
|
561 | { |
|
|
562 | strcpy (kbuf, "\033On"); |
|
|
563 | break; |
|
|
564 | } |
|
|
565 | /* FALLTHROUGH */ |
|
|
566 | # endif |
534 | case XK_Delete: |
567 | case XK_Delete: |
535 | strcpy (kbuf, key_delete); |
568 | strcpy (kbuf, key_delete); |
536 | break; |
569 | break; |
537 | #endif |
570 | #endif |
538 | case XK_Tab: |
571 | case XK_Tab: |
… | |
… | |
641 | #ifdef XK_KP_Begin |
674 | #ifdef XK_KP_Begin |
642 | case XK_KP_Begin: |
675 | case XK_KP_Begin: |
643 | strcpy (kbuf, "\033Ou"); |
676 | strcpy (kbuf, "\033Ou"); |
644 | break; |
677 | break; |
645 | |
678 | |
646 | case XK_KP_Insert: |
|
|
647 | strcpy (kbuf, "\033Op"); |
|
|
648 | break; |
|
|
649 | |
|
|
650 | case XK_KP_Delete: |
|
|
651 | strcpy (kbuf, "\033On"); |
|
|
652 | break; |
|
|
653 | #endif |
679 | #endif |
654 | case XK_KP_F1: /* "\033OP" */ |
680 | case XK_KP_F1: /* "\033OP" */ |
655 | case XK_KP_F2: /* "\033OQ" */ |
681 | case XK_KP_F2: /* "\033OQ" */ |
656 | case XK_KP_F3: /* "\033OR" */ |
682 | case XK_KP_F3: /* "\033OR" */ |
657 | case XK_KP_F4: /* "\033OS" */ |
683 | case XK_KP_F4: /* "\033OS" */ |
… | |
… | |
689 | break; |
715 | break; |
690 | |
716 | |
691 | case XK_Find: |
717 | case XK_Find: |
692 | strcpy (kbuf, "\033[1~"); |
718 | strcpy (kbuf, "\033[1~"); |
693 | break; |
719 | break; |
|
|
720 | |
|
|
721 | #ifdef XK_KP_End |
|
|
722 | case XK_KP_Insert: |
|
|
723 | /* allow shift to override */ |
|
|
724 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
|
|
725 | { |
|
|
726 | strcpy (kbuf, "\033Op"); |
|
|
727 | break; |
|
|
728 | } |
|
|
729 | /* FALLTHROUGH */ |
|
|
730 | #endif |
694 | case XK_Insert: |
731 | case XK_Insert: |
695 | strcpy (kbuf, "\033[2~"); |
732 | strcpy (kbuf, "\033[2~"); |
696 | break; |
733 | break; |
697 | #ifdef DXK_Remove /* support for DEC remove like key */ |
734 | #ifdef DXK_Remove /* support for DEC remove like key */ |
698 | case DXK_Remove: |
735 | case DXK_Remove: |
… | |
… | |
788 | #undef FKEY |
825 | #undef FKEY |
789 | default: |
826 | default: |
790 | newlen = 0; |
827 | newlen = 0; |
791 | break; |
828 | break; |
792 | } |
829 | } |
|
|
830 | |
793 | if (newlen) |
831 | if (newlen) |
794 | len = strlen (kbuf); |
832 | len = strlen (kbuf); |
795 | } |
833 | } |
796 | |
834 | |
797 | /* |
835 | /* |
… | |
… | |
806 | else if (ctrl && keysym == XK_minus) |
844 | else if (ctrl && keysym == XK_minus) |
807 | { |
845 | { |
808 | len = 1; |
846 | len = 1; |
809 | kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ |
847 | kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ |
810 | } |
848 | } |
|
|
849 | else if (keysym == XK_ISO_Left_Tab) |
|
|
850 | { |
|
|
851 | strcpy (kbuf, "\033[Z"); |
|
|
852 | len = 3; |
|
|
853 | } |
811 | else |
854 | else |
812 | { |
855 | { |
813 | #ifdef META8_OPTION |
856 | #ifdef META8_OPTION |
814 | /* set 8-bit on */ |
857 | /* set 8-bit on */ |
815 | if (meta && (meta_char == 0x80)) |
858 | if (meta && (meta_char == 0x80)) |
816 | { |
859 | { |
817 | unsigned char *ch; |
860 | char *ch; |
818 | |
861 | |
819 | for (ch = kbuf; ch < kbuf + len; ch++) |
862 | for (ch = kbuf; ch < kbuf + len; ch++) |
820 | *ch |= 0x80; |
863 | *ch |= 0x80; |
821 | |
864 | |
822 | meta = 0; |
865 | meta = 0; |
… | |
… | |
824 | #endif |
867 | #endif |
825 | /* nil */ ; |
868 | /* nil */ ; |
826 | } |
869 | } |
827 | } |
870 | } |
828 | |
871 | |
|
|
872 | if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) |
|
|
873 | return; |
|
|
874 | |
829 | if (len <= 0) |
875 | if (len <= 0) |
830 | return; /* not mapped */ |
876 | return; /* not mapped */ |
831 | |
877 | |
832 | if (options & Opt_scrollTtyKeypress) |
878 | if (OPTION (Opt_scrollTtyKeypress)) |
833 | if (TermWin.view_start) |
879 | if (view_start) |
834 | { |
880 | { |
835 | TermWin.view_start = 0; |
881 | view_start = 0; |
836 | want_refresh = 1; |
882 | want_refresh = 1; |
837 | } |
883 | } |
838 | |
884 | |
839 | /* |
885 | /* |
840 | * these modifications only affect the static keybuffer |
886 | * these modifications only affect the static keybuffer |
… | |
… | |
855 | #ifdef META8_OPTION |
901 | #ifdef META8_OPTION |
856 | && meta_char == C0_ESC |
902 | && meta_char == C0_ESC |
857 | #endif |
903 | #endif |
858 | ) |
904 | ) |
859 | { |
905 | { |
860 | const unsigned char ch = C0_ESC; |
906 | const char ch = C0_ESC; |
861 | tt_write (&ch, 1); |
907 | tt_write (&ch, 1); |
862 | } |
908 | } |
863 | |
909 | |
864 | #if defined(DEBUG_CMD) |
910 | #if defined(DEBUG_CMD) |
865 | /* Display keyboard buffer contents */ |
911 | /* Display keyboard buffer contents */ |
… | |
… | |
873 | #endif /* DEBUG_CMD */ |
919 | #endif /* DEBUG_CMD */ |
874 | tt_write (kbuf, (unsigned int)len); |
920 | tt_write (kbuf, (unsigned int)len); |
875 | } |
921 | } |
876 | /*}}} */ |
922 | /*}}} */ |
877 | |
923 | |
878 | #if (MENUBAR_MAX) |
924 | #if defined (KEYSYM_RESOURCE) |
879 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
|
|
880 | /* attempt to `write' count to the input buffer */ |
|
|
881 | unsigned int |
925 | unsigned int |
882 | rxvt_term::cmd_write (const unsigned char *str, unsigned int count) |
926 | rxvt_term::cmd_write (const char *str, unsigned int count) |
883 | { |
927 | { |
884 | unsigned int n, s; |
928 | unsigned int n, s; |
885 | |
929 | |
886 | n = cmdbuf_ptr - cmdbuf_base; |
930 | n = cmdbuf_ptr - cmdbuf_base; |
887 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
931 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
… | |
… | |
906 | |
950 | |
907 | cmd_parse (); |
951 | cmd_parse (); |
908 | |
952 | |
909 | return 0; |
953 | return 0; |
910 | } |
954 | } |
911 | #endif /* MENUBAR_MAX */ |
955 | #endif |
912 | |
956 | |
913 | void |
957 | void |
914 | rxvt_term::flush () |
958 | rxvt_term::flush () |
915 | { |
959 | { |
916 | flush_ev.stop (); |
960 | flush_ev.stop (); |
… | |
… | |
924 | } |
968 | } |
925 | #endif |
969 | #endif |
926 | |
970 | |
927 | if (want_refresh) |
971 | if (want_refresh) |
928 | { |
972 | { |
|
|
973 | if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) |
|
|
974 | { |
|
|
975 | int row = view_start; |
|
|
976 | int end_row = row + nrow; |
|
|
977 | |
|
|
978 | while (row > top_row && ROW (row - 1).is_longer ()) |
|
|
979 | --row; |
|
|
980 | |
|
|
981 | do |
|
|
982 | { |
|
|
983 | int start_row = row; |
|
|
984 | line_t *l; |
|
|
985 | |
|
|
986 | do |
|
|
987 | { |
|
|
988 | l = &ROW (row++); |
|
|
989 | |
|
|
990 | if (!(l->f & LINE_FILTERED)) |
|
|
991 | { |
|
|
992 | // line not filtered, mark it as filtered |
|
|
993 | l->f |= LINE_FILTERED; |
|
|
994 | while (l->is_longer ()) |
|
|
995 | { |
|
|
996 | l = &ROW (row++); |
|
|
997 | l->f |= LINE_FILTERED; |
|
|
998 | } |
|
|
999 | |
|
|
1000 | // and filter it |
|
|
1001 | HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); |
|
|
1002 | |
|
|
1003 | break; |
|
|
1004 | } |
|
|
1005 | } |
|
|
1006 | while (l->is_longer () && row < end_row); |
|
|
1007 | } |
|
|
1008 | while (row < end_row); |
|
|
1009 | } |
|
|
1010 | |
929 | scr_refresh (refresh_type); |
1011 | scr_refresh (); |
930 | scrollbar_show (1); |
1012 | scrollbar_show (1); |
931 | #ifdef USE_XIM |
1013 | #ifdef USE_XIM |
932 | IMSendSpot (); |
1014 | IMSendSpot (); |
933 | #endif |
1015 | #endif |
934 | } |
1016 | } |
… | |
… | |
937 | } |
1019 | } |
938 | |
1020 | |
939 | void |
1021 | void |
940 | rxvt_term::check_cb (check_watcher &w) |
1022 | rxvt_term::check_cb (check_watcher &w) |
941 | { |
1023 | { |
942 | SET_R (this); |
1024 | make_current (); |
943 | SET_LOCALE (locale); |
|
|
944 | |
1025 | |
945 | display->flush (); |
1026 | display->flush (); |
946 | |
1027 | |
947 | if (want_refresh && !flush_ev.active) |
1028 | if (want_refresh && !flush_ev.active) |
948 | flush_ev.start (NOW + 0.01); |
1029 | flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally |
949 | } |
1030 | } |
950 | |
1031 | |
951 | void |
1032 | void |
952 | rxvt_term::flush_cb (time_watcher &w) |
1033 | rxvt_term::flush_cb (time_watcher &w) |
953 | { |
1034 | { |
954 | SET_R (this); |
1035 | make_current (); |
955 | SET_LOCALE (locale); |
|
|
956 | |
1036 | |
957 | refresh_limit = 1; |
1037 | refresh_limit = 1; |
958 | refresh_count = 0; |
1038 | refresh_count = 0; |
959 | flush (); |
1039 | flush (); |
960 | } |
1040 | } |
… | |
… | |
988 | rxvt_term::cont_scroll_cb (time_watcher &w) |
1068 | rxvt_term::cont_scroll_cb (time_watcher &w) |
989 | { |
1069 | { |
990 | if ((scrollbar_isUp() || scrollbar_isDn()) && |
1070 | if ((scrollbar_isUp() || scrollbar_isDn()) && |
991 | scr_page (scrollbar_isUp() ? UP : DN, 1)) |
1071 | scr_page (scrollbar_isUp() ? UP : DN, 1)) |
992 | { |
1072 | { |
993 | refresh_type |= SMOOTH_REFRESH; |
|
|
994 | want_refresh = 1; |
1073 | want_refresh = 1; |
995 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1074 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
996 | } |
1075 | } |
997 | } |
1076 | } |
998 | #endif |
1077 | #endif |
… | |
… | |
1002 | rxvt_term::sel_scroll_cb (time_watcher &w) |
1081 | rxvt_term::sel_scroll_cb (time_watcher &w) |
1003 | { |
1082 | { |
1004 | if (scr_page (scroll_selection_dir, scroll_selection_lines)) |
1083 | if (scr_page (scroll_selection_dir, scroll_selection_lines)) |
1005 | { |
1084 | { |
1006 | selection_extend (selection_save_x, selection_save_y, selection_save_state); |
1085 | selection_extend (selection_save_x, selection_save_y, selection_save_state); |
1007 | refresh_type |= SMOOTH_REFRESH; |
|
|
1008 | want_refresh = 1; |
1086 | want_refresh = 1; |
1009 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1087 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1010 | } |
1088 | } |
1011 | } |
1089 | } |
1012 | #endif |
1090 | #endif |
… | |
… | |
1017 | { |
1095 | { |
1018 | if (mouse_slip_wheel_speed == 0 |
1096 | if (mouse_slip_wheel_speed == 0 |
1019 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1097 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1020 | : scr_page (UP, mouse_slip_wheel_speed)) |
1098 | : scr_page (UP, mouse_slip_wheel_speed)) |
1021 | { |
1099 | { |
1022 | refresh_type |= SMOOTH_REFRESH; |
1100 | if (view_start == top_row || view_start == 0) |
|
|
1101 | mouse_slip_wheel_speed = 0; |
|
|
1102 | |
1023 | want_refresh = 1; |
1103 | want_refresh = 1; |
1024 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1104 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1025 | } |
1105 | } |
1026 | } |
1106 | } |
1027 | #endif |
1107 | #endif |
1028 | |
1108 | |
|
|
1109 | #if HAVE_SCHED_YIELD |
|
|
1110 | static struct event_handler |
|
|
1111 | { |
|
|
1112 | check_watcher cw_yield; |
|
|
1113 | |
|
|
1114 | void yield (check_watcher &w) |
|
|
1115 | { |
|
|
1116 | sched_yield (); |
|
|
1117 | w.stop (); |
|
|
1118 | } |
|
|
1119 | |
|
|
1120 | event_handler () |
|
|
1121 | : cw_yield (this, &event_handler::yield) |
|
|
1122 | { |
|
|
1123 | } |
|
|
1124 | } event_handler; |
|
|
1125 | #endif |
|
|
1126 | |
1029 | bool |
1127 | bool |
1030 | rxvt_term::pty_fill () |
1128 | rxvt_term::pty_fill () |
1031 | { |
1129 | { |
1032 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1130 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1033 | |
1131 | |
1034 | if (CBUFSIZ == n) |
1132 | if (CBUFSIZ == n) |
1035 | { |
1133 | { |
1036 | rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); |
1134 | rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); |
1037 | n = 0; |
1135 | n = 0; |
1038 | } |
1136 | } |
1039 | |
1137 | |
1040 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1138 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1041 | cmdbuf_ptr = cmdbuf_base; |
1139 | cmdbuf_ptr = cmdbuf_base; |
1042 | cmdbuf_endp = cmdbuf_ptr + n; |
1140 | cmdbuf_endp = cmdbuf_ptr + n; |
1043 | |
1141 | |
1044 | n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
1142 | ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); |
1045 | |
1143 | |
1046 | if (n > 0) |
1144 | if (r > 0) |
1047 | { |
1145 | { |
1048 | cmdbuf_endp += n; |
1146 | cmdbuf_endp += r; |
1049 | return true; |
1147 | return true; |
1050 | } |
1148 | } |
1051 | else if (n < 0 && errno != EAGAIN) |
1149 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
|
|
1150 | { |
|
|
1151 | #if HAVE_SCHED_YIELD |
|
|
1152 | if (display->is_local) |
|
|
1153 | event_handler.cw_yield.start (); |
|
|
1154 | #endif |
|
|
1155 | } |
|
|
1156 | else |
|
|
1157 | { |
|
|
1158 | pty_ev.stop (); |
|
|
1159 | |
|
|
1160 | if (!OPTION (Opt_hold)) |
1052 | destroy (); |
1161 | destroy (); |
|
|
1162 | } |
1053 | |
1163 | |
1054 | return false; |
1164 | return false; |
1055 | } |
1165 | } |
1056 | |
1166 | |
1057 | void |
1167 | void |
1058 | rxvt_term::pty_cb (io_watcher &w, short revents) |
1168 | rxvt_term::pty_cb (io_watcher &w, short revents) |
1059 | { |
1169 | { |
1060 | SET_R (this); |
1170 | make_current (); |
1061 | SET_LOCALE (locale); |
|
|
1062 | |
1171 | |
1063 | if (revents & EVENT_WRITE) |
|
|
1064 | tt_write (0, 0); |
|
|
1065 | else if (revents & EVENT_READ) |
1172 | if (revents & EVENT_READ) |
1066 | // loop, but don't allow a single term to monopolize us |
1173 | // loop, but don't allow a single term to monopolize us |
1067 | while (pty_fill ()) |
1174 | while (pty_fill ()) |
1068 | if (cmd_parse ()) |
1175 | if (cmd_parse ()) |
1069 | break; |
1176 | break; |
|
|
1177 | |
|
|
1178 | if (revents & EVENT_WRITE) |
|
|
1179 | pty_write (); |
1070 | } |
1180 | } |
1071 | |
1181 | |
1072 | void |
1182 | void |
1073 | rxvt_term::pointer_unblank () |
1183 | rxvt_term::pointer_unblank () |
1074 | { |
1184 | { |
1075 | XDefineCursor (display->display, TermWin.vt, TermWin_cursor); |
1185 | XDefineCursor (display->display, vt, TermWin_cursor); |
1076 | recolour_cursor (); |
1186 | recolour_cursor (); |
1077 | |
1187 | |
1078 | #ifdef POINTER_BLANK |
1188 | #ifdef POINTER_BLANK |
1079 | hidden_pointer = 0; |
1189 | hidden_pointer = 0; |
1080 | |
1190 | |
1081 | if (options & Opt_pointerBlank) |
1191 | if (OPTION (Opt_pointerBlank)) |
1082 | pointer_ev.start (NOW + pointerBlankDelay); |
1192 | pointer_ev.start (NOW + pointerBlankDelay); |
1083 | #endif |
1193 | #endif |
1084 | } |
1194 | } |
1085 | |
1195 | |
1086 | #ifdef POINTER_BLANK |
1196 | #ifdef POINTER_BLANK |
1087 | void |
1197 | void |
1088 | rxvt_term::pointer_blank () |
1198 | rxvt_term::pointer_blank () |
1089 | { |
1199 | { |
1090 | if (! (options & Opt_pointerBlank)) |
1200 | if (!OPTION (Opt_pointerBlank)) |
1091 | return; |
1201 | return; |
1092 | |
1202 | |
1093 | XDefineCursor (display->display, TermWin.vt, blank_cursor); |
1203 | XDefineCursor (display->display, vt, display->blank_cursor); |
1094 | XFlush (display->display); |
1204 | XFlush (display->display); |
1095 | |
1205 | |
1096 | hidden_pointer = 1; |
1206 | hidden_pointer = 1; |
1097 | } |
1207 | } |
1098 | |
1208 | |
1099 | void |
1209 | void |
1100 | rxvt_term::pointer_cb (time_watcher &w) |
1210 | rxvt_term::pointer_cb (time_watcher &w) |
1101 | { |
1211 | { |
1102 | SET_R (this); |
1212 | make_current (); |
1103 | SET_LOCALE (locale); |
|
|
1104 | |
1213 | |
1105 | pointer_blank (); |
1214 | pointer_blank (); |
1106 | } |
1215 | } |
1107 | #endif |
1216 | #endif |
1108 | |
1217 | |
… | |
… | |
1187 | |
1296 | |
1188 | /*{{{ process an X event */ |
1297 | /*{{{ process an X event */ |
1189 | void |
1298 | void |
1190 | rxvt_term::x_cb (XEvent &ev) |
1299 | rxvt_term::x_cb (XEvent &ev) |
1191 | { |
1300 | { |
1192 | SET_R (this); |
1301 | make_current (); |
1193 | SET_LOCALE (locale); |
|
|
1194 | |
1302 | |
1195 | #if defined(CURSOR_BLINK) |
1303 | dDisp; |
1196 | if ((options & Opt_cursorBlink) && ev.type == KeyPress) |
|
|
1197 | { |
|
|
1198 | if (hidden_cursor) |
|
|
1199 | { |
|
|
1200 | hidden_cursor = 0; |
|
|
1201 | want_refresh = 1; |
|
|
1202 | } |
|
|
1203 | |
1304 | |
1204 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1305 | if (ev.xany.window == vt |
1205 | } |
1306 | && SHOULD_INVOKE (HOOK_X_EVENT) |
1206 | #endif |
1307 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
|
|
1308 | return; |
1207 | |
1309 | |
1208 | #if defined(POINTER_BLANK) |
1310 | // for XQueryPointer |
1209 | if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1210 | { |
|
|
1211 | if (ev.type == MotionNotify |
|
|
1212 | || ev.type == ButtonPress |
|
|
1213 | || ev.type == ButtonRelease) |
|
|
1214 | if (hidden_pointer) |
|
|
1215 | pointer_unblank (); |
|
|
1216 | |
|
|
1217 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1218 | pointer_blank (); |
|
|
1219 | } |
|
|
1220 | #endif |
|
|
1221 | |
|
|
1222 | Window unused_root, unused_child; |
1311 | Window unused_root, unused_child; |
1223 | int unused_root_x, unused_root_y; |
1312 | int unused_root_x, unused_root_y; |
1224 | unsigned int unused_mask; |
1313 | unsigned int unused_mask; |
1225 | |
1314 | |
1226 | switch (ev.type) |
1315 | switch (ev.type) |
… | |
… | |
1233 | |
1322 | |
1234 | break; |
1323 | break; |
1235 | |
1324 | |
1236 | case KeyRelease: |
1325 | case KeyRelease: |
1237 | { |
1326 | { |
1238 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 |
1327 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL |
1239 | KeySym ks; |
1328 | KeySym keysym; |
1240 | |
1329 | |
1241 | ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1330 | keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1242 | #endif |
1331 | #endif |
1243 | |
1332 | |
1244 | #if ENABLE_FRILLS || ISO_14755 |
1333 | #if ENABLE_FRILLS || ISO_14755 |
1245 | // ISO 14755 support |
1334 | // ISO 14755 support |
1246 | if (iso14755buf) |
1335 | if (iso14755buf) |
… | |
… | |
1251 | # endif |
1340 | # endif |
1252 | # if ISO_14755 |
1341 | # if ISO_14755 |
1253 | // iso14755 part 5.2 handling: release time |
1342 | // iso14755 part 5.2 handling: release time |
1254 | // first: controls |
1343 | // first: controls |
1255 | if ((ev.xkey.state & ControlMask) |
1344 | if ((ev.xkey.state & ControlMask) |
1256 | && ((ks >= 0x40 && ks <= 0x5f) |
1345 | && ((keysym >= 0x40 && keysym <= 0x5f) |
1257 | || (ks >= 0x61 && ks <= 0x7f))) |
1346 | || (keysym >= 0x61 && keysym <= 0x7f))) |
1258 | { |
1347 | { |
1259 | iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); |
1348 | iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f); |
1260 | commit_iso14755 (); |
1349 | commit_iso14755 (); |
1261 | return; // case-break; |
1350 | goto skip_switch; |
1262 | } |
1351 | } |
1263 | |
1352 | |
1264 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1353 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1265 | if (i[0] == ks) |
1354 | if (i[0] == keysym) |
1266 | { |
1355 | { |
1267 | iso14755buf = ISO_14755_51 | i[1]; |
1356 | iso14755buf = ISO_14755_51 | i[1]; |
1268 | commit_iso14755 (); |
1357 | commit_iso14755 (); |
1269 | return; // case-break; |
1358 | goto skip_switch; |
1270 | } |
1359 | } |
1271 | |
1360 | |
1272 | scr_bell (); |
1361 | scr_bell (); |
1273 | # endif |
1362 | # endif |
1274 | iso14755buf = 0; |
1363 | iso14755buf = 0; |
… | |
… | |
1293 | else |
1382 | else |
1294 | iso14755buf = 0; |
1383 | iso14755buf = 0; |
1295 | } |
1384 | } |
1296 | #endif |
1385 | #endif |
1297 | |
1386 | |
|
|
1387 | if (ev.xany.window == vt |
|
|
1388 | && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END))) |
|
|
1389 | break; |
|
|
1390 | |
1298 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1391 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1299 | if (!(ev.xkey.state & ControlMask)) |
1392 | if (!(ev.xkey.state & ControlMask)) |
1300 | slip_wheel_ev.stop (); |
1393 | slip_wheel_ev.stop (); |
1301 | else if (ks == XK_Control_L || ks == XK_Control_R) |
1394 | else if (keysym == XK_Control_L || keysym == XK_Control_R) |
1302 | mouse_slip_wheel_speed = 0; |
1395 | mouse_slip_wheel_speed = 0; |
1303 | #endif |
1396 | #endif |
1304 | break; |
1397 | break; |
1305 | } |
1398 | } |
1306 | |
1399 | |
… | |
… | |
1312 | button_release (ev.xbutton); |
1405 | button_release (ev.xbutton); |
1313 | break; |
1406 | break; |
1314 | |
1407 | |
1315 | case ClientMessage: |
1408 | case ClientMessage: |
1316 | if (ev.xclient.format == 32 |
1409 | if (ev.xclient.format == 32 |
|
|
1410 | && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) |
|
|
1411 | { |
1317 | && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) |
1412 | if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) |
1318 | destroy (); |
1413 | destroy (); |
|
|
1414 | #if ENABLE_EWMH |
|
|
1415 | else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) |
|
|
1416 | XSendEvent (disp, ev.xclient.window = display->root, |
|
|
1417 | False, SubstructureRedirectMask | SubstructureNotifyMask, |
|
|
1418 | &ev); |
|
|
1419 | #endif |
|
|
1420 | } |
|
|
1421 | #if ENABLE_XEMBED |
|
|
1422 | else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED]) |
|
|
1423 | { |
|
|
1424 | if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) |
|
|
1425 | focus_in (); |
|
|
1426 | else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) |
|
|
1427 | focus_out (); |
|
|
1428 | } |
|
|
1429 | #endif |
1319 | #ifdef OFFIX_DND |
1430 | #ifdef OFFIX_DND |
1320 | /* OffiX Dnd (drag 'n' drop) protocol */ |
1431 | /* OffiX Dnd (drag 'n' drop) protocol */ |
1321 | else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] |
1432 | else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] |
1322 | && (ev.xclient.data.l[0] == DndFile |
1433 | && (ev.xclient.data.l[0] == DndFile |
1323 | || ev.xclient.data.l[0] == DndDir |
1434 | || ev.xclient.data.l[0] == DndDir |
1324 | || ev.xclient.data.l[0] == DndLink)) |
1435 | || ev.xclient.data.l[0] == DndLink)) |
1325 | { |
1436 | { |
1326 | /* Get Dnd data */ |
1437 | /* Get Dnd data */ |
1327 | Atom ActualType; |
1438 | Atom ActualType; |
1328 | int ActualFormat; |
1439 | int ActualFormat; |
1329 | unsigned char *data; |
1440 | unsigned char *data; |
1330 | unsigned long Size, RemainingBytes; |
1441 | unsigned long Size, RemainingBytes; |
1331 | |
1442 | |
1332 | XGetWindowProperty (display->display, display->root, |
1443 | XGetWindowProperty (disp, display->root, |
1333 | xa[XA_DNDSELECTION], |
1444 | xa[XA_DNDSELECTION], |
1334 | 0L, 1000000L, |
1445 | 0L, 1000000L, |
1335 | False, AnyPropertyType, |
1446 | False, AnyPropertyType, |
1336 | &ActualType, &ActualFormat, |
1447 | &ActualType, &ActualFormat, |
1337 | &Size, &RemainingBytes, |
1448 | &Size, &RemainingBytes, |
1338 | &data); |
1449 | &data); |
1339 | set_string_property (XA_CUT_BUFFER0, data); |
1450 | set_string_property (XA_CUT_BUFFER0, data); |
1340 | XFree (data); |
1451 | XFree (data); |
1341 | selection_paste (display->root, XA_CUT_BUFFER0, True); |
1452 | selection_paste (display->root, XA_CUT_BUFFER0, true); |
1342 | XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); |
1453 | XSetInputFocus (disp, display->root, RevertToNone, CurrentTime); |
1343 | } |
1454 | } |
1344 | #endif /* OFFIX_DND */ |
1455 | #endif /* OFFIX_DND */ |
1345 | break; |
1456 | break; |
1346 | |
1457 | |
1347 | case MappingNotify: |
1458 | case MappingNotify: |
… | |
… | |
1372 | break; |
1483 | break; |
1373 | } |
1484 | } |
1374 | break; |
1485 | break; |
1375 | |
1486 | |
1376 | case FocusIn: |
1487 | case FocusIn: |
1377 | if (!TermWin.focus) |
1488 | focus_in (); |
|
|
1489 | break; |
|
|
1490 | |
|
|
1491 | case FocusOut: |
|
|
1492 | focus_out (); |
|
|
1493 | break; |
|
|
1494 | |
|
|
1495 | case ConfigureNotify: |
|
|
1496 | if (ev.xconfigure.window == parent[0]) |
1378 | { |
1497 | { |
1379 | TermWin.focus = 1; |
|
|
1380 | want_refresh = 1; |
|
|
1381 | #ifdef USE_XIM |
|
|
1382 | if (Input_Context != NULL) |
|
|
1383 | { |
|
|
1384 | IMSetStatusPosition (); |
|
|
1385 | XSetICFocus (Input_Context); |
|
|
1386 | } |
|
|
1387 | #endif |
|
|
1388 | #ifdef CURSOR_BLINK |
|
|
1389 | if (options & Opt_cursorBlink) |
|
|
1390 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1391 | #endif |
|
|
1392 | #ifdef OFF_FOCUS_FADING |
|
|
1393 | if (rs[Rs_fade]) |
|
|
1394 | { |
|
|
1395 | pix_colors = pix_colors_focused; |
|
|
1396 | scr_recolour (); |
|
|
1397 | } |
|
|
1398 | #endif |
|
|
1399 | |
|
|
1400 | } |
|
|
1401 | break; |
|
|
1402 | |
|
|
1403 | case FocusOut: |
|
|
1404 | if (TermWin.focus) |
|
|
1405 | { |
|
|
1406 | TermWin.focus = 0; |
|
|
1407 | want_refresh = 1; |
|
|
1408 | |
|
|
1409 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1410 | iso14755buf = 0; |
|
|
1411 | #endif |
|
|
1412 | #if ENABLE_OVERLAY |
|
|
1413 | scr_overlay_off (); |
|
|
1414 | #endif |
|
|
1415 | #ifdef USE_XIM |
|
|
1416 | if (Input_Context != NULL) |
|
|
1417 | XUnsetICFocus (Input_Context); |
|
|
1418 | #endif |
|
|
1419 | #ifdef CURSOR_BLINK |
|
|
1420 | if (options & Opt_cursorBlink) |
|
|
1421 | cursor_blink_ev.stop (); |
|
|
1422 | hidden_cursor = 0; |
|
|
1423 | #endif |
|
|
1424 | #ifdef OFF_FOCUS_FADING |
|
|
1425 | if (rs[Rs_fade]) |
|
|
1426 | { |
|
|
1427 | pix_colors = pix_colors_unfocused; |
|
|
1428 | scr_recolour (); |
|
|
1429 | } |
|
|
1430 | #endif |
|
|
1431 | } |
|
|
1432 | break; |
|
|
1433 | |
|
|
1434 | case ConfigureNotify: |
|
|
1435 | if (ev.xconfigure.window == TermWin.parent[0]) |
|
|
1436 | { |
|
|
1437 | int height, width; |
|
|
1438 | |
|
|
1439 | do |
|
|
1440 | { /* Wrap lots of configures into one */ |
|
|
1441 | width = ev.xconfigure.width; |
|
|
1442 | height = ev.xconfigure.height; |
|
|
1443 | D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); |
|
|
1444 | } |
|
|
1445 | while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); |
1498 | while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) |
|
|
1499 | ; |
1446 | |
1500 | |
1447 | if (szHint.width != width || szHint.height != height) |
1501 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1448 | { |
1502 | { |
1449 | seen_resize = 1; |
1503 | seen_resize = 1; |
1450 | resize_all_windows (width, height, 1); |
1504 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1451 | } |
1505 | } |
1452 | |
1506 | |
|
|
1507 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
|
|
1508 | |
1453 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1509 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1454 | if (options & Opt_transparent) |
1510 | if (OPTION (Opt_transparent)) |
1455 | check_our_parents (); |
1511 | check_our_parents (); |
1456 | #endif |
1512 | #endif |
1457 | } |
1513 | } |
1458 | break; |
1514 | break; |
1459 | |
1515 | |
… | |
… | |
1468 | selection_clear (); |
1524 | selection_clear (); |
1469 | break; |
1525 | break; |
1470 | |
1526 | |
1471 | case SelectionNotify: |
1527 | case SelectionNotify: |
1472 | if (selection_wait == Sel_normal) |
1528 | if (selection_wait == Sel_normal) |
1473 | selection_paste (ev.xselection.requestor, |
1529 | selection_paste (ev.xselection.requestor, ev.xselection.property, true); |
1474 | ev.xselection.property, True); |
|
|
1475 | break; |
1530 | break; |
1476 | |
1531 | |
1477 | case SelectionRequest: |
1532 | case SelectionRequest: |
1478 | selection_send (ev.xselectionrequest); |
1533 | selection_send (ev.xselectionrequest); |
1479 | break; |
1534 | break; |
1480 | |
1535 | |
|
|
1536 | case MapNotify: |
|
|
1537 | mapped = 1; |
|
|
1538 | #ifdef TEXT_BLINK |
|
|
1539 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1540 | #endif |
|
|
1541 | HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
|
|
1542 | break; |
|
|
1543 | |
1481 | case UnmapNotify: |
1544 | case UnmapNotify: |
1482 | TermWin.mapped = 0; |
1545 | mapped = 0; |
1483 | #ifdef TEXT_BLINK |
1546 | #ifdef TEXT_BLINK |
1484 | text_blink_ev.stop (); |
1547 | text_blink_ev.stop (); |
1485 | #endif |
1548 | #endif |
1486 | break; |
1549 | HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1487 | |
|
|
1488 | case MapNotify: |
|
|
1489 | TermWin.mapped = 1; |
|
|
1490 | #ifdef TEXT_BLINK |
|
|
1491 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1492 | #endif |
|
|
1493 | break; |
1550 | break; |
1494 | |
1551 | |
1495 | #ifdef TRANSPARENT |
1552 | #ifdef TRANSPARENT |
1496 | case ReparentNotify: |
1553 | case ReparentNotify: |
1497 | rootwin_cb (ev); |
1554 | rootwin_cb (ev); |
1498 | break; |
1555 | break; |
1499 | #endif /* TRANSPARENT */ |
1556 | #endif /* TRANSPARENT */ |
1500 | |
1557 | |
1501 | case GraphicsExpose: |
1558 | case GraphicsExpose: |
1502 | case Expose: |
1559 | case Expose: |
1503 | if (ev.xany.window == TermWin.vt) |
1560 | if (ev.xany.window == vt) |
1504 | { |
1561 | { |
1505 | do |
1562 | do |
1506 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1563 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1507 | ev.xexpose.width, ev.xexpose.height, False); |
1564 | ev.xexpose.width, ev.xexpose.height, False); |
1508 | while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); |
1565 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); |
1509 | |
1566 | |
1510 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1567 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1511 | |
1568 | |
1512 | while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) |
1569 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1513 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1570 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1514 | ev.xexpose.width, ev.xexpose.height, False); |
1571 | ev.xexpose.width, ev.xexpose.height, False); |
1515 | |
1572 | |
1516 | scr_refresh (refresh_type); |
1573 | want_refresh = 1; |
1517 | } |
1574 | } |
1518 | else |
1575 | else |
1519 | { |
1576 | { |
1520 | XEvent unused_event; |
1577 | XEvent unused_event; |
1521 | |
1578 | |
1522 | while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) |
1579 | while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) |
1523 | ; |
1580 | ; |
1524 | while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) |
1581 | while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) |
1525 | ; |
1582 | ; |
1526 | |
1583 | |
1527 | if (isScrollbarWindow (ev.xany.window)) |
1584 | if (isScrollbarWindow (ev.xany.window)) |
1528 | { |
1585 | { |
1529 | scrollBar.setIdle (); |
1586 | scrollBar.setIdle (); |
1530 | scrollbar_show (0); |
1587 | scrollbar_show (0); |
1531 | } |
1588 | } |
1532 | #ifdef MENUBAR |
|
|
1533 | if (menubar_visible () && isMenuBarWindow (ev.xany.window)) |
|
|
1534 | menubar_expose (); |
|
|
1535 | #endif |
|
|
1536 | |
1589 | |
1537 | #ifdef TRANSPARENT |
1590 | #ifdef TRANSPARENT |
1538 | if (am_transparent && ev.xany.window == TermWin.parent[0]) |
1591 | if (am_transparent && ev.xany.window == parent[0]) |
1539 | XClearWindow (display->display, ev.xany.window); |
1592 | XClearWindow (disp, ev.xany.window); |
1540 | #endif |
1593 | #endif |
1541 | } |
1594 | } |
1542 | break; |
1595 | break; |
1543 | |
1596 | |
1544 | case MotionNotify: |
1597 | case MotionNotify: |
1545 | #ifdef POINTER_BLANK |
1598 | #ifdef POINTER_BLANK |
1546 | if (hidden_pointer) |
1599 | if (hidden_pointer) |
1547 | pointer_unblank (); |
1600 | pointer_unblank (); |
1548 | #endif |
1601 | #endif |
1549 | #if MENUBAR |
|
|
1550 | if (isMenuBarWindow (ev.xany.window)) |
|
|
1551 | { |
|
|
1552 | menubar_control (ev.xbutton); |
|
|
1553 | break; |
|
|
1554 | } |
|
|
1555 | #endif |
|
|
1556 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1602 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1557 | break; |
1603 | break; |
1558 | |
1604 | |
1559 | if (ev.xany.window == TermWin.vt) |
1605 | if (ev.xany.window == vt) |
1560 | { |
1606 | { |
|
|
1607 | if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) |
|
|
1608 | && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
|
|
1609 | ; // nop |
1561 | if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1610 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1562 | { |
1611 | { |
1563 | while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) |
1612 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1564 | ; |
1613 | ; |
1565 | |
1614 | |
1566 | XQueryPointer (display->display, TermWin.vt, |
1615 | XQueryPointer (disp, vt, |
1567 | &unused_root, &unused_child, |
1616 | &unused_root, &unused_child, |
1568 | &unused_root_x, &unused_root_y, |
1617 | &unused_root_x, &unused_root_y, |
1569 | &ev.xbutton.x, &ev.xbutton.y, |
1618 | &ev.xbutton.x, &ev.xbutton.y, |
1570 | &ev.xbutton.state); |
1619 | &ev.xbutton.state); |
1571 | #ifdef MOUSE_THRESHOLD |
1620 | #ifdef MOUSE_THRESHOLD |
… | |
… | |
1583 | #endif |
1632 | #endif |
1584 | selection_extend (ev.xbutton.x, ev.xbutton.y, |
1633 | selection_extend (ev.xbutton.x, ev.xbutton.y, |
1585 | ev.xbutton.state & Button3Mask ? 2 : 0); |
1634 | ev.xbutton.state & Button3Mask ? 2 : 0); |
1586 | |
1635 | |
1587 | #ifdef SELECTION_SCROLLING |
1636 | #ifdef SELECTION_SCROLLING |
1588 | if (ev.xbutton.y < TermWin.int_bwidth |
1637 | if (ev.xbutton.y < int_bwidth |
1589 | || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) |
1638 | || Pixel2Row (ev.xbutton.y) > (nrow-1)) |
1590 | { |
1639 | { |
1591 | int dist; |
1640 | int dist; |
1592 | |
1641 | |
1593 | /* don't clobber the current delay if we are |
1642 | /* don't clobber the current delay if we are |
1594 | * already in the middle of scrolling. |
1643 | * already in the middle of scrolling. |
… | |
… | |
1602 | selection_save_x = ev.xbutton.x; |
1651 | selection_save_x = ev.xbutton.x; |
1603 | selection_save_y = ev.xbutton.y; |
1652 | selection_save_y = ev.xbutton.y; |
1604 | selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; |
1653 | selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; |
1605 | |
1654 | |
1606 | /* calc number of lines to scroll */ |
1655 | /* calc number of lines to scroll */ |
1607 | if (ev.xbutton.y < TermWin.int_bwidth) |
1656 | if (ev.xbutton.y < int_bwidth) |
1608 | { |
1657 | { |
1609 | scroll_selection_dir = UP; |
1658 | scroll_selection_dir = UP; |
1610 | dist = TermWin.int_bwidth - ev.xbutton.y; |
1659 | dist = int_bwidth - ev.xbutton.y; |
1611 | } |
1660 | } |
1612 | else |
1661 | else |
1613 | { |
1662 | { |
1614 | scroll_selection_dir = DN; |
1663 | scroll_selection_dir = DN; |
1615 | dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); |
1664 | dist = ev.xbutton.y - (int_bwidth + height); |
1616 | } |
1665 | } |
1617 | |
1666 | |
1618 | scroll_selection_lines = Pixel2Height (dist) |
1667 | scroll_selection_lines = Pixel2Height (dist) |
1619 | / SELECTION_SCROLL_LINE_SPEEDUP |
1668 | / SELECTION_SCROLL_LINE_SPEEDUP |
1620 | + 1; |
1669 | + 1; |
1621 | MIN_IT (scroll_selection_lines, |
1670 | min_it (scroll_selection_lines, |
1622 | SELECTION_SCROLL_MAX_LINES); |
1671 | SELECTION_SCROLL_MAX_LINES); |
1623 | } |
1672 | } |
1624 | else |
1673 | else |
1625 | { |
1674 | { |
1626 | /* we are within the text window, so we |
1675 | /* we are within the text window, so we |
… | |
… | |
1635 | #endif |
1684 | #endif |
1636 | } |
1685 | } |
1637 | } |
1686 | } |
1638 | else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) |
1687 | else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) |
1639 | { |
1688 | { |
1640 | while (XCheckTypedWindowEvent (display->display, scrollBar.win, |
1689 | while (XCheckTypedWindowEvent (disp, scrollBar.win, |
1641 | MotionNotify, &ev)) |
1690 | MotionNotify, &ev)) |
1642 | ; |
1691 | ; |
1643 | |
1692 | |
1644 | XQueryPointer (display->display, scrollBar.win, |
1693 | XQueryPointer (disp, scrollBar.win, |
1645 | &unused_root, &unused_child, |
1694 | &unused_root, &unused_child, |
1646 | &unused_root_x, &unused_root_y, |
1695 | &unused_root_x, &unused_root_y, |
1647 | &ev.xbutton.x, &ev.xbutton.y, |
1696 | &ev.xbutton.x, &ev.xbutton.y, |
1648 | &unused_mask); |
1697 | &unused_mask); |
1649 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1698 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1650 | scrollbar_size ()); |
1699 | scrollbar_size ()); |
1651 | scr_refresh (refresh_type); |
1700 | want_refresh = 1; |
1652 | refresh_limit = 0; |
1701 | refresh_limit = 0; |
1653 | scrollbar_show (1); |
1702 | scrollbar_show (1); |
1654 | } |
1703 | } |
1655 | break; |
1704 | break; |
1656 | } |
1705 | } |
|
|
1706 | |
|
|
1707 | skip_switch: ; |
|
|
1708 | |
|
|
1709 | #if defined(CURSOR_BLINK) |
|
|
1710 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
|
|
1711 | { |
|
|
1712 | if (hidden_cursor) |
|
|
1713 | { |
|
|
1714 | hidden_cursor = 0; |
|
|
1715 | want_refresh = 1; |
|
|
1716 | } |
|
|
1717 | |
|
|
1718 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1719 | } |
|
|
1720 | #endif |
|
|
1721 | |
|
|
1722 | #if defined(POINTER_BLANK) |
|
|
1723 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1724 | { |
|
|
1725 | if (ev.type == MotionNotify |
|
|
1726 | || ev.type == ButtonPress |
|
|
1727 | || ev.type == ButtonRelease) |
|
|
1728 | if (hidden_pointer) |
|
|
1729 | pointer_unblank (); |
|
|
1730 | |
|
|
1731 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1732 | pointer_blank (); |
|
|
1733 | } |
|
|
1734 | #endif |
|
|
1735 | } |
|
|
1736 | |
|
|
1737 | void |
|
|
1738 | rxvt_term::focus_in () |
|
|
1739 | { |
|
|
1740 | if (!focus) |
|
|
1741 | { |
|
|
1742 | focus = 1; |
|
|
1743 | want_refresh = 1; |
|
|
1744 | |
|
|
1745 | HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
|
|
1746 | |
|
|
1747 | #if USE_XIM |
|
|
1748 | if (Input_Context != NULL) |
|
|
1749 | { |
|
|
1750 | IMSetStatusPosition (); |
|
|
1751 | XSetICFocus (Input_Context); |
|
|
1752 | } |
|
|
1753 | #endif |
|
|
1754 | #if CURSOR_BLINK |
|
|
1755 | if (OPTION (Opt_cursorBlink)) |
|
|
1756 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1757 | #endif |
|
|
1758 | #if OFF_FOCUS_FADING |
|
|
1759 | if (rs[Rs_fade]) |
|
|
1760 | { |
|
|
1761 | pix_colors = pix_colors_focused; |
|
|
1762 | scr_recolour (); |
|
|
1763 | } |
|
|
1764 | #endif |
|
|
1765 | } |
|
|
1766 | } |
|
|
1767 | |
|
|
1768 | void |
|
|
1769 | rxvt_term::focus_out () |
|
|
1770 | { |
|
|
1771 | if (focus) |
|
|
1772 | { |
|
|
1773 | focus = 0; |
|
|
1774 | want_refresh = 1; |
|
|
1775 | |
|
|
1776 | HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
|
|
1777 | |
|
|
1778 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1779 | if (iso14755buf) |
|
|
1780 | { |
|
|
1781 | iso14755buf = 0; |
|
|
1782 | # if ENABLE_OVERLAY |
|
|
1783 | scr_overlay_off (); |
|
|
1784 | # endif |
|
|
1785 | } |
|
|
1786 | #endif |
|
|
1787 | #if USE_XIM |
|
|
1788 | if (Input_Context != NULL) |
|
|
1789 | XUnsetICFocus (Input_Context); |
|
|
1790 | #endif |
|
|
1791 | #if CURSOR_BLINK |
|
|
1792 | if (OPTION (Opt_cursorBlink)) |
|
|
1793 | cursor_blink_ev.stop (); |
|
|
1794 | hidden_cursor = 0; |
|
|
1795 | #endif |
|
|
1796 | #if OFF_FOCUS_FADING |
|
|
1797 | if (rs[Rs_fade]) |
|
|
1798 | { |
|
|
1799 | pix_colors = pix_colors_unfocused; |
|
|
1800 | scr_recolour (); |
|
|
1801 | } |
|
|
1802 | #endif |
|
|
1803 | } |
1657 | } |
1804 | } |
1658 | |
1805 | |
1659 | #if TRANSPARENT |
1806 | #if TRANSPARENT |
1660 | void |
1807 | void |
1661 | rxvt_term::rootwin_cb (XEvent &ev) |
1808 | rxvt_term::rootwin_cb (XEvent &ev) |
1662 | { |
1809 | { |
1663 | SET_R (this); |
1810 | make_current (); |
1664 | SET_LOCALE (locale); |
|
|
1665 | |
1811 | |
1666 | switch (ev.type) |
1812 | switch (ev.type) |
1667 | { |
1813 | { |
1668 | case PropertyNotify: |
1814 | case PropertyNotify: |
1669 | /* |
1815 | /* |
1670 | * if user used some Esetroot compatible prog to set the root bg, |
1816 | * if user used some Esetroot compatible prog to set the root bg, |
1671 | * use the property to determine the pixmap. We use it later on. |
1817 | * use the property to determine the pixmap. We use it later on. |
1672 | */ |
1818 | */ |
1673 | if (xa[XA_XROOTPMAPID] == 0) |
|
|
1674 | xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); |
|
|
1675 | |
|
|
1676 | if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) |
1819 | if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] |
|
|
1820 | && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) |
1677 | return; |
1821 | return; |
1678 | |
1822 | |
1679 | /* FALLTHROUGH */ |
1823 | /* FALLTHROUGH */ |
1680 | case ReparentNotify: |
1824 | case ReparentNotify: |
1681 | if ((options & Opt_transparent) && check_our_parents () && am_transparent) |
1825 | if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) |
1682 | want_refresh = want_full_refresh = 1; |
1826 | want_refresh = want_full_refresh = 1; |
1683 | break; |
1827 | break; |
1684 | } |
1828 | } |
1685 | } |
1829 | } |
1686 | #endif |
1830 | #endif |
… | |
… | |
1689 | rxvt_term::button_press (XButtonEvent &ev) |
1833 | rxvt_term::button_press (XButtonEvent &ev) |
1690 | { |
1834 | { |
1691 | int reportmode = 0, clickintime; |
1835 | int reportmode = 0, clickintime; |
1692 | |
1836 | |
1693 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
1837 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
|
|
1838 | |
1694 | if (!bypass_keystate) |
1839 | if (!bypass_keystate) |
1695 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1840 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1696 | |
1841 | |
1697 | /* |
1842 | /* |
1698 | * VT window processing of button press |
1843 | * VT window processing of button press |
1699 | */ |
1844 | */ |
1700 | if (ev.window == TermWin.vt) |
1845 | if (ev.window == vt) |
1701 | { |
1846 | { |
1702 | #if ISO_14755 |
1847 | #if ISO_14755 |
1703 | // 5.4 |
1848 | // 5.4 |
1704 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1849 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1705 | { |
1850 | { |
… | |
… | |
1718 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1863 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1719 | if (ev.button == MEvent.button && clickintime) |
1864 | if (ev.button == MEvent.button && clickintime) |
1720 | { |
1865 | { |
1721 | /* same button, within alloted time */ |
1866 | /* same button, within alloted time */ |
1722 | MEvent.clicks++; |
1867 | MEvent.clicks++; |
|
|
1868 | |
1723 | if (MEvent.clicks > 1) |
1869 | if (MEvent.clicks > 1) |
1724 | { |
1870 | { |
1725 | /* only report double clicks */ |
1871 | /* only report double clicks */ |
1726 | MEvent.clicks = 2; |
1872 | MEvent.clicks = 2; |
1727 | mouse_report (ev); |
1873 | mouse_report (ev); |
… | |
… | |
1747 | else |
1893 | else |
1748 | { |
1894 | { |
1749 | if (ev.button != MEvent.button) |
1895 | if (ev.button != MEvent.button) |
1750 | MEvent.clicks = 0; |
1896 | MEvent.clicks = 0; |
1751 | |
1897 | |
|
|
1898 | if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END))) |
1752 | switch (ev.button) |
1899 | switch (ev.button) |
1753 | { |
1900 | { |
1754 | case Button1: |
1901 | case Button1: |
1755 | /* allow meta + click to select rectangular areas */ |
1902 | /* allow meta + click to select rectangular areas */ |
1756 | /* should be done in screen.C */ |
1903 | /* should be done in screen.C */ |
1757 | #if ENABLE_FRILLS |
1904 | #if ENABLE_FRILLS |
1758 | selection.rect = !! (ev.state & ModMetaMask); |
1905 | selection.rect = !!(ev.state & ModMetaMask); |
1759 | #else |
1906 | #else |
1760 | selection.rect = false; |
1907 | selection.rect = false; |
1761 | #endif |
1908 | #endif |
1762 | |
1909 | |
1763 | /* allow shift+left click to extend selection */ |
1910 | /* allow shift+left click to extend selection */ |
1764 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1911 | if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) |
1765 | { |
1912 | { |
1766 | if (MEvent.button == Button1 && clickintime) |
1913 | if (MEvent.button == Button1 && clickintime) |
1767 | selection_rotate (ev.x, ev.y); |
1914 | selection_rotate (ev.x, ev.y); |
1768 | else |
1915 | else |
1769 | selection_extend (ev.x, ev.y, 1); |
1916 | selection_extend (ev.x, ev.y, 1); |
1770 | } |
1917 | } |
1771 | else |
1918 | else |
1772 | { |
1919 | { |
1773 | if (MEvent.button == Button1 && clickintime) |
1920 | if (MEvent.button == Button1 && clickintime) |
1774 | MEvent.clicks++; |
1921 | MEvent.clicks++; |
1775 | else |
1922 | else |
1776 | MEvent.clicks = 1; |
1923 | MEvent.clicks = 1; |
1777 | |
1924 | |
1778 | selection_click (MEvent.clicks, ev.x, ev.y); |
1925 | selection_click (MEvent.clicks, ev.x, ev.y); |
1779 | } |
1926 | } |
1780 | |
1927 | |
1781 | MEvent.button = Button1; |
1928 | MEvent.button = Button1; |
1782 | break; |
1929 | break; |
1783 | |
1930 | |
1784 | case Button3: |
1931 | case Button3: |
1785 | if (MEvent.button == Button3 && clickintime) |
1932 | if (MEvent.button == Button3 && clickintime) |
1786 | selection_rotate (ev.x, ev.y); |
1933 | selection_rotate (ev.x, ev.y); |
1787 | else |
1934 | else |
1788 | selection_extend (ev.x, ev.y, 1); |
1935 | selection_extend (ev.x, ev.y, 1); |
1789 | |
1936 | |
1790 | MEvent.button = Button3; |
1937 | MEvent.button = Button3; |
1791 | break; |
1938 | break; |
1792 | } |
1939 | } |
1793 | } |
1940 | } |
1794 | |
1941 | |
1795 | MEvent.time = ev.time; |
1942 | MEvent.time = ev.time; |
1796 | return; |
1943 | return; |
1797 | } |
1944 | } |
1798 | |
1945 | |
… | |
… | |
1910 | case Button3: |
2057 | case Button3: |
1911 | if (scrollBar.style != R_SB_XTERM) |
2058 | if (scrollBar.style != R_SB_XTERM) |
1912 | { |
2059 | { |
1913 | if (scrollbar_above_slider (ev.y)) |
2060 | if (scrollbar_above_slider (ev.y)) |
1914 | # ifdef RXVT_SCROLL_FULL |
2061 | # ifdef RXVT_SCROLL_FULL |
1915 | scr_page (UP, TermWin.nrow - 1); |
2062 | scr_page (UP, nrow - 1); |
1916 | # else |
2063 | # else |
1917 | scr_page (UP, TermWin.nrow / 4); |
2064 | scr_page (UP, nrow / 4); |
1918 | # endif |
2065 | # endif |
1919 | else if (scrollbar_below_slider (ev.y)) |
2066 | else if (scrollbar_below_slider (ev.y)) |
1920 | # ifdef RXVT_SCROLL_FULL |
2067 | # ifdef RXVT_SCROLL_FULL |
1921 | scr_page (DN, TermWin.nrow - 1); |
2068 | scr_page (DN, nrow - 1); |
1922 | # else |
2069 | # else |
1923 | scr_page (DN, TermWin.nrow / 4); |
2070 | scr_page (DN, nrow / 4); |
1924 | # endif |
2071 | # endif |
1925 | else |
2072 | else |
1926 | scrollBar.setMotion (); |
2073 | scrollBar.setMotion (); |
1927 | } |
2074 | } |
1928 | else |
2075 | else |
1929 | { |
2076 | { |
1930 | scr_page ((ev.button == Button1 ? DN : UP), |
2077 | scr_page ((ev.button == Button1 ? DN : UP), |
1931 | (TermWin.nrow |
2078 | (nrow |
1932 | * scrollbar_position (ev.y) |
2079 | * scrollbar_position (ev.y) |
1933 | / scrollbar_size ())); |
2080 | / scrollbar_size ())); |
1934 | } |
2081 | } |
1935 | |
2082 | |
1936 | break; |
2083 | break; |
1937 | } |
2084 | } |
1938 | } |
2085 | } |
|
|
2086 | |
1939 | return; |
2087 | return; |
1940 | } |
2088 | } |
1941 | #if MENUBAR |
|
|
1942 | /* |
|
|
1943 | * Menubar window processing of button press |
|
|
1944 | */ |
|
|
1945 | if (isMenuBarWindow (ev.window)) |
|
|
1946 | menubar_control (ev); |
|
|
1947 | #endif |
|
|
1948 | } |
2089 | } |
1949 | |
2090 | |
1950 | void |
2091 | void |
1951 | rxvt_term::button_release (XButtonEvent &ev) |
2092 | rxvt_term::button_release (XButtonEvent &ev) |
1952 | { |
2093 | { |
… | |
… | |
1958 | |
2099 | |
1959 | if (scrollbar_isUpDn ()) |
2100 | if (scrollbar_isUpDn ()) |
1960 | { |
2101 | { |
1961 | scrollBar.setIdle (); |
2102 | scrollBar.setIdle (); |
1962 | scrollbar_show (0); |
2103 | scrollbar_show (0); |
1963 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
|
|
1964 | refresh_type &= ~SMOOTH_REFRESH; |
|
|
1965 | #endif |
|
|
1966 | } |
2104 | } |
1967 | |
2105 | |
1968 | #ifdef SELECTION_SCROLLING |
2106 | #ifdef SELECTION_SCROLLING |
1969 | if (sel_scroll_ev.active) |
2107 | if (sel_scroll_ev.active) |
1970 | sel_scroll_ev.stop(); |
2108 | sel_scroll_ev.stop(); |
1971 | #endif |
2109 | #endif |
1972 | |
2110 | |
1973 | if (ev.window == TermWin.vt) |
2111 | if (ev.window == vt) |
1974 | { |
2112 | { |
1975 | #if ISO_14755 |
2113 | #if ISO_14755 |
1976 | // 5.4 |
2114 | // 5.4 |
1977 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
2115 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1978 | return; |
2116 | return; |
… | |
… | |
2008 | if (priv_modes & PrivMode_mouse_report |
2146 | if (priv_modes & PrivMode_mouse_report |
2009 | && bypass_keystate |
2147 | && bypass_keystate |
2010 | && ev.button == Button1 && MEvent.clicks <= 1) |
2148 | && ev.button == Button1 && MEvent.clicks <= 1) |
2011 | selection_extend (ev.x, ev.y, 0); |
2149 | selection_extend (ev.x, ev.y, 0); |
2012 | |
2150 | |
|
|
2151 | if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) |
|
|
2152 | return; |
|
|
2153 | |
2013 | switch (ev.button) |
2154 | switch (ev.button) |
2014 | { |
2155 | { |
2015 | case Button1: |
2156 | case Button1: |
2016 | case Button3: |
2157 | case Button3: |
2017 | selection_make (ev.time); |
2158 | selection_make (ev.time); |
… | |
… | |
2028 | |
2169 | |
2029 | v = ev.button == Button4 ? UP : DN; |
2170 | v = ev.button == Button4 ? UP : DN; |
2030 | |
2171 | |
2031 | if (ev.state & ShiftMask) |
2172 | if (ev.state & ShiftMask) |
2032 | i = 1; |
2173 | i = 1; |
2033 | else if (options & Opt_mouseWheelScrollPage) |
2174 | else if (OPTION (Opt_mouseWheelScrollPage)) |
2034 | i = TermWin.nrow - 1; |
2175 | i = nrow - 1; |
2035 | else |
2176 | else |
2036 | i = 5; |
2177 | i = 5; |
2037 | |
2178 | |
2038 | # ifdef MOUSE_SLIP_WHEELING |
2179 | # ifdef MOUSE_SLIP_WHEELING |
2039 | if (ev.state & ControlMask) |
2180 | if (ev.state & ControlMask) |
2040 | { |
2181 | { |
2041 | mouse_slip_wheel_speed += v ? -1 : 1; |
2182 | mouse_slip_wheel_speed += v ? -1 : 1; |
2042 | if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; |
2183 | if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; |
2043 | if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; |
2184 | if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; |
2044 | |
2185 | |
2045 | if (slip_wheel_ev.at < NOW) |
2186 | if (slip_wheel_ev.at < NOW) |
2046 | slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; |
2187 | slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; |
2047 | |
2188 | |
2048 | slip_wheel_ev.start (); |
2189 | slip_wheel_ev.start (); |
2049 | } |
2190 | } |
2050 | else |
2191 | else |
2051 | { |
2192 | { |
2052 | # endif |
2193 | # endif |
2053 | # ifdef JUMP_MOUSE_WHEEL |
|
|
2054 | scr_page (v, i); |
2194 | scr_page (v, i); |
2055 | scr_refresh (SMOOTH_REFRESH); |
|
|
2056 | scrollbar_show (1); |
2195 | scrollbar_show (1); |
2057 | # else |
|
|
2058 | while (i--) |
|
|
2059 | { |
|
|
2060 | scr_page (v, 1); |
|
|
2061 | scr_refresh (SMOOTH_REFRESH); |
|
|
2062 | scrollbar_show (1); |
|
|
2063 | } |
|
|
2064 | # endif |
|
|
2065 | # ifdef MOUSE_SLIP_WHEELING |
2196 | # ifdef MOUSE_SLIP_WHEELING |
2066 | } |
2197 | } |
2067 | #endif |
2198 | # endif |
2068 | } |
2199 | } |
2069 | break; |
2200 | break; |
2070 | #endif |
2201 | #endif |
2071 | } |
2202 | } |
2072 | } |
2203 | } |
2073 | #ifdef MENUBAR |
|
|
2074 | else if (isMenuBarWindow (ev.window)) |
|
|
2075 | menubar_control (ev); |
|
|
2076 | #endif |
|
|
2077 | } |
2204 | } |
2078 | |
2205 | |
2079 | #ifdef TRANSPARENT |
2206 | #ifdef TRANSPARENT |
2080 | #if TINTING |
2207 | #if TINTING |
2081 | /* taken from aterm-0.4.2 */ |
2208 | /* taken from aterm-0.4.2 */ |
… | |
… | |
2089 | RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; |
2216 | RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; |
2090 | unsigned int lower_lim_r, lower_lim_g, lower_lim_b; |
2217 | unsigned int lower_lim_r, lower_lim_g, lower_lim_b; |
2091 | unsigned int upper_lim_r, upper_lim_g, upper_lim_b; |
2218 | unsigned int upper_lim_r, upper_lim_g, upper_lim_b; |
2092 | int i; |
2219 | int i; |
2093 | |
2220 | |
2094 | Visual* visual = display->visual; |
2221 | Visual *visual = display->visual; |
2095 | |
2222 | |
2096 | if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; |
2223 | if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; |
2097 | |
2224 | |
2098 | /* for convenience */ |
2225 | /* for convenience */ |
2099 | mask_r = visual->red_mask; |
2226 | mask_r = visual->red_mask; |
… | |
… | |
2320 | Atom atype; |
2447 | Atom atype; |
2321 | unsigned char *prop = NULL; |
2448 | unsigned char *prop = NULL; |
2322 | Window root, oldp, *list; |
2449 | Window root, oldp, *list; |
2323 | Pixmap rootpixmap = None; |
2450 | Pixmap rootpixmap = None; |
2324 | XWindowAttributes wattr, wrootattr; |
2451 | XWindowAttributes wattr, wrootattr; |
|
|
2452 | dDisp; |
2325 | |
2453 | |
2326 | pchanged = 0; |
2454 | pchanged = 0; |
2327 | |
2455 | |
2328 | if (!(options & Opt_transparent)) |
2456 | if (!OPTION (Opt_transparent)) |
2329 | return pchanged; /* Don't try any more */ |
2457 | return pchanged; /* Don't try any more */ |
2330 | |
2458 | |
2331 | XGetWindowAttributes (display->display, display->root, &wrootattr); |
2459 | XGetWindowAttributes (disp, display->root, &wrootattr); |
2332 | rootdepth = wrootattr.depth; |
2460 | rootdepth = wrootattr.depth; |
2333 | |
2461 | |
2334 | XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); |
2462 | XGetWindowAttributes (disp, parent[0], &wattr); |
2335 | |
2463 | |
2336 | if (rootdepth != wattr.depth) |
2464 | if (rootdepth != wattr.depth) |
2337 | { |
2465 | { |
2338 | if (am_transparent) |
2466 | if (am_transparent) |
2339 | { |
2467 | { |
2340 | pchanged = 1; |
2468 | pchanged = 1; |
2341 | XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); |
2469 | XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); |
2342 | am_transparent = am_pixmap_trans = 0; |
2470 | am_transparent = am_pixmap_trans = 0; |
2343 | } |
2471 | } |
2344 | |
2472 | |
2345 | return pchanged; /* Don't try any more */ |
2473 | return pchanged; /* Don't try any more */ |
2346 | } |
2474 | } |
2347 | |
2475 | |
2348 | /* Get all X ops out of the queue so that our information is up-to-date. */ |
2476 | /* Get all X ops out of the queue so that our information is up-to-date. */ |
2349 | XSync (display->display, False); |
2477 | XSync (disp, False); |
2350 | |
2478 | |
2351 | /* |
2479 | /* |
2352 | * Make the frame window set by the window manager have |
2480 | * Make the frame window set by the window manager have |
2353 | * the root background. Some window managers put multiple nested frame |
2481 | * the root background. Some window managers put multiple nested frame |
2354 | * windows for each client, so we have to take care about that. |
2482 | * windows for each client, so we have to take care about that. |
2355 | */ |
2483 | */ |
2356 | i = (xa[XA_XROOTPMAPID] |
2484 | i = (xa[XA_XROOTPMAP_ID] |
2357 | && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], |
2485 | && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], |
2358 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2486 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2359 | &nitems, &bytes_after, &prop) == Success); |
2487 | &nitems, &bytes_after, &prop) == Success); |
2360 | |
2488 | |
2361 | if (!i || prop == NULL) |
2489 | if (!i || prop == NULL) |
2362 | i = (xa[XA_XSETROOTID] |
2490 | i = (xa[XA_ESETROOT_PMAP_ID] |
2363 | && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], |
2491 | && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], |
2364 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2492 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2365 | &nitems, &bytes_after, &prop) == Success); |
2493 | &nitems, &bytes_after, &prop) == Success); |
2366 | |
2494 | |
2367 | if (!i || prop == NULL |
2495 | if (!i || prop == NULL |
2368 | #if TINTING |
2496 | #if TINTING |
… | |
… | |
2387 | Window cr; |
2515 | Window cr; |
2388 | XImage *image; |
2516 | XImage *image; |
2389 | GC gc; |
2517 | GC gc; |
2390 | XGCValues gcvalue; |
2518 | XGCValues gcvalue; |
2391 | |
2519 | |
2392 | XTranslateCoordinates (display->display, TermWin.parent[0], display->root, |
2520 | XTranslateCoordinates (disp, parent[0], display->root, |
2393 | 0, 0, &sx, &sy, &cr); |
2521 | 0, 0, &sx, &sy, &cr); |
2394 | nw = (unsigned int)szHint.width; |
2522 | nw = (unsigned int)szHint.width; |
2395 | nh = (unsigned int)szHint.height; |
2523 | nh = (unsigned int)szHint.height; |
2396 | nx = ny = 0; |
2524 | nx = ny = 0; |
2397 | |
2525 | |
… | |
… | |
2407 | nh += sy; |
2535 | nh += sy; |
2408 | ny = -sy; |
2536 | ny = -sy; |
2409 | sy = 0; |
2537 | sy = 0; |
2410 | } |
2538 | } |
2411 | |
2539 | |
2412 | MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); |
2540 | min_it (nw, (unsigned int) (wrootattr.width - sx)); |
2413 | MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); |
2541 | min_it (nh, (unsigned int) (wrootattr.height - sy)); |
2414 | |
2542 | |
2415 | XSync (display->display, False); |
2543 | XSync (disp, False); |
2416 | allowedxerror = -1; |
2544 | allowedxerror = -1; |
2417 | image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2545 | image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2418 | |
2546 | |
2419 | /* XXX: handle BadMatch - usually because we're outside the pixmap */ |
2547 | /* XXX: handle BadMatch - usually because we're outside the pixmap */ |
2420 | /* XXX: may need a delay here? */ |
2548 | /* XXX: may need a delay here? */ |
2421 | allowedxerror = 0; |
2549 | allowedxerror = 0; |
2422 | |
2550 | |
2423 | if (image == NULL) |
2551 | if (image == NULL) |
2424 | { |
2552 | { |
2425 | if (am_transparent && am_pixmap_trans) |
2553 | if (am_transparent && am_pixmap_trans) |
2426 | { |
2554 | { |
2427 | pchanged = 1; |
2555 | pchanged = 1; |
2428 | if (TermWin.pixmap != None) |
2556 | if (pixmap != None) |
2429 | { |
2557 | { |
2430 | XFreePixmap (display->display, TermWin.pixmap); |
2558 | XFreePixmap (disp, pixmap); |
2431 | TermWin.pixmap = None; |
2559 | pixmap = None; |
2432 | } |
2560 | } |
2433 | } |
2561 | } |
2434 | |
2562 | |
2435 | am_pixmap_trans = 0; |
2563 | am_pixmap_trans = 0; |
2436 | } |
2564 | } |
2437 | else |
2565 | else |
2438 | { |
2566 | { |
2439 | if (TermWin.pixmap != None) |
2567 | if (pixmap != None) |
2440 | XFreePixmap (display->display, TermWin.pixmap); |
2568 | XFreePixmap (disp, pixmap); |
2441 | |
2569 | |
2442 | #if TINTING |
2570 | #if TINTING |
2443 | if (ISSET_PIXCOLOR (Color_tint)) |
2571 | if (ISSET_PIXCOLOR (Color_tint)) |
2444 | { |
2572 | { |
2445 | unsigned short rm, gm, bm; |
2573 | unsigned short rm, gm, bm; |
… | |
… | |
2449 | |
2577 | |
2450 | ShadeXImage (display, image, shade, rm, gm, bm); |
2578 | ShadeXImage (display, image, shade, rm, gm, bm); |
2451 | } |
2579 | } |
2452 | #endif |
2580 | #endif |
2453 | |
2581 | |
2454 | TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, |
2582 | pixmap = XCreatePixmap (disp, vt, |
2455 | szHint.width, szHint.height, image->depth); |
2583 | szHint.width, szHint.height, image->depth); |
2456 | gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); |
2584 | gc = XCreateGC (disp, vt, 0UL, &gcvalue); |
2457 | XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, |
2585 | XPutImage (disp, pixmap, gc, image, 0, 0, |
2458 | nx, ny, image->width, image->height); |
2586 | nx, ny, image->width, image->height); |
2459 | XFreeGC (display->display, gc); |
2587 | XFreeGC (disp, gc); |
2460 | XDestroyImage (image); |
2588 | XDestroyImage (image); |
2461 | XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); |
2589 | XSetWindowBackgroundPixmap (disp, parent[0], pixmap); |
2462 | XClearWindow (display->display, TermWin.parent[0]); |
2590 | XClearWindow (disp, parent[0]); |
2463 | |
2591 | |
2464 | if (!am_transparent || !am_pixmap_trans) |
2592 | if (!am_transparent || !am_pixmap_trans) |
2465 | pchanged = 1; |
2593 | pchanged = 1; |
2466 | |
2594 | |
2467 | am_transparent = am_pixmap_trans = 1; |
2595 | am_transparent = am_pixmap_trans = 1; |
2468 | } |
2596 | } |
2469 | } |
2597 | } |
2470 | |
2598 | |
2471 | if (am_pixmap_trans) |
2599 | if (am_pixmap_trans) |
2472 | XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); |
2600 | XSetWindowBackgroundPixmap (disp, vt, ParentRelative); |
2473 | else |
2601 | else |
2474 | { |
2602 | { |
2475 | unsigned int n; |
2603 | unsigned int n; |
2476 | /* |
2604 | /* |
2477 | * InheritPixmap transparency |
2605 | * InheritPixmap transparency |
2478 | */ |
2606 | */ |
2479 | for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2607 | for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2480 | { |
2608 | { |
2481 | oldp = TermWin.parent[i]; |
2609 | oldp = parent[i]; |
2482 | XQueryTree (display->display, TermWin.parent[i - 1], &root, |
2610 | XQueryTree (disp, parent[i - 1], &root, |
2483 | &TermWin.parent[i], &list, &n); |
2611 | &parent[i], &list, &n); |
2484 | XFree (list); |
2612 | XFree (list); |
2485 | |
2613 | |
2486 | if (TermWin.parent[i] == display->root) |
2614 | if (parent[i] == display->root) |
2487 | { |
2615 | { |
2488 | if (oldp != None) |
2616 | if (oldp != None) |
2489 | pchanged = 1; |
2617 | pchanged = 1; |
2490 | |
2618 | |
2491 | break; |
2619 | break; |
2492 | } |
2620 | } |
2493 | |
2621 | |
2494 | if (oldp != TermWin.parent[i]) |
2622 | if (oldp != parent[i]) |
2495 | pchanged = 1; |
2623 | pchanged = 1; |
2496 | } |
2624 | } |
2497 | |
2625 | |
2498 | n = 0; |
2626 | n = 0; |
2499 | |
2627 | |
2500 | if (pchanged) |
2628 | if (pchanged) |
2501 | { |
2629 | { |
2502 | for (; n < (unsigned int)i; n++) |
2630 | for (; n < (unsigned int)i; n++) |
2503 | { |
2631 | { |
2504 | XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); |
2632 | XGetWindowAttributes (disp, parent[n], &wattr); |
2505 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2633 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2506 | { |
2634 | { |
2507 | n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; |
2635 | n = (int) (sizeof (parent) / sizeof (Window)) + 1; |
2508 | break; |
2636 | break; |
2509 | } |
2637 | } |
2510 | } |
2638 | } |
2511 | } |
2639 | } |
2512 | |
2640 | |
2513 | if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) |
2641 | if (n > (int) (sizeof (parent) / sizeof (parent[0]))) |
2514 | { |
2642 | { |
2515 | XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); |
2643 | XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); |
2516 | XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); |
2644 | XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); |
2517 | am_transparent = 0; |
2645 | am_transparent = 0; |
2518 | /* XXX: also turn off Opt_transparent? */ |
2646 | /* XXX: also turn off Opt_transparent? */ |
2519 | } |
2647 | } |
2520 | else |
2648 | else |
2521 | { |
2649 | { |
… | |
… | |
2524 | * needed for fvwm2.2.2 (and before?) */ |
2652 | * needed for fvwm2.2.2 (and before?) */ |
2525 | sleep (1); |
2653 | sleep (1); |
2526 | #endif |
2654 | #endif |
2527 | for (n = 0; n < (unsigned int)i; n++) |
2655 | for (n = 0; n < (unsigned int)i; n++) |
2528 | { |
2656 | { |
2529 | XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); |
2657 | XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); |
2530 | XClearWindow (display->display, TermWin.parent[n]); |
2658 | XClearWindow (disp, parent[n]); |
2531 | } |
2659 | } |
2532 | |
2660 | |
2533 | XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); |
2661 | XSetWindowBackgroundPixmap (disp, vt, ParentRelative); |
2534 | am_transparent = 1; |
2662 | am_transparent = 1; |
2535 | } |
2663 | } |
2536 | |
2664 | |
2537 | for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2665 | for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2538 | TermWin.parent[i] = None; |
2666 | parent[i] = None; |
2539 | } |
2667 | } |
2540 | |
2668 | |
2541 | if (scrollBar.win) |
2669 | if (scrollBar.win) |
2542 | { |
2670 | { |
2543 | XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); |
2671 | XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); |
2544 | scrollBar.setIdle (); |
2672 | scrollBar.setIdle (); |
2545 | scrollbar_show (0); |
2673 | scrollbar_show (0); |
2546 | } |
2674 | } |
2547 | |
2675 | |
2548 | if (am_transparent) |
2676 | if (am_transparent) |
… | |
… | |
2560 | |
2688 | |
2561 | bool |
2689 | bool |
2562 | rxvt_term::cmd_parse () |
2690 | rxvt_term::cmd_parse () |
2563 | { |
2691 | { |
2564 | bool flag = false; |
2692 | bool flag = false; |
2565 | unicode_t ch = NOCHAR; |
2693 | wchar_t ch = NOCHAR; |
2566 | unsigned char *seq_begin; // remember start of esc-sequence here |
2694 | char *seq_begin; // remember start of esc-sequence here |
2567 | |
2695 | |
2568 | for (;;) |
2696 | for (;;) |
2569 | { |
2697 | { |
2570 | if (ch == NOCHAR) |
2698 | if (ch == NOCHAR) |
2571 | { |
2699 | { |
2572 | seq_begin = cmdbuf_ptr; |
2700 | seq_begin = cmdbuf_ptr; |
2573 | ch = next_char (); |
2701 | ch = next_char (); |
2574 | } |
|
|
2575 | |
2702 | |
2576 | if (ch == NOCHAR) // TODO: improve |
2703 | if (ch == NOCHAR) |
2577 | break; |
2704 | break; |
|
|
2705 | } |
2578 | |
2706 | |
2579 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2707 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2580 | { |
2708 | { |
2581 | if (!seen_input) |
2709 | if (!seen_input) |
2582 | { |
2710 | { |
… | |
… | |
2586 | // some window managers resize the window early, and these programs |
2714 | // some window managers resize the window early, and these programs |
2587 | // then sometimes get the size wrong. |
2715 | // then sometimes get the size wrong. |
2588 | // unfortunately other programs are even more buggy and dislike |
2716 | // unfortunately other programs are even more buggy and dislike |
2589 | // being sent SIGWINCH, so only do it when we were in fact being |
2717 | // being sent SIGWINCH, so only do it when we were in fact being |
2590 | // resized. |
2718 | // resized. |
2591 | if (seen_resize) |
2719 | if (seen_resize && cmd_pid) |
2592 | kill (-cmd_pid, SIGWINCH); |
2720 | kill (-cmd_pid, SIGWINCH); |
2593 | } |
2721 | } |
2594 | |
2722 | |
2595 | /* Read a text string from the input buffer */ |
2723 | /* Read a text string from the input buffer */ |
2596 | unicode_t buf[UBUFSIZ]; |
2724 | wchar_t buf[UBUFSIZ]; |
2597 | bool refreshnow = false; |
2725 | bool refreshnow = false; |
2598 | int nlines = 0; |
2726 | int nlines = 0; |
2599 | unicode_t *str = buf; |
2727 | wchar_t *str = buf; |
|
|
2728 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2600 | |
2729 | |
2601 | for (;;) |
2730 | for (;;) |
2602 | { |
2731 | { |
2603 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2732 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2604 | break; |
2733 | break; |
2605 | |
2734 | |
2606 | *str++ = ch; |
2735 | *str++ = ch; |
2607 | |
2736 | |
2608 | if (ch == C0_LF) |
2737 | if (ch == C0_LF || str >= eol) |
2609 | { |
2738 | { |
|
|
2739 | if (ch == C0_LF) |
2610 | nlines++; |
2740 | nlines++; |
|
|
2741 | |
2611 | refresh_count++; |
2742 | refresh_count++; |
2612 | |
2743 | |
2613 | if (!(options & Opt_jumpScroll) |
2744 | if (!OPTION (Opt_jumpScroll) |
2614 | || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) |
2745 | || (refresh_count >= refresh_limit * (nrow - 1))) |
2615 | { |
2746 | { |
2616 | refreshnow = true; |
2747 | refreshnow = true; |
|
|
2748 | refresh_count = 0; |
2617 | ch = NOCHAR; |
2749 | ch = NOCHAR; |
2618 | break; |
2750 | break; |
2619 | } |
2751 | } |
2620 | |
2752 | |
2621 | // scr_add_lines only works for nlines <= TermWin.nrow - 1. |
2753 | // scr_add_lines only works for nlines <= nrow - 1. |
2622 | if (nlines >= TermWin.nrow - 1) |
2754 | if (nlines >= nrow - 1) |
2623 | { |
2755 | { |
|
|
2756 | if (!(SHOULD_INVOKE (HOOK_ADD_LINES) |
|
|
2757 | && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) |
2624 | scr_add_lines (buf, nlines, str - buf); |
2758 | scr_add_lines (buf, str - buf, nlines); |
|
|
2759 | |
2625 | nlines = 0; |
2760 | nlines = 0; |
2626 | str = buf; |
2761 | str = buf; |
|
|
2762 | eol = str + min (ncol, UBUFSIZ); |
2627 | } |
2763 | } |
2628 | } |
|
|
2629 | |
2764 | |
2630 | if (str >= buf + UBUFSIZ) |
2765 | if (str >= eol) |
2631 | { |
2766 | { |
|
|
2767 | if (eol >= buf + UBUFSIZ) |
|
|
2768 | { |
2632 | ch = NOCHAR; |
2769 | ch = NOCHAR; |
2633 | break; |
2770 | break; |
|
|
2771 | } |
|
|
2772 | else |
|
|
2773 | eol = min (eol + ncol, buf + UBUFSIZ); |
|
|
2774 | } |
|
|
2775 | |
2634 | } |
2776 | } |
2635 | |
2777 | |
2636 | seq_begin = cmdbuf_ptr; |
2778 | seq_begin = cmdbuf_ptr; |
2637 | ch = next_char (); |
2779 | ch = next_char (); |
2638 | } |
2780 | } |
2639 | |
2781 | |
|
|
2782 | if (!(SHOULD_INVOKE (HOOK_ADD_LINES) |
|
|
2783 | && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) |
2640 | scr_add_lines (buf, nlines, str - buf); |
2784 | scr_add_lines (buf, str - buf, nlines); |
2641 | |
2785 | |
2642 | /* |
2786 | /* |
2643 | * If there have been a lot of new lines, then update the screen |
2787 | * If there have been a lot of new lines, then update the screen |
2644 | * What the heck I'll cheat and only refresh less than every page-full. |
2788 | * What the heck I'll cheat and only refresh less than every page-full. |
2645 | * the number of pages between refreshes is refresh_limit, which |
2789 | * the number of pages between refreshes is refresh_limit, which |
2646 | * is incremented here because we must be doing flat-out scrolling. |
2790 | * is incremented here because we must be doing flat-out scrolling. |
2647 | */ |
2791 | */ |
2648 | if (refreshnow) |
2792 | if (refreshnow) |
2649 | { |
2793 | { |
2650 | if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2794 | if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2651 | refresh_limit++; |
2795 | refresh_limit++; |
2652 | else |
2796 | else |
2653 | { |
2797 | { |
2654 | flag = true; |
2798 | flag = true; |
2655 | scr_refresh (refresh_type); |
2799 | scr_refresh (); |
|
|
2800 | want_refresh = 1; |
2656 | } |
2801 | } |
2657 | } |
2802 | } |
2658 | |
2803 | |
2659 | } |
2804 | } |
2660 | else |
2805 | else |
… | |
… | |
2675 | } |
2820 | } |
2676 | |
2821 | |
2677 | return flag; |
2822 | return flag; |
2678 | } |
2823 | } |
2679 | |
2824 | |
2680 | // read the next octet |
|
|
2681 | unicode_t |
|
|
2682 | rxvt_term::next_octet () |
|
|
2683 | { |
|
|
2684 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2685 | ? *cmdbuf_ptr++ |
|
|
2686 | : NOCHAR; |
|
|
2687 | } |
|
|
2688 | |
|
|
2689 | // read the next character |
2825 | // read the next character |
2690 | unicode_t |
2826 | wchar_t |
2691 | rxvt_term::next_char () |
2827 | rxvt_term::next_char () |
2692 | { |
2828 | { |
2693 | while (cmdbuf_ptr < cmdbuf_endp) |
2829 | while (cmdbuf_ptr < cmdbuf_endp) |
2694 | { |
2830 | { |
2695 | // assume 7-bit to be ascii ALWAYS |
2831 | // assume 7-bit to be ascii ALWAYS |
2696 | if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2832 | if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2697 | return *cmdbuf_ptr++; |
2833 | return *cmdbuf_ptr++; |
2698 | |
2834 | |
2699 | wchar_t wc; |
2835 | wchar_t wc; |
2700 | size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2836 | size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2701 | |
2837 | |
2702 | if (len == (size_t)-2) |
2838 | if (len == (size_t)-2) |
2703 | { |
2839 | { |
2704 | // the mbstate stores incomplete sequences. didn't know this :/ |
2840 | // the mbstate stores incomplete sequences. didn't know this :/ |
2705 | cmdbuf_ptr = cmdbuf_endp; |
2841 | cmdbuf_ptr = cmdbuf_endp; |
2706 | break; |
2842 | break; |
2707 | } |
2843 | } |
2708 | |
2844 | |
2709 | if (len == (size_t)-1) |
2845 | if (len == (size_t)-1) |
2710 | return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2846 | return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2711 | |
2847 | |
2712 | // assume wchar == unicode |
2848 | // assume wchar == unicode |
2713 | cmdbuf_ptr += len; |
2849 | cmdbuf_ptr += len; |
2714 | return wc; |
2850 | return wc & UNICODE_MASK; |
2715 | } |
2851 | } |
2716 | |
2852 | |
2717 | return NOCHAR; |
2853 | return NOCHAR; |
|
|
2854 | } |
|
|
2855 | |
|
|
2856 | // read the next octet |
|
|
2857 | uint32_t |
|
|
2858 | rxvt_term::next_octet () |
|
|
2859 | { |
|
|
2860 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2861 | ? (unsigned char)*cmdbuf_ptr++ |
|
|
2862 | : NOCHAR; |
2718 | } |
2863 | } |
2719 | |
2864 | |
2720 | /* rxvt_cmd_getc () - Return next input character */ |
2865 | /* rxvt_cmd_getc () - Return next input character */ |
2721 | /* |
2866 | /* |
2722 | * Return the next input character after first passing any keyboard input |
2867 | * Return the next input character after first passing any keyboard input |
2723 | * to the command. |
2868 | * to the command. |
2724 | */ |
2869 | */ |
2725 | unicode_t |
2870 | wchar_t |
2726 | rxvt_term::cmd_getc () |
2871 | rxvt_term::cmd_getc () |
2727 | { |
2872 | { |
2728 | unicode_t c = next_char (); |
2873 | wchar_t c = next_char (); |
2729 | |
2874 | |
2730 | if (c == NOCHAR) |
2875 | if (c == NOCHAR) |
2731 | throw out_of_input; |
2876 | throw out_of_input; |
2732 | |
2877 | |
2733 | return c; |
2878 | return c; |
2734 | } |
2879 | } |
2735 | |
2880 | |
2736 | unicode_t |
2881 | uint32_t |
2737 | rxvt_term::cmd_get8 () |
2882 | rxvt_term::cmd_get8 () |
2738 | { |
2883 | { |
2739 | unicode_t c = next_octet (); |
2884 | uint32_t c = next_octet (); |
2740 | |
2885 | |
2741 | if (c == NOCHAR) |
2886 | if (c == NOCHAR) |
2742 | throw out_of_input; |
2887 | throw out_of_input; |
2743 | |
2888 | |
2744 | return c; |
2889 | return c; |
… | |
… | |
2844 | case C0_ESC: |
2989 | case C0_ESC: |
2845 | process_escape_seq (); |
2990 | process_escape_seq (); |
2846 | break; |
2991 | break; |
2847 | case C0_ENQ: /* terminal Status */ |
2992 | case C0_ENQ: /* terminal Status */ |
2848 | if (rs[Rs_answerbackstring]) |
2993 | if (rs[Rs_answerbackstring]) |
2849 | tt_write ((const unsigned char *)rs[Rs_answerbackstring], |
2994 | tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring])); |
2850 | (unsigned int)strlen (rs[Rs_answerbackstring])); |
|
|
2851 | else |
2995 | else |
2852 | tt_write ((unsigned char *)VT100_ANS, |
2996 | tt_write (VT100_ANS, strlen (VT100_ANS)); |
2853 | (unsigned int)strlen (VT100_ANS)); |
|
|
2854 | break; |
2997 | break; |
2855 | case C0_BEL: /* bell */ |
2998 | case C0_BEL: /* bell */ |
2856 | scr_bell (); |
2999 | scr_bell (); |
2857 | break; |
3000 | break; |
2858 | case C0_BS: /* backspace */ |
3001 | case C0_BS: /* backspace */ |
… | |
… | |
3013 | break; |
3156 | break; |
3014 | |
3157 | |
3015 | /* 8.3.87: NEXT LINE */ |
3158 | /* 8.3.87: NEXT LINE */ |
3016 | case C1_NEL: /* ESC E */ |
3159 | case C1_NEL: /* ESC E */ |
3017 | { |
3160 | { |
3018 | unicode_t nlcr[] = { C0_LF, C0_CR }; |
3161 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
3019 | scr_add_lines (nlcr, 1, 2); |
3162 | scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); |
3020 | } |
3163 | } |
3021 | break; |
3164 | break; |
3022 | |
3165 | |
3023 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3166 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3024 | case C1_ESA: /* ESC G */ |
3167 | case C1_ESA: /* ESC G */ |
… | |
… | |
3046 | process_dcs_seq (); |
3189 | process_dcs_seq (); |
3047 | break; |
3190 | break; |
3048 | |
3191 | |
3049 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3192 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3050 | case C1_SCI: /* ESC Z */ |
3193 | case C1_SCI: /* ESC Z */ |
3051 | tt_write ((const unsigned char *)ESCZ_ANSWER, |
3194 | tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); |
3052 | (unsigned int) (sizeof (ESCZ_ANSWER) - 1)); |
|
|
3053 | break; /* steal obsolete ESC [ c */ |
3195 | break; /* steal obsolete ESC [ c */ |
3054 | |
3196 | |
3055 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3197 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3056 | case C1_CSI: /* ESC [ */ |
3198 | case C1_CSI: /* ESC [ */ |
3057 | process_csi_seq (); |
3199 | process_csi_seq (); |
… | |
… | |
3182 | { |
3324 | { |
3183 | switch (priv) |
3325 | switch (priv) |
3184 | { |
3326 | { |
3185 | case '>': |
3327 | case '>': |
3186 | if (ch == CSI_DA) /* secondary device attributes */ |
3328 | if (ch == CSI_DA) /* secondary device attributes */ |
3187 | tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); |
3329 | tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); |
3188 | break; |
3330 | break; |
3189 | case '?': |
3331 | case '?': |
3190 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3332 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3191 | process_terminal_mode (ch, priv, nargs, arg); |
3333 | process_terminal_mode (ch, priv, nargs, arg); |
3192 | break; |
3334 | break; |
… | |
… | |
3297 | |
3439 | |
3298 | case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ |
3440 | case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ |
3299 | arg[0] = -arg[0]; |
3441 | arg[0] = -arg[0]; |
3300 | /* FALLTHROUGH */ |
3442 | /* FALLTHROUGH */ |
3301 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3443 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3302 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); |
3444 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3303 | break; |
3445 | break; |
3304 | |
3446 | |
3305 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3447 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3306 | tt_write ((const unsigned char *)VT100_ANS, |
3448 | tt_write (VT100_ANS, sizeof (VT100_ANS) - 1); |
3307 | (unsigned int) (sizeof (VT100_ANS) - 1)); |
|
|
3308 | break; |
3449 | break; |
3309 | |
3450 | |
3310 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3451 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3311 | process_sgr_mode (nargs, arg); |
3452 | process_sgr_mode (nargs, arg); |
3312 | break; |
3453 | break; |
… | |
… | |
3319 | break; |
3460 | break; |
3320 | case 6: /* CPR requested */ |
3461 | case 6: /* CPR requested */ |
3321 | scr_report_position (); |
3462 | scr_report_position (); |
3322 | break; |
3463 | break; |
3323 | case 7: /* unofficial extension */ |
3464 | case 7: /* unofficial extension */ |
3324 | if (options & Opt_insecure) |
3465 | if (OPTION (Opt_insecure)) |
3325 | tt_printf ("%-.250s\012", rs[Rs_display_name]); |
3466 | tt_printf ("%-.250s\012", rs[Rs_display_name]); |
3326 | break; |
3467 | break; |
3327 | case 8: /* unofficial extension */ |
3468 | case 8: /* unofficial extension */ |
3328 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
3469 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
3329 | break; |
3470 | break; |
… | |
… | |
3421 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3562 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3422 | { |
3563 | { |
3423 | int x, y; |
3564 | int x, y; |
3424 | XWindowAttributes wattr; |
3565 | XWindowAttributes wattr; |
3425 | Window wdummy; |
3566 | Window wdummy; |
|
|
3567 | dDisp; |
3426 | |
3568 | |
3427 | if (nargs == 0) |
3569 | if (nargs == 0) |
3428 | return; |
3570 | return; |
3429 | |
3571 | |
3430 | switch (args[0]) |
3572 | switch (args[0]) |
3431 | { |
3573 | { |
3432 | /* |
3574 | /* |
3433 | * commands |
3575 | * commands |
3434 | */ |
3576 | */ |
3435 | case 1: /* deiconify window */ |
3577 | case 1: /* deiconify window */ |
3436 | XMapWindow (display->display, TermWin.parent[0]); |
3578 | XMapWindow (disp, parent[0]); |
3437 | break; |
3579 | break; |
3438 | case 2: /* iconify window */ |
3580 | case 2: /* iconify window */ |
3439 | XIconifyWindow (display->display, TermWin.parent[0], |
3581 | XIconifyWindow (disp, parent[0], display->screen); |
3440 | DefaultScreen (display->display)); |
|
|
3441 | break; |
3582 | break; |
3442 | case 3: /* set position (pixels) */ |
3583 | case 3: /* set position (pixels) */ |
3443 | XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); |
3584 | XMoveWindow (disp, parent[0], args[1], args[2]); |
3444 | break; |
3585 | break; |
3445 | case 4: /* set size (pixels) */ |
3586 | case 4: /* set size (pixels) */ |
3446 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3587 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3447 | break; |
3588 | break; |
3448 | case 5: /* raise window */ |
3589 | case 5: /* raise window */ |
3449 | XRaiseWindow (display->display, TermWin.parent[0]); |
3590 | XRaiseWindow (disp, parent[0]); |
3450 | break; |
3591 | break; |
3451 | case 6: /* lower window */ |
3592 | case 6: /* lower window */ |
3452 | XLowerWindow (display->display, TermWin.parent[0]); |
3593 | XLowerWindow (disp, parent[0]); |
3453 | break; |
3594 | break; |
3454 | case 7: /* refresh window */ |
3595 | case 7: /* refresh window */ |
3455 | scr_touch (true); |
3596 | scr_touch (true); |
3456 | break; |
3597 | break; |
3457 | case 8: /* set size (chars) */ |
3598 | case 8: /* set size (chars) */ |
3458 | set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), |
3599 | set_widthheight ((unsigned int) (args[2] * fwidth), |
3459 | (unsigned int) (args[1] * TermWin.fheight)); |
3600 | (unsigned int) (args[1] * fheight)); |
3460 | break; |
3601 | break; |
3461 | |
3602 | |
3462 | //case 9: NYI, TODO, restore maximized window or maximize window |
3603 | //case 9: NYI, TODO, restore maximized window or maximize window |
3463 | default: |
3604 | default: |
3464 | if (args[0] >= 24) /* set height (chars) */ |
3605 | if (args[0] >= 24) /* set height (chars) */ |
3465 | set_widthheight ((unsigned int)TermWin.width, |
3606 | set_widthheight ((unsigned int)width, |
3466 | (unsigned int) (args[1] * TermWin.fheight)); |
3607 | (unsigned int) (args[1] * fheight)); |
3467 | break; |
3608 | break; |
3468 | |
3609 | |
3469 | |
3610 | |
3470 | /* |
3611 | /* |
3471 | * reports - some output format copied from XTerm |
3612 | * reports - some output format copied from XTerm |
3472 | */ |
3613 | */ |
3473 | case 11: /* report window state */ |
3614 | case 11: /* report window state */ |
3474 | XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); |
3615 | XGetWindowAttributes (disp, parent[0], &wattr); |
3475 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3616 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3476 | break; |
3617 | break; |
3477 | case 13: /* report window position */ |
3618 | case 13: /* report window position */ |
3478 | XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); |
3619 | XGetWindowAttributes (disp, parent[0], &wattr); |
3479 | XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, |
3620 | XTranslateCoordinates (disp, parent[0], wattr.root, |
3480 | -wattr.border_width, -wattr.border_width, |
3621 | -wattr.border_width, -wattr.border_width, |
3481 | &x, &y, &wdummy); |
3622 | &x, &y, &wdummy); |
3482 | tt_printf ("\033[3;%d;%dt", x, y); |
3623 | tt_printf ("\033[3;%d;%dt", x, y); |
3483 | break; |
3624 | break; |
3484 | case 14: /* report window size (pixels) */ |
3625 | case 14: /* report window size (pixels) */ |
3485 | XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); |
3626 | XGetWindowAttributes (disp, parent[0], &wattr); |
3486 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3627 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3487 | break; |
3628 | break; |
3488 | case 18: /* report text area size (chars) */ |
3629 | case 18: /* report text area size (chars) */ |
3489 | tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); |
3630 | tt_printf ("\033[8;%d;%dt", nrow, ncol); |
3490 | break; |
3631 | break; |
3491 | case 19: /* report window size (chars) */ |
3632 | case 19: /* report window size (chars) */ |
3492 | tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); |
3633 | tt_printf ("\033[9;%d;%dt", nrow, ncol); |
3493 | break; |
3634 | break; |
3494 | case 20: /* report icon label */ |
3635 | case 20: /* report icon label */ |
3495 | { |
3636 | { |
3496 | char *s; |
3637 | char *s; |
3497 | XGetIconName (display->display, TermWin.parent[0], &s); |
3638 | XGetIconName (disp, parent[0], &s); |
3498 | tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3639 | tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3499 | XFree (s); |
3640 | XFree (s); |
3500 | } |
3641 | } |
3501 | break; |
3642 | break; |
3502 | case 21: /* report window title */ |
3643 | case 21: /* report window title */ |
3503 | { |
3644 | { |
3504 | char *s; |
3645 | char *s; |
3505 | XFetchName (display->display, TermWin.parent[0], &s); |
3646 | XFetchName (disp, parent[0], &s); |
3506 | tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3647 | tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3507 | XFree (s); |
3648 | XFree (s); |
3508 | } |
3649 | } |
3509 | break; |
3650 | break; |
3510 | } |
3651 | } |
3511 | } |
3652 | } |
… | |
… | |
3514 | /*----------------------------------------------------------------------*/ |
3655 | /*----------------------------------------------------------------------*/ |
3515 | /* |
3656 | /* |
3516 | * get input up until STRING TERMINATOR (or BEL) |
3657 | * get input up until STRING TERMINATOR (or BEL) |
3517 | * ends_how is terminator used. returned input must be free()'d |
3658 | * ends_how is terminator used. returned input must be free()'d |
3518 | */ |
3659 | */ |
3519 | unsigned char * |
3660 | char * |
3520 | rxvt_term::get_to_st (unicode_t &ends_how) |
3661 | rxvt_term::get_to_st (unicode_t &ends_how) |
3521 | { |
3662 | { |
3522 | unicode_t ch; |
3663 | unicode_t ch; |
3523 | bool seen_esc = false; |
3664 | bool seen_esc = false; |
3524 | unsigned int n = 0; |
3665 | unsigned int n = 0; |
… | |
… | |
3543 | else if (ch < 0x20) |
3684 | else if (ch < 0x20) |
3544 | return NULL; /* other control character - exit */ |
3685 | return NULL; /* other control character - exit */ |
3545 | |
3686 | |
3546 | seen_esc = false; |
3687 | seen_esc = false; |
3547 | |
3688 | |
3548 | if (n >= sizeof (string) - 1) |
3689 | if (n >= STRING_MAX - 1) |
3549 | // stop at some sane length |
3690 | // stop at some sane length |
3550 | return NULL; |
3691 | return NULL; |
3551 | |
3692 | |
3552 | if (ch == C0_SYN) |
3693 | if (ch == C0_SYN) |
3553 | string[n++] = cmd_get8 (); |
3694 | string[n++] = cmd_get8 (); |
… | |
… | |
3557 | |
3698 | |
3558 | string[n++] = '\0'; |
3699 | string[n++] = '\0'; |
3559 | |
3700 | |
3560 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3701 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3561 | |
3702 | |
3562 | return (unsigned char *)rxvt_wcstombs (string); |
3703 | return rxvt_wcstombs (string); |
3563 | } |
3704 | } |
3564 | |
3705 | |
3565 | /*----------------------------------------------------------------------*/ |
3706 | /*----------------------------------------------------------------------*/ |
3566 | /* |
3707 | /* |
3567 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3708 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3568 | */ |
3709 | */ |
3569 | void |
3710 | void |
3570 | rxvt_term::process_dcs_seq () |
3711 | rxvt_term::process_dcs_seq () |
3571 | { |
3712 | { |
3572 | unsigned char *s; |
3713 | char *s; |
3573 | unicode_t eh; |
3714 | unicode_t eh; |
3574 | |
3715 | |
3575 | /* |
3716 | /* |
3576 | * Not handled yet |
3717 | * Not handled yet |
3577 | */ |
3718 | */ |
… | |
… | |
3596 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3737 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3597 | arg = arg * 10 + (ch - '0'); |
3738 | arg = arg * 10 + (ch - '0'); |
3598 | |
3739 | |
3599 | if (ch == ';') |
3740 | if (ch == ';') |
3600 | { |
3741 | { |
3601 | unsigned char *s = get_to_st (eh); |
3742 | char *s = get_to_st (eh); |
3602 | |
3743 | |
3603 | if (s) |
3744 | if (s) |
3604 | { |
3745 | { |
3605 | process_xterm_seq (arg, (char *)s, eh); |
3746 | process_xterm_seq (arg, s, eh); |
3606 | free (s); |
3747 | free (s); |
3607 | } |
3748 | } |
3608 | } |
3749 | } |
3609 | } |
3750 | } |
3610 | |
3751 | |
3611 | void |
3752 | void |
3612 | rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) |
3753 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
3613 | { |
3754 | { |
3614 | if (str[0] == '?' && !str[1]) |
3755 | if (str[0] == '?' && !str[1]) |
3615 | { |
3756 | { |
3616 | unsigned short r, g, b; |
3757 | unsigned short r, g, b; |
3617 | pix_colors_focused[color].get (display, r, g, b); |
3758 | pix_colors_focused[color].get (display, r, g, b); |
… | |
… | |
3621 | set_window_color (color, str); |
3762 | set_window_color (color, str); |
3622 | } |
3763 | } |
3623 | |
3764 | |
3624 | /* |
3765 | /* |
3625 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3766 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3626 | * 0 = change iconName/title |
|
|
3627 | * 1 = change iconName |
|
|
3628 | * 2 = change title |
|
|
3629 | * 4 = change color |
|
|
3630 | * 10 = change fg color |
|
|
3631 | * 11 = change bg color |
|
|
3632 | * 12 = change text color |
|
|
3633 | * 13 = change mouse foreground color |
|
|
3634 | * 17 = change highlight character colour |
|
|
3635 | * 18 = change bold character color |
|
|
3636 | * 19 = change underlined character color |
|
|
3637 | * 46 = change logfile (not implemented) |
|
|
3638 | * 50 = change font |
|
|
3639 | * |
|
|
3640 | * rxvt extensions: |
|
|
3641 | * 20 = bg pixmap |
|
|
3642 | * 39 = change default fg color |
|
|
3643 | * 49 = change default bg color |
|
|
3644 | * 55 = dump scrollback buffer and all of screen |
|
|
3645 | * 701 = change locale |
|
|
3646 | * 702 = find font |
|
|
3647 | * 703 = menu |
|
|
3648 | */ |
3767 | */ |
3649 | void |
3768 | void |
3650 | rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) |
3769 | rxvt_term::process_xterm_seq (int op, const char *str, char resp) |
3651 | { |
3770 | { |
3652 | int changed = 0; |
3771 | int changed = 0; |
3653 | int color; |
3772 | int color; |
3654 | char *buf, *name; |
3773 | char *buf, *name; |
3655 | bool query = str[0] == '?' && !str[1]; |
3774 | bool query = str[0] == '?' && !str[1]; |
3656 | int saveop = op; |
3775 | int saveop = op; |
|
|
3776 | dDisp; |
3657 | |
3777 | |
3658 | assert (str != NULL); |
3778 | assert (str != NULL); |
3659 | switch (op) |
3779 | switch (op) |
3660 | { |
3780 | { |
3661 | case XTerm_name: |
3781 | case XTerm_name: |
… | |
… | |
3677 | unsigned long bytes_after; |
3797 | unsigned long bytes_after; |
3678 | unsigned char *value = 0; |
3798 | unsigned char *value = 0; |
3679 | const char *str = ""; |
3799 | const char *str = ""; |
3680 | |
3800 | |
3681 | if (prop |
3801 | if (prop |
3682 | && XGetWindowProperty (display->display, TermWin.parent[0], |
3802 | && XGetWindowProperty (disp, parent[0], |
3683 | prop, 0, 1<<16, 0, AnyPropertyType, |
3803 | prop, 0, 1<<16, 0, AnyPropertyType, |
3684 | &actual_type, &actual_format, |
3804 | &actual_type, &actual_format, |
3685 | &nitems, &bytes_after, &value) == Success |
3805 | &nitems, &bytes_after, &value) == Success |
3686 | && actual_type != None |
3806 | && actual_type != None |
3687 | && actual_format == 8) |
3807 | && actual_format == 8) |
… | |
… | |
3699 | { |
3819 | { |
3700 | *eq = 0; |
3820 | *eq = 0; |
3701 | set_utf8_property (display->atom (str), eq + 1); |
3821 | set_utf8_property (display->atom (str), eq + 1); |
3702 | } |
3822 | } |
3703 | else |
3823 | else |
3704 | XDeleteProperty (display->display, TermWin.parent[0], |
3824 | XDeleteProperty (disp, parent[0], |
3705 | display->atom (str)); |
3825 | display->atom (str)); |
3706 | } |
3826 | } |
3707 | break; |
3827 | break; |
3708 | |
3828 | |
3709 | case XTerm_Color: |
3829 | case XTerm_Color: |
… | |
… | |
3711 | { |
3831 | { |
3712 | if ((name = strchr (buf, ';')) == NULL) |
3832 | if ((name = strchr (buf, ';')) == NULL) |
3713 | break; |
3833 | break; |
3714 | |
3834 | |
3715 | *name++ = '\0'; |
3835 | *name++ = '\0'; |
3716 | color = atoi (buf); |
3836 | color = atoi (buf) + minCOLOR; |
3717 | |
3837 | |
3718 | if (color < 0 || color >= TOTAL_COLORS) |
3838 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
3719 | break; |
3839 | break; |
3720 | |
3840 | |
3721 | if ((buf = strchr (name, ';')) != NULL) |
3841 | if ((buf = strchr (name, ';')) != NULL) |
3722 | *buf++ = '\0'; |
3842 | *buf++ = '\0'; |
3723 | |
3843 | |
3724 | if (name[0] == '?' && !name[1]) |
3844 | if (name[0] == '?' && !name[1]) |
3725 | { |
3845 | { |
3726 | unsigned short r, g, b; |
3846 | unsigned short r, g, b; |
3727 | pix_colors_focused[color + minCOLOR].get (display, r, g, b); |
3847 | pix_colors_focused[color].get (display, r, g, b); |
3728 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3848 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3729 | } |
3849 | } |
3730 | else |
3850 | else |
3731 | set_window_color (color + minCOLOR, name); |
3851 | set_window_color (color, name); |
3732 | } |
3852 | } |
3733 | break; |
3853 | break; |
3734 | case XTerm_Color00: |
3854 | case XTerm_Color00: |
3735 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3855 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3736 | break; |
3856 | break; |
3737 | case XTerm_Color01: |
3857 | case XTerm_Color01: |
3738 | process_color_seq (XTerm_Color00, Color_bg, str, resp); |
3858 | process_color_seq (XTerm_Color01, Color_bg, str, resp); |
3739 | break; |
3859 | break; |
3740 | #ifndef NO_CURSORCOLOR |
3860 | #ifndef NO_CURSORCOLOR |
3741 | case XTerm_Color_cursor: |
3861 | case XTerm_Color_cursor: |
3742 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3862 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3743 | break; |
3863 | break; |
… | |
… | |
3747 | break; |
3867 | break; |
3748 | case XTerm_Color_pointer_bg: |
3868 | case XTerm_Color_pointer_bg: |
3749 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3869 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3750 | break; |
3870 | break; |
3751 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3871 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3752 | case XTerm_Color_BD: |
|
|
3753 | process_color_seq (XTerm_Color_BD, Color_BD, str, resp); |
|
|
3754 | break; |
|
|
3755 | case XTerm_Color_IT: |
|
|
3756 | process_color_seq (XTerm_Color_IT, Color_IT, str, resp); |
|
|
3757 | break; |
|
|
3758 | case XTerm_Color_UL: |
|
|
3759 | process_color_seq (XTerm_Color_UL, Color_UL, str, resp); |
|
|
3760 | break; |
|
|
3761 | case XTerm_Color_RV: |
3872 | case XTerm_Color_RV: |
3762 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3873 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3763 | break; |
3874 | break; |
|
|
3875 | case Rxvt_Color_BD: |
|
|
3876 | case URxvt_Color_BD: |
|
|
3877 | process_color_seq (op, Color_BD, str, resp); |
|
|
3878 | break; |
|
|
3879 | case Rxvt_Color_UL: |
|
|
3880 | case URxvt_Color_UL: |
|
|
3881 | process_color_seq (op, Color_UL, str, resp); |
|
|
3882 | break; |
|
|
3883 | case URxvt_Color_IT: |
|
|
3884 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
|
|
3885 | break; |
3764 | #endif |
3886 | #endif |
3765 | #if TRANSPARENT && TINTING |
3887 | #if TRANSPARENT && TINTING |
3766 | case XTerm_Color_tint: |
3888 | case URxvt_Color_tint: |
3767 | process_color_seq (XTerm_Color_tint, Color_tint, str, resp); |
3889 | process_color_seq (URxvt_Color_tint, Color_tint, str, resp); |
3768 | check_our_parents (); |
3890 | check_our_parents (); |
3769 | if (am_transparent) |
3891 | if (am_transparent) |
3770 | want_full_refresh = want_refresh = 1; |
3892 | want_full_refresh = want_refresh = 1; |
3771 | break; |
3893 | break; |
3772 | #endif |
3894 | #endif |
3773 | |
3895 | |
3774 | case XTerm_Pixmap: |
3896 | case Rxvt_Pixmap: |
3775 | if (*str != ';') |
3897 | if (*str != ';') |
3776 | { |
3898 | { |
3777 | #if XPM_BACKGROUND |
3899 | #if XPM_BACKGROUND |
3778 | scale_pixmap (""); /* reset to default scaling */ |
3900 | scale_pixmap (""); /* reset to default scaling */ |
3779 | set_bgPixmap (str); /* change pixmap */ |
3901 | set_bgPixmap (str); /* change pixmap */ |
3780 | #endif |
|
|
3781 | scr_touch (true); |
3902 | scr_touch (true); |
|
|
3903 | #endif |
3782 | } |
3904 | } |
|
|
3905 | |
3783 | while ((str = strchr (str, ';')) != NULL) |
3906 | while ((str = strchr (str, ';')) != NULL) |
3784 | { |
3907 | { |
3785 | str++; |
3908 | str++; |
3786 | #if XPM_BACKGROUND |
3909 | #if XPM_BACKGROUND |
3787 | changed += scale_pixmap (str); |
3910 | changed += scale_pixmap (str); |
3788 | #endif |
3911 | #endif |
3789 | |
|
|
3790 | } |
3912 | } |
|
|
3913 | |
3791 | if (changed) |
3914 | if (changed) |
3792 | { |
3915 | { |
3793 | #ifdef XPM_BACKGROUND |
3916 | #ifdef XPM_BACKGROUND |
3794 | resize_pixmap (); |
3917 | resize_pixmap (); |
3795 | #endif |
|
|
3796 | scr_touch (true); |
3918 | scr_touch (true); |
|
|
3919 | #endif |
3797 | } |
3920 | } |
3798 | break; |
3921 | break; |
3799 | |
3922 | |
3800 | case XTerm_restoreFG: |
3923 | case Rxvt_restoreFG: |
3801 | set_window_color (Color_fg, str); |
3924 | set_window_color (Color_fg, str); |
3802 | break; |
3925 | break; |
3803 | case XTerm_restoreBG: |
3926 | case Rxvt_restoreBG: |
3804 | set_window_color (Color_bg, str); |
3927 | set_window_color (Color_bg, str); |
3805 | break; |
3928 | break; |
3806 | |
3929 | |
3807 | case XTerm_logfile: |
3930 | case XTerm_logfile: |
3808 | // TODO, when secure mode? |
3931 | // TODO, when secure mode? |
3809 | break; |
3932 | break; |
3810 | |
3933 | |
|
|
3934 | #if 0 |
|
|
3935 | case Rxvt_dumpscreen: /* no error notices */ |
|
|
3936 | { |
|
|
3937 | int fd; |
|
|
3938 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
|
|
3939 | { |
|
|
3940 | scr_dump (fd); |
|
|
3941 | close (fd); |
|
|
3942 | } |
|
|
3943 | } |
|
|
3944 | break; |
|
|
3945 | #endif |
3811 | case XTerm_font: |
3946 | case XTerm_font: |
3812 | op = URxvt_font; |
3947 | op = URxvt_font; |
3813 | case URxvt_font: |
3948 | case URxvt_font: |
3814 | #if ENABLE_STYLES |
3949 | #if ENABLE_STYLES |
3815 | case URxvt_boldFont: |
3950 | case URxvt_boldFont: |
3816 | case URxvt_italicFont: |
3951 | case URxvt_italicFont: |
3817 | case URxvt_boldItalicFont: |
3952 | case URxvt_boldItalicFont: |
3818 | #endif |
3953 | #endif |
3819 | if (query) |
3954 | if (query) |
3820 | tt_printf ("\33]%d;%-.250s%c", saveop, |
3955 | tt_printf ("\33]%d;%-.250s%c", saveop, |
3821 | (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc |
3956 | OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc |
3822 | ? TermWin.fontset[op - URxvt_font]->fontdesc : "", |
3957 | ? fontset[op - URxvt_font]->fontdesc : "", |
3823 | resp); |
3958 | resp); |
3824 | else |
3959 | else |
3825 | { |
3960 | { |
3826 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
3961 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
3827 | |
3962 | |
… | |
… | |
3830 | set_fonts (); |
3965 | set_fonts (); |
3831 | } |
3966 | } |
3832 | break; |
3967 | break; |
3833 | |
3968 | |
3834 | #if ENABLE_FRILLS |
3969 | #if ENABLE_FRILLS |
3835 | case XTerm_locale: |
3970 | case URxvt_locale: |
3836 | if (query) |
3971 | if (query) |
3837 | tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); |
3972 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
3838 | else |
3973 | else |
3839 | { |
3974 | { |
3840 | set_locale (str); |
3975 | set_locale (str); |
3841 | # ifdef USE_XIM |
3976 | pty->set_utf8_mode (enc_utf8); |
3842 | im_cb (); |
3977 | init_xlocale (); |
3843 | # endif |
|
|
3844 | } |
3978 | } |
3845 | break; |
3979 | break; |
3846 | #endif |
|
|
3847 | |
3980 | |
3848 | #ifdef MENUBAR |
3981 | case URxvt_view_up: |
3849 | case XTerm_Menu: |
3982 | case URxvt_view_down: |
3850 | if (options & Opt_insecure) |
3983 | { |
3851 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3984 | int lines = atoi (str); |
|
|
3985 | |
|
|
3986 | if (lines) |
|
|
3987 | scr_page (op == URxvt_view_up ? UP : DN, lines); |
|
|
3988 | else |
|
|
3989 | scr_erase_savelines (); |
|
|
3990 | } |
|
|
3991 | |
3852 | break; |
3992 | break; |
3853 | #endif |
3993 | #endif |
3854 | #if 0 |
3994 | |
3855 | case XTerm_dumpscreen: /* no error notices */ |
3995 | #if ENABLE_PERL |
3856 | { |
3996 | case URxvt_perl: |
3857 | int fd; |
3997 | if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) |
3858 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3998 | ; // no responses yet |
3859 | { |
|
|
3860 | scr_dump (fd); |
|
|
3861 | close (fd); |
|
|
3862 | } |
|
|
3863 | } |
|
|
3864 | break; |
3999 | break; |
3865 | #endif |
4000 | #endif |
3866 | } |
4001 | } |
3867 | } |
4002 | } |
3868 | /*----------------------------------------------------------------------*/ |
4003 | /*----------------------------------------------------------------------*/ |
… | |
… | |
3920 | { 5, PrivMode_rVideo }, |
4055 | { 5, PrivMode_rVideo }, |
3921 | { 6, PrivMode_relOrigin }, |
4056 | { 6, PrivMode_relOrigin }, |
3922 | { 7, PrivMode_Autowrap }, |
4057 | { 7, PrivMode_Autowrap }, |
3923 | // 8, bi-directional support mode |
4058 | // 8, bi-directional support mode |
3924 | { 9, PrivMode_MouseX10 }, |
4059 | { 9, PrivMode_MouseX10 }, |
3925 | #ifdef menuBar_esc |
|
|
3926 | { menuBar_esc, PrivMode_menuBar }, |
|
|
3927 | #endif |
|
|
3928 | // 18, 19 printing-related |
4060 | // 18, 19 printing-related |
3929 | { 25, PrivMode_VisibleCursor }, |
4061 | { 25, PrivMode_VisibleCursor }, |
3930 | #ifdef scrollBar_esc |
4062 | #ifdef scrollBar_esc |
3931 | { scrollBar_esc, PrivMode_scrollBar }, |
4063 | { scrollBar_esc, PrivMode_scrollBar }, |
3932 | #endif |
4064 | #endif |
… | |
… | |
3977 | } |
4109 | } |
3978 | |
4110 | |
3979 | /* extra handling for values with state unkept */ |
4111 | /* extra handling for values with state unkept */ |
3980 | switch (arg[i]) |
4112 | switch (arg[i]) |
3981 | { |
4113 | { |
|
|
4114 | #if ENABLE_STYLES |
|
|
4115 | case 1021: |
|
|
4116 | set_option (Opt_intensityStyles, mode); |
|
|
4117 | |
|
|
4118 | scr_touch (true); |
|
|
4119 | break; |
|
|
4120 | #endif |
3982 | case 1048: /* alternative cursor save */ |
4121 | case 1048: /* alternative cursor save */ |
3983 | case 1049: |
4122 | case 1049: |
3984 | if (options & Opt_secondaryScreen) |
4123 | if (OPTION (Opt_secondaryScreen)) |
3985 | if (mode == 0) |
4124 | if (mode == 0) |
3986 | scr_cursor (RESTORE); |
4125 | scr_cursor (RESTORE); |
3987 | else if (mode == 1) |
4126 | else if (mode == 1) |
3988 | scr_cursor (SAVE); |
4127 | scr_cursor (SAVE); |
3989 | break; |
4128 | break; |
… | |
… | |
4001 | */ |
4140 | */ |
4002 | PrivMode (1, PrivMode_vt52); |
4141 | PrivMode (1, PrivMode_vt52); |
4003 | break; |
4142 | break; |
4004 | case 3: /* 80/132 */ |
4143 | case 3: /* 80/132 */ |
4005 | if (priv_modes & PrivMode_132OK) |
4144 | if (priv_modes & PrivMode_132OK) |
4006 | set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); |
4145 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4007 | break; |
4146 | break; |
4008 | case 4: /* smooth scrolling */ |
4147 | case 4: /* smooth scrolling */ |
4009 | if (state) |
|
|
4010 | options &= ~Opt_jumpScroll; |
|
|
4011 | else |
|
|
4012 | options |= Opt_jumpScroll; |
4148 | set_option (Opt_jumpScroll, !state); |
4013 | break; |
4149 | break; |
4014 | case 5: /* reverse video */ |
4150 | case 5: /* reverse video */ |
4015 | scr_rvideo_mode (state); |
4151 | scr_rvideo_mode (state); |
4016 | break; |
4152 | break; |
4017 | case 6: /* relative/absolute origins */ |
4153 | case 6: /* relative/absolute origins */ |
… | |
… | |
4023 | /* case 8: - auto repeat, can't do on a per window basis */ |
4159 | /* case 8: - auto repeat, can't do on a per window basis */ |
4024 | case 9: /* X10 mouse reporting */ |
4160 | case 9: /* X10 mouse reporting */ |
4025 | if (state) /* orthogonal */ |
4161 | if (state) /* orthogonal */ |
4026 | priv_modes &= ~PrivMode_MouseX11; |
4162 | priv_modes &= ~PrivMode_MouseX11; |
4027 | break; |
4163 | break; |
4028 | #ifdef menuBar_esc |
|
|
4029 | case menuBar_esc: |
|
|
4030 | #ifdef MENUBAR |
|
|
4031 | map_menuBar (state); |
|
|
4032 | #endif |
|
|
4033 | break; |
|
|
4034 | #endif |
|
|
4035 | #ifdef scrollBar_esc |
4164 | #ifdef scrollBar_esc |
4036 | case scrollBar_esc: |
4165 | case scrollBar_esc: |
4037 | if (scrollbar_mapping (state)) |
4166 | if (scrollbar_mapping (state)) |
4038 | { |
4167 | { |
4039 | resize_all_windows (0, 0, 0); |
4168 | resize_all_windows (0, 0, 0); |
… | |
… | |
4058 | #if 0 |
4187 | #if 0 |
4059 | case 1001: |
4188 | case 1001: |
4060 | break; /* X11 mouse highlighting */ |
4189 | break; /* X11 mouse highlighting */ |
4061 | #endif |
4190 | #endif |
4062 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4191 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4063 | if (state) |
|
|
4064 | options &= ~Opt_scrollTtyOutput; |
|
|
4065 | else |
|
|
4066 | options |= Opt_scrollTtyOutput; |
4192 | set_option (Opt_scrollTtyOutput, !state); |
4067 | break; |
4193 | break; |
4068 | case 1011: /* scroll to bottom on key press */ |
4194 | case 1011: /* scroll to bottom on key press */ |
4069 | if (state) |
|
|
4070 | options |= Opt_scrollTtyKeypress; |
4195 | set_option (Opt_scrollTtyKeypress, state); |
4071 | else |
|
|
4072 | options &= ~Opt_scrollTtyKeypress; |
|
|
4073 | break; |
4196 | break; |
4074 | case 1047: /* secondary screen w/ clearing last */ |
4197 | case 1047: /* secondary screen w/ clearing last */ |
4075 | if (options & Opt_secondaryScreen) |
4198 | if (OPTION (Opt_secondaryScreen)) |
4076 | if (current_screen != PRIMARY) |
4199 | if (current_screen != PRIMARY) |
4077 | scr_erase_screen (2); |
4200 | scr_erase_screen (2); |
4078 | scr_change_screen (state); |
4201 | scr_change_screen (state); |
4079 | break; |
4202 | break; |
4080 | case 1049: /* secondary screen w/ clearing first */ |
4203 | case 1049: /* secondary screen w/ clearing first */ |
4081 | scr_change_screen (state); |
4204 | scr_change_screen (state); |
4082 | if (options & Opt_secondaryScreen) |
4205 | if (OPTION (Opt_secondaryScreen)) |
4083 | if (current_screen != PRIMARY) |
4206 | if (current_screen != PRIMARY) |
4084 | scr_erase_screen (2); |
4207 | scr_erase_screen (2); |
4085 | break; |
4208 | break; |
4086 | default: |
4209 | default: |
4087 | break; |
4210 | break; |
… | |
… | |
4215 | scr_color (Color_bg, Color_bg); |
4338 | scr_color (Color_bg, Color_bg); |
4216 | break; |
4339 | break; |
4217 | |
4340 | |
4218 | //case 50: // not variable spacing |
4341 | //case 50: // not variable spacing |
4219 | |
4342 | |
4220 | #ifndef NO_BRIGHTCOLOR |
4343 | #if ENABLE_FRILLS |
4221 | case 90: |
4344 | case 90: |
4222 | case 91: /* set bright fg color */ |
4345 | case 91: /* set bright fg color */ |
4223 | case 92: |
4346 | case 92: |
4224 | case 93: |
4347 | case 93: |
4225 | case 94: |
4348 | case 94: |
… | |
… | |
4237 | case 106: |
4360 | case 106: |
4238 | case 107: |
4361 | case 107: |
4239 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); |
4362 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); |
4240 | break; |
4363 | break; |
4241 | #endif |
4364 | #endif |
4242 | |
|
|
4243 | } |
4365 | } |
4244 | } |
4366 | } |
4245 | } |
4367 | } |
4246 | /*}}} */ |
4368 | /*}}} */ |
4247 | |
4369 | |
… | |
… | |
4271 | */ |
4393 | */ |
4272 | void |
4394 | void |
4273 | rxvt_term::tt_printf (const char *fmt,...) |
4395 | rxvt_term::tt_printf (const char *fmt,...) |
4274 | { |
4396 | { |
4275 | va_list arg_ptr; |
4397 | va_list arg_ptr; |
4276 | unsigned char buf[256]; |
4398 | char buf[256]; |
4277 | |
4399 | |
4278 | va_start (arg_ptr, fmt); |
4400 | va_start (arg_ptr, fmt); |
4279 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4401 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4280 | va_end (arg_ptr); |
4402 | va_end (arg_ptr); |
4281 | tt_write (buf, strlen (buf)); |
4403 | tt_write (buf, strlen (buf)); |
… | |
… | |
4283 | |
4405 | |
4284 | /* ---------------------------------------------------------------------- */ |
4406 | /* ---------------------------------------------------------------------- */ |
4285 | /* Write data to the pty as typed by the user, pasted with the mouse, |
4407 | /* Write data to the pty as typed by the user, pasted with the mouse, |
4286 | * or generated by us in response to a query ESC sequence. |
4408 | * or generated by us in response to a query ESC sequence. |
4287 | */ |
4409 | */ |
|
|
4410 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
|
|
4411 | |
4288 | void |
4412 | void |
4289 | rxvt_term::tt_write (const unsigned char *data, unsigned int len) |
4413 | rxvt_term::tt_write (const char *data, unsigned int len) |
4290 | { |
4414 | { |
4291 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4415 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
|
|
4416 | return; |
4292 | |
4417 | |
4293 | if (len) |
4418 | if (pty->pty < 0) |
|
|
4419 | return; |
|
|
4420 | |
|
|
4421 | if (v_buflen == 0) |
|
|
4422 | { |
|
|
4423 | ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); |
|
|
4424 | |
|
|
4425 | if ((unsigned int)written == len) |
|
|
4426 | return; |
|
|
4427 | |
|
|
4428 | data += written; |
|
|
4429 | len -= written; |
4294 | { |
4430 | } |
|
|
4431 | |
|
|
4432 | v_buffer = (char *)realloc (v_buffer, v_buflen + len); |
|
|
4433 | |
|
|
4434 | memcpy (v_buffer + v_buflen, data, len); |
|
|
4435 | v_buflen += len; |
|
|
4436 | |
|
|
4437 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
|
|
4438 | } |
|
|
4439 | |
|
|
4440 | void rxvt_term::pty_write () |
|
|
4441 | { |
|
|
4442 | int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
|
|
4443 | |
|
|
4444 | if (written > 0) |
|
|
4445 | { |
|
|
4446 | v_buflen -= written; |
|
|
4447 | |
4295 | if (v_buflen == 0) |
4448 | if (v_buflen == 0) |
4296 | { |
4449 | { |
4297 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
|
|
4298 | |
|
|
4299 | if ((unsigned int)written == len) |
|
|
4300 | return; |
|
|
4301 | |
|
|
4302 | data += written; |
|
|
4303 | len -= written; |
|
|
4304 | } |
|
|
4305 | |
|
|
4306 | |
|
|
4307 | v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); |
|
|
4308 | |
|
|
4309 | memcpy (v_buffer + v_buflen, data, len); |
|
|
4310 | v_buflen += len; |
|
|
4311 | } |
|
|
4312 | |
|
|
4313 | for (;;) |
|
|
4314 | { |
|
|
4315 | int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
|
|
4316 | |
|
|
4317 | if (written > 0) |
|
|
4318 | { |
|
|
4319 | v_buflen -= written; |
|
|
4320 | |
|
|
4321 | if (v_buflen == 0) |
|
|
4322 | { |
|
|
4323 | free (v_buffer); |
4450 | free (v_buffer); |
4324 | v_buffer = 0; |
4451 | v_buffer = 0; |
4325 | v_buflen = 0; |
4452 | v_buflen = 0; |
4326 | |
4453 | |
4327 | pty_ev.set (EVENT_READ); |
4454 | pty_ev.set (EVENT_READ); |
4328 | return; |
|
|
4329 | } |
|
|
4330 | |
|
|
4331 | memmove (v_buffer, v_buffer + written, v_buflen); |
|
|
4332 | } |
|
|
4333 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
|
|
4334 | // original code just ignores this... |
|
|
4335 | destroy (); |
|
|
4336 | else |
|
|
4337 | { |
|
|
4338 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
|
|
4339 | return; |
4455 | return; |
4340 | } |
4456 | } |
|
|
4457 | |
|
|
4458 | memmove (v_buffer, v_buffer + written, v_buflen); |
4341 | } |
4459 | } |
|
|
4460 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
|
|
4461 | pty_ev.set (EVENT_READ); |
4342 | } |
4462 | } |
4343 | |
4463 | |
4344 | /*----------------------- end-of-file (C source) -----------------------*/ |
4464 | /*----------------------- end-of-file (C source) -----------------------*/ |
4345 | |
4465 | |