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.222 by root, Mon May 22 03:59:51 2006 UTC vs.
Revision 1.274 by root, Sat Jun 3 22:20:52 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
18		20
		21	sub get_layout {
		22	my $layout;
		23
		24	for (grep { $_->{name} } values %WIDGET) {
		25	my $win = $layout->{$_->{name}} = { };
		26
		27	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		28	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		29	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		30	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		31
		32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
		36	}
		37
		38	sub set_layout {
		39	my ($layout) = @_;
		40
		41	$LAYOUT = $layout;
		42	}
		43
19	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
20	if (!$GRAB) {	47	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
23
24	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
25	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
26		54
27	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
28		56
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		58
31	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	60	$TOOLTIP->show;
33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	if $x + $TOOLTIP->{w} > $::WIDTH;
38
39	$TOOLTIP->move ($x, $y);
40	$TOOLTIP->check_size;
41	$TOOLTIP->update;
42	}	61	}
43		62
44	return;	63	return;
45	}	64	}
46	}	65	}
…		…
50	delete $TOOLTIP->{owner};	69	delete $TOOLTIP->{owner};
51	}	70	}
52		71
53	# class methods for events	72	# class methods for events
54	sub feed_sdl_key_down_event {	73	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	74	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	75	if $FOCUS;
57	}	76	}
58		77
59	sub feed_sdl_key_up_event {	78	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	79	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	80	if $FOCUS;
62	}	81	}
63		82
64	sub feed_sdl_button_down_event {	83	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	84	my ($ev) = @_;
…		…
74	check_tooltip;	93	check_tooltip;
75	}	94	}
76		95
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	96	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		97
79	if ($GRAB) {	98	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	99	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	100	}
84		101
85	sub feed_sdl_button_up_event {	102	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	103	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	104	my ($x, $y) = ($ev->{x}, $ev->{y});
88		105
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	106	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		107
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	108	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		109
93	if ($GRAB) {	110	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	111	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		112
98	if (!$BUTTON_STATE) {	113	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	114	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	115	$grab->update if $grab;
101	$GRAB->update if $GRAB;	116	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	132	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		133
119	check_tooltip;	134	check_tooltip;
120	}	135	}
121		136
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	137	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	138	if $HOVER;
126	}	139	}
127		140
128	# convert position array to integers	141	# convert position array to integers
129	sub harmonize {	142	sub harmonize {
130	my ($vals) = @_;	143	my ($vals) = @_;
…		…
144		157
145	$_->update	158	$_->update
146	for @widgets;	159	for @widgets;
147	}	160	}
148		161
		162	sub reconfigure_widgets {
		163	# make a copy, otherwise C<for> complains about freed values.
		164	my @widgets = values %WIDGET;
		165
		166	$_->reconfigure
		167	for @widgets;
		168	}
		169
149	# call when resolution changes etc.	170	# call when resolution changes etc.
150	sub rescale_widgets {	171	sub rescale_widgets {
151	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
152		173
153	# make a copy, otherwise for complains about freed values.
154	my @widgets = values %WIDGET;	174	for my $widget (values %WIDGET) {
155
156	for my $widget (@widgets) {
157	if ($widget->{toplevel}) {	175	if ($widget->{is_toplevel}) {
		176	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		177	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		178
158	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	179	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	180	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	181	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	182	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	183	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	184	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	185
		186	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		187	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		188
166	}	189	}
167
168	$widget->reconfigure;
169	}	190	}
		191
		192	reconfigure_widgets;
170	}	193	}
171		194
172	#############################################################################	195	#############################################################################
173		196
174	package CFClient::UI::Base;	197	package CFClient::UI::Base;
…		…
179		202
180	sub new {	203	sub new {
181	my $class = shift;	204	my $class = shift;
182		205
183	my $self = bless {	206	my $self = bless {
184	x => 0,	207	x => "center",
185	y => 0,	208	y => "center",
186	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
187	can_events => 1,	212	can_events => 1,
188	@_	213	@_
189	}, $class;	214	}, $class;
190		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
191	for (keys %$self) {	218	for (keys %$self) {
192	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
193	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
194	}	221	}
195	}	222	}
196		223
197	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
		226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
		227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
		228	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
		229
		230	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		231	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		232
		233	$self->show if $layout->{show};
		234	}
198		235
199	$self	236	$self
200	}	237	}
201		238
202	sub destroy {	239	sub destroy {
…		…
206	%$self = ();	243	%$self = ();
207	}	244	}
208		245
209	sub show {	246	sub show {
210	my ($self) = @_;	247	my ($self) = @_;
		248
211	return if $self->{parent};	249	return if $self->{parent};
212		250
213	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
214	}	252	}
215		253
216	sub hide {	254	sub set_visible {
217	my ($self) = @_;	255	my ($self) = @_;
		256
		257	return if $self->{visible};
		258
		259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
		261
		262	$self->emit (visibility_change => 1);
		263
		264	$self->realloc if !exists $self->{req_w};
		265
		266	$_->set_visible for $self->children;
		267	}
		268
		269	sub set_invisible {
		270	my ($self) = @_;
		271
		272	return unless $self->{visible};
		273
		274	$_->set_invisible for $self->children;
		275
		276	delete $self->{root};
		277	delete $self->{visible};
218		278
219	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
220	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
221		281
		282	CFClient::UI::check_tooltip
		283	if $TOOLTIP->{owner} == $self;
		284
		285	$self->focus_out;
		286
		287	$self->emit (visibility_change => 0);
		288	}
		289
		290	sub set_visibility {
		291	my ($self, $visible) = @_;
		292
		293	return if $self->{visible} == $visible;
		294
		295	$visible ? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub toggle_visibility {
		300	my ($self) = @_;
		301
		302	$self->{visible}
		303	? $self->hide
		304	: $self->show;
		305	}
		306
		307	sub hide {
		308	my ($self) = @_;
		309
		310	$self->set_invisible;
		311
222	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
223	if $self->{parent};	313	if $self->{parent};
224	}	314	}
225		315
226	sub move {	316	sub move_abs {
227	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
228		318
229	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
230	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
231	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
232		322
233	$self->update;	323	$self->update;
234	}	324	}
235		325
236	sub set_size {	326	sub set_size {
237	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
238		328
239	$self->{user_w} = $w;	329	$self->{force_w} = $w;
240	$self->{user_h} = $h;	330	$self->{force_h} = $h;
241		331
242	$self->check_size;	332	$self->realloc;
243	}	333	}
244		334
245	sub size_request {	335	sub size_request {
246	require Carp;	336	require Carp;
247	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
249		339
250	sub configure {	340	sub configure {
251	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
252		342
253	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
254	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
255	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
256		348
257	# use alignment to adjust x, y	349	# use alignment to adjust x, y
258		350
259	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
260	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
261
262	($w, $h) = ($w2, $h2);
263	}	353	}
264		354
265	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
266	$self->{x} = $x;	356	$self->{x} = $x;
267	$self->{y} = $y;	357	$self->{y} = $y;
268	$self->update;	358	$self->update;
269	}	359	}
270		360
271	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
272	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	362	return unless $self->{visible};
		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
		367	$self->{root}{size_alloc}{$self+0} = $self;
273	}	368	}
274	}	369	}
275		370
276	sub size_allocate {	371	sub size_allocate {
277	# nothing to be done	372	# nothing to be done
278	}	373	}
279		374
280	sub reconfigure {
281	my ($self) = @_;
282
283	$self->check_size (1);
284	$self->update;
285	}
286
287	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
288	}	381	}
289		382
290	sub set_max_size {	383	sub set_max_size {
291	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
292		385
…		…
294	delete $self->{max_h}; $self->{max_h} = $h if $h;	387	delete $self->{max_h}; $self->{max_h} = $h if $h;
295	}	388	}
296		389
297	sub set_tooltip {	390	sub set_tooltip {
298	my ($self, $tooltip) = @_;	391	my ($self, $tooltip) = @_;
		392
		393	$tooltip =~ s/^\s+//;
		394	$tooltip =~ s/\s+$//;
		395
		396	return if $self->{tooltip} eq $tooltip;
299		397
300	$self->{tooltip} = $tooltip;	398	$self->{tooltip} = $tooltip;
301		399
302	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	400	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
303	delete $CFClient::UI::TOOLTIP->{owner};	401	delete $CFClient::UI::TOOLTIP->{owner};
…		…
325	return if $FOCUS == $self;	423	return if $FOCUS == $self;
326	return unless $self->{can_focus};	424	return unless $self->{can_focus};
327		425
328	my $focus = $FOCUS; $FOCUS = $self;	426	my $focus = $FOCUS; $FOCUS = $self;
329		427
330	$self->emit (focus_in => $focus);	428	$self->_emit (focus_in => $focus);
331		429
332	$focus->update if $focus;	430	$focus->update if $focus;
333	$FOCUS->update;	431	$FOCUS->update;
334	}	432	}
335		433
…		…
338		436
339	return unless $FOCUS == $self;	437	return unless $FOCUS == $self;
340		438
341	my $focus = $FOCUS; undef $FOCUS;	439	my $focus = $FOCUS; undef $FOCUS;
342		440
343	$self->emit (focus_out => $focus);	441	$self->_emit (focus_out => $focus);
344		442
345	$focus->update if $focus; #?	443	$focus->update if $focus; #?
346	}
347		444
		445	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		446	unless $FOCUS;
		447	}
		448
348	sub mouse_motion { }	449	sub mouse_motion { 0 }
349	sub button_up { }	450	sub button_up { 0 }
350	sub key_down { }	451	sub key_down { 0 }
351	sub key_up { }	452	sub key_up { 0 }
352		453
353	sub button_down {	454	sub button_down {
354	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
355		456
356	$self->focus_in;	457	$self->focus_in;
357	}
358		458
359	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
360	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
361	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	461
362	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	462	sub find_widget {
363	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	463	my ($self, $x, $y) = @_;
		464
		465	return () unless $self->{can_events};
		466
		467	return $self
		468	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		469	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		470
		471	()
		472	}
		473
		474	sub set_parent {
		475	my ($self, $parent) = @_;
		476
		477	Scalar::Util::weaken ($self->{parent} = $parent);
		478	$self->set_visible if $parent->{visible};
		479	}
		480
		481	sub connect {
		482	my ($self, $signal, $cb) = @_;
		483
		484	push @{ $self->{signal_cb}{$signal} }, $cb;
		485	}
		486
		487	sub _emit {
		488	my ($self, $signal, @args) = @_;
		489
		490	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		491	}
		492
		493	sub emit {
		494	my ($self, $signal, @args) = @_;
		495
		496	$self->_emit ($signal, @args)
		497	|| $self->$signal (@args);
		498	}
		499
		500	sub visibility_change {
		501	#my ($self, $visible) = @_;
		502	}
		503
		504	sub realloc {
		505	my ($self) = @_;
		506
		507	if ($self->{visible}) {
		508	return if $self->{root}{realloc}{$self+0};
		509
		510	$self->{root}{realloc}{$self+0} = $self;
		511	$self->{root}->update;
		512	} else {
		513	delete $self->{req_w};
		514	delete $self->{req_h};
		515	}
		516	}
		517
		518	sub update {
		519	my ($self) = @_;
		520
		521	$self->{parent}->update
		522	if $self->{parent};
		523	}
		524
		525	sub reconfigure {
		526	my ($self) = @_;
		527
		528	$self->realloc;
		529	$self->update;
		530	}
		531
		532	# using global variables seems a bit hacky, but passing through all drawing
		533	# functions seems pointless.
		534	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
364		535
365	sub draw {	536	sub draw {
366	my ($self) = @_;	537	my ($self) = @_;
367		538
368	return unless $self->{h} && $self->{w};	539	return unless $self->{h} && $self->{w};
		540
		541	# update screen rectangle
		542	local $draw_x = $draw_x + $self->{x};
		543	local $draw_y = $draw_y + $self->{y};
		544	local $draw_w = $draw_x + $self->{w};
		545	local $draw_h = $draw_y + $self->{h};
		546
		547	# skip widgets that are entirely outside the drawing area
		548	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		549	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
369		550
370	glPushMatrix;	551	glPushMatrix;
371	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
372	$self->_draw;	553	$self->_draw;
373	glPopMatrix;	554	glPopMatrix;
…		…
385	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
386	glEnd;	567	glEnd;
387	glDisable GL_BLEND;	568	glDisable GL_BLEND;
388	}	569	}
389		570
390	if ($ENV{PCLIENT_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
391	glPushMatrix;	572	glPushMatrix;
392	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
393	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
394	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
395	glVertex 0 , 0;	576	glVertex 0 , 0;
396	glVertex $self->{w}, 0;	577	glVertex $self->{w} - 1, 0;
397	glVertex $self->{w}, $self->{h};	578	glVertex $self->{w} - 1, $self->{h} - 1;
398	glVertex 0 , $self->{h};	579	glVertex 0 , $self->{h} - 1;
399	glEnd;	580	glEnd;
400	glPopMatrix;	581	glPopMatrix;
401	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	582	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
402	}	583	}
403	}	584	}
404		585
405	sub _draw {	586	sub _draw {
406	my ($self) = @_;	587	my ($self) = @_;
407		588
408	warn "no draw defined for $self\n";	589	warn "no draw defined for $self\n";
409	}
410
411	sub find_widget {
412	my ($self, $x, $y) = @_;
413
414	return () unless $self->{can_events};
415
416	return $self
417	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
418	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
419
420	()
421	}
422
423	sub set_parent {
424	my ($self, $parent) = @_;
425
426	Scalar::Util::weaken ($self->{parent} = $parent);
427
428	# TODO: req_w _does_change after ->reconfigure
429	$self->check_size
430	unless exists $self->{req_w};
431
432	$self->show;
433	}
434
435	sub check_size {
436	my ($self, $forced) = @_;
437
438	$self->{force_alloc} = 1 if $forced;
439	$CFClient::UI::ROOT->{check_size}{$self} = $self;
440	}
441
442	sub update {
443	my ($self) = @_;
444
445	$self->{parent}->update
446	if $self->{parent};
447	}
448
449	sub connect {
450	my ($self, $signal, $cb) = @_;
451
452	push @{ $self->{signal_cb}{$signal} }, $cb;
453	}
454
455	sub emit {
456	my ($self, $signal, @args) = @_;
457
458	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
459	}	590	}
460		591
461	sub DESTROY {	592	sub DESTROY {
462	my ($self) = @_;	593	my ($self) = @_;
463		594
…		…
521	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
522	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
523	}	654	}
524		655
525	sub size_request {	656	sub size_request {
526	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
527	}	660	}
528		661
529	sub draw { }	662	sub draw { }
530		663
531	#############################################################################	664	#############################################################################
…		…
535	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
536		669
537	sub new {	670	sub new {
538	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
539		672
540	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
541		674
542	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
543	children => [],	676	children => [],
544	can_events => 0,	677	can_events => 0,
545	%arg,	678	%arg,
546	);	679	);
		680
