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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.238 by sasha, Fri Aug 3 05:33:04 2007 UTC vs.
Revision 1.319 by sf-exg, Sun Jan 24 21:53:13 2010 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
17	*	17	*
18	* This program is free software; you can redistribute it and/or modify	18	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	19	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
…		…
38	#include <limits>	38	#include <limits>
39		39
40	#include <csignal>	40	#include <csignal>
41	#include <cstring>	41	#include <cstring>
42		42
43	#ifdef TTY_GID_SUPPORT
44	# include <grp.h>
45	#endif
46
47	#ifdef HAVE_TERMIOS_H
48	# include <termios.h>	43	#include <termios.h>
		44
		45	#ifdef HAVE_XSETLOCALE
		46	# define X_LOCALE
		47	# include <X11/Xlocale.h>
		48	#else
		49	# ifdef HAVE_SETLOCALE
		50	# include <clocale>
		51	# endif
49	#endif	52	#endif
50		53
51	vector<rxvt_term *> rxvt_term::termlist;	54	vector<rxvt_term *> rxvt_term::termlist;
52		55
53	// used to tell global functions which terminal instance is "active"	56	// used to tell global functions which terminal instance is "active"
…		…
88	class rxvt_composite_vec rxvt_composite;	91	class rxvt_composite_vec rxvt_composite;
89		92
90	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)	93	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
91	{	94	{
92	compose_char *cc;	95	compose_char *cc;
93		96
94	// break compose chains, as stupid readline really likes to duplicate	97	// break compose chains, as stupid readline really likes to duplicate
95	// composing characters for some reason near the end of a line.	98	// composing characters for some reason near the end of a line.
96	cc = (*this)[c1];	99	cc = (*this)[c1];
97	while (cc)	100	while (cc)
98	{	101	{
…		…
147		150
148	}	151	}
149	#endif	152	#endif
150		153
151	rxvt_term::rxvt_term ()	154	rxvt_term::rxvt_term ()
152	:	155	{
		156	#if HAVE_BG_PIXMAP
		157	update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
		158	#endif
		159	#ifdef CURSOR_BLINK
		160	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
		161	#endif
		162	#ifdef TEXT_BLINK
		163	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
		164	#endif
		165	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		166	cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
		167	#endif
		168	#ifdef SELECTION_SCROLLING
		169	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
		170	#endif
		171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
		173	#endif
153	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
154	rootwin_ev (this, &rxvt_term::rootwin_cb),	175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
155	#endif	176	#endif
156	#if ENABLE_TRANSPARENCY	177	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
157	check_our_parents_ev(this, &rxvt_term::check_our_parents_cb),	178	#ifdef USE_XIM
158	#endif	179	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
159	#ifdef HAVE_SCROLLBARS
160	scrollbar_ev (this, &rxvt_term::x_cb),
161	#endif
162	#ifdef CURSOR_BLINK
163	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
164	#endif
165	#ifdef TEXT_BLINK
166	text_blink_ev (this, &rxvt_term::text_blink_cb),
167	#endif
168	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
169	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
170	#endif
171	#ifdef SELECTION_SCROLLING
172	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
173	#endif
174	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
176	#endif	180	#endif
177	#ifdef POINTER_BLANK	181	#ifdef POINTER_BLANK
178	pointer_ev (this, &rxvt_term::pointer_cb),	182	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
179	#endif	183	#endif
180	#ifdef USE_XIM
181	im_ev (this, &rxvt_term::im_cb),
182	#endif
183	#ifndef NO_BELL	184	#ifndef NO_BELL
184	bell_ev (this, &rxvt_term::bell_cb),	185	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
185	#endif	186	#endif
186	termwin_ev (this, &rxvt_term::x_cb),	187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
187	vt_ev (this, &rxvt_term::x_cb),	188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
188	child_ev (this, &rxvt_term::child_cb),	189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
189	check_ev (this, &rxvt_term::check_cb),	190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
190	flush_ev (this, &rxvt_term::flush_cb),	191	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
191	destroy_ev (this, &rxvt_term::destroy_cb),	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
192	pty_ev (this, &rxvt_term::pty_cb),	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193	incr_ev (this, &rxvt_term::incr_cb)	194
194	{
195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196		196
197	termlist.push_back (this);	197	termlist.push_back (this);
198		198
199	#ifdef KEYSYM_RESOURCE	199	#ifdef KEYSYM_RESOURCE
…		…
201	#endif	201	#endif
202	}	202	}
203		203
204	// clean up the most important stuff, do not call x or free mem etc.	204	// clean up the most important stuff, do not call x or free mem etc.
205	// for use before an emergency exit	205	// for use before an emergency exit
		206	void
206	void rxvt_term::emergency_cleanup ()	207	rxvt_term::emergency_cleanup ()
207	{	208	{
208	if (cmd_pid)	209	if (cmd_pid)
209	kill (-cmd_pid, SIGHUP);	210	kill (-cmd_pid, SIGHUP);
210		211
211	pty_ev.stop ();	212	pty_ev.stop ();
…		…
223	if (fontset[i] != fontset[0])	224	if (fontset[i] != fontset[0])
224	delete fontset[i];	225	delete fontset[i];
225	#endif	226	#endif
226	delete fontset[0];	227	delete fontset[0];
227		228
		229	#ifdef HAVE_BG_PIXMAP
		230	bgPixmap.destroy ();
		231	#endif
		232	#ifdef HAVE_AFTERIMAGE
		233	if (asv)
		234	destroy_asvisual (asv, 0);
		235	if (asimman)
		236	destroy_image_manager (asimman, 0);
		237	#endif
		238
228	if (display)	239	if (display)
229	{	240	{
230	selection_clear ();	241	selection_clear ();
		242	selection_clear (true);
231		243
232	#ifdef USE_XIM	244	#ifdef USE_XIM
233	im_destroy ();	245	im_destroy ();
234	#endif	246	#endif
235	#ifdef XTERM_SCROLLBAR	247	scrollBar.destroy ();
236	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
237	if (ShadowGC) XFreeGC (dpy, ShadowGC);
238	#endif
239	#ifdef PLAIN_SCROLLBAR
240	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
241	#endif
242	#ifdef NEXT_SCROLLBAR
243	if (blackGC) XFreeGC (dpy, blackGC);
244	if (whiteGC) XFreeGC (dpy, whiteGC);
245	if (grayGC) XFreeGC (dpy, grayGC);
246	if (darkGC) XFreeGC (dpy, darkGC);
247	if (stippleGC) XFreeGC (dpy, stippleGC);
248	if (dimple) XFreePixmap (dpy, dimple);
249	if (upArrow) XFreePixmap (dpy, upArrow);
250	if (downArrow) XFreePixmap (dpy, downArrow);
251	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
252	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
253	#endif
254	#ifdef RXVT_SCROLLBAR
255	if (topShadowGC) XFreeGC (dpy, topShadowGC);
256	if (botShadowGC) XFreeGC (dpy, botShadowGC);
257	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
258	#endif
259	if (gc) XFreeGC (dpy, gc);	248	if (gc) XFreeGC (dpy, gc);
260		249
261	delete drawable;	250	delete drawable;
262	// destroy all windows	251	// destroy all windows
263	if (parent[0])	252	if (parent[0])
…		…
271	pix_colors_unfocused [i].free (this);	260	pix_colors_unfocused [i].free (this);
272	#endif	261	#endif
273	}	262	}
274		263
275	clear ();	264	clear ();
276	}
277		265
278	delete [] pix_colors_focused;	266	display->flush (); /* ideally .put should do this */
279	#if OFF_FOCUS_FADING
280	delete [] pix_colors_unfocused;
281	#endif
282
283	displays.put (display);	267	displays.put (display);
		268	}
284		269
285	scr_release ();	270	scr_release ();
286		271
287	/* clear all resources */	272	/* clear all resources */
288	for (int i = 0; i < allocated.size (); i++)	273	for (int i = 0; i < allocated.size (); i++)
289	free (allocated [i]);	274	free (allocated [i]);
290		275
291	free (selection.text);	276	free (selection.text);
		277	free (selection.clip_text);
292	// TODO: manage env vars in child only(!)	278	// TODO: manage env vars in child only(!)
293	free (env_display);	279	free (env_display);
294	free (env_term);	280	free (env_term);
295	free (locale);	281	free (locale);
296	free (v_buffer);	282	free (v_buffer);
…		…
300	delete argv;	286	delete argv;
301		287
302	#ifdef KEYSYM_RESOURCE	288	#ifdef KEYSYM_RESOURCE
303	delete keyboard;	289	delete keyboard;
304	#endif	290	#endif
		291	#ifndef NO_RESOURCES
		292	XrmDestroyDatabase (option_db);
		293	#endif
305	}	294	}
306		295
307	// child has exited, usually destroys	296	// child has exited, usually destroys
308	void	297	void
309	rxvt_term::child_cb (child_watcher &w, int status)	298	rxvt_term::child_cb (ev::child &w, int status)
310	{	299	{
311	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	300	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312		301
313	cmd_pid = 0;	302	cmd_pid = 0;
314		303
…		…
317	}	306	}
318		307
319	void	308	void
320	rxvt_term::destroy ()	309	rxvt_term::destroy ()
321	{	310	{
322	if (destroy_ev.active)	311	if (destroy_ev.is_active ())
323	return;	312	return;
324		313
325	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	314	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326		315
327	#if ENABLE_OVERLAY	316	#if ENABLE_OVERLAY
…		…
331	if (display)	320	if (display)
332	{	321	{
333	#if USE_XIM	322	#if USE_XIM
334	im_ev.stop (display);	323	im_ev.stop (display);
335	#endif	324	#endif
336	#if HAVE_SCROLLBARS
337	scrollbar_ev.stop (display);	325	scrollbar_ev.stop (display);
338	#endif
339	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	326	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
340	rootwin_ev.stop (display);	327	rootwin_ev.stop (display);
341	#endif	328	#endif
342	incr_ev.stop ();	329	incr_ev.stop ();
343	termwin_ev.stop (display);	330	termwin_ev.stop (display);
344	vt_ev.stop (display);	331	vt_ev.stop (display);
345	}	332	}
346		333
347	check_ev.stop ();	334	flush_ev.stop ();
348	pty_ev.stop ();	335	pty_ev.stop ();
349	#ifdef CURSOR_BLINK	336	#ifdef CURSOR_BLINK
350	cursor_blink_ev.stop ();	337	cursor_blink_ev.stop ();
351	#endif	338	#endif
352	#ifdef TEXT_BLINK	339	#ifdef TEXT_BLINK
…		…
360	#endif	347	#endif
361	#ifdef POINTER_BLANK	348	#ifdef POINTER_BLANK
362	pointer_ev.stop ();	349	pointer_ev.stop ();
363	#endif	350	#endif
364		351
365	destroy_ev.start (0);	352	destroy_ev.start ();
366	}	353	}
367		354
368	void	355	void
369	rxvt_term::destroy_cb (time_watcher &w)	356	rxvt_term::destroy_cb (ev::idle &w, int revents)
370	{	357	{
371	make_current ();	358	make_current ();
372		359
373	delete this;	360	delete this;
374	}	361	}
…		…
428	else	415	else
429	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	416	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430	mesg, BUFSIZ);	417	mesg, BUFSIZ);
431	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	418	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432	}	419	}
433	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	420	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434	mesg, BUFSIZ);	421	mesg, BUFSIZ);
435	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	422	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436	}	423	}
437	#endif	424	#endif
438		425
…		…
462	DisplayString (display));	449	DisplayString (display));
463	rxvt_emergency_cleanup ();	450	rxvt_emergency_cleanup ();
464	_exit (EXIT_FAILURE);	451	_exit (EXIT_FAILURE);
465	}	452	}
466		453
467	/----------------------------------------------------------------------/
468	bool
469	rxvt_term::init (int argc, const char const argv, stringvec *envv)
470	{
471	this->envv = envv;
472
473	SET_R (this);
474	set_locale ("");
475	set_environ (envv); // few things in X do not call setlocale :(
476
477	if (!init_vars ())
478	return false;
479
480	init_secondary ();
481
482	const char **cmd_argv = init_resources (argc, argv);
483
484	#ifdef KEYSYM_RESOURCE
485	keyboard->register_done ();
486	#endif
487
488	#ifdef HAVE_SCROLLBARS
489	if (option (Opt_scrollBar))
490	scrollBar.setIdle (); /* set existence for size calculations */
491	#endif
492
493	pty = ptytty::create ();
494
495	create_windows (argc, argv);
496
497	init_xlocale ();
498
499	scr_reset (); // initialize screen
500
501	#if 0
502	XSynchronize (dpy, True);
503	#endif
504
505	#ifdef HAVE_SCROLLBARS
506	if (option (Opt_scrollBar))
507	resize_scrollbar (); /* create and map scrollbar */
508	#endif
509	#ifdef ENABLE_TRANSPARENCY
510	if (option (Opt_transparent))
511	{
512	XSelectInput (dpy, display->root, PropertyChangeMask);
513	check_our_parents ();
514	rootwin_ev.start (display, display->root);
515	}
516	#endif
517	#if ENABLE_PERL
518	rootwin_ev.start (display, display->root);
519	#endif
520
521	set_colorfgbg ();
522
523	init_command (cmd_argv);
524
525	free (cmd_argv);
526
527	if (pty->pty >= 0)
528	pty_ev.start (pty->pty, EVENT_READ);
529
530	check_ev.start ();
531
532	HOOK_INVOKE ((this, HOOK_START, DT_END));
533
534	#if ENABLE_XEMBED
535	if (rs[Rs_embed])
536	{
537	long info[2] = { 0, XEMBED_MAPPED };
538
539	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
540	32, PropModeReplace, (unsigned char *)&info, 2);
541	}
542	#endif
543
544	XMapWindow (dpy, vt);
545	XMapWindow (dpy, parent[0]);
546
547	return true;
548	}
549
550	static struct sig_handlers	454	static struct sig_handlers
551	{	455	{
552	sig_watcher sw_term, sw_int;	456	ev::sig sw_term, sw_int;
553		457
554	/*	458	/*
555	* Catch a fatal signal and tidy up before quitting	459	* Catch a fatal signal and tidy up before quitting
556	*/	460	*/
557	void	461	void sig_term (ev::sig &w, int revents);
558	sig_term (sig_watcher &w)	462
		463	sig_handlers ()
559	{	464	{
560	rxvt_emergency_cleanup ();	465	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
561	signal (w.signum, SIG_DFL);
562	kill (getpid (), w.signum);
563	}
564
565	sig_handlers ()
566	: sw_term (this, &sig_handlers::sig_term),
567	sw_int (this, &sig_handlers::sig_term)	466	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
568	{
569	}	467	}
570	} sig_handlers;	468	} sig_handlers;
571		469
		470	void
		471	sig_handlers::sig_term (ev::sig &w, int revents)
		472	{
		473	rxvt_emergency_cleanup ();
		474	w.stop ();
		475	kill (getpid (), w.signum);
		476	}
		477
