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.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.9 by pcg, Tue Dec 2 21:49:46 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.3 2003/11/25 11:52:42 pcg Exp $ 4 * $Id: main.C,v 1.9 2003/12/02 21:49:46 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>
… …
42 42
43#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47rxvt_term::rxvt_term()
48: pty_ev(this, &rxvt_term::pty_cb),
49 x_ev (this, &rxvt_term::x_cb)
50{
51 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
52}
53
54void * 47void *
55rxvt_term::operator new (size_t s) 48rxvt_term::operator new (size_t s)
56{ 49{
57 void *p = malloc (s); 50 void *p = malloc (s);
58 51
… …
62 55
63void 56void
64rxvt_term::operator delete (void *p, size_t s) 57rxvt_term::operator delete (void *p, size_t s)
65{ 58{
66 free (p); 59 free (p);
60}
61
62rxvt_term::rxvt_term ()
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
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{
74 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
75}
76
77rxvt_term::~rxvt_term ()
78{
79 rxvt_scr_release (this);
80
81#ifndef NO_SETOWNER_TTYDEV
82 rxvt_privileged_ttydev (this, RESTORE);
83#endif
84#ifdef UTMP_SUPPORT
85 rxvt_privileged_utmp (this, RESTORE);
86#endif
87#ifdef USE_XIM
88 if (Input_Context != NULL)
89 {
90 XDestroyIC (Input_Context);
91 Input_Context = NULL;
92 }
93#endif
94
95 if (cmd_fd >= 0)
96 close (cmd_fd);
97
98 if (Xfd >= 0)
99 XCloseDisplay (Xdisplay);
100
101 delete PixColors;
102}
103
104void
105rxvt_term::destroy ()
106{
107 check_ev.stop ();
108 pty_ev.stop ();
109 x_ev.stop ();
110#ifdef CURSOR_BLINK
111 blink_ev.stop ();
112#endif
113#ifdef POINTER_BLANK
114 pointer_ev.stop ();
115#endif
116
117 destroy_ev.start (0);
118}
119
120void
121rxvt_term::destroy_cb (time_watcher &w)
122{
123 SET_R (this);
124
125 delete this;
67} 126}
68 127
69/*----------------------------------------------------------------------*/ 128/*----------------------------------------------------------------------*/
70/* rxvt_init() */ 129/* rxvt_init() */
71/* LIBPROTO */ 130/* LIBPROTO */
72rxvt_t 131rxvt_t
73rxvt_init(int argc, const char *const *argv) 132rxvt_init (int argc, const char *const *argv)
74{ 133{
75 const char **cmd_argv;
76
77 SET_R(new rxvt_term); 134 SET_R (new rxvt_term);
78 dR; 135 dR;
79 136
80 if (rxvt_init_vars(aR) < 0) 137 if (!R->init_vars () || !R->init (argc, argv))
81 { 138 {
82 free(R); 139 delete R;
83 return NULL; 140 return NULL;
84 } 141 }
85 142
86/* 143 return R;
144}
145
146/* EXTPROTO */
147void
148rxvt_init_signals ()
149{
150/* install exit handler for cleanup */
151#if 0
152#ifdef HAVE_ATEXIT
153 atexit(rxvt_clean_exit);
154#else
155#endif
156#endif
157
158 struct sigaction sa;
159
160 sigfillset (&sa.sa_mask);
161 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
162 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
163 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
164 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
165 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
166 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
167 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
168
169/* need to trap SIGURG for SVR4 (Unixware) rlogin */
170/* signal (SIGURG, SIG_DFL); */
171
172 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
173 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
174}
175
176bool
177rxvt_term::init (int argc, const char *const *argv)
178{
179 dR;//TODO (scrollbar, setidle)
180
181 /*
87 * Save and then give up any super-user privileges 182 * Save and then give up any super-user privileges
88 * If we need privileges in any area then we must specifically request it. 183 * If we need privileges in any area then we must specifically request it.
89 * We should only need to be root in these cases: 184 * We should only need to be root in these cases:
90 * 1. write utmp entries on some systems 185 * 1. write utmp entries on some systems
91 * 2. chown tty on some systems 186 * 2. chown tty on some systems
92 */ 187 */
93 rxvt_privileges(aR_ SAVE); 188 rxvt_privileges (this, SAVE);
94 rxvt_privileges(aR_ IGNORE); 189 rxvt_privileges (this, IGNORE);
95 190
96 rxvt_init_secondary(aR); 191 rxvt_init_secondary (this);
97 192
98 cmd_argv = rxvt_init_resources(aR_ argc, argv); 193 const char **cmd_argv = rxvt_init_resources (this, argc, argv);
99
100 R->x_ev.start (ConnectionNumber (R->Xdisplay), EVENT_READ);
101 194
102#if (MENUBAR_MAX) 195#if (MENUBAR_MAX)
103 rxvt_menubar_read(aR_ R->rs[Rs_menu]); 196 rxvt_menubar_read (this, rs[Rs_menu]);
104#endif 197#endif
105#ifdef HAVE_SCROLLBARS 198#ifdef HAVE_SCROLLBARS
106 if (R->Options & Opt_scrollBar) 199 if (Options & Opt_scrollBar)
107 scrollbar_setIdle(); /* set existence for size calculations */ 200 scrollbar_setIdle (); /* set existence for size calculations */
108#endif 201#endif
109 202
110 rxvt_Create_Windows(aR_ argc, argv); 203 rxvt_Create_Windows (this, argc, argv);
111 204
112 rxvt_init_xlocale(aR); 205 rxvt_init_xlocale (this);
113 206
114 rxvt_scr_reset(aR); /* initialize screen */ 207 rxvt_scr_reset (this); /* initialize screen */
115#ifdef RXVT_GRAPHICS 208#ifdef RXVT_GRAPHICS
116 rxvt_Gr_reset(aR); /* reset graphics */ 209 rxvt_Gr_reset (this); /* reset graphics */
117#endif 210#endif
118 211
119#if 0 212#if 0
120#ifdef DEBUG_X 213#ifdef DEBUG_X
121 XSynchronize(R->Xdisplay, True); 214 XSynchronize(Xdisplay, True);
122 XSetErrorHandler((XErrorHandler) abort);
123#else
124 XSetErrorHandler((XErrorHandler) rxvt_xerror_handler);
125#endif 215#endif
126#endif 216#endif
127 217
128#ifdef HAVE_SCROLLBARS 218#ifdef HAVE_SCROLLBARS
129 if (R->Options & Opt_scrollBar) 219 if (Options & Opt_scrollBar)
130 rxvt_Resize_scrollBar(aR); /* create and map scrollbar */ 220 rxvt_Resize_scrollBar (this); /* create and map scrollbar */
131#endif 221#endif
132#if (MENUBAR_MAX) 222#if (MENUBAR_MAX)
133 if (menubar_visible(r)) 223 if (menubar_visible(r))
134 XMapWindow(R->Xdisplay, R->menuBar.win); 224 XMapWindow (Xdisplay, menuBar.win);
135#endif 225#endif
136#ifdef TRANSPARENT 226#ifdef TRANSPARENT
137 if (R->Options & Opt_transparent) 227 if (Options & Opt_transparent)
138 { 228 {
139 XSelectInput(R->Xdisplay, Xroot, PropertyChangeMask); 229 XSelectInput (Xdisplay, Xroot, PropertyChangeMask);
140 rxvt_check_our_parents(aR); 230 rxvt_check_our_parents (this);
141 } 231 }
142#endif 232#endif
143 XMapWindow(R->Xdisplay, R->TermWin.vt); 233 XMapWindow (Xdisplay, TermWin.vt);
144 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 234 XMapWindow (Xdisplay, TermWin.parent[0]);
145 235
146 rxvt_init_env(aR); 236 rxvt_init_env (this);
147 rxvt_init_command(aR_ cmd_argv); 237 rxvt_init_command (this, cmd_argv);
148 238
239 x_ev.start (Xfd, EVENT_READ);
149 R->pty_ev.start (R->cmd_fd, EVENT_READ); 240 pty_ev.start (cmd_fd, EVENT_READ);
150 241
151 return R; 242 check_ev.start ();
243
244 return true;
152} 245}
153 246
154/* ------------------------------------------------------------------------- * 247/* ------------------------------------------------------------------------- *
155 * SIGNAL HANDLING & EXIT HANDLER * 248 * SIGNAL HANDLING & EXIT HANDLER *
156 * ------------------------------------------------------------------------- */ 249 * ------------------------------------------------------------------------- */
… …
160/* ARGSUSED */ 253/* ARGSUSED */
161/* EXTPROTO */ 254/* EXTPROTO */
162RETSIGTYPE 255RETSIGTYPE
163rxvt_Child_signal(int sig __attribute__ ((unused))) 256rxvt_Child_signal(int sig __attribute__ ((unused)))
164{ 257{
165 dR;
166 int pid, save_errno = errno; 258 int pid, save_errno = errno;
167
168 do {
169 errno = 0;
170 } while ((pid = waitpid(-1, NULL, WNOHANG)) == -1 && errno == EINTR); 259 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
260 ;
261 errno = save_errno;
171 262
263#if 0
172 if (pid == R->cmd_pid) 264 if (pid == R->cmd_pid)
173 exit(EXIT_SUCCESS); 265 exit (EXIT_SUCCESS);
174 266#endif
175 errno = save_errno;
176 signal(SIGCHLD, rxvt_Child_signal);
177} 267}
178 268
179/* 269/*
180 * Catch a fatal signal and tidy up before quitting 270 * Catch a fatal signal and tidy up before quitting
181 */ 271 */
… …
195/* INTPROTO */ 285/* INTPROTO */
196int 286int
197rxvt_xerror_handler(const Display * display 287rxvt_xerror_handler(const Display * display
198 __attribute__ ((unused)), const XErrorEvent * event) 288 __attribute__ ((unused)), const XErrorEvent * event)
199{ 289{
200 dR; 290 dR;
201 291
202 if (R->allowedxerror == -1) { 292 if (R->allowedxerror == -1)
203 R->allowedxerror = event->error_code; 293 R->allowedxerror = event->error_code;
204 return 0; /* ignored anyway */ 294 else
205 } 295 {
206 rxvt_print_error("XError: Request: %d . %d, Error: %d", 296 rxvt_print_error("XError: Request: %d . %d, Error: %d",
207 event->request_code, event->minor_code, 297 event->request_code, event->minor_code,
208 event->error_code); 298 event->error_code);
209/* XXX: probably should call rxvt_clean_exit() bypassing X routines */ 299
210 exit(EXIT_FAILURE); 300 R->destroy ();
211/* NOTREACHED */ 301 }
302
303 return 0;
212} 304}
213 305
214/*----------------------------------------------------------------------*/ 306/*----------------------------------------------------------------------*/
215/* 307/*
216 * Exit gracefully, clearing the utmp entry and restoring tty attributes 308 * Exit gracefully, clearing the utmp entry and restoring tty attributes
217 * TODO: if debugging, this should free up any known resources if we can 309 * TODO: if debugging, this should free up any known resources if we can
218 */ 310 */
219/* EXTPROTO */ 311/* EXTPROTO */
220void 312void
221rxvt_clean_exit(void) 313rxvt_clean_exit ()
222{ 314{
223 dR; 315 dR;
224 316
225#ifdef DEBUG_SCREEN 317 R->destroy ();
226 rxvt_scr_release(aR);
227#endif
228#ifndef NO_SETOWNER_TTYDEV
229 rxvt_privileged_ttydev(aR_ RESTORE);
230#endif
231#ifdef UTMP_SUPPORT
232 rxvt_privileged_utmp(aR_ RESTORE);
233#endif
234#ifdef USE_XIM
235 if (R->Input_Context != NULL) {
236 XDestroyIC(R->Input_Context);
237 R->Input_Context = NULL;
238 }
239#endif
240} 318}
241 319
242/* ------------------------------------------------------------------------- * 320/* ------------------------------------------------------------------------- *
243 * MEMORY ALLOCATION WRAPPERS * 321 * MEMORY ALLOCATION WRAPPERS *
244 * ------------------------------------------------------------------------- */ 322 * ------------------------------------------------------------------------- */
… …
536/*----------------------------------------------------------------------*/ 614/*----------------------------------------------------------------------*/
537/* 615/*
538 * Tell the teletype handler what size the window is. 616 * Tell the teletype handler what size the window is.
539 * Called after a window size change. 617 * Called after a window size change.
540 */ 618 */
541/* EXTPROTO */
542void 619void
543rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) 620rxvt_term::tt_winch ()
544{ 621{
545 struct winsize ws; 622 struct winsize ws;
546 623
547 if (fd < 0) 624 if (cmd_fd < 0)
548 return; 625 return;
626
549 ws.ws_col = col; 627 ws.ws_col = TermWin.ncol;
550 ws.ws_row = row; 628 ws.ws_row = TermWin.nrow;
551 ws.ws_xpixel = ws.ws_ypixel = 0; 629 ws.ws_xpixel = ws.ws_ypixel = 0;
552#ifndef DEBUG_SIZE 630#ifndef DEBUG_SIZE
553 (void)ioctl(fd, TIOCSWINSZ, &ws); 631 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
554#else 632#else
555 if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { 633 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
556 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 634 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
557 }
558# ifdef SIGWINCH 635# ifdef SIGWINCH
559 else if (pid) /* force through to the command */ 636 else if (cmd_pid) /* force through to the command */
560 kill(pid, SIGWINCH); 637 kill (cmd_pid, SIGWINCH);
561# endif 638# endif
562#endif 639#endif
563} 640}
564 641
565/*----------------------------------------------------------------------*/ 642/*----------------------------------------------------------------------*/
… …
984 return; 1061 return;
985} 1062}
986 1063
987/* INTPROTO */ 1064/* INTPROTO */
988void 1065void
989rxvt_setPreeditArea(pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1066rxvt_setPreeditArea (pR_ XRectangle * preedit_rect, XRectangle * status_rect,
990 XRectangle * needed_rect) 1067 XRectangle * needed_rect)
991{ 1068{
992 int mbh, vtx = 0; 1069 int mbh, vtx = 0;
993 1070
994 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1071 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right))
995 vtx = scrollbar_TotalWidth(); 1072 vtx = scrollbar_TotalWidth();

Diff Legend

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