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.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.277 by root, Sun Jun 4 00:21:52 2006 UTC

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

Diff Legend

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