572	char **rxvt_environ; // startup environment	478	char **rxvt_environ; // startup environment
573		479
574	void	480	void
575	rxvt_init ()	481	rxvt_init ()
576	{	482	{
577	ptytty::init ();	483	ptytty::init ();
		484
		485	if (!ev_default_loop (0))
		486	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
578		487
579	rxvt_environ = environ;	488	rxvt_environ = environ;
580		489
581	signal (SIGHUP, SIG_IGN);	490	signal (SIGHUP, SIG_IGN);
582	signal (SIGPIPE, SIG_IGN);	491	signal (SIGPIPE, SIG_IGN);
583		492
584	sig_handlers.sw_term.start (SIGTERM);	493	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
585	sig_handlers.sw_int.start (SIGINT);	494	sig_handlers.sw_int.start (SIGINT); ev_unref ();
586		495
587	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	496	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
588	/* signal (SIGURG, SIG_DFL); */	497	/* signal (SIGURG, SIG_DFL); */
589		498
590	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	499	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
591	// TODO: handle this with exceptions and tolerate the memory loss	500	// TODO: handle this with exceptions and tolerate the memory loss
592	XSetIOErrorHandler (rxvt_xioerror_handler);	501	XSetIOErrorHandler (rxvt_xioerror_handler);
593		502
594	XrmInitialize ();	503	XrmInitialize ();
595	}
596
597	/* ------------------------------------------------------------------------- *
598	* MEMORY ALLOCATION WRAPPERS *
599	* ------------------------------------------------------------------------- */
600	void *
601	rxvt_malloc (size_t size)
602	{
603	void *p = malloc (size);
604
605	if (!p)
606	rxvt_fatal ("memory allocation failure. aborting.\n");
607
608	return p;
609	}
610
611	void *
612	rxvt_calloc (size_t number, size_t size)
613	{
614	void *p = calloc (number, size);
615
616	if (!p)
617	rxvt_fatal ("memory allocation failure. aborting.\n");
618
619	return p;
620	}
621
622	void *
623	rxvt_realloc (void *ptr, size_t size)
624	{
625	void *p = realloc (ptr, size);
626
627	if (!p)
628	rxvt_fatal ("memory allocation failure. aborting.\n");
629
630	return p;
631	}	504	}
632		505
633	/----------------------------------------------------------------------/	506	/----------------------------------------------------------------------/
634	/*	507	/*
635	* window size/position calculations for XSizeHint and other storage.	508	* window size/position calculations for XSizeHint and other storage.
…		…
637	*/	510	*/
638	void	511	void
639	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	512	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
640	{	513	{
641	short recalc_x, recalc_y;	514	short recalc_x, recalc_y;
642	int x, y, sb_w, flags;	515	int x, y, flags;
643	unsigned int w, h;	516	unsigned int w, h;
644	unsigned int max_width, max_height;	517	unsigned int max_width, max_height;
645		518
646	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	519	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
647	szHint.win_gravity = NorthWestGravity;	520	szHint.win_gravity = NorthWestGravity;
…		…
657	if (rs[Rs_geometry])	530	if (rs[Rs_geometry])
658	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	531	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
659		532
660	if (flags & WidthValue)	533	if (flags & WidthValue)
661	{	534	{
		535	if (!w)
		536	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		537
662	ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());	538	ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
663	szHint.flags \|= USSize;	539	szHint.flags \|= USSize;
664	}	540	}
665		541
666	if (flags & HeightValue)	542	if (flags & HeightValue)
667	{	543	{
		544	if (!h)
		545	rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
		546
668	nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());	547	nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
669	szHint.flags \|= USSize;	548	szHint.flags \|= USSize;
670	}	549	}
671		550
672	if (flags & XValue)	551	if (flags & XValue)
673	{	552	{
…		…
704	max_width = MAX_COLS * fwidth;	583	max_width = MAX_COLS * fwidth;
705	max_height = MAX_ROWS * fheight;	584	max_height = MAX_ROWS * fheight;
706		585
707	szHint.base_width = szHint.base_height = 2 * int_bwidth;	586	szHint.base_width = szHint.base_height = 2 * int_bwidth;
708		587
709	sb_w = 0;
710	window_vt_x = window_vt_y = int_bwidth;	588	window_vt_x = window_vt_y = int_bwidth;
711		589
712	if (scrollBar.state)	590	if (scrollBar.state)
713	{	591	{
714	sb_w = scrollbar_TotalWidth ();	592	int sb_w = scrollBar.total_width ();
715	szHint.base_width += sb_w;	593	szHint.base_width += sb_w;
716		594
717	if (!option (Opt_scrollBar_right))	595	if (!option (Opt_scrollBar_right))
718	window_vt_x += sb_w;	596	window_vt_x += sb_w;
719	}	597	}
…		…
743	{	621	{
744	min_it (height, max_height);	622	min_it (height, max_height);
745	szHint.height = szHint.base_height + height;	623	szHint.height = szHint.base_height + height;
746	}	624	}
747		625
748	if (scrollBar.state && option (Opt_scrollBar_right))
749	window_sb_x = szHint.width - sb_w;
750
751	if (recalc_x)	626	if (recalc_x)
752	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	627	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
753		628
754	if (recalc_y)	629	if (recalc_y)
755	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;	630	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
756		631
757	ncol = width / fwidth;	632	ncol = width / fwidth;
758	nrow = height / fheight;	633	nrow = height / fheight;
759	}	634	}
760		635
761	/----------------------------------------------------------------------/	636	/----------------------------------------------------------------------/
762	/*	637	/*
…		…
773		648
774	ws.ws_col = ncol;	649	ws.ws_col = ncol;
775	ws.ws_row = nrow;	650	ws.ws_row = nrow;
776	ws.ws_xpixel = width;	651	ws.ws_xpixel = width;
777	ws.ws_ypixel = height;	652	ws.ws_ypixel = height;
778	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	653	ioctl (pty->pty, TIOCSWINSZ, &ws);
779		654
780	#if 0	655	#if 0
781	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	656	// TIOCSWINSZ is supposed to do this automatically and correctly
782	if (cmd_pid) /* force through to the command */	657	if (cmd_pid) /* force through to the command */
783	kill (-cmd_pid, SIGWINCH);	658	kill (-cmd_pid, SIGWINCH);
784	#endif	659	#endif
785	}	660	}
786		661
…		…
815	delete fontset[0];	690	delete fontset[0];
816	fontset[0] = fs;	691	fontset[0] = fs;
817		692
818	prop = (*fs)[1]->properties ();	693	prop = (*fs)[1]->properties ();
819	prop.height += lineSpace;	694	prop.height += lineSpace;
		695	prop.width += letterSpace;
