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.237 by root, Thu May 25 21:36:45 2006 UTC vs.
Revision 1.275 by root, Sat Jun 3 22:50:48 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	}
…		…
152	sub rescale_widgets {	171	sub rescale_widgets {
153	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
154		173
155	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
156	if ($widget->{is_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
157	$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.]+$/;
158	$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};
159	$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};
160	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161	$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.]+$/;
162	$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};
163	$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};
164	$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
165	}	189	}
166	}	190	}
167		191
168	reconfigure_widgets;	192	reconfigure_widgets;
169	}	193	}
…		…
178		202
179	sub new {	203	sub new {
180	my $class = shift;	204	my $class = shift;
181		205
182	my $self = bless {	206	my $self = bless {
183	x => 0,	207	x => "center",
184	y => 0,	208	y => "center",
185	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
186	can_events => 1,	212	can_events => 1,
187	@_	213	@_
188	}, $class;	214	}, $class;
189		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
190	for (keys %$self) {	218	for (keys %$self) {
191	if (/^connect_(.*)$/) {	219	if (/^on_(.*)$/) {
192	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
193	}	221	}
194	}	222	}
195		223
196	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	}
197		235
198	$self	236	$self
199	}	237	}
200		238
201	sub destroy {	239	sub destroy {
…		…
205	%$self = ();	243	%$self = ();
206	}	244	}
207		245
208	sub show {	246	sub show {
209	my ($self) = @_;	247	my ($self) = @_;
		248
210	return if $self->{parent};	249	return if $self->{parent};
211		250
212	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
213	}	252	}
214		253
215	sub show_centered {	254	sub set_visible {
216	my ($self) = @_;	255	my ($self) = @_;
		256
217	return if $self->{parent};	257	return if $self->{visible};
218		258
219	$self->show;	259	$self->{root} = $self->{parent}{root};
		260	$self->{visible} = $self->{parent}{visible} + 1;
220		261
221	$CFClient::UI::ROOT->on_post_alloc (	262	$self->emit (visibility_change => 1);
222	"centered $self" => sub {	263
223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);	264	$self->realloc if !exists $self->{req_w};
224	},	265
225	);	266	$_->set_visible for $self->children;
226	}	267	}
227		268
228	sub set_invisible {	269	sub set_invisible {
229	my ($self) = @_;	270	my ($self) = @_;
230		271
231	# broken show/hide model	272	return unless $self->{visible};
232		273
		274	$_->set_invisible for $self->children;
		275
		276	delete $self->{root};
233	delete $self->{visible};	277	delete $self->{visible};
234		278
235	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
236	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
237		281
238	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
239	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
240		284
241	$self->focus_out;	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;
242	}	305	}
243		306
244	sub hide {	307	sub hide {
245	my ($self) = @_;	308	my ($self) = @_;
246		309
…		…
248		311
249	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
250	if $self->{parent};	313	if $self->{parent};
251	}	314	}
252		315
253	sub move {	316	sub move_abs {
254	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
255		318
256	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
257	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
258	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
259		322
260	$self->update;	323	$self->update;
261	}	324	}
262		325
263	sub set_size {	326	sub set_size {
264	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
265		328
266	$self->{user_w} = $w;	329	$self->{force_w} = $w;
267	$self->{user_h} = $h;	330	$self->{force_h} = $h;
268		331
269	$self->check_size;	332	$self->realloc;
270	}	333	}
271		334
272	sub size_request {	335	sub size_request {
273	require Carp;	336	require Carp;
274	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
276		339
277	sub configure {	340	sub configure {
278	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
279		342
280	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
281	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
282	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
283		348
284	# use alignment to adjust x, y	349	# use alignment to adjust x, y
285		350
286	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
287	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
288
289	($w, $h) = ($w2, $h2);
290	}	353	}
291		354
292	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
293	$self->{x} = $x;	356	$self->{x} = $x;
294	$self->{y} = $y;	357	$self->{y} = $y;
295	$self->update;	358	$self->update;
296	}	359	}
297		360
298	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299	$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;
300	}	368	}
301	}	369	}
302		370
303	sub size_allocate {	371	sub size_allocate {
304	# nothing to be done	372	# nothing to be done
305	}	373	}
306		374
307	sub reconfigure {
308	my ($self) = @_;
309
310	$self->check_size (1);
311	$self->update;
312	}
313
314	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
315	}	381	}
316		382
317	sub set_max_size {	383	sub set_max_size {
318	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
319		385
…		…
378		444
379	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	445	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
380	unless $FOCUS;	446	unless $FOCUS;
381	}	447	}
382		448
383	sub mouse_motion { }	449	sub mouse_motion { 0 }
384	sub button_up { }	450	sub button_up { 0 }
385	sub key_down { }	451	sub key_down { 0 }
386	sub key_up { }	452	sub key_up { 0 }
387		453
388	sub button_down {	454	sub button_down {
389	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
390		456
391	$self->focus_in;	457	$self->focus_in;
392	}
393		458
394	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
395	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
396	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	461
397	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	462	sub find_widget {
398	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
399		535
400	sub draw {	536	sub draw {
401	my ($self) = @_;	537	my ($self) = @_;
402		538
403	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);
404		550
405	glPushMatrix;	551	glPushMatrix;
406	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
407	$self->_draw;	553	$self->_draw;
408	glPopMatrix;	554	glPopMatrix;
…		…
420	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
421	glEnd;	567	glEnd;
422	glDisable GL_BLEND;	568	glDisable GL_BLEND;
423	}	569	}
424		570
425	if ($ENV{PCLIENT_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
426	glPushMatrix;	572	glPushMatrix;
427	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
428	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
429	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
430	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
441	my ($self) = @_;	587	my ($self) = @_;
442		588
443	warn "no draw defined for $self\n";	589	warn "no draw defined for $self\n";
444	}	590	}
445		591
446	sub find_widget {
447	my ($self, $x, $y) = @_;
448
449	return () unless $self->{can_events};
450
451	return $self
452	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455	()
456	}
457
458	sub set_parent {
459	my ($self, $parent) = @_;
460
461	Scalar::Util::weaken ($self->{parent} = $parent);
462
463	$self->{root} = $parent->{root};
464	$self->{visible} = $parent->{visible};
465
466	# TODO: req_w _does_change after ->reconfigure
467	$self->check_size
468	unless exists $self->{req_w};
469
470	$self->show;
471	}
472
473	sub check_size {
474	my ($self, $forced) = @_;
475
476	$self->{force_alloc} = 1 if $forced;
477	$CFClient::UI::ROOT->{check_size}{$self} = $self;
478	}
479
480	sub update {
481	my ($self) = @_;
482
483	$self->{parent}->update
484	if $self->{parent};
485	}
486
487	sub connect {
488	my ($self, $signal, $cb) = @_;
489
490	push @{ $self->{signal_cb}{$signal} }, $cb;
491	}
492
493	sub _emit {
494	my ($self, $signal, @args) = @_;
495
496	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497	}
498
499	sub emit {
500	my ($self, $signal, @args) = @_;
501
502	$self->_emit ($signal, @args)
503	|| $self->$signal (@args);
504	}
505
506	sub DESTROY {	592	sub DESTROY {
507	my ($self) = @_;	593	my ($self) = @_;
508		594
509	delete $WIDGET{$self+0};	595	delete $WIDGET{$self+0};
510	#$self->deactivate;	596	#$self->deactivate;
…		…
566	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
567	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
568	}	654	}
569		655
570	sub size_request {	656	sub size_request {
571	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
572	}	660	}
573		661
574	sub draw { }	662	sub draw { }
575		663
576	#############################################################################	664	#############################################################################
…		…
580	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
581		669
582	sub new {	670	sub new {
583	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
584		672
585	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
586		674
587	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
588	children => [],	676	children => [],
589	can_events => 0,	677	can_events => 0,
590	%arg,	678	%arg,
591	);	679	);
		680
592	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
593		683
594	$self	684	$self
595	}	685	}
596		686
597	sub add {	687	sub add {
…		…
605	$self->{children} = [	695	$self->{children} = [
606	sort { $a->{z} <=> $b->{z} }	696	sort { $a->{z} <=> $b->{z} }
607	@{$self->{children}}, @widgets	697	@{$self->{children}}, @widgets
608	];	698	];
609		699
610	$self->check_size (1);	700	$self->realloc;
611	$self->update;
612	}	701	}
613		702
614	sub children {	703	sub children {
615	@{ $_[0]{children} }	704	@{ $_[0]{children} }
616	}	705	}
…		…
621	delete $child->{parent};	710	delete $child->{parent};
622	$child->hide;	711	$child->hide;
623		712
624	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	713	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
625		714
626	$self->check_size (1);	715	$self->realloc;
627	$self->update;
628	}	716	}
629		717
630	sub clear {	718	sub clear {
631	my ($self) = @_;	719	my ($self) = @_;
632		720
…		…
636	for (@$children) {	724	for (@$children) {
637	delete $_->{parent};	725	delete $_->{parent};
638	$_->hide;	726	$_->hide;
639	}	727	}
640		728
641	$self->check_size;	729	$self->realloc;
642	$self->update;
643	}	730	}
644		731
645	sub find_widget {	732	sub find_widget {
646	my ($self, $x, $y) = @_;	733	my ($self, $x, $y) = @_;
647		734
648	$x -= $self->{x};	735	$x -= $self->{x};
649	$y -= $self->{y};	736	$y -= $self->{y};
650		737
651	my $res;	738	my $res;
652		739
653	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
654	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
655	and return $res;	742	and return $res;
656	}	743	}
657		744
658	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
707	$self->{children}[0]->configure (0, 0, $w, $h);	794	$self->{children}[0]->configure (0, 0, $w, $h);
708	}	795	}
709		796
710	#############################################################################	797	#############################################################################
711		798
		799	# back-buffered drawing area
		800
