[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.175 by root, Thu Jan 12 00:35:39 2006 UTC vs.
Revision 1.216 by root, Wed Feb 1 21:15:33 2006 UTC

…		…
46		46
47	#ifdef HAVE_TERMIOS_H	47	#ifdef HAVE_TERMIOS_H
48	# include <termios.h>	48	# include <termios.h>
49	#endif	49	#endif
50		50
51	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)	51	vector<rxvt_term *> rxvt_term::termlist;
52	static uid_t saved_euid;	52
53	static gid_t saved_egid;	53	// used to tell global functions which terminal instance is "active"
54	#endif	54	rxvt_t rxvt_current_term;
		55
		56	static char curlocale[128], savelocale[128];
55		57
56	bool	58	bool
57	rxvt_tainted ()
58	{
59	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60	return getuid () != saved_euid \|\| getgid () != saved_egid;
61	#else
62	return false;
63	#endif
64	}
65
66	vector<rxvt_term *> rxvt_term::termlist;
67
68	static char curlocale[128], savelocale[128];
69
70	bool
71	rxvt_set_locale (const char *locale)	59	rxvt_set_locale (const char *locale) NOTHROW
72	{	60	{
73	if (!locale \|\| !strncmp (locale, curlocale, 128))	61	if (!locale \|\| !strncmp (locale, curlocale, 128))
74	return false;	62	return false;
75		63
76	strncpy (curlocale, locale, 128);	64	strncpy (curlocale, locale, 128);
77	setlocale (LC_CTYPE, curlocale);	65	setlocale (LC_CTYPE, curlocale);
78	return true;	66	return true;
79	}	67	}
80		68
81	void	69	void
82	rxvt_push_locale (const char *locale)	70	rxvt_push_locale (const char *locale) NOTHROW
83	{	71	{
84	strcpy (savelocale, curlocale);	72	strcpy (savelocale, curlocale);
85	rxvt_set_locale (locale);	73	rxvt_set_locale (locale);
86	}	74	}
87		75
88	void	76	void
89	rxvt_pop_locale ()	77	rxvt_pop_locale () NOTHROW
90	{	78	{
91	rxvt_set_locale (savelocale);	79	rxvt_set_locale (savelocale);
92	}	80	}
93		81
94	#if ENABLE_COMBINING	82	#if ENABLE_COMBINING
…		…
161	rootwin_ev (this, &rxvt_term::rootwin_cb),	149	rootwin_ev (this, &rxvt_term::rootwin_cb),
162	#endif	150	#endif
163	#ifdef HAVE_SCROLLBARS	151	#ifdef HAVE_SCROLLBARS
164	scrollbar_ev (this, &rxvt_term::x_cb),	152	scrollbar_ev (this, &rxvt_term::x_cb),
165	#endif	153	#endif
166	#ifdef MENUBAR
167	menubar_ev (this, &rxvt_term::x_cb),
168	#endif
169	#ifdef CURSOR_BLINK	154	#ifdef CURSOR_BLINK
170	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),	155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
171	#endif	156	#endif
172	#ifdef TEXT_BLINK	157	#ifdef TEXT_BLINK
173	text_blink_ev (this, &rxvt_term::text_blink_cb),	158	text_blink_ev (this, &rxvt_term::text_blink_cb),
…		…
185	pointer_ev (this, &rxvt_term::pointer_cb),	170	pointer_ev (this, &rxvt_term::pointer_cb),
186	#endif	171	#endif
187	#ifdef USE_XIM	172	#ifdef USE_XIM
188	im_ev (this, &rxvt_term::im_cb),	173	im_ev (this, &rxvt_term::im_cb),
189	#endif	174	#endif
		175	#ifndef NO_BELL
		176	bell_ev (this, &rxvt_term::bell_cb),
		177	#endif
190	termwin_ev (this, &rxvt_term::x_cb),	178	termwin_ev (this, &rxvt_term::x_cb),
191	vt_ev (this, &rxvt_term::x_cb),	179	vt_ev (this, &rxvt_term::x_cb),
		180	child_ev (this, &rxvt_term::child_cb),
