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.241 by root, Fri May 26 20:50:35 2006 UTC vs.
Revision 1.275 by root, Sat Jun 3 22:50:48 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};
		273
		274	$_->set_invisible for $self->children;
233		275
234	delete $self->{root};	276	delete $self->{root};
235	delete $self->{visible};	277	delete $self->{visible};
236		278
237	undef $GRAB if $GRAB == $self;	279	undef $GRAB if $GRAB == $self;
238	undef $HOVER if $HOVER == $self;	280	undef $HOVER if $HOVER == $self;
239		281
240	CFClient::UI::check_tooltip	282	CFClient::UI::check_tooltip
241	if $CFClient::UI::TOOLTIP->{owner} == $self;	283	if $TOOLTIP->{owner} == $self;
242		284
243	$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;
244	}	305	}
245		306
246	sub hide {	307	sub hide {
247	my ($self) = @_;	308	my ($self) = @_;
248		309
…		…
250		311
251	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
252	if $self->{parent};	313	if $self->{parent};
253	}	314	}
254		315
255	sub move {	316	sub move_abs {
256	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
257		318
258	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
259	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
260	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
261		322
262	$self->update;	323	$self->update;
263	}	324	}
264		325
265	sub set_size {	326	sub set_size {
266	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
267		328
268	$self->{user_w} = $w;	329	$self->{force_w} = $w;
269	$self->{user_h} = $h;	330	$self->{force_h} = $h;
270		331
271	$self->check_size;	332	$self->realloc;
272	}	333	}
273		334
274	sub size_request {	335	sub size_request {
275	require Carp;	336	require Carp;
276	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
…		…
278		339
279	sub configure {	340	sub configure {
280	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
281		342
282	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
283	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
284	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
285		348
286	# use alignment to adjust x, y	349	# use alignment to adjust x, y
287		350
288	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
289	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
290
291	($w, $h) = ($w2, $h2);
292	}	353	}
293		354
294	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
295	$self->{x} = $x;	356	$self->{x} = $x;
296	$self->{y} = $y;	357	$self->{y} = $y;
297	$self->update;	358	$self->update;
298	}	359	}
299		360
300	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
301	$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;
302	}	368	}
303	}	369	}
304		370
305	sub size_allocate {	371	sub size_allocate {
306	# nothing to be done	372	# nothing to be done
307	}	373	}
308		374
309	sub reconfigure {
310	my ($self) = @_;
311
312	$self->check_size (1);
313	$self->update;
314	}
315
316	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
317	}	381	}
318		382
319	sub set_max_size {	383	sub set_max_size {
320	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
321		385
…		…
380		444
381	$::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
382	unless $FOCUS;	446	unless $FOCUS;
383	}	447	}
384		448
385	sub mouse_motion { }	449	sub mouse_motion { 0 }
386	sub button_up { }	450	sub button_up { 0 }
387	sub key_down { }	451	sub key_down { 0 }
388	sub key_up { }	452	sub key_up { 0 }
389		453
390	sub button_down {	454	sub button_down {
391	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
392		456
393	$self->focus_in;	457	$self->focus_in;
394	}
395		458
396	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
397	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
398	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	461
399	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	462	sub find_widget {
400	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
401		535
402	sub draw {	536	sub draw {
403	my ($self) = @_;	537	my ($self) = @_;
404		538
405	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);
406		550
407	glPushMatrix;	551	glPushMatrix;
408	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
409	$self->_draw;	553	$self->_draw;
410	glPopMatrix;	554	glPopMatrix;
…		…
422	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
423	glEnd;	567	glEnd;
424	glDisable GL_BLEND;	568	glDisable GL_BLEND;
425	}	569	}
426		570
427	if ($ENV{PCLIENT_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
428	glPushMatrix;	572	glPushMatrix;
429	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
430	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
431	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
432	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
443	my ($self) = @_;	587	my ($self) = @_;
444		588
445	warn "no draw defined for $self\n";	589	warn "no draw defined for $self\n";
446	}	590	}
447		591
448	sub find_widget {
449	my ($self, $x, $y) = @_;
450
451	return () unless $self->{can_events};
452
453	return $self
454	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
455	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
456
457	()
458	}
459
460	sub set_parent {
461	my ($self, $parent) = @_;
462
463	Scalar::Util::weaken ($self->{parent} = $parent);
464
465	$self->{root} = $parent->{root};
466	$self->{visible} = $parent->{visible} + 1;
467
468	# TODO: req_w _does_change after ->reconfigure
469	$self->check_size
470	unless exists $self->{req_w};
471
472	$self->show;
473	}
474
475	sub check_size {
476	my ($self, $forced) = @_;
477
478	$self->{force_alloc} = 1 if $forced;
479	$CFClient::UI::ROOT->{check_size}{$self} = $self;
480	}
481
482	sub update {
483	my ($self) = @_;
484
485	$self->{parent}->update
486	if $self->{parent};
487	}
488
489	sub connect {
490	my ($self, $signal, $cb) = @_;
491
492	push @{ $self->{signal_cb}{$signal} }, $cb;
493	}
494
495	sub _emit {
496	my ($self, $signal, @args) = @_;
497
498	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
499	}
500
501	sub emit {
502	my ($self, $signal, @args) = @_;
503
504	$self->_emit ($signal, @args)
505	|| $self->$signal (@args);
506	}
507
508	sub DESTROY {	592	sub DESTROY {
509	my ($self) = @_;	593	my ($self) = @_;
510		594
511	delete $WIDGET{$self+0};	595	delete $WIDGET{$self+0};
512	#$self->deactivate;	596	#$self->deactivate;
…		…
568	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
569	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
570	}	654	}
571		655
572	sub size_request {	656	sub size_request {
573	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
574	}	660	}
575		661
576	sub draw { }	662	sub draw { }
577		663
578	#############################################################################	664	#############################################################################
…		…
582	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
583		669
584	sub new {	670	sub new {
585	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
586		672
587	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
588		674
589	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
590	children => [],	676	children => [],
591	can_events => 0,	677	can_events => 0,
592	%arg,	678	%arg,
593	);	679	);
		680
594	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
595		683
596	$self	684	$self
597	}	685	}
598		686
599	sub add {	687	sub add {
…		…
607	$self->{children} = [	695	$self->{children} = [
608	sort { $a->{z} <=> $b->{z} }	696	sort { $a->{z} <=> $b->{z} }
609	@{$self->{children}}, @widgets	697	@{$self->{children}}, @widgets
610	];	698	];
611		699
612	$self->check_size (1);	700	$self->realloc;
613	$self->update;
614	}	701	}
615		702
616	sub children {	703	sub children {
617	@{ $_[0]{children} }	704	@{ $_[0]{children} }
618	}	705	}
…		…
623	delete $child->{parent};	710	delete $child->{parent};
624	$child->hide;	711	$child->hide;
625		712
626	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	713	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
627		714
628	$self->check_size (1);	715	$self->realloc;
629	$self->update;
630	}	716	}
631		717
632	sub clear {	718	sub clear {
633	my ($self) = @_;	719	my ($self) = @_;
634		720
…		…
638	for (@$children) {	724	for (@$children) {
639	delete $_->{parent};	725	delete $_->{parent};
640	$_->hide;	726	$_->hide;
641	}	727	}
642		728
643	$self->check_size;	729	$self->realloc;
644	$self->update;
645	}	730	}
646		731
647	sub find_widget {	732	sub find_widget {
648	my ($self, $x, $y) = @_;	733	my ($self, $x, $y) = @_;
649		734
650	$x -= $self->{x};	735	$x -= $self->{x};
651	$y -= $self->{y};	736	$y -= $self->{y};
652		737
653	my $res;	738	my $res;
654		739
655	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
656	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
657	and return $res;	742	and return $res;
658	}	743	}
659		744
660	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
709	$self->{children}[0]->configure (0, 0, $w, $h);	794	$self->{children}[0]->configure (0, 0, $w, $h);
710	}	795	}
711		796
712	#############################################################################	797	#############################################################################
713		798
		799	# back-buffered drawing area
		800
