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.251 by root, Sun May 28 22:24:24 2006 UTC vs.
Revision 1.276 by root, Sun Jun 4 00:16:01 2006 UTC

…		…
17	our $BUTTON_STATE;	17	our $BUTTON_STATE;
18		18
19	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
20		20
21	sub get_layout {	21	sub get_layout {
		22	my $layout;
		23
22	for (grep { $_->{name} } values %WIDGET) {	24	for (grep { $_->{name} } values %WIDGET) {
23	$LAYOUT->{$_->{name}} = {	25	my $win = $layout->{$_->{name}} = { };
24	x => $_->{x} / $::WIDTH,
25	y => $_->{y} / $::HEIGHT,
26	w => $_->{w} / $::WIDTH,
27	h => $_->{h} / $::HEIGHT
28	};	26
29	}	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};
30		31
31	return $LAYOUT;	32	$win->{show} = $_->{visible} && $_->{is_toplevel};
		33	}
		34
		35	$layout
32	}	36	}
33		37
34	sub set_layout {	38	sub set_layout {
35	my ($layout) = @_;	39	my ($layout) = @_;
		40
36	$LAYOUT = $layout;	41	$LAYOUT = $layout;
37	}	42	}
38		43
39	sub check_tooltip {	44	sub check_tooltip {
		45	return if $ENV{CFPLUS_DEBUG} & 8;
		46
40	if (!$GRAB) {	47	if (!$GRAB) {
41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42	if (length $widget->{tooltip}) {	49	if (length $widget->{tooltip}) {
43
44	if ($TOOLTIP->{owner} != $widget) {	50	if ($TOOLTIP->{owner} != $widget) {
		51	$TOOLTIP->hide;
		52
45	$TOOLTIP->{owner} = $widget;	53	$TOOLTIP->{owner} = $widget;
46		54
47	my $tip = $widget->{tooltip};	55	my $tip = $widget->{tooltip};
48		56
49	$tip = $tip->($widget) if CODE:: eq ref $tip;	57	$tip = $tip->($widget) if CODE:: eq ref $tip;
50		58
51	$TOOLTIP->set_tooltip_from ($widget);	59	$TOOLTIP->set_tooltip_from ($widget);
52	$TOOLTIP->show;	60	$TOOLTIP->show;
53
54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57	if $x + $TOOLTIP->{w} > $::WIDTH;
58
59	$TOOLTIP->move ($x, $y);
60	$TOOLTIP->realloc;
61	}	61	}
62		62
63	return;	63	return;
64	}	64	}
65	}	65	}
…		…
171	sub rescale_widgets {	171	sub rescale_widgets {
172	my ($sx, $sy) = @_;	172	my ($sx, $sy) = @_;
173		173
174	for my $widget (values %WIDGET) {	174	for my $widget (values %WIDGET) {
175	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
176	$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.]+$/;
177	$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};
178	$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};
179	$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.]+$/;
180	$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};
181	$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};
		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
