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.258 by root, Tue May 30 02:55:45 2006 UTC vs.
Revision 1.292 by root, Tue Jun 6 03:02:15 2006 UTC

…		…
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
		8	use Event;
8		9
9	use CFClient;	10	use CFClient;
10	use CFClient::Texture;	11	use CFClient::Texture;
11		12
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
…		…
15	our $ROOT;	16	our $ROOT;
16	our $TOOLTIP;	17	our $TOOLTIP;
17	our $BUTTON_STATE;	18	our $BUTTON_STATE;
18		19
19	our %WIDGET; # all widgets, weak-referenced	20	our %WIDGET; # all widgets, weak-referenced
		21
		22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
		23	if (!$GRAB) {
		24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		25	if (length $widget->{tooltip}) {
		26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->hide;
		28
		29	$TOOLTIP->{owner} = $widget;
		30
		31	return if $ENV{CFPLUS_DEBUG} & 8;
		32
		33	my $tip = $widget->{tooltip};
		34
		35	$tip = $tip->($widget) if CODE:: eq ref $tip;
		36
		37	$TOOLTIP->set_tooltip_from ($widget);
		38	$TOOLTIP->show;
		39	}
		40
		41	return;
		42	}
		43	}
		44	}
		45
		46	$TOOLTIP->hide;
		47	delete $TOOLTIP->{owner};
		48	});