714	package CFClient::UI::Window;	801	package CFClient::UI::Window;
715		802
716	our @ISA = CFClient::UI::Bin::;	803	our @ISA = CFClient::UI::Bin::;
717		804
718	use CFClient::OpenGL;	805	use CFClient::OpenGL;
…		…
736	$self->SUPER::size_allocate ($w, $h);	823	$self->SUPER::size_allocate ($w, $h);
737	$self->update;	824	$self->update;
738	}	825	}
739		826
740	sub _render {	827	sub _render {
		828	my ($self) = @_;
		829
741	$_[0]{children}[0]->draw;	830	$self->{children}[0]->draw;
742	}	831	}
743		832
744	sub render_child {	833	sub render_child {
745	my ($self) = @_;	834	my ($self) = @_;
746		835
747	$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 {
748	glClearColor 0, 0, 0, 0;	837	glClearColor 0, 0, 0, 0;
749	glClear GL_COLOR_BUFFER_BIT;	838	glClear GL_COLOR_BUFFER_BIT;
750		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
751	$self->_render;	847	$self->_render;
752	};	848	};
753	}	849	}
754		850
755	sub _draw {	851	sub _draw {
756	my ($self) = @_;	852	my ($self) = @_;
757		853
758	my ($w, $h) = ($self->w, $self->h);	854	my ($w, $h) = @$self{qw(w h)};
759		855
760	my $tex = $self->{texture}	856	my $tex = $self->{texture}
761	or return;	857	or return;
762		858
763	glEnable GL_TEXTURE_2D;	859	glEnable GL_TEXTURE_2D;
…		…
786	}	882	}
787		883
788	sub size_request {	884	sub size_request {
789	my ($self) = @_;	885	my ($self) = @_;
790		886
791	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	887	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
792		888
793	@$self{qw(child_w child_h)}	889	$w = 10 if $self->{scroll_x};
		890	$h = 10 if $self->{scroll_y};
		891
		892	($w, $h)
794	}	893	}
795		894
796	sub size_allocate {	895	sub size_allocate {
797	my ($self, $w, $h) = @_;	896	my ($self, $w, $h) = @_;
798		897
		898	my $child = $self->child;
		899
799	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	900	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
800	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	901	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
801		902
802	$self->child->configure (0, 0, $w, $h);	903	$self->child->configure (0, 0, $w, $h);
803	$self->update;	904	$self->update;
804	}	905	}
805		906
…		…
841	}	942	}
842		943
843	sub _render {	944	sub _render {
844	my ($self) = @_;	945	my ($self) = @_;
845		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
846	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
847		951
848	$self->SUPER::_render;	952	$self->SUPER::_render;
849	}	953	}
850		954
…		…
853	package CFClient::UI::ScrolledWindow;	957	package CFClient::UI::ScrolledWindow;
854		958
855	our @ISA = CFClient::UI::HBox::;	959	our @ISA = CFClient::UI::HBox::;
856		960
857	sub new {	961	sub new {
858	my $class = shift;	962	my ($class, %arg) = @_;
		963
		964	my $child = delete $arg{child};
859		965
860	my $self;	966	my $self;
861		967
862	my $slider = new CFClient::UI::Slider	968	my $slider = new CFClient::UI::Slider
863	vertical => 1,	969	vertical => 1,
864	range => [0, 0, 1, 0.01], # HACK fix	970	range => [0, 0, 1, 0.01], # HACK fix
865	connect_changed => sub {	971	on_changed => sub {
866	$self->{vp}->set_offset (0, $_[1]);	972	$self->{vp}->set_offset (0, $_[1]);
867	},	973	},
868	;	974	;
869		975
870	$self = $class->SUPER::new (	976	$self = $class->SUPER::new (
871	vp => (new CFClient::UI::ViewPort expand => 1),	977	vp => (new CFClient::UI::ViewPort expand => 1),
872	slider => $slider,	978	slider => $slider,
873	@_,	979	%arg,
874	);	980	);
875		981
876	$self->{vp}->add ($self->{scrolled});
877	$self->add ($self->{vp});
878	$self->add ($self->{slider});	982	$self->SUPER::add ($self->{vp}, $self->{slider});
		983	$self->add ($child) if $child;
879		984
880	$self	985	$self
		986	}
		987
		988	sub add {
		989	my ($self, $widget) = @_;
		990
		991	$self->{vp}->add ($self->{child} = $widget);
881	}	992	}
882		993
883	sub update {	994	sub update {
884	my ($self) = @_;	995	my ($self) = @_;
885		996
…		…
948		1059
949	our @ISA = CFClient::UI::Bin::;	1060	our @ISA = CFClient::UI::Bin::;
950		1061
951	use CFClient::OpenGL;	1062	use CFClient::OpenGL;
952		1063
953	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 =
954	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
955	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);
956		1071
957	sub new {	1072	sub new {
958	my $class = shift;	1073	my ($class, %arg) = @_;
959		1074
960	# TODO: user_x, user_y, overwrite moveto?	1075	my $title = delete $arg{title};
961		1076
962	my $self = $class->SUPER::new (	1077	my $self = $class->SUPER::new (
963	bg => [1, 1, 1, 1],	1078	bg => [1, 1, 1, 1],
964	border_bg => [1, 1, 1, 1],	1079	border_bg => [1, 1, 1, 1],
965	border => 0.6,	1080	border => 0.6,
966	is_toplevel => 1,
967	can_events => 1,	1081	can_events => 1,
968	@_	1082	min_w => 16,
		1083	min_h => 16,
		1084	%arg,
969	);	1085	);
970		1086
971	$self->{title} &&= new CFClient::UI::Label	1087	$self->{title} = new CFClient::UI::Label
972	align => 0,	1088	align => 0,
973	valign => 1,	1089	valign => 1,
974	text => $self->{title},	1090	text => $title,
975	fontsize => $self->{border};	1091	fontsize => $self->{border}
		1092	if defined $title;
976		1093
977	$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};
978	}	1102	}
979		1103
980	sub border {	1104	sub border {
981	int $_[0]{border} * $::FONTSIZE	1105	int $_[0]{border} * $::FONTSIZE
982	}	1106	}
983		1107
984	sub size_request {	1108	sub size_request {
985	my ($self) = @_;	1109	my ($self) = @_;
		1110
		1111	$self->{title}->size_request
		1112	if $self->{title};
986		1113
987	my ($w, $h) = $self->SUPER::size_request;	1114	my ($w, $h) = $self->SUPER::size_request;
988		1115
989	(	1116	(
990	$w + $self->border * 2,	1117	$w + $self->border * 2,
…		…
993	}	1120	}
994		1121
995	sub size_allocate {	1122	sub size_allocate {
996	my ($self, $w, $h) = @_;	1123	my ($self, $w, $h) = @_;
997		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
998	$h -= List::Util::max 0, $self->border * 2;	1133	$h -= List::Util::max 0, $border * 2;
999	$w -= List::Util::max 0, $self->border * 2;	1134	$w -= List::Util::max 0, $border * 2;
1000		1135
1001	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1002	if $self->{title};
1003
1004	$self->child->configure ($self->border, $self->border, $w, $h);	1136	$self->child->configure ($border, $border, $w, $h);
1005	}	1137	}
1006		1138
1007	sub button_down {	1139	sub button_down {
1008	my ($self, $ev, $x, $y) = @_;	1140	my ($self, $ev, $x, $y) = @_;
1009		1141
…		…
1025	my ($ev, $x, $y) = @_;	1157	my ($ev, $x, $y) = @_;
1026		1158
1027	my $dx = $ev->{x} - $ox;	1159	my $dx = $ev->{x} - $ox;
1028	my $dy = $ev->{y} - $oy;	1160	my $dy = $ev->{y} - $oy;
1029		1161
1030	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1162	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1031	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1163	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1164
		1165	$self->realloc;
1032	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1033	$self->check_size;
1034	};	1167	};
1035		1168
1036	} elsif ($lr ^ $td) {	1169	} elsif ($lr ^ $td) {
1037	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1170	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1038	my ($bx, $by) = ($self->{x}, $self->{y});	1171	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1040	$self->{motion} = sub {	1173	$self->{motion} = sub {
1041	my ($ev, $x, $y) = @_;	1174	my ($ev, $x, $y) = @_;
1042		1175
1043	($x, $y) = ($ev->{x}, $ev->{y});	1176	($x, $y) = ($ev->{x}, $ev->{y});
1044		1177
1045	$self->move ($bx + $x - $ox, $by + $y - $oy);	1178	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1046	$self->update;
1047	};	1179	};
		1180	} else {
		1181	return 0;
		1182	}
		1183
1048	}	1184	1
1049	}	1185	}
1050		1186
1051	sub button_up {	1187	sub button_up {
1052	my ($self, $ev, $x, $y) = @_;	1188	my ($self, $ev, $x, $y) = @_;
1053		1189
1054	delete $self->{motion};	1190	!!delete $self->{motion}
1055	}	1191	}
1056		1192
1057	sub mouse_motion {	1193	sub mouse_motion {
1058	my ($self, $ev, $x, $y) = @_;	1194	my ($self, $ev, $x, $y) = @_;
1059		1195
1060	$self->{motion}->($ev, $x, $y) if $self->{motion};	1196	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1197
		1198	!!$self->{motion}
1061	}	1199	}
1062		1200
1063	sub _draw {	1201	sub _draw {
1064	my ($self) = @_;	1202	my ($self) = @_;
1065		1203
		1204	my $child = $self->{children}[0];
		1205
1066	my ($w, $h ) = ($self->{w}, $self->{h});	1206	my ($w, $h ) = ($self->{w}, $self->{h});
1067	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1207	my ($cw, $ch) = ($child->{w}, $child->{h});
1068		1208
1069	glEnable GL_TEXTURE_2D;	1209	glEnable GL_TEXTURE_2D;
1070	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1210	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1071		1211
1072	my $border = $self->border;	1212	my $border = $self->border;
1073		1213
1074	glColor @{ $self->{border_bg} };	1214	glColor @{ $self->{border_bg} };
1075	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1215	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1076	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1216	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1077	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1217	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1078	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1218	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1079		1219
1080	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1220	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1081	my $bg = $tex[0];	1221	glColor @{ $self->{bg} };
1082		1222
1083	# TODO: repeat texture not scale	1223	# TODO: repeat texture not scale
		1224	# solve this better(?)
1084	my $rep_x = $cw / $bg->{w};	1225	$bg->{s} = $cw / $bg->{w};
1085	my $rep_y = $ch / $bg->{h};	1226	$bg->{t} = $ch / $bg->{h};
1086
1087	glColor @{ $self->{bg} };
1088
1089	$bg->{s} = $rep_x;
1090	$bg->{t} = $rep_y;
1091	$bg->{wrap_mode} = 1;
1092	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1227	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1093	}	1228	}
1094		1229
1095	glDisable GL_TEXTURE_2D;	1230	glDisable GL_TEXTURE_2D;
1096		1231
1097	$self->{title}->draw if $self->{title};
1098
1099	$self->child->draw;	1232	$child->draw;
		1233
		1234	if ($self->{title}) {
		1235	glTranslate 0, $border - $self->{h};
		1236	$self->{title}->_draw;
		1237	}
