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.212 by elmex, Wed May 17 14:55:14 2006 UTC vs.
Revision 1.242 by elmex, Sat May 27 20:00:40 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
		20
		21	sub get_layout {
		22	for (grep { $_->{name} } values %WIDGET) {
		23	$LAYOUT->{$_->{name}} = {
		24	x => $_->{x} / $::WIDTH,
		25	y => $_->{y} / $::HEIGHT,
		26	w => $_->{w} / $::WIDTH,
		27	h => $_->{h} / $::HEIGHT
		28	};
		29	}
		30
		31	return $LAYOUT;
		32	}
		33
		34	sub set_layout {
		35	my ($layout) = @_;
		36	$LAYOUT = $layout;
		37	}
18		38
19	sub check_tooltip {	39	sub check_tooltip {
20	if (!$GRAB) {	40	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
…		…
50	delete $TOOLTIP->{owner};	70	delete $TOOLTIP->{owner};
51	}	71	}
52		72
53	# class methods for events	73	# class methods for events
54	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	75	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	76	if $FOCUS;
57	}	77	}
58		78
59	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	80	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	81	if $FOCUS;
62	}	82	}
63		83
64	sub feed_sdl_button_down_event {	84	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	85	my ($ev) = @_;
…		…
74	check_tooltip;	94	check_tooltip;
75	}	95	}
76		96
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		98
79	if ($GRAB) {	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	100	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	101	}
84		102
85	sub feed_sdl_button_up_event {	103	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	104	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	105	my ($x, $y) = ($ev->{x}, $ev->{y});
88		106
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		108
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		110
93	if ($GRAB) {	111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	112	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		113
98	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	116	$grab->update if $grab;
101	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		134
119	check_tooltip;	135	check_tooltip;
120	}	136	}
121		137
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	139	if $HOVER;
126	}	140	}
127		141
128	# convert position array to integers	142	# convert position array to integers
129	sub harmonize {	143	sub harmonize {
130	my ($vals) = @_;	144	my ($vals) = @_;
…		…
136	$rem += $_ - $i;	150	$rem += $_ - $i;
137	$_ = $i;	151	$_ = $i;
138	}	152	}
139	}	153	}
140		154
		155	sub full_refresh {
		156	# make a copy, otherwise for complains about freed values.
		157	my @widgets = values %WIDGET;
		158
		159	$_->update
		160	for @widgets;
		161	}
		162
		163	sub reconfigure_widgets {
		164	# make a copy, otherwise C<for> complains about freed values.
		165	my @widgets = values %WIDGET;
		166
		167	$_->reconfigure
		168	for @widgets;
		169	}
		170
141	# call when resolution changes etc.	171	# call when resolution changes etc.
142	sub rescale_widgets {	172	sub rescale_widgets {
143	my ($sx, $sy) = @_;	173	my ($sx, $sy) = @_;
144		174
145	for my $widget (values %WIDGET) {	175	for my $widget (values %WIDGET) {
146	if ($widget->{toplevel}) {	176	if ($widget->{is_toplevel}) {
147	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};	180	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	181	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	182	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	183	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	184	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155	}	185	}
156
157	$widget->reconfigure;
158	}	186	}
		187
		188	reconfigure_widgets;
159	}	189	}
160		190
161	#############################################################################	191	#############################################################################
162		192
163	package CFClient::UI::Base;	193	package CFClient::UI::Base;
…		…
183	}	213	}
184	}	214	}
185		215
186	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187		217
		218	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		219	$self->{user_x} = $layout->{x} * $::WIDTH;
		220	$self->{user_y} = $layout->{y} * $::HEIGHT;
		221	$self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		222	$self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		223	}
		224
188	$self	225	$self
189	}	226	}
190		227
191	sub destroy {	228	sub destroy {
192	my ($self) = @_;	229	my ($self) = @_;
…		…
195	%$self = ();	232	%$self = ();
196	}	233	}
197		234
198	sub show {	235	sub show {
199	my ($self) = @_;	236	my ($self) = @_;
200
201	return if $self->{parent};	237	return if $self->{parent};
202		238
203	$CFClient::UI::ROOT->add ($self);	239	$CFClient::UI::ROOT->add ($self);
204	}	240	}
205		241
206	sub hide {	242	sub show_centered {
207	my ($self) = @_;	243	my ($self) = @_;
		244	return if $self->{parent};
		245
		246	$self->show;
		247
		248	$CFClient::UI::ROOT->on_post_alloc (
		249	"centered $self" => sub {
		250	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		251	},
		252	);
		253	}
		254
		255	sub set_invisible {
		256	my ($self) = @_;
		257
		258	# broken show/hide model
		259
		260	delete $self->{root};
		261	delete $self->{visible};
208		262
209	undef $GRAB if $GRAB == $self;	263	undef $GRAB if $GRAB == $self;
210	undef $HOVER if $HOVER == $self;	264	undef $HOVER if $HOVER == $self;
		265
		266	CFClient::UI::check_tooltip
		267	if $CFClient::UI::TOOLTIP->{owner} == $self;
		268
		269	$self->focus_out;
		270	}
		271
		272	sub hide {
		273	my ($self) = @_;
		274
		275	$self->set_invisible;
211		276
212	$self->{parent}->remove ($self)	277	$self->{parent}->remove ($self)
213	if $self->{parent};	278	if $self->{parent};
214	}	279	}
215		280
…		…
285	}	350	}
286		351
287	sub set_tooltip {	352	sub set_tooltip {
288	my ($self, $tooltip) = @_;	353	my ($self, $tooltip) = @_;
289		354
		355	$tooltip =~ s/^\s+//;
		356	$tooltip =~ s/\s+$//;
		357
		358	return if $self->{tooltip} eq $tooltip;
		359
290	$self->{tooltip} = $tooltip;	360	$self->{tooltip} = $tooltip;
291		361
292	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	362	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293	delete $CFClient::UI::TOOLTIP->{owner};	363	delete $CFClient::UI::TOOLTIP->{owner};
294	CFClient::UI::check_tooltip;	364	CFClient::UI::check_tooltip;
…		…
315	return if $FOCUS == $self;	385	return if $FOCUS == $self;
316	return unless $self->{can_focus};	386	return unless $self->{can_focus};
317		387
318	my $focus = $FOCUS; $FOCUS = $self;	388	my $focus = $FOCUS; $FOCUS = $self;
319		389
320	$self->emit (focus_in => $focus);	390	$self->_emit (focus_in => $focus);
321		391
322	$focus->update if $focus;	392	$focus->update if $focus;
323	$FOCUS->update;	393	$FOCUS->update;
324	}	394	}
325		395
…		…
328		398
329	return unless $FOCUS == $self;	399	return unless $FOCUS == $self;
330		400
331	my $focus = $FOCUS; undef $FOCUS;	401	my $focus = $FOCUS; undef $FOCUS;
332		402
333	$self->emit (focus_out => $focus);	403	$self->_emit (focus_out => $focus);
334		404
335	$focus->update if $focus; #?	405	$focus->update if $focus; #?
		406
		407	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		408	unless $FOCUS;