182	}	189	}
183	}	190	}
184		191
185	reconfigure_widgets;	192	reconfigure_widgets;
186	}	193	}
…		…
195		202
196	sub new {	203	sub new {
197	my $class = shift;	204	my $class = shift;
198		205
199	my $self = bless {	206	my $self = bless {
200	x => 0,	207	x => "center",
201	y => 0,	208	y => "center",
202	z => 0,	209	z => 0,
		210	w => undef,
		211	h => undef,
203	can_events => 1,	212	can_events => 1,
204	@_	213	@_
205	}, $class;	214	}, $class;
		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
206		217
207	for (keys %$self) {	218	for (keys %$self) {
208	if (/^on_(.*)$/) {	219	if (/^on_(.*)$/) {
209	$self->connect ($1 => delete $self->{$_});	220	$self->connect ($1 => delete $self->{$_});
210	}	221	}
211	}	222	}
212		223
213	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
214
215	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	224	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
216	$self->{req_x} = $layout->{x} * $::WIDTH;	225	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
217	$self->{req_y} = $layout->{y} * $::HEIGHT;	226	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
218	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;	227	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
219	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;	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};
220	}	234	}
221		235
222	$self	236	$self
223	}	237	}
224		238
…		…
235	return if $self->{parent};	249	return if $self->{parent};
236		250
237	$CFClient::UI::ROOT->add ($self);	251	$CFClient::UI::ROOT->add ($self);
238	}	252	}
239		253
240	sub center {
241	my ($self) = @_;
242
243	$CFClient::UI::ROOT->on_post_alloc (
244	"center_$self" => sub {
245	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
246	},
247	);
248
249	$self->update;
250	}
251
252	sub set_visible {	254	sub set_visible {
253	my ($self) = @_;	255	my ($self) = @_;
254		256
255	return if $self->{visible};	257	return if $self->{visible};
256		258
257	$self->{root} = $self->{parent}{root};	259	$self->{root} = $self->{parent}{root};
258	$self->{visible} = $self->{parent}{visible} + 1;	260	$self->{visible} = $self->{parent}{visible} + 1;
259		261
260	$self->emit (visibility_change => 1);	262	$self->emit (visibility_change => 1);
261		263
262	$self->realloc unless exists $self->{req_w};	264	$self->realloc if !exists $self->{req_w};
263		265
264	$_->set_visible for $self->children;	266	$_->set_visible for $self->children;
265	}	267	}
266		268
267	sub set_invisible {	269	sub set_invisible {
…		…
309		311
310	$self->{parent}->remove ($self)	312	$self->{parent}->remove ($self)
311	if $self->{parent};	313	if $self->{parent};
312	}	314	}
313		315
314	sub move {	316	sub move_abs {
315	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
316		318
317	$self->{x} = int $x;	319	$self->{x} = List::Util::max 0, int $x;
318	$self->{y} = int $y;	320	$self->{y} = List::Util::max 0, int $y;
319	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
320		322
321	$self->update;	323	$self->update;
322	}	324	}
323		325
324	sub set_size {	326	sub set_size {
325	my ($self, $w, $h) = @_;	327	my ($self, $w, $h) = @_;
326		328
327	$self->{def_w} = $w;	329	$self->{force_w} = $w;
328	$self->{def_h} = $h;	330	$self->{force_h} = $h;
329		331
330	$self->realloc;	332	$self->realloc;
331	}	333	}
332		334
333	sub size_request {	335	sub size_request {
…		…
337		339
338	sub configure {	340	sub configure {
339	my ($self, $x, $y, $w, $h) = @_;	341	my ($self, $x, $y, $w, $h) = @_;
340		342
341	if ($self->{aspect}) {	343	if ($self->{aspect}) {
		344	my ($ow, $oh) = ($w, $h);
		345
342	my $w2 = List::Util::min $w, int $h * $self->{aspect};	346	$w = List::Util::min $w, int $h * $self->{aspect};
343	my $h2 = List::Util::min $h, int $w / $self->{aspect};	347	$h = List::Util::min $h, int $w / $self->{aspect};
344		348
345	# use alignment to adjust x, y	349	# use alignment to adjust x, y
346		350
347	$x += int +($w - $w2) * 0.5;	351	$x += int 0.5 * ($ow - $w);
348	$y += int +($h - $h2) * 0.5;	352	$y += int 0.5 * ($oh - $h);
349
350	($w, $h) = ($w2, $h2);
351	}	353	}
352		354
353	if ($self->{x} != $x || $self->{y} != $y) {	355	if ($self->{x} ne $x || $self->{y} ne $y) {
354	$self->{x} = $x;	356	$self->{x} = $x;
355	$self->{y} = $y;	357	$self->{y} = $y;
356	$self->update;	358	$self->update;
357	}	359	}
358		360
359	if ($self->{w} != $w || $self->{h} != $h) {	361	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
360	return unless $self->{visible};	362	return unless $self->{visible};
361		363
		364	$self->{alloc_w} = $w;
		365	$self->{alloc_h} = $h;
		366
362	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];	367	$self->{root}{size_alloc}{$self+0} = $self;
363	}	368	}
364	}	369	}
365		370
366	sub size_allocate {	371	sub size_allocate {
367	# nothing to be done	372	# nothing to be done
368	}	373	}
369		374
370	sub children {	375	sub children {
		376	# nop
		377	}
		378
		379	sub visible_children {
		380	$_[0]->children
371	}	381	}
372		382
373	sub set_max_size {	383	sub set_max_size {
374	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
375		385
…		…
434		444
435	$::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
436	unless $FOCUS;	446	unless $FOCUS;
437	}	447	}
438		448
439	sub mouse_motion { }	449	sub mouse_motion { 0 }
440	sub button_up { }	450	sub button_up { 0 }
441	sub key_down { }	451	sub key_down { 0 }
442	sub key_up { }	452	sub key_up { 0 }
443		453
444	sub button_down {	454	sub button_down {
445	my ($self, $ev, $x, $y) = @_;	455	my ($self, $ev, $x, $y) = @_;
446		456
447	$self->focus_in;	457	$self->focus_in;
448	}
449		458
450	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	459	0
451	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	460	}
452	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
453	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
454	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
455		461
456	sub find_widget {	462	sub find_widget {
457	my ($self, $x, $y) = @_;	463	my ($self, $x, $y) = @_;
458		464
459	return () unless $self->{can_events};	465	return () unless $self->{can_events};
…		…
467		473
468	sub set_parent {	474	sub set_parent {
469	my ($self, $parent) = @_;	475	my ($self, $parent) = @_;
470		476
471	Scalar::Util::weaken ($self->{parent} = $parent);	477	Scalar::Util::weaken ($self->{parent} = $parent);
472
473	$self->set_visible if $parent->{visible};	478	$self->set_visible if $parent->{visible};
474
475	$self->realloc;
476	}	479	}
477		480
478	sub connect {	481	sub connect {
479	my ($self, $signal, $cb) = @_;	482	my ($self, $signal, $cb) = @_;
480		483
…		…
499	}	502	}
500		503
501	sub realloc {	504	sub realloc {
502	my ($self) = @_;	505	my ($self) = @_;
503		506
504	return unless $self->{visible};	507	if ($self->{visible}) {
505
506	return if $self->{root}{realloc}{$self};	508	return if $self->{root}{realloc}{$self+0};
507		509
508	$self->{root}{realloc}{$self} = $self;	510	$self->{root}{realloc}{$self+0} = $self;
509	$self->{root}->update;	511	$self->{root}->update;
		512	} else {
		513	delete $self->{req_w};
		514	delete $self->{req_h};
		515	}
510	}	516	}
511		517
512	sub update {	518	sub update {
513	my ($self) = @_;	519	my ($self) = @_;
514		520
515	$self->{parent}->update	521	$self->{parent}->update
516	if $self->{parent};	522	if $self->{parent};
517	}	523	}
518		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
		535
519	sub draw {	536	sub draw {
520	my ($self) = @_;	537	my ($self) = @_;
521		538
522	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);
523		550
524	glPushMatrix;	551	glPushMatrix;
525	glTranslate $self->{x}, $self->{y}, 0;	552	glTranslate $self->{x}, $self->{y}, 0;
526	$self->_draw;	553	$self->_draw;
527	glPopMatrix;	554	glPopMatrix;
…		…
539	glVertex $x , $y + $self->{h};	566	glVertex $x , $y + $self->{h};
540	glEnd;	567	glEnd;
541	glDisable GL_BLEND;	568	glDisable GL_BLEND;
542	}	569	}
543		570
544	if ($ENV{PCLIENT_DEBUG}) {	571	if ($ENV{CFPLUS_DEBUG} & 1) {
545	glPushMatrix;	572	glPushMatrix;
546	glColor 1, 1, 0, 1;	573	glColor 1, 1, 0, 1;
547	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
548	glBegin GL_LINE_LOOP;	575	glBegin GL_LINE_LOOP;
549	glVertex 0 , 0;	576	glVertex 0 , 0;
…		…
625	my ($class, %arg) = @_;	652	my ($class, %arg) = @_;
626	$class->SUPER::new (can_events => 0, %arg);	653	$class->SUPER::new (can_events => 0, %arg);
627	}	654	}
628		655
629	sub size_request {	656	sub size_request {
630	(0, 0)	657	my ($self) = @_;
		658
		659	($self->{w} + 0, $self->{h} + 0)
631	}	660	}
632		661
633	sub draw { }	662	sub draw { }
634		663
635	#############################################################################	664	#############################################################################
…		…
639	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFClient::UI::Base::;
640		669
641	sub new {	670	sub new {
642	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
643		672
644	my $children = delete $arg{children} || [];	673	my $children = delete $arg{children};
645		674
646	my $self = $class->SUPER::new (	675	my $self = $class->SUPER::new (
647	children => [],	676	children => [],
648	can_events => 0,	677	can_events => 0,
649	%arg,	678	%arg,
650	);	679	);
		680
651	$self->add ($_) for @$children;	681	$self->add (@$children)
		682	if $children;
652		683
653	$self	684	$self
654	}	685	}
655		686
656	sub add {	687	sub add {
…		…
704	$x -= $self->{x};	735	$x -= $self->{x};
705	$y -= $self->{y};	736	$y -= $self->{y};
706		737
707	my $res;	738	my $res;
708		739
709	for (reverse @{ $self->{children} }) {	740	for (reverse $self->visible_children) {
710	$res = $_->find_widget ($x, $y)	741	$res = $_->find_widget ($x, $y)
711	and return $res;	742	and return $res;
712	}	743	}
713		744
714	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	745	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
756	sub size_request {	787	sub size_request {
757	$_[0]{children}[0]->size_request	788	$_[0]{children}[0]->size_request
758	}	789	}
759		790
760	sub size_allocate {	791	sub size_allocate {
761	my ($self, $w, $h, $changed) = @_;	792	my ($self, $w, $h) = @_;
762		793
763	$self->{children}[0]->configure (0, 0, $w, $h);	794	$self->{children}[0]->configure (0, 0, $w, $h);
764	}	795	}
765		796
766	#############################################################################	797	#############################################################################
		798
		799	# back-buffered drawing area
767		800
768	package CFClient::UI::Window;	801	package CFClient::UI::Window;
769		802
770	our @ISA = CFClient::UI::Bin::;	803	our @ISA = CFClient::UI::Bin::;
771		804
…		…
783	$ROOT->on_post_alloc ($self => sub { $self->render_child });	816	$ROOT->on_post_alloc ($self => sub { $self->render_child });
784	$self->SUPER::update;	817	$self->SUPER::update;
785	}	818	}
786		819
787	sub size_allocate {	820	sub size_allocate {
788	my ($self, $w, $h, $changed) = @_;	821	my ($self, $w, $h) = @_;
789		822
790	$self->SUPER::size_allocate ($w, $h, $changed);	823	$self->SUPER::size_allocate ($w, $h);
791	$self->update	824	$self->update;
792	if $changed;
793	}	825	}
794		826
795	sub _render {	827	sub _render {
		828	my ($self) = @_;
		829
796	$_[0]{children}[0]->draw;	830	$self->{children}[0]->draw;
797	}	831	}
798		832
799	sub render_child {	833	sub render_child {
800	my ($self) = @_;	834	my ($self) = @_;
801		835
802	$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 {
803	glClearColor 0, 0, 0, 0;	837	glClearColor 0, 0, 0, 0;
804	glClear GL_COLOR_BUFFER_BIT;	838	glClear GL_COLOR_BUFFER_BIT;
805		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
806	$self->_render;	847	$self->_render;
807	};	848	};
808	}	849	}
809		850
810	sub _draw {	851	sub _draw {
811	my ($self) = @_;	852	my ($self) = @_;
812		853
813	my ($w, $h) = ($self->w, $self->h);	854	my ($w, $h) = @$self{qw(w h)};
814		855
815	my $tex = $self->{texture}	856	my $tex = $self->{texture}
816	or return;	857	or return;
817		858
818	glEnable GL_TEXTURE_2D;	859	glEnable GL_TEXTURE_2D;
…		…
841	}	882	}
842		883
843	sub size_request {	884	sub size_request {
844	my ($self) = @_;	885	my ($self) = @_;
845		886
846	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	887	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
847		888
848	$w = 10 if $self->{scroll_x};	889	$w = 10 if $self->{scroll_x};
849	$h = 10 if $self->{scroll_y};	890	$h = 10 if $self->{scroll_y};
850		891
851	($w, $h)	892	($w, $h)
852	}	893	}
853		894
854	sub size_allocate {	895	sub size_allocate {
855	my ($self, $w, $h, $changed) = @_;	896	my ($self, $w, $h) = @_;
856		897
		898	my $child = $self->child;
		899
857	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	900	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	901	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859		902
860	$self->child->configure (0, 0, $w, $h);	903	$self->child->configure (0, 0, $w, $h);
861	$self->update;	904	$self->update;
862	}	905	}
863		906
…		…
899	}	942	}
900		943
901	sub _render {	944	sub _render {
902	my ($self) = @_;	945	my ($self) = @_;
903		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
904	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	950	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905		951
906	$self->SUPER::_render;	952	$self->SUPER::_render;
907	}	953	}
908		954
…		…
911	package CFClient::UI::ScrolledWindow;	957	package CFClient::UI::ScrolledWindow;
912		958
913	our @ISA = CFClient::UI::HBox::;	959	our @ISA = CFClient::UI::HBox::;
914		960
915	sub new {	961	sub new {
916	my $class = shift;	962	my ($class, %arg) = @_;
		963
		964	my $child = delete $arg{child};
917		965
918	my $self;	966	my $self;
919		967
920	my $slider = new CFClient::UI::Slider	968	my $slider = new CFClient::UI::Slider
921	vertical => 1,	969	vertical => 1,
…		…
926	;	974	;
927		975
928	$self = $class->SUPER::new (	976	$self = $class->SUPER::new (
929	vp => (new CFClient::UI::ViewPort expand => 1),	977	vp => (new CFClient::UI::ViewPort expand => 1),
930	slider => $slider,	978	slider => $slider,
931	@_,	979	%arg,
932	);	980	);
933		981
934	$self->{vp}->add ($self->{scrolled});
935	$self->add ($self->{vp});
936	$self->add ($self->{slider});	982	$self->SUPER::add ($self->{vp}, $self->{slider});
		983	$self->add ($child) if $child;
937		984
938	$self	985	$self
		986	}
		987
		988	sub add {
		989	my ($self, $widget) = @_;
		990
		991	$self->{vp}->add ($self->{child} = $widget);
939	}	992	}
940		993
941	sub update {	994	sub update {
942	my ($self) = @_;	995	my ($self) = @_;
943		996
…		…
947	my $child = $self->{vp}->child;	1000	my $child = $self->{vp}->child;
948	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1001	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949	}	1002	}
950		1003
951	sub size_allocate {	1004	sub size_allocate {
952	my ($self, $w, $h, $changed) = @_;	1005	my ($self, $w, $h) = @_;
953		1006
954	$self->SUPER::size_allocate ($w, $h, $changed);	1007	$self->SUPER::size_allocate ($w, $h);
955		1008
956	my $child = $self->{vp}->child;	1009	my $child = $self->{vp}->child;
957	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1010	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958	}	1011	}
959		1012
…		…
1006		1059
1007	our @ISA = CFClient::UI::Bin::;	1060	our @ISA = CFClient::UI::Bin::;
1008		1061
1009	use CFClient::OpenGL;	1062	use CFClient::OpenGL;
1010		1063
1011	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 =
1012	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1013	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);
1014		1071
1015	sub new {	1072	sub new {
1016	my $class = shift;	1073	my ($class, %arg) = @_;
		1074
		1075	my $title = delete $arg{title};
1017		1076
1018	my $self = $class->SUPER::new (	1077	my $self = $class->SUPER::new (
1019	bg => [1, 1, 1, 1],	1078	bg => [1, 1, 1, 1],
1020	border_bg => [1, 1, 1, 1],	1079	border_bg => [1, 1, 1, 1],
1021	border => 0.6,	1080	border => 0.6,
1022	is_toplevel => 1,
1023	can_events => 1,	1081	can_events => 1,
1024	@_	1082	min_w => 16,
		1083	min_h => 16,
		1084	%arg,
1025	);	1085	);
1026		1086
1027	$self->{title} &&= new CFClient::UI::Label	1087	$self->{title} = new CFClient::UI::Label
1028	align => 0,	1088	align => 0,
1029	valign => 1,	1089	valign => 1,
1030	text => $self->{title},	1090	text => $title,
1031	fontsize => $self->{border};	1091	fontsize => $self->{border}
		1092	if defined $title;
1032		1093
1033	$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};
1034	}	1102	}
1035		1103
1036	sub border {	1104	sub border {
1037	int $_[0]{border} * $::FONTSIZE	1105	int $_[0]{border} * $::FONTSIZE
1038	}	1106	}
1039		1107
1040	sub size_request {	1108	sub size_request {
1041	my ($self) = @_;	1109	my ($self) = @_;
		1110
		1111	$self->{title}->size_request
		1112	if $self->{title};
1042		1113
1043	my ($w, $h) = $self->SUPER::size_request;	1114	my ($w, $h) = $self->SUPER::size_request;
1044		1115
1045	(	1116	(
1046	$w + $self->border * 2,	1117	$w + $self->border * 2,
1047	$h + $self->border * 2,	1118	$h + $self->border * 2,
1048	)	1119	)
1049	}	1120	}
1050		1121
1051	sub size_allocate {	1122	sub size_allocate {
1052	my ($self, $w, $h, $changed) = @_;	1123	my ($self, $w, $h) = @_;
1053		1124
1054	return unless $changed;	1125	if ($self->{title}) {
		1126	$self->{title}{w} = $w;
		1127	$self->{title}{h} = $h;
		1128	$self->{title}->size_allocate ($w, $h);
		1129	}
1055		1130
		1131	my $border = $self->border;
		1132
1056	$h -= List::Util::max 0, $self->border * 2;	1133	$h -= List::Util::max 0, $border * 2;
1057	$w -= List::Util::max 0, $self->border * 2;	1134	$w -= List::Util::max 0, $border * 2;
1058		1135
1059	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1060	if $self->{title};
1061
1062	$self->child->configure ($self->border, $self->border, $w, $h);	1136	$self->child->configure ($border, $border, $w, $h);
1063	}	1137	}
1064		1138
1065	sub button_down {	1139	sub button_down {
1066	my ($self, $ev, $x, $y) = @_;	1140	my ($self, $ev, $x, $y) = @_;
1067		1141
…		…
1083	my ($ev, $x, $y) = @_;	1157	my ($ev, $x, $y) = @_;
1084		1158
1085	my $dx = $ev->{x} - $ox;	1159	my $dx = $ev->{x} - $ox;
1086	my $dy = $ev->{y} - $oy;	1160	my $dy = $ev->{y} - $oy;
1087		1161
1088	$self->{user_x} = $wx + $dx * $mx;
1089	$self->{user_y} = $wy + $dy * $my;
1090	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);	1162	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1091	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);	1163	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1092	$self->move ($self->{user_x}, $self->{user_y});	1164
1093	$self->realloc;	1165	$self->realloc;
		1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1094	};	1167	};