820		696
821	fs->set_prop (prop, false);	697	fs->set_prop (prop, false);
822		698
823	fwidth = prop.width;	699	fwidth = prop.width;
824	fheight = prop.height;	700	fheight = prop.height;
…		…
860	if (parent[0])	736	if (parent[0])
861	{	737	{
862	resize_all_windows (0, 0, 0);	738	resize_all_windows (0, 0, 0);
863	scr_remap_chars ();	739	scr_remap_chars ();
864	scr_touch (true);	740	scr_touch (true);
865	}	741	}
866		742
867	return true;	743	return true;
868	}	744	}
869		745
		746	void
870	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	747	rxvt_term::set_string_property (Atom prop, const char *str, int len)
871	{	748	{
872	XChangeProperty (dpy, parent[0],	749	XChangeProperty (dpy, parent[0],
873	prop, XA_STRING, 8, PropModeReplace,	750	prop, XA_STRING, 8, PropModeReplace,
874	(const unsigned char *)str, len >= 0 ? len : strlen (str));	751	(const unsigned char *)str, len >= 0 ? len : strlen (str));
875	}	752	}
876		753
		754	void
877	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	755	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
878	{	756	{
879	wchar_t *ws = rxvt_mbstowcs (str, len);	757	wchar_t *ws = rxvt_mbstowcs (str, len);
880	char *s = rxvt_wcstoutf8 (ws);	758	char *s = rxvt_wcstoutf8 (ws);
881		759
882	XChangeProperty (dpy, parent[0],	760	XChangeProperty (dpy, parent[0],
…		…
906	#if ENABLE_EWMH	784	#if ENABLE_EWMH
907	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	785	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
908	#endif	786	#endif
909	}	787	}
910		788
		789	void
		790	rxvt_term::set_window_color (int idx, const char *color)
		791	{
911	#ifdef XTERM_COLOR_CHANGE	792	#ifdef XTERM_COLOR_CHANGE
912	void
913	rxvt_term::set_window_color (int idx, const char *color)
914	{
915	rxvt_color xcol;	793	rxvt_color xcol;
916	int i;	794
917
918	if (color == NULL \|\| *color == '\0')	795	if (color == NULL \|\| *color == '\0')
919	return;	796	return;
920		797
921	color = strdup (color);	798	color = strdup (color);
922	allocated.push_back ((void *)color);	799	allocated.push_back ((void *)color);
923	rs[Rs_color + idx] = color;	800	rs[Rs_color + idx] = color;
924		801
925	/* handle color aliases */	802	/* handle color aliases */
926	if (isdigit (*color))	803	if (isdigit (*color))
927	{	804	{
928	i = atoi (color);	805	int i = atoi (color);
929		806
930	if (i >= 8 && i <= 15)	807	if (i >= 8 && i <= 15)
		808	{
931	{ /* bright colors */	809	/* bright colors */
932	i -= 8;
933	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	810	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
934	goto done;	811	goto done;
935	}	812	}
936		813
937	if (i >= 0 && i <= 7)	814	if (i >= 0 && i <= 7)
		815	{
938	{ /* normal colors */	816	/* normal colors */
939	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	817	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
940	goto done;	818	goto done;
941	}	819	}
942	}	820	}
943		821
…		…
948	* so just keep gobbling up the colormap	826	* so just keep gobbling up the colormap
949	*/	827	*/
950		828
951	pix_colors_focused[idx] = xcol;	829	pix_colors_focused[idx] = xcol;
952		830
953	/* XSetWindowAttributes attr; */
954	/* Cursor cursor; */
955	done:	831	done:
956	/TODO: handle Color_BD, scrollbar background, etc. /	832	/TODO: handle Color_BD, scrollbar background, etc. /
957		833
958	update_fade_color (idx);	834	update_fade_color (idx);
959	recolour_cursor ();	835	recolour_cursor ();
960	scr_recolour ();	836	scr_recolour ();
		837	#endif /* XTERM_COLOR_CHANGE */
961	}	838	}
962
963	#else
964	# define set_window_color (idx,color) ((void)0)
965	#endif /* XTERM_COLOR_CHANGE */
966		839
967	void	840	void
968	rxvt_term::recolour_cursor ()	841	rxvt_term::recolour_cursor ()
969	{	842	{
970	XColor fg, bg;	843	XColor fg, bg;
…		…
986	*/	859	*/
987	void	860	void
988	rxvt_term::set_colorfgbg ()	861	rxvt_term::set_colorfgbg ()
989	{	862	{
990	unsigned int i;	863	unsigned int i;
991	const char *xpmb = "\0";	864	const char *xpmb = "";
992	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	865	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
993		866
994	strcpy (fstr, "default");	867	strcpy (fstr, "default");
995	strcpy (bstr, "default");	868	strcpy (bstr, "default");
996	for (i = Color_Black; i <= Color_White; i++)	869	for (i = Color_Black; i <= Color_White; i++)
…		…
1002		875
1003	for (i = Color_Black; i <= Color_White; i++)	876	for (i = Color_Black; i <= Color_White; i++)
1004	if (pix_colors[Color_bg] == pix_colors[i])	877	if (pix_colors[Color_bg] == pix_colors[i])
1005	{	878	{
1006	sprintf (bstr, "%d", (i - Color_Black));	879	sprintf (bstr, "%d", (i - Color_Black));
1007	#ifdef XPM_BACKGROUND	880	#ifdef BG_IMAGE_FROM_FILE
1008	xpmb = "default;";	881	xpmb = "default;";
1009	#endif	882	#endif
1010	break;	883	break;
1011	}	884	}
1012		885
…		…
1041	int old_width = szHint.width;	914	int old_width = szHint.width;
1042	int old_height = szHint.height;	915	int old_height = szHint.height;
1043		916
1044	window_calc (newwidth, newheight);	917	window_calc (newwidth, newheight);
1045		918
1046	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))	919	bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
		920
		921	// to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
		922	if (set_hint)
		923	{
		924	szHint.flags &= ~(PBaseSize \| PResizeInc);
1047	XSetWMNormalHints (dpy, parent[0], &szHint);	925	XSetWMNormalHints (dpy, parent[0], &szHint);
		926	szHint.flags \|= PBaseSize \| PResizeInc;
		927	}
1048		928
1049	if (!ignoreparent)	929	if (!ignoreparent)
1050	{	930	{
1051	#ifdef SMART_RESIZE	931	#ifdef SMART_RESIZE
1052	/*	932	/*
…		…
1092	#else	972	#else
1093	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);	973	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1094	#endif	974	#endif
1095	}	975	}
1096		976
		977	if (set_hint)
		978	XSetWMNormalHints (dpy, parent[0], &szHint);
		979
1097	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	980	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1098		981
1099	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	982	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1100	{	983	{
1101	if (scrollBar.state)	984	if (scrollBar.state)
1102	{	985	scrollBar.resize ();
1103	XMoveResizeWindow (dpy, scrollBar.win,
1104	window_sb_x, 0,
1105	scrollbar_TotalWidth (), szHint.height);
1106	resize_scrollbar ();
1107	}
1108		986
1109	XMoveResizeWindow (dpy, vt,	987	XMoveResizeWindow (dpy, vt,
1110	window_vt_x, window_vt_y,	988	window_vt_x, window_vt_y,
1111	width, height);	989	width, height);
1112		990
1113	scr_clear ();	991	#ifdef HAVE_BG_PIXMAP
1114	#ifdef XPM_BACKGROUND	992	if (bgPixmap.window_size_sensitive ())
1115	resize_pixmap ();	993	update_background ();
1116	#endif	994	#endif
1117	}	995	}
1118		996
1119	if (fix_screen \|\| old_height == 0)	997	if (fix_screen \|\| old_height == 0)
1120	scr_reset ();	998	scr_reset ();
1121		999
1122	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version	1000	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1123	//scr_touch (false);	1001	//scr_touch (false);
1124		1002
1125	#if defined(XPM_BACKGROUND) \|\| defined(ENABLE_TRANSPARENCY)	1003	#ifdef HAVE_BG_PIXMAP
		1004	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1126	if (bgPixmap.pixmap)	1005	// if (bgPixmap.pixmap)
1127	scr_touch (false);	1006	// scr_touch (false);
1128	#endif	1007	#endif
1129		1008
1130	#ifdef USE_XIM	1009	#ifdef USE_XIM
1131	IMSetPosition ();	1010	IMSetPosition ();
1132	#endif	1011	#endif
…		…
1199		1078
1200	/* Checking whether input method is running. */	1079	/* Checking whether input method is running. */
1201	bool	1080	bool
1202	rxvt_term::IMisRunning ()	1081	rxvt_term::IMisRunning ()
1203	{	1082	{
1204	char *p;
1205	Atom atom;	1083	Atom atom;
1206	Window win;	1084	Window win;
1207	char server[IMBUFSIZ];	1085	char server[IMBUFSIZ];
1208		1086
1209	/* get current locale modifier */	1087	/* get current locale modifier */
1210	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1088	if (char *p = XSetLocaleModifiers (0))
1211	{	1089	{
1212	strcpy (server, "@server=");	1090	strcpy (server, "@server=");
1213	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1091	strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1214		1092
1215	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1093	if (p = strchr (server + 1, '@')) /* first one only */
1216	*p = '\0';	1094	*p = '\0';
1217		1095
1218	atom = XInternAtom (dpy, server, False);	1096	atom = XInternAtom (dpy, server, False);
1219	win = XGetSelectionOwner (dpy, atom);	1097	win = XGetSelectionOwner (dpy, atom);
1220		1098
…		…
1303	if (term->rs[Rs_imLocale])	1181	if (term->rs[Rs_imLocale])
1304	SET_LOCALE (term->locale);	1182	SET_LOCALE (term->locale);
1305	}	1183	}
1306	else	1184	else
1307	str = (void *)text->string.wide_char;	1185	str = (void *)text->string.wide_char;
1308		1186
1309	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1187	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1310	DT_INT, call_data->caret,	1188	DT_INT, call_data->caret,
1311	DT_INT, call_data->chg_first,	1189	DT_INT, call_data->chg_first,
1312	DT_INT, call_data->chg_length,	1190	DT_INT, call_data->chg_length,
1313	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1191	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1632		1510
1633	if (input_style & XIMPreeditPosition)	1511	if (input_style & XIMPreeditPosition)
1634	{	1512	{
1635	im_set_size (preedit_rect);	1513	im_set_size (preedit_rect);
1636	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1514	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1637		1515
1638	XSetICValues (Input_Context,	1516	XSetICValues (Input_Context,
1639	XNPreeditAttributes, preedit_attr, NULL);	1517	XNPreeditAttributes, preedit_attr, NULL);
1640	}	1518	}
1641	else	1519	else
1642	{	1520	{
…		…
1659	XFree (status_attr);	1537	XFree (status_attr);
1660	}	1538	}
1661		1539
1662	XFree (preedit_attr);	1540	XFree (preedit_attr);
1663	}	1541	}
1664	#endif /* USE_XIM */	1542	#endif /* USE_XIM */
		1543
		1544	void
		1545	rxvt_term::get_window_origin (int &x, int &y)
		1546	{
		1547	Window cr;
		1548	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1549	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
		1550	}
		1551
		1552	Pixmap
		1553	rxvt_term::get_pixmap_property (int prop_id)
		1554	{
		1555	if (prop_id > 0 && prop_id < NUM_XA)
		1556	if (xa[prop_id])
		1557	{
		1558	int aformat;
		1559	unsigned long nitems, bytes_after;
		1560	Atom atype;
		1561	unsigned char *prop = NULL;
		1562	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1563	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1564	&nitems, &bytes_after, &prop);
		1565	if (result == Success && prop && atype == XA_PIXMAP)
		1566	return (Pixmap )prop;
		1567	}
		1568
		1569	return None;
		1570	}
		1571
		1572	#ifdef HAVE_BG_PIXMAP
		1573	# if TRACE_PIXMAPS
		1574	# undef update_background
		1575	void
		1576	rxvt_term::trace_update_background (const char *file, int line)
		1577	{
		1578	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1579	update_background ();
		1580	}
		1581	# endif
		1582
		1583	void
		1584	rxvt_term::update_background ()
		1585	{
		1586	if (update_background_ev.is_active ())
		1587	return;
		1588
		1589	bgPixmap.invalidate ();
		1590
		1591	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
		1592
		1593	if (to_wait <= 0.)
		1594	bgPixmap.render ();
		1595	else
		1596	update_background_ev.start (to_wait);
		1597	}
		1598
		1599	void
		1600	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1601	{
		1602	make_current ();
		1603
		1604	update_background_ev.stop ();
		1605	bgPixmap.render ();
		1606	refresh_check ();
		1607	}
		1608
		1609	#endif /* HAVE_BG_PIXMAP */
1665		1610
1666	/----------------------- end-of-file (C source) -----------------------/	1611	/----------------------- 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.238 by sasha, Fri Aug 3 05:33:04 2007 UTC vs. Revision 1.319 by sf-exg, Sun Jan 24 21:53:13 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.238 by sasha, Fri Aug 3 05:33:04 2007 UTC vs.
Revision 1.319 by sf-exg, Sun Jan 24 21:53:13 2010 UTC