20		49
21	sub get_layout {	50	sub get_layout {
22	my $layout;	51	my $layout;
23		52
24	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
39	my ($layout) = @_;	68	my ($layout) = @_;
40		69
41	$LAYOUT = $layout;	70	$LAYOUT = $layout;
42	}	71	}
43		72
44	sub check_tooltip {
45	if (!$GRAB) {
46	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47	if (length $widget->{tooltip}) {
48
49	if ($TOOLTIP->{owner} != $widget) {
50	$TOOLTIP->hide;
51
52	$TOOLTIP->{owner} = $widget;
53
54	my $tip = $widget->{tooltip};
55
56	$tip = $tip->($widget) if CODE:: eq ref $tip;
57
58	$TOOLTIP->set_tooltip_from ($widget);
59	$TOOLTIP->show;
60	}
61
62	return;
63	}
64	}
65	}
66
67	$TOOLTIP->hide;
68	delete $TOOLTIP->{owner};
69	}
70
71	# class methods for events	73	# class methods for events
72	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
73	$FOCUS->emit (key_down => $_[0])	75	$FOCUS->emit (key_down => $_[0])
74	if $FOCUS;	76	if $FOCUS;
75	}	77	}
…		…
87	my $widget = $ROOT->find_widget ($x, $y);	89	my $widget = $ROOT->find_widget ($x, $y);
88		90
89	$GRAB = $widget;	91	$GRAB = $widget;
90	$GRAB->update if $GRAB;	92	$GRAB->update if $GRAB;
91		93
92	check_tooltip;	94	$TOOLTIP_WATCHER->cb->();
93	}	95	}
94		96
95	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
96		98
97	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
…		…
112	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
113	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
114	$grab->update if $grab;	116	$grab->update if $grab;
115	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
116		118
117	check_tooltip;	119	$TOOLTIP_WATCHER->cb->();
118	}	120	}
119	}	121	}
120		122
121	sub feed_sdl_motion_event {	123	sub feed_sdl_motion_event {
122	my ($ev) = @_;	124	my ($ev) = @_;
…		…
128	my $hover = $HOVER; $HOVER = $widget;	130	my $hover = $HOVER; $HOVER = $widget;
129		131
130	$hover->update if $hover && $hover->{can_hover};	132	$hover->update if $hover && $hover->{can_hover};
131	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
132		134
133	check_tooltip;	135	$TOOLTIP_WATCHER->start;
134	}	136	}
135		137
136	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137	if $HOVER;	139	if $HOVER;
138	}	140	}
…		…
170	sub rescale_widgets {	172	sub rescale_widgets {
171	my ($sx, $sy) = @_;	173	my ($sx, $sy) = @_;
172		174
173	for my $widget (values %WIDGET) {	175	for my $widget (values %WIDGET) {
174	if ($widget->{is_toplevel}) {	176	if ($widget->{is_toplevel}) {
175	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	177	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	178	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177		179
178	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;	180	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	181	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};	182	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;	183	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	184	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};	185	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184		186
185	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	187	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	188	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187		189
188	}	190	}
189	}	191	}
190		192
191	reconfigure_widgets;	193	reconfigure_widgets;
…		…
219	$self->connect ($1 => delete $self->{$_});	221	$self->connect ($1 => delete $self->{$_});
220	}	222	}
221	}	223	}
222		224
223	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	225	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};	226	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};	227	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};	228	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};	229	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228		230
229	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	231	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	232	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231		233
232	$self->show if $layout->{show};	234	$self->show if $layout->{show};
…		…
276	delete $self->{visible};	278	delete $self->{visible};
277		279
278	undef $GRAB if $GRAB == $self;	280	undef $GRAB if $GRAB == $self;
279	undef $HOVER if $HOVER == $self;	281	undef $HOVER if $HOVER == $self;
280		282
281	CFClient::UI::check_tooltip	283	$CFClient::UI::TOOLTIP_WATCHER->cb->()
282	if $TOOLTIP->{owner} == $self;	284	if $TOOLTIP->{owner} == $self;
283		285
284	$self->focus_out;	286	$self->focus_out;
285		287
286	$self->emit (visibility_change => 0);	288	$self->emit (visibility_change => 0);
…		…
355	$self->{x} = $x;	357	$self->{x} = $x;
356	$self->{y} = $y;	358	$self->{y} = $y;
357	$self->update;	359	$self->update;
358	}	360	}
359		361
360	if ($self->{w} != $w || $self->{h} != $h) {	362	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361	return unless $self->{visible};	363	return unless $self->{visible};
362		364
		365	$self->{alloc_w} = $w;
		366	$self->{alloc_h} = $h;
		367
363	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];	368	$self->{root}{size_alloc}{$self+0} = $self;
364	}	369	}
365	}	370	}
366		371
367	sub size_allocate {	372	sub size_allocate {
368	# nothing to be done	373	# nothing to be done
369	}	374	}
370		375
371	sub children {	376	sub children {
		377	# nop
		378	}
		379
		380	sub visible_children {
		381	$_[0]->children
372	}	382	}
373		383
374	sub set_max_size {	384	sub set_max_size {
375	my ($self, $w, $h) = @_;	385	my ($self, $w, $h) = @_;
376		386
377	delete $self->{max_w}; $self->{max_w} = $w if $w;	387	$self->{max_w} = int $w if defined $w;
378	delete $self->{max_h}; $self->{max_h} = $h if $h;	388	$self->{max_h} = int $h if defined $h;
		389
		390	$self->realloc;
379	}	391	}
380		392
381	sub set_tooltip {	393	sub set_tooltip {
382	my ($self, $tooltip) = @_;	394	my ($self, $tooltip) = @_;
383		395
…		…
388		400
389	$self->{tooltip} = $tooltip;	401	$self->{tooltip} = $tooltip;
390		402
391	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	403	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
392	delete $CFClient::UI::TOOLTIP->{owner};	404	delete $CFClient::UI::TOOLTIP->{owner};
393	CFClient::UI::check_tooltip;	405	$CFClient::UI::TOOLTIP_WATCHER->cb->();
394	}	406	}
395	}	407	}
396		408
397	# translate global coordinates to local coordinate system	409	# translate global coordinates to local coordinate system
398	sub coord2local {	410	sub coord2local {
…		…
435		447
436	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	448	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
437	unless $FOCUS;	449	unless $FOCUS;
438	}	450	}
439		451
440	sub mouse_motion { }	452	sub mouse_motion { 0 }
441	sub button_up { }	453	sub button_up { 0 }
442	sub key_down { }	454	sub key_down { 0 }
443	sub key_up { }	455	sub key_up { 0 }
444		456
445	sub button_down {	457	sub button_down {
446	my ($self, $ev, $x, $y) = @_;	458	my ($self, $ev, $x, $y) = @_;
447		459
448	$self->focus_in;	460	$self->focus_in;
449	}
450		461
451	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	462	0
452	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	463	}
453	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
454	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
455	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
456		464
457	sub find_widget {	465	sub find_widget {
458	my ($self, $x, $y) = @_;	466	my ($self, $x, $y) = @_;
459		467
460	return () unless $self->{can_events};	468	return () unless $self->{can_events};
…		…
498		506
499	sub realloc {	507	sub realloc {
500	my ($self) = @_;	508	my ($self) = @_;
501		509
502	if ($self->{visible}) {	510	if ($self->{visible}) {
503	return if $self->{root}{realloc}{$self};	511	return if $self->{root}{realloc}{$self+0};
504		512
505	$self->{root}{realloc}{$self} = $self;	513	$self->{root}{realloc}{$self+0} = $self;
506	$self->{root}->update;	514	$self->{root}->update;
507	} else {	515	} else {
508	delete $self->{req_w};	516	delete $self->{req_w};
		517	delete $self->{req_h};
509	}	518	}
510	}	519	}
511		520
512	sub update {	521	sub update {
513	my ($self) = @_;	522	my ($self) = @_;
…		…
521		530
522	$self->realloc;	531	$self->realloc;
523	$self->update;	532	$self->update;
524	}	533	}
525		534
		535	# using global variables seems a bit hacky, but passing through all drawing
		536	# functions seems pointless.
		537	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
		538
526	sub draw {	539	sub draw {
527	my ($self) = @_;	540	my ($self) = @_;
528		541
529	return unless $self->{h} && $self->{w};	542	return unless $self->{h} && $self->{w};
		543
		544	# update screen rectangle
		545	local $draw_x = $draw_x + $self->{x};
		546	local $draw_y = $draw_y + $self->{y};
		547	local $draw_w = $draw_x + $self->{w};
		548	local $draw_h = $draw_y + $self->{h};
		549
		550	# skip widgets that are entirely outside the drawing area
		551	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		552	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
530		553
531	glPushMatrix;	554	glPushMatrix;
532	glTranslate $self->{x}, $self->{y}, 0;	555	glTranslate $self->{x}, $self->{y}, 0;
533	$self->_draw;
534	glPopMatrix;
535		556
536	if ($self == $HOVER && $self->{can_hover}) {	557	if ($self == $HOVER && $self->{can_hover}) {
537	my ($x, $y) = @$self{qw(x y)};
538
539	glColor 1, 0.8, 0.5, 0.2;	558	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
540	glEnable GL_BLEND;	559	glEnable GL_BLEND;
541	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	560	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
542	glBegin GL_QUADS;	561	glBegin GL_QUADS;
543	glVertex $x , $y;	562	glVertex 0 , 0;
544	glVertex $x + $self->{w}, $y;	563	glVertex $self->{w}, 0;
545	glVertex $x + $self->{w}, $y + $self->{h};	564	glVertex $self->{w}, $self->{h};
546	glVertex $x , $y + $self->{h};	565	glVertex 0 , $self->{h};
547	glEnd;	566	glEnd;
548	glDisable GL_BLEND;	567	glDisable GL_BLEND;
549	}	568	}
550		569
551	if ($ENV{CFPLUS_DEBUG}) {	570	if ($ENV{CFPLUS_DEBUG} & 1) {
552	glPushMatrix;	571	glPushMatrix;
553	glColor 1, 1, 0, 1;	572	glColor 1, 1, 0, 1;
554	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	573	glTranslate 0.375, 0.375;
555	glBegin GL_LINE_LOOP;	574	glBegin GL_LINE_LOOP;
556	glVertex 0 , 0;	575	glVertex 0 , 0;
557	glVertex $self->{w} - 1, 0;	576	glVertex $self->{w} - 1, 0;
558	glVertex $self->{w} - 1, $self->{h} - 1;	577	glVertex $self->{w} - 1, $self->{h} - 1;
559	glVertex 0 , $self->{h} - 1;	578	glVertex 0 , $self->{h} - 1;
560	glEnd;	579	glEnd;
561	glPopMatrix;	580	glPopMatrix;
562	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	581	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
563	}	582	}
		583
		584	$self->_draw;
		585	glPopMatrix;
564	}	586	}
565		587
566	sub _draw {	588	sub _draw {
567	my ($self) = @_;	589	my ($self) = @_;
568		590
…		…
606		628
607	if ($color && (@$color < 4 || $color->[3])) {	629	if ($color && (@$color < 4 || $color->[3])) {
608	my ($w, $h) = @$self{qw(w h)};	630	my ($w, $h) = @$self{qw(w h)};
609		631
610	glEnable GL_BLEND;	632	glEnable GL_BLEND;
611	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	633	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
612	glColor @$color;	634	glColor_premultiply @$color;
613		635
614	glBegin GL_QUADS;	636	glBegin GL_QUADS;
615	glVertex 0 , 0;	637	glVertex 0 , 0;
616	glVertex 0 , $h;	638	glVertex 0 , $h;
617	glVertex $w, $h;	639	glVertex $w, $h;
…		…
648	our @ISA = CFClient::UI::Base::;	670	our @ISA = CFClient::UI::Base::;
649		671
650	sub new {	672	sub new {
651	my ($class, %arg) = @_;	673	my ($class, %arg) = @_;
652		674
653	my $children = delete $arg{children} || [];	675	my $children = delete $arg{children};
654		676
655	my $self = $class->SUPER::new (	677	my $self = $class->SUPER::new (
656	children => [],	678	children => [],
657	can_events => 0,	679	can_events => 0,
658	%arg,	680	%arg,
659	);	681	);
		682
660	$self->add ($_) for @$children;	683	$self->add (@$children)
		684	if $children;
661		685
662	$self	686	$self
663	}	687	}
664		688
665	sub add {	689	sub add {
…		…
713	$x -= $self->{x};	737	$x -= $self->{x};
714	$y -= $self->{y};	738	$y -= $self->{y};
715		739
716	my $res;	740	my $res;
717		741
718	for (reverse @{ $self->{children} }) {	742	for (reverse $self->visible_children) {
719	$res = $_->find_widget ($x, $y)	743	$res = $_->find_widget ($x, $y)
720	and return $res;	744	and return $res;
721	}	745	}
722		746
723	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	747	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
765	sub size_request {	789	sub size_request {
766	$_[0]{children}[0]->size_request	790	$_[0]{children}[0]->size_request
767	}	791	}
768		792
769	sub size_allocate {	793	sub size_allocate {
770	my ($self, $w, $h, $changed) = @_;	794	my ($self, $w, $h) = @_;
771		795
772	$self->{children}[0]->configure (0, 0, $w, $h);	796	$self->{children}[0]->configure (0, 0, $w, $h);
773	}	797	}
774		798
775	#############################################################################	799	#############################################################################
		800
		801	# back-buffered drawing area
776		802
777	package CFClient::UI::Window;	803	package CFClient::UI::Window;
778		804
779	our @ISA = CFClient::UI::Bin::;	805	our @ISA = CFClient::UI::Bin::;
780		806
…		…
792	$ROOT->on_post_alloc ($self => sub { $self->render_child });	818	$ROOT->on_post_alloc ($self => sub { $self->render_child });
793	$self->SUPER::update;	819	$self->SUPER::update;
794	}	820	}
795		821
796	sub size_allocate {	822	sub size_allocate {
797	my ($self, $w, $h, $changed) = @_;	823	my ($self, $w, $h) = @_;
798		824
799	$self->SUPER::size_allocate ($w, $h, $changed);	825	$self->SUPER::size_allocate ($w, $h);
800	$self->update	826	$self->update;
801	if $changed;
802	}	827	}
803		828
804	sub _render {	829	sub _render {
		830	my ($self) = @_;
		831
805	$_[0]{children}[0]->draw;	832	$self->{children}[0]->draw;
806	}	833	}
807		834
808	sub render_child {	835	sub render_child {
809	my ($self) = @_;	836	my ($self) = @_;
810		837
811	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	838	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
812	glClearColor 0, 0, 0, 0;	839	glClearColor 0, 0, 0, 0;
813	glClear GL_COLOR_BUFFER_BIT;	840	glClear GL_COLOR_BUFFER_BIT;
814		841
		842	{
		843	package CFClient::UI::Base;
		844
		845	($draw_x, $draw_y, $draw_w, $draw_h) =
		846	(0, 0, $self->{w}, $self->{h});
		847	}
		848
815	$self->_render;	849	$self->_render;
816	};	850	};
817	}	851	}
818		852
819	sub _draw {	853	sub _draw {
820	my ($self) = @_;	854	my ($self) = @_;
821		855
822	my ($w, $h) = ($self->w, $self->h);	856	my ($w, $h) = @$self{qw(w h)};
823		857
824	my $tex = $self->{texture}	858	my $tex = $self->{texture}
825	or return;	859	or return;
826		860
827	glEnable GL_TEXTURE_2D;	861	glEnable GL_TEXTURE_2D;
828	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
829	glColor 1, 1, 1, 1;	863	glColor 0, 0, 0, 1;
830		864
831	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	865	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
832		866
833	glDisable GL_TEXTURE_2D;	867	glDisable GL_TEXTURE_2D;
834	}	868	}
…		…
850	}	884	}
851		885
852	sub size_request {	886	sub size_request {
853	my ($self) = @_;	887	my ($self) = @_;
854		888
855	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	889	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
856		890
857	$w = 10 if $self->{scroll_x};	891	$w = 10 if $self->{scroll_x};
858	$h = 10 if $self->{scroll_y};	892	$h = 10 if $self->{scroll_y};
859		893
860	($w, $h)	894	($w, $h)
861	}	895	}
862		896
863	sub size_allocate {	897	sub size_allocate {
864	my ($self, $w, $h, $changed) = @_;	898	my ($self, $w, $h) = @_;
865		899
		900	my $child = $self->child;
		901
866	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	902	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
867	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	903	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
868		904
869	$self->child->configure (0, 0, $w, $h);	905	$self->child->configure (0, 0, $w, $h);
870	$self->update;	906	$self->update;
871	}	907	}
872		908
…		…
908	}	944	}
909		945
910	sub _render {	946	sub _render {
911	my ($self) = @_;	947	my ($self) = @_;
912		948
		949	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
		950	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
		951
913	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	952	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
914		953
915	$self->SUPER::_render;	954	$self->SUPER::_render;
916	}	955	}
917		956
…		…
920	package CFClient::UI::ScrolledWindow;	959	package CFClient::UI::ScrolledWindow;
921		960
922	our @ISA = CFClient::UI::HBox::;	961	our @ISA = CFClient::UI::HBox::;
923		962
924	sub new {	963	sub new {
925	my $class = shift;	964	my ($class, %arg) = @_;
		965
		966	my $child = delete $arg{child};
926		967
927	my $self;	968	my $self;
928		969
929	my $slider = new CFClient::UI::Slider	970	my $slider = new CFClient::UI::Slider
930	vertical => 1,	971	vertical => 1,
…		…
935	;	976	;
936		977
937	$self = $class->SUPER::new (	978	$self = $class->SUPER::new (
938	vp => (new CFClient::UI::ViewPort expand => 1),	979	vp => (new CFClient::UI::ViewPort expand => 1),
939	slider => $slider,	980	slider => $slider,
940	@_,	981	%arg,
941	);	982	);
942		983
943	$self->{vp}->add ($self->{scrolled});
944	$self->add ($self->{vp});
945	$self->add ($self->{slider});	984	$self->SUPER::add ($self->{vp}, $self->{slider});
		985	$self->add ($child) if $child;
946		986
947	$self	987	$self
		988	}
		989
		990	sub add {
		991	my ($self, $widget) = @_;
		992
		993	$self->{vp}->add ($self->{child} = $widget);
948	}	994	}
949		995
950	sub update {	996	sub update {
951	my ($self) = @_;	997	my ($self) = @_;
952		998
…		…
956	my $child = $self->{vp}->child;	1002	my $child = $self->{vp}->child;
957	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1003	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958	}	1004	}
959		1005
960	sub size_allocate {	1006	sub size_allocate {
961	my ($self, $w, $h, $changed) = @_;	1007	my ($self, $w, $h) = @_;
962		1008
963	$self->SUPER::size_allocate ($w, $h, $changed);	1009	$self->SUPER::size_allocate ($w, $h);
964		1010
965	my $child = $self->{vp}->child;	1011	my $child = $self->{vp}->child;
966	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1012	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
967	}	1013	}
968		1014
…		…
991		1037
992	if ($self->{bg}) {	1038	if ($self->{bg}) {
993	my ($w, $h) = @$self{qw(w h)};	1039	my ($w, $h) = @$self{qw(w h)};
994		1040
995	glEnable GL_BLEND;	1041	glEnable GL_BLEND;
996	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1042	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
997	glColor @{ $self->{bg} };	1043	glColor_premultiply @{ $self->{bg} };
998		1044
999	glBegin GL_QUADS;	1045	glBegin GL_QUADS;
1000	glVertex 0 , 0;	1046	glVertex 0 , 0;
1001	glVertex 0 , $h;	1047	glVertex 0 , $h;
1002	glVertex $w, $h;	1048	glVertex $w, $h;
…		…
1024	my @border =	1070	my @border =
1025	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1026	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1072	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1027		1073
1028	sub new {	1074	sub new {
1029	my $class = shift;	1075	my ($class, %arg) = @_;
		1076
		1077	my $title = delete $arg{title};
1030		1078
1031	my $self = $class->SUPER::new (	1079	my $self = $class->SUPER::new (
1032	bg => [1, 1, 1, 1],	1080	bg => [1, 1, 1, 1],
1033	border_bg => [1, 1, 1, 1],	1081	border_bg => [1, 1, 1, 1],
1034	border => 0.6,	1082	border => 0.6,
1035	can_events => 1,	1083	can_events => 1,
1036	min_w => 16,	1084	min_w => 16,
1037	min_h => 16,	1085	min_h => 16,
1038	@_	1086	%arg,
1039	);	1087	);
1040		1088
1041	$self->{title} &&= new CFClient::UI::Label	1089	$self->{title} = new CFClient::UI::Label
1042	align => 0,	1090	align => 0,
1043	valign => 1,	1091	valign => 1,
1044	text => $self->{title},	1092	text => $title,
1045	fontsize => $self->{border};	1093	fontsize => $self->{border}
		1094	if defined $title;
1046		1095
1047	$self	1096	$self
		1097	}
		1098
		1099	sub add {
		1100	my ($self, @widgets) = @_;
		1101
		1102	$self->SUPER::add (@widgets);
		1103	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1048	}	1104	}
1049		1105
1050	sub border {	1106	sub border {
1051	int $_[0]{border} * $::FONTSIZE	1107	int $_[0]{border} * $::FONTSIZE
1052	}	1108	}
1053		1109
1054	sub size_request {	1110	sub size_request {
1055	my ($self) = @_;	1111	my ($self) = @_;
		1112
		1113	$self->{title}->size_request
		1114	if $self->{title};
1056		1115
1057	my ($w, $h) = $self->SUPER::size_request;	1116	my ($w, $h) = $self->SUPER::size_request;
1058		1117
1059	(	1118	(
1060	$w + $self->border * 2,	1119	$w + $self->border * 2,
1061	$h + $self->border * 2,	1120	$h + $self->border * 2,
1062	)	1121	)
1063	}	1122	}
1064		1123
1065	sub size_allocate {	1124	sub size_allocate {
1066	my ($self, $w, $h, $changed) = @_;	1125	my ($self, $w, $h) = @_;
1067		1126
1068	return unless $changed;	1127	if ($self->{title}) {
		1128	$self->{title}{w} = $w;
		1129	$self->{title}{h} = $h;
		1130	$self->{title}->size_allocate ($w, $h);
		1131	}
1069		1132
		1133	my $border = $self->border;
		1134
1070	$h -= List::Util::max 0, $self->border * 2;	1135	$h -= List::Util::max 0, $border * 2;
1071	$w -= List::Util::max 0, $self->border * 2;	1136	$w -= List::Util::max 0, $border * 2;
1072		1137
1073	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1074	if $self->{title};
1075
1076	$self->child->configure ($self->border, $self->border, $w, $h);	1138	$self->child->configure ($border, $border, $w, $h);
1077	}	1139	}
1078		1140
1079	sub button_down {	1141	sub button_down {
1080	my ($self, $ev, $x, $y) = @_;	1142	my ($self, $ev, $x, $y) = @_;
1081		1143
…		…
1100	my $dy = $ev->{y} - $oy;	1162	my $dy = $ev->{y} - $oy;
1101		1163
1102	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1164	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1103	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1165	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104		1166
		1167	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1105	$self->realloc;	1168	$self->realloc;
1106	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1107	};	1169	};
1108		1170
1109	} elsif ($lr ^ $td) {	1171	} elsif ($lr ^ $td) {
1110	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1172	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1111	my ($bx, $by) = ($self->{x}, $self->{y});	1173	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1114	my ($ev, $x, $y) = @_;	1176	my ($ev, $x, $y) = @_;
1115		1177
1116	($x, $y) = ($ev->{x}, $ev->{y});	1178	($x, $y) = ($ev->{x}, $ev->{y});
1117		1179
1118	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1181	# HACK: the next line is required to enforce placement
		1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1119	};	1183	};
		1184	} else {
		1185	return 0;
		1186	}
		1187