336	}	409	}
337		410
338	sub mouse_motion { }	411	sub mouse_motion { }
339	sub button_up { }	412	sub button_up { }
340	sub key_down { }	413	sub key_down { }
341	sub key_up { }	414	sub key_up { }
342		415
343	sub button_down {	416	sub button_down {
344	my ($self, $ev, $x, $y) = @_;	417	my ($self, $ev, $x, $y) = @_;
345		418
346	$self->focus_in;	419	$self->focus_in;
…		…
380	if ($ENV{PCLIENT_DEBUG}) {	453	if ($ENV{PCLIENT_DEBUG}) {
381	glPushMatrix;	454	glPushMatrix;
382	glColor 1, 1, 0, 1;	455	glColor 1, 1, 0, 1;
383	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	456	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
384	glBegin GL_LINE_LOOP;	457	glBegin GL_LINE_LOOP;
385	glVertex 0 , 0;	458	glVertex 0 , 0;
386	glVertex $self->{w}, 0;	459	glVertex $self->{w} - 1, 0;
387	glVertex $self->{w}, $self->{h};	460	glVertex $self->{w} - 1, $self->{h} - 1;
388	glVertex 0 , $self->{h};	461	glVertex 0 , $self->{h} - 1;
389	glEnd;	462	glEnd;
390	glPopMatrix;	463	glPopMatrix;
391	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	464	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
392	}	465	}
393	}	466	}
…		…
413	sub set_parent {	486	sub set_parent {
414	my ($self, $parent) = @_;	487	my ($self, $parent) = @_;
415		488
416	Scalar::Util::weaken ($self->{parent} = $parent);	489	Scalar::Util::weaken ($self->{parent} = $parent);
417		490
		491	$self->{root} = $parent->{root};
		492	$self->{visible} = $parent->{visible} + 1;
		493
418	# TODO: req_w _does_change after ->reconfigure	494	# TODO: req_w _does_change after ->reconfigure
419	$self->check_size	495	$self->check_size
420	unless exists $self->{req_w};	496	unless exists $self->{req_w};
		497
		498	$self->show;
421	}	499	}
422		500
423	sub check_size {	501	sub check_size {
424	my ($self, $forced) = @_;	502	my ($self, $forced) = @_;
425		503
…		…
438	my ($self, $signal, $cb) = @_;	516	my ($self, $signal, $cb) = @_;
439		517
440	push @{ $self->{signal_cb}{$signal} }, $cb;	518	push @{ $self->{signal_cb}{$signal} }, $cb;
441	}	519	}
442		520
		521	sub _emit {
		522	my ($self, $signal, @args) = @_;
		523
		524	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		525	}
		526
443	sub emit {	527	sub emit {
444	my ($self, $signal, @args) = @_;	528	my ($self, $signal, @args) = @_;
445		529
446	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	530	$self->_emit ($signal, @args)
		531	|| $self->$signal (@args);
447	}	532	}
448		533
449	sub DESTROY {	534	sub DESTROY {
450	my ($self) = @_;	535	my ($self) = @_;
451		536
…		…
564	delete $child->{parent};	649	delete $child->{parent};
565	$child->hide;	650	$child->hide;
566		651
567	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	652	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
568		653
569	$self->check_size;	654	$self->check_size (1);
570	$self->update;	655	$self->update;
571	}	656	}
572		657
573	sub clear {	658	sub clear {
574	my ($self) = @_;	659	my ($self) = @_;
…		…
688	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	773	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
689	glClearColor 0, 0, 0, 0;	774	glClearColor 0, 0, 0, 0;
690	glClear GL_COLOR_BUFFER_BIT;	775	glClear GL_COLOR_BUFFER_BIT;
691		776
692	$self->_render;	777	$self->_render;
693	# glColorMask 1, 1, 1, 0;
694	# glEnable GL_BLEND;
695	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
696	# glRasterPos 0, 0;
697	# glCopyPixels 0, 0, $self->{w}, $self->{h};
698	# glDisable GL_BLEND;
699	# glColorMask 1, 1, 1, 1;
700	};	778	};
701	}	779	}
702		780
703	sub _draw {	781	sub _draw {
704	my ($self) = @_;	782	my ($self) = @_;
…		…
708	my $tex = $self->{texture}	786	my $tex = $self->{texture}
709	or return;	787	or return;
710		788
711	glEnable GL_TEXTURE_2D;	789	glEnable GL_TEXTURE_2D;
712	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	790	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
713	glColor 0, 0, 0, 1;	791	glColor 1, 1, 1, 1;
714		792
715	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	793	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
716		794
717	glDisable GL_TEXTURE_2D;	795	glDisable GL_TEXTURE_2D;
718	}	796	}
…		…
721		799
722	package CFClient::UI::ViewPort;	800	package CFClient::UI::ViewPort;
723		801
724	our @ISA = CFClient::UI::Window::;	802	our @ISA = CFClient::UI::Window::;
725		803
		804	sub new {
		805	my $class = shift;
		806
		807	$class->SUPER::new (
		808	scroll_x => 0,
		809	scroll_y => 1,
		810	@_,
		811	)
		812	}
		813
726	sub size_request {	814	sub size_request {
727	my ($self) = @_;	815	my ($self) = @_;
728		816
729	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	817	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
730	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
731		818
732	@$self{qw(child_w child_h)}	819	@$self{qw(child_w child_h)}
733	}	820	}
734		821
735	sub size_allocate {	822	sub size_allocate {
736	my ($self, $w, $h) = @_;	823	my ($self, $w, $h) = @_;
737		824
		825	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		826	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		827
		828	$self->child->configure (0, 0, $w, $h);
738	$self->update;	829	$self->update;
739	}	830	}
740		831
741	sub set_offset {	832	sub set_offset {
742	my ($self, $x, $y) = @_;	833	my ($self, $x, $y) = @_;
…		…
796		887
797	my $slider = new CFClient::UI::Slider	888	my $slider = new CFClient::UI::Slider
798	vertical => 1,	889	vertical => 1,
799	range => [0, 0, 1, 0.01], # HACK fix	890	range => [0, 0, 1, 0.01], # HACK fix
800	connect_changed => sub {	891	connect_changed => sub {
801	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	892	$self->{vp}->set_offset (0, $_[1]);
802	},	893	},
803	;	894	;
804		895
805	$self = $class->SUPER::new (	896	$self = $class->SUPER::new (
806	vp => (new CFClient::UI::ViewPort),	897	vp => (new CFClient::UI::ViewPort expand => 1),
807	slider => $slider,	898	slider => $slider,
808	@_,	899	@_,
809	);	900	);
810		901
811	$self->{vp}->add ($self->{scrolled});	902	$self->{vp}->add ($self->{scrolled});
812	$self->add ($self->{vp});	903	$self->add ($self->{vp});
813	$self->add ($self->{slider});	904	$self->add ($self->{slider});
814		905
815	$self	906	$self
		907	}
		908
		909	sub update {
		910	my ($self) = @_;
		911
		912	$self->SUPER::update;
		913
		914	# todo: overwrite size_allocate of child
		915	my $child = $self->{vp}->child;
		916	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		917	}
		918
		919	sub size_allocate {
		920	my ($self, $w, $h) = @_;
		921
		922	$self->SUPER::size_allocate ($w, $h);
		923
		924	my $child = $self->{vp}->child;
		925	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
816	}	926	}
817		927
818	#TODO# update range on size_allocate depending on child	928	#TODO# update range on size_allocate depending on child
819	# update viewport offset on scroll	929	# update viewport offset on scroll
820		930
…		…
874	my $class = shift;	984	my $class = shift;
875		985
876	# TODO: user_x, user_y, overwrite moveto?	986	# TODO: user_x, user_y, overwrite moveto?
877		987
878	my $self = $class->SUPER::new (	988	my $self = $class->SUPER::new (
879	bg => [1, 1, 1, 1],	989	bg => [1, 1, 1, 1],
880	border_bg => [1, 1, 1, 1],	990	border_bg => [1, 1, 1, 1],
881	border => 0.6,	991	border => 0.6,
882	toplevel => 1,	992	is_toplevel => 1,
883	can_events => 1,	993	can_events => 1,
884	@_	994	@_
885	);	995	);
886		996
887	$self->{title} &&= new CFClient::UI::Label	997	$self->{title} &&= new CFClient::UI::Label
888	align => 0,	998	align => 0,
…		…
1028	sub new {	1138	sub new {
1029	my $class = shift;	1139	my $class = shift;
1030		1140
1031	$class->SUPER::new (	1141	$class->SUPER::new (
1032	col_expand => [],	1142	col_expand => [],
1033	@_	1143	@_,
1034	)	1144	)
		1145	}
		1146
		1147	sub children {
		1148	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1035	}	1149	}
