ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.304 by elmex, Tue Jun 13 11:01:04 2006 UTC vs.
Revision 1.336 by root, Sun Jul 23 16:46:06 2006 UTC

…		…
79	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
80	$FOCUS->emit (key_up => $_[0])	80	$FOCUS->emit (key_up => $_[0])
81	if $FOCUS;	81	if $FOCUS;
82	}	82	}
83		83
		84	sub check_hover {
		85	my ($widget) = @_;
		86
		87	if ($widget != $HOVER) {
		88	my $hover = $HOVER; $HOVER = $widget;
		89
		90	$hover->update if $hover && $hover->{can_hover};
		91	$HOVER->update if $HOVER && $HOVER->{can_hover};
		92
		93	$TOOLTIP_WATCHER->start;
		94	}
		95	}
		96
84	sub feed_sdl_button_down_event {	97	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	98	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	99	my ($x, $y) = ($ev->{x}, $ev->{y});
87		100
88	if (!$BUTTON_STATE) {	101	unless ($BUTTON_STATE) {
89	my $widget = $ROOT->find_widget ($x, $y);	102	my $widget = $ROOT->find_widget ($x, $y);
90		103
91	$GRAB = $widget;	104	$GRAB = $widget;
92	$GRAB->update if $GRAB;	105	$GRAB->update if $GRAB;
93		106
94	$TOOLTIP_WATCHER->cb->();	107	$TOOLTIP_WATCHER->cb->();
95	}	108	}
96		109
97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	110	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
98		111
99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	112	if ($GRAB) {
100	if $GRAB;	113	if ($ev->{button} == 4 || $ev->{button} == 5) {
		114	# mousewheel
		115	$ev->{dx} = 0;
		116	$ev->{dy} = $ev->{button} * 2 - 9;
		117	$GRAB->emit (mouse_wheel => $ev);
		118	} else {
		119	$GRAB->emit (button_down => $ev)
		120	}
		121	}
101	}	122	}
102		123
103	sub feed_sdl_button_up_event {	124	sub feed_sdl_button_up_event {
104	my ($ev) = @_;	125	my ($ev) = @_;
105	my ($x, $y) = ($ev->{x}, $ev->{y});
106		126
107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	127	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108		128
109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	129	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110		130
111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	131	$GRAB->emit (button_up => $ev)
112	if $GRAB;	132	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113		133
114	if (!$BUTTON_STATE) {	134	unless ($BUTTON_STATE) {
115	my $grab = $GRAB; undef $GRAB;	135	my $grab = $GRAB; undef $GRAB;
116	$grab->update if $grab;	136	$grab->update if $grab;
117	$GRAB->update if $GRAB;	137	$GRAB->update if $GRAB;
118		138
		139	check_hover $widget;
119	$TOOLTIP_WATCHER->cb->();	140	$TOOLTIP_WATCHER->cb->();
120	}	141	}
121	}	142	}
122		143
123	sub feed_sdl_motion_event {	144	sub feed_sdl_motion_event {
124	my ($ev) = @_;	145	my ($ev) = @_;
125	my ($x, $y) = ($ev->{x}, $ev->{y});	146	my ($x, $y) = ($ev->{x}, $ev->{y});
126		147
127	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	148	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128		149
129	if ($widget != $HOVER) {	150	check_hover $widget;
130	my $hover = $HOVER; $HOVER = $widget;
131		151
132	$hover->update if $hover && $hover->{can_hover};	152	$HOVER->emit (mouse_motion => $ev)
133	$HOVER->update if $HOVER && $HOVER->{can_hover};
134
135	$TOOLTIP_WATCHER->start;
136	}
137
138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139	if $HOVER;	153	if $HOVER;
140	}	154	}
141		155
142	# convert position array to integers	156	# convert position array to integers
143	sub harmonize {	157	sub harmonize {
…		…
189		203
190	}	204	}
191	}	205	}
192		206
193	reconfigure_widgets;	207	reconfigure_widgets;
		208	}
		209
		210	#############################################################################
		211
		212	package CFClient::UI::Event;
		213
		214	sub xy {
		215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
194	}	216	}
195		217
196	#############################################################################	218	#############################################################################
197		219
198	package CFClient::UI::Base;	220	package CFClient::UI::Base;
…		…
281	undef $HOVER if $HOVER == $self;	303	undef $HOVER if $HOVER == $self;
282		304
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	305	$CFClient::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	306	if $TOOLTIP->{owner} == $self;
285		307
286	$self->focus_out;	308	$self->emit ("focus_out");
287
288	$self->emit (visibility_change => 0);	309	$self->emit (visibility_change => 0);
289	}	310	}
290		311
291	sub set_visibility {	312	sub set_visibility {
292	my ($self, $visible) = @_;	313	my ($self, $visible) = @_;
…		…
336	sub size_request {	357	sub size_request {
337	require Carp;	358	require Carp;
338	Carp::confess "size_request is abstract";	359	Carp::confess "size_request is abstract";
339	}	360	}
340		361
		362	sub baseline_shift {
		363	0
		364	}
		365
341	sub configure {	366	sub configure {
342	my ($self, $x, $y, $w, $h) = @_;	367	my ($self, $x, $y, $w, $h) = @_;
343		368
344	if ($self->{aspect}) {	369	if ($self->{aspect}) {
345	my ($ow, $oh) = ($w, $h);	370	my ($ow, $oh) = ($w, $h);
346		371
347	$w = List::Util::min $w, int $h * $self->{aspect};	372	$w = List::Util::min $w, CFClient::ceil $h * $self->{aspect};
348	$h = List::Util::min $h, int $w / $self->{aspect};	373	$h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};
349		374
350	# use alignment to adjust x, y	375	# use alignment to adjust x, y
351		376
352	$x += int 0.5 * ($ow - $w);	377	$x += int 0.5 * ($ow - $w);
353	$y += int 0.5 * ($oh - $h);	378	$y += int 0.5 * ($oh - $h);
…		…
367		392
368	$self->{root}{size_alloc}{$self+0} = $self;	393	$self->{root}{size_alloc}{$self+0} = $self;
369	}	394	}
370	}	395	}
371		396
372	sub size_allocate {
373	# nothing to be done
374	}
375
376	sub children {	397	sub children {
377	# nop	398	# nop
378	}	399	}
379		400
380	sub visible_children {	401	sub visible_children {
…		…
408		429
409	# translate global coordinates to local coordinate system	430	# translate global coordinates to local coordinate system
410	sub coord2local {	431	sub coord2local {
411	my ($self, $x, $y) = @_;	432	my ($self, $x, $y) = @_;
412		433
		434	Carp::confess unless $self->{parent};#d#
		435
413	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	436	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414	}	437	}
415		438
416	# translate local coordinates to global coordinate system	439	# translate local coordinates to global coordinate system
417	sub coord2global {	440	sub coord2global {
418	my ($self, $x, $y) = @_;	441	my ($self, $x, $y) = @_;
419		442
		443	Carp::confess unless $self->{parent};#d#
		444
420	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	445	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421	}	446	}
422		447
423	sub focus_in {	448	sub invoke_focus_in {
424	my ($self) = @_;	449	my ($self) = @_;
425		450
426	return if $FOCUS == $self;	451	return if $FOCUS == $self;
427	return unless $self->{can_focus};	452	return unless $self->{can_focus};
428		453
429	my $focus = $FOCUS; $FOCUS = $self;	454	$FOCUS = $self;
430		455
431	$self->_emit (focus_in => $focus);	456	$self->update;
432		457
433	$focus->update if $focus;	458	0
434	$FOCUS->update;
435	}	459	}
436		460
437	sub focus_out {	461	sub invoke_focus_out {
438	my ($self) = @_;	462	my ($self) = @_;
439		463
440	return unless $FOCUS == $self;	464	return unless $FOCUS == $self;
441		465
442	my $focus = $FOCUS; undef $FOCUS;	466	undef $FOCUS;
443		467
444	$self->_emit (focus_out => $focus);	468	$self->update;
445		469
446	$focus->update if $focus; #?
447
448	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	470	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449	unless $FOCUS;	471	unless $FOCUS;
450	}
451		472
		473	0
		474	}
		475
		476	sub grab_focus {
		477	my ($self) = @_;
		478
		479	$FOCUS->emit ("focus_out") if $FOCUS;
		480	$self->emit ("focus_in");
		481	}
		482
452	sub mouse_motion { 0 }	483	sub invoke_mouse_motion { 0 }
453	sub button_up { 0 }	484	sub invoke_button_up { 0 }
454	sub key_down { 0 }	485	sub invoke_key_down { 0 }
455	sub key_up { 0 }	486	sub invoke_key_up { 0 }
		487	sub invoke_mouse_wheel { 0 }
456		488
457	sub button_down {	489	sub invoke_button_down {
458	my ($self, $ev, $x, $y) = @_;	490	my ($self, $ev, $x, $y) = @_;
459		491
460	$self->focus_in;	492	$self->grab_focus;
461		493
462	0	494	0
		495	}
		496
		497	sub connect {
		498	my ($self, $signal, $cb) = @_;
		499
		500	push @{ $self->{signal_cb}{$signal} }, $cb;
		501
		502	defined wantarray and CFClient::guard {
		503	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		504	@{ $self->{signal_cb}{$signal} };
		505	}
		506	}
		507
		508	my %has_coords = (
		509	button_down => 1,
		510	button_up => 1,
		511	mouse_motion => 1,
		512	mouse_wheel => 1,
		513	);
		514
		515	sub emit {
		516	my ($self, $signal, @args) = @_;
		517
		518	# I do not really like this solution, but I dislike duplication
		519	# and needlessly verbose code, too.
		520	my @append
		521	= $has_coords{$signal}
		522	? $args[0]->xy ($self)
		523	: ();
		524
		525	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		526
		527	#d##TODO# stop propagating at first true, do not use sum
		528	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
		529	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
		530	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463	}	531	}
464		532
465	sub find_widget {	533	sub find_widget {
466	my ($self, $x, $y) = @_;	534	my ($self, $x, $y) = @_;
467		535
…		…
477	sub set_parent {	545	sub set_parent {
478	my ($self, $parent) = @_;	546	my ($self, $parent) = @_;
479		547
480	Scalar::Util::weaken ($self->{parent} = $parent);	548	Scalar::Util::weaken ($self->{parent} = $parent);
481	$self->set_visible if $parent->{visible};	549	$self->set_visible if $parent->{visible};
482	}
483
484	sub connect {
485	my ($self, $signal, $cb) = @_;
486
487	push @{ $self->{signal_cb}{$signal} }, $cb;
488	}
489
490	sub _emit {
491	my ($self, $signal, @args) = @_;
492
493	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494	}
495
496	sub emit {
497	my ($self, $signal, @args) = @_;
498
499	$self->_emit ($signal, @args)
500	|| $self->$signal (@args);
501	}
502
503	sub visibility_change {
504	#my ($self, $visible) = @_;
505	}	550	}
506		551
507	sub realloc {	552	sub realloc {
508	my ($self) = @_;	553	my ($self) = @_;
509		554
…		…
542	return unless $self->{h} && $self->{w};	587	return unless $self->{h} && $self->{w};
543		588
544	# update screen rectangle	589	# update screen rectangle
545	local $draw_x = $draw_x + $self->{x};	590	local $draw_x = $draw_x + $self->{x};
546	local $draw_y = $draw_y + $self->{y};	591	local $draw_y = $draw_y + $self->{y};
547	local $draw_w = $draw_x + $self->{w};
548	local $draw_h = $draw_y + $self->{h};
549		592
550	# skip widgets that are entirely outside the drawing area	593	# skip widgets that are entirely outside the drawing area
551	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	594	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	595	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553		596
…		…
592	}	635	}
593		636
594	sub DESTROY {	637	sub DESTROY {
595	my ($self) = @_;	638	my ($self) = @_;
596		639
		640	return if CFClient::in_destruct;
		641
597	delete $WIDGET{$self+0};	642	delete $WIDGET{$self+0};
598		643
599	eval { $self->destroy };	644	eval { $self->destroy };
600	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	645	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
601	}	646	}
…		…
686	if $children;	731	if $children;
687		732
688	$self	733	$self
689	}	734	}
690		735
		736	sub realloc {
		737	my ($self) = @_;
		738
		739	$self->{force_realloc} = 1;
		740	$self->{force_size_alloc} = 1;
		741	$self->SUPER::realloc;
		742	}
		743
691	sub add {	744	sub add {
692	my ($self, @widgets) = @_;	745	my ($self, @widgets) = @_;
693		746
694	$_->set_parent ($self)	747	$_->set_parent ($self)
695	for @widgets;	748	for @widgets;
…		…
789		842
790	sub size_request {	843	sub size_request {
791	$_[0]{children}[0]->size_request	844	$_[0]{children}[0]->size_request
792	}	845	}
793		846
794	sub size_allocate {	847	sub invoke_size_allocate {
795	my ($self, $w, $h) = @_;	848	my ($self, $w, $h) = @_;
796		849
797	$self->{children}[0]->configure (0, 0, $w, $h);	850	$self->{children}[0]->configure (0, 0, $w, $h);
		851
		852	1
798	}	853	}
799		854
800	#############################################################################	855	#############################################################################
801		856
802	# back-buffered drawing area	857	# back-buffered drawing area
…		…
818		873
819	$ROOT->on_post_alloc ($self => sub { $self->render_child });	874	$ROOT->on_post_alloc ($self => sub { $self->render_child });
820	$self->SUPER::update;	875	$self->SUPER::update;
821	}	876	}
822		877
823	sub size_allocate {	878	sub invoke_size_allocate {
824	my ($self, $w, $h) = @_;	879	my ($self, $w, $h) = @_;
825		880
826	$self->SUPER::size_allocate ($w, $h);
827	$self->update;	881	$self->update;
		882
		883	$self->SUPER::invoke_size_allocate ($w, $h)
828	}	884	}
829		885
830	sub _render {	886	sub _render {
831	my ($self) = @_;	887	my ($self) = @_;
832		888
…		…
893	$h = 10 if $self->{scroll_y};	949	$h = 10 if $self->{scroll_y};
894		950
895	($w, $h)	951	($w, $h)
896	}	952	}
897		953
898	sub size_allocate {	954	sub invoke_size_allocate {
899	my ($self, $w, $h) = @_;	955	my ($self, $w, $h) = @_;
900		956
901	my $child = $self->child;	957	my $child = $self->child;
902		958
903	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	959	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	960	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905		961
906	$self->child->configure (0, 0, $w, $h);	962	$self->child->configure (0, 0, $w, $h);
907	$self->update;	963	$self->update;
		964
		965	1
908	}	966	}
909		967
910	sub set_offset {	968	sub set_offset {
911	my ($self, $x, $y) = @_;	969	my ($self, $x, $y) = @_;
912		970
…		…
975	$self->{vp}->set_offset (0, $_[1]);	1033	$self->{vp}->set_offset (0, $_[1]);
976	},	1034	},
977	;	1035	;
978		1036
979	$self = $class->SUPER::new (	1037	$self = $class->SUPER::new (
980	vp => (new CFClient::UI::ViewPort expand => 1),	1038	vp => (new CFClient::UI::ViewPort expand => 1),
		1039	can_events => 1,
981	slider => $slider,	1040	slider => $slider,
982	%arg,	1041	%arg,
983	);	1042	);
984		1043
985	$self->SUPER::add ($self->{vp}, $self->{slider});	1044	$self->SUPER::add ($self->{vp}, $self->{slider});
986	$self->add ($child) if $child;	1045	$self->add ($child) if $child;
987		1046
988	$self	1047	$self
989	}	1048	}
990		1049
		1050	#TODO# update range on size_allocate depending on child
		1051
991	sub add {	1052	sub add {
992	my ($self, $widget) = @_;	1053	my ($self, $widget) = @_;
993		1054
994	$self->{vp}->add ($self->{child} = $widget);	1055	$self->{vp}->add ($self->{child} = $widget);
995	}	1056	}
996		1057
		1058	sub invoke_mouse_wheel {
		1059	my ($self, $ev) = @_;
		1060
		1061	return 0 unless $ev->{dy}; # only vertical movements
		1062
		1063	$self->{slider}->emit (mouse_wheel => $ev);
		1064
		1065	1
		1066	}
		1067
		1068	sub update_slider {
		1069	my ($self) = @_;
		1070
		1071	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1072	}
		1073
997	sub update {	1074	sub update {
998	my ($self) = @_;	1075	my ($self) = @_;
999		1076
1000	$self->SUPER::update;	1077	$self->SUPER::update;
1001		1078
1002	# todo: overwrite size_allocate of child	1079	$self->update_slider;
1003	my $child = $self->{vp}->child;
1004	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005	}	1080	}
1006		1081
1007	sub size_allocate {	1082	sub invoke_size_allocate {
1008	my ($self, $w, $h) = @_;	1083	my ($self, $w, $h) = @_;
1009		1084
		1085	$self->update_slider;
		1086
1010	$self->SUPER::size_allocate ($w, $h);	1087	$self->SUPER::invoke_size_allocate ($w, $h)
1011
1012	my $child = $self->{vp}->child;
1013	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014	}	1088	}
1015
1016	#TODO# update range on size_allocate depending on child
1017	# update viewport offset on scroll
1018		1089
1019	#############################################################################	1090	#############################################################################
1020		1091
1021	package CFClient::UI::Frame;	1092	package CFClient::UI::Frame;
1022		1093
…		…
1078	my $self = $class->SUPER::new (	1149	my $self = $class->SUPER::new (
1079	bg => [1, 1, 1, 1],	1150	bg => [1, 1, 1, 1],
1080	border_bg => [1, 1, 1, 1],	1151	border_bg => [1, 1, 1, 1],
1081	border => 0.6,	1152	border => 0.6,
1082	can_events => 1,	1153	can_events => 1,
1083	min_w => 16,	1154	min_w => 64,
1084	min_h => 16,	1155	min_h => 32,
1085	%arg,	1156	%arg,
1086	);	1157	);
1087		1158
1088	$self->{title_widget} = new CFClient::UI::Label	1159	$self->{title_widget} = new CFClient::UI::Label
1089	align => 0,	1160	align => 0,
1090	valign => 1,	1161	valign => 1,
1091	text => $self->{title},	1162	text => $self->{title},
1092	fontsize => $self->{border},	1163	fontsize => $self->{border},
1093	if exists $self->{title};	1164	if exists $self->{title};
1094		1165
1095	unless ($self->{no_close_button}) {	1166	if ($self->{has_close_button}) {
1096	$self->{close_btn} =	1167	$self->{close_button} =
1097	new CFClient::UI::ImageButton	1168	new CFClient::UI::ImageButton
1098	image => 'x1_close.png',	1169	path => 'x1_close.png',
1099	on_activate => sub { $self->hide };	1170	on_activate => sub { $self->emit ("delete") };
1100		1171
1101	$self->CFClient::UI::Container::add ($self->{close_btn});	1172	$self->CFClient::UI::Container::add ($self->{close_button});
1102	}	1173	}
1103		1174
1104	$self	1175	$self
1105	}	1176	}
1106		1177
1107	sub add {	1178	sub add {
1108	my ($self, @widgets) = @_;	1179	my ($self, @widgets) = @_;
1109		1180
1110	$self->SUPER::add (@widgets);	1181	$self->SUPER::add (@widgets);
1111	$self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};	1182	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1183	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113	}	1184	}
1114		1185
1115	sub border {	1186	sub border {
1116	int $_[0]{border} * $::FONTSIZE	1187	int $_[0]{border} * $::FONTSIZE
…		…
1120	my ($self) = @_;	1191	my ($self) = @_;
1121		1192
1122	$self->{title_widget}->size_request	1193	$self->{title_widget}->size_request
1123	if $self->{title_widget};	1194	if $self->{title_widget};
1124		1195
1125	$self->{close_btn}->size_request	1196	$self->{close_button}->size_request
1126	if $self->{close_btn};	1197	if $self->{close_button};
1127		1198
1128	my ($w, $h) = $self->SUPER::size_request;	1199	my ($w, $h) = $self->SUPER::size_request;
1129		1200
1130	(	1201	(
1131	$w + $self->border * 2,	1202	$w + $self->border * 2,
1132	$h + $self->border * 2,	1203	$h + $self->border * 2,
1133	)	1204	)
1134	}	1205	}
1135		1206
1136	sub size_allocate {	1207	sub invoke_size_allocate {
1137	my ($self, $w, $h) = @_;	1208	my ($self, $w, $h) = @_;
1138		1209
1139	if ($self->{title_widget}) {	1210	if ($self->{title_widget}) {
1140	$self->{title_widget}{w} = $w;	1211	$self->{title_widget}{w} = $w;
1141	$self->{title_widget}{h} = $h;	1212	$self->{title_widget}{h} = $h;
1142	$self->{title_widget}->size_allocate ($w, $h);	1213	$self->{title_widget}->invoke_size_allocate ($w, $h);
1143	}	1214	}
1144		1215
1145	my $border = $self->border;	1216	my $border = $self->border;
1146		1217
1147	$h -= List::Util::max 0, $border * 2;	1218	$h -= List::Util::max 0, $border * 2;
1148	$w -= List::Util::max 0, $border * 2;	1219	$w -= List::Util::max 0, $border * 2;
1149		1220
1150	$self->child->configure ($border, $border, $w, $h);	1221	$self->child->configure ($border, $border, $w, $h);
1151		1222
1152	$self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border)	1223	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153	if $self->{close_btn};	1224	if $self->{close_button};
1154	}
1155		1225
		1226	1
		1227	}
		1228
		1229	sub invoke_delete {
		1230	my ($self) = @_;
		1231
		1232	$self->hide;
		1233
		1234	1
		1235	}
		1236