1120	}	1188	1
1121	}	1189	}
1122		1190
1123	sub button_up {	1191	sub button_up {
1124	my ($self, $ev, $x, $y) = @_;	1192	my ($self, $ev, $x, $y) = @_;
1125		1193
1126	delete $self->{motion};	1194	!!delete $self->{motion}
1127	}	1195	}
1128		1196
1129	sub mouse_motion {	1197	sub mouse_motion {
1130	my ($self, $ev, $x, $y) = @_;	1198	my ($self, $ev, $x, $y) = @_;
1131		1199
1132	$self->{motion}->($ev, $x, $y) if $self->{motion};	1200	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1201
		1202	!!$self->{motion}
1133	}	1203	}
1134		1204
1135	sub _draw {	1205	sub _draw {
1136	my ($self) = @_;	1206	my ($self) = @_;
1137		1207
		1208	my $child = $self->{children}[0];
		1209
1138	my ($w, $h ) = ($self->{w}, $self->{h});	1210	my ($w, $h ) = ($self->{w}, $self->{h});
1139	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1211	my ($cw, $ch) = ($child->{w}, $child->{h});
1140		1212
1141	glEnable GL_TEXTURE_2D;	1213	glEnable GL_TEXTURE_2D;
1142	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1214	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1143		1215
1144	my $border = $self->border;	1216	my $border = $self->border;
…		…
1159	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1231	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160	}	1232	}
1161		1233
1162	glDisable GL_TEXTURE_2D;	1234	glDisable GL_TEXTURE_2D;
1163		1235
1164	$self->{title}->draw if $self->{title};
1165
1166	$self->child->draw;	1236	$child->draw;
		1237
		1238	if ($self->{title}) {
		1239	glTranslate 0, $border - $self->{h};
		1240	$self->{title}->_draw;
		1241	}
1167	}	1242	}
1168		1243
1169	#############################################################################	1244	#############################################################################
1170		1245
1171	package CFClient::UI::Table;	1246	package CFClient::UI::Table;
…		…
1245	(sum @$hs),	1320	(sum @$hs),
1246	)	1321	)
1247	}	1322	}
1248		1323
1249	sub size_allocate {	1324	sub size_allocate {
1250	my ($self, $w, $h, $changed) = @_;	1325	my ($self, $w, $h) = @_;
1251		1326
1252	my ($ws, $hs) = $self->get_wh;	1327	my ($ws, $hs) = $self->get_wh;
1253		1328
1254	my $req_w = (sum @$ws) || 1;	1329	my $req_w = (sum @$ws) || 1;
1255	my $req_h = (sum @$hs) || 1;	1330	my $req_h = (sum @$hs) || 1;
…		…
1333	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1408	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1334	)	1409	)
1335	}	1410	}
1336		1411
1337	sub size_allocate {	1412	sub size_allocate {
1338	my ($self, $w, $h, $changed) = @_;	1413	my ($self, $w, $h) = @_;
1339		1414
1340	my $space = $self->{vertical} ? $h : $w;	1415	my $space = $self->{vertical} ? $h : $w;
1341	my $children = $self->{children};	1416	my $children = $self->{children};
1342		1417
1343	my @req;	1418	my @req;
…		…
1464		1539
1465	delete $self->{texture};	1540	delete $self->{texture};
1466	$self->SUPER::update;	1541	$self->SUPER::update;
1467	}	1542	}
1468		1543
		1544	sub realloc {
		1545	my ($self) = @_;
		1546
		1547	delete $self->{ox};
		1548	$self->SUPER::realloc;
		1549	}
		1550