547	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
548		683
549	$self	684	$self
550	}	685	}
551		686
552	sub add {	687	sub add {
…		…
560	$self->{children} = [	695	$self->{children} = [
561	sort { $a->{z} <=> $b->{z} }	696	sort { $a->{z} <=> $b->{z} }
562	@{$self->{children}}, @widgets	697	@{$self->{children}}, @widgets
563	];	698	];
564		699
565	$self->check_size (1);	700	$self->realloc;
566	$self->update;
567	}	701	}
568		702
569	sub children {	703	sub children {
570	@{ $_[0]{children} }	704	@{ $_[0]{children} }
571	}	705	}
…		…
576	delete $child->{parent};	710	delete $child->{parent};
577	$child->hide;	711	$child->hide;
578		712
579	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	713	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
580		714
581	$self->check_size;	715	$self->realloc;
582	$self->update;
583	}	716	}
584		717
585	sub clear {	718	sub clear {
586	my ($self) = @_;	719	my ($self) = @_;
587		720
…		…
591	for (@$children) {	724	for (@$children) {
592	delete $_->{parent};	725	delete $_->{parent};
593	$_->hide;	726	$_->hide;
594	}	727	}
595		728
596	$self->check_size;	729	$self->realloc;
597	$self->update;
598	}	730	}
599		731
600	sub find_widget {	732	sub find_widget {
601	my ($self, $x, $y) = @_;	733	my ($self, $x, $y) = @_;
602		734
603	$x -= $self->{x};	735	$x -= $self->{x};
604	$y -= $self->{y};	736	$y -= $self->{y};
605		737
606	my $res;	738	my $res;
607		739
608	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
609	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
610	and return $res;	742	and return $res;
611	}	743	}
612		744
613	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
662	$self->{children}[0]->configure (0, 0, $w, $h);	794	$self->{children}[0]->configure (0, 0, $w, $h);
663	}	795	}
664		796
665	#############################################################################	797	#############################################################################
666		798
		799	# back-buffered drawing area
		800
667	package CFClient::UI::Window;	801	package CFClient::UI::Window;
668		802
669	our @ISA = CFClient::UI::Bin::;	803	our @ISA = CFClient::UI::Bin::;
670		804
671	use CFClient::OpenGL;	805	use CFClient::OpenGL;
…		…
689	$self->SUPER::size_allocate ($w, $h);	823	$self->SUPER::size_allocate ($w, $h);
690	$self->update;	824	$self->update;
691	}	825	}
692		826
693	sub _render {	827	sub _render {
		828	my ($self) = @_;
		829
694	$_[0]{children}[0]->draw;	830	$self->{children}[0]->draw;
695	}	831	}
696		832
697	sub render_child {	833	sub render_child {
698	my ($self) = @_;	834	my ($self) = @_;
699		835
700	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	836	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
701	glClearColor 0, 0, 0, 0;	837	glClearColor 0, 0, 0, 0;
702	glClear GL_COLOR_BUFFER_BIT;	838	glClear GL_COLOR_BUFFER_BIT;
703		839
		840	{
		841	package CFClient::UI::Base;
		842
		843	($draw_x, $draw_y, $draw_w, $draw_h) =
		844	(0, 0, $self->{w}, $self->{h});
		845	}
		846
704	$self->_render;	847	$self->_render;
705	};	848	};
706	}	849	}
707		850
708	sub _draw {	851	sub _draw {
709	my ($self) = @_;	852	my ($self) = @_;
710		853
711	my ($w, $h) = ($self->w, $self->h);	854	my ($w, $h) = @$self{qw(w h)};
712		855
713	my $tex = $self->{texture}	856	my $tex = $self->{texture}
714	or return;	857	or return;
715		858
716	glEnable GL_TEXTURE_2D;	859	glEnable GL_TEXTURE_2D;
…		…
726		869
727	package CFClient::UI::ViewPort;	870	package CFClient::UI::ViewPort;
728		871
729	our @ISA = CFClient::UI::Window::;	872	our @ISA = CFClient::UI::Window::;
730		873
		874	sub new {
		875	my $class = shift;
		876
		877	$class->SUPER::new (
		878	scroll_x => 0,
		879	scroll_y => 1,
		880	@_,
		881	)
		882	}
		883
731	sub size_request {	884	sub size_request {
732	my ($self) = @_;	885	my ($self) = @_;
733		886
734	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	887	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
735	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
736		888
737	@$self{qw(child_w child_h)}	889	$w = 10 if $self->{scroll_x};
		890	$h = 10 if $self->{scroll_y};
		891
		892	($w, $h)
738	}	893	}
739		894
740	sub size_allocate {	895	sub size_allocate {
741	my ($self, $w, $h) = @_;	896	my ($self, $w, $h) = @_;
742		897
		898	my $child = $self->child;
		899
		900	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
		901	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
		902
		903	$self->child->configure (0, 0, $w, $h);
743	$self->update;	904	$self->update;
744	}	905	}
745		906
746	sub set_offset {	907	sub set_offset {
747	my ($self, $x, $y) = @_;	908	my ($self, $x, $y) = @_;
…		…
781	}	942	}
782		943
783	sub _render {	944	sub _render {
784	my ($self) = @_;	945	my ($self) = @_;
785		946
		947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		948	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		949
786	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
787		951
788	$self->SUPER::_render;	952	$self->SUPER::_render;
789	}	953	}
790		954
…		…
793	package CFClient::UI::ScrolledWindow;	957	package CFClient::UI::ScrolledWindow;
794		958
795	our @ISA = CFClient::UI::HBox::;	959	our @ISA = CFClient::UI::HBox::;
796		960
797	sub new {	961	sub new {
798	my $class = shift;	962	my ($class, %arg) = @_;
		963
		964	my $child = delete $arg{child};
799		965
800	my $self;	966	my $self;
801		967
802	my $slider = new CFClient::UI::Slider	968	my $slider = new CFClient::UI::Slider
803	vertical => 1,	969	vertical => 1,
804	range => [0, 0, 1, 0.01], # HACK fix	970	range => [0, 0, 1, 0.01], # HACK fix
805	connect_changed => sub {	971	on_changed => sub {
806	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	972	$self->{vp}->set_offset (0, $_[1]);
807	},	973	},
808	;	974	;
809		975
810	$self = $class->SUPER::new (	976	$self = $class->SUPER::new (
811	vp => (new CFClient::UI::ViewPort expand => 1),	977	vp => (new CFClient::UI::ViewPort expand => 1),
812	slider => $slider,	978	slider => $slider,
813	@_,	979	%arg,
814	);	980	);
815		981
816	$self->{vp}->add ($self->{scrolled});
817	$self->add ($self->{vp});
818	$self->add ($self->{slider});	982	$self->SUPER::add ($self->{vp}, $self->{slider});
		983	$self->add ($child) if $child;
819		984
820	$self	985	$self
		986	}
		987
		988	sub add {
		989	my ($self, $widget) = @_;
		990
		991	$self->{vp}->add ($self->{child} = $widget);
		992	}
		993
		994	sub update {
		995	my ($self) = @_;
		996
		997	$self->SUPER::update;
		998
		999	# todo: overwrite size_allocate of child
		1000	my $child = $self->{vp}->child;
		1001	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		1002	}
		1003
		1004	sub size_allocate {
		1005	my ($self, $w, $h) = @_;
		1006
		1007	$self->SUPER::size_allocate ($w, $h);
		1008
		1009	my $child = $self->{vp}->child;
		1010	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
821	}	1011	}
822		1012
823	#TODO# update range on size_allocate depending on child	1013	#TODO# update range on size_allocate depending on child
824	# update viewport offset on scroll	1014	# update viewport offset on scroll
825		1015
…		…
869		1059
870	our @ISA = CFClient::UI::Bin::;	1060	our @ISA = CFClient::UI::Bin::;
871		1061
872	use CFClient::OpenGL;	1062	use CFClient::OpenGL;
873		1063
874	my @tex =	1064	my $bg =
		1065	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1066	mipmap => 1, wrap => 1;
		1067
		1068	my @border =
875	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
876	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1070	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
877		1071
878	sub new {	1072	sub new {
879	my $class = shift;	1073	my ($class, %arg) = @_;
880		1074
881	# TODO: user_x, user_y, overwrite moveto?	1075	my $title = delete $arg{title};
882		1076
883	my $self = $class->SUPER::new (	1077	my $self = $class->SUPER::new (
884	bg => [1, 1, 1, 1],	1078	bg => [1, 1, 1, 1],
885	border_bg => [1, 1, 1, 1],	1079	border_bg => [1, 1, 1, 1],
886	border => 0.6,	1080	border => 0.6,
887	toplevel => 1,
888	can_events => 1,	1081	can_events => 1,
889	@_	1082	min_w => 16,
		1083	min_h => 16,
		1084	%arg,
890	);	1085	);
891		1086
892	$self->{title} &&= new CFClient::UI::Label	1087	$self->{title} = new CFClient::UI::Label
893	align => 0,	1088	align => 0,
894	valign => 1,	1089	valign => 1,
895	text => $self->{title},	1090	text => $title,
896	fontsize => $self->{border};	1091	fontsize => $self->{border}
		1092	if defined $title;
897		1093
898	$self	1094	$self
		1095	}
		1096
		1097	sub add {
		1098	my ($self, @widgets) = @_;
		1099
		1100	$self->SUPER::add (@widgets);
		1101	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
899	}	1102	}
900		1103
901	sub border {	1104	sub border {
902	int $_[0]{border} * $::FONTSIZE	1105	int $_[0]{border} * $::FONTSIZE
903	}	1106	}
904		1107
905	sub size_request {	1108	sub size_request {
906	my ($self) = @_;	1109	my ($self) = @_;
		1110
		1111	$self->{title}->size_request
		1112	if $self->{title};
907		1113
908	my ($w, $h) = $self->SUPER::size_request;	1114	my ($w, $h) = $self->SUPER::size_request;
909		1115
910	(	1116	(
911	$w + $self->border * 2,	1117	$w + $self->border * 2,
…		…
914	}	1120	}
915		1121
916	sub size_allocate {	1122	sub size_allocate {
917	my ($self, $w, $h) = @_;	1123	my ($self, $w, $h) = @_;
918		1124
		1125	if ($self->{title}) {
		1126	$self->{title}{w} = $w;
		1127	$self->{title}{h} = $h;
		1128	$self->{title}->size_allocate ($w, $h);
		1129	}
		1130
		1131	my $border = $self->border;
		1132
919	$h -= List::Util::max 0, $self->border * 2;	1133	$h -= List::Util::max 0, $border * 2;
920	$w -= List::Util::max 0, $self->border * 2;	1134	$w -= List::Util::max 0, $border * 2;
921		1135
922	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
923	if $self->{title};
924
925	$self->child->configure ($self->border, $self->border, $w, $h);	1136	$self->child->configure ($border, $border, $w, $h);
926	}	1137	}
927		1138
928	sub button_down {	1139	sub button_down {
929	my ($self, $ev, $x, $y) = @_;	1140	my ($self, $ev, $x, $y) = @_;
930		1141
…		…
946	my ($ev, $x, $y) = @_;	1157	my ($ev, $x, $y) = @_;
947		1158
948	my $dx = $ev->{x} - $ox;	1159	my $dx = $ev->{x} - $ox;
949	my $dy = $ev->{y} - $oy;	1160	my $dy = $ev->{y} - $oy;
950		1161
951	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1162	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
952	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1163	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1164
		1165	$self->realloc;
953	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
954	$self->check_size;
955	};	1167	};
956		1168
957	} elsif ($lr ^ $td) {	1169	} elsif ($lr ^ $td) {
958	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1170	my ($ox, $oy) = ($ev->{x}, $ev->{y});
959	my ($bx, $by) = ($self->{x}, $self->{y});	1171	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
961	$self->{motion} = sub {	1173	$self->{motion} = sub {
962	my ($ev, $x, $y) = @_;	1174	my ($ev, $x, $y) = @_;
963		1175
964	($x, $y) = ($ev->{x}, $ev->{y});	1176	($x, $y) = ($ev->{x}, $ev->{y});
965		1177
966	$self->move ($bx + $x - $ox, $by + $y - $oy);	1178	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
967	$self->update;
968	};	1179	};
		1180	} else {
		1181	return 0;
		1182	}
		1183
969	}	1184	1
970	}	1185	}
971		1186
972	sub button_up {	1187	sub button_up {
973	my ($self, $ev, $x, $y) = @_;	1188	my ($self, $ev, $x, $y) = @_;
974		1189
975	delete $self->{motion};	1190	!!delete $self->{motion}
976	}	1191	}
977		1192
978	sub mouse_motion {	1193	sub mouse_motion {
979	my ($self, $ev, $x, $y) = @_;	1194	my ($self, $ev, $x, $y) = @_;
980		1195
981	$self->{motion}->($ev, $x, $y) if $self->{motion};	1196	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1197
		1198	!!$self->{motion}
982	}	1199	}
983		1200
984	sub _draw {	1201	sub _draw {
985	my ($self) = @_;	1202	my ($self) = @_;
986		1203
		1204	my $child = $self->{children}[0];
		1205
987	my ($w, $h ) = ($self->{w}, $self->{h});	1206	my ($w, $h ) = ($self->{w}, $self->{h});
988	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1207	my ($cw, $ch) = ($child->{w}, $child->{h});
989		1208
990	glEnable GL_TEXTURE_2D;	1209	glEnable GL_TEXTURE_2D;
991	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1210	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
992		1211
993	my $border = $self->border;	1212	my $border = $self->border;
994		1213
995	glColor @{ $self->{border_bg} };	1214	glColor @{ $self->{border_bg} };
996	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1215	$border[0]->draw_quad_alpha (0, 0, $w, $border);
997	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1216	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
998	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1217	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
999	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1218	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1000		1219
1001	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1220	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1002	my $bg = $tex[0];	1221	glColor @{ $self->{bg} };
1003		1222
1004	# TODO: repeat texture not scale	1223	# TODO: repeat texture not scale
		1224	# solve this better(?)
1005	my $rep_x = $cw / $bg->{w};	1225	$bg->{s} = $cw / $bg->{w};
1006	my $rep_y = $ch / $bg->{h};	1226	$bg->{t} = $ch / $bg->{h};
1007
1008	glColor @{ $self->{bg} };
1009
1010	$bg->{s} = $rep_x;
1011	$bg->{t} = $rep_y;
1012	$bg->{wrap_mode} = 1;
1013	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1227	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1014	}	1228	}
1015		1229
1016	glDisable GL_TEXTURE_2D;	1230	glDisable GL_TEXTURE_2D;
1017		1231
1018	$self->{title}->draw if $self->{title};
1019
1020	$self->child->draw;	1232	$child->draw;
		1233
		1234	if ($self->{title}) {
		1235	glTranslate 0, $border - $self->{h};
		1236	$self->{title}->_draw;
		1237	}