1156	sub button_down {	1237	sub invoke_button_down {
1157	my ($self, $ev, $x, $y) = @_;	1238	my ($self, $ev, $x, $y) = @_;
1158		1239
1159	my ($w, $h) = @$self{qw(w h)};	1240	my ($w, $h) = @$self{qw(w h)};
1160	my $border = $self->border;	1241	my $border = $self->border;
1161		1242
…		…
1192		1273
1193	($x, $y) = ($ev->{x}, $ev->{y});	1274	($x, $y) = ($ev->{x}, $ev->{y});
1194		1275
1195	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1276	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196	# HACK: the next line is required to enforce placement	1277	# HACK: the next line is required to enforce placement
1197	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1278	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1198	};	1279	};
1199	} else {	1280	} else {
1200	return 0;	1281	return 0;
1201	}	1282	}
1202		1283
1203	1	1284	1
1204	}	1285	}
1205		1286
1206	sub button_up {	1287	sub invoke_button_up {
1207	my ($self, $ev, $x, $y) = @_;	1288	my ($self, $ev, $x, $y) = @_;
1208		1289
1209	$self->{close_btn}->button_up ($ev, $x, $y)
1210	if $self->{close_btn};
1211
1212	!!delete $self->{motion}	1290	! ! delete $self->{motion}
1213	}	1291	}
1214		1292
1215	sub mouse_motion {	1293	sub invoke_mouse_motion {
1216	my ($self, $ev, $x, $y) = @_;	1294	my ($self, $ev, $x, $y) = @_;
1217		1295
1218	$self->{motion}->($ev, $x, $y) if $self->{motion};	1296	$self->{motion}->($ev, $x, $y) if $self->{motion};
1219		1297
1220	!!$self->{motion}	1298	! ! $self->{motion}
1221	}	1299	}
1222		1300
1223	sub _draw {	1301	sub _draw {
1224	my ($self) = @_;	1302	my ($self) = @_;
1225		1303
…		…
1258	$self->{title_widget}->_draw;	1336	$self->{title_widget}->_draw;
1259		1337
1260	glTranslate 0, - ($border - $self->{h});	1338	glTranslate 0, - ($border - $self->{h});
1261	}	1339	}
1262		1340
1263	$self->{close_btn}->draw	1341	$self->{close_button}->draw
1264	if $self->{close_btn};	1342	if $self->{close_button};
1265	}	1343	}
1266		1344
1267	#############################################################################	1345	#############################################################################
1268		1346
1269	package CFClient::UI::Table;	1347	package CFClient::UI::Table;
…		…
1286	sub children {	1364	sub children {
1287	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1365	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1288	}	1366	}
1289		1367
1290	sub add {	1368	sub add {
1291	my ($self, $x, $y, $child) = @_;	1369	my ($self) = shift;
1292		1370
		1371	while (@_) {
		1372	my ($x, $y, $child) = splice @_, 0, 3, ();
1293	$child->set_parent ($self);	1373	$child->set_parent ($self);
1294	$self->{children}[$y][$x] = $child;	1374	$self->{children}[$y][$x] = $child;
		1375	}
1295		1376
		1377	$self->{force_realloc} = 1;
		1378	$self->{force_size_alloc} = 1;
1296	$self->realloc;	1379	$self->realloc;
1297	}	1380	}
1298		1381
1299	sub remove {	1382	sub remove {
1300	my ($self, $child) = @_;	1383	my ($self, $child) = @_;
…		…
1348	(sum @$ws),	1431	(sum @$ws),
1349	(sum @$hs),	1432	(sum @$hs),
1350	)	1433	)
1351	}	1434	}
1352		1435
1353	sub size_allocate {	1436	sub invoke_size_allocate {
1354	my ($self, $w, $h) = @_;	1437	my ($self, $w, $h) = @_;
1355		1438
1356	my ($ws, $hs) = $self->get_wh;	1439	my ($ws, $hs) = $self->get_wh;
1357		1440
1358	my $req_w = (sum @$ws) || 1;	1441	my $req_w = (sum @$ws) || 1;
…		…
1390	}	1473	}
1391		1474
1392	$y += $row_h;	1475	$y += $row_h;
1393	}	1476	}
1394		1477
		1478	1
