ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.168 by root, Sun Sep 5 09:32:59 2004 UTC vs.
Revision 1.203 by root, Sat Jun 18 09:02:37 2005 UTC

… …
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-2005 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.
… …
48#include "../config.h" /* NECESSARY */ 48#include "../config.h" /* NECESSARY */
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h" /* NECESSARY */
50#include "version.h" 50#include "version.h"
51#include "command.h" 51#include "command.h"
52 52
53#include <wchar.h> 53#ifdef KEYSYM_RESOURCE
54# include "keyboard.h"
55#endif
56
57#include <csignal>
54 58
55/*----------------------------------------------------------------------*/ 59/*----------------------------------------------------------------------*/
56 60
57#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
58 62
… …
113 XK_Escape, 0x238b, 117 XK_Escape, 0x238b,
114 XK_Undo, 0x238c, 118 XK_Undo, 0x238c,
115 XK_Print, 0x2399, 119 XK_Print, 0x2399,
116 120
117 XK_space, 0x2423, 121 XK_space, 0x2423,
122
123#ifdef XK_KP_Begin
124 XK_KP_Prior, 0x21de,
125 XK_KP_Next, 0x21df,
126 XK_KP_Begin, 0x2320,
127 XK_KP_Insert, 0x2380,
128 XK_KP_Delete, 0x2326,
118 XK_KP_Space, 0x2422, 129 XK_KP_Space, 0x2422,
130#endif
119 0, 131 0,
120}; 132};
121 133
122void 134void
123rxvt_term::iso14755_54 (int x, int y) 135rxvt_term::iso14755_54 (int x, int y)
… …
151void 163void
152rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r)
153{ 165{
154 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
155 rxvt_font *f = (*fs)[fs->find_font (ch)]; 167 rxvt_font *f = (*fs)[fs->find_font (ch)];
156 wchar_t *chr, *alloc, ch2; 168 wchar_t *chr, *alloc, ch2, *fname;
157 int len; 169 int len;
170
171 fname = rxvt_utf8towcs (f->name);
158 172
159#if ENABLE_COMBINING 173#if ENABLE_COMBINING
160 if (IS_COMPOSE (ch)) 174 if (IS_COMPOSE (ch))
161 { 175 {
162 len = rxvt_composite.expand (ch, 0); 176 len = rxvt_composite.expand (ch, 0);
… …
171 alloc = 0; 185 alloc = 0;
172 chr = &ch2; 186 chr = &ch2;
173 len = 1; 187 len = 1;
174 } 188 }
175 189
176 int width = strlen (f->name); 190 int width = wcswidth (fname, wcslen (fname));
177 191
178 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 192 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1);
179 193
180 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 194 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
181 195
… …
194#endif 208#endif
195 scr_overlay_set (11, y, ch, r); 209 scr_overlay_set (11, y, ch, r);
196 scr_overlay_set (12, y, NOCHAR, r); 210 scr_overlay_set (12, y, NOCHAR, r);
197 } 211 }
198 212
199 scr_overlay_set (0, len, f->name); 213 scr_overlay_set (0, len, fname);
214
215 free (fname);
200 216
201#if ENABLE_COMBINING 217#if ENABLE_COMBINING
202 if (alloc) 218 if (alloc)
203 delete [] alloc; 219 delete [] alloc;
204#endif 220#endif
… …
272 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 288 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
273 * escape sequence to toggle the Keypad. 289 * escape sequence to toggle the Keypad.
274 * 290 *
275 * Always permit `shift' to override the current setting 291 * Always permit `shift' to override the current setting
276 */ 292 */
277 shft = (ev.state & ShiftMask); 293 shft = ev.state & ShiftMask;
278 ctrl = (ev.state & ControlMask); 294 ctrl = ev.state & ControlMask;
279 meta = (ev.state & ModMetaMask); 295 meta = ev.state & ModMetaMask;
280 296
281 if (numlock_state || (ev.state & ModNumLockMask)) 297 if (numlock_state || (ev.state & ModNumLockMask))
282 { 298 {
283 numlock_state = (ev.state & ModNumLockMask); 299 numlock_state = (ev.state & ModNumLockMask);
284 PrivMode ((!numlock_state), PrivMode_aplKP); 300 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
304 320
305 // the XOpenIM manpage lies about hardcoding the locale 321 // the XOpenIM manpage lies about hardcoding the locale
306 // at the point of XOpenIM, so temporarily switch locales 322 // at the point of XOpenIM, so temporarily switch locales
307 if (rs[Rs_imLocale]) 323 if (rs[Rs_imLocale])
308 SET_LOCALE (rs[Rs_imLocale]); 324 SET_LOCALE (rs[Rs_imLocale]);
325
309 // assume wchar_t == unicode or better 326 // assume wchar_t == unicode or better
310 len = XwcLookupString (Input_Context, &ev, wkbuf, 327 len = XwcLookupString (Input_Context, &ev, wkbuf,
311 KBUFSZ, &keysym, &status_return); 328 KBUFSZ, &keysym, &status_return);
329
312 if (rs[Rs_imLocale]) 330 if (rs[Rs_imLocale])
313 SET_LOCALE (locale); 331 SET_LOCALE (locale);
314 332
315 if (status_return == XLookupChars 333 if (status_return == XLookupChars
316 || status_return == XLookupBoth) 334 || status_return == XLookupBoth)
… …
343 valid_keysym = keysym != NoSymbol; 361 valid_keysym = keysym != NoSymbol;
344 } 362 }
345 363
346 if (valid_keysym) 364 if (valid_keysym)
347 { 365 {
366#ifdef KEYSYM_RESOURCE
367 if (keyboard->dispatch (this, keysym, ev.state))
368 return;
369#endif
370
348 if (TermWin.saveLines) 371 if (TermWin.saveLines)
349 { 372 {
350#ifdef UNSHIFTED_SCROLLKEYS 373#ifdef UNSHIFTED_SCROLLKEYS
351 if (!ctrl && !meta) 374 if (!ctrl && !meta)
352#else 375#else
… …
417 { 440 {
418 /* normal XTerm key bindings */ 441 /* normal XTerm key bindings */
419 case XK_Insert: /* Shift+Insert = paste mouse selection */ 442 case XK_Insert: /* Shift+Insert = paste mouse selection */
420 selection_request (ev.time, 0, 0); 443 selection_request (ev.time, 0, 0);
421 return; 444 return;
422#if TODO // TODO 445#if TODO
423 /* rxvt extras */ 446 /* rxvt extras */
424 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 447 case XK_KP_Add: /* Shift+KP_Add = bigger font */
425 change_font (FONT_UP); 448 change_font (FONT_UP);
426 return; 449 return;
427 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 450 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
… …
486 } 509 }
487#endif 510#endif
488 511
489 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 512 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
490 { 513 {
491#ifdef KEYSYM_RESOURCE
492 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
493 {
494 unsigned int l;
495 const unsigned char *kbuf0;
496
497 kbuf0 = (Keysym_map[keysym & 0xFF]);
498 l = (unsigned int)*kbuf0++;
499
500 /* escape prefix */
501 if (meta
502# ifdef META8_OPTION
503 && meta_char == C0_ESC
504# endif
505 )
506 {
507 const unsigned char ch = C0_ESC;
508 tt_write (&ch, 1);
509 }
510
511 tt_write (kbuf0, l);
512 return;
513 }
514 else
515#endif
516 { 514 {
517 newlen = 1; 515 newlen = 1;
518 switch (keysym) 516 switch (keysym)
519 { 517 {
520#ifndef NO_BACKSPACE_KEY 518#ifndef NO_BACKSPACE_KEY
… …
528 else 526 else
529 strcpy (kbuf, key_backspace); 527 strcpy (kbuf, key_backspace);
530 break; 528 break;
531#endif 529#endif
532#ifndef NO_DELETE_KEY 530#ifndef NO_DELETE_KEY
531# ifdef XK_KP_Prior
532 case XK_KP_Delete:
533 /* allow shift to override */
534 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
535 {
536 strcpy (kbuf, "\033On");
537 break;
538 }
539 /* FALLTHROUGH */
540# endif
533 case XK_Delete: 541 case XK_Delete:
534 strcpy (kbuf, key_delete); 542 strcpy (kbuf, key_delete);
535 break; 543 break;
536#endif 544#endif
537 case XK_Tab: 545 case XK_Tab:
… …
640#ifdef XK_KP_Begin 648#ifdef XK_KP_Begin
641 case XK_KP_Begin: 649 case XK_KP_Begin:
642 strcpy (kbuf, "\033Ou"); 650 strcpy (kbuf, "\033Ou");
643 break; 651 break;
644 652
645 case XK_KP_Insert:
646 strcpy (kbuf, "\033Op");
647 break;
648
649 case XK_KP_Delete:
650 strcpy (kbuf, "\033On");
651 break;
652#endif 653#endif
653 case XK_KP_F1: /* "\033OP" */ 654 case XK_KP_F1: /* "\033OP" */
654 case XK_KP_F2: /* "\033OQ" */ 655 case XK_KP_F2: /* "\033OQ" */
655 case XK_KP_F3: /* "\033OR" */ 656 case XK_KP_F3: /* "\033OR" */
656 case XK_KP_F4: /* "\033OS" */ 657 case XK_KP_F4: /* "\033OS" */
… …
688 break; 689 break;
689 690
690 case XK_Find: 691 case XK_Find:
691 strcpy (kbuf, "\033[1~"); 692 strcpy (kbuf, "\033[1~");
692 break; 693 break;
694
695#ifdef XK_KP_End
696 case XK_KP_Insert:
697 /* allow shift to override */
698 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
699 {
700 strcpy (kbuf, "\033Op");
701 break;
702 }
703 /* FALLTHROUGH */
704#endif
693 case XK_Insert: 705 case XK_Insert:
694 strcpy (kbuf, "\033[2~"); 706 strcpy (kbuf, "\033[2~");
695 break; 707 break;
696#ifdef DXK_Remove /* support for DEC remove like key */ 708#ifdef DXK_Remove /* support for DEC remove like key */
697 case DXK_Remove: 709 case DXK_Remove:
… …
787#undef FKEY 799#undef FKEY
788 default: 800 default:
789 newlen = 0; 801 newlen = 0;
790 break; 802 break;
791 } 803 }
804
792 if (newlen) 805 if (newlen)
793 len = strlen (kbuf); 806 len = strlen (kbuf);
794 } 807 }
795 808
796 /* 809 /*
… …
804 } 817 }
805 else if (ctrl && keysym == XK_minus) 818 else if (ctrl && keysym == XK_minus)
806 { 819 {
807 len = 1; 820 len = 1;
808 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 821 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
822 }
823 else if (keysym == XK_ISO_Left_Tab)
824 {
825 strcpy (kbuf, "\033[Z");
826 len = 3;
809 } 827 }
810 else 828 else
811 { 829 {
812#ifdef META8_OPTION 830#ifdef META8_OPTION
813 /* set 8-bit on */ 831 /* set 8-bit on */
… …
872#endif /* DEBUG_CMD */ 890#endif /* DEBUG_CMD */
873 tt_write (kbuf, (unsigned int)len); 891 tt_write (kbuf, (unsigned int)len);
874} 892}
875/*}}} */ 893/*}}} */
876 894
877#if (MENUBAR_MAX) 895#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
878/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 896/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
879/* attempt to `write' count to the input buffer */ 897/* attempt to `write' count to the input buffer */
880unsigned int 898unsigned int
881rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 899rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
882{ 900{
… …
905 923
906 cmd_parse (); 924 cmd_parse ();
907 925
908 return 0; 926 return 0;
909} 927}
910#endif /* MENUBAR_MAX */ 928#endif
911 929
912void 930void
913rxvt_term::flush () 931rxvt_term::flush ()
914{ 932{
915 flush_ev.stop (); 933 flush_ev.stop ();
… …
1016{ 1034{
1017 if (mouse_slip_wheel_speed == 0 1035 if (mouse_slip_wheel_speed == 0
1018 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1036 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1019 : scr_page (UP, mouse_slip_wheel_speed)) 1037 : scr_page (UP, mouse_slip_wheel_speed))
1020 { 1038 {
1039 if (TermWin.view_start == TermWin.nscrolled ||
1040 TermWin.view_start == 0)
1041 mouse_slip_wheel_speed = 0;
1042
1021 refresh_type |= SMOOTH_REFRESH; 1043 refresh_type |= SMOOTH_REFRESH;
1022 want_refresh = 1; 1044 want_refresh = 1;
1023 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1045 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1024 } 1046 }
1025} 1047}
… …
1057rxvt_term::pty_cb (io_watcher &w, short revents) 1079rxvt_term::pty_cb (io_watcher &w, short revents)
1058{ 1080{
1059 SET_R (this); 1081 SET_R (this);
1060 SET_LOCALE (locale); 1082 SET_LOCALE (locale);
1061 1083
1062 if (revents & EVENT_WRITE)
1063 tt_write (0, 0);
1064 else if (revents & EVENT_READ) 1084 if (revents & EVENT_READ)
1065 // loop, but don't allow a single term to monopolize us 1085 // loop, but don't allow a single term to monopolize us
1066 while (pty_fill ()) 1086 while (pty_fill ())
1067 if (cmd_parse ()) 1087 if (cmd_parse ())
1068 break; 1088 break;
1089
1090 if (revents & EVENT_WRITE)
1091 pty_write ();
1069} 1092}
1070 1093
1071void 1094void
1072rxvt_term::pointer_unblank () 1095rxvt_term::pointer_unblank ()
1073{ 1096{
… …
1087rxvt_term::pointer_blank () 1110rxvt_term::pointer_blank ()
1088{ 1111{
1089 if (! (options & Opt_pointerBlank)) 1112 if (! (options & Opt_pointerBlank))
1090 return; 1113 return;
1091 1114
1092 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1115 XDefineCursor (display->display, TermWin.vt, display->blank_cursor);
1093 XFlush (display->display); 1116 XFlush (display->display);
1094 1117
1095 hidden_pointer = 1; 1118 hidden_pointer = 1;
1096} 1119}
1097 1120
… …
1186 1209
1187/*{{{ process an X event */ 1210/*{{{ process an X event */
1188void 1211void
1189rxvt_term::x_cb (XEvent &ev) 1212rxvt_term::x_cb (XEvent &ev)
1190{ 1213{
1214 dDisp;
1215
1191 SET_R (this); 1216 SET_R (this);
1192 SET_LOCALE (locale); 1217 SET_LOCALE (locale);
1193 1218
1194#if defined(CURSOR_BLINK) 1219#if defined(CURSOR_BLINK)
1195 if ((options & Opt_cursorBlink) && ev.type == KeyPress) 1220 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
… …
1216 if (ev.type == KeyPress && hidden_pointer == 0) 1241 if (ev.type == KeyPress && hidden_pointer == 0)
1217 pointer_blank (); 1242 pointer_blank ();
1218 } 1243 }
1219#endif 1244#endif
1220 1245
1221 Window unused_root, unused_child; 1246 Window unused_root, unused_child;
1222 int unused_root_x, unused_root_y; 1247 int unused_root_x, unused_root_y;
1223 unsigned int unused_mask; 1248 unsigned int unused_mask;
1224 1249
1225 switch (ev.type) 1250 switch (ev.type)
1226 { 1251 {
1227 case KeyPress: 1252 case KeyPress:
1228#if ISO_14755 1253#if ISO_14755
… …
1311 button_release (ev.xbutton); 1336 button_release (ev.xbutton);
1312 break; 1337 break;
1313 1338
1314 case ClientMessage: 1339 case ClientMessage:
1315 if (ev.xclient.format == 32 1340 if (ev.xclient.format == 32
1341 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1342 {
1316 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1343 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1317 destroy (); 1344 destroy ();
1345#if ENABLE_EWMH
1346 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1347 XSendEvent (disp, ev.xclient.window = display->root,
1348 False, SubstructureRedirectMask | SubstructureNotifyMask,
1349 &ev);
1350#endif
1351 }
1352#if ENABLE_XEMBED
1353 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1354 {
1355 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1356 focus_in ();
1357 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1358 focus_out ();
1359 }
1360#endif
1318#ifdef OFFIX_DND 1361#ifdef OFFIX_DND
1319 /* OffiX Dnd (drag 'n' drop) protocol */ 1362 /* OffiX Dnd (drag 'n' drop) protocol */
1320 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1363 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1321 && (ev.xclient.data.l[0] == DndFile 1364 && (ev.xclient.data.l[0] == DndFile
1322 || ev.xclient.data.l[0] == DndDir 1365 || ev.xclient.data.l[0] == DndDir
1323 || ev.xclient.data.l[0] == DndLink)) 1366 || ev.xclient.data.l[0] == DndLink))
1324 { 1367 {
1325 /* Get Dnd data */ 1368 /* Get Dnd data */
1326 Atom ActualType; 1369 Atom ActualType;
1327 int ActualFormat; 1370 int ActualFormat;
1328 unsigned char *data; 1371 unsigned char *data;
1329 unsigned long Size, RemainingBytes; 1372 unsigned long Size, RemainingBytes;
1330 1373
1331 XGetWindowProperty (display->display, display->root, 1374 XGetWindowProperty (disp, display->root,
1332 xa[XA_DNDSELECTION], 1375 xa[XA_DNDSELECTION],
1333 0L, 1000000L, 1376 0L, 1000000L,
1334 False, AnyPropertyType, 1377 False, AnyPropertyType,
1335 &ActualType, &ActualFormat, 1378 &ActualType, &ActualFormat,
1336 &Size, &RemainingBytes, 1379 &Size, &RemainingBytes,
1337 &data); 1380 &data);
1338 XChangeProperty (display->display, display->root, 1381 set_string_property (XA_CUT_BUFFER0, data);
1339 XA_CUT_BUFFER0, XA_STRING,
1340 8, PropModeReplace,
1341 data, strlen (data));
1342 XFree (data); 1382 XFree (data);
1343 selection_paste (display->root, XA_CUT_BUFFER0, True); 1383 selection_paste (display->root, XA_CUT_BUFFER0, true);
1344 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1384 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1345 } 1385 }
1346#endif /* OFFIX_DND */ 1386#endif /* OFFIX_DND */
1347 break; 1387 break;
1348 1388
1349 case MappingNotify: 1389 case MappingNotify:
… …
1374 break; 1414 break;
1375 } 1415 }
1376 break; 1416 break;
1377 1417
1378 case FocusIn: 1418 case FocusIn:
1379 if (!TermWin.focus) 1419 focus_in ();
1380 {
1381 TermWin.focus = 1;
1382 want_refresh = 1;
1383#ifdef USE_XIM
1384 if (Input_Context != NULL)
1385 {
1386 IMSetStatusPosition ();
1387 XSetICFocus (Input_Context);
1388 }
1389#endif
1390#ifdef CURSOR_BLINK
1391 if (options & Opt_cursorBlink)
1392 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1393#endif
1394#ifdef OFF_FOCUS_FADING
1395 if (rs[Rs_fade])
1396 {
1397 pix_colors = pix_colors_focused;
1398 scr_recolour ();
1399 }
1400#endif
1401
1402 }
1403 break; 1420 break;
1404 1421
1405 case FocusOut: 1422 case FocusOut:
1406 if (TermWin.focus) 1423 focus_out ();
1407 {
1408 TermWin.focus = 0;
1409 want_refresh = 1;
1410
1411#if ENABLE_FRILLS || ISO_14755
1412 iso14755buf = 0;
1413#endif
1414#if ENABLE_OVERLAY
1415 scr_overlay_off ();
1416#endif
1417#ifdef USE_XIM
1418 if (Input_Context != NULL)
1419 XUnsetICFocus (Input_Context);
1420#endif
1421#ifdef CURSOR_BLINK
1422 if (options & Opt_cursorBlink)
1423 cursor_blink_ev.stop ();
1424 hidden_cursor = 0;
1425#endif
1426#ifdef OFF_FOCUS_FADING
1427 if (rs[Rs_fade])
1428 {
1429 pix_colors = pix_colors_unfocused;
1430 scr_recolour ();
1431 }
1432#endif
1433 }
1434 break; 1424 break;
1435 1425
1436 case ConfigureNotify: 1426 case ConfigureNotify:
1437 if (ev.xconfigure.window == TermWin.parent[0]) 1427 if (ev.xconfigure.window == TermWin.parent[0])
1438 { 1428 {
… …
1442 { /* Wrap lots of configures into one */ 1432 { /* Wrap lots of configures into one */
1443 width = ev.xconfigure.width; 1433 width = ev.xconfigure.width;
1444 height = ev.xconfigure.height; 1434 height = ev.xconfigure.height;
1445 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); 1435 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1446 } 1436 }
1447 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1437 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev));
1448 1438
1449 if (szHint.width != width || szHint.height != height) 1439 if (szHint.width != width || szHint.height != height)
1450 { 1440 {
1451 seen_resize = 1; 1441 seen_resize = 1;
1452 resize_all_windows (width, height, 1); 1442 resize_all_windows (width, height, 1);
1453 } 1443 }
1454 1444
1455#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1445#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1456 if (options & Opt_transparent) 1446 if (options & Opt_transparent)
1457 {
1458 check_our_parents (); 1447 check_our_parents ();
1459 if (am_transparent)
1460 want_refresh = want_full_refresh = 1;
1461 }
1462#endif 1448#endif
1463 } 1449 }
1464 break; 1450 break;
1465 1451
1466 case PropertyNotify: 1452 case PropertyNotify:
… …
1474 selection_clear (); 1460 selection_clear ();
1475 break; 1461 break;
1476 1462
1477 case SelectionNotify: 1463 case SelectionNotify:
1478 if (selection_wait == Sel_normal) 1464 if (selection_wait == Sel_normal)
1479 selection_paste (ev.xselection.requestor, 1465 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1480 ev.xselection.property, True);
1481 break; 1466 break;
1482 1467
1483 case SelectionRequest: 1468 case SelectionRequest:
1484 selection_send (ev.xselectionrequest); 1469 selection_send (ev.xselectionrequest);
1485 break; 1470 break;
… …
1509 if (ev.xany.window == TermWin.vt) 1494 if (ev.xany.window == TermWin.vt)
1510 { 1495 {
1511 do 1496 do
1512 scr_expose (ev.xexpose.x, ev.xexpose.y, 1497 scr_expose (ev.xexpose.x, ev.xexpose.y,
1513 ev.xexpose.width, ev.xexpose.height, False); 1498 ev.xexpose.width, ev.xexpose.height, False);
1514 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1499 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev));
1515 1500
1516 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1501 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1517 1502
1518 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1503 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev))
1519 scr_expose (ev.xexpose.x, ev.xexpose.y, 1504 scr_expose (ev.xexpose.x, ev.xexpose.y,
1520 ev.xexpose.width, ev.xexpose.height, False); 1505 ev.xexpose.width, ev.xexpose.height, False);
1521 1506
1522 scr_refresh (refresh_type); 1507 scr_refresh (refresh_type);
1523 } 1508 }
1524 else 1509 else
1525 { 1510 {
1526 XEvent unused_event; 1511 XEvent unused_event;
1527 1512
1528 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1513 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1529 ; 1514 ;
1530 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1515 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1531 ; 1516 ;
1532 1517
1533 if (isScrollbarWindow (ev.xany.window)) 1518 if (isScrollbarWindow (ev.xany.window))
1534 { 1519 {
1535 scrollBar.setIdle (); 1520 scrollBar.setIdle ();
… …
1540 menubar_expose (); 1525 menubar_expose ();
1541#endif 1526#endif
1542 1527
1543#ifdef TRANSPARENT 1528#ifdef TRANSPARENT
1544 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1529 if (am_transparent && ev.xany.window == TermWin.parent[0])
1545 XClearWindow (display->display, ev.xany.window); 1530 XClearWindow (disp, ev.xany.window);
1546#endif 1531#endif
1547 } 1532 }
1548 break; 1533 break;
1549 1534
1550 case MotionNotify: 1535 case MotionNotify:
… …
1564 1549
1565 if (ev.xany.window == TermWin.vt) 1550 if (ev.xany.window == TermWin.vt)
1566 { 1551 {
1567 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1552 if (ev.xbutton.state & (Button1Mask | Button3Mask))
1568 { 1553 {
1569 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1554 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev))
1570 ; 1555 ;
1571 1556
1572 XQueryPointer (display->display, TermWin.vt, 1557 XQueryPointer (disp, TermWin.vt,
1573 &unused_root, &unused_child, 1558 &unused_root, &unused_child,
1574 &unused_root_x, &unused_root_y, 1559 &unused_root_x, &unused_root_y,
1575 &ev.xbutton.x, &ev.xbutton.y, 1560 &ev.xbutton.x, &ev.xbutton.y,
1576 &ev.xbutton.state); 1561 &ev.xbutton.state);
1577#ifdef MOUSE_THRESHOLD 1562#ifdef MOUSE_THRESHOLD
… …
1641#endif 1626#endif
1642 } 1627 }
1643 } 1628 }
1644 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1645 { 1630 {
1646 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1631 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1647 MotionNotify, &ev)) 1632 MotionNotify, &ev))
1648 ; 1633 ;
1649 1634
1650 XQueryPointer (display->display, scrollBar.win, 1635 XQueryPointer (disp, scrollBar.win,
1651 &unused_root, &unused_child, 1636 &unused_root, &unused_child,
1652 &unused_root_x, &unused_root_y, 1637 &unused_root_x, &unused_root_y,
1653 &ev.xbutton.x, &ev.xbutton.y, 1638 &ev.xbutton.x, &ev.xbutton.y,
1654 &unused_mask); 1639 &unused_mask);
1655 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1660 } 1645 }
1661 break; 1646 break;
1662 } 1647 }
1663} 1648}
1664 1649
1650void
1651rxvt_term::focus_in ()
1652{
1653 if (!TermWin.focus)
1654 {
1655 TermWin.focus = 1;
1656 want_refresh = 1;
1657#ifdef USE_XIM
1658 if (Input_Context != NULL)
1659 {
1660 IMSetStatusPosition ();
1661 XSetICFocus (Input_Context);
1662 }
1663#endif
1664#ifdef CURSOR_BLINK
1665 if (options & Opt_cursorBlink)
1666 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1667#endif
1668#ifdef OFF_FOCUS_FADING
1669 if (rs[Rs_fade])
1670 {
1671 pix_colors = pix_colors_focused;
1672 scr_recolour ();
1673 }
1674#endif
1675 }
1676}
1677
1678void
1679rxvt_term::focus_out ()
1680{
1681 if (TermWin.focus)
1682 {
1683 TermWin.focus = 0;
1684 want_refresh = 1;
1685
1686#if ENABLE_FRILLS || ISO_14755
1687 iso14755buf = 0;
1688#endif
1689#if ENABLE_OVERLAY
1690 scr_overlay_off ();
1691#endif
1692#ifdef USE_XIM
1693 if (Input_Context != NULL)
1694 XUnsetICFocus (Input_Context);
1695#endif
1696#ifdef CURSOR_BLINK
1697 if (options & Opt_cursorBlink)
1698 cursor_blink_ev.stop ();
1699 hidden_cursor = 0;
1700#endif
1701#ifdef OFF_FOCUS_FADING
1702 if (rs[Rs_fade])
1703 {
1704 pix_colors = pix_colors_unfocused;
1705 scr_recolour ();
1706 }
1707#endif
1708 }
1709}
1710
1665#if TRANSPARENT 1711#if TRANSPARENT
1666void 1712void
1667rxvt_term::rootwin_cb (XEvent &ev) 1713rxvt_term::rootwin_cb (XEvent &ev)
1668{ 1714{
1669 SET_R (this); 1715 SET_R (this);
… …
1674 case PropertyNotify: 1720 case PropertyNotify:
1675 /* 1721 /*
1676 * if user used some Esetroot compatible prog to set the root bg, 1722 * if user used some Esetroot compatible prog to set the root bg,
1677 * use the property to determine the pixmap. We use it later on. 1723 * use the property to determine the pixmap. We use it later on.
1678 */ 1724 */
1679 if (xa[XA_XROOTPMAPID] == 0)
1680 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1681
1682 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1725 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1726 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1683 return; 1727 return;
1684 1728
1685 /* FALLTHROUGH */ 1729 /* FALLTHROUGH */
1686 case ReparentNotify: 1730 case ReparentNotify:
1687 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1731 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
… …
1759 { 1803 {
1760 case Button1: 1804 case Button1:
1761 /* allow meta + click to select rectangular areas */ 1805 /* allow meta + click to select rectangular areas */
1762 /* should be done in screen.C */ 1806 /* should be done in screen.C */
1763#if ENABLE_FRILLS 1807#if ENABLE_FRILLS
1764 selection.rect = !! (ev.state & ModMetaMask); 1808 selection.rect = !!(ev.state & ModMetaMask);
1765#else 1809#else
1766 selection.rect = false; 1810 selection.rect = false;
1767#endif 1811#endif
1768 1812
1769 /* allow shift+left click to extend selection */ 1813 /* allow shift+left click to extend selection */
… …
2095 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2139 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2096 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2140 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2097 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2141 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2098 int i; 2142 int i;
2099 2143
2100 Visual* visual = display->visual; 2144 Visual *visual = display->visual;
2101 2145
2102 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2146 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2103 2147
2104 /* for convenience */ 2148 /* for convenience */
2105 mask_r = visual->red_mask; 2149 mask_r = visual->red_mask;
… …
2326 Atom atype; 2370 Atom atype;
2327 unsigned char *prop = NULL; 2371 unsigned char *prop = NULL;
2328 Window root, oldp, *list; 2372 Window root, oldp, *list;
2329 Pixmap rootpixmap = None; 2373 Pixmap rootpixmap = None;
2330 XWindowAttributes wattr, wrootattr; 2374 XWindowAttributes wattr, wrootattr;
2375 dDisp;
2331 2376
2332 pchanged = 0; 2377 pchanged = 0;
2333 2378
2334 if (!(options & Opt_transparent)) 2379 if (!(options & Opt_transparent))
2335 return pchanged; /* Don't try any more */ 2380 return pchanged; /* Don't try any more */
2336 2381
2337 XGetWindowAttributes (display->display, display->root, &wrootattr); 2382 XGetWindowAttributes (disp, display->root, &wrootattr);
2338 rootdepth = wrootattr.depth; 2383 rootdepth = wrootattr.depth;
2339 2384
2340 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2385 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
2341 2386
2342 if (rootdepth != wattr.depth) 2387 if (rootdepth != wattr.depth)
2343 { 2388 {
2344 if (am_transparent) 2389 if (am_transparent)
2345 { 2390 {
2346 pchanged = 1; 2391 pchanged = 1;
2347 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2392 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2348 am_transparent = am_pixmap_trans = 0; 2393 am_transparent = am_pixmap_trans = 0;
2349 } 2394 }
2350 2395
2351 return pchanged; /* Don't try any more */ 2396 return pchanged; /* Don't try any more */
2352 } 2397 }
2353 2398
2354 /* Get all X ops out of the queue so that our information is up-to-date. */ 2399 /* Get all X ops out of the queue so that our information is up-to-date. */
2355 XSync (display->display, False); 2400 XSync (disp, False);
2356 2401
2357 /* 2402 /*
2358 * Make the frame window set by the window manager have 2403 * Make the frame window set by the window manager have
2359 * the root background. Some window managers put multiple nested frame 2404 * the root background. Some window managers put multiple nested frame
2360 * windows for each client, so we have to take care about that. 2405 * windows for each client, so we have to take care about that.
2361 */ 2406 */
2362 i = (xa[XA_XROOTPMAPID] 2407 i = (xa[XA_XROOTPMAP_ID]
2363 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2408 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2364 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2409 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2365 &nitems, &bytes_after, &prop) == Success); 2410 &nitems, &bytes_after, &prop) == Success);
2366 2411
2367 if (!i || prop == NULL) 2412 if (!i || prop == NULL)
2368 i = (xa[XA_XSETROOTID] 2413 i = (xa[XA_ESETROOT_PMAP_ID]
2369 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2414 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2370 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2415 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2371 &nitems, &bytes_after, &prop) == Success); 2416 &nitems, &bytes_after, &prop) == Success);
2372 2417
2373 if (!i || prop == NULL 2418 if (!i || prop == NULL
2374#if TINTING 2419#if TINTING
… …
2393 Window cr; 2438 Window cr;
2394 XImage *image; 2439 XImage *image;
2395 GC gc; 2440 GC gc;
2396 XGCValues gcvalue; 2441 XGCValues gcvalue;
2397 2442
2398 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2443 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
2399 0, 0, &sx, &sy, &cr); 2444 0, 0, &sx, &sy, &cr);
2400 nw = (unsigned int)szHint.width; 2445 nw = (unsigned int)szHint.width;
2401 nh = (unsigned int)szHint.height; 2446 nh = (unsigned int)szHint.height;
2402 nx = ny = 0; 2447 nx = ny = 0;
2403 2448
… …
2415 sy = 0; 2460 sy = 0;
2416 } 2461 }
2417 2462
2418 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2463 MIN_IT (nw, (unsigned int) (wrootattr.width - sx));
2419 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2464 MIN_IT (nh, (unsigned int) (wrootattr.height - sy));
2465
2466 XSync (disp, False);
2420 allowedxerror = -1; 2467 allowedxerror = -1;
2421 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2468 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2422 2469
2423 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2470 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2424 /* XXX: may need a delay here? */ 2471 /* XXX: may need a delay here? */
2425 allowedxerror = 0; 2472 allowedxerror = 0;
2426 2473
… …
2429 if (am_transparent && am_pixmap_trans) 2476 if (am_transparent && am_pixmap_trans)
2430 { 2477 {
2431 pchanged = 1; 2478 pchanged = 1;
2432 if (TermWin.pixmap != None) 2479 if (TermWin.pixmap != None)
2433 { 2480 {
2434 XFreePixmap (display->display, TermWin.pixmap); 2481 XFreePixmap (disp, TermWin.pixmap);
2435 TermWin.pixmap = None; 2482 TermWin.pixmap = None;
2436 } 2483 }
2437 } 2484 }
2438 2485
2439 am_pixmap_trans = 0; 2486 am_pixmap_trans = 0;
2440 } 2487 }
2441 else 2488 else
2442 { 2489 {
2443 if (TermWin.pixmap != None) 2490 if (TermWin.pixmap != None)
2444 XFreePixmap (display->display, TermWin.pixmap); 2491 XFreePixmap (disp, TermWin.pixmap);
2445 2492
2446#if TINTING 2493#if TINTING
2447 if (ISSET_PIXCOLOR (Color_tint)) 2494 if (ISSET_PIXCOLOR (Color_tint))
2448 { 2495 {
2449 unsigned short rm, gm, bm; 2496 unsigned short rm, gm, bm;
… …
2453 2500
2454 ShadeXImage (display, image, shade, rm, gm, bm); 2501 ShadeXImage (display, image, shade, rm, gm, bm);
2455 } 2502 }
2456#endif 2503#endif
2457 2504
2458 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2505 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt,
2459 szHint.width, szHint.height, image->depth); 2506 szHint.width, szHint.height, image->depth);
2460 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2507 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue);
2461 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2508 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0,
2462 nx, ny, image->width, image->height); 2509 nx, ny, image->width, image->height);
2463 XFreeGC (display->display, gc); 2510 XFreeGC (disp, gc);
2464 XDestroyImage (image); 2511 XDestroyImage (image);
2465 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2512 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap);
2466 XClearWindow (display->display, TermWin.parent[0]); 2513 XClearWindow (disp, TermWin.parent[0]);
2467 2514
2468 if (!am_transparent || !am_pixmap_trans) 2515 if (!am_transparent || !am_pixmap_trans)
2469 pchanged = 1; 2516 pchanged = 1;
2470 2517
2471 am_transparent = am_pixmap_trans = 1; 2518 am_transparent = am_pixmap_trans = 1;
2472 } 2519 }
2473 } 2520 }
2474 2521
2475 if (!am_pixmap_trans) 2522 if (am_pixmap_trans)
2523 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2524 else
2476 { 2525 {
2477 unsigned int n; 2526 unsigned int n;
2478 /* 2527 /*
2479 * InheritPixmap transparency 2528 * InheritPixmap transparency
2480 */ 2529 */
2481 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2530 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2482 { 2531 {
2483 oldp = TermWin.parent[i]; 2532 oldp = TermWin.parent[i];
2484 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2533 XQueryTree (disp, TermWin.parent[i - 1], &root,
2485 &TermWin.parent[i], &list, &n); 2534 &TermWin.parent[i], &list, &n);
2486 XFree (list); 2535 XFree (list);
2487 2536
2488 if (TermWin.parent[i] == display->root) 2537 if (TermWin.parent[i] == display->root)
2489 { 2538 {
… …
2501 2550
2502 if (pchanged) 2551 if (pchanged)
2503 { 2552 {
2504 for (; n < (unsigned int)i; n++) 2553 for (; n < (unsigned int)i; n++)
2505 { 2554 {
2506 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2555 XGetWindowAttributes (disp, TermWin.parent[n], &wattr);
2507 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2556 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2508 { 2557 {
2509 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2558 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1;
2510 break; 2559 break;
2511 } 2560 }
2512 } 2561 }
2513 } 2562 }
2514 2563
2515 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2564 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0])))
2516 { 2565 {
2517 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2566 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]);
2518 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2567 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]);
2519 am_transparent = 0; 2568 am_transparent = 0;
2520 /* XXX: also turn off Opt_transparent? */ 2569 /* XXX: also turn off Opt_transparent? */
2521 } 2570 }
2522 else 2571 else
2523 { 2572 {
… …
2526 * needed for fvwm2.2.2 (and before?) */ 2575 * needed for fvwm2.2.2 (and before?) */
2527 sleep (1); 2576 sleep (1);
2528#endif 2577#endif
2529 for (n = 0; n < (unsigned int)i; n++) 2578 for (n = 0; n < (unsigned int)i; n++)
2530 { 2579 {
2531 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2580 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative);
2532 XClearWindow (display->display, TermWin.parent[n]); 2581 XClearWindow (disp, TermWin.parent[n]);
2533 } 2582 }
2534 2583
2535 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2584 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative);
2536 am_transparent = 1; 2585 am_transparent = 1;
2537 } 2586 }
2538 2587
2539 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2588 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++)
2540 TermWin.parent[i] = None; 2589 TermWin.parent[i] = None;
2541 } 2590 }
2542 2591
2543 if (scrollBar.win) 2592 if (scrollBar.win)
2544 { 2593 {
2545 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2594 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2546 scrollBar.setIdle (); 2595 scrollBar.setIdle ();
2547 scrollbar_show (0); 2596 scrollbar_show (0);
2597 }
2598
2599 if (am_transparent)
2600 {
2601 want_refresh = want_full_refresh = 1;
2602 if (am_pixmap_trans)
2603 flush ();
2548 } 2604 }
2549 2605
2550 return pchanged; 2606 return pchanged;
2551} 2607}
2552#endif 2608#endif
… …
2581 // some window managers resize the window early, and these programs 2637 // some window managers resize the window early, and these programs
2582 // then sometimes get the size wrong. 2638 // then sometimes get the size wrong.
2583 // unfortunately other programs are even more buggy and dislike 2639 // unfortunately other programs are even more buggy and dislike
2584 // being sent SIGWINCH, so only do it when we were in fact being 2640 // being sent SIGWINCH, so only do it when we were in fact being
2585 // resized. 2641 // resized.
2586 if (seen_resize) 2642 if (seen_resize && cmd_pid)
2587 kill (-cmd_pid, SIGWINCH); 2643 kill (-cmd_pid, SIGWINCH);
2588 } 2644 }
2589 2645
2590 /* Read a text string from the input buffer */ 2646 /* Read a text string from the input buffer */
2591 unicode_t buf[UBUFSIZ]; 2647 unicode_t buf[UBUFSIZ];
… …
2704 if (len == (size_t)-1) 2760 if (len == (size_t)-1)
2705 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2761 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2706 2762
2707 // assume wchar == unicode 2763 // assume wchar == unicode
2708 cmdbuf_ptr += len; 2764 cmdbuf_ptr += len;
2709 return wc; 2765 return wc & UNICODE_MASK;
2710 } 2766 }
2711 2767
2712 return NOCHAR; 2768 return NOCHAR;
2713} 2769}
2714 2770
… …
3177 { 3233 {
3178 switch (priv) 3234 switch (priv)
3179 { 3235 {
3180 case '>': 3236 case '>':
3181 if (ch == CSI_DA) /* secondary device attributes */ 3237 if (ch == CSI_DA) /* secondary device attributes */
3182 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3238 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3183 break; 3239 break;
3184 case '?': 3240 case '?':
3185 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3241 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3186 process_terminal_mode (ch, priv, nargs, arg); 3242 process_terminal_mode (ch, priv, nargs, arg);
3187 break; 3243 break;
… …
3416rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3472rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3417{ 3473{
3418 int x, y; 3474 int x, y;
3419 XWindowAttributes wattr; 3475 XWindowAttributes wattr;
3420 Window wdummy; 3476 Window wdummy;
3477 dDisp;
3421 3478
3422 if (nargs == 0) 3479 if (nargs == 0)
3423 return; 3480 return;
3424 3481
3425 switch (args[0]) 3482 switch (args[0])
3426 { 3483 {
3427 /* 3484 /*
3428 * commands 3485 * commands
3429 */ 3486 */
3430 case 1: /* deiconify window */ 3487 case 1: /* deiconify window */
3431 XMapWindow (display->display, TermWin.parent[0]); 3488 XMapWindow (disp, TermWin.parent[0]);
3432 break; 3489 break;
3433 case 2: /* iconify window */ 3490 case 2: /* iconify window */
3434 XIconifyWindow (display->display, TermWin.parent[0], 3491 XIconifyWindow (disp, TermWin.parent[0], display->screen);
3435 DefaultScreen (display->display));
3436 break; 3492 break;
3437 case 3: /* set position (pixels) */ 3493 case 3: /* set position (pixels) */
3438 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3494 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]);
3439 break; 3495 break;
3440 case 4: /* set size (pixels) */ 3496 case 4: /* set size (pixels) */
3441 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3497 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3442 break; 3498 break;
3443 case 5: /* raise window */ 3499 case 5: /* raise window */
3444 XRaiseWindow (display->display, TermWin.parent[0]); 3500 XRaiseWindow (disp, TermWin.parent[0]);
3445 break; 3501 break;
3446 case 6: /* lower window */ 3502 case 6: /* lower window */
3447 XLowerWindow (display->display, TermWin.parent[0]); 3503 XLowerWindow (disp, TermWin.parent[0]);
3448 break; 3504 break;
3449 case 7: /* refresh window */ 3505 case 7: /* refresh window */
3450 scr_touch (true); 3506 scr_touch (true);
3451 break; 3507 break;
3452 case 8: /* set size (chars) */ 3508 case 8: /* set size (chars) */
… …
3464 3520
3465 /* 3521 /*
3466 * reports - some output format copied from XTerm 3522 * reports - some output format copied from XTerm
3467 */ 3523 */
3468 case 11: /* report window state */ 3524 case 11: /* report window state */
3469 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3525 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3470 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3526 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3471 break; 3527 break;
3472 case 13: /* report window position */ 3528 case 13: /* report window position */
3473 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3529 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3474 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3530 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root,
3475 -wattr.border_width, -wattr.border_width, 3531 -wattr.border_width, -wattr.border_width,
3476 &x, &y, &wdummy); 3532 &x, &y, &wdummy);
3477 tt_printf ("\033[3;%d;%dt", x, y); 3533 tt_printf ("\033[3;%d;%dt", x, y);
3478 break; 3534 break;
3479 case 14: /* report window size (pixels) */ 3535 case 14: /* report window size (pixels) */
3480 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3536 XGetWindowAttributes (disp, TermWin.parent[0], &wattr);
3481 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3537 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3482 break; 3538 break;
3483 case 18: /* report text area size (chars) */ 3539 case 18: /* report text area size (chars) */
3484 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3540 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol);
3485 break; 3541 break;
… …
3487 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3543 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol);
3488 break; 3544 break;
3489 case 20: /* report icon label */ 3545 case 20: /* report icon label */
3490 { 3546 {
3491 char *s; 3547 char *s;
3492 XGetIconName (display->display, TermWin.parent[0], &s); 3548 XGetIconName (disp, TermWin.parent[0], &s);
3493 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3549 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3494 XFree (s); 3550 XFree (s);
3495 } 3551 }
3496 break; 3552 break;
3497 case 21: /* report window title */ 3553 case 21: /* report window title */
3498 { 3554 {
3499 char *s; 3555 char *s;
3500 XFetchName (display->display, TermWin.parent[0], &s); 3556 XFetchName (disp, TermWin.parent[0], &s);
3501 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3557 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */
3502 XFree (s); 3558 XFree (s);
3503 } 3559 }
3504 break; 3560 break;
3505 } 3561 }
… …
3512 * ends_how is terminator used. returned input must be free()'d 3568 * ends_how is terminator used. returned input must be free()'d
3513 */ 3569 */
3514unsigned char * 3570unsigned char *
3515rxvt_term::get_to_st (unicode_t &ends_how) 3571rxvt_term::get_to_st (unicode_t &ends_how)
3516{ 3572{
3517 unicode_t seen_esc = 0, ch; 3573 unicode_t ch;
3574 bool seen_esc = false;
3518 unsigned int n = 0; 3575 unsigned int n = 0;
3519 unsigned char *s;
3520 unsigned char string[STRING_MAX]; 3576 wchar_t string[STRING_MAX];
3521 3577
3522 while ((ch = cmd_getc ()) != NOCHAR) 3578 while ((ch = cmd_getc ()) != NOCHAR)
3523 { 3579 {
3524 if (seen_esc) 3580 if (seen_esc)
3525 { 3581 {
… …
3528 else 3584 else
3529 return NULL; 3585 return NULL;
3530 } 3586 }
3531 else if (ch == C0_ESC) 3587 else if (ch == C0_ESC)
3532 { 3588 {
3533 seen_esc = 1; 3589 seen_esc = true;
3534 continue; 3590 continue;
3535 } 3591 }
3536 else if (ch == C0_BEL || ch == CHAR_ST) 3592 else if (ch == C0_BEL || ch == CHAR_ST)
3537 break; 3593 break;
3538 else if (ch < 0x20) 3594 else if (ch < 0x20)
3539 return NULL; /* other control character - exit */ 3595 return NULL; /* other control character - exit */
3540 3596
3541 seen_esc = 0; 3597 seen_esc = false;
3542 3598
3543 if (n >= sizeof (string) - 1) 3599 if (n >= STRING_MAX - 1)
3544 // stop at some sane length 3600 // stop at some sane length
3545 return NULL; 3601 return NULL;
3546 3602
3547 if (ch == C0_SYN) 3603 if (ch == C0_SYN)
3548 string[n++] = cmd_get8 (); 3604 string[n++] = cmd_get8 ();
… …
3550 string[n++] = ch; 3606 string[n++] = ch;
3551 } 3607 }
3552 3608
3553 string[n++] = '\0'; 3609 string[n++] = '\0';
3554 3610
3555 if ((s = (unsigned char *)rxvt_malloc (n)) == NULL)
3556 return NULL;
3557
3558 ends_how = (ch == 0x5c ? C0_ESC : ch); 3611 ends_how = (ch == 0x5c ? C0_ESC : ch);
3559 strncpy (s, string, n); 3612
3560 return s; 3613 return (unsigned char *)rxvt_wcstombs (string);
3561} 3614}
3562 3615
3563/*----------------------------------------------------------------------*/ 3616/*----------------------------------------------------------------------*/
3564/* 3617/*
3565 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3618 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
… …
3619 set_window_color (color, str); 3672 set_window_color (color, str);
3620} 3673}
3621 3674
3622/* 3675/*
3623 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3676 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3624 * 0 = change iconName/title
3625 * 1 = change iconName
3626 * 2 = change title
3627 * 4 = change color
3628 * 10 = change fg color
3629 * 11 = change bg color
3630 * 12 = change text color
3631 * 13 = change mouse foreground color
3632 * 17 = change highlight character colour
3633 * 18 = change bold character color
3634 * 19 = change underlined character color
3635 * 46 = change logfile (not implemented)
3636 * 50 = change font
3637 *
3638 * rxvt extensions:
3639 * 20 = bg pixmap
3640 * 39 = change default fg color
3641 * 49 = change default bg color
3642 * 55 = dump scrollback buffer and all of screen
3643 * 701 = change locale
3644 * 702 = find font
3645 * 703 = menu
3646 */ 3677 */
3647void 3678void
3648rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3679rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
3649{ 3680{
3650 int changed = 0; 3681 int changed = 0;
3651 int color; 3682 int color;
3652 char *buf, *name; 3683 char *buf, *name;
3653 bool query = str[0] == '?' && !str[1]; 3684 bool query = str[0] == '?' && !str[1];
3654 int saveop = op; 3685 int saveop = op;
3686 dDisp;
3655 3687
3656 assert (str != NULL); 3688 assert (str != NULL);
3657 switch (op) 3689 switch (op)
3658 { 3690 {
3659 case XTerm_name: 3691 case XTerm_name:
… …
3666 set_title (str); 3698 set_title (str);
3667 break; 3699 break;
3668 case XTerm_property: 3700 case XTerm_property:
3669 if (str[0] == '?') 3701 if (str[0] == '?')
3670 { 3702 {
3671 Atom prop = XInternAtom (display->display, str + 1, True); 3703 Atom prop = display->atom (str + 1);
3672 Atom actual_type; 3704 Atom actual_type;
3673 int actual_format; 3705 int actual_format;
3674 unsigned long nitems; 3706 unsigned long nitems;
3675 unsigned long bytes_after; 3707 unsigned long bytes_after;
3676 unsigned char *value = 0; 3708 unsigned char *value = 0;
3677 const char *str = ""; 3709 const char *str = "";
3678 3710
3679 if (prop 3711 if (prop
3680 && XGetWindowProperty (display->display, TermWin.parent[0], 3712 && XGetWindowProperty (disp, TermWin.parent[0],
3681 prop, 0, 1<<16, 0, AnyPropertyType, 3713 prop, 0, 1<<16, 0, AnyPropertyType,
3682 &actual_type, &actual_format, 3714 &actual_type, &actual_format,
3683 &nitems, &bytes_after, &value) == Success 3715 &nitems, &bytes_after, &value) == Success
3684 && actual_type != None 3716 && actual_type != None
3685 && actual_format == 8) 3717 && actual_format == 8)
… …
3694 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3726 char *eq = strchr (str, '='); // constness lost, but verified to be ok
3695 3727
3696 if (eq) 3728 if (eq)
3697 { 3729 {
3698 *eq = 0; 3730 *eq = 0;
3699 XChangeProperty (display->display, TermWin.parent[0], 3731 set_utf8_property (display->atom (str), eq + 1);
3700 display->atom (str), XA_STRING, 8,
3701 PropModeReplace, (unsigned char *)eq + 1,
3702 strlen (eq + 1));
3703 } 3732 }
3704 else 3733 else
3705 XDeleteProperty (display->display, TermWin.parent[0], 3734 XDeleteProperty (disp, TermWin.parent[0],
3706 display->atom (str)); 3735 display->atom (str));
3707 } 3736 }
3708 break; 3737 break;
3709 3738
3710 case XTerm_Color: 3739 case XTerm_Color:
… …
3751 break; 3780 break;
3752#ifndef NO_BOLD_UNDERLINE_REVERSE 3781#ifndef NO_BOLD_UNDERLINE_REVERSE
3753 case XTerm_Color_BD: 3782 case XTerm_Color_BD:
3754 process_color_seq (XTerm_Color_BD, Color_BD, str, resp); 3783 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3755 break; 3784 break;
3756 case XTerm_Color_IT:
3757 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3758 break;
3759 case XTerm_Color_UL: 3785 case XTerm_Color_UL:
3760 process_color_seq (XTerm_Color_UL, Color_UL, str, resp); 3786 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3761 break; 3787 break;
3762 case XTerm_Color_RV: 3788 case XTerm_Color_RV:
3763 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3789 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3764 break; 3790 break;
3791 case URxvt_Color_IT:
3792 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3793 break;
3765#endif 3794#endif
3766#if TRANSPARENT || TINTING 3795#if TRANSPARENT && TINTING
3767 case XTerm_Color_tint: 3796 case URxvt_Color_tint:
3768 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3797 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3769 check_our_parents (); 3798 check_our_parents ();
3770 if (am_transparent) 3799 if (am_transparent)
3771 want_full_refresh = want_refresh = 1; 3800 want_full_refresh = want_refresh = 1;
3772 break; 3801 break;
3773#endif 3802#endif
… …
3785 { 3814 {
3786 str++; 3815 str++;
3787#if XPM_BACKGROUND 3816#if XPM_BACKGROUND
3788 changed += scale_pixmap (str); 3817 changed += scale_pixmap (str);
3789#endif 3818#endif
3790
3791 } 3819 }
3820
3792 if (changed) 3821 if (changed)
3793 { 3822 {
3794#ifdef XPM_BACKGROUND 3823#ifdef XPM_BACKGROUND
3795 resize_pixmap (); 3824 resize_pixmap ();
3796#endif 3825#endif
… …
3807 3836
3808 case XTerm_logfile: 3837 case XTerm_logfile:
3809 // TODO, when secure mode? 3838 // TODO, when secure mode?
3810 break; 3839 break;
3811 3840
3841#ifdef MENUBAR
3842 case URxvt_Menu:
3843 if (options & Opt_insecure)
3844 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3845 break;
3846#endif
3847#if 0
3848 case XTerm_dumpscreen: /* no error notices */
3849 {
3850 int fd;
3851 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3852 {
3853 scr_dump (fd);
3854 close (fd);
3855 }
3856 }
3857 break;
3858#endif
3812 case XTerm_font: 3859 case XTerm_font:
3813 op = URxvt_font; 3860 op = URxvt_font;
3814 case URxvt_font: 3861 case URxvt_font:
3815#if ENABLE_STYLES 3862#if ENABLE_STYLES
3816 case URxvt_boldFont: 3863 case URxvt_boldFont:
… …
3831 set_fonts (); 3878 set_fonts ();
3832 } 3879 }
3833 break; 3880 break;
3834 3881
3835#if ENABLE_FRILLS 3882#if ENABLE_FRILLS
3836 case XTerm_locale: 3883 case URxvt_locale:
3837 if (query) 3884 if (query)
3838 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3885 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp);
3839 else 3886 else
3840 { 3887 {
3841 set_locale (str); 3888 set_locale (str);
3842# ifdef USE_XIM 3889 pty.set_utf8_mode (enc_utf8);
3843 im_cb (); 3890 init_xlocale ();
3844# endif
3845 } 3891 }
3846 break; 3892 break;
3847#endif
3848 3893
3849#ifdef MENUBAR 3894 case URxvt_view_up:
3850 case XTerm_Menu: 3895 case URxvt_view_down:
3851 if (options & Opt_insecure) 3896 int lines = atoi (str);
3852 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3897
3853 break; 3898 if (lines)
3854#endif 3899 scr_page (op == URxvt_view_up ? UP : DN, lines);
3855#if 0
3856 case XTerm_dumpscreen: /* no error notices */
3857 { 3900 else
3858 int fd;
3859 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3860 { 3901 {
3861 scr_dump (fd); 3902 scr_erase_savelines ();
3862 close (fd);
3863 } 3903 }
3864 } 3904
3865 break; 3905 break;
3866#endif 3906#endif
3867 } 3907 }
3868} 3908}
3869/*----------------------------------------------------------------------*/ 3909/*----------------------------------------------------------------------*/
… …
4284 4324
4285/* ---------------------------------------------------------------------- */ 4325/* ---------------------------------------------------------------------- */
4286/* Write data to the pty as typed by the user, pasted with the mouse, 4326/* Write data to the pty as typed by the user, pasted with the mouse,
4287 * or generated by us in response to a query ESC sequence. 4327 * or generated by us in response to a query ESC sequence.
4288 */ 4328 */
4329const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4330
4289void 4331void
4290rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4332rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4291{ 4333{
4292 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4334 if (v_buflen == 0)
4335 {
4336 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4293 4337
4294 if (len) 4338 if ((unsigned int)written == len)
4339 return;
4340
4341 data += written;
4342 len -= written;
4295 { 4343 }
4344
4345 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4346
4347 memcpy (v_buffer + v_buflen, data, len);
4348 v_buflen += len;
4349
4350 pty_ev.set (EVENT_READ | EVENT_WRITE);
4351}
4352
4353void rxvt_term::pty_write ()
4354{
4355 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4356
4357 if (written > 0)
4358 {
4359 v_buflen -= written;
4360
4296 if (v_buflen == 0) 4361 if (v_buflen == 0)
4297 { 4362 {
4298 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4299
4300 if ((unsigned int)written == len)
4301 return;
4302
4303 data += written;
4304 len -= written;
4305 }
4306
4307
4308 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4309
4310 memcpy (v_buffer + v_buflen, data, len);
4311 v_buflen += len;
4312 }
4313
4314 for (;;)
4315 {
4316 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4317
4318 if (written > 0)
4319 {
4320 v_buflen -= written;
4321
4322 if (v_buflen == 0)
4323 {
4324 free (v_buffer); 4363 free (v_buffer);
4325 v_buffer = 0; 4364 v_buffer = 0;
4326 v_buflen = 0; 4365 v_buflen = 0;
4327 4366
4328 pty_ev.set (EVENT_READ); 4367 pty_ev.set (EVENT_READ);
4329 return;
4330 }
4331
4332 memmove (v_buffer, v_buffer + written, v_buflen);
4333 }
4334 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4335 // original code just ignores this...
4336 destroy ();
4337 else
4338 {
4339 pty_ev.set (EVENT_READ | EVENT_WRITE);
4340 return; 4368 return;
4341 } 4369 }
4370
4371 memmove (v_buffer, v_buffer + written, v_buflen);
4342 } 4372 }
4373 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4374 // original code just ignores this...
4375 destroy ();
4343} 4376}
4344 4377
4345/*----------------------- end-of-file (C source) -----------------------*/ 4378/*----------------------- end-of-file (C source) -----------------------*/
4346 4379

Diff Legend

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