1021	}	1238	}
1022		1239
1023	#############################################################################	1240	#############################################################################
1024		1241
1025	package CFClient::UI::Table;	1242	package CFClient::UI::Table;
…		…
1033	sub new {	1250	sub new {
1034	my $class = shift;	1251	my $class = shift;
1035		1252
1036	$class->SUPER::new (	1253	$class->SUPER::new (
1037	col_expand => [],	1254	col_expand => [],
1038	@_	1255	@_,
1039	)	1256	)
		1257	}
		1258
		1259	sub children {
		1260	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1040	}	1261	}
1041		1262
1042	sub add {	1263	sub add {
1043	my ($self, $x, $y, $child) = @_;	1264	my ($self, $x, $y, $child) = @_;
1044		1265
1045	$child->set_parent ($self);	1266	$child->set_parent ($self);
1046	$self->{children}[$y][$x] = $child;	1267	$self->{children}[$y][$x] = $child;
1047		1268
1048	$child->check_size;	1269	$self->realloc;
1049	}	1270	}
1050		1271
1051	sub children {
1052	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053	}
1054
1055	# TODO: move to container class maybe? send childs a signal on removal?	1272	# TODO: move to container class maybe? send children a signal on removal?
1056	sub clear {	1273	sub clear {
1057	my ($self) = @_;	1274	my ($self) = @_;
1058		1275
1059	my @children = $self->children;	1276	my @children = $self->children;
1060	delete $self->{children};	1277	delete $self->{children};
…		…
1062	for (@children) {	1279	for (@children) {
1063	delete $_->{parent};	1280	delete $_->{parent};
1064	$_->hide;	1281	$_->hide;
1065	}	1282	}
1066		1283
1067	$self->update;	1284	$self->realloc;
1068	}	1285	}
1069		1286
1070	sub get_wh {	1287	sub get_wh {
1071	my ($self) = @_;	1288	my ($self) = @_;
1072		1289
…		…
1103	sub size_allocate {	1320	sub size_allocate {
1104	my ($self, $w, $h) = @_;	1321	my ($self, $w, $h) = @_;
1105		1322
1106	my ($ws, $hs) = $self->get_wh;	1323	my ($ws, $hs) = $self->get_wh;
1107		1324
1108	my $req_w = sum @$ws;	1325	my $req_w = (sum @$ws) || 1;
1109	my $req_h = sum @$hs;	1326	my $req_h = (sum @$hs) || 1;
1110		1327
1111	# TODO: nicer code && do row_expand	1328	# TODO: nicer code && do row_expand
1112	my @col_expand = @{$self->{col_expand}};	1329	my @col_expand = @{$self->{col_expand}};
1113	@col_expand = (1) x @$ws unless @col_expand;	1330	@col_expand = (1) x @$ws unless @col_expand;
1114	my $col_expand = (sum @col_expand) || 1;	1331	my $col_expand = (sum @col_expand) || 1;
…		…
1168	}	1385	}
1169	}	1386	}
1170		1387
1171	#############################################################################	1388	#############################################################################
1172		1389
1173	package CFClient::UI::HBox;	1390	package CFClient::UI::Box;
1174
1175	# TODO: wrap into common Box base class
1176		1391
1177	our @ISA = CFClient::UI::Container::;	1392	our @ISA = CFClient::UI::Container::;
1178		1393
1179	sub size_request {	1394	sub size_request {
1180	my ($self) = @_;	1395	my ($self) = @_;
1181		1396
1182	my @alloc = map [$_->size_request], @{$self->{children}};	1397	$self->{vertical}
1183		1398	? (
1184	(	1399	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1185	(List::Util::sum map $_->[0], @alloc),	1400	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1186	(List::Util::max map $_->[1], @alloc),	1401	)
1187	)	1402	: (
		1403	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1404	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1405	)
1188	}	1406	}
1189		1407
1190	sub size_allocate {	1408	sub size_allocate {
1191	my ($self, $w, $h) = @_;	1409	my ($self, $w, $h) = @_;
1192		1410
1193	($h, $w) = ($w, $h);	1411	my $space = $self->{vertical} ? $h : $w;
1194
1195	my $children = $self->{children};	1412	my $children = $self->{children};
1196		1413
1197	my @h = map $_->{req_w}, @$children;	1414	my @req;
1198		1415
1199	my $req_h = List::Util::sum @h;	1416	if ($self->{homogeneous}) {
1200		1417	@req = ($space / (@$children || 1)) x @$children;
1201	if ($req_h > $h) {
1202	# ah well, not enough space
1203	$_ *= $h / $req_h for @h;
1204	} else {	1418	} else {
		1419	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1420	my $req = List::Util::sum @req;
		1421
		1422	if ($req > $space) {
		1423	# ah well, not enough space
		1424	$_ *= $space / $req for @req;
		1425	} else {
1205	my $exp = List::Util::sum map $_->{expand}, @$children;	1426	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1206	$exp ||= 1;
1207		1427
		1428	$space = ($space - $req) / $expand; # remaining space to give away
		1429
		1430	$req[$_] += $space * $children->[$_]{expand}
1208	for (0 .. $#$children) {	1431	for 0 .. $#$children;
1209	my $child = $children->[$_];
1210
1211	my $alloc_h = $h[$_];
1212	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1213	$h[$_] = $alloc_h;
1214	}	1432	}
1215	}	1433	}
1216		1434
1217	CFClient::UI::harmonize \@h;	1435	CFClient::UI::harmonize \@req;
1218		1436
1219	my $y = 0;	1437	my $pos = 0;
1220	for (0 .. $#$children) {	1438	for (0 .. $#$children) {
1221	my $child = $children->[$_];
1222	my $h = $h[$_];	1439	my $alloc = $req[$_];
1223	$child->configure ($y, 0, $h, $w);	1440	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1224		1441
1225	$y += $h;	1442	$pos += $alloc;
1226	}	1443	}
1227		1444
1228	1	1445	1
1229	}	1446	}
1230		1447
1231	#############################################################################	1448	#############################################################################
1232		1449
		1450	package CFClient::UI::HBox;
		1451
		1452	our @ISA = CFClient::UI::Box::;
		1453
		1454	sub new {
		1455	my $class = shift;
		1456
		1457	$class->SUPER::new (
		1458	vertical => 0,
		1459	@_,
		1460	)
		1461	}
		1462
		1463	#############################################################################
		1464