1395	}	1479	}
1396		1480
1397	sub find_widget {	1481	sub find_widget {
1398	my ($self, $x, $y) = @_;	1482	my ($self, $x, $y) = @_;
1399		1483
…		…
1436	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1520	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1521	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1438	)	1522	)
1439	}	1523	}
1440		1524
1441	sub size_allocate {	1525	sub invoke_size_allocate {
1442	my ($self, $w, $h) = @_;	1526	my ($self, $w, $h) = @_;
1443		1527
1444	my $space = $self->{vertical} ? $h : $w;	1528	my $space = $self->{vertical} ? $h : $w;
1445	my $children = $self->{children};	1529	my @children = $self->visible_children;
1446		1530
1447	my @req;	1531	my @req;
1448		1532
1449	if ($self->{homogeneous}) {	1533	if ($self->{homogeneous}) {
1450	@req = ($space / (@$children || 1)) x @$children;	1534	@req = ($space / (@children || 1)) x @children;
1451	} else {	1535	} else {
1452	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1536	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1453	my $req = List::Util::sum @req;	1537	my $req = List::Util::sum @req;
1454		1538
1455	if ($req > $space) {	1539	if ($req > $space) {
1456	# ah well, not enough space	1540	# ah well, not enough space
1457	$_ *= $space / $req for @req;	1541	$_ *= $space / $req for @req;
1458	} else {	1542	} else {
1459	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1543	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1460		1544
1461	$space = ($space - $req) / $expand; # remaining space to give away	1545	$space = ($space - $req) / $expand; # remaining space to give away
1462		1546
1463	$req[$_] += $space * $children->[$_]{expand}	1547	$req[$_] += $space * $children[$_]{expand}
1464	for 0 .. $#$children;	1548	for 0 .. $#children;
1465	}	1549	}
1466	}	1550	}
1467		1551
1468	CFClient::UI::harmonize \@req;	1552	CFClient::UI::harmonize \@req;
1469		1553
1470	my $pos = 0;	1554	my $pos = 0;
1471	for (0 .. $#$children) {	1555	for (0 .. $#children) {
1472	my $alloc = $req[$_];	1556	my $alloc = $req[$_];
1473	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1557	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1474		1558
1475	$pos += $alloc;	1559	$pos += $alloc;
1476	}	1560	}
1477		1561
1478	1	1562	1
…		…
1551	}	1635	}
1552		1636
1553	$self	1637	$self
1554	}	1638	}
1555		1639
1556	sub escape($) {
1557	local $_ = $_[0];
1558
1559	s/&/&amp;/g;
1560	s/>/&gt;/g;
1561	s/</&lt;/g;
1562
1563	$_
1564	}
1565
1566	sub update {	1640	sub update {
1567	my ($self) = @_;	1641	my ($self) = @_;
1568		1642
1569	delete $self->{texture};	1643	delete $self->{texture};
1570	$self->SUPER::update;	1644	$self->SUPER::update;
…		…
1581	my ($self, $text) = @_;	1655	my ($self, $text) = @_;
1582		1656
1583	return if $self->{text} eq "T$text";	1657	return if $self->{text} eq "T$text";
1584	$self->{text} = "T$text";	1658	$self->{text} = "T$text";
1585		1659
1586	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587	$self->{layout}->set_text ($text);	1660	$self->{layout}->set_text ($text);
1588		1661
1589	delete $self->{size_req};	1662	delete $self->{size_req};
1590	$self->realloc;	1663	$self->realloc;
1591	$self->update;	1664	$self->update;
…		…
1597	return if $self->{text} eq "M$markup";	1670	return if $self->{text} eq "M$markup";
1598	$self->{text} = "M$markup";	1671	$self->{text} = "M$markup";
1599		1672
1600	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1673	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601		1674
1602	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603	$self->{layout}->set_markup ($markup);	1675	$self->{layout}->set_markup ($markup);
1604		1676
1605	delete $self->{size_req};	1677	delete $self->{size_req};
1606	$self->realloc;	1678	$self->realloc;
1607	$self->update;	1679	$self->update;
…		…
1619		1691
1620	my ($w, $h) = $self->{layout}->size;	1692	my ($w, $h) = $self->{layout}->size;
1621		1693
1622	if (exists $self->{template}) {	1694	if (exists $self->{template}) {
1623	$self->{template}->set_font ($self->{font}) if $self->{font};	1695	$self->{template}->set_font ($self->{font}) if $self->{font};
		1696	$self->{template}->set_width ($self->{max_w} || -1);
1624	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1697	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625		1698
1626	my ($w2, $h2) = $self->{template}->size;	1699	my ($w2, $h2) = $self->{template}->size;
1627		1700
1628	$w = List::Util::max $w, $w2;	1701	$w = List::Util::max $w, $w2;
…		…
1633	};	1706	};
1634		1707
1635	@{ $self->{size_req} }	1708	@{ $self->{size_req} }
1636	}	1709	}
1637		1710
		1711	sub baseline_shift {
		1712	$_[0]{layout}->descent
		1713	}
		1714