1469	sub set_text {	1551	sub set_text {
1470	my ($self, $text) = @_;	1552	my ($self, $text) = @_;
1471		1553
1472	return if $self->{text} eq "T$text";	1554	return if $self->{text} eq "T$text";
1473	$self->{text} = "T$text";	1555	$self->{text} = "T$text";
1474		1556
1475	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1476	$self->{layout}->set_text ($text);	1558	$self->{layout}->set_text ($text);
1477		1559
		1560	delete $self->{size_req};
1478	$self->realloc;	1561	$self->realloc;
1479	$self->update;	1562	$self->update;
1480	}	1563	}
1481		1564
1482	sub set_markup {	1565	sub set_markup {
…		…
1488	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1571	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1489		1572
1490	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1573	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1491	$self->{layout}->set_markup ($markup);	1574	$self->{layout}->set_markup ($markup);
1492		1575
		1576	delete $self->{size_req};
1493	$self->realloc;	1577	$self->realloc;
1494	$self->update;	1578	$self->update;
1495	}	1579	}
1496		1580
1497	sub size_request {	1581	sub size_request {
1498	my ($self) = @_;	1582	my ($self) = @_;
1499		1583
		1584	$self->{size_req} ||= do {
1500	$self->{layout}->set_font ($self->{font}) if $self->{font};	1585	$self->{layout}->set_font ($self->{font}) if $self->{font};
1501	$self->{layout}->set_width ($self->{max_w} || -1);	1586	$self->{layout}->set_width ($self->{max_w} || -1);
1502	$self->{layout}->set_ellipsise ($self->{ellipsise});	1587	$self->{layout}->set_ellipsise ($self->{ellipsise});
1503	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1588	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1504	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1589	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1505		1590
1506	my ($w, $h) = $self->{layout}->size;	1591	my ($w, $h) = $self->{layout}->size;
1507		1592
1508	if (exists $self->{template}) {	1593	if (exists $self->{template}) {
1509	$self->{template}->set_font ($self->{font}) if $self->{font};	1594	$self->{template}->set_font ($self->{font}) if $self->{font};
1510	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1595	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1511		1596
1512	my ($w2, $h2) = $self->{template}->size;	1597	my ($w2, $h2) = $self->{template}->size;
1513		1598
1514	$w = List::Util::max $w, $w2;	1599	$w = List::Util::max $w, $w2;
1515	$h = List::Util::max $h, $h2;	1600	$h = List::Util::max $h, $h2;
		1601	}
		1602
		1603	[$w, $h]
1516	}	1604	};
1517		1605
1518	($w, $h)	1606	@{ $self->{size_req} }
1519	}	1607	}
1520		1608
1521	sub size_allocate {	1609	sub size_allocate {
1522	my ($self, $w, $h, $changed) = @_;	1610	my ($self, $w, $h) = @_;
		1611
		1612	delete $self->{ox};
1523		1613
1524	delete $self->{texture}	1614	delete $self->{texture}
1525	if $changed;	1615	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1526	}	1616	}
1527		1617
1528	sub set_fontsize {	1618	sub set_fontsize {
1529	my ($self, $fontsize) = @_;	1619	my ($self, $fontsize) = @_;
1530		1620
1531	$self->{fontsize} = $fontsize;	1621	$self->{fontsize} = $fontsize;
1532	delete $self->{texture};	1622	delete $self->{texture};
1533		1623
1534	$self->realloc;	1624	$self->realloc;
		1625	}
		1626
		1627	sub reconfigure {
		1628	my ($self) = @_;
		1629
		1630	delete $self->{size_req};
		1631
		1632	$self->SUPER::reconfigure;
1535	}	1633	}
1536		1634
1537	sub _draw {	1635	sub _draw {
1538	my ($self) = @_;	1636	my ($self) = @_;
1539		1637
…		…
1545	$self->{layout}->set_width ($self->{w});	1643	$self->{layout}->set_width ($self->{w});
1546	$self->{layout}->set_ellipsise ($self->{ellipsise});	1644	$self->{layout}->set_ellipsise ($self->{ellipsise});
1547	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1645	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1548	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1646	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549		1647
1550	my $tex = new_from_layout CFClient::Texture $self->{layout};	1648	new_from_layout CFClient::Texture $self->{layout}
		1649	};
1551		1650
		1651	unless (exists $self->{ox}) {
1552	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1652	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1653	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1554	: ($self->{w} - $tex->{w}) * 0.5);	1654	: ($self->{w} - $tex->{w}) * 0.5);
1555		1655
1556	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1656	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1657	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1558	: ($self->{h} - $tex->{h}) * 0.5);	1658	: ($self->{h} - $tex->{h}) * 0.5);
1559
1560	$tex
1561	};	1659	};
1562		1660
1563	glEnable GL_TEXTURE_2D;	1661	glEnable GL_TEXTURE_2D;
1564	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1565		1662
1566	if ($tex->{format} == GL_ALPHA) {	1663	if ($tex->{format} == GL_ALPHA) {
		1664	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1567	glColor @{$self->{fg}};	1665	glColor @{$self->{fg}};
1568	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1666	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1569	} else {	1667	} else {
		1668	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1570	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1669	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1571	}	1670	}
1572		1671
1573	glDisable GL_TEXTURE_2D;	1672	glDisable GL_TEXTURE_2D;
1574	}	1673	}
…		…
1592	can_hover => 1,	1691	can_hover => 1,
1593	can_focus => 1,	1692	can_focus => 1,
1594	valign => 0,	1693	valign => 0,
1595	can_events => 1,	1694	can_events => 1,
1596	#text => ...	1695	#text => ...
		1696	#hidden => "*",
1597	@_	1697	@_
1598	)	1698	)
1599	}	1699	}
1600		1700
1601	sub _set_text {	1701	sub _set_text {
…		…
1603		1703
1604	delete $self->{cur_h};	1704	delete $self->{cur_h};
1605		1705
1606	return if $self->{text} eq $text;	1706	return if $self->{text} eq $text;
1607		1707
1608	delete $self->{texture};
1609
1610	$self->{last_activity} = $::NOW;	1708	$self->{last_activity} = $::NOW;
1611	$self->{text} = $text;	1709	$self->{text} = $text;
1612		1710
1613	$text =~ s/./*/g if $self->{hidden};	1711	$text =~ s/./*/g if $self->{hidden};
1614	$self->{layout}->set_text ("$text ");	1712	$self->{layout}->set_text ("$text ");
		1713	delete $self->{size_req};
1615		1714
1616	$self->_emit (changed => $self->{text});	1715	$self->_emit (changed => $self->{text});
		1716
		1717	$self->realloc;
		1718	$self->update;
1617	}	1719	}
1618		1720
1619	sub set_text {	1721	sub set_text {
1620	my ($self, $text) = @_;	1722	my ($self, $text) = @_;
1621		1723
1622	$self->{cursor} = length $text;	1724	$self->{cursor} = length $text;
1623	$self->_set_text ($text);	1725	$self->_set_text ($text);
1624
1625	$self->realloc;
1626	}	1726	}
1627		1727
1628	sub get_text {	1728	sub get_text {
1629	$_[0]{text}	1729	$_[0]{text}
1630	}	1730	}
…		…
1660	$self->{cursor} = length $text;	1760	$self->{cursor} = length $text;
1661	} elsif ($uni == 27) {	1761	} elsif ($uni == 27) {
1662	$self->_emit ('escape');	1762	$self->_emit ('escape');
1663	} elsif ($uni) {	1763	} elsif ($uni) {
1664	substr $text, $self->{cursor}++, 0, chr $uni;	1764	substr $text, $self->{cursor}++, 0, chr $uni;
		1765	} else {
		1766	return 0;
1665	}	1767	}
1666		1768
1667	$self->_set_text ($text);	1769	$self->_set_text ($text);
1668		1770
1669	$self->realloc;	1771	$self->realloc;
		1772
		1773	1
1670	}	1774	}
1671		1775
1672	sub focus_in {	1776	sub focus_in {
1673	my ($self) = @_;	1777	my ($self) = @_;
1674		1778
…		…
1689	utf8::encode $text;	1793	utf8::encode $text;
1690	$self->{cursor} = length substr $text, 0, $idx;	1794	$self->{cursor} = length substr $text, 0, $idx;
1691		1795
1692	$self->_set_text ($self->{text});	1796	$self->_set_text ($self->{text});
1693	$self->update;	1797	$self->update;
		1798
		1799	1
1694	}	1800	}
1695		1801
1696	sub mouse_motion {	1802	sub mouse_motion {
1697	my ($self, $ev, $x, $y) = @_;	1803	my ($self, $ev, $x, $y) = @_;
1698	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1804	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1805
		1806	0
1699	}	1807	}
1700		1808
1701	sub _draw {	1809	sub _draw {
1702	my ($self) = @_;	1810	my ($self) = @_;
1703		1811
1704	local $self->{fg} = $self->{fg};	1812	local $self->{fg} = $self->{fg};
1705		1813
1706	if ($FOCUS == $self) {	1814	if ($FOCUS == $self) {
1707	glColor @{$self->{active_bg}};	1815	glColor_premultiply @{$self->{active_bg}};
1708	$self->{fg} = $self->{active_fg};	1816	$self->{fg} = $self->{active_fg};
1709	} else {	1817	} else {
1710	glColor @{$self->{bg}};	1818	glColor_premultiply @{$self->{bg}};
1711	}	1819	}
1712		1820
1713	glEnable GL_BLEND;	1821	glEnable GL_BLEND;
1714	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1822	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1715	glBegin GL_QUADS;	1823	glBegin GL_QUADS;
1716	glVertex 0 , 0;	1824	glVertex 0 , 0;
1717	glVertex 0 , $self->{h};	1825	glVertex 0 , $self->{h};
1718	glVertex $self->{w}, $self->{h};	1826	glVertex $self->{w}, $self->{h};
1719	glVertex $self->{w}, 0;	1827	glVertex $self->{w}, 0;
…		…
1780	} else {	1888	} else {
1781	$self->set_text ($self->{history_saveback});	1889	$self->set_text ($self->{history_saveback});
1782	}	1890	}
1783		1891
1784	} else {	1892	} else {
1785	$self->SUPER::key_down ($ev);	1893	return $self->SUPER::key_down ($ev)
		1894	}
		1895
1786	}	1896	1
1787
1788	}	1897	}
1789		1898
1790	#############################################################################	1899	#############################################################################
1791		1900
1792	package CFClient::UI::Button;	1901	package CFClient::UI::Button;
…		…
1821	my ($self, $ev, $x, $y) = @_;	1930	my ($self, $ev, $x, $y) = @_;
1822		1931
1823	$self->emit ("activate")	1932	$self->emit ("activate")
1824	if $x >= 0 && $x < $self->{w}	1933	if $x >= 0 && $x < $self->{w}
1825	&& $y >= 0 && $y < $self->{h};	1934	&& $y >= 0 && $y < $self->{h};
		1935
		1936	1