1233	package CFClient::UI::VBox;	1465	package CFClient::UI::VBox;
1234		1466
1235	# TODO: wrap into common Box base class
1236
1237	our @ISA = CFClient::UI::Container::;	1467	our @ISA = CFClient::UI::Box::;
1238		1468
1239	sub size_request {	1469	sub new {
1240	my ($self) = @_;	1470	my $class = shift;
1241		1471
1242	my @alloc = map [$_->size_request], @{$self->{children}};	1472	$class->SUPER::new (
1243		1473	vertical => 1,
1244	(	1474	@_,
1245	(List::Util::max map $_->[0], @alloc),
1246	(List::Util::sum map $_->[1], @alloc),
1247	)	1475	)
1248	}
1249
1250	sub size_allocate {
1251	my ($self, $w, $h) = @_;
1252
1253	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1254
1255	my $children = $self->{children};
1256
1257	my @h = map $_->{req_h}, @$children;
1258
1259	my $req_h = List::Util::sum @h;
1260
1261	if ($req_h > $h) {
1262	# ah well, not enough space
1263	$_ *= $h / $req_h for @h;
1264	} else {
1265	my $exp = List::Util::sum map $_->{expand}, @$children;
1266	$exp ||= 1;
1267
1268	for (0 .. $#$children) {
1269	my $child = $children->[$_];
1270
1271	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1272	}
1273	}
1274
1275	CFClient::UI::harmonize \@h;
1276
1277	my $y = 0;
1278	for (0 .. $#$children) {
1279	my $child = $children->[$_];
1280	my $h = $h[$_];
1281	$child->configure (0, $y, $w, $h);
1282
1283	$y += $h;
1284	}
1285
1286	1
1287	}	1476	}
1288		1477
1289	#############################################################################	1478	#############################################################################
1290		1479
1291	package CFClient::UI::Label;	1480	package CFClient::UI::Label;
…		…
1308	ellipsise => 3, # end	1497	ellipsise => 3, # end
1309	layout => (new CFClient::Layout),	1498	layout => (new CFClient::Layout),
1310	fontsize => 1,	1499	fontsize => 1,
1311	align => -1,	1500	align => -1,
1312	valign => -1,	1501	valign => -1,
1313	padding => 2,	1502	padding_x => 2,
		1503	padding_y => 2,
1314	can_events => 0,	1504	can_events => 0,
1315	%arg	1505	%arg
1316	);	1506	);
1317		1507
1318	if (exists $self->{template}) {	1508	if (exists $self->{template}) {
…		…
1354	$self->{text} = "T$text";	1544	$self->{text} = "T$text";
1355		1545
1356	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1546	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1357	$self->{layout}->set_text ($text);	1547	$self->{layout}->set_text ($text);
1358		1548
		1549	$self->realloc;
1359	$self->update;	1550	$self->update;
1360	$self->check_size;
1361	}	1551	}
1362		1552
1363	sub set_markup {	1553	sub set_markup {
1364	my ($self, $markup) = @_;	1554	my ($self, $markup) = @_;
1365		1555
…		…
1369	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1559	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1370		1560
1371	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1561	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1372	$self->{layout}->set_markup ($markup);	1562	$self->{layout}->set_markup ($markup);
1373		1563
		1564	$self->realloc;
1374	$self->update;	1565	$self->update;
1375	$self->check_size;
1376	}	1566	}
1377		1567
1378	sub size_request {	1568	sub size_request {
1379	my ($self) = @_;	1569	my ($self) = @_;
1380		1570
…		…
1394		1584
1395	$w = List::Util::max $w, $w2;	1585	$w = List::Util::max $w, $w2;
1396	$h = List::Util::max $h, $h2;	1586	$h = List::Util::max $h, $h2;
1397	}	1587	}
1398		1588
1399	(	1589	($w, $h)
1400	$w + $self->{padding} * 2,
1401	$h + $self->{padding} * 2,
1402	)
1403	}	1590	}
1404		1591
1405	sub size_allocate {	1592	sub size_allocate {
1406	my ($self, $w, $h) = @_;	1593	my ($self, $w, $h) = @_;
1407		1594
		1595	delete $self->{ox};
		1596
1408	delete $self->{texture};	1597	delete $self->{texture}
		1598	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1409	}	1599	}
1410		1600
1411	sub set_fontsize {	1601	sub set_fontsize {
1412	my ($self, $fontsize) = @_;	1602	my ($self, $fontsize) = @_;
1413		1603
1414	$self->{fontsize} = $fontsize;	1604	$self->{fontsize} = $fontsize;
1415	delete $self->{texture};	1605	delete $self->{texture};
1416		1606
1417	$self->update;	1607	$self->realloc;
1418	$self->check_size;
1419	}	1608	}
1420		1609
1421	sub _draw {	1610	sub _draw {
1422	my ($self) = @_;	1611	my ($self) = @_;
1423		1612
…		…
1429	$self->{layout}->set_width ($self->{w});	1618	$self->{layout}->set_width ($self->{w});
1430	$self->{layout}->set_ellipsise ($self->{ellipsise});	1619	$self->{layout}->set_ellipsise ($self->{ellipsise});
1431	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1620	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1432	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1621	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1433		1622
1434	my $tex = new_from_layout CFClient::Texture $self->{layout};	1623	new_from_layout CFClient::Texture $self->{layout}
		1624	};
1435		1625
		1626	unless (exists $self->{ox}) {
1436	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1627	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1437	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1628	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1438	: ($self->{w} - $tex->{w}) * 0.5);	1629	: ($self->{w} - $tex->{w}) * 0.5);
1439		1630
1440	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1631	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1441	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1632	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1442	: ($self->{h} - $tex->{h}) * 0.5);	1633	: ($self->{h} - $tex->{h}) * 0.5);
1443
1444	$tex
1445	};	1634	};
1446		1635
1447	glEnable GL_TEXTURE_2D;	1636	glEnable GL_TEXTURE_2D;
1448	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1637	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1449		1638
…		…
1475	active_fg => [0, 0, 0],	1664	active_fg => [0, 0, 0],
1476	can_hover => 1,	1665	can_hover => 1,
1477	can_focus => 1,	1666	can_focus => 1,
1478	valign => 0,	1667	valign => 0,
1479	can_events => 1,	1668	can_events => 1,
		1669	#text => ...
1480	@_	1670	@_
1481	)	1671	)
1482	}	1672	}
1483		1673
1484	sub _set_text {	1674	sub _set_text {
…		…
1494	$self->{text} = $text;	1684	$self->{text} = $text;
1495		1685
1496	$text =~ s/./*/g if $self->{hidden};	1686	$text =~ s/./*/g if $self->{hidden};
1497	$self->{layout}->set_text ("$text ");	1687	$self->{layout}->set_text ("$text ");
1498		1688
1499	$self->emit (changed => $self->{text});	1689	$self->_emit (changed => $self->{text});
1500	}	1690	}
1501		1691
1502	sub set_text {	1692	sub set_text {
1503	my ($self, $text) = @_;	1693	my ($self, $text) = @_;
1504		1694
1505	$self->{cursor} = length $text;	1695	$self->{cursor} = length $text;
1506	$self->_set_text ($text);	1696	$self->_set_text ($text);
1507	$self->update;	1697
1508	$self->check_size;	1698	$self->realloc;
1509	}	1699	}
1510		1700
1511	sub get_text {	1701	sub get_text {
1512	$_[0]{text}	1702	$_[0]{text}
1513	}	1703	}
…		…
1516	my ($self) = @_;	1706	my ($self) = @_;
1517		1707
1518	my ($w, $h) = $self->SUPER::size_request;	1708	my ($w, $h) = $self->SUPER::size_request;
1519		1709
1520	($w + 1, $h) # add 1 for cursor	1710	($w + 1, $h) # add 1 for cursor
1521	}
1522
1523	sub size_allocate {
1524	my ($self, $w, $h) = @_;
1525
1526	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1527	}	1711	}
1528		1712
1529	sub key_down {	1713	sub key_down {
1530	my ($self, $ev) = @_;	1714	my ($self, $ev) = @_;
1531		1715
…		…
1546	} elsif ($sym == CFClient::SDLK_HOME) {	1730	} elsif ($sym == CFClient::SDLK_HOME) {
1547	$self->{cursor} = 0;	1731	$self->{cursor} = 0;
1548	} elsif ($sym == CFClient::SDLK_END) {	1732	} elsif ($sym == CFClient::SDLK_END) {
1549	$self->{cursor} = length $text;	1733	$self->{cursor} = length $text;
1550	} elsif ($uni == 27) {	1734	} elsif ($uni == 27) {
1551	$self->emit ('escape');	1735	$self->_emit ('escape');
1552	} elsif ($uni) {	1736	} elsif ($uni) {
1553	substr $text, $self->{cursor}++, 0, chr $uni;	1737	substr $text, $self->{cursor}++, 0, chr $uni;
		1738	} else {
		1739	return 0;
1554	}	1740	}
1555		1741
1556	$self->_set_text ($text);	1742	$self->_set_text ($text);
1557	$self->update;	1743
1558	$self->check_size;	1744	$self->realloc;
		1745
		1746	1
1559	}	1747	}
1560		1748
1561	sub focus_in {	1749	sub focus_in {
1562	my ($self) = @_;	1750	my ($self) = @_;
1563		1751
…		…
1578	utf8::encode $text;	1766	utf8::encode $text;
1579	$self->{cursor} = length substr $text, 0, $idx;	1767	$self->{cursor} = length substr $text, 0, $idx;
1580		1768
1581	$self->_set_text ($self->{text});	1769	$self->_set_text ($self->{text});
1582	$self->update;	1770	$self->update;
		1771
		1772	1
1583	}	1773	}
1584		1774
1585	sub mouse_motion {	1775	sub mouse_motion {
1586	my ($self, $ev, $x, $y) = @_;	1776	my ($self, $ev, $x, $y) = @_;
1587	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1777	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1778
		1779	0
1588	}	1780	}
1589		1781
1590	sub _draw {	1782	sub _draw {
1591	my ($self) = @_;	1783	my ($self) = @_;
1592		1784
…		…
1643	if ($sym == 13) {	1835	if ($sym == 13) {
1644	unshift @{$self->{history}},	1836	unshift @{$self->{history}},
1645	my $txt = $self->get_text;	1837	my $txt = $self->get_text;
1646	$self->{history_pointer} = -1;	1838	$self->{history_pointer} = -1;
1647	$self->{history_saveback} = '';	1839	$self->{history_saveback} = '';
1648	$self->emit (activate => $txt);	1840	$self->_emit (activate => $txt);
1649	$self->update;	1841	$self->update;
1650		1842
1651	} elsif ($sym == CFClient::SDLK_UP) {	1843	} elsif ($sym == CFClient::SDLK_UP) {
1652	if ($self->{history_pointer} < 0) {	1844	if ($self->{history_pointer} < 0) {
1653	$self->{history_saveback} = $self->get_text;	1845	$self->{history_saveback} = $self->get_text;
…		…
1669	} else {	1861	} else {
1670	$self->set_text ($self->{history_saveback});	1862	$self->set_text ($self->{history_saveback});
1671	}	1863	}
1672		1864
1673	} else {	1865	} else {
1674	$self->SUPER::key_down ($ev);	1866	return $self->SUPER::key_down ($ev)
		1867	}
		1868
1675	}	1869	1
1676
1677	}	1870	}
1678		1871
1679	#############################################################################	1872	#############################################################################
1680		1873
1681	package CFClient::UI::Button;	1874	package CFClient::UI::Button;
…		…
1690		1883
1691	sub new {	1884	sub new {
1692	my $class = shift;	1885	my $class = shift;
1693		1886
1694	$class->SUPER::new (	1887	$class->SUPER::new (
1695	padding => 4,	1888	padding_x => 4,
		1889	padding_y => 4,
1696	fg => [1, 1, 1],	1890	fg => [1, 1, 1],
1697	active_fg => [0, 0, 1],	1891	active_fg => [0, 0, 1],
1698	can_hover => 1,	1892	can_hover => 1,
1699	align => 0,	1893	align => 0,
1700	valign => 0,	1894	valign => 0,
1701	can_events => 1,	1895	can_events => 1,
1702	@_	1896	@_
1703	)	1897	)
1704	}	1898	}
1705		1899
		1900	sub activate { }
		1901