1638	sub size_allocate {	1715	sub invoke_size_allocate {
1639	my ($self, $w, $h) = @_;	1716	my ($self, $w, $h) = @_;
1640		1717
1641	delete $self->{ox};	1718	delete $self->{ox};
1642		1719
1643	delete $self->{texture}	1720	delete $self->{texture}
1644	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1721	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1722
		1723	1
1645	}	1724	}
1646		1725
1647	sub set_fontsize {	1726	sub set_fontsize {
1648	my ($self, $fontsize) = @_;	1727	my ($self, $fontsize) = @_;
1649		1728
1650	$self->{fontsize} = $fontsize;	1729	$self->{fontsize} = $fontsize;
		1730	delete $self->{size_req};
1651	delete $self->{texture};	1731	delete $self->{texture};
1652		1732
1653	$self->realloc;	1733	$self->realloc;
1654	}	1734	}
1655		1735
1656	sub reconfigure {	1736	sub reconfigure {
1657	my ($self) = @_;	1737	my ($self) = @_;
1658		1738
1659	delete $self->{size_req};	1739	delete $self->{size_req};
		1740	delete $self->{texture};
1660		1741
1661	$self->SUPER::reconfigure;	1742	$self->SUPER::reconfigure;
1662	}	1743	}
1663		1744
1664	sub _draw {	1745	sub _draw {
1665	my ($self) = @_;	1746	my ($self) = @_;
1666		1747
1667	$self->SUPER::_draw; # draw background, if applicable	1748	$self->SUPER::_draw; # draw background, if applicable
1668		1749
1669	my $tex = $self->{texture} ||= do {	1750	my $size = $self->{texture} ||= do {
1670	$self->{layout}->set_foreground (@{$self->{fg}});	1751	$self->{layout}->set_foreground (@{$self->{fg}});
1671	$self->{layout}->set_font ($self->{font}) if $self->{font};	1752	$self->{layout}->set_font ($self->{font}) if $self->{font};
1672	$self->{layout}->set_width ($self->{w});	1753	$self->{layout}->set_width ($self->{w});
1673	$self->{layout}->set_ellipsise ($self->{ellipsise});	1754	$self->{layout}->set_ellipsise ($self->{ellipsise});
1674	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1755	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1756	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676		1757
1677	new_from_layout CFClient::Texture $self->{layout}	1758	[$self->{layout}->size]
1678	};	1759	};
1679		1760
1680	unless (exists $self->{ox}) {	1761	unless (exists $self->{ox}) {
1681	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1762	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1763	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683	: ($self->{w} - $tex->{w}) * 0.5);	1764	: ($self->{w} - $size->[0]) * 0.5);
1684		1765
1685	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1766	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1767	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687	: ($self->{h} - $tex->{h}) * 0.5);	1768	: ($self->{h} - $size->[1]) * 0.5);
1688	};	1769	};
1689		1770
1690	glEnable GL_TEXTURE_2D;
1691
1692	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1771	my $w = List::Util::min $self->{w} + 4, $size->[0];
1693	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1772	my $h = List::Util::min $self->{h} + 2, $size->[1];
1694		1773
1695	if ($tex->{format} == GL_ALPHA) {	1774	$self->{layout}->render ($self->{ox}, $self->{oy});
1696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697	glColor @{$self->{fg}};
1698	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699	} else {
1700	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702	}
1703
1704	glDisable GL_TEXTURE_2D;
1705	}	1775	}
1706		1776
1707	#############################################################################	1777	#############################################################################
1708		1778
1709	package CFClient::UI::EntryBase;	1779	package CFClient::UI::EntryBase;
…		…
1742		1812
1743	$text =~ s/./*/g if $self->{hidden};	1813	$text =~ s/./*/g if $self->{hidden};
1744	$self->{layout}->set_text ("$text ");	1814	$self->{layout}->set_text ("$text ");
1745	delete $self->{size_req};	1815	delete $self->{size_req};
1746		1816
1747	$self->_emit (changed => $self->{text});	1817	$self->emit (changed => $self->{text});
1748		1818
1749	$self->realloc;	1819	$self->realloc;
1750	$self->update;	1820	$self->update;
1751	}	1821	}
1752		1822
…		…
1767	my ($w, $h) = $self->SUPER::size_request;	1837	my ($w, $h) = $self->SUPER::size_request;
1768		1838
1769	($w + 1, $h) # add 1 for cursor	1839	($w + 1, $h) # add 1 for cursor
1770	}	1840	}
1771		1841
1772	sub key_down {	1842	sub invoke_key_down {
1773	my ($self, $ev) = @_;	1843	my ($self, $ev) = @_;
1774		1844
1775	my $mod = $ev->{mod};	1845	my $mod = $ev->{mod};
1776	my $sym = $ev->{sym};	1846	my $sym = $ev->{sym};
1777	my $uni = $ev->{unicode};	1847	my $uni = $ev->{unicode};
…		…
1789	} elsif ($sym == CFClient::SDLK_HOME) {	1859	} elsif ($sym == CFClient::SDLK_HOME) {
1790	$self->{cursor} = 0;	1860	$self->{cursor} = 0;
1791	} elsif ($sym == CFClient::SDLK_END) {	1861	} elsif ($sym == CFClient::SDLK_END) {
1792	$self->{cursor} = length $text;	1862	$self->{cursor} = length $text;
1793	} elsif ($uni == 27) {	1863	} elsif ($uni == 27) {
1794	$self->_emit ('escape');	1864	$self->emit ('escape');
1795	} elsif ($uni) {	1865	} elsif ($uni) {
1796	substr $text, $self->{cursor}++, 0, chr $uni;	1866	substr $text, $self->{cursor}++, 0, chr $uni;
1797	} else {	1867	} else {
1798	return 0;	1868	return 0;
1799	}	1869	}
…		…
1803	$self->realloc;	1873	$self->realloc;
1804		1874
1805	1	1875	1
1806	}	1876	}
1807		1877
1808	sub focus_in {	1878	sub invoke_focus_in {
1809	my ($self) = @_;	1879	my ($self) = @_;
1810		1880
1811	$self->{last_activity} = $::NOW;	1881	$self->{last_activity} = $::NOW;
1812		1882
1813	$self->SUPER::focus_in;	1883	$self->SUPER::invoke_focus_in
1814	}	1884	}
1815		1885
1816	sub button_down {	1886	sub invoke_button_down {
1817	my ($self, $ev, $x, $y) = @_;	1887	my ($self, $ev, $x, $y) = @_;
1818		1888
1819	$self->SUPER::button_down ($ev, $x, $y);	1889	$self->SUPER::invoke_button_down ($ev, $x, $y);
1820		1890
1821	my $idx = $self->{layout}->xy_to_index ($x, $y);	1891	my $idx = $self->{layout}->xy_to_index ($x, $y);
1822		1892
1823	# byte-index to char-index	1893	# byte-index to char-index
1824	my $text = $self->{text};	1894	my $text = $self->{text};
1825	utf8::encode $text;	1895	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826	$self->{cursor} = length substr $text, 0, $idx;	1896	$self->{cursor} = length $text;
1827		1897
1828	$self->_set_text ($self->{text});	1898	$self->_set_text ($self->{text});
1829	$self->update;	1899	$self->update;
1830		1900
1831	1	1901	1
1832	}	1902	}
1833		1903
1834	sub mouse_motion {	1904	sub invoke_mouse_motion {
1835	my ($self, $ev, $x, $y) = @_;	1905	my ($self, $ev, $x, $y) = @_;
1836	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1906	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837		1907
1838	0	1908	1
1839	}	1909	}
1840		1910
1841	sub _draw {	1911	sub _draw {
1842	my ($self) = @_;	1912	my ($self) = @_;
1843		1913
…		…
1884		1954
1885	our @ISA = CFClient::UI::EntryBase::;	1955	our @ISA = CFClient::UI::EntryBase::;
1886		1956
1887	use CFClient::OpenGL;	1957	use CFClient::OpenGL;
1888		1958
1889	sub key_down {	1959	sub invoke_key_down {
1890	my ($self, $ev) = @_;	1960	my ($self, $ev) = @_;
1891		1961
1892	my $sym = $ev->{sym};	1962	my $sym = $ev->{sym};
1893		1963
1894	if ($sym == 13) {	1964	if ($sym == 13) {
1895	unshift @{$self->{history}},	1965	unshift @{$self->{history}},
1896	my $txt = $self->get_text;	1966	my $txt = $self->get_text;
		1967
1897	$self->{history_pointer} = -1;	1968	$self->{history_pointer} = -1;
1898	$self->{history_saveback} = '';	1969	$self->{history_saveback} = '';
1899	$self->_emit (activate => $txt);	1970	$self->emit (activate => $txt);
1900	$self->update;	1971	$self->update;
1901		1972
1902	} elsif ($sym == CFClient::SDLK_UP) {	1973	} elsif ($sym == CFClient::SDLK_UP) {
1903	if ($self->{history_pointer} < 0) {	1974	if ($self->{history_pointer} < 0) {
1904	$self->{history_saveback} = $self->get_text;	1975	$self->{history_saveback} = $self->get_text;
…		…
1920	} else {	1991	} else {
1921	$self->set_text ($self->{history_saveback});	1992	$self->set_text ($self->{history_saveback});
1922	}	1993	}
1923		1994
1924	} else {	1995	} else {
1925	return $self->SUPER::key_down ($ev)	1996	return $self->SUPER::invoke_key_down ($ev)
1926	}	1997	}
1927		1998
1928	1	1999	1
1929	}	2000	}
1930		2001
…		…
1954	can_events => 1,	2025	can_events => 1,
1955	@_	2026	@_
1956	)	2027	)
1957	}	2028	}
1958		2029
1959	sub activate { }
1960
1961	sub button_up {	2030	sub invoke_button_up {
1962	my ($self, $ev, $x, $y) = @_;	2031	my ($self, $ev, $x, $y) = @_;
1963		2032
1964	$self->emit ("activate")	2033	$self->emit ("activate")
1965	if $x >= 0 && $x < $self->{w}	2034	if $x >= 0 && $x < $self->{w}
1966	&& $y >= 0 && $y < $self->{h};	2035	&& $y >= 0 && $y < $self->{h};
…		…
1980	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2049	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1981		2050
1982	glDisable GL_TEXTURE_2D;	2051	glDisable GL_TEXTURE_2D;
1983		2052
1984	$self->SUPER::_draw;	2053	$self->SUPER::_draw;
		2054	}
		2055
		2056	#############################################################################
		2057
		2058	package CFClient::UI::CheckBox;
		2059
		2060	our @ISA = CFClient::UI::DrawBG::;
		2061
		2062	my @tex =
		2063	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		2064	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2065
		2066	use CFClient::OpenGL;
		2067
		2068	sub new {
		2069	my $class = shift;
		2070
		2071	$class->SUPER::new (
		2072	padding_x => 2,
		2073	padding_y => 2,
		2074	fg => [1, 1, 1],
		2075	active_fg => [1, 1, 0],
		2076	bg => [0, 0, 0, 0.2],
		2077	active_bg => [1, 1, 1, 0.5],
		2078	state => 0,
		2079	can_hover => 1,
		2080	@_
		2081	)
		2082	}
		2083
		2084	sub size_request {
		2085	my ($self) = @_;
		2086
		2087	(6) x 2
		2088	}
		2089
		2090	sub toggle {
		2091	my ($self) = @_;
		2092
		2093	$self->{state} = !$self->{state};
		2094	$self->emit (changed => $self->{state});
		2095	$self->update;
		2096	}
		2097
		2098	sub invoke_button_down {
		2099	my ($self, $ev, $x, $y) = @_;
		2100
		2101	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2102	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2103	$self->toggle;
		2104	} else {
		2105	return 0
		2106	}
		2107
		2108	1
		2109	}
		2110
		2111	sub _draw {
		2112	my ($self) = @_;
		2113
		2114	$self->SUPER::_draw;
		2115
		2116	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2117
		2118	my ($w, $h) = @$self{qw(w h)};
		2119
		2120	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2121
		2122	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2123
		2124	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2125
		2126	glEnable GL_TEXTURE_2D;
		2127	$tex->draw_quad_alpha (0, 0, $s, $s);
		2128	glDisable GL_TEXTURE_2D;
		2129	}
		2130
		2131	#############################################################################
		2132
		2133	package CFClient::UI::Image;
		2134
		2135	our @ISA = CFClient::UI::Base::;
		2136
		2137	use CFClient::OpenGL;
		2138
		2139	our %texture_cache;
		2140
		2141	sub new {
		2142	my $class = shift;
		2143
		2144	my $self = $class->SUPER::new (
		2145	can_events => 0,
		2146	@_,
		2147	);
		2148
		2149	$self->{path} || $self->{tex}
		2150	or Carp::croak "'path' or 'tex' attributes required";
		2151
		2152	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2153	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
		2154
		2155	Scalar::Util::weaken $texture_cache{$self->{path}};
		2156
		2157	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2158
		2159	$self
		2160	}
		2161
		2162	sub STORABLE_freeze {
		2163	my ($self, $cloning) = @_;
		2164
		2165	$self->{path}
		2166	or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
		2167
		2168	$self->{path}
		2169	}
		2170
		2171	sub STORABLE_attach {
		2172	my ($self, $cloning, $path) = @_;
		2173
		2174	$self->new (path => $path)
		2175	}
		2176
		2177	sub size_request {
		2178	my ($self) = @_;
		2179
		2180	($self->{tex}{w}, $self->{tex}{h})
		2181	}
		2182
		2183	sub _draw {
		2184	my ($self) = @_;
		2185
		2186	my $tex = $self->{tex};
		2187
		2188	my ($w, $h) = ($self->{w}, $self->{h});
		2189
		2190	if ($self->{rot90}) {
		2191	glRotate 90, 0, 0, 1;
		2192	glTranslate 0, -$self->{w}, 0;
		2193
		2194	($w, $h) = ($h, $w);
		2195	}
		2196
		2197	glEnable GL_TEXTURE_2D;
		2198	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2199
		2200	$tex->draw_quad (0, 0, $w, $h);
		2201
		2202	glDisable GL_TEXTURE_2D;
1985	}	2203	}
1986		2204
1987	#############################################################################	2205	#############################################################################
1988		2206
1989	package CFClient::UI::ImageButton;	2207	package CFClient::UI::ImageButton;
…		…
2008	can_events => 1,	2226	can_events => 1,
2009	@_	2227	@_
2010	);	2228	);
2011	}	2229	}
2012		2230
2013	sub activate { }
2014
2015	sub button_up {	2231	sub invoke_button_up {
2016	my ($self, $ev, $x, $y) = @_;	2232	my ($self, $ev, $x, $y) = @_;
2017		2233
2018	$self->emit ("activate")	2234	$self->emit ("activate")
2019	if $x >= 0 && $x < $self->{w}	2235	if $x >= 0 && $x < $self->{w}
2020	&& $y >= 0 && $y < $self->{h};	2236	&& $y >= 0 && $y < $self->{h};
2021		2237
2022	1	2238	1
2023	}
2024
2025	#############################################################################
2026
2027	package CFClient::UI::CheckBox;
2028
2029	our @ISA = CFClient::UI::DrawBG::;
2030
2031	my @tex =
2032	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2033	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2034
2035	use CFClient::OpenGL;
2036
2037	sub new {
2038	my $class = shift;
2039
2040	$class->SUPER::new (
2041	padding_x => 2,
2042	padding_y => 2,
2043	fg => [1, 1, 1],
2044	active_fg => [1, 1, 0],
2045	bg => [0, 0, 0, 0.2],
2046	active_bg => [1, 1, 1, 0.5],
2047	state => 0,
2048	can_hover => 1,
2049	@_
2050	)
2051	}
2052
2053	sub size_request {
2054	my ($self) = @_;
2055
2056	(6) x 2
2057	}
2058
2059	sub button_down {
2060	my ($self, $ev, $x, $y) = @_;
2061
2062	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2063	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2064	$self->{state} = !$self->{state};
2065	$self->_emit (changed => $self->{state});
2066	} else {
2067	return 0
2068	}
2069
2070	1
2071	}
2072
2073	sub _draw {
2074	my ($self) = @_;
2075
2076	$self->SUPER::_draw;
2077
2078	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2079
2080	my ($w, $h) = @$self{qw(w h)};
2081
2082	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2083
2084	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2085
2086	my $tex = $self->{state} ? $tex[1] : $tex[0];
2087
2088	glEnable GL_TEXTURE_2D;
2089	$tex->draw_quad_alpha (0, 0, $s, $s);
2090	glDisable GL_TEXTURE_2D;
2091	}
2092
2093	#############################################################################
2094
2095	package CFClient::UI::Image;
2096
2097	our @ISA = CFClient::UI::Base::;
2098
2099	use CFClient::OpenGL;
2100	use Carp qw/confess/;
2101
2102	our %loaded_images;
2103
2104	sub new {
2105	my $class = shift;
2106
2107	my $self = $class->SUPER::new (can_events => 0, @_);
2108
2109	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
2110
2111	$loaded_images{$self->{image}} ||=
2112	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
2113
2114	my $tex = $self->{tex} = $loaded_images{$self->{image}};
2115
2116	Scalar::Util::weaken $loaded_images{$self->{image}};
2117
2118	$self->{aspect} = $tex->{w} / $tex->{h};
2119
2120	$self
2121	}
2122
2123	sub size_request {
2124	my ($self) = @_;
2125
2126	($self->{tex}->{w}, $self->{tex}->{h})
2127	}
2128
2129	sub _draw {
2130	my ($self) = @_;
2131
2132	my $tex = $self->{tex};
2133
2134	my ($w, $h) = ($self->{w}, $self->{h});
2135
2136	if ($self->{rot90}) {
2137	glRotate 90, 0, 0, 1;
2138	glTranslate 0, -$self->{w}, 0;
2139
2140	($w, $h) = ($h, $w);
2141	}
2142
2143	glEnable GL_TEXTURE_2D;
2144	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2145
2146	$tex->draw_quad_alpha (0, 0, $w, $h);
2147
2148	glDisable GL_TEXTURE_2D;
2149	}	2239	}
2150		2240
2151	#############################################################################	2241	#############################################################################
2152		2242
2153	package CFClient::UI::VGauge;	2243	package CFClient::UI::VGauge;
…		…
2240	my $ycut1 = max 0, min 1, $ycut;	2330	my $ycut1 = max 0, min 1, $ycut;
2241	my $ycut2 = max 0, min 1, $ycut - 1;	2331	my $ycut2 = max 0, min 1, $ycut - 1;
2242		2332
2243	my $h1 = $self->{h} * (1 - $ycut1);	2333	my $h1 = $self->{h} * (1 - $ycut1);
2244	my $h2 = $self->{h} * (1 - $ycut2);	2334	my $h2 = $self->{h} * (1 - $ycut2);
		2335	my $h3 = $self->{h};
		2336
		2337	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2245		2338