1100	}	1238	}
1101		1239
1102	#############################################################################	1240	#############################################################################
1103		1241
1104	package CFClient::UI::Table;	1242	package CFClient::UI::Table;
…		…
1126	my ($self, $x, $y, $child) = @_;	1264	my ($self, $x, $y, $child) = @_;
1127		1265
1128	$child->set_parent ($self);	1266	$child->set_parent ($self);
1129	$self->{children}[$y][$x] = $child;	1267	$self->{children}[$y][$x] = $child;
1130		1268
1131	$self->check_size (1);	1269	$self->realloc;
1132	}	1270	}
1133		1271
1134	# 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?
1135	sub clear {	1273	sub clear {
1136	my ($self) = @_;	1274	my ($self) = @_;
…		…
1141	for (@children) {	1279	for (@children) {
1142	delete $_->{parent};	1280	delete $_->{parent};
1143	$_->hide;	1281	$_->hide;
1144	}	1282	}
1145		1283
1146	$self->check_size (1);	1284	$self->realloc;
1147	$self->update;
1148	}	1285	}
1149		1286
1150	sub get_wh {	1287	sub get_wh {
1151	my ($self) = @_;	1288	my ($self) = @_;
1152		1289
…		…
1248	}	1385	}
1249	}	1386	}
1250		1387
1251	#############################################################################	1388	#############################################################################
1252		1389
1253	package CFClient::UI::HBox;	1390	package CFClient::UI::Box;
1254
1255	# TODO: wrap into common Box base class
1256		1391
1257	our @ISA = CFClient::UI::Container::;	1392	our @ISA = CFClient::UI::Container::;
1258		1393
1259	sub size_request {	1394	sub size_request {
1260	my ($self) = @_;	1395	my ($self) = @_;
1261		1396
1262	my @alloc = map [$_->size_request], @{$self->{children}};	1397	$self->{vertical}
1263		1398	? (
1264	(	1399	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1265	(List::Util::sum map $_->[0], @alloc),	1400	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1266	(List::Util::max map $_->[1], @alloc),	1401	)
1267	)	1402	: (
		1403	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1404	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1405	)
1268	}	1406	}
1269		1407
1270	sub size_allocate {	1408	sub size_allocate {
1271	my ($self, $w, $h) = @_;	1409	my ($self, $w, $h) = @_;
1272		1410
1273	($h, $w) = ($w, $h);	1411	my $space = $self->{vertical} ? $h : $w;
1274
1275	my $children = $self->{children};	1412	my $children = $self->{children};
1276		1413
1277	my @h = map $_->{req_w}, @$children;	1414	my @req;
1278		1415
1279	my $req_h = List::Util::sum @h;	1416	if ($self->{homogeneous}) {
1280		1417	@req = ($space / (@$children || 1)) x @$children;
1281	if ($req_h > $h) {
1282	# ah well, not enough space
1283	$_ *= $h / $req_h for @h;
1284	} 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 {
1285	my $exp = List::Util::sum map $_->{expand}, @$children;	1426	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1286	$exp ||= 1;
1287		1427
		1428	$space = ($space - $req) / $expand; # remaining space to give away
		1429
		1430	$req[$_] += $space * $children->[$_]{expand}
1288	for (0 .. $#$children) {	1431	for 0 .. $#$children;
1289	my $child = $children->[$_];
1290
1291	my $alloc_h = $h[$_];
1292	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1293	$h[$_] = $alloc_h;
1294	}	1432	}
1295	}	1433	}
1296		1434
1297	CFClient::UI::harmonize \@h;	1435	CFClient::UI::harmonize \@req;
1298		1436
1299	my $y = 0;	1437	my $pos = 0;
1300	for (0 .. $#$children) {	1438	for (0 .. $#$children) {
1301	my $child = $children->[$_];
1302	my $h = $h[$_];	1439	my $alloc = $req[$_];
1303	$child->configure ($y, 0, $h, $w);	1440	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1304		1441
1305	$y += $h;	1442	$pos += $alloc;
1306	}	1443	}
1307		1444
1308	1	1445	1
1309	}	1446	}
1310		1447
1311	#############################################################################	1448	#############################################################################
1312		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
1313	package CFClient::UI::VBox;	1465	package CFClient::UI::VBox;
1314		1466
1315	# TODO: wrap into common Box base class
1316
1317	our @ISA = CFClient::UI::Container::;	1467	our @ISA = CFClient::UI::Box::;
1318		1468
1319	sub size_request {	1469	sub new {
1320	my ($self) = @_;	1470	my $class = shift;
1321		1471
1322	my @alloc = map [$_->size_request], @{$self->{children}};	1472	$class->SUPER::new (
1323		1473	vertical => 1,
1324	(	1474	@_,
1325	(List::Util::max map $_->[0], @alloc),
1326	(List::Util::sum map $_->[1], @alloc),
1327	)	1475	)
1328	}
1329
1330	sub size_allocate {
1331	my ($self, $w, $h) = @_;
1332
1333	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1334
1335	my $children = $self->{children};
1336
1337	my @h = map $_->{req_h}, @$children;
1338
1339	my $req_h = List::Util::sum @h;
1340
1341	if ($req_h > $h) {
1342	# ah well, not enough space
1343	$_ *= $h / $req_h for @h;
1344	} else {
1345	my $exp = List::Util::sum map $_->{expand}, @$children;
1346	$exp ||= 1;
1347
1348	for (0 .. $#$children) {
1349	my $child = $children->[$_];
1350
1351	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1352	}
1353	}
1354
1355	CFClient::UI::harmonize \@h;
1356
1357	my $y = 0;
1358	for (0 .. $#$children) {
1359	my $child = $children->[$_];
1360	my $h = $h[$_];
1361	$child->configure (0, $y, $w, $h);
1362
1363	$y += $h;
1364	}
1365
1366	1
1367	}	1476	}
1368		1477
1369	#############################################################################	1478	#############################################################################
1370		1479
1371	package CFClient::UI::Label;	1480	package CFClient::UI::Label;
…		…
1388	ellipsise => 3, # end	1497	ellipsise => 3, # end
1389	layout => (new CFClient::Layout),	1498	layout => (new CFClient::Layout),
1390	fontsize => 1,	1499	fontsize => 1,
1391	align => -1,	1500	align => -1,
1392	valign => -1,	1501	valign => -1,
1393	padding => 2,	1502	padding_x => 2,
		1503	padding_y => 2,