1036		1150
1037	sub add {	1151	sub add {
1038	my ($self, $x, $y, $child) = @_;	1152	my ($self, $x, $y, $child) = @_;
1039		1153
1040	$child->set_parent ($self);	1154	$child->set_parent ($self);
1041	$self->{children}[$y][$x] = $child;	1155	$self->{children}[$y][$x] = $child;
1042		1156
1043	$child->check_size;	1157	$self->check_size (1);
1044	}	1158	}
1045		1159
1046	sub children {
1047	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048	}
1049
1050	# TODO: move to container class maybe? send childs a signal on removal?	1160	# TODO: move to container class maybe? send children a signal on removal?
1051	sub clear {	1161	sub clear {
1052	my ($self) = @_;	1162	my ($self) = @_;
1053		1163
1054	my @children = $self->children;	1164	my @children = $self->children;
1055	delete $self->{children};	1165	delete $self->{children};
…		…
1057	for (@children) {	1167	for (@children) {
1058	delete $_->{parent};	1168	delete $_->{parent};
1059	$_->hide;	1169	$_->hide;
1060	}	1170	}
1061		1171
		1172	$self->check_size (1);
1062	$self->update;	1173	$self->update;
1063	}	1174	}
1064		1175
1065	sub get_wh {	1176	sub get_wh {
1066	my ($self) = @_;	1177	my ($self) = @_;
…		…
1098	sub size_allocate {	1209	sub size_allocate {
1099	my ($self, $w, $h) = @_;	1210	my ($self, $w, $h) = @_;
1100		1211
1101	my ($ws, $hs) = $self->get_wh;	1212	my ($ws, $hs) = $self->get_wh;
1102		1213
1103	my $req_w = sum @$ws;	1214	my $req_w = (sum @$ws) || 1;
1104	my $req_h = sum @$hs;	1215	my $req_h = (sum @$hs) || 1;
1105		1216
1106	# TODO: nicer code && do row_expand	1217	# TODO: nicer code && do row_expand
1107	my @col_expand = @{$self->{col_expand}};	1218	my @col_expand = @{$self->{col_expand}};
1108	@col_expand = (1) x @$ws unless @col_expand;	1219	@col_expand = (1) x @$ws unless @col_expand;
1109	my $col_expand = (sum @col_expand) || 1;	1220	my $col_expand = (sum @col_expand) || 1;
…		…
1297	#bg => none	1408	#bg => none
1298	#active_bg => none	1409	#active_bg => none
1299	#font => default_font	1410	#font => default_font
1300	#text => initial text	1411	#text => initial text
1301	#markup => initial narkup	1412	#markup => initial narkup
		1413	#max_w => maximum pixel width
		1414	ellipsise => 3, # end
1302	layout => (new CFClient::Layout),	1415	layout => (new CFClient::Layout),
1303	fontsize => 1,	1416	fontsize => 1,
1304	align => -1,	1417	align => -1,
1305	valign => -1,	1418	valign => -1,
1306	padding => 2,	1419	padding => 2,
…		…
1371	sub size_request {	1484	sub size_request {
1372	my ($self) = @_;	1485	my ($self) = @_;
1373		1486
1374	$self->{layout}->set_font ($self->{font}) if $self->{font};	1487	$self->{layout}->set_font ($self->{font}) if $self->{font};
1375	$self->{layout}->set_width ($self->{max_w} || -1);	1488	$self->{layout}->set_width ($self->{max_w} || -1);
		1489	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1490	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1491	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377		1492
1378	my ($w, $h) = $self->{layout}->size;	1493	my ($w, $h) = $self->{layout}->size;
1379		1494
1380	if (exists $self->{template}) {	1495	if (exists $self->{template}) {
…		…
1416		1531
1417	my $tex = $self->{texture} ||= do {	1532	my $tex = $self->{texture} ||= do {
1418	$self->{layout}->set_foreground (@{$self->{fg}});	1533	$self->{layout}->set_foreground (@{$self->{fg}});
1419	$self->{layout}->set_font ($self->{font}) if $self->{font};	1534	$self->{layout}->set_font ($self->{font}) if $self->{font};
1420	$self->{layout}->set_width ($self->{w});	1535	$self->{layout}->set_width ($self->{w});
		1536	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1537	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1538	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422		1539
1423	my $tex = new_from_layout CFClient::Texture $self->{layout};	1540	my $tex = new_from_layout CFClient::Texture $self->{layout};
1424		1541
1425	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1542	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1426	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1543	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
…		…
1464	active_fg => [0, 0, 0],	1581	active_fg => [0, 0, 0],
1465	can_hover => 1,	1582	can_hover => 1,
1466	can_focus => 1,	1583	can_focus => 1,
1467	valign => 0,	1584	valign => 0,
1468	can_events => 1,	1585	can_events => 1,
		1586	#text => ...
1469	@_	1587	@_
1470	)	1588	)
1471	}	1589	}
1472		1590
1473	sub _set_text {	1591	sub _set_text {
…		…
1483	$self->{text} = $text;	1601	$self->{text} = $text;
1484		1602
1485	$text =~ s/./*/g if $self->{hidden};	1603	$text =~ s/./*/g if $self->{hidden};
1486	$self->{layout}->set_text ("$text ");	1604	$self->{layout}->set_text ("$text ");
1487		1605
1488	$self->emit (changed => $self->{text});	1606	$self->_emit (changed => $self->{text});
1489	}	1607	}
1490		1608
1491	sub set_text {	1609	sub set_text {
1492	my ($self, $text) = @_;	1610	my ($self, $text) = @_;
1493		1611
…		…
1505	my ($self) = @_;	1623	my ($self) = @_;
1506		1624
1507	my ($w, $h) = $self->SUPER::size_request;	1625	my ($w, $h) = $self->SUPER::size_request;
1508		1626
1509	($w + 1, $h) # add 1 for cursor	1627	($w + 1, $h) # add 1 for cursor
1510	}
1511
1512	sub size_allocate {
1513	my ($self, $w, $h) = @_;
1514
1515	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1516	}	1628	}
1517		1629
1518	sub key_down {	1630	sub key_down {
1519	my ($self, $ev) = @_;	1631	my ($self, $ev) = @_;
1520		1632
…		…
1535	} elsif ($sym == CFClient::SDLK_HOME) {	1647	} elsif ($sym == CFClient::SDLK_HOME) {
1536	$self->{cursor} = 0;	1648	$self->{cursor} = 0;
1537	} elsif ($sym == CFClient::SDLK_END) {	1649	} elsif ($sym == CFClient::SDLK_END) {
1538	$self->{cursor} = length $text;	1650	$self->{cursor} = length $text;
1539	} elsif ($uni == 27) {	1651	} elsif ($uni == 27) {
1540	$self->emit ('escape');	1652	$self->_emit ('escape');
1541	} elsif ($uni) {	1653	} elsif ($uni) {
1542	substr $text, $self->{cursor}++, 0, chr $uni;	1654	substr $text, $self->{cursor}++, 0, chr $uni;
1543	}	1655	}
1544		1656
1545	$self->_set_text ($text);	1657	$self->_set_text ($text);
…		…
1632	if ($sym == 13) {	1744	if ($sym == 13) {
1633	unshift @{$self->{history}},	1745	unshift @{$self->{history}},
1634	my $txt = $self->get_text;	1746	my $txt = $self->get_text;
1635	$self->{history_pointer} = -1;	1747	$self->{history_pointer} = -1;
1636	$self->{history_saveback} = '';	1748	$self->{history_saveback} = '';
1637	$self->emit (activate => $txt);	1749	$self->_emit (activate => $txt);
1638	$self->update;	1750	$self->update;
1639		1751
1640	} elsif ($sym == CFClient::SDLK_UP) {	1752	} elsif ($sym == CFClient::SDLK_UP) {
1641	if ($self->{history_pointer} < 0) {	1753	if ($self->{history_pointer} < 0) {
1642	$self->{history_saveback} = $self->get_text;	1754	$self->{history_saveback} = $self->get_text;
…		…
1690	can_events => 1,	1802	can_events => 1,
1691	@_	1803	@_
1692	)	1804	)
1693	}	1805	}
1694		1806
		1807	sub activate { }
		1808
1695	sub button_up {	1809	sub button_up {
1696	my ($self, $ev, $x, $y) = @_;	1810	my ($self, $ev, $x, $y) = @_;
1697		1811
		1812	$self->emit ("activate")
1698	if ($x >= 0 && $x < $self->{w}	1813	if $x >= 0 && $x < $self->{w}
1699	&& $y >= 0 && $y < $self->{h}) {	1814	&& $y >= 0 && $y < $self->{h};
1700	$self->emit ("activate");
1701	}
1702	}	1815	}
1703		1816
1704	sub _draw {	1817	sub _draw {
1705	my ($self) = @_;	1818	my ($self) = @_;
1706		1819
…		…
1758	my ($self, $ev, $x, $y) = @_;	1871	my ($self, $ev, $x, $y) = @_;
1759		1872
1760	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1873	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1761	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1874	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1762	$self->{state} = !$self->{state};	1875	$self->{state} = !$self->{state};
1763	$self->emit (changed => $self->{state});	1876	$self->_emit (changed => $self->{state});
1764	}	1877	}
1765	}	1878	}
1766		1879
1767	sub _draw {	1880	sub _draw {
1768	my ($self) = @_;	1881	my ($self) = @_;
…		…
2043	my $self = $class->SUPER::new (	2156	my $self = $class->SUPER::new (
2044	fg => [1, 1, 1],	2157	fg => [1, 1, 1],
2045	active_fg => [0, 0, 0],	2158	active_fg => [0, 0, 0],
2046	bg => [0, 0, 0, 0.2],	2159	bg => [0, 0, 0, 0.2],
2047	active_bg => [1, 1, 1, 0.5],	2160	active_bg => [1, 1, 1, 0.5],
2048	range => [0, 0, 100, 10],	2161	range => [0, 0, 100, 10, 0],
2049	req_w => $::WIDTH / 80,	2162	req_w => $::WIDTH / 80,
2050	req_h => $::WIDTH / 80,	2163	req_h => $::WIDTH / 80,
2051	vertical => 0,	2164	vertical => 0,
2052	can_hover => 1,	2165	can_hover => 1,
2053	inner_pad => .05,	2166	inner_pad => 0.02,
2054	@_	2167	@_
2055	);	2168	);
2056		2169
2057	$self->set_value ($self->{range}[0]);	2170	$self->set_value ($self->{range}[0]);
2058	$self->update;	2171	$self->update;
2059		2172
2060	$self	2173	$self
2061	}	2174	}
2062		2175
		2176	sub set_range {
		2177	my ($self, $range) = @_;
		2178
		2179	($range, $self->{range}) = ($self->{range}, $range);
		2180
		2181	$self->update
		2182	if "@$range" ne "@{$self->{range}}";
		2183	}
		2184
2063	sub set_value {	2185	sub set_value {
2064	my ($self, $value) = @_;	2186	my ($self, $value) = @_;
2065		2187
2066	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2188	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067		2189
2068	$hi = $lo + 1 if $hi <= $lo;	2190	$hi = $lo + 1 if $hi <= $lo;
2069		2191
		2192	$page = $hi - $lo if $page > $hi - $lo;
		2193
2070	$value = $lo if $value < $lo;	2194	$value = $lo if $value < $lo;
2071	$value = $hi if $value > $hi;	2195	$value = $hi - $page if $value > $hi - $page;
2072		2196
2073	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2197	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074	if $unit;	2198	if $unit;
2075		2199
2076	$page = $hi - $lo if $page > $hi - $lo;
2077
2078	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2200	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079		2201
2080	if ($value != $old_value) {	2202	if ($value != $old_value) {
2081	$self->emit (changed => $value);	2203	$self->_emit (changed => $value);
2082	$self->update;	2204	$self->update;
2083	}	2205	}
2084	}	2206	}
2085		2207
2086	sub size_request {	2208	sub size_request {
…		…
2094		2216
2095	sub button_down {	2217	sub button_down {
2096	my ($self, $ev, $x, $y) = @_;	2218	my ($self, $ev, $x, $y) = @_;
2097		2219
2098	$self->SUPER::button_down ($ev, $x, $y);	2220	$self->SUPER::button_down ($ev, $x, $y);
		2221
		2222	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2223
2099	$self->mouse_motion ($ev, $x, $y);	2224	$self->mouse_motion ($ev, $x, $y);
2100	}	2225	}
2101		2226
2102	sub mouse_motion {	2227	sub mouse_motion {
2103	my ($self, $ev, $x, $y) = @_;	2228	my ($self, $ev, $x, $y) = @_;
…		…
2105	if ($GRAB == $self) {	2230	if ($GRAB == $self) {
2106	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2231	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107		2232
2108	my (undef, $lo, $hi, $page) = @{$self->{range}};	2233	my (undef, $lo, $hi, $page) = @{$self->{range}};
2109		2234
2110	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2235	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111		2236
2112	$self->set_value ($x * ($hi - $lo) + $lo);	2237	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2113	}	2238	}
2114	}	2239	}
2115		2240
2116	sub update {	2241	sub update {
2117	my ($self) = @_;	2242	my ($self) = @_;
2118		2243
2119	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2244	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120	$self->set_value ($self->{range}[0]);	2245	$self->set_value ($self->{range}[0]);
2121		2246
2122	my ($value, $lo, $hi, $page) = @{$self->{range}};	2247	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2248	my $range = ($hi - $page - $lo) || 1e-100;
2123		2249
2124	my $inner_w = 1 - 2 * $self->{inner_pad};	2250	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125		2251
2126	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2252	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2253	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127		2254
2128	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2255	$value = ($value - $lo) / $range;
2129	$value = $self->{scale} * ($value - $lo);	2256	$value = $value * $self->{scale} + $self->{offset};
2130		2257
2131	$value = $self->{inner_pad} + ($value - $page * 0.5);
2132
2133	$value = 0 if $value < 0;
2134	$page = 1 - $value if $value + $page > 1;
2135
2136	$self->{knob_x} = $value;	2258	$self->{knob_x} = $value - $knob_w * 0.5;
2137	$self->{knob_w} = $page;	2259	$self->{knob_w} = $knob_w;
2138	});	2260	});
2139		2261
2140	$self->SUPER::update;	2262	$self->SUPER::update;
2141	}	2263	}
2142		2264
…		…
2148	glScale $self->{w}, $self->{h};	2270	glScale $self->{w}, $self->{h};
2149		2271
2150	if ($self->{vertical}) {	2272	if ($self->{vertical}) {
2151	# draw a vertical slider like a rotated horizontal slider	2273	# draw a vertical slider like a rotated horizontal slider
2152		2274
		2275	glTranslate 1, 0, 0;
2153	glRotate 90, 0, 0, 1;	2276	glRotate 90, 0, 0, 1;
2154	glTranslate 0, 1, 0;
2155	}	2277	}
2156		2278
2157	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2279	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2280	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159		2281
…		…
2166	# draw handle	2288	# draw handle
2167	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2289	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168		2290
2169	glDisable GL_TEXTURE_2D;	2291	glDisable GL_TEXTURE_2D;
2170	}	2292	}
		2293
		2294	#############################################################################
		2295
		2296	package CFClient::UI::ValSlider;
		2297
		2298	our @ISA = CFClient::UI::HBox::;
		2299
		2300	sub new {
		2301	my ($class, %arg) = @_;
		2302
		2303	my $range = delete $arg{range};
		2304
		2305	my $self = $class->SUPER::new (
		2306	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2307	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2308	to_value => sub { shift },
		2309	from_value => sub { shift },
		2310	%arg,
		2311	);
		2312
		2313	$self->{slider}->connect (changed => sub {
		2314	my ($self, $value) = @_;
		2315	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2316	$self->{parent}->emit (changed => $value);
		2317	});
		2318
		2319	# $self->{entry}->connect (changed => sub {
		2320	# my ($self, $value) = @_;
		2321	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2322	# $self->{parent}->emit (changed => $value);
		2323	# });
		2324
		2325	$self->add ($self->{slider}, $self->{entry});
		2326
		2327	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2328
		2329	$self
		2330	}
		2331
		2332	sub set_range { shift->{slider}->set_range (@_) }
		2333	sub set_value { shift->{slider}->set_value (@_) }