192	check_ev (this, &rxvt_term::check_cb),	181	check_ev (this, &rxvt_term::check_cb),
193	flush_ev (this, &rxvt_term::flush_cb),	182	flush_ev (this, &rxvt_term::flush_cb),
194	destroy_ev (this, &rxvt_term::destroy_cb),	183	destroy_ev (this, &rxvt_term::destroy_cb),
195	pty_ev (this, &rxvt_term::pty_cb),	184	pty_ev (this, &rxvt_term::pty_cb),
196	incr_ev (this, &rxvt_term::incr_cb)	185	incr_ev (this, &rxvt_term::incr_cb)
…		…
199		188
200	termlist.push_back (this);	189	termlist.push_back (this);
201		190
202	#ifdef KEYSYM_RESOURCE	191	#ifdef KEYSYM_RESOURCE
203	keyboard = new keyboard_manager;	192	keyboard = new keyboard_manager;
204
205	if (!keyboard)
206	rxvt_fatal ("out of memory, aborting.\n");
207	#endif	193	#endif
208	}	194	}
209		195
210	// clean up the most important stuff, do not call x or free mem etc.	196	// clean up the most important stuff, do not call x or free mem etc.
211	// for use before an emergency exit	197	// for use before an emergency exit
212	void rxvt_term::emergency_cleanup ()	198	void rxvt_term::emergency_cleanup ()
213	{	199	{
214	if (cmd_pid)	200	if (cmd_pid)
215	kill (-cmd_pid, SIGHUP);	201	kill (-cmd_pid, SIGHUP);
216		202
217	#ifdef UTMP_SUPPORT	203	delete pty; pty = 0;
218	privileged_utmp (RESTORE);
219	#endif
220
221	pty.put ();
222	}	204	}
223		205
224	rxvt_term::~rxvt_term ()	206	rxvt_term::~rxvt_term ()
225	{	207	{
226	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
227
228	termlist.erase (find (termlist.begin (), termlist.end(), this));	208	termlist.erase (find (termlist.begin (), termlist.end(), this));
229		209
230	emergency_cleanup ();	210	emergency_cleanup ();
231		211
232	#if ENABLE_STYLES	212	#if ENABLE_STYLES
…		…
236	#endif	216	#endif
237	delete fontset[0];	217	delete fontset[0];
238		218
239	if (display)	219	if (display)
240	{	220	{
241	dDisp;
242
243	selection_clear ();	221	selection_clear ();
244		222
245	#ifdef USE_XIM	223	#ifdef USE_XIM
246	im_destroy ();	224	im_destroy ();
247	#endif	225	#endif
248	#ifdef MENUBAR
249	if (menubarGC) XFreeGC (disp, menubarGC);
250	#endif
251	#ifdef XTERM_SCROLLBAR	226	#ifdef XTERM_SCROLLBAR
252	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	227	if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
253	if (ShadowGC) XFreeGC (disp, ShadowGC);	228	if (ShadowGC) XFreeGC (xdisp, ShadowGC);
254	#endif	229	#endif
255	#ifdef PLAIN_SCROLLBAR	230	#ifdef PLAIN_SCROLLBAR
256	if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);	231	if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
257	#endif	232	#endif
258	#ifdef NEXT_SCROLLBAR	233	#ifdef NEXT_SCROLLBAR
259	if (blackGC) XFreeGC (disp, blackGC);	234	if (blackGC) XFreeGC (xdisp, blackGC);
260	if (whiteGC) XFreeGC (disp, whiteGC);	235	if (whiteGC) XFreeGC (xdisp, whiteGC);
261	if (grayGC) XFreeGC (disp, grayGC);	236	if (grayGC) XFreeGC (xdisp, grayGC);
262	if (darkGC) XFreeGC (disp, darkGC);	237	if (darkGC) XFreeGC (xdisp, darkGC);
263	if (stippleGC) XFreeGC (disp, stippleGC);	238	if (stippleGC) XFreeGC (xdisp, stippleGC);
264	if (dimple) XFreePixmap (disp, dimple);	239	if (dimple) XFreePixmap (xdisp, dimple);
265	if (upArrow) XFreePixmap (disp, upArrow);	240	if (upArrow) XFreePixmap (xdisp, upArrow);
266	if (downArrow) XFreePixmap (disp, downArrow);	241	if (downArrow) XFreePixmap (xdisp, downArrow);
267	if (upArrowHi) XFreePixmap (disp, upArrowHi);	242	if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
268	if (downArrowHi) XFreePixmap (disp, downArrowHi);	243	if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
269	#endif	244	#endif
270	#if defined(MENUBAR) \|\| defined(RXVT_SCROLLBAR)	245	#ifdef RXVT_SCROLLBAR
271	if (topShadowGC) XFreeGC (disp, topShadowGC);	246	if (topShadowGC) XFreeGC (xdisp, topShadowGC);
272	if (botShadowGC) XFreeGC (disp, botShadowGC);	247	if (botShadowGC) XFreeGC (xdisp, botShadowGC);
273	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	248	if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
274	#endif	249	#endif
275	if (gc) XFreeGC (disp, gc);	250	if (gc) XFreeGC (xdisp, gc);
276		251
277	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
278	delete menuBar.drawable;
279	//if (menuBar.win)
280	// XDestroyWindow (disp, menuBar.win);
281	#endif
282	delete drawable;	252	delete drawable;
283	// destroy all windows	253	// destroy all windows
284	if (parent[0])	254	if (parent[0])
285	XDestroyWindow (disp, parent[0]);	255	XDestroyWindow (xdisp, parent[0]);
286	}
287		256
288	// TODO: free pixcolours, colours should become part of rxvt_display	257	for (int i = 0; i < TOTAL_COLORS; i++)
		258	if (ISSET_PIXCOLOR (i))
		259	{
		260	pix_colors_focused [i].free (this);
		261	#if OFF_FOCUS_FADING
		262	pix_colors_unfocused [i].free (this);
		263	#endif
		264	}
		265
		266	clear ();
		267	}
		268
289	delete pix_colors_focused;	269	delete pix_colors_focused;
290	#if OFF_FOCUS_FADING	270	#if OFF_FOCUS_FADING
291	delete pix_colors_unfocused;	271	delete pix_colors_unfocused;
292	#endif	272	#endif
293		273
…		…
299	for (int i = 0; i < allocated.size (); i++)	279	for (int i = 0; i < allocated.size (); i++)
300	free (allocated [i]);	280	free (allocated [i]);
301		281
302	free (selection.text);	282	free (selection.text);
303	// TODO: manage env vars in child only(!)	283	// TODO: manage env vars in child only(!)
304	free (env_windowid);
305	free (env_display);	284	free (env_display);
306	free (env_term);	285	free (env_term);
307	free (env_colorfgbg);
308	free (locale);	286	free (locale);
309	free (v_buffer);	287	free (v_buffer);
310	free (incr_buf);	288	free (incr_buf);
311		289
312	delete envv;	290	delete envv;
…		…
315	#ifdef KEYSYM_RESOURCE	293	#ifdef KEYSYM_RESOURCE
316	delete keyboard;	294	delete keyboard;
317	#endif	295	#endif
318	}	296	}
319		297
		298	// child has exited, usually destroys