1095		1168
1096	} elsif ($lr ^ $td) {	1169	} elsif ($lr ^ $td) {
1097	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1170	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1098	my ($bx, $by) = ($self->{x}, $self->{y});	1171	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1100	$self->{motion} = sub {	1173	$self->{motion} = sub {
1101	my ($ev, $x, $y) = @_;	1174	my ($ev, $x, $y) = @_;
1102		1175
1103	($x, $y) = ($ev->{x}, $ev->{y});	1176	($x, $y) = ($ev->{x}, $ev->{y});
1104		1177
1105	$self->{user_x} = $bx + $x - $ox;	1178	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1106	$self->{user_y} = $by + $y - $oy;
1107
1108	$self->move ($self->{user_x}, $self->{user_y});
1109	$self->realloc;
1110	};	1179	};
		1180	} else {
		1181	return 0;
		1182	}
		1183
1111	}	1184	1
1112	}	1185	}
1113		1186
1114	sub button_up {	1187	sub button_up {
1115	my ($self, $ev, $x, $y) = @_;	1188	my ($self, $ev, $x, $y) = @_;
1116		1189
1117	delete $self->{motion};	1190	!!delete $self->{motion}
1118	}	1191	}
1119		1192
1120	sub mouse_motion {	1193	sub mouse_motion {
1121	my ($self, $ev, $x, $y) = @_;	1194	my ($self, $ev, $x, $y) = @_;
1122		1195
1123	$self->{motion}->($ev, $x, $y) if $self->{motion};	1196	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1197
		1198	!!$self->{motion}
1124	}	1199	}
1125		1200
1126	sub _draw {	1201	sub _draw {
1127	my ($self) = @_;	1202	my ($self) = @_;
1128		1203
		1204	my $child = $self->{children}[0];
		1205
1129	my ($w, $h ) = ($self->{w}, $self->{h});	1206	my ($w, $h ) = ($self->{w}, $self->{h});
1130	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1207	my ($cw, $ch) = ($child->{w}, $child->{h});
1131		1208
1132	glEnable GL_TEXTURE_2D;	1209	glEnable GL_TEXTURE_2D;
1133	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1210	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1134		1211
1135	my $border = $self->border;	1212	my $border = $self->border;
1136		1213
1137	glColor @{ $self->{border_bg} };	1214	glColor @{ $self->{border_bg} };
1138	$tex[1]->draw_quad_alpha (0, 0, $w, $border);	1215	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1139	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);	1216	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1140	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1217	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1141	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);	1218	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1142		1219
1143	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1220	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1144	my $bg = $tex[0];	1221	glColor @{ $self->{bg} };
1145		1222
1146	# TODO: repeat texture not scale	1223	# TODO: repeat texture not scale
		1224	# solve this better(?)
