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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.25 by pcg, Sat Jan 31 03:27:45 2004 UTC

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

Diff Legend

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