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.21 by pcg, Thu Jan 29 23:26:01 2004 UTC vs.
Revision 1.46 by pcg, Tue Feb 24 22:28:42 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.21 2004/01/29 23:26:01 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * 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> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
12 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
13 * - extensive modifications 12 * - extensive modifications
14 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
15 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
16 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
72{ 72{
73 free (p); 73 free (p);
74} 74}
75 75
76rxvt_term::rxvt_term () 76rxvt_term::rxvt_term ()
77: destroy_ev (this, &rxvt_term::destroy_cb), 77 :
78 rootwin_ev (this, &rxvt_term::rootwin_cb),
79 termwin_ev (this, &rxvt_term::x_cb),
80 vt_ev (this, &rxvt_term::x_cb),
81#ifdef HAVE_SCROLLBARS
82 scrollbar_ev (this, &rxvt_term::x_cb),
83#endif
84#ifdef MENUBAR
85 menubar_ev (this, &rxvt_term::x_cb),
86#endif
78#ifdef CURSOR_BLINK 87#ifdef CURSOR_BLINK
79 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
80#endif 89#endif
81#ifdef TEXT_BLINK 90#ifdef TEXT_BLINK
82 text_blink_ev (this, &rxvt_term::text_blink_cb), 91 text_blink_ev (this, &rxvt_term::text_blink_cb),
83#endif 92#endif
84#ifdef POINTER_BLANK 93#ifdef POINTER_BLANK
85 pointer_ev (this, &rxvt_term::pointer_cb), 94 pointer_ev (this, &rxvt_term::pointer_cb),
86#endif 95#endif
96#ifdef USE_XIM
87 x_ev (this, &rxvt_term::x_cb), 97 im_ev (this, &rxvt_term::im_cb),
98#endif
88 check_ev (this, &rxvt_term::check_cb), 99 check_ev (this, &rxvt_term::check_cb),
100 destroy_ev (this, &rxvt_term::destroy_cb),
101 pty_ev (this, &rxvt_term::pty_cb),
89 incr_ev (this, &rxvt_term::incr_cb), 102 incr_ev (this, &rxvt_term::incr_cb)
90 pty_ev (this, &rxvt_term::pty_cb)
91{ 103{
92 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
93} 105}
94 106
95rxvt_term::~rxvt_term () 107rxvt_term::~rxvt_term ()
96{ 108{
109 if (cmd_fd >= 0)
110 close (cmd_fd);
111
112#ifndef NO_SETOWNER_TTYDEV
113 privileged_ttydev (RESTORE);
114#endif
115#ifdef UTMP_SUPPORT
116 privileged_utmp (RESTORE);
117#endif
118
119 delete TermWin.fontset;
120
121 if (display)
122 {
123#if defined(MENUBAR) && (MENUBAR_MAX > 1)
124 delete menuBar.drawable;
125 //if (menuBar.win)
126 // XDestroyWindow (display->display, menuBar.win);
127#endif
128 delete TermWin.drawable;
129 // destroy all windows
130 if (TermWin.parent[0])
131 XDestroyWindow (display->display, TermWin.parent[0]);
132 }
133
134 // TODO: free pixcolours, colours should become part of rxvt_display
135
136 delete PixColors;
137
138 displays.put (display);
139
97 scr_release (); 140 scr_release ();
98 141
142 free (env_windowid);
143 free (env_display);
144 free (env_term);
145 free (env_colorfgbg);
99 free (locale); 146 free (locale);
100 free (codeset); 147 free (codeset);
101 148
102#ifndef NO_SETOWNER_TTYDEV 149 delete envv;
103 rxvt_privileged_ttydev (this, RESTORE); 150 delete argv;
104#endif 151}
105#ifdef UTMP_SUPPORT 152
106 rxvt_privileged_utmp (this, RESTORE); 153void
107#endif 154rxvt_term::destroy ()
155{
156 if (display)
157 {
158 rootwin_ev.stop (display);
159 termwin_ev.stop (display);
160 vt_ev.stop (display);
108#ifdef USE_XIM 161#ifdef USE_XIM
109 if (Input_Context != NULL) 162 im_destroy ();
163 im_ev.stop (display);
164#endif
165#ifdef HAVE_SCROLLBARS
166 scrollbar_ev.stop (display);
167#endif
168#ifdef MENUBAR
169 menubar_ev.stop (display);
170#endif
110 { 171 }
111 XDestroyIC (Input_Context);
112 Input_Context = NULL;
113 }
114#endif
115 172
116 if (cmd_fd >= 0)
117 close (cmd_fd);
118
119 if (Xfd >= 0)
120 XCloseDisplay (Xdisplay);
121
122 delete PixColors;
123}
124
125void
126rxvt_term::destroy ()
127{
128 check_ev.stop (); 173 check_ev.stop ();
129 pty_ev.stop (); 174 pty_ev.stop ();
130 x_ev.stop ();
131#ifdef CURSOR_BLINK 175#ifdef CURSOR_BLINK
132 cursor_blink_ev.stop (); 176 cursor_blink_ev.stop ();
133#endif 177#endif
134#ifdef TEXT_BLINK 178#ifdef TEXT_BLINK
135 text_blink_ev.stop (); 179 text_blink_ev.stop ();
… …
148 192
149 delete this; 193 delete this;
150} 194}
151 195
152/*----------------------------------------------------------------------*/ 196/*----------------------------------------------------------------------*/
153/* rxvt_init() */ 197/* rxvt_init () */
154/* LIBPROTO */ 198/* LIBPROTO */
155rxvt_t 199rxvt_t
156rxvt_init (int argc, const char *const *argv) 200rxvt_init (int argc, const char *const *argv)
157{ 201{
158 SET_R (new rxvt_term); 202 SET_R (new rxvt_term);
159 dR;
160 203
161 if (!R->init_vars () || !R->init (argc, argv)) 204 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
162 { 205 {
163 delete R; 206 delete GET_R;
164 return NULL; 207 SET_R (0);
165 } 208 }
166 209
167 return R; 210 return GET_R;
168} 211}
169 212
170/* EXTPROTO */ 213static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
214
171void 215void
172rxvt_init_signals () 216rxvt_init_signals ()
173{ 217{
174/* install exit handler for cleanup */ 218 /* install exit handler for cleanup */
175#if 0 219#if 0
176#ifdef HAVE_ATEXIT 220#ifdef HAVE_ATEXIT
177 atexit(rxvt_clean_exit); 221 atexit (rxvt_clean_exit);
178#else 222#else
179#endif 223#endif
180#endif 224#endif
181 225
182 struct sigaction sa; 226 struct sigaction sa;
… …
188 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0); 232 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
189 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0); 233 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
190 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0); 234 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
191 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0); 235 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
192 236
193/* need to trap SIGURG for SVR4 (Unixware) rlogin */ 237 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
194/* signal (SIGURG, SIG_DFL); */ 238 /* signal (SIGURG, SIG_DFL); */
195 239
196 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 240 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
197 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 241 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
198} 242}
199 243
200bool 244bool
201rxvt_term::init (int argc, const char *const *argv) 245rxvt_term::init (int argc, const char *const *argv)
… …
205 * If we need privileges in any area then we must specifically request it. 249 * If we need privileges in any area then we must specifically request it.
206 * We should only need to be root in these cases: 250 * We should only need to be root in these cases:
207 * 1. write utmp entries on some systems 251 * 1. write utmp entries on some systems
208 * 2. chown tty on some systems 252 * 2. chown tty on some systems
209 */ 253 */
210 rxvt_privileges (this, SAVE); 254 privileges (SAVE);
211 rxvt_privileges (this, IGNORE); 255 privileges (IGNORE);
212 256
213 init_secondary (); 257 init_secondary ();
214 258
215 const char **cmd_argv = init_resources (argc, argv); 259 const char **cmd_argv = init_resources (argc, argv);
216 260
217 set_locale (""); 261 set_locale ("");
218 262
219#if (MENUBAR_MAX) 263#if MENUBAR_MAX
220 rxvt_menubar_read (this, rs[Rs_menu]); 264 menubar_read (rs[Rs_menu]);
221#endif 265#endif
222#ifdef HAVE_SCROLLBARS 266#ifdef HAVE_SCROLLBARS
223 if (Options & Opt_scrollBar) 267 if (Options & Opt_scrollBar)
224 scrollBar.setIdle (); /* set existence for size calculations */ 268 scrollBar.setIdle (); /* set existence for size calculations */
225#endif 269#endif
… …
227 create_windows (argc, argv); 271 create_windows (argc, argv);
228 272
229 init_xlocale (); 273 init_xlocale ();
230 274
231 scr_reset (); /* initialize screen */ 275 scr_reset (); /* initialize screen */
232#ifdef RXVT_GRAPHICS
233 rxvt_Gr_reset (this); /* reset graphics */
234#endif
235 276
236#if 0 277#if 0
237#ifdef DEBUG_X
238 XSynchronize(Xdisplay, True); 278 XSynchronize (display->display, True);
239#endif
240#endif 279#endif
241 280
242#ifdef HAVE_SCROLLBARS 281#ifdef HAVE_SCROLLBARS
243 if (Options & Opt_scrollBar) 282 if (Options & Opt_scrollBar)
244 resize_scrollbar (); /* create and map scrollbar */ 283 resize_scrollbar (); /* create and map scrollbar */
245#endif 284#endif
246#if (MENUBAR_MAX) 285#if (MENUBAR_MAX)
247 if (menubar_visible(r)) 286 if (menubar_visible ())
248 XMapWindow (Xdisplay, menuBar.win); 287 XMapWindow (display->display, menuBar.win);
249#endif 288#endif
250#ifdef TRANSPARENT 289#ifdef TRANSPARENT
251 if (Options & Opt_transparent) 290 if (Options & Opt_transparent)
252 { 291 {
253 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 292 XSelectInput (display->display, display->root, PropertyChangeMask);
254 rxvt_check_our_parents (this); 293 check_our_parents ();
255 } 294 }
256#endif 295#endif
296
297 rootwin_ev.start (display, display->root);
298
257 XMapWindow (Xdisplay, TermWin.vt); 299 XMapWindow (display->display, TermWin.vt);
258 XMapWindow (Xdisplay, TermWin.parent[0]); 300 XMapWindow (display->display, TermWin.parent[0]);
259 301
260 init_env ();
261 init_command (cmd_argv); 302 init_command (cmd_argv);
262 303
263 x_ev.start (Xfd, EVENT_READ);
264 pty_ev.start (cmd_fd, EVENT_READ); 304 pty_ev.start (cmd_fd, EVENT_READ);
265 305
266 check_ev.start (); 306 check_ev.start ();
267
268 process_x_events ();
269 307
270 return true; 308 return true;
271} 309}
272 310
273/* ------------------------------------------------------------------------- * 311/* ------------------------------------------------------------------------- *
… …
277 * Catch a SIGCHLD signal and exit if the direct child has died 315 * Catch a SIGCHLD signal and exit if the direct child has died
278 */ 316 */
279/* ARGSUSED */ 317/* ARGSUSED */
280/* EXTPROTO */ 318/* EXTPROTO */
281RETSIGTYPE 319RETSIGTYPE
282rxvt_Child_signal(int sig __attribute__ ((unused))) 320rxvt_Child_signal (int sig __attribute__ ((unused)))
283{ 321{
284 int pid, save_errno = errno; 322 int pid, save_errno = errno;
285 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 323 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
286 ; 324 ;
287 errno = save_errno; 325 errno = save_errno;
288 326
289#if 0 327#if 0
290 if (pid == R->cmd_pid) 328 if (pid == cmd_pid)
291 exit (EXIT_SUCCESS); 329 exit (EXIT_SUCCESS);
292#endif 330#endif
293} 331}
294 332
295/* 333/*
296 * Catch a fatal signal and tidy up before quitting 334 * Catch a fatal signal and tidy up before quitting
297 */ 335 */
298/* EXTPROTO */ 336/* EXTPROTO */
299RETSIGTYPE 337RETSIGTYPE
300rxvt_Exit_signal(int sig) 338rxvt_Exit_signal (int sig)
301{ 339{
302 signal(sig, SIG_DFL); 340 signal (sig, SIG_DFL);
303#ifdef DEBUG_CMD 341#ifdef DEBUG_CMD
304 rxvt_print_error("signal %d", sig); 342 rxvt_print_error ("signal %d", sig);
305#endif 343#endif
306 rxvt_clean_exit(); 344 rxvt_clean_exit ();
307 kill(getpid(), sig); 345 kill (getpid (), sig);
308} 346}
309 347
310/* ARGSUSED */
311/* INTPROTO */ 348/* INTPROTO */
312int 349int
313rxvt_xerror_handler(const Display * display 350rxvt_xerror_handler (Display *display, XErrorEvent *event)
314 __attribute__ ((unused)), const XErrorEvent * event)
315{ 351{
316 dR;
317
318 if (R->allowedxerror == -1) 352 if (GET_R->allowedxerror == -1)
319 R->allowedxerror = event->error_code; 353 GET_R->allowedxerror = event->error_code;
320 else 354 else
321 { 355 {
322 rxvt_print_error("XError: Request: %d . %d, Error: %d", 356 old_xerror_handler (display, event);
323 event->request_code, event->minor_code,
324 event->error_code);
325
326 R->destroy (); 357 GET_R->destroy ();
327 } 358 }
328 359
329 return 0; 360 return 0;
330} 361}
331 362
… …
336 */ 367 */
337/* EXTPROTO */ 368/* EXTPROTO */
338void 369void
339rxvt_clean_exit () 370rxvt_clean_exit ()
340{ 371{
341 dR; 372 // TODO: rxvtd should clean up all ressources
342 373 if (GET_R)
343 R->destroy (); 374 GET_R->destroy ();
344} 375}
345 376
346/* ------------------------------------------------------------------------- * 377/* ------------------------------------------------------------------------- *
347 * MEMORY ALLOCATION WRAPPERS * 378 * MEMORY ALLOCATION WRAPPERS *
348 * ------------------------------------------------------------------------- */ 379 * ------------------------------------------------------------------------- */
349/* EXTPROTO */ 380/* EXTPROTO */
350void * 381void *
351rxvt_malloc(size_t size) 382rxvt_malloc (size_t size)
352{ 383{
353 void *p; 384 void *p;
354 385
355 p = malloc(size); 386 p = malloc (size);
356 if (p) 387 if (p)
357 return p; 388 return p;
358 389
359 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 390 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
360 rxvt_clean_exit(); 391 rxvt_clean_exit ();
361 exit(EXIT_FAILURE); 392 exit (EXIT_FAILURE);
362/* NOTREACHED */ 393 /* NOTREACHED */
363} 394}
364 395
365/* EXTPROTO */ 396/* EXTPROTO */
366void * 397void *
367rxvt_calloc(size_t number, size_t size) 398rxvt_calloc (size_t number, size_t size)
368{ 399{
369 void *p; 400 void *p;
370 401
371 p = calloc(number, size); 402 p = calloc (number, size);
372 if (p) 403 if (p)
373 return p; 404 return p;
374 405
375 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 406 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
376 rxvt_clean_exit(); 407 rxvt_clean_exit ();
377 exit(EXIT_FAILURE); 408 exit (EXIT_FAILURE);
378/* NOTREACHED */ 409 /* NOTREACHED */
379} 410}
380 411
381/* EXTPROTO */ 412/* EXTPROTO */
382void * 413void *
383rxvt_realloc(void *ptr, size_t size) 414rxvt_realloc (void *ptr, size_t size)
384{ 415{
385 void *p; 416 void *p;
386 417
387 if (ptr) 418 if (ptr)
388 p = realloc(ptr, size); 419 p = realloc (ptr, size);
389 else 420 else
390 p = malloc(size); 421 p = malloc (size);
391 if (p) 422 if (p)
392 return p; 423 return p;
393 424
394 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 425 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
395 rxvt_clean_exit(); 426 rxvt_clean_exit ();
396 exit(EXIT_FAILURE); 427 exit (EXIT_FAILURE);
397/* NOTREACHED */ 428 /* NOTREACHED */
398} 429}
399 430
400/* ------------------------------------------------------------------------- * 431/* ------------------------------------------------------------------------- *
401 * PRIVILEGED OPERATIONS * 432 * PRIVILEGED OPERATIONS *
402 * ------------------------------------------------------------------------- */ 433 * ------------------------------------------------------------------------- */
403/* take care of suid/sgid super-user (root) privileges */ 434/* take care of suid/sgid super-user (root) privileges */
404/* INTPROTO */
405void 435void
406rxvt_privileges(pR_ int mode) 436rxvt_term::privileges (int mode)
407{ 437{
408#if ! defined(__CYGWIN32__) 438#if ! defined(__CYGWIN32__)
409# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 439# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
410/* setreuid() is the poor man's setuid(), seteuid() */ 440 /* setreuid () is the poor man's setuid (), seteuid () */
411# define seteuid(a) setreuid(-1, (a)) 441# define seteuid(a) setreuid(-1, (a))
412# define setegid(a) setregid(-1, (a)) 442# define setegid(a) setregid(-1, (a))
413# define HAVE_SETEUID 443# define HAVE_SETEUID
414# endif 444# endif
415# ifdef HAVE_SETEUID 445# ifdef HAVE_SETEUID
416 switch (mode) { 446 switch (mode)
447 {
417 case IGNORE: 448 case IGNORE:
418 /* 449 /*
419 * change effective uid/gid - not real uid/gid - so we can switch 450 * change effective uid/gid - not real uid/gid - so we can switch
420 * back to root later, as required 451 * back to root later, as required
421 */ 452 */
422 seteuid(getuid()); 453 seteuid (getuid ());
423 setegid(getgid()); 454 setegid (getgid ());
424 break; 455 break;
425 case SAVE: 456 case SAVE:
426 R->euid = geteuid(); 457 euid = geteuid ();
427 R->egid = getegid(); 458 egid = getegid ();
428 break; 459 break;
429 case RESTORE: 460 case RESTORE:
430 seteuid(R->euid); 461 seteuid (euid);
431 setegid(R->egid); 462 setegid (egid);
432 break; 463 break;
433 } 464 }
434# else 465# else
435 switch (mode) { 466 switch (mode)
467 {
436 case IGNORE: 468 case IGNORE:
437 setuid(getuid()); 469 setuid (getuid ());
438 setgid(getgid()); 470 setgid (getgid ());
439 /* FALLTHROUGH */ 471 /* FALLTHROUGH */
440 case SAVE: 472 case SAVE:
441 /* FALLTHROUGH */ 473 /* FALLTHROUGH */
442 case RESTORE: 474 case RESTORE:
443 break; 475 break;
444 } 476 }
445# endif 477# endif
446#endif 478#endif
447} 479}
448 480
449#ifdef UTMP_SUPPORT 481#ifdef UTMP_SUPPORT
450/* EXTPROTO */
451void 482void
452rxvt_privileged_utmp(pR_ char action) 483rxvt_term::privileged_utmp (char action)
453{ 484{
454 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 485 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
455 action, R->next_utmp_action, getpid())); 486 action, next_utmp_action, getpid ()));
456 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 487 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
457 || (R->Options & Opt_utmpInhibit) 488 || (Options & Opt_utmpInhibit)
458 || R->ttydev == NULL || *R->ttydev == '\0') 489 || ttydev == NULL || *ttydev == '\0')
459 return; 490 return;
460 491
461 rxvt_privileges(aR_ RESTORE); 492 privileges (RESTORE);
462 if (action == SAVE) { 493 if (action == SAVE)
494 {
463 R->next_utmp_action = RESTORE; 495 next_utmp_action = RESTORE;
464 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 496 makeutent (ttydev, rs[Rs_display_name]);
497 }
498 else
465 } else { /* action == RESTORE */ 499 { /* action == RESTORE */
466 R->next_utmp_action = IGNORE; 500 next_utmp_action = IGNORE;
467 rxvt_cleanutent(aR); 501 cleanutent ();
468 } 502 }
469 rxvt_privileges(aR_ IGNORE); 503 privileges (IGNORE);
470} 504}
471#endif 505#endif
472 506
473#ifndef NO_SETOWNER_TTYDEV 507#ifndef NO_SETOWNER_TTYDEV
474/* EXTPROTO */
475void 508void
476rxvt_privileged_ttydev(pR_ char action) 509rxvt_term::privileged_ttydev (char action)
477{ 510{
478 D_MAIN((stderr, 511 D_MAIN ((stderr,
479 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 512 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
480 action, R->next_tty_action, getpid())); 513 action, next_tty_action, getpid ()));
481 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 514 if (next_tty_action != action || (action != SAVE && action != RESTORE)
482 || R->ttydev == NULL || *R->ttydev == '\0') 515 || ttydev == NULL || *ttydev == '\0')
483 return; 516 return;
484 517
485 rxvt_privileges(aR_ RESTORE); 518 privileges (RESTORE);
486 519
487 if (action == SAVE) { 520 if (action == SAVE)
521 {
488 R->next_tty_action = RESTORE; 522 next_tty_action = RESTORE;
489# ifndef RESET_TTY_TO_COMMON_DEFAULTS 523# ifndef RESET_TTY_TO_COMMON_DEFAULTS
490/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 524 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
491 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 525 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
492 R->next_tty_action = IGNORE; 526 next_tty_action = IGNORE;
493 else 527 else
494# endif 528# endif
529
495 { 530 {
496 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 531 chown (ttydev, getuid (), ttygid); /* fail silently */
497 chmod(R->ttydev, R->ttymode); 532 chmod (ttydev, ttymode);
498# ifdef HAVE_REVOKE 533# ifdef HAVE_REVOKE
499 revoke(R->ttydev); 534 revoke (ttydev);
500# endif 535# endif
536
501 } 537 }
538 }
539 else
502 } else { /* action == RESTORE */ 540 { /* action == RESTORE */
503 R->next_tty_action = IGNORE; 541 next_tty_action = IGNORE;
504# ifndef RESET_TTY_TO_COMMON_DEFAULTS 542# ifndef RESET_TTY_TO_COMMON_DEFAULTS
505 chmod(R->ttydev, R->ttyfd_stat.st_mode); 543 chmod (ttydev, ttyfd_stat.st_mode);
506 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 544 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
507# else 545# else
508 chmod(R->ttydev, 546 chmod (ttydev,
509 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 547 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
510 chown(R->ttydev, 0, 0); 548 chown (ttydev, 0, 0);
511# endif 549# endif
512 }
513 550
551 }
552
514 rxvt_privileges(aR_ IGNORE); 553 privileges (IGNORE);
515 554
516# ifndef RESET_TTY_TO_COMMON_DEFAULTS 555# ifndef RESET_TTY_TO_COMMON_DEFAULTS
517 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 556 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
518 action == RESTORE ? "Restoring" : (action == 557 action == RESTORE ? "Restoring" : (action ==
519 SAVE ? "Saving" : 558 SAVE ? "Saving" :
520 "UNKNOWN ERROR for"), R->ttydev, 559 "UNKNOWN ERROR for"), ttydev,
521 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 560 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
522 R->ttyfd_stat.st_gid)); 561 ttyfd_stat.st_gid));
523# endif 562# endif
524} 563}
525#endif 564#endif
526 565
527/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
… …
530 * if width/height are non-zero then override calculated width/height 569 * if width/height are non-zero then override calculated width/height
531 */ 570 */
532void 571void
533rxvt_term::window_calc (unsigned int width, unsigned int height) 572rxvt_term::window_calc (unsigned int width, unsigned int height)
534{ 573{
535 short recalc_x, recalc_y; 574 short recalc_x, recalc_y;
536 int x, y, sb_w, mb_h, flags; 575 int x, y, sb_w, mb_h, flags;
537 unsigned int w, h; 576 unsigned int w, h;
538 unsigned int max_width, max_height; 577 unsigned int max_width, max_height;
539 578
540 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 579 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
541 TermWin.ncol, TermWin.nrow, szHint.width, 580 TermWin.ncol, TermWin.nrow, szHint.width,
542 szHint.height)); 581 szHint.height));
543 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 582 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
544 szHint.win_gravity = NorthWestGravity; 583 szHint.win_gravity = NorthWestGravity;
545/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 584 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
546 585
547 recalc_x = recalc_y = 0; 586 recalc_x = recalc_y = 0;
548 flags = 0; 587 flags = 0;
549 if (!parsed_geometry) { 588 if (!parsed_geometry)
589 {
550 parsed_geometry = 1; 590 parsed_geometry = 1;
551 if (rs[Rs_geometry]) 591 if (rs[Rs_geometry])
552 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h); 592 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
553 if (flags & WidthValue) { 593 if (flags & WidthValue)
594 {
554 TermWin.ncol = BOUND_POSITIVE_INT16(w); 595 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
555 szHint.flags |= USSize; 596 szHint.flags |= USSize;
556 } 597 }
557 if (flags & HeightValue) { 598 if (flags & HeightValue)
599 {
558 TermWin.nrow = BOUND_POSITIVE_INT16(h); 600 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
559 szHint.flags |= USSize; 601 szHint.flags |= USSize;
560 } 602 }
561 if (flags & XValue) { 603 if (flags & XValue)
604 {
562 szHint.x = x; 605 szHint.x = x;
563 szHint.flags |= USPosition; 606 szHint.flags |= USPosition;
564 if (flags & XNegative) { 607 if (flags & XNegative)
608 {
565 recalc_x = 1; 609 recalc_x = 1;
566 szHint.win_gravity = NorthEastGravity; 610 szHint.win_gravity = NorthEastGravity;
567 } 611 }
568 } 612 }
569 if (flags & YValue) { 613 if (flags & YValue)
614 {
570 szHint.y = y; 615 szHint.y = y;
571 szHint.flags |= USPosition; 616 szHint.flags |= USPosition;
572 if (flags & YNegative) { 617 if (flags & YNegative)
618 {
573 recalc_y = 1; 619 recalc_y = 1;
574 if (szHint.win_gravity == NorthEastGravity) 620 if (szHint.win_gravity == NorthEastGravity)
575 szHint.win_gravity = SouthEastGravity; 621 szHint.win_gravity = SouthEastGravity;
576 else 622 else
577 szHint.win_gravity = SouthWestGravity; 623 szHint.win_gravity = SouthWestGravity;
578 } 624 }
579 } 625 }
580 } 626 }
581/* TODO: BOUNDS */ 627 /* TODO: BOUNDS */
582 TermWin.width = TermWin.ncol * TermWin.fwidth; 628 TermWin.width = TermWin.ncol * TermWin.fwidth;
583 TermWin.height = TermWin.nrow * TermWin.fheight; 629 TermWin.height = TermWin.nrow * TermWin.fheight;
584 max_width = MAX_COLS * TermWin.fwidth; 630 max_width = MAX_COLS * TermWin.fwidth;
585 max_height = MAX_ROWS * TermWin.fheight; 631 max_height = MAX_ROWS * TermWin.fheight;
586 632
587 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 633 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
588 634
589 sb_w = mb_h = 0; 635 sb_w = mb_h = 0;
590 window_vt_x = window_vt_y = 0; 636 window_vt_x = window_vt_y = 0;
591 if (scrollbar_visible (this)) { 637 if (scrollbar_visible ())
638 {
592 sb_w = scrollbar_TotalWidth(); 639 sb_w = scrollbar_TotalWidth ();
593 szHint.base_width += sb_w; 640 szHint.base_width += sb_w;
594 if (!(Options & Opt_scrollBar_right)) 641 if (! (Options & Opt_scrollBar_right))
595 window_vt_x = sb_w; 642 window_vt_x = sb_w;
596 } 643 }
597 if (menubar_visible (this)) { 644 if (menubar_visible ())
645 {
598 mb_h = menuBar_TotalHeight(); 646 mb_h = menuBar_TotalHeight ();
599 szHint.base_height += mb_h; 647 szHint.base_height += mb_h;
600 window_vt_y = mb_h; 648 window_vt_y = mb_h;
601 } 649 }
602 szHint.width_inc = TermWin.fwidth; 650 szHint.width_inc = TermWin.fwidth;
603 szHint.height_inc = TermWin.fheight; 651 szHint.height_inc = TermWin.fheight;
604 szHint.min_width = szHint.base_width + szHint.width_inc; 652 szHint.min_width = szHint.base_width + szHint.width_inc;
605 szHint.min_height = szHint.base_height + szHint.height_inc; 653 szHint.min_height = szHint.base_height + szHint.height_inc;
606 654
607 if (width && width - szHint.base_width < max_width) { 655 if (width && width - szHint.base_width < max_width)
656 {
608 szHint.width = width; 657 szHint.width = width;
609 TermWin.width = width - szHint.base_width; 658 TermWin.width = width - szHint.base_width;
610 } else { 659 }
660 else
661 {
611 MIN_IT(TermWin.width, max_width); 662 MIN_IT (TermWin.width, max_width);
612 szHint.width = szHint.base_width + TermWin.width; 663 szHint.width = szHint.base_width + TermWin.width;
613 } 664 }
614 if (height && height - szHint.base_height < max_height) { 665 if (height && height - szHint.base_height < max_height)
666 {
615 szHint.height = height; 667 szHint.height = height;
616 TermWin.height = height - szHint.base_height; 668 TermWin.height = height - szHint.base_height;
617 } else { 669 }
670 else
671 {
618 MIN_IT(TermWin.height, max_height); 672 MIN_IT (TermWin.height, max_height);
619 szHint.height = szHint.base_height + TermWin.height; 673 szHint.height = szHint.base_height + TermWin.height;
620 } 674 }
621 if (scrollbar_visible (this) && (Options & Opt_scrollBar_right)) 675 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
622 window_sb_x = szHint.width - sb_w; 676 window_sb_x = szHint.width - sb_w;
623 677
624 if (recalc_x) 678 if (recalc_x)
625 szHint.x += (DisplayWidth (Xdisplay, DefaultScreen (Xdisplay)) 679 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
626 - szHint.width - 2 * TermWin.ext_bwidth); 680 - szHint.width - 2 * TermWin.ext_bwidth);
627 if (recalc_y) 681 if (recalc_y)
628 szHint.y += (DisplayHeight (Xdisplay, DefaultScreen (Xdisplay)) 682 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
629 - szHint.height - 2 * TermWin.ext_bwidth); 683 - szHint.height - 2 * TermWin.ext_bwidth);
630 684
631 TermWin.ncol = TermWin.width / TermWin.fwidth; 685 TermWin.ncol = TermWin.width / TermWin.fwidth;
632 TermWin.nrow = TermWin.height / TermWin.fheight; 686 TermWin.nrow = TermWin.height / TermWin.fheight;
633 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 687 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
634 TermWin.ncol, TermWin.nrow, szHint.width, 688 TermWin.ncol, TermWin.nrow, szHint.width,
635 szHint.height)); 689 szHint.height));
636 return; 690 return;
637} 691}
638 692
639/*----------------------------------------------------------------------*/ 693/*----------------------------------------------------------------------*/
640/* 694/*
641 * Tell the teletype handler what size the window is. 695 * Tell the teletype handler what size the window is.
… …
654 ws.ws_xpixel = ws.ws_ypixel = 0; 708 ws.ws_xpixel = ws.ws_ypixel = 0;
655#ifndef DEBUG_SIZE 709#ifndef DEBUG_SIZE
656 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 710 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
657#else 711#else
658 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 712 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
659 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 713 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
660# ifdef SIGWINCH 714# ifdef SIGWINCH
661 else if (cmd_pid) /* force through to the command */ 715 else if (cmd_pid) /* force through to the command */
662 kill (cmd_pid, SIGWINCH); 716 kill (cmd_pid, SIGWINCH);
663# endif 717# endif
664#endif 718#endif
665} 719}
666 720
667/*----------------------------------------------------------------------*/ 721/*----------------------------------------------------------------------*/
668/* rxvt_change_font() - Switch to a new font */ 722/* rxvt_change_font () - Switch to a new font */
669/* 723/*
670 * init = 1 - initialize 724 * init = 1 - initialize
671 * 725 *
672 * fontname == FONT_UP - switch to bigger font 726 * fontname == FONT_UP - switch to bigger font
673 * fontname == FONT_DN - switch to smaller font 727 * fontname == FONT_DN - switch to smaller font
674 */ 728 */
675/* EXTPROTO */ 729bool
676void
677rxvt_change_font(pR_ int init, const char *fontname) 730rxvt_term::change_font (const char *fontname)
678{ 731{
679} 732 if (fontname == FONT_UP)
733 {
734 // TODO
735 }
736 else if (fontname == FONT_DN)
737 {
738 // TODO
739 }
740 else
741 {
742 rxvt_fontset *fs = new rxvt_fontset (this);
680 743
681/* INTPROTO */ 744 if (fs && fs->populate (fontname ? fontname : "fixed"))
682void 745 {
746 delete TermWin.fontset;
747 TermWin.fontset = fs;
748 TermWin.fwidth = fs->base_font ()->width;
749 TermWin.fheight = fs->base_font ()->height;
750 TermWin.fbase = fs->base_font ()->ascent;
751
752 if (TermWin.parent[0])
753 {
754 resize_all_windows (0, 0, 0);
755 scr_remap_chars ();
756 scr_touch (true);
757 }
758
759 return true;
760 }
761 }
762
763 return false;
764}
765
766bool
683rxvt_font_up_down(pR_ int n, int direction) 767rxvt_term::font_up_down (int n, int direction)
684{ 768{
769 return false;
685} 770}
686 771
687/*----------------------------------------------------------------------*/ 772/*----------------------------------------------------------------------*/
688/*----------------------------------------------------------------------*/ 773/*----------------------------------------------------------------------*/
689/* xterm sequences - title, iconName, color (exptl) */ 774/* xterm sequences - title, iconName, color (exptl) */
690/* EXTPROTO */
691void 775void
692rxvt_set_title(pR_ const char *str) 776rxvt_term::set_title (const char *str)
693{ 777{
694#ifndef SMART_WINDOW_TITLE 778#ifndef SMART_WINDOW_TITLE
695 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 779 XStoreName (display->display, TermWin.parent[0], str);
696#else 780#else
697 char *name; 781 char *name;
698 782
699 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 783 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
700 name = NULL; 784 name = NULL;
701 if (name == NULL || STRCMP(name, str)) 785 if (name == NULL || STRCMP (name, str))
702 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 786 XStoreName (display->display, TermWin.parent[0], str);
703 if (name) 787 if (name)
704 XFree(name); 788 XFree (name);
705#endif 789#endif
706} 790}
707 791
708/* EXTPROTO */
709void 792void
710rxvt_set_iconName(pR_ const char *str) 793rxvt_term::set_iconName (const char *str)
711{ 794{
712#ifndef SMART_WINDOW_TITLE 795#ifndef SMART_WINDOW_TITLE
713 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 796 XSetIconName (display->display, TermWin.parent[0], str);
714#else 797#else
715 char *name; 798 char *name;
716 799
717 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 800 if (XGetIconName (display->display, TermWin.parent[0], &name))
718 name = NULL; 801 name = NULL;
719 if (name == NULL || STRCMP(name, str)) 802 if (name == NULL || STRCMP (name, str))
720 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 803 XSetIconName (display->display, TermWin.parent[0], str);
721 if (name) 804 if (name)
722 XFree(name); 805 XFree (name);
723#endif 806#endif
724} 807}
725 808
726#ifdef XTERM_COLOR_CHANGE 809#ifdef XTERM_COLOR_CHANGE
727/* EXTPROTO */
728void 810void
729rxvt_set_window_color(pR_ int idx, const char *color) 811rxvt_term::set_window_color (int idx, const char *color)
730{ 812{
731 rxvt_color xcol; 813 rxvt_color xcol;
732 int i; 814 int i;
733 815
734 if (color == NULL || *color == '\0') 816 if (color == NULL || *color == '\0')
735 return; 817 return;
736 818
737/* handle color aliases */ 819 /* handle color aliases */
738 if (isdigit(*color)) { 820 if (isdigit (*color))
821 {
739 i = atoi(color); 822 i = atoi (color);
823 if (i >= 8 && i <= 15)
740 if (i >= 8 && i <= 15) { /* bright colors */ 824 { /* bright colors */
741 i -= 8; 825 i -= 8;
742# ifndef NO_BRIGHTCOLOR 826# ifndef NO_BRIGHTCOLOR
743 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 827 PixColors[idx] = PixColors[minBrightCOLOR + i];
744 SET_PIXCOLOR(R, idx); 828 SET_PIXCOLOR (idx);
745 goto Done; 829 goto Done;
746# endif 830# endif
831
747 } 832 }
748 if (i >= 0 && i <= 7) { /* normal colors */ 833 if (i >= 0 && i <= 7)
834 { /* normal colors */
749 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 835 PixColors[idx] = PixColors[minCOLOR + i];
750 SET_PIXCOLOR(R, idx); 836 SET_PIXCOLOR (idx);
751 goto Done; 837 goto Done;
752 } 838 }
753 } 839 }
754 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 840 if (!rXParseAllocColor (& xcol, color))
755 return; 841 return;
756/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 842 /* XStoreColor (display->display, XCMAP, XColor*); */
757 843
758/* 844 /*
759 * FIXME: should free colors here, but no idea how to do it so instead, 845 * FIXME: should free colors here, but no idea how to do it so instead,
760 * so just keep gobbling up the colormap 846 * so just keep gobbling up the colormap
761 */ 847 */
762# if 0 848# if 0
763 for (i = Color_Black; i <= Color_White; i++) 849 for (i = Color_Black; i <= Color_White; i++)
764 if (R->PixColors[idx] == R->PixColors[i]) 850 if (PixColors[idx] == PixColors[i])
765 break; 851 break;
766 if (i > Color_White) { 852 if (i > Color_White)
853 {
767 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 854 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
768 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 855 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
769 DisplayPlanes(R->Xdisplay, Xscreen)); 856 DisplayPlanes (display->display, display->screen));
770 } 857 }
771# endif 858# endif
772 859
773 R->PixColors[idx] = xcol; 860 PixColors[idx] = xcol;
774 SET_PIXCOLOR(R, idx); 861 SET_PIXCOLOR (idx);
775 862
776/* XSetWindowAttributes attr; */ 863 /* XSetWindowAttributes attr; */
777/* Cursor cursor; */ 864 /* Cursor cursor; */
778 Done: 865Done:
779 if (idx == Color_bg && !(R->Options & Opt_transparent)) 866 if (idx == Color_bg && ! (Options & Opt_transparent))
780 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 867 XSetWindowBackground (display->display, TermWin.vt,
781 R->PixColors[Color_bg]); 868 PixColors[Color_bg]);
782 869
783/* handle Color_BD, scrollbar background, etc. */ 870 /* handle Color_BD, scrollbar background, etc. */
784 871
785 rxvt_set_colorfgbg (aR); 872 set_colorfgbg ();
786 R->recolour_cursor (); 873 recolour_cursor ();
787/* the only reasonable way to enforce a clean update */ 874 /* the only reasonable way to enforce a clean update */
788 rxvt_scr_poweron (aR); 875 scr_poweron ();
789} 876}
790 877
791#else 878#else
792# define rxvt_set_window_color(aR_ idx,color) ((void)0) 879# define set_window_color (idx,color) ((void)0)
793#endif /* XTERM_COLOR_CHANGE */ 880#endif /* XTERM_COLOR_CHANGE */
794 881
795void 882void
796rxvt_term::recolour_cursor () 883rxvt_term::recolour_cursor ()
797{ 884{
798#if TODO 885#if TODO
799 rxvt_color xcol[2]; 886 rxvt_color xcol[2];
800 887
801 xcol[0] = PixColors[Color_pointer]; 888 xcol[0] = PixColors[Color_pointer];
802 xcol[1] = PixColors[Color_bg]; 889 xcol[1] = PixColors[Color_bg];
803 XQueryColors (Xdisplay, XCMAP, xcol, 2); 890 XQueryColors (display->display, XCMAP, xcol, 2);
804 XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1])); 891 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
805#endif 892#endif
806} 893}
807 894
808/*----------------------------------------------------------------------*/ 895/*----------------------------------------------------------------------*/
809/* 896/*
810 * find if fg/bg matches any of the normal (low-intensity) colors 897 * find if fg/bg matches any of the normal (low-intensity) colors
811 */ 898 */
812/* INTPROTO */
813void 899void
814rxvt_set_colorfgbg(pR) 900rxvt_term::set_colorfgbg ()
815{ 901{
816 unsigned int i; 902 unsigned int i;
817 const char *xpmb = "\0"; 903 const char *xpmb = "\0";
818 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 904 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
819 905
820 R->env_colorfgbg = 906 env_colorfgbg =
821 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 907 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
822 STRCPY(fstr, "default"); 908 STRCPY (fstr, "default");
823 STRCPY(bstr, "default"); 909 STRCPY (bstr, "default");
824 for (i = Color_Black; i <= Color_White; i++) 910 for (i = Color_Black; i <= Color_White; i++)
825 if (R->PixColors[Color_fg] == R->PixColors[i]) { 911 if (PixColors[Color_fg] == PixColors[i])
912 {
826 sprintf(fstr, "%d", (i - Color_Black)); 913 sprintf (fstr, "%d", (i - Color_Black));
827 break; 914 break;
828 } 915 }
829 for (i = Color_Black; i <= Color_White; i++) 916 for (i = Color_Black; i <= Color_White; i++)
830 if (R->PixColors[Color_bg] == R->PixColors[i]) { 917 if (PixColors[Color_bg] == PixColors[i])
918 {
831 sprintf(bstr, "%d", (i - Color_Black)); 919 sprintf (bstr, "%d", (i - Color_Black));
832#ifdef XPM_BACKGROUND 920#ifdef XPM_BACKGROUND
833 xpmb = "default;"; 921 xpmb = "default;";
834#endif 922#endif
835 break; 923 break;
836 } 924 }
925
837 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 926 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
838 putenv(R->env_colorfgbg);
839 927
840#ifndef NO_BRIGHTCOLOR 928#ifndef NO_BRIGHTCOLOR
841 R->colorfgbg = DEFAULT_RSTYLE; 929 colorfgbg = DEFAULT_RSTYLE;
842 for (i = minCOLOR; i <= maxCOLOR; i++) { 930 for (i = minCOLOR; i <= maxCOLOR; i++)
931 {
843 if (R->PixColors[Color_fg] == R->PixColors[i]) 932 if (PixColors[Color_fg] == PixColors[i])
844 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 933 colorfgbg = SET_FGCOLOR (colorfgbg, i);
845 if (R->PixColors[Color_bg] == R->PixColors[i]) 934 if (PixColors[Color_bg] == PixColors[i])
846 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 935 colorfgbg = SET_BGCOLOR (colorfgbg, i);
847 } 936 }
848#endif 937#endif
849} 938}
850 939
851/*----------------------------------------------------------------------*/ 940/*----------------------------------------------------------------------*/
852/* 941/*
853 * Colour determination for low colour displays, routine from 942 * Colour determination for low colour displays, routine from
854 * Hans de Goede <hans@highrise.nl> 943 * Hans de Goede <hans@highrise.nl>
855 */ 944 */
856 945
857/* EXTPROTO */
858int 946int
859rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 947rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
860{ 948{
861 screen_in_out->set(aR_ colour);
862
863 if (!screen_in_out->set(aR_ colour)) { 949 if (!screen_in_out->set (display, colour))
950 {
864 rxvt_print_error("can't allocate colour: %s", colour); 951 rxvt_print_error ("can't allocate colour: %s", colour);
865 return false; 952 return false;
866 } 953 }
867 954
868 return true; 955 return true;
869} 956}
870 957
871/* -------------------------------------------------------------------- * 958/* -------------------------------------------------------------------- *
872 * - WINDOW RESIZING - * 959 * - WINDOW RESIZING - *
873 * -------------------------------------------------------------------- */ 960 * -------------------------------------------------------------------- */
… …
879#ifdef SMART_RESIZE 966#ifdef SMART_RESIZE
880 int old_width = szHint.width, old_height = szHint.height; 967 int old_width = szHint.width, old_height = szHint.height;
881#endif 968#endif
882 969
883 window_calc (width, height); 970 window_calc (width, height);
884 XSetWMNormalHints (Xdisplay, TermWin.parent[0], &szHint); 971 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
885 if (!ignoreparent) 972 if (!ignoreparent)
886 { 973 {
887#ifdef SMART_RESIZE 974#ifdef SMART_RESIZE
888 /* 975 /*
889 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 976 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
… …
892 int x, y, x1, y1; 979 int x, y, x1, y1;
893 int dx, dy; 980 int dx, dy;
894 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 981 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
895 Window unused_cr; 982 Window unused_cr;
896 983
897 XTranslateCoordinates (Xdisplay, TermWin.parent[0], Xroot, 984 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
898 0, 0, &x, &y, &unused_cr); 985 0, 0, &x, &y, &unused_cr);
899 XGetGeometry (Xdisplay, TermWin.parent[0], &unused_cr, &x1, &y1, 986 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
900 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 987 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
901 /* 988 /*
902 * if Xroot isn't the parent window, a WM will probably have offset 989 * if display->root isn't the parent window, a WM will probably have offset
903 * our position for handles and decorations. Counter it 990 * our position for handles and decorations. Counter it
904 */ 991 */
905 if (x1 != x || y1 != y) { 992 if (x1 != x || y1 != y)
993 {
906 x -= x1; 994 x -= x1;
907 y -= y1; 995 y -= y1;
908 } 996 }
909 997
910 x1 = (DisplayWidth (Xdisplay, Xscreen) - old_width) / 2; 998 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
911 y1 = (DisplayHeight (Xdisplay, Xscreen) - old_height) / 2; 999 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
912 dx = old_width - szHint.width; 1000 dx = old_width - szHint.width;
913 dy = old_height - szHint.height; 1001 dy = old_height - szHint.height;
914 1002
915 /* Check position of the center of the window */ 1003 /* Check position of the center of the window */
916 if (x < x1) /* left half */ 1004 if (x < x1) /* left half */
917 dx = 0; 1005 dx = 0;
918 else if (x == x1) /* exact center */ 1006 else if (x == x1) /* exact center */
919 dx /= 2; 1007 dx /= 2;
920 if (y < y1) /* top half */ 1008 if (y < y1) /* top half */
921 dy = 0; 1009 dy = 0;
922 else if (y == y1) /* exact center */ 1010 else if (y == y1) /* exact center */
923 dy /= 2; 1011 dy /= 2;
924 1012
925 XMoveResizeWindow (Xdisplay, TermWin.parent[0], x + dx, y + dy, 1013 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
926 szHint.width, szHint.height); 1014 szHint.width, szHint.height);
927#else 1015#else
928 XResizeWindow (Xdisplay, TermWin.parent[0], szHint.width, 1016 XResizeWindow (display->display, TermWin.parent[0], szHint.width,
929 szHint.height); 1017 szHint.height);
930#endif 1018#endif
1019
931 } 1020 }
932 1021
933 fix_screen = (TermWin.ncol != prev_ncol 1022 fix_screen = (TermWin.ncol != prev_ncol
934 || TermWin.nrow != prev_nrow); 1023 || TermWin.nrow != prev_nrow);
935 1024
936 if (fix_screen || width != old_width || height != old_height) 1025 if (fix_screen || width != old_width || height != old_height)
937 { 1026 {
938 if (scrollbar_visible (this)) 1027 if (scrollbar_visible ())
939 { 1028 {
940 XMoveResizeWindow (Xdisplay, scrollBar.win, window_sb_x, 1029 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,
941 0, scrollbar_TotalWidth (), szHint.height); 1030 0, scrollbar_TotalWidth (), szHint.height);
942 resize_scrollbar (); 1031 resize_scrollbar ();
943 } 1032 }
944 1033
945 if (menubar_visible (this)) 1034 if (menubar_visible ())
946 XMoveResizeWindow (Xdisplay, menuBar.win, window_vt_x, 1035 XMoveResizeWindow (display->display, menuBar.win, window_vt_x,
947 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1036 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
948 1037
949 XMoveResizeWindow (Xdisplay, TermWin.vt, window_vt_x, 1038 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
950 window_vt_y, TermWin_TotalWidth (), 1039 window_vt_y, TermWin_TotalWidth (),
951 TermWin_TotalHeight ()); 1040 TermWin_TotalHeight ());
952#ifdef RXVT_GRAPHICS
953 if (old_height)
954 rxvt_Gr_Resize (this, old_width - szHint.base_width,
955 old_height - szHint.base_height);
956#endif
957 scr_clear (); 1041 scr_clear ();
958#ifdef XPM_BACKGROUND 1042#ifdef XPM_BACKGROUND
959 rxvt_resize_pixmap (this); 1043 resize_pixmap ();
960#endif 1044#endif
1045
961 } 1046 }
962 1047
963 if (fix_screen || old_height == 0) 1048 if (fix_screen || old_height == 0)
964 { 1049 {
965 int curr_screen = -1; 1050 int curr_screen = -1;
… …
968 /* scr_reset only works on the primary screen */ 1053 /* scr_reset only works on the primary screen */
969 if (old_height) /* this is not the first time through */ 1054 if (old_height) /* this is not the first time through */
970 { 1055 {
971 unsigned int ncol = TermWin.ncol; 1056 unsigned int ncol = TermWin.ncol;
972 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1057 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
973 curr_screen = rxvt_scr_change_screen (this, PRIMARY); 1058 curr_screen = scr_change_screen (PRIMARY);
974 TermWin.ncol = ncol; 1059 TermWin.ncol = ncol;
975 } 1060 }
976 1061
977 scr_reset(); 1062 scr_reset ();
978 1063
979 if (curr_screen >= 0) /* this is not the first time through */ 1064 if (curr_screen >= 0) /* this is not the first time through */
980 { 1065 {
981 rxvt_scr_change_screen (this, curr_screen); 1066 scr_change_screen (curr_screen);
982 rxvt_selection_check (this, old_ncol != TermWin.ncol ? 4 : 0); 1067 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
983 } 1068 }
984 } 1069 }
985 1070
986 old_width = szHint.width; 1071 old_width = szHint.width;
987 old_height = szHint.height; 1072 old_height = szHint.height;
988 1073
989#ifdef USE_XIM 1074#ifdef USE_XIM
990 rxvt_IMSetStatusPosition (this); 1075 IMSetStatusPosition ();
991#endif 1076#endif
992} 1077}
993 1078
994/* 1079/*
995 * Set the width/height of the vt window in characters. Units are pixels. 1080 * Set the width/height of the vt window in characters. Units are pixels.
996 * good for toggling 80/132 columns 1081 * good for toggling 80/132 columns
997 */ 1082 */
998/* EXTPROTO */
999void 1083void
1000rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1084rxvt_term::set_widthheight (unsigned int width, unsigned int height)
1001{ 1085{
1002 XWindowAttributes wattr; 1086 XWindowAttributes wattr;
1003 1087
1004 if (width == 0 || height == 0) { 1088 if (width == 0 || height == 0)
1089 {
1005 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1090 XGetWindowAttributes (display->display, display->root, &wattr);
1006 if (width == 0) 1091 if (width == 0)
1007 width = wattr.width - R->szHint.base_width; 1092 width = wattr.width - szHint.base_width;
1008 if (height == 0) 1093 if (height == 0)
1009 height = wattr.height - R->szHint.base_height; 1094 height = wattr.height - szHint.base_height;
1010 } 1095 }
1011 if (width != R->TermWin.width || height != R->TermWin.height) { 1096 if (width != TermWin.width || height != TermWin.height)
1097 {
1012 width += R->szHint.base_width; 1098 width += szHint.base_width;
1013 height += R->szHint.base_height; 1099 height += szHint.base_height;
1014 R->resize_all_windows (width, height, 0); 1100 resize_all_windows (width, height, 0);
1015 } 1101 }
1016} 1102}
1017 1103
1018/* -------------------------------------------------------------------- * 1104/* -------------------------------------------------------------------- *
1019 * - X INPUT METHOD ROUTINES - * 1105 * - X INPUT METHOD ROUTINES - *
1020 * -------------------------------------------------------------------- */ 1106 * -------------------------------------------------------------------- */
1021#ifdef USE_XIM 1107#ifdef USE_XIM
1108
1022void 1109void
1023rxvt_term::set_size (XRectangle *size) 1110rxvt_term::im_set_size (XRectangle *size)
1024{ 1111{
1025 size->x = TermWin.int_bwidth; 1112 size->x = TermWin.int_bwidth;
1026 size->y = TermWin.int_bwidth; 1113 size->y = TermWin.int_bwidth;
1027 size->width = Width2Pixel(TermWin.ncol); 1114 size->width = Width2Pixel (TermWin.ncol);
1028 size->height = Height2Pixel(TermWin.nrow); 1115 size->height = Height2Pixel (TermWin.nrow);
1029} 1116}
1030 1117
1031void 1118void
1032rxvt_term::set_color (unsigned long *fg, unsigned long *bg) 1119rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
1033{ 1120{
1034 *fg = PixColors[Color_fg]; 1121 *fg = PixColors[Color_fg];
1035 *bg = PixColors[Color_bg]; 1122 *bg = PixColors[Color_bg];
1036} 1123}
1037 1124
1038/* Checking whether input method is running. */ 1125/* Checking whether input method is running. */
1039/* INTPROTO */
1040Bool 1126bool
1041rxvt_IMisRunning(pR) 1127rxvt_term::IMisRunning ()
1042{ 1128{
1043 char *p; 1129 char *p;
1044 Atom atom; 1130 Atom atom;
1045 Window win; 1131 Window win;
1046 char server[IMBUFSIZ]; 1132 char server[IMBUFSIZ];
1047 1133
1048/* get current locale modifier */ 1134 /* get current locale modifier */
1049 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1135 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1136 {
1050 STRCPY(server, "@server="); 1137 STRCPY (server, "@server=");
1051 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1138 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1052 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1139 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
1053 *p = '\0'; 1140 *p = '\0';
1054 1141
1055 atom = XInternAtom(R->Xdisplay, server, False); 1142 atom = XInternAtom (display->display, server, False);
1056 win = XGetSelectionOwner(R->Xdisplay, atom); 1143 win = XGetSelectionOwner (display->display, atom);
1057 if (win != None) 1144 if (win != None)
1058 return True; 1145 return True;
1059 } 1146 }
1060 return False; 1147 return False;
1061} 1148}
1062 1149
1063/* EXTPROTO */
1064void 1150void
1065rxvt_IMSendSpot(pR) 1151rxvt_term::IMSendSpot ()
1066{ 1152{
1067 XPoint spot; 1153 XPoint spot;
1068 XVaNestedList preedit_attr; 1154 XVaNestedList preedit_attr;
1069 1155
1070 if (R->Input_Context == NULL 1156 if (Input_Context == NULL
1071 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1157 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
1072 || !(R->event_type == KeyPress 1158 || ! (event_type == KeyPress
1073 || R->event_type == Expose 1159 || event_type == Expose
1074 || R->event_type == NoExpose 1160 || event_type == NoExpose
1075 || R->event_type == SelectionNotify 1161 || event_type == SelectionNotify
1076 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1162 || event_type == ButtonRelease || event_type == FocusIn)
1077 || !rxvt_IMisRunning(aR)) 1163 || !IMisRunning ())
1078 return; 1164 return;
1079 1165
1080 R->set_position (&spot); 1166 im_set_position (&spot);
1081 1167
1082 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1168 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1083 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1169 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1084 XFree(preedit_attr); 1170 XFree (preedit_attr);
1085} 1171}
1086 1172
1087void 1173void
1088rxvt_term::set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, 1174rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1089 XRectangle * needed_rect) 1175 XRectangle * needed_rect)
1090{ 1176{
1091 int mbh, vtx = 0; 1177 int mbh, vtx = 0;
1092 1178
1093 if (scrollbar_visible (this) && !(Options & Opt_scrollBar_right)) 1179 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1094 vtx = scrollbar_TotalWidth(); 1180 vtx = scrollbar_TotalWidth ();
1095 1181
1096 mbh = menubar_visible (this) ? menuBar_TotalHeight() : 0; 1182 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1097 mbh -= TermWin.lineSpace; 1183 mbh -= TermWin.lineSpace;
1098 1184
1099 preedit_rect->x = needed_rect->width + vtx; 1185 preedit_rect->x = needed_rect->width + vtx;
1100 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1186 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1101 1187
1102 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx; 1188 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1103 preedit_rect->height = Height2Pixel(1); 1189 preedit_rect->height = Height2Pixel (1);
1104 1190
1105 status_rect->x = vtx; 1191 status_rect->x = vtx;
1106 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1192 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1107 1193
1108 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1); 1194 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1109 status_rect->height = Height2Pixel(1); 1195 status_rect->height = Height2Pixel (1);
1110} 1196}
1111 1197
1112/* ARGSUSED */
1113/* INTPROTO */
1114void 1198void
1115rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1199rxvt_term::im_destroy ()
1116 __attribute__ ((unused)), XPointer call_data
1117 __attribute__ ((unused)))
1118{ 1200{
1119 dR; 1201 if (Input_Context)
1120 1202 {
1203 XDestroyIC (Input_Context);
1121 R->Input_Context = NULL; 1204 Input_Context = NULL;
1122/* To avoid Segmentation Fault in C locale: Solaris only? */ 1205 }
1123 if (STRCMP(R->locale, "C")) 1206
1124 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1207 if (input_method)
1125 rxvt_IMInstantiateCallback, NULL); 1208 {
1209 display->put_xim (input_method);
1210 input_method = 0;
1211 }
1126} 1212}
1127 1213
1128/* 1214/*
1129 * Try to open a XIM with the current modifiers, then see if we can 1215 * Try to open a XIM with the current modifiers, then see if we can
1130 * open a suitable preedit type 1216 * open a suitable preedit type
1131 */ 1217 */
1132static Bool 1218bool
1133rxvt_IM_get_IC (pR) 1219rxvt_term::IM_get_IC (const char *modifiers)
1134{ 1220{
1135 int i, j, found; 1221 int i, j, found;
1136 XIM xim; 1222 XIM xim;
1137 XPoint spot; 1223 XPoint spot;
1138 XRectangle rect, status_rect, needed_rect; 1224 XRectangle rect, status_rect, needed_rect;
1139 unsigned long fg, bg; 1225 unsigned long fg, bg;
1140 const char *p; 1226 const char *p;
1141 char **s; 1227 char **s;
1142 XIMStyles *xim_styles; 1228 XIMStyles *xim_styles;
1143 XVaNestedList preedit_attr, status_attr; 1229 XVaNestedList preedit_attr, status_attr;
1144 XIMCallback ximcallback;
1145 1230
1231 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1232 return false;
1233
1146 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1234 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1147 xim = XOpenIM (R->Xdisplay, NULL, NULL, NULL); 1235 input_method = display->get_xim (locale, modifiers);
1148 if (xim == NULL) 1236 if (input_method == NULL)
1149 return False; 1237 return false;
1150 1238
1239 xim = input_method->xim;
1240
1151 xim_styles = NULL; 1241 xim_styles = NULL;
1152 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1242 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1153 || !xim_styles || !xim_styles->count_styles) { 1243 || !xim_styles || !xim_styles->count_styles)
1154 XCloseIM(xim); 1244 {
1245 display->put_xim (input_method);
1155 return False; 1246 return false;
1156 } 1247 }
1157 1248
1158 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType] 1249 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1159 : "OverTheSpot,OffTheSpot,Root";
1160 s = rxvt_splitcommastring(p); 1250 s = rxvt_splitcommastring (p);
1161 for (i = found = 0; !found && s[i]; i++) { 1251 for (i = found = 0; !found && s[i]; i++)
1252 {
1162 if (!STRCMP(s[i], "OverTheSpot")) 1253 if (!STRCMP (s[i], "OverTheSpot"))
1163 R->input_style = (XIMPreeditPosition | XIMStatusNothing); 1254 input_style = (XIMPreeditPosition | XIMStatusNothing);
1164 else if (!STRCMP(s[i], "OffTheSpot")) 1255 else if (!STRCMP (s[i], "OffTheSpot"))
1165 R->input_style = (XIMPreeditArea | XIMStatusArea); 1256 input_style = (XIMPreeditArea | XIMStatusArea);
1166 else if (!STRCMP(s[i], "Root")) 1257 else if (!STRCMP (s[i], "Root"))
1167 R->input_style = (XIMPreeditNothing | XIMStatusNothing); 1258 input_style = (XIMPreeditNothing | XIMStatusNothing);
1168 1259
1169 for (j = 0; j < xim_styles->count_styles; j++) 1260 for (j = 0; j < xim_styles->count_styles; j++)
1170 if (R->input_style == xim_styles->supported_styles[j]) { 1261 if (input_style == xim_styles->supported_styles[j])
1262 {
1171 found = 1; 1263 found = 1;
1172 break; 1264 break;
1173 } 1265 }
1174 } 1266 }
1267
1175 for (i = 0; s[i]; i++) 1268 for (i = 0; s[i]; i++)
1176 free(s[i]); 1269 free (s[i]);
1270
1177 free(s); 1271 free (s);
1178 XFree(xim_styles); 1272 XFree (xim_styles);
1179 1273
1180 if (!found) { 1274 if (!found)
1181 XCloseIM(xim); 1275 {
1276 display->put_xim (input_method);
1182 return False; 1277 return false;
1183 } 1278 }
1184 1279
1185 ximcallback.callback = rxvt_IMDestroyCallback;
1186
1187 /* XXX: not sure why we need this (as well as IC one below) */
1188 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1189
1190 preedit_attr = status_attr = NULL; 1280 preedit_attr = status_attr = NULL;
1191 1281
1192 if (R->input_style & XIMPreeditPosition) { 1282 if (input_style & XIMPreeditPosition)
1283 {
1193 R->set_size (&rect); 1284 im_set_size (&rect);
1194 R->set_position (&spot); 1285 im_set_position (&spot);
1195 R->set_color (&fg, &bg); 1286 im_set_color (&fg, &bg);
1196 1287
1197 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1288 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1198 XNSpotLocation, &spot, 1289 XNSpotLocation, &spot,
1199 XNForeground, fg, XNBackground, bg,
1200 //XNFontSet, R->TermWin.fontset,
1201 NULL);
1202 } else if (R->input_style & XIMPreeditArea) {
1203 R->set_color (&fg, &bg);
1204
1205 /*
1206 * The necessary width of preedit area is unknown
1207 * until create input context.
1208 */
1209 needed_rect.width = 0;
1210
1211 R->set_preedit_area(&rect, &status_rect, &needed_rect);
1212
1213 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1214 XNForeground, fg, XNBackground, bg,
1215 //XNFontSet, R->TermWin.fontset,
1216 NULL);
1217 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1218 XNForeground, fg, XNBackground, bg, 1290 XNForeground, fg, XNBackground, bg,
1219 //XNFontSet, R->TermWin.fontset, 1291 //XNFontSet, TermWin.fontset,
1220 NULL); 1292 NULL);
1293 }
1294 else if (input_style & XIMPreeditArea)
1221 } 1295 {
1296 im_set_color (&fg, &bg);
1297
1298 /*
1299 * The necessary width of preedit area is unknown
1300 * until create input context.
1301 */
1302 needed_rect.width = 0;
1303
1304 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1305
1306 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1307 XNForeground, fg, XNBackground, bg,
1308 //XNFontSet, TermWin.fontset,
1309 NULL);
1310 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1311 XNForeground, fg, XNBackground, bg,
1312 //XNFontSet, TermWin.fontset,
1313 NULL);
1314 }
1315
1222 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style, 1316 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1223 XNClientWindow, R->TermWin.parent[0], 1317 XNClientWindow, TermWin.parent[0],
1224 XNFocusWindow, R->TermWin.parent[0], 1318 XNFocusWindow, TermWin.parent[0],
1225 XNDestroyCallback, &ximcallback,
1226 preedit_attr ? XNPreeditAttributes : NULL, 1319 preedit_attr ? XNPreeditAttributes : NULL,
1227 preedit_attr, 1320 preedit_attr,
1228 status_attr ? XNStatusAttributes : NULL, 1321 status_attr ? XNStatusAttributes : NULL,
1229 status_attr, NULL); 1322 status_attr, NULL);
1230 if (preedit_attr) 1323 if (preedit_attr) XFree (preedit_attr);
1231 XFree(preedit_attr); 1324 if (status_attr) XFree (status_attr);
1232 if (status_attr) 1325
1233 XFree(status_attr);
1234 if (R->Input_Context == NULL) { 1326 if (Input_Context == NULL)
1327 {
1235 rxvt_print_error("failed to create input context"); 1328 rxvt_print_error ("failed to create input context");
1236 XCloseIM(xim); 1329 display->put_xim (input_method);
1237 return False; 1330 return false;
1238 } 1331 }
1332
1239 if (R->input_style & XIMPreeditArea) 1333 if (input_style & XIMPreeditArea)
1240 rxvt_IMSetStatusPosition(aR); 1334 IMSetStatusPosition ();
1335
1241 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1336 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1242 return True; 1337 return true;
1243} 1338}
1244 1339
1245/*
1246 * X manual pages and include files don't match on some systems:
1247 * some think this is an XIDProc and others an XIMProc so we can't
1248 * use the first argument - need to update this to be nice for
1249 * both types via some sort of configure detection
1250 */
1251/* ARGSUSED */
1252/* EXTPROTO */
1253void 1340void
1254rxvt_IMInstantiateCallback(Display * unused 1341rxvt_term::im_cb ()
1255 __attribute__ ((unused)), XPointer client_data
1256 __attribute__ ((unused)), XPointer call_data
1257 __attribute__ ((unused)))
1258{ 1342{
1259 dR;
1260 int i, found, had_im; 1343 int i, found, had_im;
1261 const char *p; 1344 const char *p;
1262 char **s; 1345 char **s;
1263 char buf[IMBUFSIZ]; 1346 char buf[IMBUFSIZ];
1264 1347
1348 im_destroy ();
1349
1265 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1350 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1266 if (R->Input_Context) 1351 if (Input_Context)
1267 return; 1352 return;
1268 1353
1269#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1354#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1270 if (R->rs[Rs_imLocale]) 1355 if (rs[Rs_imLocale])
1271 setlocale (LC_CTYPE, R->rs[Rs_imLocale]); 1356 SET_LOCALE (rs[Rs_imLocale]);
1272#endif 1357#endif
1273 1358
1274 p = R->rs[Rs_inputMethod]; 1359 p = rs[Rs_inputMethod];
1275 if (p && *p) 1360 if (p && *p)
1276 { 1361 {
1277 bool found = false; 1362 bool found = false;
1278 1363
1279 s = rxvt_splitcommastring (p); 1364 s = rxvt_splitcommastring (p);
… …
1281 { 1366 {
1282 if (*s[i]) 1367 if (*s[i])
1283 { 1368 {
1284 STRCPY (buf, "@im="); 1369 STRCPY (buf, "@im=");
1285 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1370 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1286 if ((p = XSetLocaleModifiers (buf)) && *p 1371 if (IM_get_IC (buf))
1287 && rxvt_IM_get_IC (aR))
1288 { 1372 {
1289 found = true; 1373 found = true;
1290 break; 1374 break;
1291 } 1375 }
1292 } 1376 }
1293 } 1377 }
1294 for (i = 0; s[i]; i++) 1378 for (i = 0; s[i]; i++)
1295 free(s[i]); 1379 free (s[i]);
1296 free(s); 1380 free (s);
1297 1381
1298 if (found) 1382 if (found)
1299 goto done; 1383 goto done;
1300 } 1384 }
1301 1385
1302/* try with XMODIFIERS env. var. */ 1386 /* try with XMODIFIERS env. var. */
1303 if ((p = XSetLocaleModifiers ("")) && *p 1387 if (IM_get_IC (""))
1304 && rxvt_IM_get_IC (aR))
1305 goto done; 1388 goto done;
1306 1389
1307/* try with no modifiers base IF the user didn't specify an IM */ 1390 /* try with no modifiers base IF the user didn't specify an IM */
1308 if ((p = XSetLocaleModifiers ("@im=none")) && *p 1391 if (IM_get_IC ("@im=none"))
1309 && rxvt_IM_get_IC (aR) == True)
1310 goto done; 1392 goto done;
1311 1393
1312done: 1394done:
1313#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1395#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1314 if (R->rs[Rs_imLocale]) 1396 if (rs[Rs_imLocale])
1315 setlocale (LC_CTYPE, R->locale); 1397 SET_LOCALE (locale);
1316#endif 1398#endif
1317} 1399}
1318 1400
1319/* EXTPROTO */
1320void 1401void
1321rxvt_IMSetStatusPosition(pR) 1402rxvt_term::IMSetStatusPosition ()
1322{ 1403{
1323 XRectangle preedit_rect, status_rect, *needed_rect; 1404 XRectangle preedit_rect, status_rect, *needed_rect;
1324 XVaNestedList preedit_attr, status_attr; 1405 XVaNestedList preedit_attr, status_attr;
1325 1406
1326 if (R->Input_Context == NULL 1407 if (Input_Context == NULL
1327 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1408 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1328 || !rxvt_IMisRunning(aR)) 1409 || !IMisRunning ())
1329 return; 1410 return;
1330 1411
1331/* Getting the necessary width of preedit area */ 1412 /* Getting the necessary width of preedit area */
1332 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1413 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1333 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1414 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1334 XFree(status_attr); 1415 XFree (status_attr);
1335 1416
1336 R->set_preedit_area(&preedit_rect, &status_rect, needed_rect); 1417 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1337 1418
1338 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1419 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1339 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1420 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1340 1421
1341 XSetICValues(R->Input_Context, 1422 XSetICValues (Input_Context,
1342 XNPreeditAttributes, preedit_attr, 1423 XNPreeditAttributes, preedit_attr,
1343 XNStatusAttributes, status_attr, NULL); 1424 XNStatusAttributes, status_attr, NULL);
1344 1425
1345 XFree(preedit_attr); 1426 XFree (preedit_attr);
1346 XFree(status_attr); 1427 XFree (status_attr);
1347} 1428}
1348#endif /* USE_XIM */ 1429#endif /* USE_XIM */
1349 1430
1350/*----------------------------------------------------------------------*/ 1431/*----------------------------------------------------------------------*/
1351rxvt_t rxvt_current_term; 1432rxvt_t rxvt_current_term;

Diff Legend

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