712	package CFClient::UI::Window;	801	package CFClient::UI::Window;
713		802
714	our @ISA = CFClient::UI::Bin::;	803	our @ISA = CFClient::UI::Bin::;
715		804
716	use CFClient::OpenGL;	805	use CFClient::OpenGL;
…		…
734	$self->SUPER::size_allocate ($w, $h);	823	$self->SUPER::size_allocate ($w, $h);
735	$self->update;	824	$self->update;
736	}	825	}
737		826
738	sub _render {	827	sub _render {
		828	my ($self) = @_;
		829
739	$_[0]{children}[0]->draw;	830	$self->{children}[0]->draw;
740	}	831	}
741		832
742	sub render_child {	833	sub render_child {
743	my ($self) = @_;	834	my ($self) = @_;
744		835
745	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	836	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
746	glClearColor 0, 0, 0, 0;	837	glClearColor 0, 0, 0, 0;
747	glClear GL_COLOR_BUFFER_BIT;	838	glClear GL_COLOR_BUFFER_BIT;
748		839
		840	{
		841	package CFClient::UI::Base;
		842
		843	($draw_x, $draw_y, $draw_w, $draw_h) =
		844	(0, 0, $self->{w}, $self->{h});
		845	}
		846
749	$self->_render;	847	$self->_render;
750	};	848	};
751	}	849	}
752		850
753	sub _draw {	851	sub _draw {
754	my ($self) = @_;	852	my ($self) = @_;
755		853
756	my ($w, $h) = ($self->w, $self->h);	854	my ($w, $h) = @$self{qw(w h)};
757		855
758	my $tex = $self->{texture}	856	my $tex = $self->{texture}
759	or return;	857	or return;
760		858
761	glEnable GL_TEXTURE_2D;	859	glEnable GL_TEXTURE_2D;
…		…
784	}	882	}
785		883
786	sub size_request {	884	sub size_request {
787	my ($self) = @_;	885	my ($self) = @_;
788		886
789	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	887	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
790		888
791	@$self{qw(child_w child_h)}	889	$w = 10 if $self->{scroll_x};
		890	$h = 10 if $self->{scroll_y};
		891
		892	($w, $h)
792	}	893	}
793		894
794	sub size_allocate {	895	sub size_allocate {
795	my ($self, $w, $h) = @_;	896	my ($self, $w, $h) = @_;
796		897
		898	my $child = $self->child;
		899
797	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	900	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
798	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	901	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
799		902
800	$self->child->configure (0, 0, $w, $h);	903	$self->child->configure (0, 0, $w, $h);
801	$self->update;	904	$self->update;
802	}	905	}
803		906
…		…
839	}	942	}
840		943
841	sub _render {	944	sub _render {
842	my ($self) = @_;	945	my ($self) = @_;
843		946
		947	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		948	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		949
844	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
845		951
846	$self->SUPER::_render;	952	$self->SUPER::_render;
847	}	953	}
848		954
…		…
851	package CFClient::UI::ScrolledWindow;	957	package CFClient::UI::ScrolledWindow;
852		958
853	our @ISA = CFClient::UI::HBox::;	959	our @ISA = CFClient::UI::HBox::;
854		960
855	sub new {	961	sub new {
856	my $class = shift;	962	my ($class, %arg) = @_;
		963
		964	my $child = delete $arg{child};
857		965
858	my $self;	966	my $self;
859		967
860	my $slider = new CFClient::UI::Slider	968	my $slider = new CFClient::UI::Slider
861	vertical => 1,	969	vertical => 1,
862	range => [0, 0, 1, 0.01], # HACK fix	970	range => [0, 0, 1, 0.01], # HACK fix
863	connect_changed => sub {	971	on_changed => sub {
864	$self->{vp}->set_offset (0, $_[1]);	972	$self->{vp}->set_offset (0, $_[1]);
865	},	973	},
866	;	974	;
867		975
868	$self = $class->SUPER::new (	976	$self = $class->SUPER::new (
869	vp => (new CFClient::UI::ViewPort expand => 1),	977	vp => (new CFClient::UI::ViewPort expand => 1),
870	slider => $slider,	978	slider => $slider,
871	@_,	979	%arg,
872	);	980	);
873		981
874	$self->{vp}->add ($self->{scrolled});
875	$self->add ($self->{vp});
876	$self->add ($self->{slider});	982	$self->SUPER::add ($self->{vp}, $self->{slider});
		983	$self->add ($child) if $child;
877		984
878	$self	985	$self
		986	}
		987
		988	sub add {
		989	my ($self, $widget) = @_;
		990
		991	$self->{vp}->add ($self->{child} = $widget);
		992	}
		993
		994	sub update {
		995	my ($self) = @_;
		996
		997	$self->SUPER::update;
		998
		999	# todo: overwrite size_allocate of child
		1000	my $child = $self->{vp}->child;
		1001	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
879	}	1002	}
880		1003
881	sub size_allocate {	1004	sub size_allocate {
882	my ($self, $w, $h) = @_;	1005	my ($self, $w, $h) = @_;
883		1006
…		…
936		1059
937	our @ISA = CFClient::UI::Bin::;	1060	our @ISA = CFClient::UI::Bin::;
938		1061
939	use CFClient::OpenGL;	1062	use CFClient::OpenGL;
940		1063
941	my @tex =	1064	my $bg =
		1065	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
		1066	mipmap => 1, wrap => 1;
		1067
		1068	my @border =
942	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
943	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1070	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
944		1071
945	sub new {	1072	sub new {
946	my $class = shift;	1073	my ($class, %arg) = @_;
947		1074
948	# TODO: user_x, user_y, overwrite moveto?	1075	my $title = delete $arg{title};
949		1076
950	my $self = $class->SUPER::new (	1077	my $self = $class->SUPER::new (
951	bg => [1, 1, 1, 1],	1078	bg => [1, 1, 1, 1],
952	border_bg => [1, 1, 1, 1],	1079	border_bg => [1, 1, 1, 1],
953	border => 0.6,	1080	border => 0.6,
954	is_toplevel => 1,
955	can_events => 1,	1081	can_events => 1,
956	@_	1082	min_w => 16,
		1083	min_h => 16,
		1084	%arg,
957	);	1085	);
958		1086
959	$self->{title} &&= new CFClient::UI::Label	1087	$self->{title} = new CFClient::UI::Label
960	align => 0,	1088	align => 0,
961	valign => 1,	1089	valign => 1,
962	text => $self->{title},	1090	text => $title,
963	fontsize => $self->{border};	1091	fontsize => $self->{border}
		1092	if defined $title;
964		1093
965	$self	1094	$self
		1095	}
		1096
		1097	sub add {
		1098	my ($self, @widgets) = @_;
		1099
		1100	$self->SUPER::add (@widgets);
		1101	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
966	}	1102	}
967		1103
968	sub border {	1104	sub border {
969	int $_[0]{border} * $::FONTSIZE	1105	int $_[0]{border} * $::FONTSIZE
970	}	1106	}
971		1107
972	sub size_request {	1108	sub size_request {
973	my ($self) = @_;	1109	my ($self) = @_;
		1110
		1111	$self->{title}->size_request
		1112	if $self->{title};
974		1113
975	my ($w, $h) = $self->SUPER::size_request;	1114	my ($w, $h) = $self->SUPER::size_request;
976		1115
977	(	1116	(
978	$w + $self->border * 2,	1117	$w + $self->border * 2,
…		…
981	}	1120	}
982		1121
983	sub size_allocate {	1122	sub size_allocate {
984	my ($self, $w, $h) = @_;	1123	my ($self, $w, $h) = @_;
985		1124
		1125	if ($self->{title}) {
		1126	$self->{title}{w} = $w;
		1127	$self->{title}{h} = $h;
		1128	$self->{title}->size_allocate ($w, $h);
		1129	}
		1130
		1131	my $border = $self->border;
		1132
986	$h -= List::Util::max 0, $self->border * 2;	1133	$h -= List::Util::max 0, $border * 2;
987	$w -= List::Util::max 0, $self->border * 2;	1134	$w -= List::Util::max 0, $border * 2;
988		1135
989	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
990	if $self->{title};
991
992	$self->child->configure ($self->border, $self->border, $w, $h);	1136	$self->child->configure ($border, $border, $w, $h);
993	}	1137	}
994		1138
995	sub button_down {	1139	sub button_down {
996	my ($self, $ev, $x, $y) = @_;	1140	my ($self, $ev, $x, $y) = @_;
997		1141
…		…
1013	my ($ev, $x, $y) = @_;	1157	my ($ev, $x, $y) = @_;
1014		1158
1015	my $dx = $ev->{x} - $ox;	1159	my $dx = $ev->{x} - $ox;
1016	my $dy = $ev->{y} - $oy;	1160	my $dy = $ev->{y} - $oy;
1017		1161
1018	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1162	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1019	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1163	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1164
		1165	$self->realloc;
1020	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1021	$self->check_size;
1022	};	1167	};
1023		1168
1024	} elsif ($lr ^ $td) {	1169	} elsif ($lr ^ $td) {
1025	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1170	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1026	my ($bx, $by) = ($self->{x}, $self->{y});	1171	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1028	$self->{motion} = sub {	1173	$self->{motion} = sub {
1029	my ($ev, $x, $y) = @_;	1174	my ($ev, $x, $y) = @_;
1030		1175
1031	($x, $y) = ($ev->{x}, $ev->{y});	1176	($x, $y) = ($ev->{x}, $ev->{y});
1032		1177
1033	$self->move ($bx + $x - $ox, $by + $y - $oy);	1178	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1034	$self->update;
1035	};	1179	};
		1180	} else {
		1181	return 0;
		1182	}
		1183
1036	}	1184	1
1037	}	1185	}
1038		1186
1039	sub button_up {	1187	sub button_up {
1040	my ($self, $ev, $x, $y) = @_;	1188	my ($self, $ev, $x, $y) = @_;
1041		1189
1042	delete $self->{motion};	1190	!!delete $self->{motion}
1043	}	1191	}
1044		1192
1045	sub mouse_motion {	1193	sub mouse_motion {
1046	my ($self, $ev, $x, $y) = @_;	1194	my ($self, $ev, $x, $y) = @_;
1047		1195
1048	$self->{motion}->($ev, $x, $y) if $self->{motion};	1196	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1197
		1198	!!$self->{motion}
1049	}	1199	}
1050		1200
1051	sub _draw {	1201	sub _draw {
1052	my ($self) = @_;	1202	my ($self) = @_;
1053		1203
		1204	my $child = $self->{children}[0];
		1205
1054	my ($w, $h ) = ($self->{w}, $self->{h});	1206	my ($w, $h ) = ($self->{w}, $self->{h});
1055	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1207	my ($cw, $ch) = ($child->{w}, $child->{h});
1056		1208
1057	glEnable GL_TEXTURE_2D;	1209	glEnable GL_TEXTURE_2D;
1058	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1210	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1059		1211
1060	my $border = $self->border;	1212	my $border = $self->border;
1061		1213
1062	glColor @{ $self->{border_bg} };	1214	glColor @{ $self->{border_bg} };
1063	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1215	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1064	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1216	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1065	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1217	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1066	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1218	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1067		1219
1068	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1220	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1069	my $bg = $tex[0];	1221	glColor @{ $self->{bg} };
1070		1222
1071	# TODO: repeat texture not scale	1223	# TODO: repeat texture not scale
		1224	# solve this better(?)
1072	my $rep_x = $cw / $bg->{w};	1225	$bg->{s} = $cw / $bg->{w};
1073	my $rep_y = $ch / $bg->{h};	1226	$bg->{t} = $ch / $bg->{h};
1074
1075	glColor @{ $self->{bg} };
1076
1077	$bg->{s} = $rep_x;
1078	$bg->{t} = $rep_y;
1079	$bg->{wrap_mode} = 1;
1080	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1227	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1081	}	1228	}
1082		1229
1083	glDisable GL_TEXTURE_2D;	1230	glDisable GL_TEXTURE_2D;
1084		1231
1085	$self->{title}->draw if $self->{title};
1086
1087	$self->child->draw;	1232	$child->draw;
		1233
		1234	if ($self->{title}) {
		1235	glTranslate 0, $border - $self->{h};
		1236	$self->{title}->_draw;
		1237	}