320	void	299	void
321	rxvt_term::child_exit ()	300	rxvt_term::child_cb (child_watcher &w, int status)
322	{	301	{
		302	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
		303
323	cmd_pid = 0;	304	cmd_pid = 0;
324		305
325	if (!OPTION (Opt_hold))	306	if (!OPTION (Opt_hold))
326	destroy ();	307	destroy ();
327	}	308	}
…		…
330	rxvt_term::destroy ()	311	rxvt_term::destroy ()
331	{	312	{
332	if (destroy_ev.active)	313	if (destroy_ev.active)
333	return;	314	return;
334		315
		316	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
		317
335	#if ENABLE_OVERLAY	318	#if ENABLE_OVERLAY
336	scr_overlay_off ();	319	scr_overlay_off ();
337	#endif	320	#endif
338		321
339	if (display)	322	if (display)
…		…
341	#if USE_XIM	324	#if USE_XIM
342	im_ev.stop (display);	325	im_ev.stop (display);
343	#endif	326	#endif
344	#if HAVE_SCROLLBARS	327	#if HAVE_SCROLLBARS
345	scrollbar_ev.stop (display);	328	scrollbar_ev.stop (display);
346	#endif
347	#if MENUBAR
348	menubar_ev.stop (display);
349	#endif	329	#endif
350	#if TRANSPARENT	330	#if TRANSPARENT
351	rootwin_ev.stop (display);	331	rootwin_ev.stop (display);
352	#endif	332	#endif
353	incr_ev.stop ();	333	incr_ev.stop ();
…		…
377	}	357	}
378		358
379	void	359	void
380	rxvt_term::destroy_cb (time_watcher &w)	360	rxvt_term::destroy_cb (time_watcher &w)
381	{	361	{
382	SET_R (this);	362	make_current ();
383		363
384	delete this;	364	delete this;
385	}	365	}
386		366
387	/----------------------------------------------------------------------/	367	/----------------------------------------------------------------------/
…		…
396	{	376	{
397	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)	377	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
398	(*t)->emergency_cleanup ();	378	(*t)->emergency_cleanup ();
399	}	379	}
400		380
401	#if ENABLE_FRILLS	381	#if !ENABLE_MINIMAL
402	static void	382	static void
403	print_x_error (Display dpy, XErrorEvent event)	383	print_x_error (Display dpy, XErrorEvent event)
404	{	384	{
405	char buffer[BUFSIZ];	385	char buffer[BUFSIZ];
406	char mesg[BUFSIZ];	386	char mesg[BUFSIZ];
…		…
454	GET_R->allowedxerror = event->error_code;	434	GET_R->allowedxerror = event->error_code;
455	else	435	else
456	{	436	{
457	// GET_R is most likely not the terminal which caused the error,	437	// GET_R is most likely not the terminal which caused the error,
458	// so just output the error and continue	438	// so just output the error and continue
459	#if ENABLE_FRILLS	439	#if ENABLE_MINIMAL
		440	old_xerror_handler (display, event);
		441	#else
460	print_x_error (display, event);	442	print_x_error (display, event);
461	#else
462	old_xerror_handler (display, event);
463	#endif	443	#endif
464	}	444	}
465		445
466	return 0;	446	return 0;
467	}	447	}
…		…
475	_exit (EXIT_FAILURE);	455	_exit (EXIT_FAILURE);
476	}	456	}
477		457
478	/----------------------------------------------------------------------/	458	/----------------------------------------------------------------------/
479	bool	459	bool
480	rxvt_term::init (int argc, const char const argv)	460	rxvt_term::init (int argc, const char const argv, stringvec *envv)
481	{	461	{
		462	this->envv = envv;
		463
482	SET_R (this);	464	SET_R (this);
483	TEMP_ENV; // few things in X do not call setlocale :(
484
485	set_locale ("");	465	set_locale ("");
		466	set_environ (envv); // few things in X do not call setlocale :(
486		467
487	if (!init_vars ())	468	if (!init_vars ())
488	return false;	469	return false;
489		470
490	init_secondary ();	471	init_secondary ();
…		…
493		474
494	#ifdef KEYSYM_RESOURCE	475	#ifdef KEYSYM_RESOURCE
495	keyboard->register_done ();	476	keyboard->register_done ();
496	#endif	477	#endif
497		478
498	#if MENUBAR_MAX
499	menubar_read (rs[Rs_menu]);
500	#endif
501	#ifdef HAVE_SCROLLBARS	479	#ifdef HAVE_SCROLLBARS
502	if (OPTION (Opt_scrollBar))	480	if (OPTION (Opt_scrollBar))
503	scrollBar.setIdle (); /* set existence for size calculations */	481	scrollBar.setIdle (); /* set existence for size calculations */
504	#endif	482	#endif
505		483
506	#if ENABLE_PERL	484	pty = ptytty::create ();
507	if (!rs[Rs_perl_ext_1])
508	rs[Rs_perl_ext_1] = "default";
509
510	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
511	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
512	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
513	{
514	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
515	// ignore some perl-related arguments if some bozo installed us set[ug]id
516	if (rxvt_tainted ())
517	{
518	if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
519	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
520	{
521	rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
522	rs[Rs_perl_lib] = 0;
523	rs[Rs_perl_eval] = 0;
524	}
525	}
526	#endif
527	rxvt_perl.init ();
528	setlocale (LC_CTYPE, curlocale); // perl init destroys this info
529	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
530	}
531	#endif
532		485
533	create_windows (argc, argv);	486	create_windows (argc, argv);
534		487
535	dDisp;
536
537	init_xlocale ();	488	init_xlocale ();
538		489
539	scr_reset (); // initialize screen	490	scr_reset (); // initialize screen
540		491
541	#if 0	492	#if 0
542	XSynchronize (disp, True);	493	XSynchronize (xdisp, True);
543	#endif	494	#endif
544		495
545	#ifdef HAVE_SCROLLBARS	496	#ifdef HAVE_SCROLLBARS
546	if (OPTION (Opt_scrollBar))	497	if (OPTION (Opt_scrollBar))
547	resize_scrollbar (); /* create and map scrollbar */	498	resize_scrollbar (); /* create and map scrollbar */
548	#endif	499	#endif
549	#if (MENUBAR_MAX)
550	if (menubar_visible ())
551	XMapWindow (disp, menuBar.win);
552	#endif
553	#ifdef TRANSPARENT	500	#ifdef TRANSPARENT
554	if (OPTION (Opt_transparent))	501	if (OPTION (Opt_transparent))
555	{	502	{
556	XSelectInput (disp, display->root, PropertyChangeMask);	503	XSelectInput (xdisp, display->root, PropertyChangeMask);
557	check_our_parents ();	504	check_our_parents ();
558	rootwin_ev.start (display, display->root);	505	rootwin_ev.start (display, display->root);
559	}	506	}
560	#endif	507	#endif
561		508
562	XMapWindow (disp, vt);
563	XMapWindow (disp, parent[0]);
564
565	set_colorfgbg ();	509	set_colorfgbg ();
566		510
567	init_command (cmd_argv);	511	init_command (cmd_argv);
568		512
569	free (cmd_argv);	513	free (cmd_argv);
570		514
571	if (pty.pty >= 0)	515	if (pty->pty >= 0)
572	pty_ev.start (pty.pty, EVENT_READ);	516	pty_ev.start (pty->pty, EVENT_READ);
573		517
574	check_ev.start ();	518	check_ev.start ();
575		519
576	HOOK_INVOKE ((this, HOOK_START, DT_END));	520	HOOK_INVOKE ((this, HOOK_START, DT_END));
577		521
		522	#if ENABLE_XEMBED
		523	if (rs[Rs_embed])
		524	{
		525	long info[2] = { 0, XEMBED_MAPPED };
		526
		527	XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		528	32, PropModeReplace, (unsigned char *)&info, 2);
		529	}
		530	#endif
		531
		532	XMapWindow (xdisp, vt);
		533	XMapWindow (xdisp, parent[0]);
		534
578	return true;	535	return true;
579	}	536	}
580		537
581	static struct sig_handlers	538	static struct sig_handlers
582	{	539	{
583	sig_watcher sw_chld, sw_term, sw_int;	540	sig_watcher sw_term, sw_int;
584		541
585	void sig_chld (sig_watcher &w)
586	{
587	// we are being called for every SIGCHLD, find the corresponding term
588	int pid;
589
590	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
591	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
592	if (pid == (*t)->cmd_pid)
593	{
594	(*t)->child_exit ();
595	break;
596	}
597	}
598
599	/*	542	/*
600	* Catch a fatal signal and tidy up before quitting	543	* Catch a fatal signal and tidy up before quitting
601	*/	544	*/
602	void	545	void
603	sig_term (sig_watcher &w)	546	sig_term (sig_watcher &w)
604	{	547	{
605	#ifdef DEBUG_CMD
606	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
607	#endif
608	rxvt_emergency_cleanup ();	548	rxvt_emergency_cleanup ();
609	signal (w.signum, SIG_DFL);	549	signal (w.signum, SIG_DFL);
610	kill (getpid (), w.signum);	550	kill (getpid (), w.signum);
611	}	551	}
612		552
613	sig_handlers ()	553	sig_handlers ()
614	: sw_chld (this, &sig_handlers::sig_chld),
615	sw_term (this, &sig_handlers::sig_term),	554	: sw_term (this, &sig_handlers::sig_term),
616	sw_int (this, &sig_handlers::sig_term)	555	sw_int (this, &sig_handlers::sig_term)
617	{	556	{
618	}	557	}
619	} sig_handlers;	558	} sig_handlers;
620		559
621	char **rxvt_environ; // startup environment	560	char **rxvt_environ; // startup environment
622		561
623	void	562	void
624	rxvt_init ()	563	rxvt_init ()
625	{	564	{
		565	ptytty::init ();
		566
626	rxvt_environ = environ;	567	rxvt_environ = environ;
627
628	/*
629	* Save and then give up any super-user privileges
630	* If we need privileges in any area then we must specifically request it.
631	* We should only need to be root in these cases:
632	* 1. write utmp entries on some systems
633	* 2. chown tty on some systems
634	*/
635	rxvt_privileges (SAVE);
636	rxvt_privileges (IGNORE);
637		568
638	signal (SIGHUP, SIG_IGN);	569	signal (SIGHUP, SIG_IGN);
639	signal (SIGPIPE, SIG_IGN);	570	signal (SIGPIPE, SIG_IGN);
640		571
641	sig_handlers.sw_chld.start (SIGCHLD);
642	sig_handlers.sw_term.start (SIGTERM);	572	sig_handlers.sw_term.start (SIGTERM);
643	sig_handlers.sw_int.start (SIGINT);	573	sig_handlers.sw_int.start (SIGINT);
644		574
645	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	575	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
646	/* signal (SIGURG, SIG_DFL); */	576	/* signal (SIGURG, SIG_DFL); */
…		…
675	rxvt_fatal ("memory allocation failure. aborting.\n");	605	rxvt_fatal ("memory allocation failure. aborting.\n");
676		606
677	return p;	607	return p;
678	}	608	}
679		609
680	void *	610	void *
681	rxvt_realloc (void *ptr, size_t size)	611	rxvt_realloc (void *ptr, size_t size)
682	{	612	{
683	void *p = realloc (ptr, size);	613	void *p = realloc (ptr, size);
684		614
685	if (!p)	615	if (!p)
686	rxvt_fatal ("memory allocation failure. aborting.\n");	616	rxvt_fatal ("memory allocation failure. aborting.\n");
687		617
688	return p;	618	return p;
689	}	619	}
690
691	/* ------------------------------------------------------------------------- *
692	* PRIVILEGED OPERATIONS *
693	* ------------------------------------------------------------------------- */
694	/* take care of suid/sgid super-user (root) privileges */
695	void
696	rxvt_privileges (rxvt_privaction action)
697	{
698	#if ! defined(__CYGWIN32__)
699	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
700	/* setreuid () is the poor man's setuid (), seteuid () */
701	# define seteuid(a) setreuid(-1, (a))
702	# define setegid(a) setregid(-1, (a))
703	# define HAVE_SETEUID
704	# endif
705	# ifdef HAVE_SETEUID
706	switch (action)
707	{
708	case IGNORE:
709	/*
710	* change effective uid/gid - not real uid/gid - so we can switch
711	* back to root later, as required
712	*/
713	setegid (getgid ());
714	seteuid (getuid ());
715	break;
716	case SAVE:
717	saved_egid = getegid ();
718	saved_euid = geteuid ();
719	break;
720	case RESTORE:
721	setegid (saved_egid);
722	seteuid (saved_euid);
723	break;
724	}
725	# else
726	switch (action)
727	{
728	case IGNORE:
729	setgid (getgid ());
730	setuid (getuid ());
731	/* FALLTHROUGH */
732	case SAVE:
733	/* FALLTHROUGH */
734	case RESTORE:
735	break;
736	}
737	# endif
738	#endif
739	}
740
741	#ifdef UTMP_SUPPORT
742	void
743	rxvt_term::privileged_utmp (rxvt_privaction action)
744	{
745	if (OPTION (Opt_utmpInhibit)
746	\|\| !pty.name \|\| !*pty.name)
747	return;
748
749	rxvt_privileges (RESTORE);
750
751	if (action == SAVE)
752	makeutent (pty.name, rs[Rs_display_name]);
753	else
754	cleanutent ();
755
756	rxvt_privileges (IGNORE);
757	}
758	#endif
759		620
760	/----------------------------------------------------------------------/	621	/----------------------------------------------------------------------/
761	/*	622	/*
762	* window size/position calculcations for XSizeHint and other storage.	623	* window size/position calculcations for XSizeHint and other storage.
763	* if width/height are non-zero then override calculated width/height	624	* if width/height are non-zero then override calculated width/height
764	*/	625	*/
765	void	626	void
766	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	627	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
767	{	628	{
768	short recalc_x, recalc_y;	629	short recalc_x, recalc_y;
769	int x, y, sb_w, mb_h, flags;	630	int x, y, sb_w, flags;
770	unsigned int w, h;	631	unsigned int w, h;
771	unsigned int max_width, max_height;	632	unsigned int max_width, max_height;
772	dDisp;
773
774	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
775	ncol, nrow, szHint.width, szHint.height));
776		633
777	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	634	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
778	szHint.win_gravity = NorthWestGravity;	635	szHint.win_gravity = NorthWestGravity;
779	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	636	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
780		637
…		…
835	max_width = MAX_COLS * fwidth;	692	max_width = MAX_COLS * fwidth;
836	max_height = MAX_ROWS * fheight;	693	max_height = MAX_ROWS * fheight;
837		694
838	szHint.base_width = szHint.base_height = 2 * int_bwidth;	695	szHint.base_width = szHint.base_height = 2 * int_bwidth;
839		696
840	sb_w = mb_h = 0;	697	sb_w = 0;
841	window_vt_x = window_vt_y = int_bwidth;	698	window_vt_x = window_vt_y = int_bwidth;
842		699
843	if (scrollbar_visible ())	700	if (scrollBar.state)
844	{	701	{
845	sb_w = scrollbar_TotalWidth ();	702	sb_w = scrollbar_TotalWidth ();
846	szHint.base_width += sb_w;	703	szHint.base_width += sb_w;
		704
847	if (!OPTION (Opt_scrollBar_right))	705	if (!OPTION (Opt_scrollBar_right))
848	window_vt_x += sb_w;	706	window_vt_x += sb_w;
849	}
850
851	if (menubar_visible ())
852	{
853	mb_h = menuBar_TotalHeight ();
854	szHint.base_height += mb_h;
855	window_vt_y += mb_h;
856	}	707	}
857		708
858	szHint.width_inc = fwidth;	709	szHint.width_inc = fwidth;
859	szHint.height_inc = fheight;	710	szHint.height_inc = fheight;
860	szHint.min_width = szHint.base_width + szHint.width_inc;	711	szHint.min_width = szHint.base_width + szHint.width_inc;
…		…
880	{	731	{
881	min_it (height, max_height);	732	min_it (height, max_height);
882	szHint.height = szHint.base_height + height;	733	szHint.height = szHint.base_height + height;
883	}	734	}
884		735
885	if (scrollbar_visible () && OPTION (Opt_scrollBar_right))	736	if (scrollBar.state && OPTION (Opt_scrollBar_right))
886	window_sb_x = szHint.width - sb_w;	737	window_sb_x = szHint.width - sb_w;
887		738
888	if (recalc_x)	739	if (recalc_x)
889	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	740	szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
		741