2246	glEnable GL_BLEND;	2339	glEnable GL_BLEND;
2247	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2340	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2341	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2249	glEnable GL_TEXTURE_2D;	2342	glEnable GL_TEXTURE_2D;
…		…
2268		2361
2269	if ($t3) {	2362	if ($t3) {
2270	glBindTexture GL_TEXTURE_2D, $t3->{name};	2363	glBindTexture GL_TEXTURE_2D, $t3->{name};
2271	glBegin GL_QUADS;	2364	glBegin GL_QUADS;
2272	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2365	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2273	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2366	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2274	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2367	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2275	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2368	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2276	glEnd;	2369	glEnd;
2277	}	2370	}
2278		2371
2279	glDisable GL_BLEND;	2372	glDisable GL_BLEND;
…		…
2367	$self->update;	2460	$self->update;
2368		2461
2369	$self	2462	$self
2370	}	2463	}
2371		2464
2372	sub changed { }
2373
2374	sub set_range {	2465	sub set_range {
2375	my ($self, $range) = @_;	2466	my ($self, $range) = @_;
2376		2467
2377	($range, $self->{range}) = ($self->{range}, $range);	2468	($range, $self->{range}) = ($self->{range}, $range);
2378		2469
…		…
2398	if $unit;	2489	if $unit;
2399		2490
2400	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2491	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401		2492
2402	if ($value != $old_value) {	2493	if ($value != $old_value) {
2403	$self->_emit (changed => $value);	2494	$self->emit (changed => $value);
2404	$self->update;	2495	$self->update;
2405	}	2496	}
2406	}	2497	}
2407		2498
2408	sub size_request {	2499	sub size_request {
2409	my ($self) = @_;	2500	my ($self) = @_;
2410		2501
2411	($self->{req_w}, $self->{req_h})	2502	($self->{req_w}, $self->{req_h})
2412	}	2503	}
2413		2504
2414	sub button_down {	2505	sub invoke_button_down {
2415	my ($self, $ev, $x, $y) = @_;	2506	my ($self, $ev, $x, $y) = @_;
2416		2507
2417	$self->SUPER::button_down ($ev, $x, $y);	2508	$self->SUPER::invoke_button_down ($ev, $x, $y);
2418		2509
2419	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2510	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420		2511
2421	$self->mouse_motion ($ev, $x, $y)	2512	$self->invoke_mouse_motion ($ev, $x, $y)
2422	}	2513	}
2423		2514
2424	sub mouse_motion {	2515	sub invoke_mouse_motion {
2425	my ($self, $ev, $x, $y) = @_;	2516	my ($self, $ev, $x, $y) = @_;
2426		2517
2427	if ($GRAB == $self) {	2518	if ($GRAB == $self) {
2428	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2519	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429		2520
…		…
2435	} else {	2526	} else {
2436	return 0;	2527	return 0;
2437	}	2528	}
2438		2529
2439	1	2530	1
		2531	}
		2532
		2533	sub invoke_mouse_wheel {
		2534	my ($self, $ev) = @_;
		2535
		2536	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2537
		2538	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2539
		2540	! ! $delta
2440	}	2541	}
2441		2542
2442	sub update {	2543	sub update {
2443	my ($self) = @_;	2544	my ($self) = @_;
2444		2545
…		…
2545	sub new {	2646	sub new {
2546	my $class = shift;	2647	my $class = shift;
2547		2648
2548	my $self = $class->SUPER::new (	2649	my $self = $class->SUPER::new (
2549	fontsize => 1,	2650	fontsize => 1,
2550	can_events => 0,	2651	can_events => 1,
2551	indent => 0,	2652	indent => 0,
2552	#font => default_font	2653	#font => default_font
2553	@_,	2654	@_,
2554		2655
2555	layout => (new CFClient::Layout 1),	2656	layout => (new CFClient::Layout),
2556	par => [],	2657	par => [],
2557	height => 0,	2658	height => 0,
2558	children => [	2659	children => [
2559	(new CFClient::UI::Empty expand => 1),	2660	(new CFClient::UI::Empty expand => 1),
2560	(new CFClient::UI::Slider vertical => 1),	2661	(new CFClient::UI::Slider vertical => 1),
…		…
2571		2672
2572	$self->{fontsize} = $fontsize;	2673	$self->{fontsize} = $fontsize;
2573	$self->reflow;	2674	$self->reflow;
2574	}	2675	}
2575		2676
		2677	sub size_request {
		2678	my ($self) = @_;
		2679
		2680	my ($empty, $slider) = @{ $self->{children} };
		2681
		2682	local $self->{children} = [$empty, $slider];
		2683	$self->SUPER::size_request
		2684	}
		2685
2576	sub size_allocate {	2686	sub invoke_size_allocate {
2577	my ($self, $w, $h) = @_;	2687	my ($self, $w, $h) = @_;
2578		2688
2579	$self->SUPER::size_allocate ($w, $h);	2689	my ($empty, $slider, @other) = @{ $self->{children} };
		2690	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2580		2691
2581	$self->{layout}->set_font ($self->{font}) if $self->{font};	2692	$self->{layout}->set_font ($self->{font}) if $self->{font};
2582	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2693	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583	$self->{layout}->set_width ($self->{children}[0]{w});	2694	$self->{layout}->set_width ($empty->{w});
2584	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2695	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585		2696
2586	$self->reflow;	2697	$self->reflow;
2587	}
2588		2698
2589	sub text_size {	2699	local $self->{children} = [$empty, $slider];
		2700	$self->SUPER::invoke_size_allocate ($w, $h)
		2701	}
		2702
		2703	sub invoke_mouse_wheel {
2590	my ($self, $text, $indent) = @_;	2704	my ($self, $ev) = @_;
		2705
		2706	return 0 unless $ev->{dy}; # only vertical movements
		2707
		2708	$self->{children}[1]->emit (mouse_wheel => $ev);
		2709
		2710	1
		2711	}
		2712
		2713	sub get_layout {
		2714	my ($self, $para) = @_;
2591		2715
2592	my $layout = $self->{layout};	2716	my $layout = $self->{layout};
2593		2717
		2718	$layout->set_font ($self->{font}) if $self->{font};
		2719	$layout->set_foreground (@{$para->{fg}});
2594	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2720	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595	$layout->set_width ($self->{children}[0]{w} - $indent);	2721	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2596	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2722	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597	$layout->set_markup ($text);	2723	$layout->set_markup ($para->{markup});
		2724
		2725	$layout->set_shapes (
		2726	map
		2727	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2728	@{$para->{widget}}
2598		2729	);
		2730
2599	$layout->size	2731	$layout
2600	}	2732	}
2601		2733
2602	sub reflow {	2734	sub reflow {
2603	my ($self) = @_;	2735	my ($self) = @_;
2604		2736
…		…
2613	$self->{children}[1]->set_value ($offset);	2745	$self->{children}[1]->set_value ($offset);
2614	}	2746	}
2615		2747
2616	sub clear {	2748	sub clear {
2617	my ($self) = @_;	2749	my ($self) = @_;
		2750
		2751	my (undef, undef, @other) = @{ $self->{children} };
		2752	$self->remove ($_) for @other;
2618		2753
2619	$self->{par} = [];	2754	$self->{par} = [];
2620	$self->{height} = 0;	2755	$self->{height} = 0;
2621	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2756	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622	}	2757	}
2623		2758
2624	sub add_paragraph {	2759	sub add_paragraph {
2625	my ($self, $color, $text, $indent) = @_;	2760	my ($self, $color, $para, $indent) = @_;
2626		2761
2627	for my $line (split /\n/, $text) {	2762	my ($text, @w) = ref $para ? @$para : $para;
2628	my ($w, $h) = $self->text_size ($line);	2763
2629	$self->{height} += $h;	2764	$para = {
2630	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2765	w => 1e10,
		2766	wrapped => 1,
		2767	fg => $color,
		2768	indent => $indent,
		2769	markup => $text,
		2770	widget => \@w,
2631	}	2771	};
2632		2772
2633	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2773	$self->add (@w) if @w;
		2774	push @{$self->{par}}, $para;
		2775
		2776	$self->{need_reflow}++;
		2777	$self->update;
		2778	}
		2779
		2780	sub scroll_to_bottom {
		2781	my ($self) = @_;
		2782
		2783	$self->{scroll_to_bottom} = 1;
		2784	$self->update;
2634	}	2785	}
2635		2786
2636	sub update {	2787	sub update {
2637	my ($self) = @_;	2788	my ($self) = @_;
2638		2789
…		…
2646	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2797	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647		2798
2648	if (delete $self->{need_reflow}) {	2799	if (delete $self->{need_reflow}) {
2649	my $height = 0;	2800	my $height = 0;
2650		2801
2651	my $layout = $self->{layout};
2652
2653	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2655	for (@{$self->{par}}) {	2802	for my $para (@{$self->{par}}) {
2656	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2803	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2657	$layout->set_width ($W - $_->[3]);	2804	my $layout = $self->get_layout ($para);
2658	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2659	$layout->set_markup ($_->[4]);
2660	my ($w, $h) = $layout->size;	2805	my ($w, $h) = $layout->size;
2661	$_->[0] = $w + $_->[3];	2806
2662	$_->[1] = $h;	2807	$para->{w} = $w + $para->{indent};
		2808	$para->{h} = $h;
		2809	$para->{wrapped} = $layout->has_wrapped;
2663	}	2810	}
2664		2811
2665	$height += $_->[1];	2812	$height += $para->{h};
2666	}	2813	}
2667		2814
2668	$self->{height} = $height;	2815	$self->{height} = $height;
2669		2816
2670	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2817	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2671		2818
2672	delete $self->{texture};	2819	delete $self->{texture};
		2820	}
		2821
		2822	if (delete $self->{scroll_to_bottom}) {
		2823	$self->{children}[1]->set_value (1e10);
2673	}	2824	}
2674		2825
2675	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2826	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2676	glClearColor 0, 0, 0, 0;	2827	glClearColor 0, 0, 0, 0;
2677	glClear GL_COLOR_BUFFER_BIT;	2828	glClear GL_COLOR_BUFFER_BIT;
…		…
2681	my $y0 = $top;	2832	my $y0 = $top;
2682	my $y1 = $top + $H;	2833	my $y1 = $top + $H;
2683		2834
2684	my $y = 0;	2835	my $y = 0;
2685		2836
2686	my $layout = $self->{layout};
2687
2688	$layout->set_font ($self->{font}) if $self->{font};
2689
2690	glEnable GL_BLEND;
2691	#TODO# not correct in windows where rgba is forced off
2692	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2693
2694	for my $par (@{$self->{par}}) {	2837	for my $para (@{$self->{par}}) {
2695	my $h = $par->[1];	2838	my $h = $para->{h};
2696		2839
2697	if ($y0 < $y + $h && $y < $y1) {	2840	if ($y0 < $y + $h && $y < $y1) {
2698	$layout->set_foreground (@{ $par->[2] });
2699	$layout->set_width ($W - $par->[3]);
2700	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2701	$layout->set_markup ($par->[4]);
2702		2841
2703	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2842	my $layout = $self->get_layout ($para);
2704		2843
2705	glRasterPos $par->[3], $y - $y0;	2844	$layout->render ($para->{indent}, $y - $y0);
2706	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2845
		2846	if (my @w = @{ $para->{widget} }) {
		2847	my @s = $layout->get_shapes;
		2848
		2849	for (@w) {
		2850	my ($dx, $dy) = splice @s, 0, 2, ();
		2851
		2852	$_->{x} = $dx + $para->{indent};
		2853	$_->{y} = $dy + $y - $y0;
		2854
		2855	$_->draw;
		2856	}
		2857	}
2707	}	2858	}
2708		2859
2709	$y += $h;	2860	$y += $h;
2710	}	2861	}
2711
2712	glDisable GL_BLEND;
2713	};	2862	};
2714	});	2863	});
		2864	}
		2865
		2866	sub reconfigure {
		2867	my ($self) = @_;
		2868
		2869	$self->SUPER::reconfigure;
		2870
		2871	$_->{w} = 1e10 for @{ $self->{par} };
		2872	$self->reflow;
2715	}	2873	}
2716		2874
2717	sub _draw {	2875	sub _draw {
2718	my ($self) = @_;	2876	my ($self) = @_;
2719		2877
…		…
2722	glColor 0, 0, 0, 1;	2880	glColor 0, 0, 0, 1;
2723	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2881	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2724	glDisable GL_TEXTURE_2D;	2882	glDisable GL_TEXTURE_2D;
2725		2883
2726	$self->{children}[1]->draw;	2884	$self->{children}[1]->draw;
2727
2728	}	2885	}
2729		2886
2730	#############################################################################	2887	#############################################################################
2731		2888
2732	package CFClient::UI::Animator;	2889	package CFClient::UI::Animator;
…		…
2841	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2998	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842		2999
2843	($w + 4, $h + 4)	3000	($w + 4, $h + 4)
2844	}	3001	}
2845		3002
2846	sub size_allocate {	3003	sub invoke_size_allocate {
2847	my ($self, $w, $h) = @_;	3004	my ($self, $w, $h) = @_;
2848		3005
2849	$self->SUPER::size_allocate ($w - 4, $h - 4);	3006	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850	}	3007	}
2851		3008
2852	sub visibility_change {	3009	sub invoke_visibility_change {
2853	my ($self, $visible) = @_;	3010	my ($self, $visible) = @_;
2854		3011
2855	return unless $visible;	3012	return unless $visible;
2856		3013
2857	$self->{root}->on_post_alloc ("move_$self" => sub {	3014	$self->{root}->on_post_alloc ("move_$self" => sub {
2858	my $widget = $self->{owner}	3015	my $widget = $self->{owner}
2859	or return;	3016	or return;
2860		3017
		3018	if ($widget->{visible}) {
2861	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3019	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862		3020
2863	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3021	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864	if $x + $self->{w} > $self->{root}{w};	3022	if $x + $self->{w} > $self->{root}{w};
2865		3023
2866	$self->move_abs ($x, $y);	3024	$self->move_abs ($x, $y);
		3025	} else {
		3026	$self->hide;
		3027	}
2867	});	3028	});
2868	}	3029	}
2869		3030
2870	sub _draw {	3031	sub _draw {
2871	my ($self) = @_;	3032	my ($self) = @_;
…		…
3005	for my $item (@{ $self->{items} }) {	3166	for my $item (@{ $self->{items} }) {
3006	my ($widget, $cb, $tooltip) = @$item;	3167	my ($widget, $cb, $tooltip) = @$item;
3007		3168
3008	# handle various types of items, only text for now	3169	# handle various types of items, only text for now
3009	if (!ref $widget) {	3170	if (!ref $widget) {
		3171	if ($widget =~ /\t/) {
		3172	my ($left, $right) = split /\t/, $widget, 2;
		3173
		3174	$widget = new CFClient::UI::HBox
		3175	can_hover => 1,
		3176	can_events => 1,
		3177	tooltip => $tooltip,
		3178	children => [
		3179	(new CFClient::UI::Label markup => $left, expand => 1),
		3180	(new CFClient::UI::Label markup => $right, align => +1),
		3181	],
		3182	;
		3183
		3184	} else {
3010	$widget = new CFClient::UI::Label	3185	$widget = new CFClient::UI::Label
3011	can_hover => 1,	3186	can_hover => 1,
3012	can_events => 1,	3187	can_events => 1,
3013	markup => $widget,	3188	markup => $widget,
3014	tooltip => $tooltip	3189	tooltip => $tooltip;
		3190	}
3015	}	3191	}
3016		3192
3017	$self->{item}{$widget} = $item;	3193	$self->{item}{$widget} = $item;
3018		3194
3019	$self->{vbox}->add ($widget);	3195	$self->{vbox}->add ($widget);
…		…
3024		3200
3025	# popup given the event (must be a mouse button down event currently)	3201	# popup given the event (must be a mouse button down event currently)
3026	sub popup {	3202	sub popup {
3027	my ($self, $ev) = @_;	3203	my ($self, $ev) = @_;
3028		3204
3029	$self->_emit ("popdown");	3205	$self->emit ("popdown");
3030		3206
3031	# maybe save $GRAB? must be careful about events...	3207	# maybe save $GRAB? must be careful about events...
3032	$GRAB = $self;	3208	$GRAB = $self;
3033	$self->{button} = $ev->{button};	3209	$self->{button} = $ev->{button};
3034		3210
3035	$self->show;	3211	$self->show;
3036	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3212	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3037	}	3213	}
3038		3214
3039	sub mouse_motion {	3215	sub invoke_mouse_motion {
3040	my ($self, $ev, $x, $y) = @_;	3216	my ($self, $ev, $x, $y) = @_;
3041		3217
3042	# TODO: should use vbox->find_widget or so	3218	# TODO: should use vbox->find_widget or so
3043	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3219	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044	$self->{hover} = $self->{item}{$HOVER};	3220	$self->{hover} = $self->{item}{$HOVER};
3045		3221
3046	0	3222	0
3047	}	3223	}
3048		3224
3049	sub button_up {	3225	sub invoke_button_up {
3050	my ($self, $ev, $x, $y) = @_;	3226	my ($self, $ev, $x, $y) = @_;
3051		3227
3052	if ($ev->{button} == $self->{button}) {	3228	if ($ev->{button} == $self->{button}) {
3053	undef $GRAB;	3229	undef $GRAB;
3054	$self->hide;	3230	$self->hide;
3055		3231
3056	$self->_emit ("popdown");	3232	$self->emit ("popdown");
3057	$self->{hover}[1]->() if $self->{hover};	3233	$self->{hover}[1]->() if $self->{hover};
3058	} else {	3234	} else {
3059	return 0	3235	return 0
3060	}	3236	}
3061		3237
…		…
3088		3264
3089	$self->{current} = $self->{children}[0]	3265	$self->{current} = $self->{children}[0]
3090	if @{ $self->{children} };	3266	if @{ $self->{children} };
3091	}	3267	}
3092		3268
		3269	sub get_current_page {
		3270	my ($self) = @_;
		3271
		3272	$self->{current}
		3273	}
		3274
3093	sub set_current_page {	3275	sub set_current_page {
3094	my ($self, $page_or_widget) = @_;	3276	my ($self, $page_or_widget) = @_;
3095		3277
3096	my $widget = ref $page_or_widget	3278	my $widget = ref $page_or_widget
3097	? $page_or_widget	3279	? $page_or_widget
3098	: $self->{children}[$page_or_widget];	3280	: $self->{children}[$page_or_widget];
3099		3281
3100	$self->{current} = $widget;	3282	$self->{current} = $widget;
3101	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3283	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102		3284
3103	$self->_emit (page_changed => $self->{current});	3285	$self->emit (page_changed => $self->{current});
3104		3286
3105	$self->realloc;	3287	$self->realloc;
3106	}	3288	}
3107		3289
3108	sub visible_children {	3290	sub visible_children {
…		…
3113	my ($self) = @_;	3295	my ($self) = @_;
3114		3296
3115	$self->{current}->size_request	3297	$self->{current}->size_request
3116	}	3298	}
3117		3299
3118	sub size_allocate {	3300	sub invoke_size_allocate {
3119	my ($self, $w, $h) = @_;	3301	my ($self, $w, $h) = @_;
3120		3302
3121	$self->{current}->configure (0, 0, $w, $h);	3303	$self->{current}->configure (0, 0, $w, $h);
		3304
		3305	1
3122	}	3306	}
3123		3307
3124	sub _draw {	3308	sub _draw {
3125	my ($self) = @_;	3309	my ($self) = @_;
3126		3310
…		…
3161	);	3345	);
3162		3346
3163	$self->{multiplexer}->add ($widget);	3347	$self->{multiplexer}->add ($widget);
3164	}	3348	}
3165		3349
		3350	sub get_current_page {
		3351	my ($self) = @_;
		3352
		3353	$self->{multiplexer}->get_current_page
		3354	}
		3355
3166	sub set_current_page {	3356	sub set_current_page {
3167	my ($self, $page) = @_;	3357	my ($self, $page) = @_;
3168		3358
3169	$self->{multiplexer}->set_current_page ($page);	3359	$self->{multiplexer}->set_current_page ($page);
3170	$self->_emit (page_changed => $self->{multiplexer}{current});	3360	$self->emit (page_changed => $self->{multiplexer}{current});
3171	}	3361	}
3172		3362
3173	#############################################################################	3363	#############################################################################
3174		3364
3175	package CFClient::UI::Combobox;	3365	package CFClient::UI::Combobox;
…		…
3190	$self->_set_value ($self->{value});	3380	$self->_set_value ($self->{value});
3191		3381
3192	$self	3382	$self
3193	}	3383	}
3194		3384
3195	sub button_down {	3385	sub invoke_button_down {
3196	my ($self, $ev) = @_;	3386	my ($self, $ev) = @_;
3197		3387
3198	my @menu_items;	3388	my @menu_items;
3199		3389
3200	for (@{ $self->{options} }) {	3390	for (@{ $self->{options} }) {
…		…
3221	my ($self, $value) = @_;	3411	my ($self, $value) = @_;
3222		3412
3223	return unless $self->{value} ne $value;	3413	return unless $self->{value} ne $value;
3224		3414
3225	$self->_set_value ($value);	3415	$self->_set_value ($value);
3226	$self->_emit (changed => $value);	3416	$self->emit (changed => $value);
3227	}	3417	}
3228		3418
3229	#############################################################################	3419	#############################################################################
3230		3420
3231	package CFClient::UI::Statusbox;	3421	package CFClient::UI::Statusbox;
…		…
3346	count => 1,	3536	count => 1,
3347	%arg,	3537	%arg,
3348	};	3538	};
3349	}	3539	}
3350		3540
		3541	$ROOT->on_refresh (reorder => sub {
3351	$self->reorder;	3542	$self->reorder;
		3543	});