1147	my $rep_x = $cw / $bg->{w};	1225	$bg->{s} = $cw / $bg->{w};
1148	my $rep_y = $ch / $bg->{h};	1226	$bg->{t} = $ch / $bg->{h};
1149
1150	glColor @{ $self->{bg} };
1151
1152	$bg->{s} = $rep_x;
1153	$bg->{t} = $rep_y;
1154	$bg->{wrap_mode} = 1;
1155	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1227	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1156	}	1228	}
1157		1229
1158	glDisable GL_TEXTURE_2D;	1230	glDisable GL_TEXTURE_2D;
1159		1231
1160	$self->{title}->draw if $self->{title};
1161
1162	$self->child->draw;	1232	$child->draw;
		1233
		1234	if ($self->{title}) {
		1235	glTranslate 0, $border - $self->{h};
		1236	$self->{title}->_draw;
		1237	}
1163	}	1238	}
1164		1239
1165	#############################################################################	1240	#############################################################################
1166		1241
1167	package CFClient::UI::Table;	1242	package CFClient::UI::Table;
…		…
1241	(sum @$hs),	1316	(sum @$hs),
1242	)	1317	)
1243	}	1318	}
1244		1319
1245	sub size_allocate {	1320	sub size_allocate {
1246	my ($self, $w, $h, $changed) = @_;	1321	my ($self, $w, $h) = @_;
1247		1322
1248	my ($ws, $hs) = $self->get_wh;	1323	my ($ws, $hs) = $self->get_wh;
1249		1324
1250	my $req_w = (sum @$ws) || 1;	1325	my $req_w = (sum @$ws) || 1;
1251	my $req_h = (sum @$hs) || 1;	1326	my $req_h = (sum @$hs) || 1;
…		…
1329	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1404	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1330	)	1405	)
1331	}	1406	}
1332		1407
1333	sub size_allocate {	1408	sub size_allocate {
1334	my ($self, $w, $h, $changed) = @_;	1409	my ($self, $w, $h) = @_;
1335		1410
1336	my $space = $self->{vertical} ? $h : $w;	1411	my $space = $self->{vertical} ? $h : $w;
1337	my $children = $self->{children};	1412	my $children = $self->{children};
1338		1413
1339	my @req;	1414	my @req;
…		…
1422	ellipsise => 3, # end	1497	ellipsise => 3, # end
1423	layout => (new CFClient::Layout),	1498	layout => (new CFClient::Layout),
1424	fontsize => 1,	1499	fontsize => 1,
1425	align => -1,	1500	align => -1,
1426	valign => -1,	1501	valign => -1,
1427	padding => 2,	1502	padding_x => 2,
		1503	padding_y => 2,
1428	can_events => 0,	1504	can_events => 0,
1429	%arg	1505	%arg
1430	);	1506	);
1431		1507
1432	if (exists $self->{template}) {	1508	if (exists $self->{template}) {
…		…
1469		1545
1470	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1546	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1471	$self->{layout}->set_text ($text);	1547	$self->{layout}->set_text ($text);
1472		1548
1473	$self->realloc;	1549	$self->realloc;
		1550	$self->update;
1474	}	1551	}
1475		1552
1476	sub set_markup {	1553	sub set_markup {
1477	my ($self, $markup) = @_;	1554	my ($self, $markup) = @_;
1478		1555
…		…
1483		1560
1484	$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;
1485	$self->{layout}->set_markup ($markup);	1562	$self->{layout}->set_markup ($markup);
1486		1563
1487	$self->realloc;	1564	$self->realloc;
		1565	$self->update;
1488	}	1566	}
1489		1567
1490	sub size_request {	1568	sub size_request {
1491	my ($self) = @_;	1569	my ($self) = @_;
1492		1570
…		…
1506		1584
1507	$w = List::Util::max $w, $w2;	1585	$w = List::Util::max $w, $w2;
1508	$h = List::Util::max $h, $h2;	1586	$h = List::Util::max $h, $h2;
1509	}	1587	}
1510		1588
1511	(	1589	($w, $h)
1512	$w + $self->{padding} * 2,
1513	$h + $self->{padding} * 2,
1514	)
1515	}	1590	}
1516		1591
1517	sub size_allocate {	1592	sub size_allocate {
1518	my ($self, $w, $h, $changed) = @_;	1593	my ($self, $w, $h) = @_;
		1594
		1595	delete $self->{ox};
1519		1596
1520	delete $self->{texture}	1597	delete $self->{texture}
1521	if $changed;	1598	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522	}	1599	}
1523		1600
1524	sub set_fontsize {	1601	sub set_fontsize {
1525	my ($self, $fontsize) = @_;	1602	my ($self, $fontsize) = @_;
1526		1603
…		…
1541	$self->{layout}->set_width ($self->{w});	1618	$self->{layout}->set_width ($self->{w});
1542	$self->{layout}->set_ellipsise ($self->{ellipsise});	1619	$self->{layout}->set_ellipsise ($self->{ellipsise});
1543	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1620	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1621	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545		1622
1546	my $tex = new_from_layout CFClient::Texture $self->{layout};	1623	new_from_layout CFClient::Texture $self->{layout}
		1624	};
1547		1625
		1626	unless (exists $self->{ox}) {
1548	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1627	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1549	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1628	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1550	: ($self->{w} - $tex->{w}) * 0.5);	1629	: ($self->{w} - $tex->{w}) * 0.5);
1551		1630
1552	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}	1631	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1553	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1632	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1554	: ($self->{h} - $tex->{h}) * 0.5);	1633	: ($self->{h} - $tex->{h}) * 0.5);
1555
1556	$tex
1557	};	1634	};
1558		1635
1559	glEnable GL_TEXTURE_2D;	1636	glEnable GL_TEXTURE_2D;
1560	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1637	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1561		1638
…		…
1599		1676
1600	delete $self->{cur_h};	1677	delete $self->{cur_h};
1601		1678
1602	return if $self->{text} eq $text;	1679	return if $self->{text} eq $text;
1603		1680
1604	delete $self->{texture};
1605
1606	$self->{last_activity} = $::NOW;	1681	$self->{last_activity} = $::NOW;
1607	$self->{text} = $text;	1682	$self->{text} = $text;
1608		1683
1609	$text =~ s/./*/g if $self->{hidden};	1684	$text =~ s/./*/g if $self->{hidden};
1610	$self->{layout}->set_text ("$text ");	1685	$self->{layout}->set_text ("$text ");
1611		1686
1612	$self->_emit (changed => $self->{text});	1687	$self->_emit (changed => $self->{text});
		1688	$self->update;
1613	}	1689	}
1614		1690
1615	sub set_text {	1691	sub set_text {
1616	my ($self, $text) = @_;	1692	my ($self, $text) = @_;
1617		1693
…		…
1656	$self->{cursor} = length $text;	1732	$self->{cursor} = length $text;
1657	} elsif ($uni == 27) {	1733	} elsif ($uni == 27) {
1658	$self->_emit ('escape');	1734	$self->_emit ('escape');
1659	} elsif ($uni) {	1735	} elsif ($uni) {
1660	substr $text, $self->{cursor}++, 0, chr $uni;	1736	substr $text, $self->{cursor}++, 0, chr $uni;
		1737	} else {
		1738	return 0;
1661	}	1739	}
1662		1740
1663	$self->_set_text ($text);	1741	$self->_set_text ($text);
1664		1742
1665	$self->realloc;	1743	$self->realloc;
		1744
		1745	1
1666	}	1746	}
1667		1747
1668	sub focus_in {	1748	sub focus_in {
1669	my ($self) = @_;	1749	my ($self) = @_;
1670		1750
…		…
1685	utf8::encode $text;	1765	utf8::encode $text;
1686	$self->{cursor} = length substr $text, 0, $idx;	1766	$self->{cursor} = length substr $text, 0, $idx;
1687		1767
1688	$self->_set_text ($self->{text});	1768	$self->_set_text ($self->{text});
1689	$self->update;	1769	$self->update;
		1770
		1771	1
1690	}	1772	}
1691		1773
1692	sub mouse_motion {	1774	sub mouse_motion {
1693	my ($self, $ev, $x, $y) = @_;	1775	my ($self, $ev, $x, $y) = @_;
1694	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1776	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1777
		1778	0
1695	}	1779	}
1696		1780
1697	sub _draw {	1781	sub _draw {
1698	my ($self) = @_;	1782	my ($self) = @_;
1699		1783
…		…
1776	} else {	1860	} else {
1777	$self->set_text ($self->{history_saveback});	1861	$self->set_text ($self->{history_saveback});
1778	}	1862	}
1779		1863
1780	} else {	1864	} else {
1781	$self->SUPER::key_down ($ev);	1865	return $self->SUPER::key_down ($ev)
		1866	}
		1867