1088	}	1238	}
1089		1239
1090	#############################################################################	1240	#############################################################################
1091		1241
1092	package CFClient::UI::Table;	1242	package CFClient::UI::Table;
…		…
1114	my ($self, $x, $y, $child) = @_;	1264	my ($self, $x, $y, $child) = @_;
1115		1265
1116	$child->set_parent ($self);	1266	$child->set_parent ($self);
1117	$self->{children}[$y][$x] = $child;	1267	$self->{children}[$y][$x] = $child;
1118		1268
1119	$self->check_size (1);	1269	$self->realloc;
1120	}	1270	}
1121		1271
1122	# TODO: move to container class maybe? send children a signal on removal?	1272	# TODO: move to container class maybe? send children a signal on removal?
1123	sub clear {	1273	sub clear {
1124	my ($self) = @_;	1274	my ($self) = @_;
…		…
1129	for (@children) {	1279	for (@children) {
1130	delete $_->{parent};	1280	delete $_->{parent};
1131	$_->hide;	1281	$_->hide;
1132	}	1282	}
1133		1283
1134	$self->check_size (1);	1284	$self->realloc;
1135	$self->update;
1136	}	1285	}
1137		1286
1138	sub get_wh {	1287	sub get_wh {
1139	my ($self) = @_;	1288	my ($self) = @_;
1140		1289
…		…
1171	sub size_allocate {	1320	sub size_allocate {
1172	my ($self, $w, $h) = @_;	1321	my ($self, $w, $h) = @_;
1173		1322
1174	my ($ws, $hs) = $self->get_wh;	1323	my ($ws, $hs) = $self->get_wh;
1175		1324
1176	my $req_w = sum @$ws;	1325	my $req_w = (sum @$ws) || 1;
1177	my $req_h = sum @$hs;	1326	my $req_h = (sum @$hs) || 1;
1178		1327
1179	# TODO: nicer code && do row_expand	1328	# TODO: nicer code && do row_expand
1180	my @col_expand = @{$self->{col_expand}};	1329	my @col_expand = @{$self->{col_expand}};
1181	@col_expand = (1) x @$ws unless @col_expand;	1330	@col_expand = (1) x @$ws unless @col_expand;
1182	my $col_expand = (sum @col_expand) || 1;	1331	my $col_expand = (sum @col_expand) || 1;
…		…
1236	}	1385	}
1237	}	1386	}
1238		1387
1239	#############################################################################	1388	#############################################################################
1240		1389
1241	package CFClient::UI::HBox;	1390	package CFClient::UI::Box;
1242
1243	# TODO: wrap into common Box base class
1244		1391
1245	our @ISA = CFClient::UI::Container::;	1392	our @ISA = CFClient::UI::Container::;
1246		1393
1247	sub size_request {	1394	sub size_request {
1248	my ($self) = @_;	1395	my ($self) = @_;
1249		1396
1250	my @alloc = map [$_->size_request], @{$self->{children}};	1397	$self->{vertical}
1251		1398	? (
1252	(	1399	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1253	(List::Util::sum map $_->[0], @alloc),	1400	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1254	(List::Util::max map $_->[1], @alloc),	1401	)
1255	)	1402	: (
		1403	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1404	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1405	)
1256	}	1406	}
1257		1407
1258	sub size_allocate {	1408	sub size_allocate {
1259	my ($self, $w, $h) = @_;	1409	my ($self, $w, $h) = @_;
1260		1410
1261	($h, $w) = ($w, $h);	1411	my $space = $self->{vertical} ? $h : $w;
1262
1263	my $children = $self->{children};	1412	my $children = $self->{children};
1264		1413
1265	my @h = map $_->{req_w}, @$children;	1414	my @req;
1266		1415
1267	my $req_h = List::Util::sum @h;	1416	if ($self->{homogeneous}) {
1268		1417	@req = ($space / (@$children || 1)) x @$children;
1269	if ($req_h > $h) {
1270	# ah well, not enough space
1271	$_ *= $h / $req_h for @h;
1272	} else {	1418	} else {
		1419	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1420	my $req = List::Util::sum @req;
		1421
		1422	if ($req > $space) {
		1423	# ah well, not enough space
		1424	$_ *= $space / $req for @req;
		1425	} else {
1273	my $exp = List::Util::sum map $_->{expand}, @$children;	1426	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1274	$exp ||= 1;
1275		1427
		1428	$space = ($space - $req) / $expand; # remaining space to give away
		1429
		1430	$req[$_] += $space * $children->[$_]{expand}
1276	for (0 .. $#$children) {	1431	for 0 .. $#$children;
1277	my $child = $children->[$_];
1278
1279	my $alloc_h = $h[$_];
1280	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1281	$h[$_] = $alloc_h;
1282	}	1432	}
1283	}	1433	}
1284		1434
1285	CFClient::UI::harmonize \@h;	1435	CFClient::UI::harmonize \@req;
1286		1436
1287	my $y = 0;	1437	my $pos = 0;
1288	for (0 .. $#$children) {	1438	for (0 .. $#$children) {
1289	my $child = $children->[$_];
1290	my $h = $h[$_];	1439	my $alloc = $req[$_];
1291	$child->configure ($y, 0, $h, $w);	1440	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1292		1441
1293	$y += $h;	1442	$pos += $alloc;
1294	}	1443	}
1295		1444
1296	1	1445	1
1297	}	1446	}
1298		1447
1299	#############################################################################	1448	#############################################################################
1300		1449
		1450	package CFClient::UI::HBox;
		1451
		1452	our @ISA = CFClient::UI::Box::;
		1453
		1454	sub new {
		1455	my $class = shift;
		1456
		1457	$class->SUPER::new (
		1458	vertical => 0,
		1459	@_,
		1460	)
		1461	}
		1462
		1463	#############################################################################
		1464
