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

Diff Legend

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