1782	}	1868	1
1783
1784	}	1869	}
1785		1870
1786	#############################################################################	1871	#############################################################################
1787		1872
1788	package CFClient::UI::Button;	1873	package CFClient::UI::Button;
…		…
1797		1882
1798	sub new {	1883	sub new {
1799	my $class = shift;	1884	my $class = shift;
1800		1885
1801	$class->SUPER::new (	1886	$class->SUPER::new (
1802	padding => 4,	1887	padding_x => 4,
		1888	padding_y => 4,
1803	fg => [1, 1, 1],	1889	fg => [1, 1, 1],
1804	active_fg => [0, 0, 1],	1890	active_fg => [0, 0, 1],
1805	can_hover => 1,	1891	can_hover => 1,
1806	align => 0,	1892	align => 0,
1807	valign => 0,	1893	valign => 0,
…		…
1816	my ($self, $ev, $x, $y) = @_;	1902	my ($self, $ev, $x, $y) = @_;
1817		1903
1818	$self->emit ("activate")	1904	$self->emit ("activate")
1819	if $x >= 0 && $x < $self->{w}	1905	if $x >= 0 && $x < $self->{w}
1820	&& $y >= 0 && $y < $self->{h};	1906	&& $y >= 0 && $y < $self->{h};
		1907
		1908	1
1821	}	1909	}
1822		1910
1823	sub _draw {	1911	sub _draw {
1824	my ($self) = @_;	1912	my ($self) = @_;
1825		1913
…		…
1854		1942
1855	sub new {	1943	sub new {
1856	my $class = shift;	1944	my $class = shift;
1857		1945
1858	$class->SUPER::new (	1946	$class->SUPER::new (
1859	padding => 2,	1947	padding_x => 2,
		1948	padding_y => 2,
1860	fg => [1, 1, 1],	1949	fg => [1, 1, 1],
1861	active_fg => [1, 1, 0],	1950	active_fg => [1, 1, 0],
1862	bg => [0, 0, 0, 0.2],	1951	bg => [0, 0, 0, 0.2],
1863	active_bg => [1, 1, 1, 0.5],	1952	active_bg => [1, 1, 1, 0.5],
1864	state => 0,	1953	state => 0,
…		…
1868	}	1957	}
1869		1958
1870	sub size_request {	1959	sub size_request {
1871	my ($self) = @_;	1960	my ($self) = @_;
1872		1961
1873	($self->{padding} * 2 + 6) x 2	1962	(6) x 2
1874	}	1963	}
1875		1964
1876	sub button_down {	1965	sub button_down {
1877	my ($self, $ev, $x, $y) = @_;	1966	my ($self, $ev, $x, $y) = @_;
1878		1967
1879	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1968	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1969	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881	$self->{state} = !$self->{state};	1970	$self->{state} = !$self->{state};
1882	$self->_emit (changed => $self->{state});	1971	$self->_emit (changed => $self->{state});
		1972	} else {
		1973	return 0
		1974	}
		1975
1883	}	1976	1
1884	}	1977	}
1885		1978
1886	sub _draw {	1979	sub _draw {
1887	my ($self) = @_;	1980	my ($self) = @_;
1888		1981
1889	$self->SUPER::_draw;	1982	$self->SUPER::_draw;
1890		1983
1891	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	1984	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892		1985
1893	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1986	my ($w, $h) = @$self{qw(w h)};
		1987
		1988	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894		1989
1895	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1990	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896		1991
1897	my $tex = $self->{state} ? $tex[1] : $tex[0];	1992	my $tex = $self->{state} ? $tex[1] : $tex[0];
1898		1993
…		…
2163	fg => [1, 1, 1],	2258	fg => [1, 1, 1],
2164	active_fg => [0, 0, 0],	2259	active_fg => [0, 0, 0],
2165	bg => [0, 0, 0, 0.2],	2260	bg => [0, 0, 0, 0.2],
2166	active_bg => [1, 1, 1, 0.5],	2261	active_bg => [1, 1, 1, 0.5],
2167	range => [0, 0, 100, 10, 0],	2262	range => [0, 0, 100, 10, 0],
2168	req_w => $::WIDTH / 80,	2263	min_w => $::WIDTH / 80,
2169	req_h => $::WIDTH / 80,	2264	min_h => $::WIDTH / 80,
2170	vertical => 0,	2265	vertical => 0,
2171	can_hover => 1,	2266	can_hover => 1,
2172	inner_pad => 0.02,	2267	inner_pad => 0.02,
2173	@_	2268	@_
2174	);	2269	);
…		…
2214	}	2309	}
2215		2310
2216	sub size_request {	2311	sub size_request {
2217	my ($self) = @_;	2312	my ($self) = @_;
2218		2313
2219	my $w = $self->{req_w};	2314	($self->{req_w}, $self->{req_h})
2220	my $h = $self->{req_h};
2221
2222	$self->{vertical} ? ($h, $w) : ($w, $h)
2223	}	2315	}
2224		2316
2225	sub button_down {	2317	sub button_down {
2226	my ($self, $ev, $x, $y) = @_;	2318	my ($self, $ev, $x, $y) = @_;
2227		2319
2228	$self->SUPER::button_down ($ev, $x, $y);	2320	$self->SUPER::button_down ($ev, $x, $y);
2229		2321
2230	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2322	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2231		2323
2232	$self->mouse_motion ($ev, $x, $y);	2324	$self->mouse_motion ($ev, $x, $y)
2233	}	2325	}
2234		2326
2235	sub mouse_motion {	2327	sub mouse_motion {
2236	my ($self, $ev, $x, $y) = @_;	2328	my ($self, $ev, $x, $y) = @_;
2237		2329
…		…
2241	my (undef, $lo, $hi, $page) = @{$self->{range}};	2333	my (undef, $lo, $hi, $page) = @{$self->{range}};
2242		2334
2243	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2335	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2244		2336
2245	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2337	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2338	} else {
		2339	return 0;
		2340	}
		2341
2246	}	2342	1
2247	}	2343	}
2248		2344
2249	sub update {	2345	sub update {
2250	my ($self) = @_;	2346	my ($self) = @_;
2251		2347
2252	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2348	delete $self->{knob_w};
		2349	$self->SUPER::update;
		2350	}
		2351
		2352	sub _draw {
		2353	my ($self) = @_;
		2354
		2355	unless ($self->{knob_w}) {
2253	$self->set_value ($self->{range}[0]);	2356	$self->set_value ($self->{range}[0]);
2254		2357
2255	my ($value, $lo, $hi, $page) = @{$self->{range}};	2358	my ($value, $lo, $hi, $page) = @{$self->{range}};
2256	my $range = ($hi - $page - $lo) || 1e-100;	2359	my $range = ($hi - $page - $lo) || 1e-100;
2257		2360
…		…
2263	$value = ($value - $lo) / $range;	2366	$value = ($value - $lo) / $range;
2264	$value = $value * $self->{scale} + $self->{offset};	2367	$value = $value * $self->{scale} + $self->{offset};
2265		2368
2266	$self->{knob_x} = $value - $knob_w * 0.5;	2369	$self->{knob_x} = $value - $knob_w * 0.5;
2267	$self->{knob_w} = $knob_w;	2370	$self->{knob_w} = $knob_w;
2268	});	2371	}
2269
2270	$self->SUPER::update;
2271	}
2272
2273	sub _draw {
2274	my ($self) = @_;
2275		2372
2276	$self->SUPER::_draw ();	2373	$self->SUPER::_draw ();
2277		2374
2278	glScale $self->{w}, $self->{h};	2375	glScale $self->{w}, $self->{h};
2279		2376
…		…
2377	$self->{fontsize} = $fontsize;	2474	$self->{fontsize} = $fontsize;
2378	$self->reflow;	2475	$self->reflow;
2379	}	2476	}
2380		2477
2381	sub size_allocate {	2478	sub size_allocate {
2382	my ($self, $w, $h, $changed) = @_;	2479	my ($self, $w, $h) = @_;
2383		2480
2384	$self->SUPER::size_allocate ($w, $h, $changed);	2481	$self->SUPER::size_allocate ($w, $h);
2385
2386	return unless $changed;
2387		2482
2388	$self->{layout}->set_font ($self->{font}) if $self->{font};	2483	$self->{layout}->set_font ($self->{font}) if $self->{font};
2389	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2484	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2390	$self->{layout}->set_width ($self->{children}[0]{w});	2485	$self->{layout}->set_width ($self->{children}[0]{w});
2391		2486
…		…
2614	}	2709	}
2615		2710
2616	sub set_tooltip_from {	2711	sub set_tooltip_from {
2617	my ($self, $widget) = @_;	2712	my ($self, $widget) = @_;
2618		2713
		2714	my $tooltip = $widget->{tooltip};
		2715
		2716	if ($ENV{CFPLUS_DEBUG} & 2) {
		2717	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2718	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2719	. "req $widget->{req_w} $widget->{req_h}\n"
		2720	. "visible $widget->{visible}";
		2721	}
		2722
2619	$self->add (new CFClient::UI::Label	2723	$self->add (new CFClient::UI::Label
2620	markup => $widget->{tooltip},	2724	markup => $tooltip,
2621	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2725	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2622	fontsize => 0.8,	2726	fontsize => 0.8,
2623	fg => [0, 0, 0, 1],	2727	fg => [0, 0, 0, 1],
2624	ellipsise => 0,	2728	ellipsise => 0,
2625	font => ($widget->{tooltip_font} || $::FONT_PROP),	2729	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2633		2737
2634	($w + 4, $h + 4)	2738	($w + 4, $h + 4)
2635	}	2739	}
2636		2740
2637	sub size_allocate {	2741	sub size_allocate {
2638	my ($self, $w, $h, $changed) = @_;	2742	my ($self, $w, $h) = @_;
2639		2743
2640	return unless $changed;
2641
2642	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2744	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2745	}
		2746
		2747	sub visibility_change {
		2748	my ($self, $visible) = @_;
		2749
		2750	return unless $visible;
		2751
		2752	$self->{root}->on_post_alloc ("move_$self" => sub {
		2753	my $widget = $self->{owner}
		2754	or return;
		2755
		2756	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2757
		2758	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2759	if $x + $self->{w} > $::WIDTH;
		2760
		2761	$self->move_abs ($x, $y);
		2762	});
2643	}	2763	}
2644		2764
2645	sub _draw {	2765	sub _draw {
2646	my ($self) = @_;	2766	my ($self) = @_;
2647		2767
…		…
2664	glVertex $w, $h;	2784	glVertex $w, $h;
2665	glVertex $w, 0;	2785	glVertex $w, 0;
2666	glEnd;	2786	glEnd;
2667		2787
2668	glTranslate 2 - 0.375, 2 - 0.375;	2788	glTranslate 2 - 0.375, 2 - 0.375;
		2789
2669	$self->SUPER::_draw;	2790	$self->SUPER::_draw;
2670	}	2791	}
2671		2792
2672	#############################################################################	2793	#############################################################################
2673		2794
…		…
2749	$self->SUPER::DESTROY;	2870	$self->SUPER::DESTROY;
2750	}	2871	}
2751		2872
2752	#############################################################################	2873	#############################################################################
2753		2874
2754	package CFClient::UI::Inventory;	2875	package CFClient::UI::Buttonbar;
2755		2876
2756	our @ISA = CFClient::UI::ScrolledWindow::;	2877	our @ISA = CFClient::UI::HBox::;
2757		2878
2758	sub new {	2879	# TODO: should actualyl wrap buttons and other goodies.
2759	my $class = shift;
2760
2761	my $self = $class->SUPER::new (
2762	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2763	@_,
2764	);
2765
2766	$self
2767	}
2768
2769	sub set_items {
2770	my ($self, $items) = @_;
2771
2772	$self->{scrolled}->clear;
2773	return unless $items;
2774
2775	my @items = sort {
2776	($a->{type} <=> $b->{type})
2777	or ($a->{name} cmp $b->{name})
2778	} @$items;
2779
2780	$self->{real_items} = \@items;
2781
2782	my $row = 0;
2783	for my $item (@items) {
2784	CFClient::Item::update_widgets $item;
2785
2786	$self->{scrolled}->add (0, $row, $item->{face_widget});
2787	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2788	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2789
2790	$row++;
2791	}
2792	}
2793		2880
2794	#############################################################################	2881	#############################################################################
2795		2882
2796	package CFClient::UI::Menu;	2883	package CFClient::UI::Menu;
2797		2884
…		…
2838	# maybe save $GRAB? must be careful about events...	2925	# maybe save $GRAB? must be careful about events...
2839	$GRAB = $self;	2926	$GRAB = $self;
2840	$self->{button} = $ev->{button};	2927	$self->{button} = $ev->{button};
2841		2928
2842	$self->show;	2929	$self->show;
2843	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	2930	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2844	}	2931	}
2845		2932
2846	sub mouse_motion {	2933	sub mouse_motion {
2847	my ($self, $ev, $x, $y) = @_;	2934	my ($self, $ev, $x, $y) = @_;
2848		2935
2849	# TODO: should use vbox->find_widget or so	2936	# TODO: should use vbox->find_widget or so
2850	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2937	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2851	$self->{hover} = $self->{item}{$HOVER};	2938	$self->{hover} = $self->{item}{$HOVER};
		2939
		2940	0
2852	}	2941	}
2853		2942
2854	sub button_up {	2943	sub button_up {
2855	my ($self, $ev, $x, $y) = @_;	2944	my ($self, $ev, $x, $y) = @_;
2856		2945
…		…
2858	undef $GRAB;	2947	undef $GRAB;
2859	$self->hide;	2948	$self->hide;
2860		2949
2861	$self->_emit ("popdown");	2950	$self->_emit ("popdown");
2862	$self->{hover}[1]->() if $self->{hover};	2951	$self->{hover}[1]->() if $self->{hover};
		2952	} else {
		2953	return 0
		2954	}
		2955
		2956	1
		2957	}
		2958
		2959	#############################################################################
		2960
		2961	package CFClient::UI::Multiplexer;
		2962
		2963	our @ISA = CFClient::UI::Container::;
		2964
		2965	sub new {
		2966	my $class = shift;
		2967
		2968	my $self = $class->SUPER::new (
		2969	@_,
		2970	);
		2971
		2972	$self->{current} = $self->{children}[0]
		2973	if @{ $self->{children} };
		2974
		2975	$self
		2976	}
		2977
		2978	sub add {
		2979	my ($self, @widgets) = @_;
		2980
		2981	$self->SUPER::add (@widgets);
		2982
		2983	$self->{current} = $self->{children}[0]
		2984	if @{ $self->{children} };
		2985	}
		2986
		2987	sub set_current_page {
		2988	my ($self, $page_or_widget) = @_;
		2989
		2990	my $widget = ref $page_or_widget
		2991	? $page_or_widget
		2992	: $self->{children}[$page_or_widget];
		2993
		2994	$self->{current} = $widget;
		2995	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		2996
		2997	$self->_emit (page_changed => $self->{current});
		2998
		2999	$self->realloc;
		3000	}
		3001
		3002	sub visible_children {
		3003	$_[0]{current}
		3004	}
		3005
		3006	sub size_request {
		3007	my ($self) = @_;
		3008
		3009	$self->{current}->size_request
		3010	}
		3011
		3012	sub size_allocate {
		3013	my ($self, $w, $h) = @_;
		3014
		3015	$self->{current}->configure (0, 0, $w, $h);
		3016	}
		3017
		3018	sub _draw {
		3019	my ($self) = @_;
		3020
		3021	$self->{current}->draw;
		3022	}
		3023
		3024	#############################################################################
		3025
		3026	package CFClient::UI::Notebook;
		3027
		3028	our @ISA = CFClient::UI::VBox::;
		3029
		3030	sub new {
		3031	my $class = shift;
		3032
		3033	my $self = $class->SUPER::new (
		3034	buttonbar => (new CFClient::UI::Buttonbar),
		3035	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3036	# filter => # will be put between multiplexer and $self
		3037	@_,
		3038	);
2863	}	3039
		3040	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3041	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3042
		3043	$self
		3044	}
		3045
		3046	sub add {
		3047	my ($self, $title, $widget, $tooltip) = @_;
		3048
		3049	Scalar::Util::weaken $self;
		3050
		3051	$self->{buttonbar}->add (new CFClient::UI::Button
		3052	markup => $title,
		3053	tooltip => $tooltip,
		3054	on_activate => sub { $self->set_current_page ($widget) },
		3055	);
		3056
		3057	$self->{multiplexer}->add ($widget);
		3058	}
		3059
		3060	sub set_current_page {
		3061	my ($self, $page) = @_;
		3062
		3063	$self->{multiplexer}->set_current_page ($page);
		3064	$self->_emit (page_changed => $self->{multiplexer}{current});
2864	}	3065	}
2865		3066
2866	#############################################################################	3067	#############################################################################
2867		3068
2868	package CFClient::UI::Statusbox;	3069	package CFClient::UI::Statusbox;
…		…
2973	$self->SUPER::reconfigure;	3174	$self->SUPER::reconfigure;
2974	}	3175	}
2975		3176
2976	#############################################################################	3177	#############################################################################
2977		3178
		3179	package CFClient::UI::Inventory;
		3180
		3181	our @ISA = CFClient::UI::ScrolledWindow::;
		3182
		3183	sub new {
		3184	my $class = shift;
		3185
		3186	my $self = $class->SUPER::new (
		3187	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3188	@_,
		3189	);
		3190
		3191	$self
		3192	}
		3193
		3194	sub set_items {
		3195	my ($self, $items) = @_;
		3196
		3197	$self->{child}->clear;
		3198	return unless $items;
		3199
		3200	my @items = sort {
		3201	($a->{type} <=> $b->{type})
		3202	or ($a->{name} cmp $b->{name})
		3203	} @$items;
		3204
		3205	$self->{real_items} = \@items;
		3206
		3207	my $row = 0;
		3208	for my $item (@items) {
		3209	CFClient::Item::update_widgets $item;
		3210
		3211	$self->{child}->add (0, $row, $item->{face_widget});
		3212	$self->{child}->add (1, $row, $item->{desc_widget});
		3213	$self->{child}->add (2, $row, $item->{weight_widget});
		3214
		3215	$row++;
		3216	}
		3217	}
		3218
		3219	#############################################################################
		3220
		3221	package CFClient::UI::BindEditor;
		3222
		3223	our @ISA = CFClient::UI::FancyFrame::;
		3224
		3225	sub new {
		3226	my $class = shift;
		3227
		3228	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3229
		3230	$self->add (my $vb = new CFClient::UI::VBox);
		3231
		3232
		3233	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3234	text => "start recording",
		3235	tooltip => "Start/Stops recording of actions."
		3236	."All subsequent actions after the recording started will be captured."
		3237	."The actions are displayed after the record was stopped."
		3238	."To bind the action you have to click on the 'Bind' button",
		3239	on_activate => sub {
		3240	unless ($self->{recording}) {
		3241	$self->start;
		3242	} else {
		3243	$self->stop;
		3244	}
		3245	});
		3246
		3247	$vb->add (new CFClient::UI::Label text => "Actions:");
		3248	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3249
		3250	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3251	$vb->add (my $hb = new CFClient::UI::HBox);
		3252	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3253	$hb->add (new CFClient::UI::Button
		3254	text => "bind",
		3255	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3256	on_activate => sub {
		3257	$self->ask_for_bind;
		3258	});
		3259
		3260	$vb->add (my $hb = new CFClient::UI::HBox);
		3261	$hb->add (new CFClient::UI::Button
		3262	text => "ok",
		3263	expand => 1,
		3264	tooltip => "This closes the binding editor and saves the binding",
		3265	on_activate => sub {
		3266	$self->hide;
		3267	$self->commit;
		3268	});
		3269
		3270	$hb->add (new CFClient::UI::Button
		3271	text => "cancel",
		3272	expand => 1,
		3273	tooltip => "This closes the binding editor without saving",
		3274	on_activate => sub {
		3275	$self->hide;
		3276	$self->{binding_cancel}->()
		3277	if $self->{binding_cancel};
		3278	});
		3279
		3280	$self->update_binding_widgets;
		3281
		3282	$self
		3283	}
		3284
		3285	sub commit {
		3286	my ($self) = @_;
		3287	my ($mod, $sym, $cmds) = $self->get_binding;
		3288	if ($sym != 0 && @$cmds > 0) {
		3289	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3290	."'. Don't forget 'Save Config'!");
		3291	$self->{binding_change}->($mod, $sym, $cmds)
		3292	if $self->{binding_change};
		3293	} else {
		3294	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3295	$self->{binding_cancel}->()
		3296	if $self->{binding_cancel};
		3297	}
		3298	}
		3299
		3300	sub start {
		3301	my ($self) = @_;
		3302
		3303	$self->{rec_btn}->set_text ("stop recording");
		3304	$self->{recording} = 1;
		3305	$self->clear_command_list;
		3306	$::CONN->start_record if $::CONN;
		3307	}
		3308
		3309	sub stop {
		3310	my ($self) = @_;
		3311
		3312	$self->{rec_btn}->set_text ("start recording");
		3313	$self->{recording} = 0;
		3314
		3315	my $rec;
		3316	$rec = $::CONN->stop_record if $::CONN;
		3317	return unless ref $rec eq 'ARRAY';
		3318	$self->set_command_list ($rec);
		3319	}
		3320
		3321
		3322	sub ask_for_bind_and_commit {
		3323	my ($self) = @_;
		3324	$self->ask_for_bind (1);
		3325	}
		3326
		3327	sub ask_for_bind {
		3328	my ($self, $commit) = @_;
		3329
		3330	CFClient::Binder::open_binding_dialog (sub {
		3331	my ($mod, $sym) = @_;
		3332	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3333	$self->update_binding_widgets;
		3334	$self->commit if $commit;
		3335	});
		3336	}
		3337
		3338	# $mod and $sym are the modifiers and key symbol
		3339	# $cmds is a array ref of strings (the commands)
		3340	# $cb is the callback that is executed on OK
		3341	# $ccb is the callback that is executed on CANCEL and
		3342	# when the binding was unsuccessful on OK
		3343	sub set_binding {
		3344	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3345
		3346	$self->clear_command_list;
		3347	$self->{recording} = 0;
		3348	$self->{rec_btn}->set_text ("start recording");
		3349
		3350	$self->{binding} = [$mod, $sym];
		3351	$self->{commands} = $cmds;
		3352
		3353	$self->{binding_change} = $cb;
		3354	$self->{binding_cancel} = $ccb;
		3355
		3356	$self->update_binding_widgets;
		3357	}
		3358
		3359	# this is a shortcut method that asks for a binding
		3360	# and then just binds it.
		3361	sub do_quick_binding {
		3362	my ($self, $cmds) = @_;
		3363	$self->set_binding (undef, undef, $cmds, sub {
		3364	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3365	});
		3366	$self->ask_for_bind (1);
		3367	}
		3368
		3369	sub update_binding_widgets {
		3370	my ($self) = @_;
		3371	my ($mod, $sym, $cmds) = $self->get_binding;
		3372	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3373	$self->set_command_list ($cmds);
		3374	}
		3375
		3376	sub get_binding {
		3377	my ($self) = @_;
		3378	return (
		3379	$self->{binding}->[0],
		3380	$self->{binding}->[1],
		3381	[ grep { defined $_ } @{$self->{commands}} ]
		3382	);
		3383	}
		3384
		3385	sub clear_command_list {
		3386	my ($self) = @_;
		3387	$self->{cmdbox}->clear ();
		3388	}
		3389
		3390	sub set_command_list {
		3391	my ($self, $cmds) = @_;
		3392
		3393	$self->{cmdbox}->clear ();
		3394	$self->{commands} = $cmds;
		3395
		3396	my $idx = 0;
		3397
		3398	for (@$cmds) {
		3399	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3400
		3401	my $i = $idx;
		3402	$hb->add (new CFClient::UI::Label text => $_);
		3403	$hb->add (new CFClient::UI::Button
		3404	text => "delete",
		3405	tooltip => "Deletes the action from the record",
		3406	on_activate => sub {
		3407	$self->{cmdbox}->remove ($hb);
		3408	$cmds->[$i] = undef;
		3409	});
		3410
		3411
		3412	$idx++
		3413	}
		3414	}
		3415
		3416	#############################################################################
		3417
		3418	package CFClient::UI::SpellList;
		3419
		3420	our @ISA = CFClient::UI::Table::;
		3421
		3422	sub new {
		3423	my $class = shift;
		3424
		3425	my $self = $class->SUPER::new (
		3426	binding => [],
		3427	commands => [],
		3428	@_,
		3429	)
		3430	}
		3431
		3432	# XXX: Do sorting? Argl...
		3433	sub add_spell {
		3434	my ($self, $spell) = @_;
		3435	$self->{spells}->{$spell->{name}} = $spell;
		3436
		3437	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
		3438	face => $spell->{face},
		3439	can_hover => 1,
		3440	can_events => 1,
		3441	tooltip => $spell->{message});
		3442
		3443	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
		3444	text => $spell->{name},
		3445	can_hover => 1,
		3446	can_events => 1,
		3447	tooltip => $spell->{message},
		3448	expand => 1);
		3449
		3450	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
		3451	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
		3452	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
		3453	expand => 1);
		3454
		3455	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
		3456	text => "bind to key",
		3457	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
		3458	}
		3459
		3460	sub rebuild_spell_list {
		3461	my ($self) = @_;
		3462	$self->{tbl_idx} = 0;
		3463	$self->add_spell ($_) for values %{$self->{spells}};
		3464	}
		3465
		3466	sub remove_spell {
		3467	my ($self, $spell) = @_;
		3468	delete $self->{spells}->{$spell->{name}};
		3469	$self->rebuild_spell_list;
		3470	}
		3471
		3472	#############################################################################
		3473