1301	package CFClient::UI::VBox;	1465	package CFClient::UI::VBox;
1302		1466
1303	# TODO: wrap into common Box base class
1304
1305	our @ISA = CFClient::UI::Container::;	1467	our @ISA = CFClient::UI::Box::;
1306		1468
1307	sub size_request {	1469	sub new {
1308	my ($self) = @_;	1470	my $class = shift;
1309		1471
1310	my @alloc = map [$_->size_request], @{$self->{children}};	1472	$class->SUPER::new (
1311		1473	vertical => 1,
1312	(	1474	@_,
1313	(List::Util::max map $_->[0], @alloc),
1314	(List::Util::sum map $_->[1], @alloc),
1315	)	1475	)
1316	}
1317
1318	sub size_allocate {
1319	my ($self, $w, $h) = @_;
1320
1321	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1322
1323	my $children = $self->{children};
1324
1325	my @h = map $_->{req_h}, @$children;
1326
1327	my $req_h = List::Util::sum @h;
1328
1329	if ($req_h > $h) {
1330	# ah well, not enough space
1331	$_ *= $h / $req_h for @h;
1332	} else {
1333	my $exp = List::Util::sum map $_->{expand}, @$children;
1334	$exp ||= 1;
1335
1336	for (0 .. $#$children) {
1337	my $child = $children->[$_];
1338
1339	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1340	}
1341	}
1342
1343	CFClient::UI::harmonize \@h;
1344
1345	my $y = 0;
1346	for (0 .. $#$children) {
1347	my $child = $children->[$_];
1348	my $h = $h[$_];
1349	$child->configure (0, $y, $w, $h);
1350
1351	$y += $h;
1352	}
1353
1354	1
1355	}	1476	}
1356		1477
1357	#############################################################################	1478	#############################################################################
1358		1479
1359	package CFClient::UI::Label;	1480	package CFClient::UI::Label;
…		…
1376	ellipsise => 3, # end	1497	ellipsise => 3, # end
1377	layout => (new CFClient::Layout),	1498	layout => (new CFClient::Layout),
1378	fontsize => 1,	1499	fontsize => 1,
1379	align => -1,	1500	align => -1,
1380	valign => -1,	1501	valign => -1,
1381	padding => 2,	1502	padding_x => 2,
		1503	padding_y => 2,
1382	can_events => 0,	1504	can_events => 0,
1383	%arg	1505	%arg
1384	);	1506	);
1385		1507
1386	if (exists $self->{template}) {	1508	if (exists $self->{template}) {
…		…
1422	$self->{text} = "T$text";	1544	$self->{text} = "T$text";
1423		1545
1424	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1546	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1425	$self->{layout}->set_text ($text);	1547	$self->{layout}->set_text ($text);
1426		1548
		1549	$self->realloc;
1427	$self->update;	1550	$self->update;
1428	$self->check_size;
1429	}	1551	}
1430		1552
1431	sub set_markup {	1553	sub set_markup {
1432	my ($self, $markup) = @_;	1554	my ($self, $markup) = @_;
1433		1555
…		…
1437	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1559	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1438		1560
1439	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1561	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1440	$self->{layout}->set_markup ($markup);	1562	$self->{layout}->set_markup ($markup);
1441		1563
		1564	$self->realloc;
1442	$self->update;	1565	$self->update;
1443	$self->check_size;
1444	}	1566	}
1445		1567
1446	sub size_request {	1568	sub size_request {
1447	my ($self) = @_;	1569	my ($self) = @_;
1448		1570
…		…
1462		1584
1463	$w = List::Util::max $w, $w2;	1585	$w = List::Util::max $w, $w2;
1464	$h = List::Util::max $h, $h2;	1586	$h = List::Util::max $h, $h2;
1465	}	1587	}
1466		1588
1467	(	1589	($w, $h)
1468	$w + $self->{padding} * 2,
1469	$h + $self->{padding} * 2,
1470	)
1471	}	1590	}
1472		1591
1473	sub size_allocate {	1592	sub size_allocate {
1474	my ($self, $w, $h) = @_;	1593	my ($self, $w, $h) = @_;
1475		1594
		1595	delete $self->{ox};
		1596
1476	delete $self->{texture};	1597	delete $self->{texture}
		1598	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1477	}	1599	}
1478		1600
1479	sub set_fontsize {	1601	sub set_fontsize {
1480	my ($self, $fontsize) = @_;	1602	my ($self, $fontsize) = @_;
1481		1603
1482	$self->{fontsize} = $fontsize;	1604	$self->{fontsize} = $fontsize;
1483	delete $self->{texture};	1605	delete $self->{texture};
1484		1606
1485	$self->update;	1607	$self->realloc;
1486	$self->check_size;
1487	}	1608	}
1488		1609
1489	sub _draw {	1610	sub _draw {
1490	my ($self) = @_;	1611	my ($self) = @_;
1491		1612
…		…
1497	$self->{layout}->set_width ($self->{w});	1618	$self->{layout}->set_width ($self->{w});
1498	$self->{layout}->set_ellipsise ($self->{ellipsise});	1619	$self->{layout}->set_ellipsise ($self->{ellipsise});
1499	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1620	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1500	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1621	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1501		1622
1502	my $tex = new_from_layout CFClient::Texture $self->{layout};	1623	new_from_layout CFClient::Texture $self->{layout}
		1624	};
1503		1625
		1626	unless (exists $self->{ox}) {
1504	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1627	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1505	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1628	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1506	: ($self->{w} - $tex->{w}) * 0.5);	1629	: ($self->{w} - $tex->{w}) * 0.5);
1507		1630
1508	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1631	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1509	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1632	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1510	: ($self->{h} - $tex->{h}) * 0.5);	1633	: ($self->{h} - $tex->{h}) * 0.5);
1511
1512	$tex
1513	};	1634	};
1514		1635
1515	glEnable GL_TEXTURE_2D;	1636	glEnable GL_TEXTURE_2D;
1516	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1637	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1517		1638
…		…
1571	sub set_text {	1692	sub set_text {
1572	my ($self, $text) = @_;	1693	my ($self, $text) = @_;
1573		1694
1574	$self->{cursor} = length $text;	1695	$self->{cursor} = length $text;
1575	$self->_set_text ($text);	1696	$self->_set_text ($text);
1576	$self->update;	1697
1577	$self->check_size;	1698	$self->realloc;
1578	}	1699	}
1579		1700
1580	sub get_text {	1701	sub get_text {
1581	$_[0]{text}	1702	$_[0]{text}
1582	}	1703	}
…		…
1612	$self->{cursor} = length $text;	1733	$self->{cursor} = length $text;
1613	} elsif ($uni == 27) {	1734	} elsif ($uni == 27) {
1614	$self->_emit ('escape');	1735	$self->_emit ('escape');
1615	} elsif ($uni) {	1736	} elsif ($uni) {
1616	substr $text, $self->{cursor}++, 0, chr $uni;	1737	substr $text, $self->{cursor}++, 0, chr $uni;
		1738	} else {
		1739	return 0;
1617	}	1740	}
1618		1741
1619	$self->_set_text ($text);	1742	$self->_set_text ($text);
1620	$self->update;	1743
1621	$self->check_size;	1744	$self->realloc;
		1745
		1746	1
1622	}	1747	}
1623		1748
1624	sub focus_in {	1749	sub focus_in {
1625	my ($self) = @_;	1750	my ($self) = @_;
1626		1751
…		…
1641	utf8::encode $text;	1766	utf8::encode $text;
1642	$self->{cursor} = length substr $text, 0, $idx;	1767	$self->{cursor} = length substr $text, 0, $idx;
1643		1768
1644	$self->_set_text ($self->{text});	1769	$self->_set_text ($self->{text});
1645	$self->update;	1770	$self->update;
		1771
		1772	1
1646	}	1773	}
1647		1774
1648	sub mouse_motion {	1775	sub mouse_motion {
1649	my ($self, $ev, $x, $y) = @_;	1776	my ($self, $ev, $x, $y) = @_;
1650	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1777	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1778
		1779	0
1651	}	1780	}
1652		1781
1653	sub _draw {	1782	sub _draw {
1654	my ($self) = @_;	1783	my ($self) = @_;
1655		1784
…		…
1732	} else {	1861	} else {
1733	$self->set_text ($self->{history_saveback});	1862	$self->set_text ($self->{history_saveback});
1734	}	1863	}
1735		1864
1736	} else {	1865	} else {
1737	$self->SUPER::key_down ($ev);	1866	return $self->SUPER::key_down ($ev)
		1867	}
		1868