890	if (recalc_y)	742	if (recalc_y)
891	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	743	szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
892		744
893	ncol = width / fwidth;	745	ncol = width / fwidth;
894	nrow = height / fheight;	746	nrow = height / fheight;
895	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
896	ncol, nrow, szHint.width,
897	szHint.height));
898	return;
899	}	747	}
900		748
901	/----------------------------------------------------------------------/	749	/----------------------------------------------------------------------/
902	/*	750	/*
903	* Tell the teletype handler what size the window is.	751	* Tell the teletype handler what size the window is.
904	* Called after a window size change.	752	* Called after a window size change.
905	*/	753	*/
906	void	754	void
907	rxvt_term::tt_winch ()	755	rxvt_term::tt_winch ()
908	{	756	{
909	if (pty.pty < 0)	757	if (pty->pty < 0)
910	return;	758	return;
911		759
912	struct winsize ws;	760	struct winsize ws;
913		761
914	ws.ws_col = ncol;	762	ws.ws_col = ncol;
915	ws.ws_row = nrow;	763	ws.ws_row = nrow;
916	ws.ws_xpixel = width;	764	ws.ws_xpixel = width;
917	ws.ws_ypixel = height;	765	ws.ws_ypixel = height;
918	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);	766	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
919		767
920	#if 0	768	#if 0
921	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	769	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
922	if (cmd_pid) /* force through to the command */	770	if (cmd_pid) /* force through to the command */
923	kill (-cmd_pid, SIGWINCH);	771	kill (-cmd_pid, SIGWINCH);
…		…
1003	return true;	851	return true;
1004	}	852	}
1005		853
1006	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	854	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
1007	{	855	{
1008	XChangeProperty (display->display, parent[0],	856	XChangeProperty (xdisp, parent[0],
1009	prop, XA_STRING, 8, PropModeReplace,	857	prop, XA_STRING, 8, PropModeReplace,
1010	(const unsigned char *)str, len >= 0 ? len : strlen (str));	858	(const unsigned char *)str, len >= 0 ? len : strlen (str));
1011	}	859	}
1012		860
1013	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	861	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
1014	{	862	{
1015	wchar_t *ws = rxvt_mbstowcs (str, len);	863	wchar_t *ws = rxvt_mbstowcs (str, len);
1016	char *s = rxvt_wcstoutf8 (ws);	864	char *s = rxvt_wcstoutf8 (ws);
1017		865
1018	XChangeProperty (display->display, parent[0],	866	XChangeProperty (xdisp, parent[0],
1019	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	867	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
1020	(const unsigned char *)s, strlen (s));	868	(const unsigned char *)s, strlen (s));
1021		869
1022	free (s);	870	free (s);
1023	free (ws);	871	free (ws);
…		…
1048	void	896	void
1049	rxvt_term::set_window_color (int idx, const char *color)	897	rxvt_term::set_window_color (int idx, const char *color)
1050	{	898	{
1051	rxvt_color xcol;	899	rxvt_color xcol;
1052	int i;	900	int i;
1053		901
1054	if (color == NULL \|\| *color == '\0')	902	if (color == NULL \|\| *color == '\0')
1055	return;	903	return;
		904
		905	color = strdup (color);
		906	allocated.push_back ((void *)color);
		907	rs[Rs_color + idx] = color;
1056		908
1057	/* handle color aliases */	909	/* handle color aliases */
1058	if (isdigit (*color))	910	if (isdigit (*color))
1059	{	911	{
1060	i = atoi (color);	912	i = atoi (color);
1061		913
1062	if (i >= 8 && i <= 15)	914	if (i >= 8 && i <= 15)
1063	{ /* bright colors */	915	{ /* bright colors */
1064	i -= 8;	916	i -= 8;
1065	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	917	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1066	SET_PIXCOLOR (idx);
1067	goto done;	918	goto done;
1068	}	919	}
1069		920
1070	if (i >= 0 && i <= 7)	921	if (i >= 0 && i <= 7)
1071	{ /* normal colors */	922	{ /* normal colors */
1072	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	923	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1073	SET_PIXCOLOR (idx);
1074	goto done;	924	goto done;
1075	}	925	}
1076	}	926	}
1077		927
1078	if (!rXParseAllocColor (&xcol, color))	928	set_color (xcol, color);
1079	return;
1080
1081	/* XStoreColor (display->display, display->cmap, XColor); /
1082		929
1083	/*	930	/*
1084	* FIXME: should free colors here, but no idea how to do it so instead,	931	* FIXME: should free colors here, but no idea how to do it so instead,
1085	* so just keep gobbling up the colormap	932	* so just keep gobbling up the colormap
1086	*/	933	*/
1087	# if 0
1088	for (i = Color_Black; i <= Color_White; i++)
1089	if (pix_colors[idx] == pix_colors[i])
1090	break;
1091	if (i > Color_White)
1092	{
1093	/* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1094	XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1095	DisplayPlanes (display->display, display->screen));
1096	}
1097	# endif
1098		934
1099	pix_colors_focused[idx] = xcol;	935	pix_colors_focused[idx] = xcol;
1100	SET_PIXCOLOR (idx);
1101		936
1102	/* XSetWindowAttributes attr; */	937	/* XSetWindowAttributes attr; */
1103	/* Cursor cursor; */	938	/* Cursor cursor; */
1104	done:	939	done:
1105		940
1106	#if OFF_FOCUS_FADING	941	#if OFF_FOCUS_FADING
1107	if (rs[Rs_fade])	942	if (rs[Rs_fade])
1108	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);	943	{
		944	rgba c;
		945	pix_colors [Color_fade].get (c);
		946	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
		947	}
1109	#endif	948	#endif
1110		949
1111	/TODO: handle Color_BD, scrollbar background, etc. /	950	/TODO: handle Color_BD, scrollbar background, etc. /
1112		951
1113	recolour_cursor ();	952	recolour_cursor ();
…		…
1119	#endif /* XTERM_COLOR_CHANGE */	958	#endif /* XTERM_COLOR_CHANGE */
1120		959
1121	void	960	void
1122	rxvt_term::recolour_cursor ()	961	rxvt_term::recolour_cursor ()
1123	{	962	{
1124	XColor xcol[2];	963	XColor fg, bg;
1125		964
1126	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)	965	(ISSET_PIXCOLOR (Color_pointer_fg)
1127	? pix_colors_focused[Color_pointer_fg]	966	? pix_colors_focused[Color_pointer_fg]
1128	: pix_colors_focused[Color_fg];	967	: pix_colors_focused[Color_fg]).get (fg);
		968
1129	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)	969	(ISSET_PIXCOLOR (Color_pointer_bg)
1130	? pix_colors_focused[Color_pointer_bg]	970	? pix_colors_focused[Color_pointer_bg]
1131	: pix_colors_focused[Color_bg];	971	: pix_colors_focused[Color_bg]).get (bg);
1132		972
1133	XQueryColors (display->display, display->cmap, xcol, 2);	973	XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg);
1134	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1135	}	974	}
1136		975
1137	/----------------------------------------------------------------------/	976	/----------------------------------------------------------------------/
1138	/*	977	/*
1139	* find if fg/bg matches any of the normal (low-intensity) colors	978	* find if fg/bg matches any of the normal (low-intensity) colors
…		…
1143	{	982	{
1144	unsigned int i;	983	unsigned int i;
1145	const char *xpmb = "\0";	984	const char *xpmb = "\0";
1146	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	985	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1147		986
1148	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1149	strcpy (fstr, "default");	987	strcpy (fstr, "default");
1150	strcpy (bstr, "default");	988	strcpy (bstr, "default");
1151	for (i = Color_Black; i <= Color_White; i++)	989	for (i = Color_Black; i <= Color_White; i++)
1152	if (pix_colors[Color_fg] == pix_colors[i])	990	if (pix_colors[Color_fg] == pix_colors[i])
1153	{	991	{
…		…
1168	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	1006	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1169	}	1007	}
1170		1008
1171	/----------------------------------------------------------------------/	1009	/----------------------------------------------------------------------/
1172		1010
1173	int	1011	bool
1174	rxvt_term::rXParseAllocColor (rxvt_color screen_in_out, const char colour)	1012	rxvt_term::set_color (rxvt_color &color, const char *name)
1175	{	1013	{
1176	if (!screen_in_out->set (display, colour))	1014	if (color.set (this, name))
1177	{
1178	rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1179	return false;
1180	}
1181
1182	return true;	1015	return true;
		1016
		1017	rxvt_warn ("can't get colour '%s', continuing without.\n", name);
		1018	return false;
		1019	}
		1020
		1021	void
		1022	rxvt_term::alias_color (int dst, int src)
		1023	{
		1024	pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1183	}	1025	}
1184		1026
1185	/* -------------------------------------------------------------------- *	1027	/* -------------------------------------------------------------------- *
1186	* - WINDOW RESIZING - *	1028	* - WINDOW RESIZING - *
1187	* -------------------------------------------------------------------- */	1029	* -------------------------------------------------------------------- */
1188	void	1030	void
1189	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)	1031	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1190	{	1032	{
1191	int fix_screen;	1033	int fix_screen;
1192	int old_width = szHint.width, old_height = szHint.height;	1034	int old_width = szHint.width;
1193	dDisp;	1035	int old_height = szHint.height;
1194		1036
1195	window_calc (newwidth, newheight);	1037	window_calc (newwidth, newheight);
1196	XSetWMNormalHints (disp, parent[0], &szHint);	1038	XSetWMNormalHints (xdisp, parent[0], &szHint);
1197		1039
1198	if (!ignoreparent)	1040	if (!ignoreparent)
1199	{	1041	{
1200	#ifdef SMART_RESIZE	1042	#ifdef SMART_RESIZE
1201	/*	1043	/*
…		…
1205	int x, y, x1, y1;	1047	int x, y, x1, y1;
1206	int dx, dy;	1048	int dx, dy;
1207	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1049	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1208	Window unused_cr;	1050	Window unused_cr;
1209		1051
1210	XTranslateCoordinates (disp, parent[0], display->root,	1052	XTranslateCoordinates (xdisp, parent[0], display->root,
1211	0, 0, &x, &y, &unused_cr);	1053	0, 0, &x, &y, &unused_cr);
1212	XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,	1054	XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1213	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1055	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1214	/*	1056	/*
1215	* if display->root isn't the parent window, a WM will probably have offset	1057	* if display->root isn't the parent window, a WM will probably have offset
1216	* our position for handles and decorations. Counter it	1058	* our position for handles and decorations. Counter it
1217	*/	1059	*/
…		…
1219	{	1061	{
1220	x -= x1;	1062	x -= x1;
1221	y -= y1;	1063	y -= y1;
1222	}	1064	}
1223		1065
1224	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1066	x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1225	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1067	y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1226	dx = old_width - szHint.width;	1068	dx = old_width - szHint.width;
1227	dy = old_height - szHint.height;	1069	dy = old_height - szHint.height;
1228		1070
1229	/* Check position of the center of the window */	1071	/* Check position of the center of the window */
1230	if (x < x1) /* left half */	1072	if (x < x1) /* left half */
1231	dx = 0;	1073	dx = 0;
…		…
1234	if (y < y1) /* top half */	1076	if (y < y1) /* top half */
1235	dy = 0;	1077	dy = 0;
1236	else if (y == y1) /* exact center */	1078	else if (y == y1) /* exact center */
1237	dy /= 2;	1079	dy /= 2;
1238		1080
1239	XMoveResizeWindow (disp, parent[0], x + dx, y + dy,	1081	XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1240	szHint.width, szHint.height);	1082	szHint.width, szHint.height);
1241	#else	1083	#else
1242	XResizeWindow (disp, parent[0], szHint.width, szHint.height);	1084	XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1243	#endif	1085	#endif
1244	}	1086	}
1245		1087
1246	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1088	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1247		1089
1248	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1090	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1249	{	1091	{
1250	if (scrollbar_visible ())	1092	if (scrollBar.state)
1251	{	1093	{
1252	XMoveResizeWindow (disp, scrollBar.win,	1094	XMoveResizeWindow (xdisp, scrollBar.win,
1253	window_sb_x, 0,	1095	window_sb_x, 0,
1254	scrollbar_TotalWidth (), szHint.height);	1096	scrollbar_TotalWidth (), szHint.height);
1255	resize_scrollbar ();	1097	resize_scrollbar ();
1256	}	1098	}
1257		1099
1258	if (menubar_visible ())
1259	XMoveResizeWindow (disp, menuBar.win,
1260	window_vt_x, 0,
1261	width, menuBar_TotalHeight ());
1262
1263	XMoveResizeWindow (disp, vt,	1100	XMoveResizeWindow (xdisp, vt,
1264	window_vt_x, window_vt_y,	1101	window_vt_x, window_vt_y,
1265	width, height);	1102	width, height);
1266		1103
1267	scr_clear ();	1104	scr_clear ();
1268	#ifdef XPM_BACKGROUND	1105	#ifdef XPM_BACKGROUND
1269	resize_pixmap ();	1106	resize_pixmap ();
1270	#endif	1107	#endif
1271	}	1108	}
1272		1109
1273	if (fix_screen \|\| old_height == 0)	1110	if (fix_screen \|\| old_height == 0)
1274	{
1275	int curr_screen = -1;
1276	int old_ncol = prev_ncol;
1277
1278	/* scr_reset only works on the primary screen */
1279	if (old_height) /* this is not the first time through */
1280	{
1281	unsigned int ocol = ncol;
1282	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1283	curr_screen = scr_change_screen (PRIMARY);
1284	ncol = ocol;
1285	}
1286
1287	scr_reset ();	1111	scr_reset ();
1288
1289	if (curr_screen >= 0) /* this is not the first time through */
1290	{
1291	scr_change_screen (curr_screen);
1292	selection_check (old_ncol != ncol ? 4 : 0);
1293	}
1294	}
1295
1296	old_width = szHint.width;
1297	old_height = szHint.height;
1298		1112
1299	#ifdef XPM_BACKGROUND	1113	#ifdef XPM_BACKGROUND
1300	if (pixmap)	1114	if (pixmap)
1301	scr_touch (false);	1115	scr_touch (false);
1302	#endif	1116	#endif
…		…
1315	{	1129	{
1316	XWindowAttributes wattr;	1130	XWindowAttributes wattr;
1317		1131
1318	if (newwidth == 0 \|\| newheight == 0)	1132	if (newwidth == 0 \|\| newheight == 0)
1319	{	1133	{
1320	XGetWindowAttributes (display->display, display->root, &wattr);	1134	XGetWindowAttributes (xdisp, display->root, &wattr);
1321		1135
1322	if (newwidth == 0)	1136	if (newwidth == 0)
1323	newwidth = wattr.width - szHint.base_width;	1137	newwidth = wattr.width - szHint.base_width;
1324	if (newheight == 0)	1138	if (newheight == 0)
1325	newheight = wattr.height - szHint.base_height;	1139	newheight = wattr.height - szHint.base_height;
…		…
1339	#ifdef USE_XIM	1153	#ifdef USE_XIM
1340		1154
1341	void	1155	void
1342	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)	1156	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1343	{	1157	{
1344	fg = pix_colors[Color_fg];	1158	fg = pix_colors [Color_fg];
1345	bg = pix_colors[Color_bg];	1159	bg = pix_colors [Color_bg];
1346	}	1160	}
1347		1161
1348	void	1162	void
1349	rxvt_term::im_set_size (XRectangle &size)	1163	rxvt_term::im_set_size (XRectangle &size)
1350	{	1164	{
…		…
1387	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1201	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1388		1202
1389	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1203	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1390	*p = '\0';	1204	*p = '\0';
1391		1205
1392	atom = XInternAtom (display->display, server, False);	1206	atom = XInternAtom (xdisp, server, False);
1393	win = XGetSelectionOwner (display->display, atom);	1207	win = XGetSelectionOwner (xdisp, atom);
1394		1208
1395	if (win != None)	1209	if (win != None)
1396	return True;	1210	return True;
1397	}	1211	}
1398		1212
…		…
1405	XPoint nspot;	1219	XPoint nspot;
1406	XVaNestedList preedit_attr;	1220	XVaNestedList preedit_attr;
1407		1221
1408	if (!Input_Context	1222	if (!Input_Context
1409	\|\| !focus	1223	\|\| !focus
1410	\|\| !(input_style & XIMPreeditPosition))	1224	\|\| !(input_style & (XIMPreeditPosition \| XIMPreeditCallbacks)))
1411	return;	1225	return;
1412		1226
1413	im_set_position (nspot);	1227	im_set_position (nspot);
1414		1228
1415	if (nspot.x == spot.x && nspot.y == spot.y)	1229	if (nspot.x == spot.x && nspot.y == spot.y)
…		…
1434	input_method = 0;	1248	input_method = 0;
1435	}	1249	}
1436		1250
1437	Input_Context = 0;	1251	Input_Context = 0;
1438	}	1252	}
		1253
		1254	#ifdef ENABLE_XIM_ONTHESPOT
		1255
		1256	static void
		1257	xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
		1258	{
		1259	((rxvt_term *)client_data)->make_current ();
		1260	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
		1261	}
		1262
		1263	static void
		1264	xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
		1265	{
		1266	((rxvt_term *)client_data)->make_current ();
		1267	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
		1268	}
		1269
		1270	static void
		1271	xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
		1272	{
		1273	rxvt_term term = (rxvt_term )client_data;
		1274	XIMText *text = call_data->text;
		1275
		1276	term->make_current ();
		1277
		1278	if (text)
		1279	{
		1280	void *str;
		1281
		1282	if (!text->encoding_is_wchar && text->string.multi_byte)
		1283	{
		1284	// of course, X makes it ugly again
		1285	if (term->rs[Rs_imLocale])
		1286	SET_LOCALE (term->rs[Rs_imLocale]);
		1287
		1288	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
		1289	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
		1290
		1291	if (term->rs[Rs_imLocale])
		1292	SET_LOCALE (term->locale);
		1293	}
		1294	else
		1295	str = (void *)text->string.wide_char;
		1296
		1297	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1298	DT_INT, call_data->caret,
		1299	DT_INT, call_data->chg_first,
		1300	DT_INT, call_data->chg_length,
		1301	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
		1302	DT_WCS_LEN, str, str ? (int)text->length : 0,
		1303	DT_END));
		1304	}
		1305	else
		1306	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1307	DT_INT, call_data->caret,
		1308	DT_INT, call_data->chg_first,
		1309	DT_INT, call_data->chg_length,
		1310	DT_END));
		1311	}
		1312
		1313	#if 0
		1314	static void
		1315	xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
		1316	{
		1317	((rxvt_term *)client_data)->make_current ();
		1318	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
		1319	DT_INT, call_data->position,
		1320	DT_INT, call_data->direction,
		1321	DT_INT, call_data->style,
		1322	DT_END));
		1323	}
		1324	#endif
		1325
		1326	#endif