1826	}	1937	}
1827		1938
1828	sub _draw {	1939	sub _draw {
1829	my ($self) = @_;	1940	my ($self) = @_;
1830		1941
1831	local $self->{fg} = $self->{fg};	1942	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1832
1833	if ($GRAB == $self) {
1834	$self->{fg} = $self->{active_fg};
1835	}
1836		1943
1837	glEnable GL_TEXTURE_2D;	1944	glEnable GL_TEXTURE_2D;
1838	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1945	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1839	glColor 0, 0, 0, 1;	1946	glColor 0, 0, 0, 1;
1840		1947
…		…
1884		1991
1885	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	1992	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1886	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	1993	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1887	$self->{state} = !$self->{state};	1994	$self->{state} = !$self->{state};
1888	$self->_emit (changed => $self->{state});	1995	$self->_emit (changed => $self->{state});
		1996	} else {
		1997	return 0
		1998	}
		1999
1889	}	2000	1
1890	}	2001	}
1891		2002
1892	sub _draw {	2003	sub _draw {
1893	my ($self) = @_;	2004	my ($self) = @_;
1894		2005
…		…
2061		2172
2062	my $h1 = $self->{h} * (1 - $ycut1);	2173	my $h1 = $self->{h} * (1 - $ycut1);
2063	my $h2 = $self->{h} * (1 - $ycut2);	2174	my $h2 = $self->{h} * (1 - $ycut2);
2064		2175
2065	glEnable GL_BLEND;	2176	glEnable GL_BLEND;
2066	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2177	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2178	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2067	glEnable GL_TEXTURE_2D;	2179	glEnable GL_TEXTURE_2D;
2068	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2180	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2069		2181
2070	glBindTexture GL_TEXTURE_2D, $t1->{name};	2182	glBindTexture GL_TEXTURE_2D, $t1->{name};
2071	glBegin GL_QUADS;	2183	glBegin GL_QUADS;
…		…
2232		2344
2233	$self->SUPER::button_down ($ev, $x, $y);	2345	$self->SUPER::button_down ($ev, $x, $y);
2234		2346
2235	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2347	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236		2348
2237	$self->mouse_motion ($ev, $x, $y);	2349	$self->mouse_motion ($ev, $x, $y)
2238	}	2350	}
2239		2351
2240	sub mouse_motion {	2352	sub mouse_motion {
2241	my ($self, $ev, $x, $y) = @_;	2353	my ($self, $ev, $x, $y) = @_;
2242		2354
…		…
2246	my (undef, $lo, $hi, $page) = @{$self->{range}};	2358	my (undef, $lo, $hi, $page) = @{$self->{range}};
2247		2359
2248	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2360	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249		2361
2250	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2362	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2363	} else {
		2364	return 0;
		2365	}
		2366
2251	}	2367	1
2252	}	2368	}
2253		2369
2254	sub update {	2370	sub update {
2255	my ($self) = @_;	2371	my ($self) = @_;
2256		2372
2257	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2373	delete $self->{knob_w};
		2374	$self->SUPER::update;
		2375	}
		2376
		2377	sub _draw {
		2378	my ($self) = @_;
		2379
		2380	unless ($self->{knob_w}) {
2258	$self->set_value ($self->{range}[0]);	2381	$self->set_value ($self->{range}[0]);
2259		2382
2260	my ($value, $lo, $hi, $page) = @{$self->{range}};	2383	my ($value, $lo, $hi, $page) = @{$self->{range}};
2261	my $range = ($hi - $page - $lo) || 1e-100;	2384	my $range = ($hi - $page - $lo) || 1e-100;
2262		2385
…		…
2268	$value = ($value - $lo) / $range;	2391	$value = ($value - $lo) / $range;
2269	$value = $value * $self->{scale} + $self->{offset};	2392	$value = $value * $self->{scale} + $self->{offset};
2270		2393
2271	$self->{knob_x} = $value - $knob_w * 0.5;	2394	$self->{knob_x} = $value - $knob_w * 0.5;
2272	$self->{knob_w} = $knob_w;	2395	$self->{knob_w} = $knob_w;
2273	});	2396	}
2274
2275	$self->SUPER::update;
2276	}
2277
2278	sub _draw {
2279	my ($self) = @_;
2280		2397
2281	$self->SUPER::_draw ();	2398	$self->SUPER::_draw ();
2282		2399
2283	glScale $self->{w}, $self->{h};	2400	glScale $self->{w}, $self->{h};
2284		2401
…		…
2382	$self->{fontsize} = $fontsize;	2499	$self->{fontsize} = $fontsize;
2383	$self->reflow;	2500	$self->reflow;
2384	}	2501	}
2385		2502
2386	sub size_allocate {	2503	sub size_allocate {
2387	my ($self, $w, $h, $changed) = @_;	2504	my ($self, $w, $h) = @_;
2388		2505
2389	$self->SUPER::size_allocate ($w, $h, $changed);	2506	$self->SUPER::size_allocate ($w, $h);
2390
2391	return unless $changed;
2392		2507
2393	$self->{layout}->set_font ($self->{font}) if $self->{font};	2508	$self->{layout}->set_font ($self->{font}) if $self->{font};
2394	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2509	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395	$self->{layout}->set_width ($self->{children}[0]{w});	2510	$self->{layout}->set_width ($self->{children}[0]{w});
		2511	$self->{layout}->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2396		2512
2397	$self->reflow;	2513	$self->reflow;
2398	}	2514	}
2399		2515
2400	sub text_size {	2516	sub text_size {
…		…
2402		2518
2403	my $layout = $self->{layout};	2519	my $layout = $self->{layout};
2404		2520
2405	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2521	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406	$layout->set_width ($self->{children}[0]{w} - $indent);	2522	$layout->set_width ($self->{children}[0]{w} - $indent);
		2523	$layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2407	$layout->set_markup ($text);	2524	$layout->set_markup ($text);
2408		2525
2409	$layout->size	2526	$layout->size
2410	}	2527	}
2411		2528
…		…
2463	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2580	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464		2581
2465	for (@{$self->{par}}) {	2582	for (@{$self->{par}}) {
2466	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2583	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467	$layout->set_width ($W - $_->[3]);	2584	$layout->set_width ($W - $_->[3]);
		2585	$layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2468	$layout->set_markup ($_->[4]);	2586	$layout->set_markup ($_->[4]);
2469	my ($w, $h) = $layout->size;	2587	my ($w, $h) = $layout->size;
2470	$_->[0] = $w + $_->[3];	2588	$_->[0] = $w + $_->[3];
2471	$_->[1] = $h;	2589	$_->[1] = $h;
2472	}	2590	}
…		…
2480		2598
2481	delete $self->{texture};	2599	delete $self->{texture};
2482	}	2600	}
2483		2601
2484	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2602	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2485	glClearColor 0.5, 0.5, 0.5, 0;	2603	glClearColor 0, 0, 0, 0;
2486	glClear GL_COLOR_BUFFER_BIT;	2604	glClear GL_COLOR_BUFFER_BIT;
2487		2605
2488	my $top = int $self->{children}[1]{range}[0];	2606	my $top = int $self->{children}[1]{range}[0];
2489		2607
2490	my $y0 = $top;	2608	my $y0 = $top;
…		…
2504	my $h = $par->[1];	2622	my $h = $par->[1];
2505		2623
2506	if ($y0 < $y + $h && $y < $y1) {	2624	if ($y0 < $y + $h && $y < $y1) {
2507	$layout->set_foreground (@{ $par->[2] });	2625	$layout->set_foreground (@{ $par->[2] });
2508	$layout->set_width ($W - $par->[3]);	2626	$layout->set_width ($W - $par->[3]);
		2627	$layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2509	$layout->set_markup ($par->[4]);	2628	$layout->set_markup ($par->[4]);
2510		2629
2511	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2630	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2512		2631
2513	glRasterPos $par->[3], $y - $y0;	2632	glRasterPos $par->[3], $y - $y0;
…		…
2525	sub _draw {	2644	sub _draw {
2526	my ($self) = @_;	2645	my ($self) = @_;
2527		2646
2528	glEnable GL_TEXTURE_2D;	2647	glEnable GL_TEXTURE_2D;
2529	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2648	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530	glColor 1, 1, 1, 1;	2649	glColor 0, 0, 0, 1;
2531	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2650	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532	glDisable GL_TEXTURE_2D;	2651	glDisable GL_TEXTURE_2D;
2533		2652
2534	$self->{children}[1]->draw;	2653	$self->{children}[1]->draw;
2535		2654
2536	}	2655	}
…		…
2619	}	2738	}
2620		2739
2621	sub set_tooltip_from {	2740	sub set_tooltip_from {
2622	my ($self, $widget) = @_;	2741	my ($self, $widget) = @_;
2623		2742
		2743	my $tooltip = $widget->{tooltip};
		2744
		2745	if ($ENV{CFPLUS_DEBUG} & 2) {
		2746	$tooltip .= "\n\n" . (ref $widget) . "\n"
		2747	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		2748	. "req $widget->{req_w} $widget->{req_h}\n"
		2749	. "visible $widget->{visible}";
		2750	}
		2751
2624	$self->add (new CFClient::UI::Label	2752	$self->add (new CFClient::UI::Label
2625	markup => $widget->{tooltip},	2753	markup => $tooltip,
2626	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2754	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627	fontsize => 0.8,	2755	fontsize => 0.8,
2628	fg => [0, 0, 0, 1],	2756	fg => [0, 0, 0, 1],
2629	ellipsise => 0,	2757	ellipsise => 0,
2630	font => ($widget->{tooltip_font} || $::FONT_PROP),	2758	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
2638		2766
2639	($w + 4, $h + 4)	2767	($w + 4, $h + 4)
2640	}	2768	}
2641		2769
2642	sub size_allocate {	2770	sub size_allocate {
2643	my ($self, $w, $h, $changed) = @_;	2771	my ($self, $w, $h) = @_;
2644		2772
2645	return unless $changed;
2646
2647	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	2773	$self->SUPER::size_allocate ($w - 4, $h - 4);
2648	}	2774	}
2649		2775
2650	sub visibility_change {	2776	sub visibility_change {
2651	my ($self, $visible) = @_;	2777	my ($self, $visible) = @_;
2652		2778
…		…
2756	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	2882	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2757		2883
2758	if ($tex) {	2884	if ($tex) {
2759	glEnable GL_TEXTURE_2D;	2885	glEnable GL_TEXTURE_2D;
2760	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2886	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2761	glColor 1, 1, 1, 1;	2887	glColor 0, 0, 0, 1;
2762	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2888	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2763	glDisable GL_TEXTURE_2D;	2889	glDisable GL_TEXTURE_2D;
2764	}	2890	}
2765	}	2891	}
2766		2892
…		…
2773	$self->SUPER::DESTROY;	2899	$self->SUPER::DESTROY;
2774	}	2900	}
2775		2901
2776	#############################################################################	2902	#############################################################################
2777		2903
2778	package CFClient::UI::Inventory;	2904	package CFClient::UI::Buttonbar;
2779		2905
2780	our @ISA = CFClient::UI::ScrolledWindow::;	2906	our @ISA = CFClient::UI::HBox::;
2781		2907
2782	sub new {	2908	# TODO: should actualyl wrap buttons and other goodies.
2783	my $class = shift;
2784
2785	my $self = $class->SUPER::new (
2786	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2787	@_,
2788	);
2789
2790	$self
2791	}
2792
2793	sub set_items {
2794	my ($self, $items) = @_;
2795
2796	$self->{scrolled}->clear;
2797	return unless $items;
2798
2799	my @items = sort {
2800	($a->{type} <=> $b->{type})
2801	or ($a->{name} cmp $b->{name})
2802	} @$items;
2803
2804	$self->{real_items} = \@items;
2805
2806	my $row = 0;
2807	for my $item (@items) {
2808	CFClient::Item::update_widgets $item;
2809
2810	$self->{scrolled}->add (0, $row, $item->{face_widget});
2811	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2812	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2813
2814	$row++;
2815	}
2816	}
2817		2909
2818	#############################################################################	2910	#############################################################################
2819		2911
2820	package CFClient::UI::Menu;	2912	package CFClient::UI::Menu;
2821		2913
…		…
2833	);	2925	);
2834		2926
2835	$self->add ($self->{vbox} = new CFClient::UI::VBox);	2927	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2836		2928
2837	for my $item (@{ $self->{items} }) {	2929	for my $item (@{ $self->{items} }) {
2838	my ($widget, $cb) = @$item;	2930	my ($widget, $cb, $tooltip) = @$item;
2839		2931
2840	# handle various types of items, only text for now	2932	# handle various types of items, only text for now
2841	if (!ref $widget) {	2933	if (!ref $widget) {
2842	$widget = new CFClient::UI::Label	2934	$widget = new CFClient::UI::Label
2843	can_hover => 1,	2935	can_hover => 1,
2844	can_events => 1,	2936	can_events => 1,
2845	text => $widget;	2937	text => $widget,
		2938	tooltip => $tooltip
2846	}	2939	}
2847		2940
2848	$self->{item}{$widget} = $item;	2941	$self->{item}{$widget} = $item;
2849		2942
2850	$self->{vbox}->add ($widget);	2943	$self->{vbox}->add ($widget);
…		…
2871	my ($self, $ev, $x, $y) = @_;	2964	my ($self, $ev, $x, $y) = @_;
2872		2965
2873	# TODO: should use vbox->find_widget or so	2966	# TODO: should use vbox->find_widget or so
2874	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2967	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875	$self->{hover} = $self->{item}{$HOVER};	2968	$self->{hover} = $self->{item}{$HOVER};
		2969
		2970	0
2876	}	2971	}
2877		2972
2878	sub button_up {	2973	sub button_up {
2879	my ($self, $ev, $x, $y) = @_;	2974	my ($self, $ev, $x, $y) = @_;
2880		2975
…		…
2882	undef $GRAB;	2977	undef $GRAB;
2883	$self->hide;	2978	$self->hide;
2884		2979
2885	$self->_emit ("popdown");	2980	$self->_emit ("popdown");
2886	$self->{hover}[1]->() if $self->{hover};	2981	$self->{hover}[1]->() if $self->{hover};
		2982	} else {
		2983	return 0
		2984	}
		2985
2887	}	2986	1
2888	}	2987	}
2889		2988
2890	#############################################################################	2989	#############################################################################
2891		2990
2892	package CFClient::UI::Statusbox;	2991	package CFClient::UI::Multiplexer;
2893		2992
2894	our @ISA = CFClient::UI::VBox::;	2993	our @ISA = CFClient::UI::Container::;
2895		2994
2896	sub new {	2995	sub new {
2897	my $class = shift;	2996	my $class = shift;
2898		2997
2899	$class->SUPER::new (	2998	my $self = $class->SUPER::new (
		2999	@_,
		3000	);
		3001
		3002	$self->{current} = $self->{children}[0]
		3003	if @{ $self->{children} };
		3004
		3005	$self
		3006	}
		3007
		3008	sub add {
		3009	my ($self, @widgets) = @_;
		3010
		3011	$self->SUPER::add (@widgets);
		3012
		3013	$self->{current} = $self->{children}[0]
		3014	if @{ $self->{children} };
		3015	}
		3016
		3017	sub set_current_page {
		3018	my ($self, $page_or_widget) = @_;
		3019
		3020	my $widget = ref $page_or_widget
		3021	? $page_or_widget
		3022	: $self->{children}[$page_or_widget];
		3023
		3024	$self->{current} = $widget;
		3025	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3026
		3027	$self->_emit (page_changed => $self->{current});
		3028
		3029	$self->realloc;
		3030	}
		3031
		3032	sub visible_children {
		3033	$_[0]{current}
		3034	}
		3035
		3036	sub size_request {
		3037	my ($self) = @_;
		3038
		3039	$self->{current}->size_request
		3040	}
		3041
		3042	sub size_allocate {
		3043	my ($self, $w, $h) = @_;
		3044
		3045	$self->{current}->configure (0, 0, $w, $h);
		3046	}
		3047
		3048	sub _draw {
		3049	my ($self) = @_;
		3050
		3051	$self->{current}->draw;
		3052	}
		3053
		3054	#############################################################################
		3055
		3056	package CFClient::UI::Notebook;
		3057
		3058	our @ISA = CFClient::UI::VBox::;
		3059
		3060	sub new {
		3061	my $class = shift;
		3062
		3063	my $self = $class->SUPER::new (
		3064	buttonbar => (new CFClient::UI::Buttonbar),
		3065	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3066	# filter => # will be put between multiplexer and $self
		3067	@_,
		3068	);
		3069
		3070	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3071	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3072
		3073	$self
		3074	}
		3075
		3076	sub add {
		3077	my ($self, $title, $widget, $tooltip) = @_;
		3078
		3079	Scalar::Util::weaken $self;
		3080
		3081	$self->{buttonbar}->add (new CFClient::UI::Button
		3082	markup => $title,
		3083	tooltip => $tooltip,
		3084	on_activate => sub { $self->set_current_page ($widget) },
		3085	);
		3086
		3087	$self->{multiplexer}->add ($widget);
		3088	}
		3089
		3090	sub set_current_page {
		3091	my ($self, $page) = @_;
		3092
		3093	$self->{multiplexer}->set_current_page ($page);
		3094	$self->_emit (page_changed => $self->{multiplexer}{current});
		3095	}
		3096
		3097	#############################################################################
		3098
		3099	package CFClient::UI::Combobox;
		3100
		3101	use utf8;
		3102
		3103	our @ISA = CFClient::UI::Button::;
		3104
		3105	sub new {
		3106	my $class = shift;
		3107
		3108	my $self = $class->SUPER::new (
		3109	options => [], # [title, value, tooltip], ...
		3110	value => undef,
		3111	@_,
		3112	);
		3113
		3114	$self->_set_value ($self->{value});
		3115
		3116	$self
		3117	}
		3118
		3119	sub button_down {
		3120	my ($self, $ev) = @_;
		3121
		3122	my @menu_items;
		3123
		3124	for (@{ $self->{options} }) {
		3125	my ($title, $value, $tooltip) = @$_;
		3126
		3127	push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
		3128	}
		3129
		3130	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3131	}
		3132
		3133	sub _set_value {
		3134	my ($self, $value) = @_;
		3135
		3136	my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
		3137	or return;
		3138
		3139	$self->{value} = $item->[1];
		3140	$self->set_markup ("$item->[0] ⇓");
		3141	$self->set_tooltip ($item->[2]);
		3142	}
		3143
		3144	sub set_value {
		3145	my ($self, $value) = @_;
		3146
		3147	return unless $self->{value} ne $value;
		3148
		3149	$self->_set_value ($value);
		3150	$self->_emit (changed => $value);
		3151	}
		3152
		3153	#############################################################################
		3154
		3155	package CFClient::UI::Statusbox;
		3156
		3157	our @ISA = CFClient::UI::VBox::;
		3158
		3159	sub new {
		3160	my $class = shift;
		3161
		3162	my $self = $class->SUPER::new (
2900	fontsize => 0.8,	3163	fontsize => 0.8,
2901	@_,	3164	@_,
2902	)	3165	);
		3166
		3167	Scalar::Util::weaken (my $this = $self);
		3168
		3169	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3170
		3171	$self
2903	}	3172	}
2904		3173
2905	sub reorder {	3174	sub reorder {
2906	my ($self) = @_;	3175	my ($self) = @_;
2907	my $NOW = time;	3176	my $NOW = Time::HiRes::time;
		3177
		3178	# freeze display when hovering over any label
		3179	return if $CFClient::UI::TOOLTIP->{owner}
		3180	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3181	values %{ $self->{item} };
2908		3182
2909	while (my ($k, $v) = each %{ $self->{item} }) {	3183	while (my ($k, $v) = each %{ $self->{item} }) {
2910	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3184	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2911	}	3185	}
2912		3186
…		…
2915	my @items = sort {	3189	my @items = sort {
2916	$a->{pri} <=> $b->{pri}	3190	$a->{pri} <=> $b->{pri}
2917	or $b->{id} <=> $a->{id}	3191	or $b->{id} <=> $a->{id}
2918	} values %{ $self->{item} };	3192	} values %{ $self->{item} };
2919		3193
		3194	$self->{timer}->interval (1);
		3195
2920	my $count = 10 + 1;	3196	my $count = 10 + 1;
2921	for my $item (@items) {	3197	for my $item (@items) {
2922	last unless --$count;	3198	last unless --$count;
2923		3199
2924	push @widgets, $item->{label} ||= do {	3200	my $label = $item->{label} ||= do {
2925	# TODO: doesn't handle markup well (read as: at all)	3201	# TODO: doesn't handle markup well (read as: at all)
2926	my $short = $item->{count} > 1	3202	my $short = $item->{count} > 1
2927	? "<b>$item->{count} ×</b> $item->{text}"	3203	? "<b>$item->{count} ×</b> $item->{text}"
2928	: $item->{text};	3204	: $item->{text};
2929		3205
…		…
2937	tooltip => $item->{tooltip},	3213	tooltip => $item->{tooltip},
2938	tooltip_font => $::FONT_PROP,	3214	tooltip_font => $::FONT_PROP,
2939	tooltip_width => 0.67,	3215	tooltip_width => 0.67,
2940	fontsize => $item->{fontsize} || $self->{fontsize},	3216	fontsize => $item->{fontsize} || $self->{fontsize},
2941	max_w => $::WIDTH * 0.44,	3217	max_w => $::WIDTH * 0.44,
2942	fg => $item->{fg},	3218	fg => [@{ $item->{fg} }],
2943	can_events => 1,	3219	can_events => 1,
2944	can_hover => 1	3220	can_hover => 1
2945	};	3221	};
		3222
		3223	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3224	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3225	$label->update;
		3226	$label->set_max_size (undef, $label->{req_h} * $diff)
		3227	if $diff < 1;
		3228	$self->{timer}->interval (1/30);
		3229	} else {
		3230	$label->{fg}[3] = $item->{fg}[3] || 1;
		3231	}
		3232
		3233	push @widgets, $label;
2946	}	3234	}
2947		3235
2948	$self->clear;	3236	$self->clear;
2949	$self->SUPER::add (reverse @widgets);	3237	$self->SUPER::add (reverse @widgets);
2950	}	3238	}
…		…
2955	$text =~ s/^\s+//;	3243	$text =~ s/^\s+//;
2956	$text =~ s/\s+$//;	3244	$text =~ s/\s+$//;
2957		3245
2958	return unless $text;	3246	return unless $text;
2959		3247
2960	my $timeout = time + ((delete $arg{timeout}) || 60);	3248	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2961		3249
2962	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3250	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2963		3251
2964	if (my $item = $self->{item}{$group}) {	3252	if (my $item = $self->{item}{$group}) {
2965	if ($item->{text} eq $text) {	3253	if ($item->{text} eq $text) {
…		…
2995		3283
2996	$self->reorder;	3284	$self->reorder;
2997	$self->SUPER::reconfigure;	3285	$self->SUPER::reconfigure;
2998	}	3286	}
2999		3287
		3288	sub DESTROY {
		3289	my ($self) = @_;
		3290
		3291	$self->{timer}->cancel;
		3292
		3293	$self->SUPER::DESTROY;
		3294	}
		3295
3000	#############################################################################	3296	#############################################################################
3001		3297
		3298	package CFClient::UI::Inventory;
		3299
		3300	our @ISA = CFClient::UI::ScrolledWindow::;
		3301
		3302	sub new {
		3303	my $class = shift;
		3304
		3305	my $self = $class->SUPER::new (
		3306	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		3307	@_,
		3308	);
		3309
		3310	$self
		3311	}
		3312
		3313	sub set_items {
		3314	my ($self, $items) = @_;
		3315
		3316	$self->{child}->clear;
		3317	return unless $items;
		3318
		3319	my @items = sort {
		3320	($a->{type} <=> $b->{type})
		3321	or ($a->{name} cmp $b->{name})
		3322	} @$items;
		3323
		3324	$self->{real_items} = \@items;
		3325
		3326	my $row = 0;
		3327	for my $item (@items) {
		3328	CFClient::Item::update_widgets $item;
		3329
		3330	$self->{child}->add (0, $row, $item->{face_widget});
		3331	$self->{child}->add (1, $row, $item->{desc_widget});
		3332	$self->{child}->add (2, $row, $item->{weight_widget});
		3333
		3334	$row++;
		3335	}
		3336	}
		3337
		3338	#############################################################################
		3339
		3340	package CFClient::UI::BindEditor;
		3341
		3342	our @ISA = CFClient::UI::FancyFrame::;
		3343
		3344	sub new {
		3345	my $class = shift;
		3346
		3347	my $self = $class->SUPER::new (binding => [], commands => [], @_);
		3348
		3349	$self->add (my $vb = new CFClient::UI::VBox);
		3350
		3351
		3352	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
		3353	text => "start recording",
		3354	tooltip => "Start/Stops recording of actions."
		3355	."All subsequent actions after the recording started will be captured."
		3356	."The actions are displayed after the record was stopped."
		3357	."To bind the action you have to click on the 'Bind' button",
		3358	on_activate => sub {
		3359	unless ($self->{recording}) {
		3360	$self->start;
		3361	} else {
		3362	$self->stop;
		3363	}
		3364	});
		3365
		3366	$vb->add (new CFClient::UI::Label text => "Actions:");
		3367	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
		3368
		3369	$vb->add (new CFClient::UI::Label text => "Bound to: ");
		3370	$vb->add (my $hb = new CFClient::UI::HBox);
		3371	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
		3372	$hb->add (new CFClient::UI::Button
		3373	text => "bind",
		3374	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
		3375	on_activate => sub {
		3376	$self->ask_for_bind;
		3377	});
		3378
		3379	$vb->add (my $hb = new CFClient::UI::HBox);
		3380	$hb->add (new CFClient::UI::Button
		3381	text => "ok",
		3382	expand => 1,
		3383	tooltip => "This closes the binding editor and saves the binding",
		3384	on_activate => sub {
		3385	$self->hide;
		3386	$self->commit;
		3387	});
		3388
		3389	$hb->add (new CFClient::UI::Button
		3390	text => "cancel",
		3391	expand => 1,
		3392	tooltip => "This closes the binding editor without saving",
		3393	on_activate => sub {
		3394	$self->hide;
		3395	$self->{binding_cancel}->()
		3396	if $self->{binding_cancel};
		3397	});
		3398
		3399	$self->update_binding_widgets;
		3400
		3401	$self
		3402	}
		3403
		3404	sub commit {
		3405	my ($self) = @_;
		3406	my ($mod, $sym, $cmds) = $self->get_binding;
		3407	if ($sym != 0 && @$cmds > 0) {
		3408	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
		3409	."'. Don't forget 'Save Config'!");
		3410	$self->{binding_change}->($mod, $sym, $cmds)
		3411	if $self->{binding_change};
		3412	} else {
		3413	$::STATUSBOX->add ("No action bound, no key or action specified!");
		3414	$self->{binding_cancel}->()
		3415	if $self->{binding_cancel};
		3416	}
		3417	}
		3418
		3419	sub start {
		3420	my ($self) = @_;
		3421
		3422	$self->{rec_btn}->set_text ("stop recording");
		3423	$self->{recording} = 1;
		3424	$self->clear_command_list;
		3425	$::CONN->start_record if $::CONN;
		3426	}
		3427
		3428	sub stop {
		3429	my ($self) = @_;
		3430
		3431	$self->{rec_btn}->set_text ("start recording");
		3432	$self->{recording} = 0;
		3433
		3434	my $rec;
		3435	$rec = $::CONN->stop_record if $::CONN;
		3436	return unless ref $rec eq 'ARRAY';
		3437	$self->set_command_list ($rec);
		3438	}
		3439
		3440
		3441	sub ask_for_bind_and_commit {
		3442	my ($self) = @_;
		3443	$self->ask_for_bind (1);
		3444	}
		3445
		3446	sub ask_for_bind {
		3447	my ($self, $commit) = @_;
		3448
		3449	CFClient::Binder::open_binding_dialog (sub {
		3450	my ($mod, $sym) = @_;
		3451	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
		3452	$self->update_binding_widgets;
		3453	$self->commit if $commit;
		3454	});
		3455	}
		3456
		3457	# $mod and $sym are the modifiers and key symbol
		3458	# $cmds is a array ref of strings (the commands)
		3459	# $cb is the callback that is executed on OK
		3460	# $ccb is the callback that is executed on CANCEL and
		3461	# when the binding was unsuccessful on OK
		3462	sub set_binding {
		3463	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
		3464
		3465	$self->clear_command_list;
		3466	$self->{recording} = 0;
		3467	$self->{rec_btn}->set_text ("start recording");
		3468
		3469	$self->{binding} = [$mod, $sym];
		3470	$self->{commands} = $cmds;
		3471
		3472	$self->{binding_change} = $cb;
		3473	$self->{binding_cancel} = $ccb;
		3474
		3475	$self->update_binding_widgets;
		3476	}
		3477
		3478	# this is a shortcut method that asks for a binding
		3479	# and then just binds it.
		3480	sub do_quick_binding {
		3481	my ($self, $cmds) = @_;
		3482	$self->set_binding (undef, undef, $cmds, sub {
		3483	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
		3484	});
		3485	$self->ask_for_bind (1);
		3486	}
		3487
		3488	sub update_binding_widgets {
		3489	my ($self) = @_;
		3490	my ($mod, $sym, $cmds) = $self->get_binding;
		3491	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
		3492	$self->set_command_list ($cmds);
		3493	}
		3494
		3495	sub get_binding {
		3496	my ($self) = @_;
		3497	return (
		3498	$self->{binding}->[0],
		3499	$self->{binding}->[1],
		3500	[ grep { defined $_ } @{$self->{commands}} ]
		3501	);
		3502	}
		3503
		3504	sub clear_command_list {
		3505	my ($self) = @_;
		3506	$self->{cmdbox}->clear ();
		3507	}
		3508
		3509	sub set_command_list {
		3510	my ($self, $cmds) = @_;
		3511
		3512	$self->{cmdbox}->clear ();
		3513	$self->{commands} = $cmds;
		3514
		3515	my $idx = 0;
		3516
		3517	for (@$cmds) {
		3518	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
		3519
		3520	my $i = $idx;
		3521	$hb->add (new CFClient::UI::Label text => $_);
		3522	$hb->add (new CFClient::UI::Button
		3523	text => "delete",
		3524	tooltip => "Deletes the action from the record",
		3525	on_activate => sub {
		3526	$self->{cmdbox}->remove ($hb);
		3527	$cmds->[$i] = undef;
		3528	});
		3529
		3530
		3531	$idx++
		3532	}
		3533	}
		3534
		3535	#############################################################################
		3536
		3537	package CFClient::UI::SpellList;
		3538
		3539	our @ISA = CFClient::UI::Table::;
		3540
		3541	sub new {
		3542	my $class = shift;
		3543
		3544	my $self = $class->SUPER::new (
		3545	binding => [],
		3546	commands => [],
		3547	@_,
		3548	)
		3549	}
		3550
		3551	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3552	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
		3553	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3554	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
		3555	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3556	"<b>Damage</b>. The amount of damage the spell deals when it hits.");
		3557
		3558	sub rebuild_spell_list {
		3559	my ($self) = @_;
		3560
		3561	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3562	$self->clear;
		3563
		3564	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
		3565	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3566	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3567	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3568
		3569	my $row = 0;
		3570
		3571	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3572	my $spell = $self->{spell}{$_};
		3573
		3574	$row++;
		3575
		3576	$self->add (0, $row, new CFClient::UI::Face
		3577	face => $spell->{face},
		3578	can_hover => 1,
		3579	can_events => 1,
		3580	tooltip => $spell->{message},
		3581	);
		3582
		3583	$self->add (1, $row, new CFClient::UI::Label
		3584	expand => 1,
		3585	text => $spell->{name},
		3586	can_hover => 1,
		3587	can_events => 1,
		3588	tooltip => $spell->{message},
		3589	);
		3590
		3591	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3592	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
		3593	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3594
		3595	# TODO: should be done via popup
		3596	$self->add (5, $row, new CFClient::UI::Button
		3597	text => "bind",
		3598	tooltip => "bind spell readying (cast command) to key",
		3599	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
		3600	);
		3601	}
		3602	});
		3603	}
		3604
		3605	sub add_spell {
		3606	my ($self, $spell) = @_;
		3607
		3608	$self->{spell}->{$spell->{name}} = $spell;
		3609	$self->rebuild_spell_list;
		3610	}
		3611
		3612	sub remove_spell {
		3613	my ($self, $spell) = @_;
		3614
		3615	delete $self->{spell}->{$spell->{name}};
		3616	$self->rebuild_spell_list;
		3617	}
		3618
		3619	#############################################################################
		3620