2171		2334
2172	#############################################################################	2335	#############################################################################
2173		2336
2174	package CFClient::UI::TextView;	2337	package CFClient::UI::TextView;
2175		2338
…		…
2205		2368
2206	$self->{fontsize} = $fontsize;	2369	$self->{fontsize} = $fontsize;
2207	$self->reflow;	2370	$self->reflow;
2208	}	2371	}
2209		2372
2210	sub text_height {
2211	my ($self, $text) = @_;
2212
2213	my $layout = $self->{layout};
2214
2215	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2216	$layout->set_width ($self->{children}[0]{w});
2217	$layout->set_markup ($text);
2218
2219	($layout->size)[1]
2220	}
2221
2222	sub reflow {
2223	my ($self) = @_;
2224
2225	$self->{need_reflow}++;
2226	$self->update;
2227	}
2228
2229	sub size_allocate {	2373	sub size_allocate {
2230	my ($self, $w, $h) = @_;	2374	my ($self, $w, $h) = @_;
2231		2375
2232	$self->SUPER::size_allocate ($w, $h);	2376	$self->SUPER::size_allocate ($w, $h);
2233		2377
…		…
2236	$self->{layout}->set_width ($self->{children}[0]{w});	2380	$self->{layout}->set_width ($self->{children}[0]{w});
2237		2381
2238	$self->reflow;	2382	$self->reflow;
2239	}	2383	}
2240		2384
		2385	sub text_size {
		2386	my ($self, $text, $indent) = @_;
		2387
		2388	my $layout = $self->{layout};
		2389
		2390	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2391	$layout->set_width ($self->{children}[0]{w} - $indent);
		2392	$layout->set_markup ($text);
		2393
		2394	$layout->size
		2395	}
		2396
		2397	sub reflow {
		2398	my ($self) = @_;
		2399
		2400	$self->{need_reflow}++;
		2401	$self->update;
		2402	}
		2403
		2404	sub set_offset {
		2405	my ($self, $offset) = @_;
		2406
		2407	# todo: base offset on lines or so, not on pixels
		2408	$self->{children}[1]->set_value ($offset);
		2409	}
		2410
		2411	sub clear {
		2412	my ($self) = @_;
		2413
		2414	$self->{par} = [];
		2415	$self->{height} = 0;
		2416	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2417	}
		2418
