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.176 by root, Mon Dec 13 01:29:03 2004 UTC vs.
Revision 1.183 by root, Tue Dec 21 06:43:00 2004 UTC

… …
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#include <cwchar>
54#include <signal.h> 54#include <csignal>
55 55
56/*----------------------------------------------------------------------*/ 56/*----------------------------------------------------------------------*/
57 57
58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59 59
… …
488#endif 488#endif
489 489
490 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 490 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491 { 491 {
492#ifdef KEYSYM_RESOURCE 492#ifdef KEYSYM_RESOURCE
493 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) 493 if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
494 { 494 {
495 unsigned int l; 495 unsigned int l;
496 const unsigned char *kbuf0; 496 const unsigned char *kbuf0;
497 497
498 kbuf0 = (Keysym_map[keysym & 0xFF]); 498 kbuf0 = (Keysym_map[keysym & 0xFF]);
… …
785 case XK_F35: /* "\033[49~" */ 785 case XK_F35: /* "\033[49~" */
786 FKEY (31, XK_F17); 786 FKEY (31, XK_F17);
787 break; 787 break;
788#undef FKEY 788#undef FKEY
789 default: 789 default:
790 newlen = 0; 790 if (len == 0
791 break; 791 && (keysym & 0xfff0) != 0xff70
792 && (keysym & 0xfff0) != 0xffe0)
793 /* generate a keycode for every remaining keypress */
794 sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
792 } 795 }
796
793 if (newlen) 797 if (newlen)
794 len = strlen (kbuf); 798 len = strlen (kbuf);
795 } 799 }
796 800
797 /* 801 /*
… …
805 } 809 }
806 else if (ctrl && keysym == XK_minus) 810 else if (ctrl && keysym == XK_minus)
807 { 811 {
808 len = 1; 812 len = 1;
809 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 813 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
814 }
815 else if (keysym == XK_ISO_Left_Tab)
816 {
817 strcpy (kbuf, "\033[Z");
818 len = 3;
819 }
820 else if (len == 0
821 && (keysym & 0xffe0) != 0xfe00
822 && (keysym < 0xfe50 || keysym > 0xfe6f))
823 {
824 /* generate a keycode for every remaining keypress */
825 len = sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym);
810 } 826 }
811 else 827 else
812 { 828 {
813#ifdef META8_OPTION 829#ifdef META8_OPTION
814 /* set 8-bit on */ 830 /* set 8-bit on */
… …
1058rxvt_term::pty_cb (io_watcher &w, short revents) 1074rxvt_term::pty_cb (io_watcher &w, short revents)
1059{ 1075{
1060 SET_R (this); 1076 SET_R (this);
1061 SET_LOCALE (locale); 1077 SET_LOCALE (locale);
1062 1078
1063 if (revents & EVENT_WRITE)
1064 tt_write (0, 0);
1065 else if (revents & EVENT_READ) 1079 if (revents & EVENT_READ)
1066 // loop, but don't allow a single term to monopolize us 1080 // loop, but don't allow a single term to monopolize us
1067 while (pty_fill ()) 1081 while (pty_fill ())
1068 if (cmd_parse ()) 1082 if (cmd_parse ())
1069 break; 1083 break;
1084
1085 if (revents & EVENT_WRITE)
1086 pty_write ();
1070} 1087}
1071 1088
1072void 1089void
1073rxvt_term::pointer_unblank () 1090rxvt_term::pointer_unblank ()
1074{ 1091{
… …
1667 case PropertyNotify: 1684 case PropertyNotify:
1668 /* 1685 /*
1669 * if user used some Esetroot compatible prog to set the root bg, 1686 * if user used some Esetroot compatible prog to set the root bg,
1670 * use the property to determine the pixmap. We use it later on. 1687 * use the property to determine the pixmap. We use it later on.
1671 */ 1688 */
1672 if (xa[XA_XROOTPMAPID] == 0)
1673 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1674
1675 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1689 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1690 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1676 return; 1691 return;
1677 1692
1678 /* FALLTHROUGH */ 1693 /* FALLTHROUGH */
1679 case ReparentNotify: 1694 case ReparentNotify:
1680 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1695 if ((options & Opt_transparent) && check_our_parents () && am_transparent)
… …
2350 /* 2365 /*
2351 * Make the frame window set by the window manager have 2366 * Make the frame window set by the window manager have
2352 * the root background. Some window managers put multiple nested frame 2367 * the root background. Some window managers put multiple nested frame
2353 * windows for each client, so we have to take care about that. 2368 * windows for each client, so we have to take care about that.
2354 */ 2369 */
2355 i = (xa[XA_XROOTPMAPID] 2370 i = (xa[XA_XROOTPMAP_ID]
2356 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2371 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID],
2357 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2372 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2358 &nitems, &bytes_after, &prop) == Success); 2373 &nitems, &bytes_after, &prop) == Success);
2359 2374
2360 if (!i || prop == NULL) 2375 if (!i || prop == NULL)
2361 i = (xa[XA_XSETROOTID] 2376 i = (xa[XA_ESETROOT_PMAP_ID]
2362 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2377 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID],
2363 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2378 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2364 &nitems, &bytes_after, &prop) == Success); 2379 &nitems, &bytes_after, &prop) == Success);
2365 2380
2366 if (!i || prop == NULL 2381 if (!i || prop == NULL
2367#if TINTING 2382#if TINTING
… …
2708 if (len == (size_t)-1) 2723 if (len == (size_t)-1)
2709 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2724 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2710 2725
2711 // assume wchar == unicode 2726 // assume wchar == unicode
2712 cmdbuf_ptr += len; 2727 cmdbuf_ptr += len;
2713 return wc; 2728 return wc & UNICODE_MASK;
2714 } 2729 }
2715 2730
2716 return NOCHAR; 2731 return NOCHAR;
2717} 2732}
2718 2733
… …
4282 4297
4283/* ---------------------------------------------------------------------- */ 4298/* ---------------------------------------------------------------------- */
4284/* Write data to the pty as typed by the user, pasted with the mouse, 4299/* Write data to the pty as typed by the user, pasted with the mouse,
4285 * or generated by us in response to a query ESC sequence. 4300 * or generated by us in response to a query ESC sequence.
4286 */ 4301 */
4302const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4303
4287void 4304void
4288rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4305rxvt_term::tt_write (const unsigned char *data, unsigned int len)
4289{ 4306{
4290 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4307 if (v_buflen == 0)
4308 {
4309 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4291 4310
4292 if (len) 4311 if ((unsigned int)written == len)
4312 return;
4313
4314 data += written;
4315 len -= written;
4293 { 4316 }
4317
4318 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4319
4320 memcpy (v_buffer + v_buflen, data, len);
4321 v_buflen += len;
4322
4323 pty_ev.set (EVENT_READ | EVENT_WRITE);
4324}
4325
4326void rxvt_term::pty_write ()
4327{
4328 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4329
4330 if (written > 0)
4331 {
4332 v_buflen -= written;
4333
4294 if (v_buflen == 0) 4334 if (v_buflen == 0)
4295 { 4335 {
4296 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4297
4298 if ((unsigned int)written == len)
4299 return;
4300
4301 data += written;
4302 len -= written;
4303 }
4304
4305
4306 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4307
4308 memcpy (v_buffer + v_buflen, data, len);
4309 v_buflen += len;
4310 }
4311
4312 for (;;)
4313 {
4314 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4315
4316 if (written > 0)
4317 {
4318 v_buflen -= written;
4319
4320 if (v_buflen == 0)
4321 {
4322 free (v_buffer); 4336 free (v_buffer);
4323 v_buffer = 0; 4337 v_buffer = 0;
4324 v_buflen = 0; 4338 v_buflen = 0;
4325 4339
4326 pty_ev.set (EVENT_READ); 4340 pty_ev.set (EVENT_READ);
4327 return;
4328 }
4329
4330 memmove (v_buffer, v_buffer + written, v_buflen);
4331 }
4332 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4333 // original code just ignores this...
4334 destroy ();
4335 else
4336 {
4337 pty_ev.set (EVENT_READ | EVENT_WRITE);
4338 return; 4341 return;
4339 } 4342 }
4343
4344 memmove (v_buffer, v_buffer + written, v_buflen);
4340 } 4345 }
4346 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4347 // original code just ignores this...
4348 destroy ();
4341} 4349}
4342 4350
4343/*----------------------- end-of-file (C source) -----------------------*/ 4351/*----------------------- end-of-file (C source) -----------------------*/
4344 4352

Diff Legend

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