1394	can_events => 0,	1504	can_events => 0,
1395	%arg	1505	%arg
1396	);	1506	);
1397		1507
1398	if (exists $self->{template}) {	1508	if (exists $self->{template}) {
…		…
1434	$self->{text} = "T$text";	1544	$self->{text} = "T$text";
1435		1545
1436	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1546	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1437	$self->{layout}->set_text ($text);	1547	$self->{layout}->set_text ($text);
1438		1548
		1549	$self->realloc;
1439	$self->update;	1550	$self->update;
1440	$self->check_size;
1441	}	1551	}
1442		1552
1443	sub set_markup {	1553	sub set_markup {
1444	my ($self, $markup) = @_;	1554	my ($self, $markup) = @_;
1445		1555
…		…
1449	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1559	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1450		1560
1451	$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;
1452	$self->{layout}->set_markup ($markup);	1562	$self->{layout}->set_markup ($markup);
1453		1563
		1564	$self->realloc;
1454	$self->update;	1565	$self->update;
1455	$self->check_size;
1456	}	1566	}
1457		1567
1458	sub size_request {	1568	sub size_request {
1459	my ($self) = @_;	1569	my ($self) = @_;
1460		1570
…		…
1474		1584
1475	$w = List::Util::max $w, $w2;	1585	$w = List::Util::max $w, $w2;
1476	$h = List::Util::max $h, $h2;	1586	$h = List::Util::max $h, $h2;
1477	}	1587	}
1478		1588
1479	(	1589	($w, $h)
1480	$w + $self->{padding} * 2,
1481	$h + $self->{padding} * 2,
1482	)
1483	}	1590	}
1484		1591
1485	sub size_allocate {	1592	sub size_allocate {
1486	my ($self, $w, $h) = @_;	1593	my ($self, $w, $h) = @_;
1487		1594
		1595	delete $self->{ox};
		1596
1488	delete $self->{texture};	1597	delete $self->{texture}
		1598	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1489	}	1599	}
