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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.4 by pcg, Tue Nov 25 15:25:17 2003 UTC vs.
Revision 1.13 by pcg, Wed Dec 17 09:00:35 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.4 2003/11/25 15:25:17 pcg Exp $ 4 * $Id: main.C,v 1.13 2003/12/17 09:00:35 pcg Exp $
5 * 5 *
6 * All portions of code are copyright by their respective author/s. 6 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 8 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
58{ 58{
59 free (p); 59 free (p);
60} 60}
61 61
62rxvt_term::rxvt_term () 62rxvt_term::rxvt_term ()
63: pty_ev(this, &rxvt_term::pty_cb), 63: pty_ev (this, &rxvt_term::pty_cb),
64#ifdef CURSOR_BLINK
65 blink_ev (this, &rxvt_term::blink_cb),
66#endif
67#ifdef POINTER_BLANK
68 pointer_ev (this, &rxvt_term::pointer_cb),
69#endif
64 x_ev (this, &rxvt_term::x_cb) 70 x_ev (this, &rxvt_term::x_cb),
71 destroy_ev (this, &rxvt_term::destroy_cb),
72 check_ev (this, &rxvt_term::check_cb),
73 incr_ev (this, &rxvt_term::incr_cb)
65{ 74{
66 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 75 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
67} 76}
68 77
69rxvt_term::~rxvt_term () 78rxvt_term::~rxvt_term ()
70{ 79{
80 scr_release ();
81
82#ifndef NO_SETOWNER_TTYDEV
83 rxvt_privileged_ttydev (this, RESTORE);
84#endif
85#ifdef UTMP_SUPPORT
86 rxvt_privileged_utmp (this, RESTORE);
87#endif
88#ifdef USE_XIM
89 if (Input_Context != NULL)
90 {
91 XDestroyIC (Input_Context);
92 Input_Context = NULL;
93 }
94#endif
95
96 if (cmd_fd >= 0)
97 close (cmd_fd);
98
99 if (Xfd >= 0)
100 XCloseDisplay (Xdisplay);
101
71 delete PixColors; 102 delete PixColors;
103}
104
105void
106rxvt_term::destroy ()
107{
108 check_ev.stop ();
109 pty_ev.stop ();
110 x_ev.stop ();
111#ifdef CURSOR_BLINK
112 blink_ev.stop ();
113#endif
114#ifdef POINTER_BLANK
115 pointer_ev.stop ();
116#endif
117
118 destroy_ev.start (0);
119}
120
121void
122rxvt_term::destroy_cb (time_watcher &w)
123{
124 SET_R (this);
125
126 delete this;
72} 127}
73 128
74/*----------------------------------------------------------------------*/ 129/*----------------------------------------------------------------------*/
75/* rxvt_init() */ 130/* rxvt_init() */
76/* LIBPROTO */ 131/* LIBPROTO */
77rxvt_t 132rxvt_t
78rxvt_init(int argc, const char *const *argv) 133rxvt_init (int argc, const char *const *argv)
79{ 134{
80 SET_R(new rxvt_term); 135 SET_R (new rxvt_term);
81 dR; 136 dR;
82 137
83 if (!R->init_vars () || !R->init (argc, argv)) 138 if (!R->init_vars () || !R->init (argc, argv))
84 { 139 {
85 delete R; 140 delete R;
86 return NULL; 141 return NULL;
87 } 142 }
88 143
89 return R; 144 return R;
145}
146
147/* EXTPROTO */
148void
149rxvt_init_signals ()
150{
151/* install exit handler for cleanup */
152#if 0
153#ifdef HAVE_ATEXIT
154 atexit(rxvt_clean_exit);
155#else
156#endif
157#endif
158
159 struct sigaction sa;
160
161 sigfillset (&sa.sa_mask);
162 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
163 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
164 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
165 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
166 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
167 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
168 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
169
170/* need to trap SIGURG for SVR4 (Unixware) rlogin */
171/* signal (SIGURG, SIG_DFL); */
172
173 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
174 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
90} 175}
91 176
92bool 177bool
93rxvt_term::init (int argc, const char *const *argv) 178rxvt_term::init (int argc, const char *const *argv)
94{ 179{
… …
118 203
119 rxvt_Create_Windows (this, argc, argv); 204 rxvt_Create_Windows (this, argc, argv);
120 205
121 rxvt_init_xlocale (this); 206 rxvt_init_xlocale (this);
122 207
123 rxvt_scr_reset (this); /* initialize screen */ 208 scr_reset (); /* initialize screen */
124#ifdef RXVT_GRAPHICS 209#ifdef RXVT_GRAPHICS
125 rxvt_Gr_reset (this); /* reset graphics */ 210 rxvt_Gr_reset (this); /* reset graphics */
126#endif 211#endif
127 212
128#if 0 213#if 0
129#ifdef DEBUG_X 214#ifdef DEBUG_X
130 XSynchronize(Xdisplay, True); 215 XSynchronize(Xdisplay, True);
131 XSetErrorHandler((XErrorHandler) abort);
132#else
133 XSetErrorHandler((XErrorHandler) rxvt_xerror_handler);
134#endif 216#endif
135#endif 217#endif
136 218
137#ifdef HAVE_SCROLLBARS 219#ifdef HAVE_SCROLLBARS
138 if (Options & Opt_scrollBar) 220 if (Options & Opt_scrollBar)
… …
155 rxvt_init_env (this); 237 rxvt_init_env (this);
156 rxvt_init_command (this, cmd_argv); 238 rxvt_init_command (this, cmd_argv);
157 239
158 x_ev.start (Xfd, EVENT_READ); 240 x_ev.start (Xfd, EVENT_READ);
159 pty_ev.start (cmd_fd, EVENT_READ); 241 pty_ev.start (cmd_fd, EVENT_READ);
242
243 check_ev.start ();
244
245 process_x_events ();
160 246
161 return true; 247 return true;
162} 248}
163 249
164/* ------------------------------------------------------------------------- * 250/* ------------------------------------------------------------------------- *
… …
170/* ARGSUSED */ 256/* ARGSUSED */
171/* EXTPROTO */ 257/* EXTPROTO */
172RETSIGTYPE 258RETSIGTYPE
173rxvt_Child_signal(int sig __attribute__ ((unused))) 259rxvt_Child_signal(int sig __attribute__ ((unused)))
174{ 260{
175 dR;
176 int pid, save_errno = errno; 261 int pid, save_errno = errno;
177
178 do {
179 errno = 0;
180 } while ((pid = waitpid(-1, NULL, WNOHANG)) == -1 && errno == EINTR); 262 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
263 ;
264 errno = save_errno;
181 265
266#if 0
182 if (pid == R->cmd_pid) 267 if (pid == R->cmd_pid)
183 exit(EXIT_SUCCESS); 268 exit (EXIT_SUCCESS);
184 269#endif
185 errno = save_errno;
186 signal(SIGCHLD, rxvt_Child_signal);
187} 270}
188 271
189/* 272/*
190 * Catch a fatal signal and tidy up before quitting 273 * Catch a fatal signal and tidy up before quitting
191 */ 274 */
… …
205/* INTPROTO */ 288/* INTPROTO */
206int 289int
207rxvt_xerror_handler(const Display * display 290rxvt_xerror_handler(const Display * display
208 __attribute__ ((unused)), const XErrorEvent * event) 291 __attribute__ ((unused)), const XErrorEvent * event)
209{ 292{
210 dR; 293 dR;
211 294
212 if (R->allowedxerror == -1) { 295 if (R->allowedxerror == -1)
213 R->allowedxerror = event->error_code; 296 R->allowedxerror = event->error_code;
214 return 0; /* ignored anyway */ 297 else
215 } 298 {
216 rxvt_print_error("XError: Request: %d . %d, Error: %d", 299 rxvt_print_error("XError: Request: %d . %d, Error: %d",
217 event->request_code, event->minor_code, 300 event->request_code, event->minor_code,
218 event->error_code); 301 event->error_code);
219/* XXX: probably should call rxvt_clean_exit() bypassing X routines */ 302
220 exit(EXIT_FAILURE); 303 R->destroy ();
221/* NOTREACHED */ 304 }
305
306 return 0;
222} 307}
223 308
224/*----------------------------------------------------------------------*/ 309/*----------------------------------------------------------------------*/
225/* 310/*
226 * Exit gracefully, clearing the utmp entry and restoring tty attributes 311 * Exit gracefully, clearing the utmp entry and restoring tty attributes
227 * TODO: if debugging, this should free up any known resources if we can 312 * TODO: if debugging, this should free up any known resources if we can
228 */ 313 */
229/* EXTPROTO */ 314/* EXTPROTO */
230void 315void
231rxvt_clean_exit(void) 316rxvt_clean_exit ()
232{ 317{
233 dR; 318 dR;
234 319
235#ifdef DEBUG_SCREEN 320 R->destroy ();
236 rxvt_scr_release(aR);
237#endif
238#ifndef NO_SETOWNER_TTYDEV
239 rxvt_privileged_ttydev(aR_ RESTORE);
240#endif
241#ifdef UTMP_SUPPORT
242 rxvt_privileged_utmp(aR_ RESTORE);
243#endif
244#ifdef USE_XIM
245 if (R->Input_Context != NULL) {
246 XDestroyIC(R->Input_Context);
247 R->Input_Context = NULL;
248 }
249#endif
250} 321}
251 322
252/* ------------------------------------------------------------------------- * 323/* ------------------------------------------------------------------------- *
253 * MEMORY ALLOCATION WRAPPERS * 324 * MEMORY ALLOCATION WRAPPERS *
254 * ------------------------------------------------------------------------- */ 325 * ------------------------------------------------------------------------- */
… …
546/*----------------------------------------------------------------------*/ 617/*----------------------------------------------------------------------*/
547/* 618/*
548 * Tell the teletype handler what size the window is. 619 * Tell the teletype handler what size the window is.
549 * Called after a window size change. 620 * Called after a window size change.
550 */ 621 */
551/* EXTPROTO */
552void 622void
553rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) 623rxvt_term::tt_winch ()
554{ 624{
555 struct winsize ws; 625 struct winsize ws;
556 626
557 if (fd < 0) 627 if (cmd_fd < 0)
558 return; 628 return;
629
559 ws.ws_col = col; 630 ws.ws_col = TermWin.ncol;
560 ws.ws_row = row; 631 ws.ws_row = TermWin.nrow;
561 ws.ws_xpixel = ws.ws_ypixel = 0; 632 ws.ws_xpixel = ws.ws_ypixel = 0;
562#ifndef DEBUG_SIZE 633#ifndef DEBUG_SIZE
563 (void)ioctl(fd, TIOCSWINSZ, &ws); 634 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
564#else 635#else
565 if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { 636 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
566 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 637 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
567 }
568# ifdef SIGWINCH 638# ifdef SIGWINCH
569 else if (pid) /* force through to the command */ 639 else if (cmd_pid) /* force through to the command */
570 kill(pid, SIGWINCH); 640 kill (cmd_pid, SIGWINCH);
571# endif 641# endif
572#endif 642#endif
573} 643}
574 644
575/*----------------------------------------------------------------------*/ 645/*----------------------------------------------------------------------*/
… …
870 uint16_t old_ncol = R->prev_ncol; 940 uint16_t old_ncol = R->prev_ncol;
871 941
872 /* scr_reset only works on the primary screen */ 942 /* scr_reset only works on the primary screen */
873 if (R->old_height) /* this is not the first time through */ 943 if (R->old_height) /* this is not the first time through */
874 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 944 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY);
945
875 rxvt_scr_reset(aR); 946 R->scr_reset();
947
876 if (curr_screen >= 0) { /* this is not the first time through */ 948 if (curr_screen >= 0) { /* this is not the first time through */
877 rxvt_scr_change_screen(aR_ curr_screen); 949 rxvt_scr_change_screen(aR_ curr_screen);
878 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0)); 950 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
879 } 951 }
880 } 952 }
… …
994 return; 1066 return;
995} 1067}
996 1068
997/* INTPROTO */ 1069/* INTPROTO */
998void 1070void
999rxvt_setPreeditArea(pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1071rxvt_setPreeditArea (pR_ XRectangle * preedit_rect, XRectangle * status_rect,
1000 XRectangle * needed_rect) 1072 XRectangle * needed_rect)
1001{ 1073{
1002 int mbh, vtx = 0; 1074 int mbh, vtx = 0;
1003 1075
1004 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1076 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right))
1005 vtx = scrollbar_TotalWidth(); 1077 vtx = scrollbar_TotalWidth();
… …
1049rxvt_IMInstantiateCallback(Display * unused 1121rxvt_IMInstantiateCallback(Display * unused
1050 __attribute__ ((unused)), XPointer client_data 1122 __attribute__ ((unused)), XPointer client_data
1051 __attribute__ ((unused)), XPointer call_data 1123 __attribute__ ((unused)), XPointer call_data
1052 __attribute__ ((unused))) 1124 __attribute__ ((unused)))
1053{ 1125{
1054 dR; 1126 dR;
1055 int i, found, had_im; 1127 int i, found, had_im;
1056 const char *p; 1128 const char *p;
1057 char **s; 1129 char **s;
1058 char buf[IMBUFSIZ]; 1130 char buf[IMBUFSIZ];
1059 1131
1060 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1132 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1061 if (R->Input_Context) 1133 if (R->Input_Context)
1062 return; 1134 return;
1063 1135
1064 found = had_im = 0;
1065 p = R->rs[Rs_inputMethod]; 1136 p = R->rs[Rs_inputMethod];
1066 if (p && *p) { 1137 if (p && *p)
1067 had_im = 1; 1138 {
1139 bool found = false;
1140
1068 s = rxvt_splitcommastring(p); 1141 s = rxvt_splitcommastring (p);
1069 for (i = 0; s[i]; i++) { 1142 for (i = 0; s[i]; i++)
1143 {
1070 if (*s[i]) { 1144 if (*s[i])
1145 {
1071 STRCPY(buf, "@im="); 1146 STRCPY (buf, "@im=");
1072 STRNCAT(buf, s[i], IMBUFSIZ - 5); 1147 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1073 if ((p = XSetLocaleModifiers(buf)) != NULL && *p 1148 if ((p = XSetLocaleModifiers (buf)) && *p
1074 && (rxvt_IM_get_IC(aR) == True)) { 1149 && rxvt_IM_get_IC (aR))
1150 {
1075 found = 1; 1151 found = true;
1076 break; 1152 break;
1077 } 1153 }
1078 } 1154 }
1079 } 1155 }
1080 for (i = 0; s[i]; i++) 1156 for (i = 0; s[i]; i++)
1081 free(s[i]); 1157 free(s[i]);
1082 free(s); 1158 free(s);
1083 } 1159
1084 if (found) 1160 if (found)
1085 return; 1161 return;
1162 }
1086 1163
1087/* try with XMODIFIERS env. var. */ 1164/* try with XMODIFIERS env. var. */
1088 if ((p = XSetLocaleModifiers("")) != NULL && *p) { 1165 if ((p = XSetLocaleModifiers ("")) && *p
1089 rxvt_IM_get_IC(aR); 1166 && rxvt_IM_get_IC (aR))
1090 return; 1167 return;
1091 }
1092 1168
1093/* try with no modifiers base IF the user didn't specify an IM */ 1169/* try with no modifiers base IF the user didn't specify an IM */
1094 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p 1170 if ((p = XSetLocaleModifiers ("@im=none")) && *p
1095 && rxvt_IM_get_IC(aR) == True) 1171 && rxvt_IM_get_IC (aR) == True)
1096 return; 1172 return;
1097} 1173}
1098 1174
1099/* 1175/*
1100 * Try to open a XIM with the current modifiers, then see if we can 1176 * Try to open a XIM with the current modifiers, then see if we can
1101 * open a suitable preedit type 1177 * open a suitable preedit type

Diff Legend

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