2241	sub add_paragraph {	2419	sub add_paragraph {
2242	my ($self, $color, $text) = @_;	2420	my ($self, $color, $text, $indent) = @_;
2243		2421
2244	#TODO: intelligently "reformat" paragraph	2422	for my $line (split /\n/, $text) {
2245		2423	my ($w, $h) = $self->text_size ($line);
2246	my $height = $self->text_height ($text);
2247
2248	$self->{height} += $height;	2424	$self->{height} += $h;
		2425	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2426	}
2249		2427
2250	push @{$self->{par}}, [$height, $color, $text];
2251
2252	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2428	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2253	$self->{children}[1]->update;
2254	}	2429	}
2255		2430
2256	sub update {	2431	sub update {
2257	my ($self) = @_;	2432	my ($self) = @_;
2258		2433
…		…
2261	return unless $self->{h} > 0;	2436	return unless $self->{h} > 0;
2262		2437
2263	delete $self->{texture};	2438	delete $self->{texture};
2264		2439
2265	$ROOT->on_post_alloc ($self, sub {	2440	$ROOT->on_post_alloc ($self, sub {
		2441	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2442
2266	if (delete $self->{need_reflow}) {	2443	if (delete $self->{need_reflow}) {
2267	my $height = 0;	2444	my $height = 0;
2268		2445
2269	$height += $_->[0] = $self->text_height ($_->[2])	2446	my $layout = $self->{layout};
		2447
		2448	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2449
2270	for @{$self->{par}};	2450	for (@{$self->{par}}) {
		2451	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2452	$layout->set_width ($W - $_->[3]);
		2453	$layout->set_markup ($_->[4]);
		2454	my ($w, $h) = $layout->size;
		2455	$_->[0] = $w + $_->[3];
		2456	$_->[1] = $h;
		2457	}
		2458
		2459	$height += $_->[1];
		2460	}
2271		2461
2272	$self->{height} = $height;	2462	$self->{height} = $height;
2273		2463
2274	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2464	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275		2465
2276	delete $self->{texture};	2466	delete $self->{texture};
2277	}	2467	}
2278		2468
2279	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2469	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2280	glClearColor 0, 0, 0, 0;	2470	glClearColor 0.5, 0.5, 0.5, 0;
2281	glClear GL_COLOR_BUFFER_BIT;	2471	glClear GL_COLOR_BUFFER_BIT;
2282		2472
2283	glEnable GL_TEXTURE_2D;
2284	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2285
2286	my $top = int $self->{children}[1]{range}[0];	2473	my $top = int $self->{children}[1]{range}[0];
2287		2474
2288	my $y0 = $top;	2475	my $y0 = $top;
2289	my $y1 = $top + $self->{h};	2476	my $y1 = $top + $H;
2290		2477
2291	my $y = 0;	2478	my $y = 0;
2292		2479
2293	my $layout = $self->{layout};	2480	my $layout = $self->{layout};
2294		2481
2295	$layout->set_font ($self->{font}) if $self->{font};	2482	$layout->set_font ($self->{font}) if $self->{font};
2296		2483
		2484	glEnable GL_BLEND;
		2485	#TODO# not correct in windows where rgba is forced off
		2486	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2487
2297	for my $par (@{$self->{par}}) {	2488	for my $par (@{$self->{par}}) {
2298	my $h = $par->[0];	2489	my $h = $par->[1];
2299		2490
2300	if ($y0 < $y + $h && $y < $y1) {	2491	if ($y0 < $y + $h && $y < $y1) {
2301	$layout->set_foreground (@{ $par->[1] });	2492	$layout->set_foreground (@{ $par->[2] });
		2493	$layout->set_width ($W - $par->[3]);
2302	$layout->set_markup ($par->[2]);	2494	$layout->set_markup ($par->[4]);
2303		2495
2304	my ($W, $H) = $layout->size;	2496	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2497
		2498	glRasterPos $par->[3], $y - $y0;
		2499	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2306	}	2500	}
2307		2501
2308	$y += $h;	2502	$y += $h;
2309	}	2503	}
2310		2504
2311	glDisable GL_TEXTURE_2D;	2505	glDisable GL_BLEND;
2312	};	2506	};
2313	});	2507	});
2314	}	2508	}
2315		2509
2316	sub _draw {	2510	sub _draw {
2317	my ($self) = @_;	2511	my ($self) = @_;
2318		2512
2319	glEnable GL_TEXTURE_2D;	2513	glEnable GL_TEXTURE_2D;
2320	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2514	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321	glColor 1, 1, 1, 1;	2515	glColor 1, 1, 1, 1;
2322	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2516	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2323	glDisable GL_TEXTURE_2D;	2517	glDisable GL_TEXTURE_2D;
2324		2518
2325	$self->{children}[1]->draw;	2519	$self->{children}[1]->draw;
2326		2520
2327	}	2521	}
…		…
2396		2590
2397	# TODO: use animation	2591	# TODO: use animation
2398	if ($self->{state} = !$self->{state}) {	2592	if ($self->{state} = !$self->{state}) {
2399	$CFClient::UI::ROOT->add ($self->{other});	2593	$CFClient::UI::ROOT->add ($self->{other});
2400	$self->{other}->move ($self->coord2global (0, $self->{h}));	2594	$self->{other}->move ($self->coord2global (0, $self->{h}));
2401	$self->emit ("open");	2595	$self->_emit ("open");
2402	} else {	2596	} else {
2403	$CFClient::UI::ROOT->remove ($self->{other});	2597	$CFClient::UI::ROOT->remove ($self->{other});
2404	$self->emit ("close");	2598	$self->_emit ("close");
2405	}	2599	}
2406		2600
2407	$self->emit (changed => $self->{state});	2601	$self->_emit (changed => $self->{state});
2408	}	2602	}
2409		2603
2410	#############################################################################	2604	#############################################################################
2411		2605
2412	package CFClient::UI::Tooltip;	2606	package CFClient::UI::Tooltip;
…		…
2426		2620
2427	sub set_tooltip_from {	2621	sub set_tooltip_from {
2428	my ($self, $widget) = @_;	2622	my ($self, $widget) = @_;
2429		2623
2430	$self->add (new CFClient::UI::Label	2624	$self->add (new CFClient::UI::Label
2431	markup => $widget->{tooltip},	2625	markup => $widget->{tooltip},
2432	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2626	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433	fontsize => 0.8,	2627	fontsize => 0.8,
2434	fg => [0, 0, 0, 1],	2628	fg => [0, 0, 0, 1],
		2629	ellipsise => 0,
2435	font => ($widget->{tooltip_font} || $::FONT_PROP),	2630	font => ($widget->{tooltip_font} || $::FONT_PROP),
2436	);	2631	);
2437	}	2632	}
2438		2633
2439	sub size_request {	2634	sub size_request {
2440	my ($self) = @_;	2635	my ($self) = @_;
…		…
2486	use CFClient::OpenGL;	2681	use CFClient::OpenGL;
2487		2682
2488	sub new {	2683	sub new {
2489	my $class = shift;	2684	my $class = shift;
2490		2685
2491	$class->SUPER::new (	2686	my $self = $class->SUPER::new (
2492	aspect => 1,	2687	aspect => 1,
		2688	can_events => 0,
2493	@_,	2689	@_,
2494	)	2690	);
		2691
		2692	if ($self->{anim} && $self->{animspeed}) {
		2693	Scalar::Util::weaken (my $widget = $self);
		2694
		2695	$self->{timer} = Event->timer (
		2696	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2697	hard => 1,
		2698	interval => $self->{animspeed},
		2699	cb => sub {
		2700	++$widget->{frame};
		2701	$widget->update;
		2702	},
		2703	);
		2704	}
		2705
		2706	$self
2495	}	2707	}
2496		2708
2497	sub size_request {	2709	sub size_request {
2498	(32, 8)	2710	(32, 8)
2499	}	2711	}
2500		2712
		2713	sub update {
		2714	my ($self) = @_;
		2715
		2716	return unless $self->{visible};
		2717
		2718	$self->SUPER::update;
		2719	}
		2720
2501	sub _draw {	2721	sub _draw {
2502	my ($self) = @_;	2722	my ($self) = @_;
2503		2723
2504	return unless $::CONN;#d# manage and cache textures differently	2724	return unless $::CONN;
		2725
		2726	my $face;
		2727
		2728	if ($self->{frame}) {
		2729	my $anim = $::CONN->{anim}[$self->{anim}];
		2730
		2731	$face = $anim->[ $self->{frame} % @$anim ]
		2732	if $anim && @$anim;
		2733	}
		2734
2505	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2735	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506		2736
2507	# TODO animation
2508	if ($tex) {	2737	if ($tex) {
2509	glEnable GL_TEXTURE_2D;	2738	glEnable GL_TEXTURE_2D;
2510	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2739	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511	glColor 1, 1, 1, 1;	2740	glColor 1, 1, 1, 1;
2512	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2741	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513	glDisable GL_TEXTURE_2D;	2742	glDisable GL_TEXTURE_2D;
2514	}	2743	}
2515	}	2744	}
2516		2745
		2746	sub DESTROY {
		2747	my ($self) = @_;
		2748
		2749	$self->{timer}->cancel
		2750	if $self->{timer};
		2751
		2752	$self->SUPER::DESTROY;
		2753	}
		2754
2517	#############################################################################	2755	#############################################################################
2518		2756
2519	package CFClient::UI::InventoryItem;	2757	package CFClient::UI::Inventory;
2520		2758
2521	our @ISA = CFClient::UI::HBox::;	2759	our @ISA = CFClient::UI::ScrolledWindow::;
2522
2523	sub _item_to_desc {
2524	my ($item) = @_;
2525
2526	my $desc =
2527	$item->{nrof} < 2
2528	? $item->{name}
2529	: "$item->{nrof} $item->{name_pl}";
2530
2531	$item->{flags} & Crossfire::Protocol::F_OPEN
2532	and $desc .= " (open)";
2533	$item->{flags} & Crossfire::Protocol::F_APPLIED
2534	and $desc .= " (applied)";
2535	$item->{flags} & Crossfire::Protocol::F_UNPAID
2536	and $desc .= " (unpaid)";
2537	$item->{flags} & Crossfire::Protocol::F_MAGIC
2538	and $desc .= " (magic)";
2539	$item->{flags} & Crossfire::Protocol::F_CURSED
2540	and $desc .= " (cursed)";
2541	$item->{flags} & Crossfire::Protocol::F_DAMNED
2542	and $desc .= " (damned)";
2543	$item->{flags} & Crossfire::Protocol::F_LOCKED
2544	and $desc .= " *";
2545
2546	$desc
2547	}
2548		2760
2549	sub new {	2761	sub new {
2550	my $class = shift;	2762	my $class = shift;
2551		2763
2552	my %args = @_;
2553
2554	my $item = delete $args{item};
2555
2556	my $desc = _item_to_desc ($item);
2557
2558	my $self = $class->SUPER::new (	2764	my $self = $class->SUPER::new (
2559	can_hover => 1,	2765	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2560	can_events => 1,
2561	tooltip => ((CFClient::UI::Label::escape $desc)
2562	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2563	connect_button_down => sub {
2564	my ($self, $ev, $x, $y) = @_;
2565
2566	# todo: maybe put examine on 1? but should just be a tooltip :(
2567	if ($ev->{button} == 1) {
2568	my $targ = $::CONN->{player}{tag};
2569
2570	if ($item->{container} == $::CONN->{player}{tag}) {
2571	$targ = $main::OPENCONT;
2572	}
2573
2574	$::CONN->send ("move $targ $item->{tag} 0");
2575	} elsif ($ev->{button} == 2) {
2576	$::CONN->send ("apply $item->{tag}");
2577	} elsif ($ev->{button} == 3) {
2578	my @menu_items = (
2579	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2580	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2581	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2582	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2583	[
2584	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2585	sub { $::CONN->send ("lock $item->{tag}") },
2586	],
2587	);
2588
2589	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2590	}
2591
2592	1
2593	},
2594	%args
2595	);
2596
2597
2598	$self->add (new CFClient::UI::Face
2599	can_events => 0,
2600	face => $item->{face},
2601	anim => $item->{anim},
2602	animspeed => $item->{animspeed},
2603	);
2604
2605	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2606
2607	$self->{item} = $item;
2608
2609	$self->update_item;
2610
2611	$self
2612	}
2613
2614	sub update_item {
2615	my ($self) = @_;
2616
2617	my $desc = _item_to_desc ($self->{item});
2618
2619	$self->{name_lbl}->set_text ($desc);
2620	}
2621
2622	#############################################################################
2623
2624	package CFClient::UI::Inventory;
2625
2626	our @ISA = CFClient::UI::ScrolledWindow::;
2627
2628	sub new {
2629	my $class = shift;
2630
2631	my $self = $class->SUPER::new (
2632	scrolled => (new CFClient::UI::VBox),
2633	@_,	2766	@_,
2634	);	2767	);
2635		2768
2636	$self	2769	$self
2637	}	2770	}
…		…
2647	or ($a->{name} cmp $b->{name})	2780	or ($a->{name} cmp $b->{name})
2648	} @$items;	2781	} @$items;
2649		2782
2650	$self->{real_items} = \@items;	2783	$self->{real_items} = \@items;
2651		2784
		2785	my $row = 0;
2652	for my $item (@items) {	2786	for my $item (@items) {
2653	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2787	CFClient::Item::update_widgets $item;
2654	$item->update_item ();
2655	}
2656		2788
2657	$self->{scrolled}->add (@items);	2789	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2790	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2791	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2658		2792
2659	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2793	$row++;
		2794	}
2660	}	2795	}
2661		2796
2662	sub size_request {	2797	sub size_request {
2663	my ($self) = @_;	2798	my ($self) = @_;
2664	($self->{req_w}, $self->{req_h});	2799	($self->{req_w}, $self->{req_h});
…		…
2704		2839
2705	# popup given the event (must be a mouse button down event currently)	2840	# popup given the event (must be a mouse button down event currently)
2706	sub popup {	2841	sub popup {
2707	my ($self, $ev) = @_;	2842	my ($self, $ev) = @_;
2708		2843
2709	$self->emit ("popdown");	2844	$self->_emit ("popdown");
2710		2845
2711	# maybe save $GRAB? must be careful about events...	2846	# maybe save $GRAB? must be careful about events...
2712	$GRAB = $self;	2847	$GRAB = $self;
2713	$self->{button} = $ev->{button};	2848	$self->{button} = $ev->{button};
2714		2849
…		…
2729		2864
2730	if ($ev->{button} == $self->{button}) {	2865	if ($ev->{button} == $self->{button}) {
2731	undef $GRAB;	2866	undef $GRAB;
2732	$self->hide;	2867	$self->hide;
2733		2868
2734	$self->emit ("popdown");	2869	$self->_emit ("popdown");
2735	$self->{hover}[1]->() if $self->{hover};	2870	$self->{hover}[1]->() if $self->{hover};
2736	}	2871	}
2737	}	2872	}
2738		2873
2739	#############################################################################	2874	#############################################################################
…		…
2774	# TODO: doesn't handle markup well (read as: at all)	2909	# TODO: doesn't handle markup well (read as: at all)
2775	my $short = $item->{count} > 1	2910	my $short = $item->{count} > 1
2776	? "<b>$item->{count} ×</b> $item->{text}"	2911	? "<b>$item->{count} ×</b> $item->{text}"
2777	: $item->{text};	2912	: $item->{text};
2778		2913
2779	my $fontsize = $item->{fontsize} || $self->{fontsize};
2780
2781	for ($short) {	2914	for ($short) {
2782	s/^\s+//;	2915	s/^\s+//;
2783	s/\s+/ /g;	2916	s/\s+/ /g;
2784	my $len = int 40 / $fontsize;
2785	substr $_, $len, length, "…" if $len < length;
2786	}	2917	}
2787		2918
2788	new CFClient::UI::Label	2919	new CFClient::UI::Label
2789	markup => $short,	2920	markup => $short,
2790	tooltip => $item->{tooltip},	2921	tooltip => $item->{tooltip},
2791	tooltip_font => $::FONT_PROP,	2922	tooltip_font => $::FONT_PROP,
2792	tooltip_width => 0.67,	2923	tooltip_width => 0.67,
2793	fontsize => $fontsize,	2924	fontsize => $item->{fontsize} || $self->{fontsize},
		2925	max_w => $::WIDTH * 0.44,
2794	fg => $item->{fg},	2926	fg => $item->{fg},
2795	can_events => 1,	2927	can_events => 1,
2796	can_hover => 1	2928	can_hover => 1
2797	};	2929	};
2798	}	2930	}
…		…
2804	sub add {	2936	sub add {
2805	my ($self, $text, %arg) = @_;	2937	my ($self, $text, %arg) = @_;
2806		2938
2807	$text =~ s/^\s+//;	2939	$text =~ s/^\s+//;
2808	$text =~ s/\s+$//;	2940	$text =~ s/\s+$//;
		2941
		2942	return unless $text;
2809		2943
2810	my $timeout = time + ((delete $arg{timeout}) || 60);	2944	my $timeout = time + ((delete $arg{timeout}) || 60);
2811		2945
2812	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2946	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813		2947
…		…
2835	}	2969	}
2836		2970
2837	$self->reorder;	2971	$self->reorder;
2838	}	2972	}
2839		2973
		2974	sub reconfigure {
		2975	my ($self) = @_;
		2976
		2977	delete $_->{label}
		2978	for values %{ $self->{item} || {} };
		2979
		2980	$self->reorder;
		2981	$self->SUPER::reconfigure;
		2982	}
		2983
