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.6 by pcg, Tue Nov 25 17:11:33 2003 UTC vs.
Revision 1.15 by pcg, Thu Dec 18 05:45:11 2003 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.6 2003/11/25 17:11:33 pcg Exp $ 4 * $Id: main.C,v 1.15 2003/12/18 05:45:11 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
47#include <cstring>
48
49static char curlocale[128];
50
51void
52rxvt_set_locale (const char *locale)
53{
54 if (locale && strncmp (locale, curlocale, 128))
55 {
56 strncpy (curlocale, locale, 128);
57 setlocale (LC_CTYPE, curlocale);
58 }
59}
60
47void * 61void *
48rxvt_term::operator new (size_t s) 62rxvt_term::operator new (size_t s)
49{ 63{
50 void *p = malloc (s); 64 void *p = malloc (s);
51 65
… …
65 blink_ev (this, &rxvt_term::blink_cb), 79 blink_ev (this, &rxvt_term::blink_cb),
66#endif 80#endif
67#ifdef POINTER_BLANK 81#ifdef POINTER_BLANK
68 pointer_ev (this, &rxvt_term::pointer_cb), 82 pointer_ev (this, &rxvt_term::pointer_cb),
69#endif 83#endif
70 x_ev (this, &rxvt_term::x_cb) 84 x_ev (this, &rxvt_term::x_cb),
85 destroy_ev (this, &rxvt_term::destroy_cb),
86 check_ev (this, &rxvt_term::check_cb),
87 incr_ev (this, &rxvt_term::incr_cb)
71{ 88{
72 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 89 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
73} 90}
74 91
75rxvt_term::~rxvt_term () 92rxvt_term::~rxvt_term ()
76{ 93{
94 scr_release ();
95
96 free (locale);
97 free (codeset);
98
99#ifndef NO_SETOWNER_TTYDEV
100 rxvt_privileged_ttydev (this, RESTORE);
101#endif
102#ifdef UTMP_SUPPORT
103 rxvt_privileged_utmp (this, RESTORE);
104#endif
105#ifdef USE_XIM
106 if (Input_Context != NULL)
107 {
108 XDestroyIC (Input_Context);
109 Input_Context = NULL;
110 }
111#endif
112
113 if (cmd_fd >= 0)
114 close (cmd_fd);
115
116 if (Xfd >= 0)
117 XCloseDisplay (Xdisplay);
118
77 delete PixColors; 119 delete PixColors;
120}
121
122void
123rxvt_term::destroy ()
124{
125 check_ev.stop ();
126 pty_ev.stop ();
127 x_ev.stop ();
128#ifdef CURSOR_BLINK
129 blink_ev.stop ();
130#endif
131#ifdef POINTER_BLANK
132 pointer_ev.stop ();
133#endif
134
135 destroy_ev.start (0);
136}
137
138void
139rxvt_term::destroy_cb (time_watcher &w)
140{
141 SET_R (this);
142
143 delete this;
78} 144}
79 145
80/*----------------------------------------------------------------------*/ 146/*----------------------------------------------------------------------*/
81/* rxvt_init() */ 147/* rxvt_init() */
82/* LIBPROTO */ 148/* LIBPROTO */
83rxvt_t 149rxvt_t
84rxvt_init(int argc, const char *const *argv) 150rxvt_init (int argc, const char *const *argv)
85{ 151{
86 SET_R(new rxvt_term); 152 SET_R (new rxvt_term);
87 dR; 153 dR;
88 154
89 if (!R->init_vars () || !R->init (argc, argv)) 155 if (!R->init_vars () || !R->init (argc, argv))
90 { 156 {
91 delete R; 157 delete R;
… …
93 } 159 }
94 160
95 return R; 161 return R;
96} 162}
97 163
164/* EXTPROTO */
165void
166rxvt_init_signals ()
167{
168/* install exit handler for cleanup */
169#if 0
170#ifdef HAVE_ATEXIT
171 atexit(rxvt_clean_exit);
172#else
173#endif
174#endif
175
176 struct sigaction sa;
177
178 sigfillset (&sa.sa_mask);
179 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
180 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
181 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
182 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
183 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
184 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
185 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
186
187/* need to trap SIGURG for SVR4 (Unixware) rlogin */
188/* signal (SIGURG, SIG_DFL); */
189
190 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
191 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
192}
193
98bool 194bool
99rxvt_term::init (int argc, const char *const *argv) 195rxvt_term::init (int argc, const char *const *argv)
100{ 196{
101 dR;//TODO (scrollbar, setidle)
102
103 /* 197 /*
104 * Save and then give up any super-user privileges 198 * Save and then give up any super-user privileges
105 * If we need privileges in any area then we must specifically request it. 199 * If we need privileges in any area then we must specifically request it.
106 * We should only need to be root in these cases: 200 * We should only need to be root in these cases:
107 * 1. write utmp entries on some systems 201 * 1. write utmp entries on some systems
108 * 2. chown tty on some systems 202 * 2. chown tty on some systems
109 */ 203 */
110 rxvt_privileges (this, SAVE); 204 rxvt_privileges (this, SAVE);
111 rxvt_privileges (this, IGNORE); 205 rxvt_privileges (this, IGNORE);
112 206
207#if HAVE_XSETLOCALE || HAVE_SETLOCALE
208 locale = strdup (setlocale (LC_CTYPE, ""));
209#endif
210#if HAVE_NL_LANGINFO
211 codeset = strdup (nl_langinfo (CODESET));
212#endif
213
113 rxvt_init_secondary (this); 214 init_secondary ();
114 215
115 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 216 const char **cmd_argv = init_resources (argc, argv);
116 217
117#if (MENUBAR_MAX) 218#if (MENUBAR_MAX)
118 rxvt_menubar_read (this, rs[Rs_menu]); 219 rxvt_menubar_read (this, rs[Rs_menu]);
119#endif 220#endif
120#ifdef HAVE_SCROLLBARS 221#ifdef HAVE_SCROLLBARS
121 if (Options & Opt_scrollBar) 222 if (Options & Opt_scrollBar)
122 scrollbar_setIdle (); /* set existence for size calculations */ 223 scrollBar.setIdle (); /* set existence for size calculations */
123#endif 224#endif
124 225
125 rxvt_Create_Windows (this, argc, argv); 226 rxvt_Create_Windows (this, argc, argv);
126 227
127 rxvt_init_xlocale (this); 228 init_xlocale ();
128 229
129 rxvt_scr_reset (this); /* initialize screen */ 230 scr_reset (); /* initialize screen */
130#ifdef RXVT_GRAPHICS 231#ifdef RXVT_GRAPHICS
131 rxvt_Gr_reset (this); /* reset graphics */ 232 rxvt_Gr_reset (this); /* reset graphics */
132#endif 233#endif
133 234
134#if 0 235#if 0
135#ifdef DEBUG_X 236#ifdef DEBUG_X
136 XSynchronize(Xdisplay, True); 237 XSynchronize(Xdisplay, True);
137 XSetErrorHandler((XErrorHandler) abort);
138#else
139 XSetErrorHandler((XErrorHandler) rxvt_xerror_handler);
140#endif 238#endif
141#endif 239#endif
142 240
143#ifdef HAVE_SCROLLBARS 241#ifdef HAVE_SCROLLBARS
144 if (Options & Opt_scrollBar) 242 if (Options & Opt_scrollBar)
… …
156 } 254 }
157#endif 255#endif
158 XMapWindow (Xdisplay, TermWin.vt); 256 XMapWindow (Xdisplay, TermWin.vt);
159 XMapWindow (Xdisplay, TermWin.parent[0]); 257 XMapWindow (Xdisplay, TermWin.parent[0]);
160 258
161 rxvt_init_env (this); 259 init_env ();
162 rxvt_init_command (this, cmd_argv); 260 init_command (cmd_argv);
163 261
164 x_ev.start (Xfd, EVENT_READ); 262 x_ev.start (Xfd, EVENT_READ);
165 pty_ev.start (cmd_fd, EVENT_READ); 263 pty_ev.start (cmd_fd, EVENT_READ);
264
265 check_ev.start ();
266
267 process_x_events ();
166 268
167 return true; 269 return true;
168} 270}
169 271
170/* ------------------------------------------------------------------------- * 272/* ------------------------------------------------------------------------- *
… …
176/* ARGSUSED */ 278/* ARGSUSED */
177/* EXTPROTO */ 279/* EXTPROTO */
178RETSIGTYPE 280RETSIGTYPE
179rxvt_Child_signal(int sig __attribute__ ((unused))) 281rxvt_Child_signal(int sig __attribute__ ((unused)))
180{ 282{
181 dR;
182 int pid, save_errno = errno; 283 int pid, save_errno = errno;
183
184 do {
185 errno = 0;
186 } while ((pid = waitpid(-1, NULL, WNOHANG)) == -1 && errno == EINTR); 284 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
285 ;
286 errno = save_errno;
187 287
288#if 0
188 if (pid == R->cmd_pid) 289 if (pid == R->cmd_pid)
189 exit(EXIT_SUCCESS); 290 exit (EXIT_SUCCESS);
190 291#endif
191 errno = save_errno;
192 signal(SIGCHLD, rxvt_Child_signal);
193} 292}
194 293
195/* 294/*
196 * Catch a fatal signal and tidy up before quitting 295 * Catch a fatal signal and tidy up before quitting
197 */ 296 */
… …
211/* INTPROTO */ 310/* INTPROTO */
212int 311int
213rxvt_xerror_handler(const Display * display 312rxvt_xerror_handler(const Display * display
214 __attribute__ ((unused)), const XErrorEvent * event) 313 __attribute__ ((unused)), const XErrorEvent * event)
215{ 314{
216 dR; 315 dR;
217 316
218 if (R->allowedxerror == -1) { 317 if (R->allowedxerror == -1)
219 R->allowedxerror = event->error_code; 318 R->allowedxerror = event->error_code;
220 return 0; /* ignored anyway */ 319 else
221 } 320 {
222 rxvt_print_error("XError: Request: %d . %d, Error: %d", 321 rxvt_print_error("XError: Request: %d . %d, Error: %d",
223 event->request_code, event->minor_code, 322 event->request_code, event->minor_code,
224 event->error_code); 323 event->error_code);
225/* XXX: probably should call rxvt_clean_exit() bypassing X routines */ 324
226 exit(EXIT_FAILURE); 325 R->destroy ();
227/* NOTREACHED */ 326 }
327
328 return 0;
228} 329}
229 330
230/*----------------------------------------------------------------------*/ 331/*----------------------------------------------------------------------*/
231/* 332/*
232 * Exit gracefully, clearing the utmp entry and restoring tty attributes 333 * Exit gracefully, clearing the utmp entry and restoring tty attributes
233 * TODO: if debugging, this should free up any known resources if we can 334 * TODO: if debugging, this should free up any known resources if we can
234 */ 335 */
235/* EXTPROTO */ 336/* EXTPROTO */
236void 337void
237rxvt_clean_exit(void) 338rxvt_clean_exit ()
238{ 339{
239 dR; 340 dR;
240 341
241#ifdef DEBUG_SCREEN 342 R->destroy ();
242 rxvt_scr_release(aR);
243#endif
244#ifndef NO_SETOWNER_TTYDEV
245 rxvt_privileged_ttydev(aR_ RESTORE);
246#endif
247#ifdef UTMP_SUPPORT
248 rxvt_privileged_utmp(aR_ RESTORE);
249#endif
250#ifdef USE_XIM
251 if (R->Input_Context != NULL) {
252 XDestroyIC(R->Input_Context);
253 R->Input_Context = NULL;
254 }
255#endif
256} 343}
257 344
258/* ------------------------------------------------------------------------- * 345/* ------------------------------------------------------------------------- *
259 * MEMORY ALLOCATION WRAPPERS * 346 * MEMORY ALLOCATION WRAPPERS *
260 * ------------------------------------------------------------------------- */ 347 * ------------------------------------------------------------------------- */
… …
552/*----------------------------------------------------------------------*/ 639/*----------------------------------------------------------------------*/
553/* 640/*
554 * Tell the teletype handler what size the window is. 641 * Tell the teletype handler what size the window is.
555 * Called after a window size change. 642 * Called after a window size change.
556 */ 643 */
557/* EXTPROTO */
558void 644void
559rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) 645rxvt_term::tt_winch ()
560{ 646{
561 struct winsize ws; 647 struct winsize ws;
562 648
563 if (fd < 0) 649 if (cmd_fd < 0)
564 return; 650 return;
651
565 ws.ws_col = col; 652 ws.ws_col = TermWin.ncol;
566 ws.ws_row = row; 653 ws.ws_row = TermWin.nrow;
567 ws.ws_xpixel = ws.ws_ypixel = 0; 654 ws.ws_xpixel = ws.ws_ypixel = 0;
568#ifndef DEBUG_SIZE 655#ifndef DEBUG_SIZE
569 (void)ioctl(fd, TIOCSWINSZ, &ws); 656 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
570#else 657#else
571 if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { 658 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
572 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 659 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
573 }
574# ifdef SIGWINCH 660# ifdef SIGWINCH
575 else if (pid) /* force through to the command */ 661 else if (cmd_pid) /* force through to the command */
576 kill(pid, SIGWINCH); 662 kill (cmd_pid, SIGWINCH);
577# endif 663# endif
578#endif 664#endif
579} 665}
580 666
581/*----------------------------------------------------------------------*/ 667/*----------------------------------------------------------------------*/
… …
694 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 780 XSetWindowBackground(R->Xdisplay, R->TermWin.vt,
695 R->PixColors[Color_bg]); 781 R->PixColors[Color_bg]);
696 782
697/* handle Color_BD, scrollbar background, etc. */ 783/* handle Color_BD, scrollbar background, etc. */
698 784
699 rxvt_set_colorfgbg(aR); 785 rxvt_set_colorfgbg (aR);
700 rxvt_recolour_cursor(aR); 786 R->recolour_cursor ();
701/* the only reasonable way to enforce a clean update */ 787/* the only reasonable way to enforce a clean update */
702 rxvt_scr_poweron(aR); 788 rxvt_scr_poweron (aR);
703} 789}
704 790
705#else 791#else
706# define rxvt_set_window_color(aR_ idx,color) ((void)0) 792# define rxvt_set_window_color(aR_ idx,color) ((void)0)
707#endif /* XTERM_COLOR_CHANGE */ 793#endif /* XTERM_COLOR_CHANGE */
708 794
709/* EXTPROTO */
710void 795void
711rxvt_recolour_cursor(pR) 796rxvt_term::recolour_cursor ()
712{ 797{
713 rxvt_color xcol[2];
714
715#if TODO 798#if TODO
799 rxvt_color xcol[2];
800
716 xcol[0] = R->PixColors[Color_pointer]; 801 xcol[0] = PixColors[Color_pointer];
717 xcol[1] = R->PixColors[Color_bg]; 802 xcol[1] = PixColors[Color_bg];
718 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 803 XQueryColors (Xdisplay, XCMAP, xcol, 2);
719 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 804 XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1]));
720#endif 805#endif
721} 806}
722 807
723/*----------------------------------------------------------------------*/ 808/*----------------------------------------------------------------------*/
724/* 809/*
… …
876 uint16_t old_ncol = R->prev_ncol; 961 uint16_t old_ncol = R->prev_ncol;
877 962
878 /* scr_reset only works on the primary screen */ 963 /* scr_reset only works on the primary screen */
879 if (R->old_height) /* this is not the first time through */ 964 if (R->old_height) /* this is not the first time through */
880 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 965 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY);
966
881 rxvt_scr_reset(aR); 967 R->scr_reset();
968
882 if (curr_screen >= 0) { /* this is not the first time through */ 969 if (curr_screen >= 0) { /* this is not the first time through */
883 rxvt_scr_change_screen(aR_ curr_screen); 970 rxvt_scr_change_screen(aR_ curr_screen);
884 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0)); 971 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
885 } 972 }
886 } 973 }
… …
1000 return; 1087 return;
1001} 1088}
1002 1089
1003/* INTPROTO */ 1090/* INTPROTO */
1004void 1091void
1005rxvt_setPreeditArea(pR_ XRectangle * preedit_rect, XRectangle * status_rect, 1092rxvt_setPreeditArea (pR_ XRectangle * preedit_rect, XRectangle * status_rect,
1006 XRectangle * needed_rect) 1093 XRectangle * needed_rect)
1007{ 1094{
1008 int mbh, vtx = 0; 1095 int mbh, vtx = 0;
1009 1096
1010 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) 1097 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right))
1011 vtx = scrollbar_TotalWidth(); 1098 vtx = scrollbar_TotalWidth();
… …
1055rxvt_IMInstantiateCallback(Display * unused 1142rxvt_IMInstantiateCallback(Display * unused
1056 __attribute__ ((unused)), XPointer client_data 1143 __attribute__ ((unused)), XPointer client_data
1057 __attribute__ ((unused)), XPointer call_data 1144 __attribute__ ((unused)), XPointer call_data
1058 __attribute__ ((unused))) 1145 __attribute__ ((unused)))
1059{ 1146{
1060 dR; 1147 dR;
1061 int i, found, had_im; 1148 int i, found, had_im;
1062 const char *p; 1149 const char *p;
1063 char **s; 1150 char **s;
1064 char buf[IMBUFSIZ]; 1151 char buf[IMBUFSIZ];
1065 1152
1066 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1153 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1067 if (R->Input_Context) 1154 if (R->Input_Context)
1068 return; 1155 return;
1069 1156
1070 found = had_im = 0; 1157#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1158 if (R->rs[Rs_imLocale])
1159 setlocale (LC_CTYPE, R->rs[Rs_imLocale]);
1160#endif
1161
1071 p = R->rs[Rs_inputMethod]; 1162 p = R->rs[Rs_inputMethod];
1072 if (p && *p) { 1163 if (p && *p)
1073 had_im = 1; 1164 {
1165 bool found = false;
1166
1074 s = rxvt_splitcommastring(p); 1167 s = rxvt_splitcommastring (p);
1075 for (i = 0; s[i]; i++) { 1168 for (i = 0; s[i]; i++)
1169 {
1076 if (*s[i]) { 1170 if (*s[i])
1171 {
1077 STRCPY(buf, "@im="); 1172 STRCPY (buf, "@im=");
1078 STRNCAT(buf, s[i], IMBUFSIZ - 5); 1173 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1079 if ((p = XSetLocaleModifiers(buf)) != NULL && *p 1174 if ((p = XSetLocaleModifiers (buf)) && *p
1080 && (rxvt_IM_get_IC(aR) == True)) { 1175 && rxvt_IM_get_IC (aR))
1176 {
1081 found = 1; 1177 found = true;
1082 break; 1178 break;
1083 } 1179 }
1084 } 1180 }
1085 } 1181 }
1086 for (i = 0; s[i]; i++) 1182 for (i = 0; s[i]; i++)
1087 free(s[i]); 1183 free(s[i]);
1088 free(s); 1184 free(s);
1089 } 1185
1090 if (found) 1186 if (found)
1091 return; 1187 goto done;
1188 }
1092 1189
1093/* try with XMODIFIERS env. var. */ 1190/* try with XMODIFIERS env. var. */
1094 if ((p = XSetLocaleModifiers("")) != NULL && *p) { 1191 if ((p = XSetLocaleModifiers ("")) && *p
1095 rxvt_IM_get_IC(aR); 1192 && rxvt_IM_get_IC (aR))
1096 return; 1193 goto done;
1097 }
1098 1194
1099/* try with no modifiers base IF the user didn't specify an IM */ 1195/* try with no modifiers base IF the user didn't specify an IM */
1100 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p 1196 if ((p = XSetLocaleModifiers ("@im=none")) && *p
1101 && rxvt_IM_get_IC(aR) == True) 1197 && rxvt_IM_get_IC (aR) == True)
1102 return; 1198 goto done;
1199
1200done:
1201#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1202 if (R->rs[Rs_imLocale])
1203 setlocale (LC_CTYPE, R->locale);
1204#endif
1103} 1205}
1104 1206
1105/* 1207/*
1106 * Try to open a XIM with the current modifiers, then see if we can 1208 * Try to open a XIM with the current modifiers, then see if we can
1107 * open a suitable preedit type 1209 * open a suitable preedit type

Diff Legend

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