1439		1327
1440	/*	1328	/*
1441	* Try to open a XIM with the current modifiers, then see if we can	1329	* Try to open a XIM with the current modifiers, then see if we can
1442	* open a suitable preedit type	1330	* open a suitable preedit type
1443	*/	1331	*/
…		…
1450	XRectangle rect, status_rect, needed_rect;	1338	XRectangle rect, status_rect, needed_rect;
1451	unsigned long fg, bg;	1339	unsigned long fg, bg;
1452	const char *p;	1340	const char *p;
1453	char **s;	1341	char **s;
1454	XIMStyles *xim_styles;	1342	XIMStyles *xim_styles;
		1343	#ifdef ENABLE_XIM_ONTHESPOT
		1344	XIMCallback xcb[4];
		1345	#endif
1455		1346
1456	TEMP_ENV;	1347	set_environ (envv);
1457		1348
1458	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1349	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1459	return false;	1350	return false;
1460		1351
1461	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1462	input_method = display->get_xim (locale, modifiers);	1352	input_method = display->get_xim (locale, modifiers);
1463	if (input_method == NULL)	1353	if (input_method == NULL)
1464	return false;	1354	return false;
1465		1355
1466	xim = input_method->xim;	1356	xim = input_method->xim;
…		…
1486	s = rxvt_splitcommastring (p);	1376	s = rxvt_splitcommastring (p);
1487		1377
1488	for (i = found = 0; !found && s[i]; i++)	1378	for (i = found = 0; !found && s[i]; i++)
1489	{	1379	{
1490	if (!strcmp (s[i], "OverTheSpot"))	1380	if (!strcmp (s[i], "OverTheSpot"))
1491	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1381	input_style = XIMPreeditPosition \| XIMStatusNothing;
1492	else if (!strcmp (s[i], "OffTheSpot"))	1382	else if (!strcmp (s[i], "OffTheSpot"))
1493	input_style = (XIMPreeditArea \| XIMStatusArea);	1383	input_style = XIMPreeditArea \| XIMStatusArea;
1494	else if (!strcmp (s[i], "Root"))	1384	else if (!strcmp (s[i], "Root"))
1495	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1385	input_style = XIMPreeditNothing \| XIMStatusNothing;
1496	else if (!strcmp (s[i], "None"))	1386	else if (!strcmp (s[i], "None"))
1497	input_style = (XIMPreeditNone \| XIMStatusNone);	1387	input_style = XIMPreeditNone \| XIMStatusNone;
		1388	#ifdef ENABLE_XIM_ONTHESPOT
		1389	else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
		1390	input_style = XIMPreeditCallbacks \| XIMStatusNothing;
		1391	#endif
		1392	else
		1393	input_style = XIMPreeditNothing \| XIMStatusNothing;
1498		1394
1499	for (j = 0; j < xim_styles->count_styles; j++)	1395	for (j = 0; j < xim_styles->count_styles; j++)
1500	if (input_style == xim_styles->supported_styles[j])	1396	if (input_style == xim_styles->supported_styles[j])
1501	{	1397	{
1502	rxvt_freecommastring (s);	1398	rxvt_freecommastring (s);
…		…
1540	"*",	1436	"*",
1541	fheight,	1437	fheight,
1542	fheight + 1, fheight - 1,	1438	fheight + 1, fheight - 1,
1543	fheight - 2, fheight + 2);	1439	fheight - 2, fheight + 2);
1544		1440
1545	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,	1441	fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1546	&missing_charset_list, &missing_charset_count, &def_string);	1442	&missing_charset_list, &missing_charset_count, &def_string);
1547		1443
1548	if (missing_charset_list)	1444	if (missing_charset_list)
1549	XFreeStringList (missing_charset_list);	1445	XFreeStringList (missing_charset_list);
1550		1446
…		…
1591	XNBackground, bg,	1487	XNBackground, bg,
1592	XNArea, &status_rect,	1488	XNArea, &status_rect,
1593	XNFontSet, fs,	1489	XNFontSet, fs,
1594	NULL);	1490	NULL);
1595	}	1491	}
		1492	#if ENABLE_XIM_ONTHESPOT
		1493	else if (input_style & XIMPreeditCallbacks)
		1494	{
		1495	im_set_position (spot);
		1496
		1497	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
		1498	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
		1499	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
		1500	# if 0
		1501	xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
		1502	# endif
		1503
		1504	preedit_attr = XVaCreateNestedList (0,
		1505	XNSpotLocation, &spot,
		1506	XNPreeditStartCallback, &xcb[0],
		1507	XNPreeditDoneCallback , &xcb[1],
		1508	XNPreeditDrawCallback , &xcb[2],
		1509	# if 0
		1510	XNPreeditCaretCallback, &xcb[3],
		1511	# endif
		1512	NULL);
		1513	}
		1514	#endif