3352	}	3544	}
3353		3545
3354	sub reconfigure {	3546	sub reconfigure {
3355	my ($self) = @_;	3547	my ($self) = @_;
3356		3548
…		…
3371		3563
3372	#############################################################################	3564	#############################################################################
3373		3565
3374	package CFClient::UI::Inventory;	3566	package CFClient::UI::Inventory;
3375		3567
3376	our @ISA = CFClient::UI::ScrolledWindow::;	3568	our @ISA = CFClient::UI::Table::;
3377		3569
3378	sub new {	3570	sub new {
3379	my $class = shift;	3571	my $class = shift;
3380		3572
3381	my $self = $class->SUPER::new (	3573	my $self = $class->SUPER::new (
3382	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3574	col_expand => [0, 1, 0],
		3575	items => [],
3383	@_,	3576	@_,
3384	);	3577	);
3385		3578
		3579	$self->set_sort_order (undef);
		3580
3386	$self	3581	$self
		3582	}
		3583
		3584	sub update_items {
		3585	my ($self) = @_;
		3586
		3587	$self->clear;
		3588
		3589	my @item = $self->{sort}->(@{ $self->{items} });
		3590
		3591	my @adds;
		3592	my $row = 0;
		3593	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3594	CFClient::Item::update_widgets $item;
		3595
		3596	push @adds, 0, $row, $item->{face_widget};
		3597	push @adds, 1, $row, $item->{desc_widget};
		3598	push @adds, 2, $row, $item->{weight_widget};
		3599
		3600	$row++;
		3601	}
		3602
		3603	$self->add (@adds);
		3604	}
		3605
		3606	sub set_sort_order {
		3607	my ($self, $order) = @_;
		3608
		3609	$self->{sort} = $order ||= sub {
		3610	sort {
		3611	$a->{type} <=> $b->{type}
		3612	or $a->{name} cmp $b->{name}
		3613	} @_
		3614	};
		3615
		3616	$self->update_items;
3387	}	3617	}
3388		3618
3389	sub set_items {	3619	sub set_items {
3390	my ($self, $items) = @_;	3620	my ($self, $items) = @_;
3391		3621
3392	$self->{child}->clear;	3622	$self->{items} = [$items ? values %$items : ()];
3393	return unless $items;
3394
3395	my @items = sort {
3396	($a->{type} <=> $b->{type})
3397	or ($a->{name} cmp $b->{name})
3398	} @$items;
3399
3400	$self->{real_items} = \@items;
3401
3402	my $row = 0;
3403	for my $item (@items) {
3404	CFClient::Item::update_widgets $item;
3405
3406	$self->{child}->add (0, $row, $item->{face_widget});
3407	$self->{child}->add (1, $row, $item->{desc_widget});
3408	$self->{child}->add (2, $row, $item->{weight_widget});
3409
3410	$row++;
3411	}
3412	}
3413
3414	#############################################################################
3415
3416	package CFClient::UI::BindEditor;
3417
3418	our @ISA = CFClient::UI::FancyFrame::;
3419
3420	sub new {
3421	my $class = shift;
3422
3423	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425	$self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429	text => "start recording",
3430	tooltip => "Start/Stops recording of actions."
3431	."All subsequent actions after the recording started will be captured."
3432	."The actions are displayed after the record was stopped."
3433	."To bind the action you have to click on the 'Bind' button",
3434	on_activate => sub {
3435	unless ($self->{recording}) {
3436	$self->start;
3437	} else {
3438	$self->stop;
3439	}
3440	});
3441
3442	$vb->add (new CFClient::UI::Label text => "Actions:");
3443	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3446	$vb->add (my $hb = new CFClient::UI::HBox);
3447	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448	$hb->add (new CFClient::UI::Button
3449	text => "bind",
3450	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451	on_activate => sub {
3452	$self->ask_for_bind;
3453	});
3454
3455	$vb->add (my $hb = new CFClient::UI::HBox);
3456	$hb->add (new CFClient::UI::Button
3457	text => "ok",
3458	expand => 1,
3459	tooltip => "This closes the binding editor and saves the binding",
3460	on_activate => sub {
3461	$self->hide;
3462	$self->commit;
3463	});
3464
3465	$hb->add (new CFClient::UI::Button
3466	text => "cancel",
3467	expand => 1,
3468	tooltip => "This closes the binding editor without saving",
3469	on_activate => sub {
3470	$self->hide;
3471	$self->{binding_cancel}->()
3472	if $self->{binding_cancel};
3473	});
3474
3475	$self->update_binding_widgets;	3623	$self->update_items;
3476
3477	$self
3478	}
3479
3480	sub commit {
3481	my ($self) = @_;
3482	my ($mod, $sym, $cmds) = $self->get_binding;
3483	if ($sym != 0 && @$cmds > 0) {
3484	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485	."'. Don't forget 'Save Config'!");
3486	$self->{binding_change}->($mod, $sym, $cmds)
3487	if $self->{binding_change};
3488	} else {
3489	$::STATUSBOX->add ("No action bound, no key or action specified!");
3490	$self->{binding_cancel}->()
3491	if $self->{binding_cancel};
3492	}
3493	}
3494
3495	sub start {
3496	my ($self) = @_;
3497
3498	$self->{rec_btn}->set_text ("stop recording");
3499	$self->{recording} = 1;
3500	$self->clear_command_list;
3501	$::CONN->start_record if $::CONN;
3502	}
3503
3504	sub stop {
3505	my ($self) = @_;
3506
3507	$self->{rec_btn}->set_text ("start recording");
3508	$self->{recording} = 0;
3509
3510	my $rec;
3511	$rec = $::CONN->stop_record if $::CONN;
3512	return unless ref $rec eq 'ARRAY';
3513	$self->set_command_list ($rec);
3514	}
3515
3516
3517	sub ask_for_bind_and_commit {
3518	my ($self) = @_;
3519	$self->ask_for_bind (1);
3520	}
3521
3522	sub ask_for_bind {
3523	my ($self, $commit, $end_cb) = @_;
3524
3525	CFClient::Binder::open_binding_dialog (sub {
3526	my ($mod, $sym) = @_;
3527	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528	$self->update_binding_widgets;
3529	$self->commit if $commit;
3530	$end_cb->() if $end_cb;
3531	});
3532	}
3533
3534	# $mod and $sym are the modifiers and key symbol
3535	# $cmds is a array ref of strings (the commands)
3536	# $cb is the callback that is executed on OK
3537	# $ccb is the callback that is executed on CANCEL and
3538	# when the binding was unsuccessful on OK
3539	sub set_binding {
3540	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3541
3542	$self->clear_command_list;
3543	$self->{recording} = 0;
3544	$self->{rec_btn}->set_text ("start recording");
3545
3546	$self->{binding} = [$mod, $sym];
3547	$self->{commands} = $cmds;
3548
3549	$self->{binding_change} = $cb;
3550	$self->{binding_cancel} = $ccb;
3551
3552	$self->update_binding_widgets;
3553	}
3554
3555	# this is a shortcut method that asks for a binding
3556	# and then just binds it.
3557	sub do_quick_binding {
3558	my ($self, $cmds, $end_cb) = @_;
3559	$self->set_binding (undef, undef, $cmds, sub {
3560	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3561	});
3562	$self->ask_for_bind (1, $end_cb);
3563	}
3564
3565	sub update_binding_widgets {
3566	my ($self) = @_;
3567	my ($mod, $sym, $cmds) = $self->get_binding;
3568	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3569	$self->set_command_list ($cmds);
3570	}
3571
3572	sub get_binding {
3573	my ($self) = @_;
3574	return (
3575	$self->{binding}->[0],
3576	$self->{binding}->[1],
3577	[ grep { defined $_ } @{$self->{commands}} ]
3578	);
3579	}
3580
3581	sub clear_command_list {
3582	my ($self) = @_;
3583	$self->{cmdbox}->clear ();
3584	}
3585
3586	sub set_command_list {
3587	my ($self, $cmds) = @_;
3588
3589	$self->{cmdbox}->clear ();
3590	$self->{commands} = $cmds;
3591
3592	my $idx = 0;
3593
3594	for (@$cmds) {
3595	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3596
3597	my $i = $idx;
3598	$hb->add (new CFClient::UI::Label text => $_);
3599	$hb->add (new CFClient::UI::Button
3600	text => "delete",
3601	tooltip => "Deletes the action from the record",
3602	on_activate => sub {
3603	$self->{cmdbox}->remove ($hb);
3604	$cmds->[$i] = undef;
3605	});
3606
3607
3608	$idx++
3609	}
3610	}	3624	}
3611		3625
3612	#############################################################################	3626	#############################################################################
3613		3627
3614	package CFClient::UI::SpellList;	3628	package CFClient::UI::SpellList;
…		…
3667	} elsif ($ev->{button} == 2) {	3681	} elsif ($ev->{button} == 2) {
3668	$::CONN->user_send ("invoke $spell->{name}");	3682	$::CONN->user_send ("invoke $spell->{name}");
3669	} elsif ($ev->{button} == 3) {	3683	} elsif ($ev->{button} == 3) {
3670	(new CFClient::UI::Menu	3684	(new CFClient::UI::Menu
3671	items => [	3685	items => [
3672	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3686	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3673	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3687	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3674	],	3688	],
3675	)->popup ($ev);	3689	)->popup ($ev);
3676	} else {	3690	} else {
3677	return 0;	3691	return 0;
…		…
3772	$coord = $max - $size if $coord > $max - $size;	3786	$coord = $max - $size if $coord > $max - $size;
3773		3787
3774	int $coord + 0.5	3788	int $coord + 0.5
3775	}	3789	}
3776		3790
3777	sub size_allocate {	3791	sub invoke_size_allocate {
3778	my ($self, $w, $h) = @_;	3792	my ($self, $w, $h) = @_;
3779		3793
3780	for my $child ($self->children) {	3794	for my $child ($self->children) {
3781	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3795	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3782		3796
…		…
3786	$X = _to_pixel $X, $W, $self->{w};	3800	$X = _to_pixel $X, $W, $self->{w};
3787	$Y = _to_pixel $Y, $H, $self->{h};	3801	$Y = _to_pixel $Y, $H, $self->{h};
3788		3802
3789	$child->configure ($X, $Y, $W, $H);	3803	$child->configure ($X, $Y, $W, $H);
3790	}	3804	}
		3805
		3806	1
3791	}	3807	}
3792		3808
3793	sub coord2local {	3809	sub coord2local {
3794	my ($self, $x, $y) = @_;	3810	my ($self, $x, $y) = @_;
3795		3811
…		…
3921	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3937	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3922		3938
3923	$w = 0 if $w < 0;	3939	$w = 0 if $w < 0;
3924	$h = 0 if $h < 0;	3940	$h = 0 if $h < 0;
3925		3941
		3942	$w = max $widget->{min_w}, $w;
		3943	$h = max $widget->{min_h}, $h;
		3944
		3945	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3946	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3947
3926	$w = int $w + 0.5;	3948	$w = int $w + 0.5;
3927	$h = int $h + 0.5;	3949	$h = int $h + 0.5;
3928		3950
3929	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3951	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3930	$widget->{old_w} = $widget->{w};	3952	$widget->{old_w} = $widget->{w};

Diff Legend

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