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.9 by pcg, Tue Dec 2 21:49:46 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.9 2003/12/02 21:49:46 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>
… …
67#ifdef POINTER_BLANK 67#ifdef POINTER_BLANK
68 pointer_ev (this, &rxvt_term::pointer_cb), 68 pointer_ev (this, &rxvt_term::pointer_cb),
69#endif 69#endif
70 x_ev (this, &rxvt_term::x_cb), 70 x_ev (this, &rxvt_term::x_cb),
71 destroy_ev (this, &rxvt_term::destroy_cb), 71 destroy_ev (this, &rxvt_term::destroy_cb),
72 check_ev (this, &rxvt_term::check_cb) 72 check_ev (this, &rxvt_term::check_cb),
73 incr_ev (this, &rxvt_term::incr_cb)
73{ 74{
74 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 75 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
75} 76}
76 77
77rxvt_term::~rxvt_term () 78rxvt_term::~rxvt_term ()
78{ 79{
79 rxvt_scr_release (this); 80 scr_release ();
80 81
81#ifndef NO_SETOWNER_TTYDEV 82#ifndef NO_SETOWNER_TTYDEV
82 rxvt_privileged_ttydev (this, RESTORE); 83 rxvt_privileged_ttydev (this, RESTORE);
83#endif 84#endif
84#ifdef UTMP_SUPPORT 85#ifdef UTMP_SUPPORT
… …
202 203
203 rxvt_Create_Windows (this, argc, argv); 204 rxvt_Create_Windows (this, argc, argv);
204 205
205 rxvt_init_xlocale (this); 206 rxvt_init_xlocale (this);
206 207
207 rxvt_scr_reset (this); /* initialize screen */ 208 scr_reset (); /* initialize screen */
208#ifdef RXVT_GRAPHICS 209#ifdef RXVT_GRAPHICS
209 rxvt_Gr_reset (this); /* reset graphics */ 210 rxvt_Gr_reset (this); /* reset graphics */
210#endif 211#endif
211 212
212#if 0 213#if 0
… …
238 239
239 x_ev.start (Xfd, EVENT_READ); 240 x_ev.start (Xfd, EVENT_READ);
240 pty_ev.start (cmd_fd, EVENT_READ); 241 pty_ev.start (cmd_fd, EVENT_READ);
241 242
242 check_ev.start (); 243 check_ev.start ();
244
245 process_x_events ();
243 246
244 return true; 247 return true;
245} 248}
246 249
247/* ------------------------------------------------------------------------- * 250/* ------------------------------------------------------------------------- *
… …
937 uint16_t old_ncol = R->prev_ncol; 940 uint16_t old_ncol = R->prev_ncol;
938 941
939 /* scr_reset only works on the primary screen */ 942 /* scr_reset only works on the primary screen */
940 if (R->old_height) /* this is not the first time through */ 943 if (R->old_height) /* this is not the first time through */
941 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 944 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY);
945
942 rxvt_scr_reset(aR); 946 R->scr_reset();
947
943 if (curr_screen >= 0) { /* this is not the first time through */ 948 if (curr_screen >= 0) { /* this is not the first time through */
944 rxvt_scr_change_screen(aR_ curr_screen); 949 rxvt_scr_change_screen(aR_ curr_screen);
945 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0)); 950 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
946 } 951 }
947 } 952 }
… …
1116rxvt_IMInstantiateCallback(Display * unused 1121rxvt_IMInstantiateCallback(Display * unused
1117 __attribute__ ((unused)), XPointer client_data 1122 __attribute__ ((unused)), XPointer client_data
1118 __attribute__ ((unused)), XPointer call_data 1123 __attribute__ ((unused)), XPointer call_data
1119 __attribute__ ((unused))) 1124 __attribute__ ((unused)))
1120{ 1125{
1121 dR; 1126 dR;
1122 int i, found, had_im; 1127 int i, found, had_im;
1123 const char *p; 1128 const char *p;
1124 char **s; 1129 char **s;
1125 char buf[IMBUFSIZ]; 1130 char buf[IMBUFSIZ];
1126 1131
1127 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1132 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1128 if (R->Input_Context) 1133 if (R->Input_Context)
1129 return; 1134 return;
1130 1135
1131 found = had_im = 0;
1132 p = R->rs[Rs_inputMethod]; 1136 p = R->rs[Rs_inputMethod];
1133 if (p && *p) { 1137 if (p && *p)
1134 had_im = 1; 1138 {
1139 bool found = false;
1140
1135 s = rxvt_splitcommastring(p); 1141 s = rxvt_splitcommastring (p);
1136 for (i = 0; s[i]; i++) { 1142 for (i = 0; s[i]; i++)
1143 {
1137 if (*s[i]) { 1144 if (*s[i])
1145 {
1138 STRCPY(buf, "@im="); 1146 STRCPY (buf, "@im=");
1139 STRNCAT(buf, s[i], IMBUFSIZ - 5); 1147 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1140 if ((p = XSetLocaleModifiers(buf)) != NULL && *p 1148 if ((p = XSetLocaleModifiers (buf)) && *p
1141 && (rxvt_IM_get_IC(aR) == True)) { 1149 && rxvt_IM_get_IC (aR))
1150 {
1142 found = 1; 1151 found = true;
1143 break; 1152 break;
1144 } 1153 }
1145 } 1154 }
1146 } 1155 }
1147 for (i = 0; s[i]; i++) 1156 for (i = 0; s[i]; i++)
1148 free(s[i]); 1157 free(s[i]);
1149 free(s); 1158 free(s);
1150 } 1159
1151 if (found) 1160 if (found)
1152 return; 1161 return;
1162 }
1153 1163
1154/* try with XMODIFIERS env. var. */ 1164/* try with XMODIFIERS env. var. */
1155 if ((p = XSetLocaleModifiers("")) != NULL && *p) { 1165 if ((p = XSetLocaleModifiers ("")) && *p
1156 rxvt_IM_get_IC(aR); 1166 && rxvt_IM_get_IC (aR))
1157 return; 1167 return;
1158 }
1159 1168
1160/* 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 */
1161 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p 1170 if ((p = XSetLocaleModifiers ("@im=none")) && *p
1162 && rxvt_IM_get_IC(aR) == True) 1171 && rxvt_IM_get_IC (aR) == True)
1163 return; 1172 return;
1164} 1173}
1165 1174
1166/* 1175/*
1167 * 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
1168 * open a suitable preedit type 1177 * open a suitable preedit type

Diff Legend

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