1596		1515
1597	Input_Context = XCreateIC (xim,	1516	Input_Context = XCreateIC (xim,
1598	XNInputStyle, input_style,	1517	XNInputStyle, input_style,
1599	XNClientWindow, vt,	1518	XNClientWindow, vt,
1600	XNFocusWindow, parent[0],	1519	XNFocusWindow, parent[0],
…		…
1603	status_attr ? XNStatusAttributes : NULL,	1522	status_attr ? XNStatusAttributes : NULL,
1604	status_attr, NULL);	1523	status_attr, NULL);
1605		1524
1606	if (preedit_attr) XFree (preedit_attr);	1525	if (preedit_attr) XFree (preedit_attr);
1607	if (status_attr) XFree (status_attr);	1526	if (status_attr) XFree (status_attr);
1608	if (fs) XFreeFontSet (display->display, fs);	1527	if (fs) XFreeFontSet (xdisp, fs);
1609		1528
1610	if (Input_Context == NULL)	1529	if (Input_Context == NULL)
1611	{	1530	{
1612	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1531	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1613	im_destroy ();	1532	im_destroy ();
1614	return false;	1533	return false;
1615	}	1534	}
1616		1535
		1536	#if 0
		1537	// unfortunately, only the focus window is used by XIM, hard to fix
		1538	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1539	vt_select_input ();
		1540	#endif
		1541