2978	package CFClient::UI::Root;	3474	package CFClient::UI::Root;
2979		3475
2980	our @ISA = CFClient::UI::Container::;	3476	our @ISA = CFClient::UI::Container::;
2981		3477
2982	use CFClient::OpenGL;	3478	use CFClient::OpenGL;
…		…
2992	Scalar::Util::weaken ($self->{root} = $self);	3488	Scalar::Util::weaken ($self->{root} = $self);
2993		3489
2994	$self	3490	$self
2995	}	3491	}
2996		3492
2997	sub configure {
2998	my ($self, $x, $y, $w, $h) = @_;
2999
3000	$self->{w} = $w;
3001	$self->{h} = $h;
3002	}
3003
3004	sub reconfigure {
3005	my ($self) = @_;
3006
3007	$self->SUPER::reconfigure;
3008
3009	$self->size_allocate ($self->{w}, $self->{h}, 1)
3010	if $self->{w};
3011	}
3012
3013	sub size_request {	3493	sub size_request {
3014	my ($self) = @_;	3494	my ($self) = @_;
3015		3495
3016	($self->{w}, $self->{h})	3496	($self->{w}, $self->{h})
3017	}	3497	}
3018		3498
		3499	sub _to_pixel {
		3500	my ($coord, $size, $max) = @_;
		3501
		3502	$coord =
		3503	$coord eq "center" ? ($max - $size) * 0.5
		3504	: $coord eq "max" ? $max
		3505	: $coord;
		3506
		3507	$coord = 0 if $coord < 0;
		3508	$coord = $max - $size if $coord > $max - $size;
		3509
		3510	int $coord + 0.5
		3511	}
		3512