1490		1600
1491	sub set_fontsize {	1601	sub set_fontsize {
1492	my ($self, $fontsize) = @_;	1602	my ($self, $fontsize) = @_;
1493		1603
1494	$self->{fontsize} = $fontsize;	1604	$self->{fontsize} = $fontsize;
1495	delete $self->{texture};	1605	delete $self->{texture};
1496		1606
1497	$self->update;	1607	$self->realloc;
1498	$self->check_size;
1499	}	1608	}
1500		1609
1501	sub _draw {	1610	sub _draw {
1502	my ($self) = @_;	1611	my ($self) = @_;
1503		1612
…		…
1509	$self->{layout}->set_width ($self->{w});	1618	$self->{layout}->set_width ($self->{w});
1510	$self->{layout}->set_ellipsise ($self->{ellipsise});	1619	$self->{layout}->set_ellipsise ($self->{ellipsise});
1511	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1620	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1512	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1621	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1513		1622
1514	my $tex = new_from_layout CFClient::Texture $self->{layout};	1623	new_from_layout CFClient::Texture $self->{layout}
		1624	};
1515		1625
		1626	unless (exists $self->{ox}) {
1516	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1627	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1517	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1628	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1518	: ($self->{w} - $tex->{w}) * 0.5);	1629	: ($self->{w} - $tex->{w}) * 0.5);
1519		1630
1520	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1631	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1521	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1632	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1522	: ($self->{h} - $tex->{h}) * 0.5);	1633	: ($self->{h} - $tex->{h}) * 0.5);
1523
1524	$tex
1525	};	1634	};
1526		1635
1527	glEnable GL_TEXTURE_2D;	1636	glEnable GL_TEXTURE_2D;
1528	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1637	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1529		1638
…		…
1583	sub set_text {	1692	sub set_text {
1584	my ($self, $text) = @_;	1693	my ($self, $text) = @_;
1585		1694
1586	$self->{cursor} = length $text;	1695	$self->{cursor} = length $text;
1587	$self->_set_text ($text);	1696	$self->_set_text ($text);
1588	$self->update;	1697
1589	$self->check_size;	1698	$self->realloc;
1590	}	1699	}
1591		1700
1592	sub get_text {	1701	sub get_text {
1593	$_[0]{text}	1702	$_[0]{text}
1594	}	1703	}
…		…
1624	$self->{cursor} = length $text;	1733	$self->{cursor} = length $text;
1625	} elsif ($uni == 27) {	1734	} elsif ($uni == 27) {
1626	$self->_emit ('escape');	1735	$self->_emit ('escape');
1627	} elsif ($uni) {	1736	} elsif ($uni) {
1628	substr $text, $self->{cursor}++, 0, chr $uni;	1737	substr $text, $self->{cursor}++, 0, chr $uni;
		1738	} else {
		1739	return 0;
1629	}	1740	}
1630		1741
1631	$self->_set_text ($text);	1742	$self->_set_text ($text);
1632	$self->update;	1743
1633	$self->check_size;	1744	$self->realloc;
		1745
		1746	1
1634	}	1747	}
1635		1748
1636	sub focus_in {	1749	sub focus_in {
1637	my ($self) = @_;	1750	my ($self) = @_;
1638		1751
…		…
1653	utf8::encode $text;	1766	utf8::encode $text;
1654	$self->{cursor} = length substr $text, 0, $idx;	1767	$self->{cursor} = length substr $text, 0, $idx;
1655		1768
1656	$self->_set_text ($self->{text});	1769	$self->_set_text ($self->{text});
1657	$self->update;	1770	$self->update;
		1771
		1772	1
1658	}	1773	}
1659		1774
1660	sub mouse_motion {	1775	sub mouse_motion {
1661	my ($self, $ev, $x, $y) = @_;	1776	my ($self, $ev, $x, $y) = @_;
1662	# 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
1663	}	1780	}
1664		1781
1665	sub _draw {	1782	sub _draw {
1666	my ($self) = @_;	1783	my ($self) = @_;
1667		1784
…		…
1744	} else {	1861	} else {
1745	$self->set_text ($self->{history_saveback});	1862	$self->set_text ($self->{history_saveback});
1746	}	1863	}
1747		1864
1748	} else {	1865	} else {
1749	$self->SUPER::key_down ($ev);	1866	return $self->SUPER::key_down ($ev)
		1867	}
		1868