3002	package CFClient::UI::Root;	3621	package CFClient::UI::Root;
3003		3622
3004	our @ISA = CFClient::UI::Container::;	3623	our @ISA = CFClient::UI::Container::;
		3624
		3625	use List::Util qw(min max);
3005		3626
3006	use CFClient::OpenGL;	3627	use CFClient::OpenGL;
3007		3628
3008	sub new {	3629	sub new {
3009	my $class = shift;	3630	my $class = shift;
…		…
3016	Scalar::Util::weaken ($self->{root} = $self);	3637	Scalar::Util::weaken ($self->{root} = $self);
3017		3638
3018	$self	3639	$self
3019	}	3640	}
3020		3641
3021	sub configure {
3022	my ($self, $x, $y, $w, $h) = @_;
3023
3024	$self->{w} = $w;
3025	$self->{h} = $h;
3026	}
3027
3028	sub reconfigure {
3029	my ($self) = @_;
3030
3031	$self->SUPER::reconfigure;
3032
3033	$self->size_allocate ($self->{w}, $self->{h}, 1)
3034	if $self->{w};
3035	}
3036
3037	sub size_request {	3642	sub size_request {
3038	my ($self) = @_;	3643	my ($self) = @_;
3039		3644
3040	($self->{w}, $self->{h})	3645	($self->{w}, $self->{h})
3041	}	3646	}
…		…
3053		3658
3054	int $coord + 0.5	3659	int $coord + 0.5
3055	}	3660	}
3056		3661
3057	sub size_allocate {	3662	sub size_allocate {
3058	my ($self, $w, $h, $changed) = @_;	3663	my ($self, $w, $h) = @_;
3059		3664
3060	for my $child ($self->children) {	3665	for my $child ($self->children) {
3061	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3666	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3062		3667
3063	$X = $child->{force_x} if exists $child->{force_x};	3668	$X = $child->{force_x} if exists $child->{force_x};
…		…
3131	$_->()	3736	$_->()
3132	for values %{delete $self->{refresh_hook}};	3737	for values %{delete $self->{refresh_hook}};
3133	}	3738	}
3134		3739
3135	if ($self->{realloc}) {	3740	if ($self->{realloc}) {
		3741	my %queue;
3136	my @queue;	3742	my @queue;
		3743	my $widget;
3137		3744
		3745	outer:
3138	while () {	3746	while () {
3139	if ($self->{realloc}) {	3747	if (my $realloc = delete $self->{realloc}) {
3140	#TODO use array-of-depth approach	3748	for $widget (values %$realloc) {
		3749	$widget->{visible} or next; # do not resize invisible widgets
3141		3750
3142	@queue = sort { $a->{visible} <=> $b->{visible} }	3751	$queue{$widget+0}++ and next; # duplicates are common
3143	@queue, values %{delete $self->{realloc}};	3752
		3753	push @{ $queue[$widget->{visible}] }, $widget;
		3754	}
3144	}	3755	}
3145		3756
		3757	while () {
		3758	@queue or last outer;
		3759
3146	my $widget = pop @queue || last;	3760	$widget = pop @{ $queue[-1] || [] }
		3761	and last;
		3762
		3763	pop @queue;
		3764	}
3147		3765
3148	$widget->{visible} or last; # do not resize invisible widgets	3766	delete $queue{$widget+0};
3149		3767
3150	my ($w, $h) = $widget->size_request;	3768	my ($w, $h) = $widget->size_request;
3151		3769
3152	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3770	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3153	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3771	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3772
		3773	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3774	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3154		3775
3155	$w = $widget->{force_w} if exists $widget->{force_w};	3776	$w = $widget->{force_w} if exists $widget->{force_w};
3156	$h = $widget->{force_h} if exists $widget->{force_h};	3777	$h = $widget->{force_h} if exists $widget->{force_h};
3157		3778
		3779	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3780	|| delete $widget->{force_realloc}) {
3158	$widget->{req_w} = $w;	3781	$widget->{req_w} = $w;
3159	$widget->{req_h} = $h;	3782	$widget->{req_h} = $h;
3160		3783
3161	$self->{size_alloc}{$widget} = [$widget, undef, undef];	3784	$self->{size_alloc}{$widget+0} = $widget;
3162		3785
3163	push @queue, $widget->{parent}	3786	if (my $parent = $widget->{parent}) {
3164	if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};	3787	$self->{realloc}{$parent+0} = $parent
		3788	unless $queue{$parent+0};
		3789
		3790	$parent->{force_size_alloc} = 1;
		3791	$self->{size_alloc}{$parent+0} = $parent;
		3792	}
		3793	}
		3794
		3795	delete $self->{realloc}{$widget+0};
3165	}	3796	}
3166	}	3797	}
3167		3798
3168	while (my $size_alloc = delete $self->{size_alloc}) {	3799	while (my $size_alloc = delete $self->{size_alloc}) {
3169	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},	3800	my @queue = sort { $b->{visible} <=> $a->{visible} }
3170	values %$size_alloc;	3801	values %$size_alloc;
3171		3802
3172	while () {	3803	while () {
3173	my ($widget, $w, $h) = @{ pop @queue or last };	3804	my $widget = pop @queue || last;
3174		3805
3175	$w = $widget->{w} || $widget->{req_w} unless defined $w;	3806	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176	$h = $widget->{h} || $widget->{req_h} unless defined $h;
3177		3807
3178	$w = 0 if $w < 0;	3808	$w = 0 if $w < 0;
3179	$h = 0 if $h < 0;	3809	$h = 0 if $h < 0;
3180		3810
3181	$w = int $w + 0.5;	3811	$w = int $w + 0.5;
3182	$h = int $h + 0.5;	3812	$h = int $h + 0.5;
3183		3813
3184	my $changed = $widget->{w} != $w || $widget->{h} != $h;	3814	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3815	$widget->{old_w} = $widget->{w};
		3816	$widget->{old_h} = $widget->{h};
3185		3817
3186	$widget->{w} = $w;	3818	$widget->{w} = $w;
3187	$widget->{h} = $h;	3819	$widget->{h} = $h;
3188		3820
3189	$widget->emit (size_allocate => $w, $h, $changed);	3821	$widget->emit (size_allocate => $w, $h);
		3822	}
3190	}	3823	}
3191	}	3824	}
3192		3825
3193	while ($self->{post_alloc_hook}) {	3826	while ($self->{post_alloc_hook}) {
3194	$_->()	3827	$_->()
3195	for values %{delete $self->{post_alloc_hook}};	3828	for values %{delete $self->{post_alloc_hook}};
3196	}	3829	}
		3830
3197		3831
3198	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3832	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3199	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3833	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3200	glClear GL_COLOR_BUFFER_BIT;	3834	glClear GL_COLOR_BUFFER_BIT;
3201		3835
…		…
3203	glLoadIdentity;	3837	glLoadIdentity;
3204	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3838	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3205	glMatrixMode GL_MODELVIEW;	3839	glMatrixMode GL_MODELVIEW;
3206	glLoadIdentity;	3840	glLoadIdentity;
3207		3841
		3842	{
		3843	package CFClient::UI::Base;
		3844
		3845	($draw_x, $draw_y, $draw_w, $draw_h) =
		3846	(0, 0, $self->{w}, $self->{h});
		3847	}
		3848
3208	$self->_draw;	3849	$self->_draw;
3209	}	3850	}
3210		3851
3211	#############################################################################	3852	#############################################################################
3212		3853

Diff Legend

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