3019	sub size_allocate {	3513	sub size_allocate {
3020	my ($self, $w, $h, $changed) = @_;	3514	my ($self, $w, $h) = @_;
3021		3515
3022	for my $child ($self->children) {	3516	for my $child ($self->children) {
3023	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3517	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3024		3518
3025	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3519	$X = $child->{force_x} if exists $child->{force_x};
3026	if exists $child->{req_x};	3520	$Y = $child->{force_y} if exists $child->{force_y};
3027		3521
3028	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3522	$X = _to_pixel $X, $W, $self->{w};
3029	if exists $child->{req_y};	3523	$Y = _to_pixel $Y, $H, $self->{h};
3030
3031	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
3032
3033	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3034	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3035		3524
3036	$child->configure ($X, $Y, $W, $H);	3525	$child->configure ($X, $Y, $W, $H);
3037	}	3526	}
3038	}	3527	}
3039		3528
…		…
3056	}	3545	}
3057		3546
3058	sub add {	3547	sub add {
3059	my ($self, @children) = @_;	3548	my ($self, @children) = @_;
3060		3549
3061	for my $child (@children) {
3062	$child->{is_toplevel} = 1;	3550	$_->{is_toplevel} = 1
3063		3551	for @children;
3064	# integerise window positions
3065	$child->{x} = int $child->{x};
3066	$child->{y} = int $child->{y};
3067	}
3068		3552
3069	$self->SUPER::add (@children);	3553	$self->SUPER::add (@children);
3070	}	3554	}
3071		3555
3072	sub remove {	3556	sub remove {
3073	my ($self, @children) = @_;	3557	my ($self, @children) = @_;
3074		3558
3075	$self->SUPER::remove (@children);	3559	$self->SUPER::remove (@children);
		3560
		3561	delete $self->{is_toplevel}
		3562	for @children;
3076		3563
3077	while (@children) {	3564	while (@children) {
3078	my $w = pop @children;	3565	my $w = pop @children;
3079	push @children, $w->children;	3566	push @children, $w->children;
3080	$w->set_invisible;	3567	$w->set_invisible;
…		…
3100	$_->()	3587	$_->()
3101	for values %{delete $self->{refresh_hook}};	3588	for values %{delete $self->{refresh_hook}};
3102	}	3589	}
3103		3590
3104	if ($self->{realloc}) {	3591	if ($self->{realloc}) {
		3592	my %queue;
3105	my @queue;	3593	my @queue;
		3594	my $widget;
3106		3595
		3596	outer:
3107	while () {	3597	while () {
3108	if ($self->{realloc}) {	3598	if (my $realloc = delete $self->{realloc}) {
3109	#TODO use array-of-depth approach	3599	for $widget (values %$realloc) {
		3600	$widget->{visible} or next; # do not resize invisible widgets
3110		3601
3111	@queue = sort { $a->{visible} <=> $b->{visible} }	3602	$queue{$widget+0}++ and next; # duplicates are common
3112	@queue, values %{delete $self->{realloc}};	3603
		3604	push @{ $queue[$widget->{visible}] }, $widget;
		3605	}
3113	}	3606	}
3114		3607
		3608	while () {
		3609	@queue or last outer;
		3610
		3611	$widget = pop @{ $queue[-1] || [] }
		3612	and last;
		3613
		3614	pop @queue;
		3615	}
		3616
		3617	delete $queue{$widget+0};
		3618
		3619	my ($w, $h) = $widget->size_request;
		3620
		3621	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		3622	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3623
		3624	$w = $widget->{force_w} if exists $widget->{force_w};
		3625	$h = $widget->{force_h} if exists $widget->{force_h};
		3626
		3627	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3628	|| delete $widget->{force_realloc}) {
		3629	$widget->{req_w} = $w;
		3630	$widget->{req_h} = $h;
		3631
		3632	$self->{size_alloc}{$widget+0} = $widget;
		3633
		3634	if (my $parent = $widget->{parent}) {
		3635	$self->{realloc}{$parent+0} = $parent
		3636	unless $queue{$parent+0};
		3637
		3638	$parent->{force_size_alloc} = 1;
		3639	$self->{size_alloc}{$parent+0} = $parent;
		3640	}
		3641	}
		3642
		3643	delete $self->{realloc}{$widget+0};
		3644	}
		3645	}
		3646
		3647	while (my $size_alloc = delete $self->{size_alloc}) {
		3648	my @queue = sort { $b->{visible} <=> $a->{visible} }
		3649	values %$size_alloc;
		3650
		3651	while () {
3115	my $widget = pop @queue || last;	3652	my $widget = pop @queue || last;
3116		3653
3117	$widget->{visible} or last; # do not resize invisible widgets	3654	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3118
3119	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3120	? @$widget{qw(def_w def_h)}
3121	: $widget->size_request;
3122
3123	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3124
3125	$widget->{req_w} = $w;
3126	$widget->{req_h} = $h;
3127
3128	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
3129
3130	push @queue, $widget->{parent}
3131	if $widget->{parent};
3132	}
3133	}
3134
3135	while (my $size_alloc = delete $self->{size_alloc}) {
3136	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3137	values %$size_alloc;
3138
3139	while () {
3140	my ($widget, $w, $h) = @{ pop @queue or last };
3141		3655
3142	$w = 0 if $w < 0;	3656	$w = 0 if $w < 0;
3143	$h = 0 if $h < 0;	3657	$h = 0 if $h < 0;
3144		3658
		3659	$w = int $w + 0.5;
		3660	$h = int $h + 0.5;
		3661
		3662	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3663	$widget->{old_w} = $widget->{w};
		3664	$widget->{old_h} = $widget->{h};
		3665
3145	$widget->{w} = $w;	3666	$widget->{w} = $w;
3146	$widget->{h} = $h;	3667	$widget->{h} = $h;
		3668
3147	$widget->emit (size_allocate => $w, $h, 1);	3669	$widget->emit (size_allocate => $w, $h);
		3670	}
3148	}	3671	}
3149	}	3672	}
3150		3673
3151	while ($self->{post_alloc_hook}) {	3674	while ($self->{post_alloc_hook}) {
3152	$_->()	3675	$_->()
3153	for values %{delete $self->{post_alloc_hook}};	3676	for values %{delete $self->{post_alloc_hook}};
3154	}	3677	}
		3678
3155		3679
3156	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3680	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3157	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3681	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3158	glClear GL_COLOR_BUFFER_BIT;	3682	glClear GL_COLOR_BUFFER_BIT;
3159		3683
…		…
3161	glLoadIdentity;	3685	glLoadIdentity;
3162	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3686	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3163	glMatrixMode GL_MODELVIEW;	3687	glMatrixMode GL_MODELVIEW;
3164	glLoadIdentity;	3688	glLoadIdentity;
3165		3689
		3690	{
		3691	package CFClient::UI::Base;
		3692
		3693	($draw_x, $draw_y, $draw_w, $draw_h) =
		3694	(0, 0, $self->{w}, $self->{h});
		3695	}
		3696
3166	$self->_draw;	3697	$self->_draw;
3167	}	3698	}
3168		3699
3169	#############################################################################	3700	#############################################################################
3170		3701

Diff Legend

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