1706	sub button_up {	1902	sub button_up {
1707	my ($self, $ev, $x, $y) = @_;	1903	my ($self, $ev, $x, $y) = @_;
1708		1904
		1905	$self->emit ("activate")
1709	if ($x >= 0 && $x < $self->{w}	1906	if $x >= 0 && $x < $self->{w}
1710	&& $y >= 0 && $y < $self->{h}) {	1907	&& $y >= 0 && $y < $self->{h};
1711	$self->emit ("activate");	1908
1712	}	1909	1
1713	}	1910	}
1714		1911
1715	sub _draw {	1912	sub _draw {
1716	my ($self) = @_;	1913	my ($self) = @_;
1717		1914
…		…
1746		1943
1747	sub new {	1944	sub new {
1748	my $class = shift;	1945	my $class = shift;
1749		1946
1750	$class->SUPER::new (	1947	$class->SUPER::new (
1751	padding => 2,	1948	padding_x => 2,
		1949	padding_y => 2,
1752	fg => [1, 1, 1],	1950	fg => [1, 1, 1],
1753	active_fg => [1, 1, 0],	1951	active_fg => [1, 1, 0],
1754	bg => [0, 0, 0, 0.2],	1952	bg => [0, 0, 0, 0.2],
1755	active_bg => [1, 1, 1, 0.5],	1953	active_bg => [1, 1, 1, 0.5],
1756	state => 0,	1954	state => 0,
…		…
1760	}	1958	}
1761		1959
1762	sub size_request {	1960	sub size_request {
1763	my ($self) = @_;	1961	my ($self) = @_;
1764		1962
1765	($self->{padding} * 2 + 6) x 2	1963	(6) x 2
1766	}	1964	}
1767		1965
1768	sub button_down {	1966	sub button_down {
1769	my ($self, $ev, $x, $y) = @_;	1967	my ($self, $ev, $x, $y) = @_;
1770		1968
1771	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1969	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1772	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1970	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1773	$self->{state} = !$self->{state};	1971	$self->{state} = !$self->{state};
1774	$self->emit (changed => $self->{state});	1972	$self->_emit (changed => $self->{state});
		1973	} else {
		1974	return 0
		1975	}
		1976
1775	}	1977	1
1776	}	1978	}
1777		1979
1778	sub _draw {	1980	sub _draw {
1779	my ($self) = @_;	1981	my ($self) = @_;
1780		1982
1781	$self->SUPER::_draw;	1983	$self->SUPER::_draw;
1782		1984
1783	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1985	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1784		1986
1785	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1987	my ($w, $h) = @$self{qw(w h)};
		1988
		1989	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1786		1990
1787	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1991	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1788		1992
1789	my $tex = $self->{state} ? $tex[1] : $tex[0];	1993	my $tex = $self->{state} ? $tex[1] : $tex[0];
1790		1994
…		…
2054	my $self = $class->SUPER::new (	2258	my $self = $class->SUPER::new (
2055	fg => [1, 1, 1],	2259	fg => [1, 1, 1],
2056	active_fg => [0, 0, 0],	2260	active_fg => [0, 0, 0],
2057	bg => [0, 0, 0, 0.2],	2261	bg => [0, 0, 0, 0.2],
2058	active_bg => [1, 1, 1, 0.5],	2262	active_bg => [1, 1, 1, 0.5],
2059	range => [0, 0, 100, 10],	2263	range => [0, 0, 100, 10, 0],
2060	req_w => $::WIDTH / 80,	2264	min_w => $::WIDTH / 80,
2061	req_h => $::WIDTH / 80,	2265	min_h => $::WIDTH / 80,
2062	vertical => 0,	2266	vertical => 0,
2063	can_hover => 1,	2267	can_hover => 1,
2064	inner_pad => 0.02,	2268	inner_pad => 0.02,
2065	@_	2269	@_
2066	);	2270	);
…		…
2069	$self->update;	2273	$self->update;
2070		2274
2071	$self	2275	$self
2072	}	2276	}
2073		2277
		2278	sub changed { }
		2279
		2280	sub set_range {
		2281	my ($self, $range) = @_;
		2282
		2283	($range, $self->{range}) = ($self->{range}, $range);
		2284
		2285	$self->update
		2286	if "@$range" ne "@{$self->{range}}";
		2287	}
		2288
2074	sub set_value {	2289	sub set_value {
2075	my ($self, $value) = @_;	2290	my ($self, $value) = @_;
2076		2291
2077	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2292	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2078		2293
2079	$hi = $lo + 1 if $hi <= $lo;	2294	$hi = $lo + 1 if $hi <= $lo;
2080		2295
		2296	$page = $hi - $lo if $page > $hi - $lo;
		2297
2081	$value = $lo if $value < $lo;	2298	$value = $lo if $value < $lo;
2082	$value = $hi if $value > $hi;	2299	$value = $hi - $page if $value > $hi - $page;
2083		2300
2084	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2301	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2085	if $unit;	2302	if $unit;
2086		2303
2087	$page = $hi - $lo if $page > $hi - $lo;
2088
2089	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2304	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2090		2305
2091	if ($value != $old_value) {	2306	if ($value != $old_value) {
2092	$self->emit (changed => $value);	2307	$self->_emit (changed => $value);
2093	$self->update;	2308	$self->update;
2094	}	2309	}
2095	}	2310	}
2096		2311
2097	sub size_request {	2312	sub size_request {
2098	my ($self) = @_;	2313	my ($self) = @_;
2099		2314
2100	my $w = $self->{req_w};	2315	($self->{req_w}, $self->{req_h})
2101	my $h = $self->{req_h};
2102
2103	$self->{vertical} ? ($h, $w) : ($w, $h)
2104	}	2316	}
2105		2317
2106	sub button_down {	2318	sub button_down {
2107	my ($self, $ev, $x, $y) = @_;	2319	my ($self, $ev, $x, $y) = @_;
2108		2320
2109	$self->SUPER::button_down ($ev, $x, $y);	2321	$self->SUPER::button_down ($ev, $x, $y);
		2322
		2323	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2324
2110	$self->mouse_motion ($ev, $x, $y);	2325	$self->mouse_motion ($ev, $x, $y)
2111	}	2326	}
2112		2327
2113	sub mouse_motion {	2328	sub mouse_motion {
2114	my ($self, $ev, $x, $y) = @_;	2329	my ($self, $ev, $x, $y) = @_;
2115		2330
2116	if ($GRAB == $self) {	2331	if ($GRAB == $self) {
2117	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2332	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2118		2333
2119	my (undef, $lo, $hi, $page) = @{$self->{range}};	2334	my (undef, $lo, $hi, $page) = @{$self->{range}};
2120		2335
2121	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2336	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2122		2337
2123	$self->set_value ($x * ($hi - $lo) + $lo);	2338	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2339	} else {
		2340	return 0;
		2341	}
		2342
2124	}	2343	1
2125	}	2344	}
2126		2345
2127	sub update {	2346	sub update {
2128	my ($self) = @_;	2347	my ($self) = @_;
2129		2348
2130	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2349	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2131	$self->set_value ($self->{range}[0]);	2350	$self->set_value ($self->{range}[0]);
2132		2351
2133	my ($value, $lo, $hi, $page) = @{$self->{range}};	2352	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2353	my $range = ($hi - $page - $lo) || 1e-100;
2134		2354
2135	my $inner_w = 1 - 2 * $self->{inner_pad};	2355	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2136		2356
2137	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2357	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2358	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2138		2359
2139	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2360	$value = ($value - $lo) / $range;
2140	$value = $self->{scale} * ($value - $lo);	2361	$value = $value * $self->{scale} + $self->{offset};
2141		2362
2142	$value = $self->{inner_pad} + ($value - $page * 0.5);
2143
2144	$value = 0 if $value < 0;
2145	$page = 1 - $value if $value + $page > 1;
2146
2147	$self->{knob_x} = $value;	2363	$self->{knob_x} = $value - $knob_w * 0.5;
2148	$self->{knob_w} = $page;	2364	$self->{knob_w} = $knob_w;
2149	});	2365	});
2150		2366
2151	$self->SUPER::update;	2367	$self->SUPER::update;
2152	}	2368	}
2153		2369
…		…
2177	# draw handle	2393	# draw handle
2178	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2394	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2179		2395
2180	glDisable GL_TEXTURE_2D;	2396	glDisable GL_TEXTURE_2D;
2181	}	2397	}
		2398
		2399	#############################################################################
		2400
		2401	package CFClient::UI::ValSlider;
		2402
		2403	our @ISA = CFClient::UI::HBox::;
		2404
		2405	sub new {
		2406	my ($class, %arg) = @_;
		2407
		2408	my $range = delete $arg{range};
		2409
		2410	my $self = $class->SUPER::new (
		2411	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2412	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2413	to_value => sub { shift },
		2414	from_value => sub { shift },
		2415	%arg,
		2416	);
		2417
		2418	$self->{slider}->connect (changed => sub {
		2419	my ($self, $value) = @_;
		2420	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2421	$self->{parent}->emit (changed => $value);
		2422	});
		2423
		2424	# $self->{entry}->connect (changed => sub {
		2425	# my ($self, $value) = @_;
		2426	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2427	# $self->{parent}->emit (changed => $value);
		2428	# });
		2429
		2430	$self->add ($self->{slider}, $self->{entry});
		2431
		2432	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2433
		2434	$self
		2435	}
		2436
		2437	sub set_range { shift->{slider}->set_range (@_) }
		2438	sub set_value { shift->{slider}->set_value (@_) }
2182		2439
2183	#############################################################################	2440	#############################################################################
2184		2441
2185	package CFClient::UI::TextView;	2442	package CFClient::UI::TextView;
2186		2443
…		…
2228	$self->{layout}->set_width ($self->{children}[0]{w});	2485	$self->{layout}->set_width ($self->{children}[0]{w});
2229		2486
2230	$self->reflow;	2487	$self->reflow;
2231	}	2488	}
2232		2489
2233	sub text_height {	2490	sub text_size {
2234	my ($self, $text, $indent) = @_;	2491	my ($self, $text, $indent) = @_;
2235		2492
2236	my $layout = $self->{layout};	2493	my $layout = $self->{layout};
2237		2494
2238	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2495	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2239	$layout->set_width ($self->{children}[0]{w} - $indent);	2496	$layout->set_width ($self->{children}[0]{w} - $indent);
2240	$layout->set_markup ($text);	2497	$layout->set_markup ($text);
2241		2498
2242	($layout->size)[1]	2499	$layout->size
2243	}	2500	}
2244		2501
2245	sub reflow {	2502	sub reflow {
2246	my ($self) = @_;	2503	my ($self) = @_;
2247		2504
2248	$self->{need_reflow}++;	2505	$self->{need_reflow}++;
2249	$self->update;	2506	$self->update;
2250	}	2507	}
2251		2508
		2509	sub set_offset {
		2510	my ($self, $offset) = @_;
		2511
		2512	# todo: base offset on lines or so, not on pixels
		2513	$self->{children}[1]->set_value ($offset);
		2514	}
		2515
		2516	sub clear {
		2517	my ($self) = @_;
		2518
		2519	$self->{par} = [];
		2520	$self->{height} = 0;
		2521	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2522	}
		2523