1738	}	1869	1
1739
1740	}	1870	}
1741		1871
1742	#############################################################################	1872	#############################################################################
1743		1873
1744	package CFClient::UI::Button;	1874	package CFClient::UI::Button;
…		…
1753		1883
1754	sub new {	1884	sub new {
1755	my $class = shift;	1885	my $class = shift;
1756		1886
1757	$class->SUPER::new (	1887	$class->SUPER::new (
1758	padding => 4,	1888	padding_x => 4,
		1889	padding_y => 4,
1759	fg => [1, 1, 1],	1890	fg => [1, 1, 1],
1760	active_fg => [0, 0, 1],	1891	active_fg => [0, 0, 1],
1761	can_hover => 1,	1892	can_hover => 1,
1762	align => 0,	1893	align => 0,
1763	valign => 0,	1894	valign => 0,
…		…
1772	my ($self, $ev, $x, $y) = @_;	1903	my ($self, $ev, $x, $y) = @_;
1773		1904
1774	$self->emit ("activate")	1905	$self->emit ("activate")
1775	if $x >= 0 && $x < $self->{w}	1906	if $x >= 0 && $x < $self->{w}
1776	&& $y >= 0 && $y < $self->{h};	1907	&& $y >= 0 && $y < $self->{h};
		1908
		1909	1
1777	}	1910	}
1778		1911
1779	sub _draw {	1912	sub _draw {
1780	my ($self) = @_;	1913	my ($self) = @_;
1781		1914
…		…
1810		1943
1811	sub new {	1944	sub new {
1812	my $class = shift;	1945	my $class = shift;
1813		1946
1814	$class->SUPER::new (	1947	$class->SUPER::new (
1815	padding => 2,	1948	padding_x => 2,
		1949	padding_y => 2,
1816	fg => [1, 1, 1],	1950	fg => [1, 1, 1],
1817	active_fg => [1, 1, 0],	1951	active_fg => [1, 1, 0],
1818	bg => [0, 0, 0, 0.2],	1952	bg => [0, 0, 0, 0.2],
1819	active_bg => [1, 1, 1, 0.5],	1953	active_bg => [1, 1, 1, 0.5],
1820	state => 0,	1954	state => 0,
…		…
1824	}	1958	}
1825		1959
1826	sub size_request {	1960	sub size_request {
1827	my ($self) = @_;	1961	my ($self) = @_;
1828		1962
1829	($self->{padding} * 2 + 6) x 2	1963	(6) x 2
1830	}	1964	}
1831		1965
1832	sub button_down {	1966	sub button_down {
1833	my ($self, $ev, $x, $y) = @_;	1967	my ($self, $ev, $x, $y) = @_;
1834		1968
1835	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1969	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1836	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1970	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1837	$self->{state} = !$self->{state};	1971	$self->{state} = !$self->{state};
1838	$self->_emit (changed => $self->{state});	1972	$self->_emit (changed => $self->{state});
		1973	} else {
		1974	return 0
		1975	}
		1976
1839	}	1977	1
1840	}	1978	}
1841		1979
1842	sub _draw {	1980	sub _draw {
1843	my ($self) = @_;	1981	my ($self) = @_;
1844		1982
1845	$self->SUPER::_draw;	1983	$self->SUPER::_draw;
1846		1984
1847	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1985	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1848		1986
1849	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1987	my ($w, $h) = @$self{qw(w h)};
		1988
		1989	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1850		1990
1851	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1991	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1852		1992
1853	my $tex = $self->{state} ? $tex[1] : $tex[0];	1993	my $tex = $self->{state} ? $tex[1] : $tex[0];
1854		1994
…		…
2119	fg => [1, 1, 1],	2259	fg => [1, 1, 1],
2120	active_fg => [0, 0, 0],	2260	active_fg => [0, 0, 0],
2121	bg => [0, 0, 0, 0.2],	2261	bg => [0, 0, 0, 0.2],
2122	active_bg => [1, 1, 1, 0.5],	2262	active_bg => [1, 1, 1, 0.5],
2123	range => [0, 0, 100, 10, 0],	2263	range => [0, 0, 100, 10, 0],
2124	req_w => $::WIDTH / 80,	2264	min_w => $::WIDTH / 80,
2125	req_h => $::WIDTH / 80,	2265	min_h => $::WIDTH / 80,
2126	vertical => 0,	2266	vertical => 0,
2127	can_hover => 1,	2267	can_hover => 1,
2128	inner_pad => 0.02,	2268	inner_pad => 0.02,
2129	@_	2269	@_
2130	);	2270	);
…		…
2133	$self->update;	2273	$self->update;
2134		2274
2135	$self	2275	$self
2136	}	2276	}
2137		2277
		2278	sub changed { }
		2279
2138	sub set_range {	2280	sub set_range {
2139	my ($self, $range) = @_;	2281	my ($self, $range) = @_;
2140		2282
2141	$self->{range} = $range;	2283	($range, $self->{range}) = ($self->{range}, $range);
2142		2284
2143	$self->update;	2285	$self->update
		2286	if "@$range" ne "@{$self->{range}}";
2144	}	2287	}
2145		2288
2146	sub set_value {	2289	sub set_value {
2147	my ($self, $value) = @_;	2290	my ($self, $value) = @_;
2148		2291
…		…
2167	}	2310	}
2168		2311
2169	sub size_request {	2312	sub size_request {
2170	my ($self) = @_;	2313	my ($self) = @_;
2171		2314
2172	my $w = $self->{req_w};	2315	($self->{req_w}, $self->{req_h})
2173	my $h = $self->{req_h};
2174
2175	$self->{vertical} ? ($h, $w) : ($w, $h)
2176	}	2316	}
2177		2317
2178	sub button_down {	2318	sub button_down {
2179	my ($self, $ev, $x, $y) = @_;	2319	my ($self, $ev, $x, $y) = @_;
2180		2320
2181	$self->SUPER::button_down ($ev, $x, $y);	2321	$self->SUPER::button_down ($ev, $x, $y);
2182		2322
2183	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2323	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2184		2324
2185	$self->mouse_motion ($ev, $x, $y);	2325	$self->mouse_motion ($ev, $x, $y)
2186	}	2326	}
2187		2327
2188	sub mouse_motion {	2328	sub mouse_motion {
2189	my ($self, $ev, $x, $y) = @_;	2329	my ($self, $ev, $x, $y) = @_;
2190		2330
…		…
2194	my (undef, $lo, $hi, $page) = @{$self->{range}};	2334	my (undef, $lo, $hi, $page) = @{$self->{range}};
2195		2335
2196	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2336	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2197		2337
2198	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2338	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2339	} else {
		2340	return 0;
		2341	}
		2342
2199	}	2343	1
2200	}	2344	}
2201		2345
2202	sub update {	2346	sub update {
2203	my ($self) = @_;	2347	my ($self) = @_;
2204		2348
2205	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2349	delete $self->{knob_w};
		2350	$self->SUPER::update;
		2351	}
		2352
		2353	sub _draw {
		2354	my ($self) = @_;
		2355
		2356	unless ($self->{knob_w}) {
2206	$self->set_value ($self->{range}[0]);	2357	$self->set_value ($self->{range}[0]);
2207		2358
2208	my ($value, $lo, $hi, $page) = @{$self->{range}};	2359	my ($value, $lo, $hi, $page) = @{$self->{range}};
2209	my $range = ($hi - $page - $lo) || 1e-100;	2360	my $range = ($hi - $page - $lo) || 1e-100;
2210		2361
…		…
2216	$value = ($value - $lo) / $range;	2367	$value = ($value - $lo) / $range;
2217	$value = $value * $self->{scale} + $self->{offset};	2368	$value = $value * $self->{scale} + $self->{offset};
2218		2369
2219	$self->{knob_x} = $value - $knob_w * 0.5;	2370	$self->{knob_x} = $value - $knob_w * 0.5;
2220	$self->{knob_w} = $knob_w;	2371	$self->{knob_w} = $knob_w;
2221	});	2372	}
2222
2223	$self->SUPER::update;
2224	}
2225
2226	sub _draw {
2227	my ($self) = @_;
2228		2373
2229	$self->SUPER::_draw ();	2374	$self->SUPER::_draw ();
2230		2375
2231	glScale $self->{w}, $self->{h};	2376	glScale $self->{w}, $self->{h};
2232		2377
…		…
2531		2676
2532	sub new {	2677	sub new {
2533	my $class = shift;	2678	my $class = shift;
2534		2679
2535	my $self = $class->SUPER::new (	2680	my $self = $class->SUPER::new (
2536	state => 0,	2681	state => 0,
2537	connect_activate => \&toggle_flopper,	2682	on_activate => \&toggle_flopper,
2538	@_	2683	@_
2539	);	2684	);
2540		2685
2541	if ($self->{state}) {
2542	$self->{state} = 0;
2543	$self->toggle_flopper;
2544	}
2545
2546	$self	2686	$self
2547	}	2687	}
2548		2688
2549	sub toggle_flopper {	2689	sub toggle_flopper {
2550	my ($self) = @_;	2690	my ($self) = @_;
2551		2691
2552	# TODO: use animation	2692	$self->{other}->toggle_visibility;
2553	if ($self->{state} = !$self->{state}) {
2554	$CFClient::UI::ROOT->add ($self->{other});
2555	$self->{other}->move ($self->coord2global (0, $self->{h}));
2556	$self->_emit ("open");
2557	} else {
2558	$CFClient::UI::ROOT->remove ($self->{other});
2559	$self->_emit ("close");
2560	}
2561
2562	$self->_emit (changed => $self->{state});
2563	}	2693	}
2564		2694
2565	#############################################################################	2695	#############################################################################
2566		2696
2567	package CFClient::UI::Tooltip;	2697	package CFClient::UI::Tooltip;
…		…
2580	}	2710	}
2581		2711
2582	sub set_tooltip_from {	2712	sub set_tooltip_from {
2583	my ($self, $widget) = @_;	2713	my ($self, $widget) = @_;
2584		2714
		2715	my $tooltip = $widget->{tooltip};
		2716
		2717	if ($ENV{CFPLUS_DEBUG} & 2) {
		2718	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2719	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2720	. "req $widget->{req_w} $widget->{req_h}\n"
		2721	. "visible $widget->{visible}";
		2722	}
		2723
2585	$self->add (new CFClient::UI::Label	2724	$self->add (new CFClient::UI::Label
2586	markup => $widget->{tooltip},	2725	markup => $tooltip,
2587	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2726	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2588	fontsize => 0.8,	2727	fontsize => 0.8,
2589	fg => [0, 0, 0, 1],	2728	fg => [0, 0, 0, 1],
2590	ellipsise => 0,	2729	ellipsise => 0,
2591	font => ($widget->{tooltip_font} || $::FONT_PROP),	2730	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2602		2741
2603	sub size_allocate {	2742	sub size_allocate {
2604	my ($self, $w, $h) = @_;	2743	my ($self, $w, $h) = @_;
2605		2744
2606	$self->SUPER::size_allocate ($w - 4, $h - 4);	2745	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2746	}
		2747
		2748	sub visibility_change {
		2749	my ($self, $visible) = @_;
		2750
		2751	return unless $visible;
		2752
		2753	$self->{root}->on_post_alloc ("move_$self" => sub {
		2754	my $widget = $self->{owner}
		2755	or return;
		2756
		2757	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2758
		2759	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2760	if $x + $self->{w} > $::WIDTH;
		2761
		2762	$self->move_abs ($x, $y);
		2763	});
2607	}	2764	}
2608		2765
2609	sub _draw {	2766	sub _draw {
2610	my ($self) = @_;	2767	my ($self) = @_;
2611		2768
…		…
2628	glVertex $w, $h;	2785	glVertex $w, $h;
2629	glVertex $w, 0;	2786	glVertex $w, 0;
2630	glEnd;	2787	glEnd;
2631		2788
2632	glTranslate 2 - 0.375, 2 - 0.375;	2789	glTranslate 2 - 0.375, 2 - 0.375;
		2790
2633	$self->SUPER::_draw;	2791	$self->SUPER::_draw;
2634	}	2792	}
2635		2793
2636	#############################################################################	2794	#############################################################################
2637		2795
…		…
2713	$self->SUPER::DESTROY;	2871	$self->SUPER::DESTROY;
2714	}	2872	}
2715		2873
2716	#############################################################################	2874	#############################################################################
2717		2875
2718	package CFClient::UI::Inventory;	2876	package CFClient::UI::Buttonbar;
2719		2877
2720	our @ISA = CFClient::UI::ScrolledWindow::;	2878	our @ISA = CFClient::UI::HBox::;
2721		2879
2722	sub new {	2880	# TODO: should actualyl wrap buttons and other goodies.
2723	my $class = shift;
2724
2725	my $self = $class->SUPER::new (
2726	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2727	@_,
2728	);
2729
2730	$self
2731	}
2732
2733	sub set_items {
2734	my ($self, $items) = @_;
2735
2736	$self->{scrolled}->clear;
2737	return unless $items;
2738
2739	my @items = sort {
2740	($a->{type} <=> $b->{type})
2741	or ($a->{name} cmp $b->{name})
2742	} @$items;
2743
2744	$self->{real_items} = \@items;
2745
2746	my $row = 0;
2747	for my $item (@items) {
2748	CFClient::Item::update_widgets $item;
2749
2750	$self->{scrolled}->add (0, $row, $item->{face_widget});
2751	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2752	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2753
2754	$row++;
2755	}
2756
2757	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2758	}
2759
2760	sub size_request {
2761	my ($self) = @_;
2762	($self->{req_w}, $self->{req_h});
2763	}
2764		2881
2765	#############################################################################	2882	#############################################################################
2766		2883
2767	package CFClient::UI::Menu;	2884	package CFClient::UI::Menu;
2768		2885
…		…
2809	# maybe save $GRAB? must be careful about events...	2926	# maybe save $GRAB? must be careful about events...
2810	$GRAB = $self;	2927	$GRAB = $self;
2811	$self->{button} = $ev->{button};	2928	$self->{button} = $ev->{button};
2812		2929
2813	$self->show;	2930	$self->show;
2814	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2931	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2815	}	2932	}
2816		2933
2817	sub mouse_motion {	2934	sub mouse_motion {
2818	my ($self, $ev, $x, $y) = @_;	2935	my ($self, $ev, $x, $y) = @_;
2819		2936
2820	# TODO: should use vbox->find_widget or so	2937	# TODO: should use vbox->find_widget or so
2821	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2938	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2822	$self->{hover} = $self->{item}{$HOVER};	2939	$self->{hover} = $self->{item}{$HOVER};
		2940
		2941	0
2823	}	2942	}
2824		2943
2825	sub button_up {	2944	sub button_up {
2826	my ($self, $ev, $x, $y) = @_;	2945	my ($self, $ev, $x, $y) = @_;
2827		2946
…		…
2829	undef $GRAB;	2948	undef $GRAB;
2830	$self->hide;	2949	$self->hide;
2831		2950
2832	$self->_emit ("popdown");	2951	$self->_emit ("popdown");
2833	$self->{hover}[1]->() if $self->{hover};	2952	$self->{hover}[1]->() if $self->{hover};
		2953	} else {
		2954	return 0
		2955	}
		2956
		2957	1
		2958	}
		2959
		2960	#############################################################################
		2961
		2962	package CFClient::UI::Multiplexer;
		2963
		2964	our @ISA = CFClient::UI::Container::;
		2965
		2966	sub new {
		2967	my $class = shift;
		2968
		2969	my $self = $class->SUPER::new (
		2970	@_,
		2971	);
		2972
		2973	$self->{current} = $self->{children}[0]
		2974	if @{ $self->{children} };
		2975
		2976	$self
		2977	}
		2978
		2979	sub add {
		2980	my ($self, @widgets) = @_;
		2981
		2982	$self->SUPER::add (@widgets);
		2983
		2984	$self->{current} = $self->{children}[0]
		2985	if @{ $self->{children} };
		2986	}
		2987
		2988	sub set_current_page {
		2989	my ($self, $page_or_widget) = @_;
		2990
		2991	my $widget = ref $page_or_widget
		2992	? $page_or_widget
		2993	: $self->{children}[$page_or_widget];
		2994
		2995	$self->{current} = $widget;
		2996	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2997
		2998	$self->_emit (page_changed => $self->{current});
		2999
		3000	$self->realloc;
		3001	}
		3002
		3003	sub visible_children {
		3004	$_[0]{current}
		3005	}
		3006
		3007	sub size_request {
		3008	my ($self) = @_;
		3009
		3010	$self->{current}->size_request
		3011	}
		3012
		3013	sub size_allocate {
		3014	my ($self, $w, $h) = @_;
		3015
		3016	$self->{current}->configure (0, 0, $w, $h);
		3017	}
		3018
		3019	sub _draw {
		3020	my ($self) = @_;
		3021
		3022	$self->{current}->draw;
		3023	}
		3024
		3025	#############################################################################
		3026
		3027	package CFClient::UI::Notebook;
		3028
		3029	our @ISA = CFClient::UI::VBox::;
		3030
		3031	sub new {
		3032	my $class = shift;
		3033
		3034	my $self = $class->SUPER::new (
		3035	buttonbar => (new CFClient::UI::Buttonbar),
		3036	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3037	# filter => # will be put between multiplexer and $self
		3038	@_,
		3039	);
2834	}	3040
		3041	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3042	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3043
		3044	$self
		3045	}
		3046
		3047	sub add {
		3048	my ($self, $title, $widget, $tooltip) = @_;
		3049
		3050	Scalar::Util::weaken $self;
		3051
		3052	$self->{buttonbar}->add (new CFClient::UI::Button
		3053	markup => $title,
		3054	tooltip => $tooltip,
		3055	on_activate => sub { $self->set_current_page ($widget) },
		3056	);
		3057
		3058	$self->{multiplexer}->add ($widget);
		3059	}
		3060
		3061	sub set_current_page {
		3062	my ($self, $page) = @_;
		3063
		3064	$self->{multiplexer}->set_current_page ($page);
		3065	$self->_emit (page_changed => $self->{multiplexer}{current});
2835	}	3066	}
2836		3067
2837	#############################################################################	3068	#############################################################################
2838		3069
2839	package CFClient::UI::Statusbox;	3070	package CFClient::UI::Statusbox;
…		…
2944	$self->SUPER::reconfigure;	3175	$self->SUPER::reconfigure;
2945	}	3176	}
2946		3177
2947	#############################################################################	3178	#############################################################################
2948		3179
2949	package CFClient::UI::Root;	3180	package CFClient::UI::Inventory;
2950		3181
2951	our @ISA = CFClient::UI::Container::;	3182	our @ISA = CFClient::UI::ScrolledWindow::;
2952
2953	use CFClient::OpenGL;
2954		3183
2955	sub new {	3184	sub new {
2956	my $class = shift;	3185	my $class = shift;
2957		3186
2958	$class->SUPER::new (	3187	my $self = $class->SUPER::new (
		3188	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3189	@_,
		3190	);
		3191
		3192	$self
		3193	}
		3194
		3195	sub set_items {
		3196	my ($self, $items) = @_;
		3197
		3198	$self->{child}->clear;
		3199	return unless $items;
		3200
		3201	my @items = sort {
		3202	($a->{type} <=> $b->{type})
		3203	or ($a->{name} cmp $b->{name})
		3204	} @$items;
		3205
		3206	$self->{real_items} = \@items;
		3207
		3208	my $row = 0;
		3209	for my $item (@items) {
		3210	CFClient::Item::update_widgets $item;
		3211
		3212	$self->{child}->add (0, $row, $item->{face_widget});
		3213	$self->{child}->add (1, $row, $item->{desc_widget});
		3214	$self->{child}->add (2, $row, $item->{weight_widget});
		3215
		3216	$row++;
		3217	}
		3218	}
		3219
		3220	#############################################################################
		3221
		3222	package CFClient::UI::BindEditor;
		3223
		3224	our @ISA = CFClient::UI::FancyFrame::;
		3225
		3226	sub new {
		3227	my $class = shift;
		3228
		3229	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3230
		3231	$self->add (my $vb = new CFClient::UI::VBox);
		3232
		3233
		3234	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3235	text => "start recording",
		3236	tooltip => "Start/Stops recording of actions."
		3237	."All subsequent actions after the recording started will be captured."
		3238	."The actions are displayed after the record was stopped."
		3239	."To bind the action you have to click on the 'Bind' button",
		3240	on_activate => sub {
		3241	unless ($self->{recording}) {
		3242	$self->start;
		3243	} else {
		3244	$self->stop;
		3245	}
		3246	});
		3247
		3248	$vb->add (new CFClient::UI::Label text => "Actions:");
		3249	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3250
		3251	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3252	$vb->add (my $hb = new CFClient::UI::HBox);
		3253	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3254	$hb->add (new CFClient::UI::Button
		3255	text => "bind",
		3256	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3257	on_activate => sub {
		3258	$self->ask_for_bind;
		3259	});
		3260
		3261	$vb->add (my $hb = new CFClient::UI::HBox);
		3262	$hb->add (new CFClient::UI::Button
		3263	text => "ok",
		3264	expand => 1,
		3265	tooltip => "This closes the binding editor and saves the binding",
		3266	on_activate => sub {
		3267	$self->hide;
		3268	$self->commit;
		3269	});
		3270
		3271	$hb->add (new CFClient::UI::Button
		3272	text => "cancel",
		3273	expand => 1,
		3274	tooltip => "This closes the binding editor without saving",
		3275	on_activate => sub {
		3276	$self->hide;
		3277	$self->{binding_cancel}->()
		3278	if $self->{binding_cancel};
		3279	});
		3280
		3281	$self->update_binding_widgets;
		3282
		3283	$self
		3284	}
		3285
		3286	sub commit {
		3287	my ($self) = @_;
		3288	my ($mod, $sym, $cmds) = $self->get_binding;
		3289	if ($sym != 0 && @$cmds > 0) {
		3290	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3291	."'. Don't forget 'Save Config'!");
		3292	$self->{binding_change}->($mod, $sym, $cmds)
		3293	if $self->{binding_change};
		3294	} else {
		3295	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3296	$self->{binding_cancel}->()
		3297	if $self->{binding_cancel};
		3298	}
		3299	}
		3300
		3301	sub start {
		3302	my ($self) = @_;
		3303
		3304	$self->{rec_btn}->set_text ("stop recording");
		3305	$self->{recording} = 1;
		3306	$self->clear_command_list;
		3307	$::CONN->start_record if $::CONN;
		3308	}
		3309
		3310	sub stop {
		3311	my ($self) = @_;
		3312
		3313	$self->{rec_btn}->set_text ("start recording");
		3314	$self->{recording} = 0;
		3315
		3316	my $rec;
		3317	$rec = $::CONN->stop_record if $::CONN;
		3318	return unless ref $rec eq 'ARRAY';
		3319	$self->set_command_list ($rec);
		3320	}
		3321
		3322
		3323	sub ask_for_bind_and_commit {
		3324	my ($self) = @_;
		3325	$self->ask_for_bind (1);
		3326	}
		3327
		3328	sub ask_for_bind {
		3329	my ($self, $commit) = @_;
		3330
		3331	CFClient::Binder::open_binding_dialog (sub {
		3332	my ($mod, $sym) = @_;
		3333	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3334	$self->update_binding_widgets;
		3335	$self->commit if $commit;
		3336	});
		3337	}
		3338
		3339	# $mod and $sym are the modifiers and key symbol
		3340	# $cmds is a array ref of strings (the commands)
		3341	# $cb is the callback that is executed on OK
		3342	# $ccb is the callback that is executed on CANCEL and
		3343	# when the binding was unsuccessful on OK
		3344	sub set_binding {
		3345	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3346
		3347	$self->clear_command_list;
		3348	$self->{recording} = 0;
		3349	$self->{rec_btn}->set_text ("start recording");
		3350
		3351	$self->{binding} = [$mod, $sym];
		3352	$self->{commands} = $cmds;
		3353
		3354	$self->{binding_change} = $cb;
		3355	$self->{binding_cancel} = $ccb;
		3356
		3357	$self->update_binding_widgets;
		3358	}
		3359
		3360	# this is a shortcut method that asks for a binding
		3361	# and then just binds it.
		3362	sub do_quick_binding {
		3363	my ($self, $cmds) = @_;
		3364	$self->set_binding (undef, undef, $cmds, sub {
		3365	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3366	});
		3367	$self->ask_for_bind (1);
		3368	}
		3369
		3370	sub update_binding_widgets {
		3371	my ($self) = @_;
		3372	my ($mod, $sym, $cmds) = $self->get_binding;
		3373	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3374	$self->set_command_list ($cmds);
		3375	}
		3376
		3377	sub get_binding {
		3378	my ($self) = @_;
		3379	return (
		3380	$self->{binding}->[0],
		3381	$self->{binding}->[1],
		3382	[ grep { defined $_ } @{$self->{commands}} ]
		3383	);
		3384	}
		3385
		3386	sub clear_command_list {
		3387	my ($self) = @_;
		3388	$self->{cmdbox}->clear ();
		3389	}
		3390
		3391	sub set_command_list {
		3392	my ($self, $cmds) = @_;
		3393
		3394	$self->{cmdbox}->clear ();
		3395	$self->{commands} = $cmds;
		3396
		3397	my $idx = 0;
		3398
		3399	for (@$cmds) {
		3400	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3401
		3402	my $i = $idx;
		3403	$hb->add (new CFClient::UI::Label text => $_);
		3404	$hb->add (new CFClient::UI::Button
		3405	text => "delete",
		3406	tooltip => "Deletes the action from the record",
		3407	on_activate => sub {
		3408	$self->{cmdbox}->remove ($hb);
		3409	$cmds->[$i] = undef;
		3410	});
		3411
		3412
		3413	$idx++
		3414	}
		3415	}
		3416
		3417	#############################################################################
		3418
		3419	package CFClient::UI::SpellList;
		3420
		3421	our @ISA = CFClient::UI::Table::;
		3422
		3423	sub new {
		3424	my $class = shift;
		3425
		3426	my $self = $class->SUPER::new (
		3427	binding => [],
		3428	commands => [],
2959	@_,	3429	@_,
2960	)	3430	)
2961	}	3431	}
2962		3432
2963	sub configure {	3433	# XXX: Do sorting? Argl...
2964	my ($self, $x, $y, $w, $h) = @_;	3434	sub add_spell {
2965
2966	$self->{w} = $w;
2967	$self->{h} = $h;
2968	}
2969
2970	sub check_size {
2971	my ($self) = @_;	3435	my ($self, $spell) = @_;
		3436	$self->{spells}->{$spell->{name}} = $spell;
2972		3437
2973	$self->size_allocate ($self->{w}, $self->{h})	3438	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2974	if $self->{w};	3439	face => $spell->{face},
		3440	can_hover => 1,
		3441	can_events => 1,
		3442	tooltip => $spell->{message});
		3443
		3444	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3445	text => $spell->{name},
		3446	can_hover => 1,
		3447	can_events => 1,
		3448	tooltip => $spell->{message},
		3449	expand => 1);
		3450
		3451	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3452	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3453	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3454	expand => 1);
		3455
		3456	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3457	text => "bind to key",
		3458	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3459	}
		3460
		3461	sub rebuild_spell_list {
		3462	my ($self) = @_;
		3463	$self->{tbl_idx} = 0;
		3464	$self->add_spell ($_) for values %{$self->{spells}};
		3465	}
		3466
		3467	sub remove_spell {
		3468	my ($self, $spell) = @_;
		3469	delete $self->{spells}->{$spell->{name}};
		3470	$self->rebuild_spell_list;
		3471	}
		3472
		3473	#############################################################################
		3474
		3475	package CFClient::UI::Root;
		3476
		3477	our @ISA = CFClient::UI::Container::;
		3478
		3479	use CFClient::OpenGL;
		3480
		3481	sub new {
		3482	my $class = shift;
		3483
		3484	my $self = $class->SUPER::new (
		3485	visible => 1,
		3486	@_,
		3487	);
		3488
		3489	Scalar::Util::weaken ($self->{root} = $self);
		3490
		3491	$self
2975	}	3492	}
2976		3493
2977	sub size_request {	3494	sub size_request {
2978	my ($self) = @_;	3495	my ($self) = @_;
2979		3496
2980	($self->{w}, $self->{h})	3497	($self->{w}, $self->{h})
		3498	}
		3499
		3500	sub _to_pixel {
		3501	my ($coord, $size, $max) = @_;
		3502
		3503	$coord =
		3504	$coord eq "center" ? ($max - $size) * 0.5
		3505	: $coord eq "max" ? $max
		3506	: $coord;
		3507
		3508	$coord = 0 if $coord < 0;
		3509	$coord = $max - $size if $coord > $max - $size;
		3510
		3511	int $coord + 0.5
2981	}	3512	}
2982		3513
2983	sub size_allocate {	3514	sub size_allocate {
2984	my ($self, $w, $h) = @_;	3515	my ($self, $w, $h) = @_;
2985		3516
2986	for my $child ($self->children) {	3517	for my $child ($self->children) {
2987	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3518	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2988		3519
2989	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3520	$X = $child->{force_x} if exists $child->{force_x};
2990	if exists $child->{req_x};	3521	$Y = $child->{force_y} if exists $child->{force_y};
2991		3522
2992	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3523	$X = _to_pixel $X, $W, $self->{w};
2993	if exists $child->{req_y};	3524	$Y = _to_pixel $Y, $H, $self->{h};
2994
2995	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2996	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2997		3525
2998	$child->configure ($X, $Y, $W, $H);	3526	$child->configure ($X, $Y, $W, $H);
2999	}	3527	}
3000	}	3528	}
3001		3529
…		…
3012	}	3540	}
3013		3541
3014	sub update {	3542	sub update {
3015	my ($self) = @_;	3543	my ($self) = @_;
3016		3544
3017	$self->check_size;
3018	$::WANT_REFRESH++;	3545	$::WANT_REFRESH++;
3019	}	3546	}
3020		3547
3021	sub add {	3548	sub add {
3022	my ($self, @children) = @_;	3549	my ($self, @children) = @_;
3023		3550
3024	for (my @widgets = @children; my $w = pop @widgets; ) {
3025	push @widgets, $w->children;
3026	$w->{root} = $self;
3027	$w->{visible} = 1;
3028	}
3029
3030	for my $child (@children) {
3031	$child->{is_toplevel} = 1;	3551	$_->{is_toplevel} = 1
3032		3552	for @children;
3033	# integerise window positions
3034	$child->{x} = int $child->{x};
3035	$child->{y} = int $child->{y};
3036	}
3037		3553
3038	$self->SUPER::add (@children);	3554	$self->SUPER::add (@children);
3039	}	3555	}
3040		3556
3041	sub remove {	3557	sub remove {
3042	my ($self, @children) = @_;	3558	my ($self, @children) = @_;
3043		3559
3044	$self->SUPER::remove (@children);	3560	$self->SUPER::remove (@children);
		3561
		3562	delete $self->{is_toplevel}
		3563	for @children;
3045		3564
3046	while (@children) {	3565	while (@children) {
3047	my $w = pop @children;	3566	my $w = pop @children;
3048	push @children, $w->children;	3567	push @children, $w->children;
3049	$w->set_invisible;	3568	$w->set_invisible;
…		…
3068	while ($self->{refresh_hook}) {	3587	while ($self->{refresh_hook}) {
3069	$_->()	3588	$_->()
3070	for values %{delete $self->{refresh_hook}};	3589	for values %{delete $self->{refresh_hook}};
3071	}	3590	}
3072		3591
3073	if ($self->{check_size}) {	3592	if ($self->{realloc}) {
3074	my @queue = ([], []);	3593	my %queue;
		3594	my @queue;
		3595	my $widget;
3075		3596
3076	for (;;) {	3597	outer:
3077	if ($self->{check_size}) {	3598	while () {
3078	# heuristic: check containers last	3599	if (my $realloc = delete $self->{realloc}) {
3079	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3600	for $widget (values %$realloc) {
3080	for values %{delete $self->{check_size}}	3601	$widget->{visible} or next; # do not resize invisible widgets
		3602
		3603	$queue{$widget+0}++ and next; # duplicates are common
		3604
		3605	push @{ $queue[$widget->{visible}] }, $widget;
		3606	}
3081	}	3607	}
3082		3608
3083	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3609	while () {
		3610	@queue or last outer;
3084		3611
3085	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3612	$widget = pop @{ $queue[-1] || [] }
3086	? @$widget{qw(user_w user_h)}	3613	and last;
3087	: $widget->size_request;
3088
3089	if (delete $widget->{force_alloc}
3090	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3091	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3092		3614
		3615	pop @queue;
		3616	}
		3617
		3618	delete $queue{$widget+0};
		3619
		3620	my ($w, $h) = $widget->size_request;
		3621
		3622	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3623	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3624
		3625	$w = $widget->{force_w} if exists $widget->{force_w};
		3626	$h = $widget->{force_h} if exists $widget->{force_h};
		3627
		3628	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3629	|| delete $widget->{force_realloc}) {
3093	$widget->{req_w} = $w;	3630	$widget->{req_w} = $w;
3094	$widget->{req_h} = $h;	3631	$widget->{req_h} = $h;
3095		3632
3096	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3633	$self->{size_alloc}{$widget+0} = $widget;
3097		3634
3098	$widget->{parent}->check_size
3099	if $widget->{parent};	3635	if (my $parent = $widget->{parent}) {
		3636	$self->{realloc}{$parent+0} = $parent
		3637	unless $queue{$parent+0};
		3638
		3639	$parent->{force_size_alloc} = 1;
		3640	$self->{size_alloc}{$parent+0} = $parent;
		3641	}
3100	}	3642	}
		3643
		3644	delete $self->{realloc}{$widget+0};
3101	}	3645	}
3102	}	3646	}
3103		3647
3104	while ($self->{size_alloc}) {	3648	while (my $size_alloc = delete $self->{size_alloc}) {
3105	for (values %{delete $self->{size_alloc}}) {	3649	my @queue = sort { $b->{visible} <=> $a->{visible} }
3106	my ($widget, $w, $h) = @$_;	3650	values %$size_alloc;
		3651
		3652	while () {
		3653	my $widget = pop @queue || last;
		3654
		3655	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3107		3656
3108	$w = 0 if $w < 0;	3657	$w = 0 if $w < 0;
3109	$h = 0 if $h < 0;	3658	$h = 0 if $h < 0;
3110		3659
		3660	$w = int $w + 0.5;
		3661	$h = int $h + 0.5;
		3662
		3663	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3664	$widget->{old_w} = $widget->{w};
		3665	$widget->{old_h} = $widget->{h};
		3666
3111	$widget->{w} = $w;	3667	$widget->{w} = $w;
3112	$widget->{h} = $h;	3668	$widget->{h} = $h;
		3669
3113	$widget->emit (size_allocate => $w, $h);	3670	$widget->emit (size_allocate => $w, $h);
		3671	}
3114	}	3672	}
3115	}	3673	}
3116		3674
3117	while ($self->{post_alloc_hook}) {	3675	while ($self->{post_alloc_hook}) {
3118	$_->()	3676	$_->()
3119	for values %{delete $self->{post_alloc_hook}};	3677	for values %{delete $self->{post_alloc_hook}};
3120	}	3678	}
		3679
3121		3680
3122	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3681	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3123	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3682	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3124	glClear GL_COLOR_BUFFER_BIT;	3683	glClear GL_COLOR_BUFFER_BIT;
3125		3684
…		…
3127	glLoadIdentity;	3686	glLoadIdentity;
3128	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3687	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3129	glMatrixMode GL_MODELVIEW;	3688	glMatrixMode GL_MODELVIEW;
3130	glLoadIdentity;	3689	glLoadIdentity;
3131		3690
		3691	{
		3692	package CFClient::UI::Base;
		3693
		3694	($draw_x, $draw_y, $draw_w, $draw_h) =
		3695	(0, 0, $self->{w}, $self->{h});
		3696	}
		3697
3132	$self->_draw;	3698	$self->_draw;
3133	}	3699	}
3134		3700
3135	#############################################################################	3701	#############################################################################
3136		3702

Diff Legend

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