1617	if (input_style & XIMPreeditArea)	1542	if (input_style & XIMPreeditArea)
1618	IMSetStatusPosition ();	1543	IMSetStatusPosition ();
1619		1544
1620	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1621	return true;	1545	return true;
1622	}	1546	}
1623		1547
1624	void	1548	void
1625	rxvt_term::im_cb ()	1549	rxvt_term::im_cb ()
…		…
1627	int i;	1551	int i;
1628	const char *p;	1552	const char *p;
1629	char **s;	1553	char **s;
1630	char buf[IMBUFSIZ];	1554	char buf[IMBUFSIZ];
1631		1555
1632	SET_R (this);	1556	make_current ();
1633		1557
1634	im_destroy ();	1558	im_destroy ();
1635		1559
1636	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1637	if (Input_Context)	1560	if (Input_Context)
1638	return;	1561	return;
1639		1562
1640	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1563	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1641	if (rs[Rs_imLocale])	1564	if (rs[Rs_imLocale])
…		…
1714	XFree (preedit_attr);	1637	XFree (preedit_attr);
1715	XFree (status_attr);	1638	XFree (status_attr);
1716	}	1639	}
1717	#endif /* USE_XIM */	1640	#endif /* USE_XIM */
1718		1641
1719	/----------------------------------------------------------------------/
1720	rxvt_t rxvt_current_term;
1721
1722	/----------------------- end-of-file (C source) -----------------------/	1642	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.175 by root, Thu Jan 12 00:35:39 2006 UTC vs. Revision 1.216 by root, Wed Feb 1 21:15:33 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.175 by root, Thu Jan 12 00:35:39 2006 UTC vs.
Revision 1.216 by root, Wed Feb 1 21:15:33 2006 UTC