2840	#############################################################################	2984	#############################################################################
2841		2985
2842	package CFClient::UI::Root;	2986	package CFClient::UI::Root;
2843		2987
2844	our @ISA = CFClient::UI::Container::;	2988	our @ISA = CFClient::UI::Container::;
…		…
2847		2991
2848	sub new {	2992	sub new {
2849	my $class = shift;	2993	my $class = shift;
2850		2994
2851	$class->SUPER::new (	2995	$class->SUPER::new (
		2996	visible => 1,
2852	@_,	2997	@_,
2853	)	2998	)
2854	}	2999	}
2855		3000
2856	sub configure {	3001	sub configure {
…		…
2874	}	3019	}
2875		3020
2876	sub size_allocate {	3021	sub size_allocate {
2877	my ($self, $w, $h) = @_;	3022	my ($self, $w, $h) = @_;
2878		3023
2879	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2880	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2881
2882	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2883	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2884
2885	for my $child ($self->children) {	3024	for my $child ($self->children) {
2886	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3025	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2887		3026
2888	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3027	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2889	if exists $child->{req_x};	3028	if exists $child->{req_x};
…		…
2918	}	3057	}
2919		3058
2920	sub add {	3059	sub add {
2921	my ($self, @children) = @_;	3060	my ($self, @children) = @_;
2922		3061
		3062	for (my @widgets = @children; my $w = pop @widgets; ) {
		3063	push @widgets, $w->children;
		3064	$w->{root} = $self;
		3065	$w->{visible} = $self->{visible} + 1;
		3066	}
		3067
2923	for my $child (@children) {	3068	for my $child (@children) {
2924	$child->{toplevel} = 1;	3069	$child->{is_toplevel} = 1;
2925		3070
2926	# integerise window positions	3071	# integerise window positions
2927	$child->{x} = int $child->{x};	3072	$child->{x} = int $child->{x};
2928	$child->{y} = int $child->{y};	3073	$child->{y} = int $child->{y};
2929	}	3074	}
2930		3075
2931	$self->SUPER::add (@children);	3076	$self->SUPER::add (@children);
		3077	}
		3078
		3079	sub remove {
		3080	my ($self, @children) = @_;
		3081
		3082	$self->SUPER::remove (@children);
		3083
		3084	while (@children) {
		3085	my $w = pop @children;
		3086	push @children, $w->children;
		3087	$w->set_invisible;
		3088	}
2932	}	3089	}
2933		3090
2934	sub on_refresh {	3091	sub on_refresh {
2935	my ($self, $id, $cb) = @_;	3092	my ($self, $id, $cb) = @_;
2936		3093
…		…
2989	$w = 0 if $w < 0;	3146	$w = 0 if $w < 0;
2990	$h = 0 if $h < 0;	3147	$h = 0 if $h < 0;
2991		3148
2992	$widget->{w} = $w;	3149	$widget->{w} = $w;
2993	$widget->{h} = $h;	3150	$widget->{h} = $h;
2994	$widget->size_allocate ($w, $h);
2995	$widget->emit (size_allocate => $w, $h);	3151	$widget->emit (size_allocate => $w, $h);
2996	}	3152	}
2997	}	3153	}
2998		3154
2999	while ($self->{post_alloc_hook}) {	3155	while ($self->{post_alloc_hook}) {
…		…
3005	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3161	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3006	glClear GL_COLOR_BUFFER_BIT;	3162	glClear GL_COLOR_BUFFER_BIT;
3007		3163
3008	glMatrixMode GL_PROJECTION;	3164	glMatrixMode GL_PROJECTION;
3009	glLoadIdentity;	3165	glLoadIdentity;
3010	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3166	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3011	glMatrixMode GL_MODELVIEW;	3167	glMatrixMode GL_MODELVIEW;
3012	glLoadIdentity;	3168	glLoadIdentity;
3013		3169
3014	$self->_draw;	3170	$self->_draw;
3015	}	3171	}
…		…
3017	#############################################################################	3173	#############################################################################
3018		3174
3019	package CFClient::UI;	3175	package CFClient::UI;
3020		3176
3021	$ROOT = new CFClient::UI::Root;	3177	$ROOT = new CFClient::UI::Root;
3022	$TOOLTIP = new CFClient::UI::Tooltip;	3178	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3023		3179
3024	1	3180	1
3025		3181

Diff Legend

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