2252	sub add_paragraph {	2524	sub add_paragraph {
2253	my ($self, $color, $text, $indent) = @_;	2525	my ($self, $color, $text, $indent) = @_;
2254		2526
2255	#TODO: intelligently "reformat" paragraph
2256
2257	for my $line (split /\n/, $text) {	2527	for my $line (split /\n/, $text) {
2258	my $height = $self->text_height ($line);	2528	my ($w, $h) = $self->text_size ($line);
2259	$self->{height} += $height;	2529	$self->{height} += $h;
2260	push @{$self->{par}}, [$height, $color, $indent, $line];	2530	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2261	}	2531	}
2262		2532
2263	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2533	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2264	$self->{children}[1]->update;
2265	}	2534	}
2266		2535
2267	sub update {	2536	sub update {
2268	my ($self) = @_;	2537	my ($self) = @_;
2269		2538
…		…
2272	return unless $self->{h} > 0;	2541	return unless $self->{h} > 0;
2273		2542
2274	delete $self->{texture};	2543	delete $self->{texture};
2275		2544
2276	$ROOT->on_post_alloc ($self, sub {	2545	$ROOT->on_post_alloc ($self, sub {
		2546	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2547
2277	if (delete $self->{need_reflow}) {	2548	if (delete $self->{need_reflow}) {
2278	my $height = 0;	2549	my $height = 0;
2279		2550
2280	$height += $_->[0] = $self->text_height ($_->[3], $_->[2])	2551	my $layout = $self->{layout};
		2552
		2553	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2554
2281	for @{$self->{par}};	2555	for (@{$self->{par}}) {
		2556	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2557	$layout->set_width ($W - $_->[3]);
		2558	$layout->set_markup ($_->[4]);
		2559	my ($w, $h) = $layout->size;
		2560	$_->[0] = $w + $_->[3];
		2561	$_->[1] = $h;
		2562	}
		2563
		2564	$height += $_->[1];
		2565	}
2282		2566
2283	$self->{height} = $height;	2567	$self->{height} = $height;
2284		2568
2285	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2569	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2286	$self->{children}[1]->update;
2287		2570
2288	delete $self->{texture};	2571	delete $self->{texture};
2289	}	2572	}
2290		2573
2291	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2574	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2292	glClearColor 0.5, 0.5, 0.5, 0;	2575	glClearColor 0.5, 0.5, 0.5, 0;
2293	glClear GL_COLOR_BUFFER_BIT;	2576	glClear GL_COLOR_BUFFER_BIT;
2294		2577
2295	my $top = int $self->{children}[1]{range}[0];	2578	my $top = int $self->{children}[1]{range}[0];
2296		2579
2297	my $y0 = $top;	2580	my $y0 = $top;
2298	my $y1 = $top + $self->{h};	2581	my $y1 = $top + $H;
2299		2582
2300	my $y = 0;	2583	my $y = 0;
2301		2584
2302	my $layout = $self->{layout};	2585	my $layout = $self->{layout};
2303		2586
2304	$layout->set_font ($self->{font}) if $self->{font};	2587	$layout->set_font ($self->{font}) if $self->{font};
2305		2588
2306	glEnable GL_BLEND;	2589	glEnable GL_BLEND;
		2590	#TODO# not correct in windows where rgba is forced off
2307	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2591	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2308		2592
2309	for my $par (@{$self->{par}}) {	2593	for my $par (@{$self->{par}}) {
2310	my $h = $par->[0];	2594	my $h = $par->[1];
2311		2595
2312	if ($y0 < $y + $h && $y < $y1) {	2596	if ($y0 < $y + $h && $y < $y1) {
2313	$layout->set_foreground (@{ $par->[1] });	2597	$layout->set_foreground (@{ $par->[2] });
2314	$layout->set_width ($self->{w} - $par->[2]);	2598	$layout->set_width ($W - $par->[3]);
2315	$layout->set_markup ($par->[3]);	2599	$layout->set_markup ($par->[4]);
2316		2600
2317	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2601	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2318		2602
2319	glRasterPos $par->[2], $y - $y0;	2603	glRasterPos $par->[3], $y - $y0;
2320	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2604	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2321	}	2605	}
2322		2606
2323	$y += $h;	2607	$y += $h;
2324	}	2608	}
…		…
2391		2675
2392	sub new {	2676	sub new {
2393	my $class = shift;	2677	my $class = shift;
2394		2678
2395	my $self = $class->SUPER::new (	2679	my $self = $class->SUPER::new (
2396	state => 0,	2680	state => 0,
2397	connect_activate => \&toggle_flopper,	2681	on_activate => \&toggle_flopper,
2398	@_	2682	@_
2399	);	2683	);
2400		2684
2401	if ($self->{state}) {
2402	$self->{state} = 0;
2403	$self->toggle_flopper;
2404	}
2405
2406	$self	2685	$self
2407	}	2686	}
2408		2687
2409	sub toggle_flopper {	2688	sub toggle_flopper {
2410	my ($self) = @_;	2689	my ($self) = @_;
2411		2690
2412	# TODO: use animation	2691	$self->{other}->toggle_visibility;
2413	if ($self->{state} = !$self->{state}) {
2414	$CFClient::UI::ROOT->add ($self->{other});
2415	$self->{other}->move ($self->coord2global (0, $self->{h}));
2416	$self->emit ("open");
2417	} else {
2418	$CFClient::UI::ROOT->remove ($self->{other});
2419	$self->emit ("close");
2420	}
2421
2422	$self->emit (changed => $self->{state});
2423	}	2692	}
2424		2693
2425	#############################################################################	2694	#############################################################################
2426		2695
2427	package CFClient::UI::Tooltip;	2696	package CFClient::UI::Tooltip;
…		…
2440	}	2709	}
2441		2710
2442	sub set_tooltip_from {	2711	sub set_tooltip_from {
2443	my ($self, $widget) = @_;	2712	my ($self, $widget) = @_;
2444		2713
		2714	my $tooltip = $widget->{tooltip};
		2715
		2716	if ($ENV{CFPLUS_DEBUG} & 2) {
		2717	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2718	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2719	. "req $widget->{req_w} $widget->{req_h}\n"
		2720	. "visible $widget->{visible}";
		2721	}
		2722
2445	$self->add (new CFClient::UI::Label	2723	$self->add (new CFClient::UI::Label
2446	markup => $widget->{tooltip},	2724	markup => $tooltip,
2447	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2725	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2448	fontsize => 0.8,	2726	fontsize => 0.8,
2449	fg => [0, 0, 0, 1],	2727	fg => [0, 0, 0, 1],
2450	ellipsise => 0,	2728	ellipsise => 0,
2451	font => ($widget->{tooltip_font} || $::FONT_PROP),	2729	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2462		2740
2463	sub size_allocate {	2741	sub size_allocate {
2464	my ($self, $w, $h) = @_;	2742	my ($self, $w, $h) = @_;
2465		2743
2466	$self->SUPER::size_allocate ($w - 4, $h - 4);	2744	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2745	}
		2746
		2747	sub visibility_change {
		2748	my ($self, $visible) = @_;
		2749
		2750	return unless $visible;
		2751
		2752	$self->{root}->on_post_alloc ("move_$self" => sub {
		2753	my $widget = $self->{owner}
		2754	or return;
		2755
		2756	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2757
		2758	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2759	if $x + $self->{w} > $::WIDTH;
		2760
		2761	$self->move_abs ($x, $y);
		2762	});
2467	}	2763	}
2468		2764
2469	sub _draw {	2765	sub _draw {
2470	my ($self) = @_;	2766	my ($self) = @_;
2471		2767
…		…
2488	glVertex $w, $h;	2784	glVertex $w, $h;
2489	glVertex $w, 0;	2785	glVertex $w, 0;
2490	glEnd;	2786	glEnd;
2491		2787
2492	glTranslate 2 - 0.375, 2 - 0.375;	2788	glTranslate 2 - 0.375, 2 - 0.375;
		2789
2493	$self->SUPER::_draw;	2790	$self->SUPER::_draw;
2494	}	2791	}
2495		2792
2496	#############################################################################	2793	#############################################################################
2497		2794
…		…
2503		2800
2504	sub new {	2801	sub new {
2505	my $class = shift;	2802	my $class = shift;
2506		2803
2507	my $self = $class->SUPER::new (	2804	my $self = $class->SUPER::new (
2508	aspect => 1,	2805	aspect => 1,
		2806	can_events => 0,
2509	@_,	2807	@_,
2510	);	2808	);
2511		2809
2512	if ($self->{anim} && $self->{animspeed}) {	2810	if ($self->{anim} && $self->{animspeed}) {
2513	Scalar::Util::weaken (my $widget = $self);	2811	Scalar::Util::weaken (my $widget = $self);
…		…
2539	}	2837	}
2540		2838
2541	sub _draw {	2839	sub _draw {
2542	my ($self) = @_;	2840	my ($self) = @_;
2543		2841
2544	return unless $::CONN;#d# manage and cache textures differently	2842	return unless $::CONN;
2545		2843
2546	my $face;	2844	my $face;
2547		2845
2548	if ($self->{frame}) {	2846	if ($self->{frame}) {
2549	my $anim = $::CONN->{anim}[$self->{anim}];	2847	my $anim = $::CONN->{anim}[$self->{anim}];
…		…
2572	$self->SUPER::DESTROY;	2870	$self->SUPER::DESTROY;
2573	}	2871	}
2574		2872
2575	#############################################################################	2873	#############################################################################
2576		2874
2577	package CFClient::UI::InventoryItem;	2875	package CFClient::UI::Buttonbar;
2578		2876
2579	our @ISA = CFClient::UI::HBox::;	2877	our @ISA = CFClient::UI::HBox::;
2580		2878
2581	sub _item_to_desc {	2879	# TODO: should actualyl wrap buttons and other goodies.
2582	my ($item) = @_;
2583
2584	my $desc =
2585	$item->{nrof} < 2
2586	? $item->{name}
2587	: "$item->{nrof} × $item->{name_pl}";
2588
2589	$item->{flags} & Crossfire::Protocol::F_OPEN
2590	and $desc .= " (open)";
2591	$item->{flags} & Crossfire::Protocol::F_APPLIED
2592	and $desc .= " (applied)";
2593	$item->{flags} & Crossfire::Protocol::F_UNPAID
2594	and $desc .= " (unpaid)";
2595	$item->{flags} & Crossfire::Protocol::F_MAGIC
2596	and $desc .= " (magic)";
2597	$item->{flags} & Crossfire::Protocol::F_CURSED
2598	and $desc .= " (cursed)";
2599	$item->{flags} & Crossfire::Protocol::F_DAMNED
2600	and $desc .= " (damned)";
2601	$item->{flags} & Crossfire::Protocol::F_LOCKED
2602	and $desc .= " *";
2603
2604	$desc
2605	}
2606
2607	sub new {
2608	my $class = shift;
2609
2610	my %args = @_;
2611
2612	my $item = delete $args{item};
2613
2614	my $desc = _item_to_desc ($item);
2615
2616	my $self = $class->SUPER::new (
2617	can_hover => 1,
2618	can_events => 1,
2619	tooltip => ((CFClient::UI::Label::escape $desc)
2620	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2621	connect_button_down => sub {
2622	my ($self, $ev, $x, $y) = @_;
2623
2624	# todo: maybe put examine on 1? but should just be a tooltip :(
2625	if ($ev->{button} == 1) {
2626	my $targ = $::CONN->{player}{tag};
2627
2628	if ($item->{container} == $::CONN->{player}{tag}) {
2629	$targ = $main::OPENCONT;
2630	}
2631
2632	$::CONN->send ("move $targ $item->{tag} 0");
2633	} elsif ($ev->{button} == 2) {
2634	$::CONN->send ("apply $item->{tag}");
2635	} elsif ($ev->{button} == 3) {
2636	my @menu_items = (
2637	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2638	["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2639	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2640	(
2641	$item->{flags} & Crossfire::Protocol::F_LOCKED
2642	? (
2643	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2644	)
2645	: (
2646	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2647	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2648	)
2649	),
2650	);
2651
2652	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2653	}
2654
2655	1
2656	},
2657	%args
2658	);
2659
2660
2661	$self->add (new CFClient::UI::Face
2662	can_events => 0,
2663	face => $item->{face},
2664	anim => $item->{anim},
2665	animspeed => $item->{animspeed},
2666	);
2667
2668	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2669
2670	$self->{item} = $item;
2671
2672	$self->update_item;
2673
2674	$self
2675	}
2676
2677	sub update_item {
2678	my ($self) = @_;
2679
2680	my $desc = _item_to_desc ($self->{item});
2681
2682	$self->{name_lbl}->set_text ($desc);
2683	}
2684
2685	#############################################################################
2686
2687	package CFClient::UI::Inventory;
2688
2689	our @ISA = CFClient::UI::ScrolledWindow::;
2690
2691	sub new {
2692	my $class = shift;
2693
2694	my $self = $class->SUPER::new (
2695	scrolled => (new CFClient::UI::VBox),
2696	@_,
2697	);
2698
2699	$self
2700	}
2701
2702	sub set_items {
2703	my ($self, $items) = @_;
2704
2705	$self->{scrolled}->clear;
2706	return unless $items;
2707
2708	my @items = sort {
2709	($a->{type} <=> $b->{type})
2710	or ($a->{name} cmp $b->{name})
2711	} @$items;
2712
2713	$self->{real_items} = \@items;
2714
2715	for my $item (@items) {
2716	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2717	$item->update_item ();
2718	}
2719
2720	$self->{scrolled}->add (@items);
2721
2722	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2723	}
2724
2725	sub size_request {
2726	my ($self) = @_;
2727	($self->{req_w}, $self->{req_h});
2728	}
2729		2880
2730	#############################################################################	2881	#############################################################################
2731		2882
2732	package CFClient::UI::Menu;	2883	package CFClient::UI::Menu;
2733		2884
…		…
2767		2918
2768	# popup given the event (must be a mouse button down event currently)	2919	# popup given the event (must be a mouse button down event currently)
2769	sub popup {	2920	sub popup {
2770	my ($self, $ev) = @_;	2921	my ($self, $ev) = @_;
2771		2922
2772	$self->emit ("popdown");	2923	$self->_emit ("popdown");
2773		2924
2774	# maybe save $GRAB? must be careful about events...	2925	# maybe save $GRAB? must be careful about events...
2775	$GRAB = $self;	2926	$GRAB = $self;
2776	$self->{button} = $ev->{button};	2927	$self->{button} = $ev->{button};
2777		2928
2778	$self->show;	2929	$self->show;
2779	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2930	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2780	}	2931	}
2781		2932
2782	sub mouse_motion {	2933	sub mouse_motion {
2783	my ($self, $ev, $x, $y) = @_;	2934	my ($self, $ev, $x, $y) = @_;
2784		2935
2785	# TODO: should use vbox->find_widget or so	2936	# TODO: should use vbox->find_widget or so
2786	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2937	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2787	$self->{hover} = $self->{item}{$HOVER};	2938	$self->{hover} = $self->{item}{$HOVER};
		2939
		2940	0
2788	}	2941	}
2789		2942
2790	sub button_up {	2943	sub button_up {
2791	my ($self, $ev, $x, $y) = @_;	2944	my ($self, $ev, $x, $y) = @_;
2792		2945
2793	if ($ev->{button} == $self->{button}) {	2946	if ($ev->{button} == $self->{button}) {
2794	undef $GRAB;	2947	undef $GRAB;
2795	$self->hide;	2948	$self->hide;
2796		2949
2797	$self->emit ("popdown");	2950	$self->_emit ("popdown");
2798	$self->{hover}[1]->() if $self->{hover};	2951	$self->{hover}[1]->() if $self->{hover};
		2952	} else {
		2953	return 0
		2954	}
		2955
		2956	1
		2957	}
		2958
		2959	#############################################################################
		2960
		2961	package CFClient::UI::Multiplexer;
		2962
		2963	our @ISA = CFClient::UI::Container::;
		2964
		2965	sub new {
		2966	my $class = shift;
		2967
		2968	my $self = $class->SUPER::new (
		2969	@_,
		2970	);
		2971
		2972	$self->{current} = $self->{children}[0]
		2973	if @{ $self->{children} };
		2974
		2975	$self
		2976	}
		2977
		2978	sub add {
		2979	my ($self, @widgets) = @_;
		2980
		2981	$self->SUPER::add (@widgets);
		2982
		2983	$self->{current} = $self->{children}[0]
		2984	if @{ $self->{children} };
		2985	}
		2986
		2987	sub set_current_page {
		2988	my ($self, $page_or_widget) = @_;
		2989
		2990	my $widget = ref $page_or_widget
		2991	? $page_or_widget
		2992	: $self->{children}[$page_or_widget];
		2993
		2994	$self->{current} = $widget;
		2995	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2996
		2997	$self->_emit (page_changed => $self->{current});
		2998
		2999	$self->realloc;
		3000	}
		3001
		3002	sub visible_children {
		3003	$_[0]{current}
		3004	}
		3005
		3006	sub size_request {
		3007	my ($self) = @_;
		3008
		3009	$self->{current}->size_request
		3010	}
		3011
		3012	sub size_allocate {
		3013	my ($self, $w, $h) = @_;
		3014
		3015	$self->{current}->configure (0, 0, $w, $h);
		3016	}
		3017
		3018	sub _draw {
		3019	my ($self) = @_;
		3020
		3021	$self->{current}->draw;
		3022	}
		3023
		3024	#############################################################################
		3025
		3026	package CFClient::UI::Notebook;
		3027
		3028	our @ISA = CFClient::UI::VBox::;
		3029
		3030	sub new {
		3031	my $class = shift;
		3032
		3033	my $self = $class->SUPER::new (
		3034	buttonbar => (new CFClient::UI::Buttonbar),
		3035	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3036	# filter => # will be put between multiplexer and $self
		3037	@_,
		3038	);
2799	}	3039
		3040	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3041	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3042
		3043	$self
		3044	}
		3045
		3046	sub add {
		3047	my ($self, $title, $widget, $tooltip) = @_;
		3048
		3049	Scalar::Util::weaken $self;
		3050
		3051	$self->{buttonbar}->add (new CFClient::UI::Button
		3052	markup => $title,
		3053	tooltip => $tooltip,
		3054	on_activate => sub { $self->set_current_page ($widget) },
		3055	);
		3056
		3057	$self->{multiplexer}->add ($widget);
		3058	}
		3059
		3060	sub set_current_page {
		3061	my ($self, $page) = @_;
		3062
		3063	$self->{multiplexer}->set_current_page ($page);
		3064	$self->_emit (page_changed => $self->{multiplexer}{current});
2800	}	3065	}
2801		3066
2802	#############################################################################	3067	#############################################################################
2803		3068
2804	package CFClient::UI::Statusbox;	3069	package CFClient::UI::Statusbox;
…		…
2864	sub add {	3129	sub add {
2865	my ($self, $text, %arg) = @_;	3130	my ($self, $text, %arg) = @_;
2866		3131
2867	$text =~ s/^\s+//;	3132	$text =~ s/^\s+//;
2868	$text =~ s/\s+$//;	3133	$text =~ s/\s+$//;
		3134
		3135	return unless $text;
2869		3136
2870	my $timeout = time + ((delete $arg{timeout}) || 60);	3137	my $timeout = time + ((delete $arg{timeout}) || 60);
2871		3138
2872	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3139	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2873		3140
…		…
2907	$self->SUPER::reconfigure;	3174	$self->SUPER::reconfigure;
2908	}	3175	}
2909		3176
2910	#############################################################################	3177	#############################################################################
2911		3178
2912	package CFClient::UI::Root;	3179	package CFClient::UI::Inventory;
2913		3180
2914	our @ISA = CFClient::UI::Container::;	3181	our @ISA = CFClient::UI::ScrolledWindow::;
2915
2916	use CFClient::OpenGL;
2917		3182
2918	sub new {	3183	sub new {
2919	my $class = shift;	3184	my $class = shift;
2920		3185
2921	$class->SUPER::new (	3186	my $self = $class->SUPER::new (
		3187	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3188	@_,
		3189	);
		3190
		3191	$self
		3192	}
		3193
		3194	sub set_items {
		3195	my ($self, $items) = @_;
		3196
		3197	$self->{child}->clear;
		3198	return unless $items;
		3199
		3200	my @items = sort {
		3201	($a->{type} <=> $b->{type})
		3202	or ($a->{name} cmp $b->{name})
		3203	} @$items;
		3204
		3205	$self->{real_items} = \@items;
		3206
		3207	my $row = 0;
		3208	for my $item (@items) {
		3209	CFClient::Item::update_widgets $item;
		3210
		3211	$self->{child}->add (0, $row, $item->{face_widget});
		3212	$self->{child}->add (1, $row, $item->{desc_widget});
		3213	$self->{child}->add (2, $row, $item->{weight_widget});
		3214
		3215	$row++;
		3216	}
		3217	}
		3218
		3219	#############################################################################
		3220
		3221	package CFClient::UI::BindEditor;
		3222
		3223	our @ISA = CFClient::UI::FancyFrame::;
		3224
		3225	sub new {
		3226	my $class = shift;
		3227
		3228	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3229
		3230	$self->add (my $vb = new CFClient::UI::VBox);
		3231
		3232
		3233	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3234	text => "start recording",
		3235	tooltip => "Start/Stops recording of actions."
		3236	."All subsequent actions after the recording started will be captured."
		3237	."The actions are displayed after the record was stopped."
		3238	."To bind the action you have to click on the 'Bind' button",
		3239	on_activate => sub {
		3240	unless ($self->{recording}) {
		3241	$self->start;
		3242	} else {
		3243	$self->stop;
		3244	}
		3245	});
		3246
		3247	$vb->add (new CFClient::UI::Label text => "Actions:");
		3248	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3249
		3250	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3251	$vb->add (my $hb = new CFClient::UI::HBox);
		3252	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3253	$hb->add (new CFClient::UI::Button
		3254	text => "bind",
		3255	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3256	on_activate => sub {
		3257	$self->ask_for_bind;
		3258	});
		3259
		3260	$vb->add (my $hb = new CFClient::UI::HBox);
		3261	$hb->add (new CFClient::UI::Button
		3262	text => "ok",
		3263	expand => 1,
		3264	tooltip => "This closes the binding editor and saves the binding",
		3265	on_activate => sub {
		3266	$self->hide;
		3267	$self->commit;
		3268	});
		3269
		3270	$hb->add (new CFClient::UI::Button
		3271	text => "cancel",
		3272	expand => 1,
		3273	tooltip => "This closes the binding editor without saving",
		3274	on_activate => sub {
		3275	$self->hide;
		3276	$self->{binding_cancel}->()
		3277	if $self->{binding_cancel};
		3278	});
		3279
		3280	$self->update_binding_widgets;
		3281
		3282	$self
		3283	}
		3284
		3285	sub commit {
		3286	my ($self) = @_;
		3287	my ($mod, $sym, $cmds) = $self->get_binding;
		3288	if ($sym != 0 && @$cmds > 0) {
		3289	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3290	."'. Don't forget 'Save Config'!");
		3291	$self->{binding_change}->($mod, $sym, $cmds)
		3292	if $self->{binding_change};
		3293	} else {
		3294	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3295	$self->{binding_cancel}->()
		3296	if $self->{binding_cancel};
		3297	}
		3298	}
		3299
		3300	sub start {
		3301	my ($self) = @_;
		3302
		3303	$self->{rec_btn}->set_text ("stop recording");
		3304	$self->{recording} = 1;
		3305	$self->clear_command_list;
		3306	$::CONN->start_record if $::CONN;
		3307	}
		3308
		3309	sub stop {
		3310	my ($self) = @_;
		3311
		3312	$self->{rec_btn}->set_text ("start recording");
		3313	$self->{recording} = 0;
		3314
		3315	my $rec;
		3316	$rec = $::CONN->stop_record if $::CONN;
		3317	return unless ref $rec eq 'ARRAY';
		3318	$self->set_command_list ($rec);
		3319	}
		3320
		3321
		3322	sub ask_for_bind_and_commit {
		3323	my ($self) = @_;
		3324	$self->ask_for_bind (1);
		3325	}
		3326
		3327	sub ask_for_bind {
		3328	my ($self, $commit) = @_;
		3329
		3330	CFClient::Binder::open_binding_dialog (sub {
		3331	my ($mod, $sym) = @_;
		3332	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3333	$self->update_binding_widgets;
		3334	$self->commit if $commit;
		3335	});
		3336	}
		3337
		3338	# $mod and $sym are the modifiers and key symbol
		3339	# $cmds is a array ref of strings (the commands)
		3340	# $cb is the callback that is executed on OK
		3341	# $ccb is the callback that is executed on CANCEL and
		3342	# when the binding was unsuccessful on OK
		3343	sub set_binding {
		3344	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3345
		3346	$self->clear_command_list;
		3347	$self->{recording} = 0;
		3348	$self->{rec_btn}->set_text ("start recording");
		3349
		3350	$self->{binding} = [$mod, $sym];
		3351	$self->{commands} = $cmds;
		3352
		3353	$self->{binding_change} = $cb;
		3354	$self->{binding_cancel} = $ccb;
		3355
		3356	$self->update_binding_widgets;
		3357	}
		3358
		3359	# this is a shortcut method that asks for a binding
		3360	# and then just binds it.
		3361	sub do_quick_binding {
		3362	my ($self, $cmds) = @_;
		3363	$self->set_binding (undef, undef, $cmds, sub {
		3364	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3365	});
		3366	$self->ask_for_bind (1);
		3367	}
		3368
		3369	sub update_binding_widgets {
		3370	my ($self) = @_;
		3371	my ($mod, $sym, $cmds) = $self->get_binding;
		3372	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3373	$self->set_command_list ($cmds);
		3374	}
		3375
		3376	sub get_binding {
		3377	my ($self) = @_;
		3378	return (
		3379	$self->{binding}->[0],
		3380	$self->{binding}->[1],
		3381	[ grep { defined $_ } @{$self->{commands}} ]
		3382	);
		3383	}
		3384
		3385	sub clear_command_list {
		3386	my ($self) = @_;
		3387	$self->{cmdbox}->clear ();
		3388	}
		3389
		3390	sub set_command_list {
		3391	my ($self, $cmds) = @_;
		3392
		3393	$self->{cmdbox}->clear ();
		3394	$self->{commands} = $cmds;
		3395
		3396	my $idx = 0;
		3397
		3398	for (@$cmds) {
		3399	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3400
		3401	my $i = $idx;
		3402	$hb->add (new CFClient::UI::Label text => $_);
		3403	$hb->add (new CFClient::UI::Button
		3404	text => "delete",
		3405	tooltip => "Deletes the action from the record",
		3406	on_activate => sub {
		3407	$self->{cmdbox}->remove ($hb);
		3408	$cmds->[$i] = undef;
		3409	});
		3410
		3411
		3412	$idx++
		3413	}
		3414	}
		3415
		3416	#############################################################################
		3417
		3418	package CFClient::UI::SpellList;
		3419
		3420	our @ISA = CFClient::UI::Table::;
		3421
		3422	sub new {
		3423	my $class = shift;
		3424
		3425	my $self = $class->SUPER::new (
		3426	binding => [],
		3427	commands => [],
2922	@_,	3428	@_,
2923	)	3429	)
2924	}	3430	}
2925		3431
2926	sub configure {	3432	# XXX: Do sorting? Argl...
2927	my ($self, $x, $y, $w, $h) = @_;	3433	sub add_spell {
2928
2929	$self->{w} = $w;
2930	$self->{h} = $h;
2931	}
2932
2933	sub check_size {
2934	my ($self) = @_;	3434	my ($self, $spell) = @_;
		3435	$self->{spells}->{$spell->{name}} = $spell;
2935		3436
2936	$self->size_allocate ($self->{w}, $self->{h})	3437	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2937	if $self->{w};	3438	face => $spell->{face},
		3439	can_hover => 1,
		3440	can_events => 1,
		3441	tooltip => $spell->{message});
		3442
		3443	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3444	text => $spell->{name},
		3445	can_hover => 1,
		3446	can_events => 1,
		3447	tooltip => $spell->{message},
		3448	expand => 1);
		3449
		3450	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3451	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3452	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3453	expand => 1);
		3454
		3455	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3456	text => "bind to key",
		3457	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3458	}
		3459
		3460	sub rebuild_spell_list {
		3461	my ($self) = @_;
		3462	$self->{tbl_idx} = 0;
		3463	$self->add_spell ($_) for values %{$self->{spells}};
		3464	}
		3465
		3466	sub remove_spell {
		3467	my ($self, $spell) = @_;
		3468	delete $self->{spells}->{$spell->{name}};
		3469	$self->rebuild_spell_list;
		3470	}
		3471
		3472	#############################################################################
		3473
		3474	package CFClient::UI::Root;
		3475
		3476	our @ISA = CFClient::UI::Container::;
		3477
		3478	use CFClient::OpenGL;
		3479
		3480	sub new {
		3481	my $class = shift;
		3482
		3483	my $self = $class->SUPER::new (
		3484	visible => 1,
		3485	@_,
		3486	);
		3487
		3488	Scalar::Util::weaken ($self->{root} = $self);
		3489
		3490	$self
2938	}	3491	}
2939		3492
2940	sub size_request {	3493	sub size_request {
2941	my ($self) = @_;	3494	my ($self) = @_;
2942		3495
2943	($self->{w}, $self->{h})	3496	($self->{w}, $self->{h})
		3497	}
		3498
		3499	sub _to_pixel {
		3500	my ($coord, $size, $max) = @_;
		3501
		3502	$coord =
		3503	$coord eq "center" ? ($max - $size) * 0.5
		3504	: $coord eq "max" ? $max
		3505	: $coord;
		3506
		3507	$coord = 0 if $coord < 0;
		3508	$coord = $max - $size if $coord > $max - $size;
		3509
		3510	int $coord + 0.5
2944	}	3511	}
2945		3512
2946	sub size_allocate {	3513	sub size_allocate {
2947	my ($self, $w, $h) = @_;	3514	my ($self, $w, $h) = @_;
2948		3515
2949	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2950	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2951
2952	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2953	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2954
2955	for my $child ($self->children) {	3516	for my $child ($self->children) {
2956	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3517	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2957		3518
2958	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3519	$X = $child->{force_x} if exists $child->{force_x};
2959	if exists $child->{req_x};	3520	$Y = $child->{force_y} if exists $child->{force_y};
2960		3521
2961	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3522	$X = _to_pixel $X, $W, $self->{w};
2962	if exists $child->{req_y};	3523	$Y = _to_pixel $Y, $H, $self->{h};
2963
2964	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2965	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2966		3524
2967	$child->configure ($X, $Y, $W, $H);	3525	$child->configure ($X, $Y, $W, $H);
2968	}	3526	}
2969	}	3527	}
2970		3528
…		…
2981	}	3539	}
2982		3540
2983	sub update {	3541	sub update {
2984	my ($self) = @_;	3542	my ($self) = @_;
2985		3543
2986	$self->check_size;
2987	$::WANT_REFRESH++;	3544	$::WANT_REFRESH++;
2988	}	3545	}
2989		3546
2990	sub add {	3547	sub add {
2991	my ($self, @children) = @_;	3548	my ($self, @children) = @_;
2992		3549
2993	for my $child (@children) {
2994	$child->{toplevel} = 1;	3550	$_->{is_toplevel} = 1
2995		3551	for @children;
2996	# integerise window positions
2997	$child->{x} = int $child->{x};
2998	$child->{y} = int $child->{y};
2999	}
3000		3552
3001	$self->SUPER::add (@children);	3553	$self->SUPER::add (@children);
		3554	}
		3555
		3556	sub remove {
		3557	my ($self, @children) = @_;
		3558
		3559	$self->SUPER::remove (@children);
		3560
		3561	delete $self->{is_toplevel}
		3562	for @children;
3002		3563
3003	while (@children) {	3564	while (@children) {
3004	my $w = pop @children;	3565	my $w = pop @children;
3005	push @children, $w->children;	3566	push @children, $w->children;
3006	$w->{visible} = 1;	3567	$w->set_invisible;
3007	}
3008	}
3009
3010	sub remove {
3011	my ($self, @children) = @_;
3012
3013	$self->SUPER::remove (@children);
3014
3015	while (@children) {
3016	my $w = pop @children;
3017	push @children, $w->children;
3018	delete $w->{visible};
3019	}	3568	}
3020	}	3569	}
3021		3570
3022	sub on_refresh {	3571	sub on_refresh {
3023	my ($self, $id, $cb) = @_;	3572	my ($self, $id, $cb) = @_;
…		…
3037	while ($self->{refresh_hook}) {	3586	while ($self->{refresh_hook}) {
3038	$_->()	3587	$_->()
3039	for values %{delete $self->{refresh_hook}};	3588	for values %{delete $self->{refresh_hook}};
3040	}	3589	}
3041		3590
3042	if ($self->{check_size}) {	3591	if ($self->{realloc}) {
3043	my @queue = ([], []);	3592	my %queue;
		3593	my @queue;
		3594	my $widget;
3044		3595
3045	for (;;) {	3596	outer:
3046	if ($self->{check_size}) {	3597	while () {
3047	# heuristic: check containers last	3598	if (my $realloc = delete $self->{realloc}) {
3048	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3599	for $widget (values %$realloc) {
3049	for values %{delete $self->{check_size}}	3600	$widget->{visible} or next; # do not resize invisible widgets
		3601
		3602	$queue{$widget+0}++ and next; # duplicates are common
		3603
		3604	push @{ $queue[$widget->{visible}] }, $widget;
		3605	}
3050	}	3606	}
3051		3607
3052	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3608	while () {
		3609	@queue or last outer;
3053		3610
3054	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3611	$widget = pop @{ $queue[-1] || [] }
3055	? @$widget{qw(user_w user_h)}	3612	and last;
3056	: $widget->size_request;
3057
3058	if (delete $widget->{force_alloc}
3059	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3060	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3061		3613
		3614	pop @queue;
		3615	}
		3616
		3617	delete $queue{$widget+0};
		3618
		3619	my ($w, $h) = $widget->size_request;
		3620
		3621	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3622	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3623
		3624	$w = $widget->{force_w} if exists $widget->{force_w};
		3625	$h = $widget->{force_h} if exists $widget->{force_h};
		3626
		3627	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3628	|| delete $widget->{force_realloc}) {
3062	$widget->{req_w} = $w;	3629	$widget->{req_w} = $w;
3063	$widget->{req_h} = $h;	3630	$widget->{req_h} = $h;
3064		3631
3065	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3632	$self->{size_alloc}{$widget+0} = $widget;
3066		3633
3067	$widget->{parent}->check_size
3068	if $widget->{parent};	3634	if (my $parent = $widget->{parent}) {
		3635	$self->{realloc}{$parent+0} = $parent
		3636	unless $queue{$parent+0};
		3637
		3638	$parent->{force_size_alloc} = 1;
		3639	$self->{size_alloc}{$parent+0} = $parent;
		3640	}
3069	}	3641	}
		3642
		3643	delete $self->{realloc}{$widget+0};
3070	}	3644	}
3071	}	3645	}
3072		3646
3073	while ($self->{size_alloc}) {	3647	while (my $size_alloc = delete $self->{size_alloc}) {
3074	for (values %{delete $self->{size_alloc}}) {	3648	my @queue = sort { $b->{visible} <=> $a->{visible} }
3075	my ($widget, $w, $h) = @$_;	3649	values %$size_alloc;
		3650
		3651	while () {
		3652	my $widget = pop @queue || last;
		3653
		3654	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3076		3655
3077	$w = 0 if $w < 0;	3656	$w = 0 if $w < 0;
3078	$h = 0 if $h < 0;	3657	$h = 0 if $h < 0;
3079		3658
		3659	$w = int $w + 0.5;
		3660	$h = int $h + 0.5;
		3661
		3662	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3663	$widget->{old_w} = $widget->{w};
		3664	$widget->{old_h} = $widget->{h};
		3665
3080	$widget->{w} = $w;	3666	$widget->{w} = $w;
3081	$widget->{h} = $h;	3667	$widget->{h} = $h;
3082	$widget->size_allocate ($w, $h);	3668
3083	$widget->emit (size_allocate => $w, $h);	3669	$widget->emit (size_allocate => $w, $h);
		3670	}
3084	}	3671	}
3085	}	3672	}
3086		3673
3087	while ($self->{post_alloc_hook}) {	3674	while ($self->{post_alloc_hook}) {
3088	$_->()	3675	$_->()
3089	for values %{delete $self->{post_alloc_hook}};	3676	for values %{delete $self->{post_alloc_hook}};
3090	}	3677	}
		3678
3091		3679
3092	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3680	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3093	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3681	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3094	glClear GL_COLOR_BUFFER_BIT;	3682	glClear GL_COLOR_BUFFER_BIT;
3095		3683
…		…
3097	glLoadIdentity;	3685	glLoadIdentity;
3098	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3686	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3099	glMatrixMode GL_MODELVIEW;	3687	glMatrixMode GL_MODELVIEW;
3100	glLoadIdentity;	3688	glLoadIdentity;
3101		3689
		3690	{
		3691	package CFClient::UI::Base;
		3692
		3693	($draw_x, $draw_y, $draw_w, $draw_h) =
		3694	(0, 0, $self->{w}, $self->{h});
		3695	}
		3696
3102	$self->_draw;	3697	$self->_draw;
3103	}	3698	}
3104		3699
3105	#############################################################################	3700	#############################################################################
3106		3701

Diff Legend

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