1750	}	1869	1
1751
1752	}	1870	}
1753		1871
1754	#############################################################################	1872	#############################################################################
1755		1873
1756	package CFClient::UI::Button;	1874	package CFClient::UI::Button;
…		…
1765		1883
1766	sub new {	1884	sub new {
1767	my $class = shift;	1885	my $class = shift;
1768		1886
1769	$class->SUPER::new (	1887	$class->SUPER::new (
1770	padding => 4,	1888	padding_x => 4,
		1889	padding_y => 4,
1771	fg => [1, 1, 1],	1890	fg => [1, 1, 1],
1772	active_fg => [0, 0, 1],	1891	active_fg => [0, 0, 1],
1773	can_hover => 1,	1892	can_hover => 1,
1774	align => 0,	1893	align => 0,
1775	valign => 0,	1894	valign => 0,
…		…
1784	my ($self, $ev, $x, $y) = @_;	1903	my ($self, $ev, $x, $y) = @_;
1785		1904
1786	$self->emit ("activate")	1905	$self->emit ("activate")
1787	if $x >= 0 && $x < $self->{w}	1906	if $x >= 0 && $x < $self->{w}
1788	&& $y >= 0 && $y < $self->{h};	1907	&& $y >= 0 && $y < $self->{h};
		1908
		1909	1
1789	}	1910	}
1790		1911
1791	sub _draw {	1912	sub _draw {
1792	my ($self) = @_;	1913	my ($self) = @_;
1793		1914
…		…
1822		1943
1823	sub new {	1944	sub new {
1824	my $class = shift;	1945	my $class = shift;
1825		1946
1826	$class->SUPER::new (	1947	$class->SUPER::new (
1827	padding => 2,	1948	padding_x => 2,
		1949	padding_y => 2,
1828	fg => [1, 1, 1],	1950	fg => [1, 1, 1],
1829	active_fg => [1, 1, 0],	1951	active_fg => [1, 1, 0],
1830	bg => [0, 0, 0, 0.2],	1952	bg => [0, 0, 0, 0.2],
1831	active_bg => [1, 1, 1, 0.5],	1953	active_bg => [1, 1, 1, 0.5],
1832	state => 0,	1954	state => 0,
…		…
1836	}	1958	}
1837		1959
1838	sub size_request {	1960	sub size_request {
1839	my ($self) = @_;	1961	my ($self) = @_;
1840		1962
1841	($self->{padding} * 2 + 6) x 2	1963	(6) x 2
1842	}	1964	}
1843		1965
1844	sub button_down {	1966	sub button_down {
1845	my ($self, $ev, $x, $y) = @_;	1967	my ($self, $ev, $x, $y) = @_;
1846		1968
1847	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1969	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1848	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1970	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1849	$self->{state} = !$self->{state};	1971	$self->{state} = !$self->{state};
1850	$self->_emit (changed => $self->{state});	1972	$self->_emit (changed => $self->{state});
		1973	} else {
		1974	return 0
		1975	}
		1976
1851	}	1977	1
1852	}	1978	}
1853		1979
1854	sub _draw {	1980	sub _draw {
1855	my ($self) = @_;	1981	my ($self) = @_;
1856		1982
1857	$self->SUPER::_draw;	1983	$self->SUPER::_draw;
1858		1984
1859	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1985	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1860		1986
1861	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;
1862		1990
1863	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1991	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1864		1992
1865	my $tex = $self->{state} ? $tex[1] : $tex[0];	1993	my $tex = $self->{state} ? $tex[1] : $tex[0];
1866		1994
…		…
2131	fg => [1, 1, 1],	2259	fg => [1, 1, 1],
2132	active_fg => [0, 0, 0],	2260	active_fg => [0, 0, 0],
2133	bg => [0, 0, 0, 0.2],	2261	bg => [0, 0, 0, 0.2],
2134	active_bg => [1, 1, 1, 0.5],	2262	active_bg => [1, 1, 1, 0.5],
2135	range => [0, 0, 100, 10, 0],	2263	range => [0, 0, 100, 10, 0],
2136	req_w => $::WIDTH / 80,	2264	min_w => $::WIDTH / 80,
2137	req_h => $::WIDTH / 80,	2265	min_h => $::WIDTH / 80,
2138	vertical => 0,	2266	vertical => 0,
2139	can_hover => 1,	2267	can_hover => 1,
2140	inner_pad => 0.02,	2268	inner_pad => 0.02,
2141	@_	2269	@_
2142	);	2270	);
…		…
2145	$self->update;	2273	$self->update;
2146		2274
2147	$self	2275	$self
2148	}	2276	}
2149		2277
		2278	sub changed { }
		2279
2150	sub set_range {	2280	sub set_range {
2151	my ($self, $range) = @_;	2281	my ($self, $range) = @_;
2152		2282
2153	($range, $self->{range}) = ($self->{range}, $range);	2283	($range, $self->{range}) = ($self->{range}, $range);
2154		2284
…		…
2180	}	2310	}
2181		2311
2182	sub size_request {	2312	sub size_request {
2183	my ($self) = @_;	2313	my ($self) = @_;
2184		2314
2185	my $w = $self->{req_w};	2315	($self->{req_w}, $self->{req_h})
2186	my $h = $self->{req_h};
2187
2188	$self->{vertical} ? ($h, $w) : ($w, $h)
2189	}	2316	}
2190		2317
2191	sub button_down {	2318	sub button_down {
2192	my ($self, $ev, $x, $y) = @_;	2319	my ($self, $ev, $x, $y) = @_;
2193		2320
2194	$self->SUPER::button_down ($ev, $x, $y);	2321	$self->SUPER::button_down ($ev, $x, $y);
2195		2322
2196	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2323	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2197		2324
2198	$self->mouse_motion ($ev, $x, $y);	2325	$self->mouse_motion ($ev, $x, $y)
2199	}	2326	}
2200		2327
2201	sub mouse_motion {	2328	sub mouse_motion {
2202	my ($self, $ev, $x, $y) = @_;	2329	my ($self, $ev, $x, $y) = @_;
2203		2330
…		…
2207	my (undef, $lo, $hi, $page) = @{$self->{range}};	2334	my (undef, $lo, $hi, $page) = @{$self->{range}};
2208		2335
2209	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2336	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2210		2337
2211	$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
2212	}	2343	1
2213	}	2344	}
2214		2345
2215	sub update {	2346	sub update {
2216	my ($self) = @_;	2347	my ($self) = @_;
2217		2348
2218	$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}) {
2219	$self->set_value ($self->{range}[0]);	2357	$self->set_value ($self->{range}[0]);
2220		2358
2221	my ($value, $lo, $hi, $page) = @{$self->{range}};	2359	my ($value, $lo, $hi, $page) = @{$self->{range}};
2222	my $range = ($hi - $page - $lo) || 1e-100;	2360	my $range = ($hi - $page - $lo) || 1e-100;
2223		2361
…		…
2229	$value = ($value - $lo) / $range;	2367	$value = ($value - $lo) / $range;
2230	$value = $value * $self->{scale} + $self->{offset};	2368	$value = $value * $self->{scale} + $self->{offset};
2231		2369
2232	$self->{knob_x} = $value - $knob_w * 0.5;	2370	$self->{knob_x} = $value - $knob_w * 0.5;
2233	$self->{knob_w} = $knob_w;	2371	$self->{knob_w} = $knob_w;
2234	});	2372	}
2235
2236	$self->SUPER::update;
2237	}
2238
2239	sub _draw {
2240	my ($self) = @_;
2241		2373
2242	$self->SUPER::_draw ();	2374	$self->SUPER::_draw ();
2243		2375
2244	glScale $self->{w}, $self->{h};	2376	glScale $self->{w}, $self->{h};
2245		2377
…		…
2544		2676
2545	sub new {	2677	sub new {
2546	my $class = shift;	2678	my $class = shift;
2547		2679
2548	my $self = $class->SUPER::new (	2680	my $self = $class->SUPER::new (
2549	state => 0,	2681	state => 0,
2550	connect_activate => \&toggle_flopper,	2682	on_activate => \&toggle_flopper,
2551	@_	2683	@_
2552	);	2684	);
2553		2685
2554	if ($self->{state}) {
2555	$self->{state} = 0;
2556	$self->toggle_flopper;
2557	}
2558
2559	$self	2686	$self
2560	}	2687	}
2561		2688
2562	sub toggle_flopper {	2689	sub toggle_flopper {
2563	my ($self) = @_;	2690	my ($self) = @_;
2564		2691
2565	# TODO: use animation	2692	$self->{other}->toggle_visibility;
2566	if ($self->{state} = !$self->{state}) {
2567	$CFClient::UI::ROOT->add ($self->{other});
2568	$self->{other}->move ($self->coord2global (0, $self->{h}));
2569	$self->_emit ("open");
2570	} else {
2571	$CFClient::UI::ROOT->remove ($self->{other});
2572	$self->_emit ("close");
2573	}
2574
2575	$self->_emit (changed => $self->{state});
2576	}	2693	}
2577		2694
2578	#############################################################################	2695	#############################################################################
2579		2696
2580	package CFClient::UI::Tooltip;	2697	package CFClient::UI::Tooltip;
…		…
2593	}	2710	}
2594		2711
2595	sub set_tooltip_from {	2712	sub set_tooltip_from {
2596	my ($self, $widget) = @_;	2713	my ($self, $widget) = @_;
2597		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
2598	$self->add (new CFClient::UI::Label	2724	$self->add (new CFClient::UI::Label
2599	markup => $widget->{tooltip},	2725	markup => $tooltip,
2600	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2726	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2601	fontsize => 0.8,	2727	fontsize => 0.8,
2602	fg => [0, 0, 0, 1],	2728	fg => [0, 0, 0, 1],
2603	ellipsise => 0,	2729	ellipsise => 0,
2604	font => ($widget->{tooltip_font} || $::FONT_PROP),	2730	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2615		2741
2616	sub size_allocate {	2742	sub size_allocate {
2617	my ($self, $w, $h) = @_;	2743	my ($self, $w, $h) = @_;
2618		2744
2619	$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	});
2620	}	2764	}
2621		2765
2622	sub _draw {	2766	sub _draw {
2623	my ($self) = @_;	2767	my ($self) = @_;
2624		2768
…		…
2641	glVertex $w, $h;	2785	glVertex $w, $h;
2642	glVertex $w, 0;	2786	glVertex $w, 0;
2643	glEnd;	2787	glEnd;
2644		2788
2645	glTranslate 2 - 0.375, 2 - 0.375;	2789	glTranslate 2 - 0.375, 2 - 0.375;
		2790
2646	$self->SUPER::_draw;	2791	$self->SUPER::_draw;
2647	}	2792	}
2648		2793
2649	#############################################################################	2794	#############################################################################
2650		2795
…		…
2726	$self->SUPER::DESTROY;	2871	$self->SUPER::DESTROY;
2727	}	2872	}
2728		2873
2729	#############################################################################	2874	#############################################################################
2730		2875
2731	package CFClient::UI::Inventory;	2876	package CFClient::UI::Buttonbar;
2732		2877
2733	our @ISA = CFClient::UI::ScrolledWindow::;	2878	our @ISA = CFClient::UI::HBox::;
2734		2879
2735	sub new {	2880	# TODO: should actualyl wrap buttons and other goodies.
2736	my $class = shift;
2737
2738	my $self = $class->SUPER::new (
2739	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2740	@_,
2741	);
2742
2743	$self
2744	}
2745
2746	sub set_items {
2747	my ($self, $items) = @_;
2748
2749	$self->{scrolled}->clear;
2750	return unless $items;
2751
2752	my @items = sort {
2753	($a->{type} <=> $b->{type})
2754	or ($a->{name} cmp $b->{name})
2755	} @$items;
2756
2757	$self->{real_items} = \@items;
2758
2759	my $row = 0;
2760	for my $item (@items) {
2761	CFClient::Item::update_widgets $item;
2762
2763	$self->{scrolled}->add (0, $row, $item->{face_widget});
2764	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2765	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2766
2767	$row++;
2768	}
2769	}
2770
2771	sub size_request {
2772	my ($self) = @_;
2773	($self->{req_w}, $self->{req_h});
2774	}
2775		2881
2776	#############################################################################	2882	#############################################################################
2777		2883
2778	package CFClient::UI::Menu;	2884	package CFClient::UI::Menu;
2779		2885
…		…
2820	# maybe save $GRAB? must be careful about events...	2926	# maybe save $GRAB? must be careful about events...
2821	$GRAB = $self;	2927	$GRAB = $self;
2822	$self->{button} = $ev->{button};	2928	$self->{button} = $ev->{button};
2823		2929
2824	$self->show;	2930	$self->show;
2825	$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);
2826	}	2932	}
2827		2933
2828	sub mouse_motion {	2934	sub mouse_motion {
2829	my ($self, $ev, $x, $y) = @_;	2935	my ($self, $ev, $x, $y) = @_;
2830		2936
2831	# TODO: should use vbox->find_widget or so	2937	# TODO: should use vbox->find_widget or so
2832	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2938	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2833	$self->{hover} = $self->{item}{$HOVER};	2939	$self->{hover} = $self->{item}{$HOVER};
		2940
		2941	0
2834	}	2942	}
2835		2943
2836	sub button_up {	2944	sub button_up {
2837	my ($self, $ev, $x, $y) = @_;	2945	my ($self, $ev, $x, $y) = @_;
2838		2946
…		…
2840	undef $GRAB;	2948	undef $GRAB;
2841	$self->hide;	2949	$self->hide;
2842		2950
2843	$self->_emit ("popdown");	2951	$self->_emit ("popdown");
2844	$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	);
2845	}	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});
2846	}	3066	}
2847		3067
2848	#############################################################################	3068	#############################################################################
2849		3069
2850	package CFClient::UI::Statusbox;	3070	package CFClient::UI::Statusbox;
…		…
2955	$self->SUPER::reconfigure;	3175	$self->SUPER::reconfigure;
2956	}	3176	}
2957		3177
2958	#############################################################################	3178	#############################################################################
2959		3179
2960	package CFClient::UI::Root;	3180	package CFClient::UI::Inventory;
2961		3181
2962	our @ISA = CFClient::UI::Container::;	3182	our @ISA = CFClient::UI::ScrolledWindow::;
2963
2964	use CFClient::OpenGL;
2965		3183
2966	sub new {	3184	sub new {
2967	my $class = shift;	3185	my $class = shift;
2968		3186
2969	$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 => [],
		3429	@_,
		3430	)
		3431	}
		3432
		3433	# XXX: Do sorting? Argl...
		3434	sub add_spell {
		3435	my ($self, $spell) = @_;
		3436	$self->{spells}->{$spell->{name}} = $spell;
		3437
		3438	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		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 (
2970	visible => 1,	3485	visible => 1,
2971	@_,	3486	@_,
2972	)	3487	);
2973	}
2974		3488
2975	sub configure {	3489	Scalar::Util::weaken ($self->{root} = $self);
2976	my ($self, $x, $y, $w, $h) = @_;
2977		3490
2978	$self->{w} = $w;	3491	$self
2979	$self->{h} = $h;
2980	}
2981
2982	sub check_size {
2983	my ($self) = @_;
2984
2985	$self->size_allocate ($self->{w}, $self->{h})
2986	if $self->{w};
2987	}	3492	}
2988		3493
2989	sub size_request {	3494	sub size_request {
2990	my ($self) = @_;	3495	my ($self) = @_;
2991		3496
2992	($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
2993	}	3512	}
2994		3513
2995	sub size_allocate {	3514	sub size_allocate {
2996	my ($self, $w, $h) = @_;	3515	my ($self, $w, $h) = @_;
2997		3516
2998	for my $child ($self->children) {	3517	for my $child ($self->children) {
2999	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)};
3000		3519
3001	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3520	$X = $child->{force_x} if exists $child->{force_x};
3002	if exists $child->{req_x};	3521	$Y = $child->{force_y} if exists $child->{force_y};
3003		3522
3004	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3523	$X = _to_pixel $X, $W, $self->{w};
3005	if exists $child->{req_y};	3524	$Y = _to_pixel $Y, $H, $self->{h};
3006
3007	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3008	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3009		3525
3010	$child->configure ($X, $Y, $W, $H);	3526	$child->configure ($X, $Y, $W, $H);
3011	}	3527	}
3012	}	3528	}
3013		3529
…		…
3024	}	3540	}
3025		3541
3026	sub update {	3542	sub update {
3027	my ($self) = @_;	3543	my ($self) = @_;
3028		3544
3029	$self->check_size;
3030	$::WANT_REFRESH++;	3545	$::WANT_REFRESH++;
3031	}	3546	}
3032		3547
3033	sub add {	3548	sub add {
3034	my ($self, @children) = @_;	3549	my ($self, @children) = @_;
3035		3550
3036	for (my @widgets = @children; my $w = pop @widgets; ) {
3037	push @widgets, $w->children;
3038	$w->{root} = $self;
3039	$w->{visible} = $self->{visible} + 1;
3040	}
3041
3042	for my $child (@children) {
3043	$child->{is_toplevel} = 1;	3551	$_->{is_toplevel} = 1
3044		3552	for @children;
3045	# integerise window positions
3046	$child->{x} = int $child->{x};
3047	$child->{y} = int $child->{y};
3048	}
3049		3553
3050	$self->SUPER::add (@children);	3554	$self->SUPER::add (@children);
3051	}	3555	}
3052		3556
3053	sub remove {	3557	sub remove {
3054	my ($self, @children) = @_;	3558	my ($self, @children) = @_;
3055		3559
3056	$self->SUPER::remove (@children);	3560	$self->SUPER::remove (@children);
		3561
		3562	delete $self->{is_toplevel}
		3563	for @children;
3057		3564
3058	while (@children) {	3565	while (@children) {
3059	my $w = pop @children;	3566	my $w = pop @children;
3060	push @children, $w->children;	3567	push @children, $w->children;
3061	$w->set_invisible;	3568	$w->set_invisible;
…		…
3080	while ($self->{refresh_hook}) {	3587	while ($self->{refresh_hook}) {
3081	$_->()	3588	$_->()
3082	for values %{delete $self->{refresh_hook}};	3589	for values %{delete $self->{refresh_hook}};
3083	}	3590	}
3084		3591
3085	if ($self->{check_size}) {	3592	if ($self->{realloc}) {
3086	my @queue = ([], []);	3593	my %queue;
		3594	my @queue;
		3595	my $widget;
3087		3596
3088	for (;;) {	3597	outer:
3089	if ($self->{check_size}) {	3598	while () {
3090	# heuristic: check containers last	3599	if (my $realloc = delete $self->{realloc}) {
3091	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3600	for $widget (values %$realloc) {
3092	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	}
3093	}	3607	}
3094		3608
3095	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3609	while () {
		3610	@queue or last outer;
3096		3611
3097	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3612	$widget = pop @{ $queue[-1] || [] }
3098	? @$widget{qw(user_w user_h)}	3613	and last;
3099	: $widget->size_request;
3100
3101	if (delete $widget->{force_alloc}
3102	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3103	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3104		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}) {
3105	$widget->{req_w} = $w;	3630	$widget->{req_w} = $w;
3106	$widget->{req_h} = $h;	3631	$widget->{req_h} = $h;
3107		3632
3108	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3633	$self->{size_alloc}{$widget+0} = $widget;
3109		3634
3110	$widget->{parent}->check_size
3111	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	}
3112	}	3642	}
		3643
		3644	delete $self->{realloc}{$widget+0};
3113	}	3645	}
3114	}	3646	}
3115		3647
3116	while ($self->{size_alloc}) {	3648	while (my $size_alloc = delete $self->{size_alloc}) {
3117	for (values %{delete $self->{size_alloc}}) {	3649	my @queue = sort { $b->{visible} <=> $a->{visible} }
3118	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)};
3119		3656
3120	$w = 0 if $w < 0;	3657	$w = 0 if $w < 0;
3121	$h = 0 if $h < 0;	3658	$h = 0 if $h < 0;
3122		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
3123	$widget->{w} = $w;	3667	$widget->{w} = $w;
3124	$widget->{h} = $h;	3668	$widget->{h} = $h;
		3669
3125	$widget->emit (size_allocate => $w, $h);	3670	$widget->emit (size_allocate => $w, $h);
		3671	}
3126	}	3672	}
3127	}	3673	}
3128		3674
3129	while ($self->{post_alloc_hook}) {	3675	while ($self->{post_alloc_hook}) {
3130	$_->()	3676	$_->()
3131	for values %{delete $self->{post_alloc_hook}};	3677	for values %{delete $self->{post_alloc_hook}};
3132	}	3678	}
		3679
3133		3680
3134	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3681	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3135	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3682	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3136	glClear GL_COLOR_BUFFER_BIT;	3683	glClear GL_COLOR_BUFFER_BIT;
3137		3684
…		…
3139	glLoadIdentity;	3686	glLoadIdentity;
3140	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3687	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3141	glMatrixMode GL_MODELVIEW;	3688	glMatrixMode GL_MODELVIEW;
3142	glLoadIdentity;	3689	glLoadIdentity;
3143		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
3144	$self->_draw;	3698	$self->_draw;
3145	}	3699	}
3146		3700
3147	#############################################################################	3701	#############################################################################
3148		3702

Diff Legend

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