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.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.246 by root, Sun May 28 00:40:51 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;
		18
		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	}
16		38
17	sub check_tooltip {	39	sub check_tooltip {
18	if (!$GRAB) {	40	if (!$GRAB) {
19	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
…		…
29	$TOOLTIP->set_tooltip_from ($widget);	51	$TOOLTIP->set_tooltip_from ($widget);
30	$TOOLTIP->show;	52	$TOOLTIP->show;
31		53
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		55
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	57	if $x + $TOOLTIP->{w} > $::WIDTH;
37		58
38	$TOOLTIP->move ($x, $y);	59	$TOOLTIP->move ($x, $y);
39	$TOOLTIP->check_size;	60	$TOOLTIP->check_size;
40	$TOOLTIP->update;	61	$TOOLTIP->update;
41	}	62	}
…		…
49	delete $TOOLTIP->{owner};	70	delete $TOOLTIP->{owner};
50	}	71	}
51		72
52	# class methods for events	73	# class methods for events
53	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
54	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	75	$FOCUS->emit (key_down => $_[0])
55	if $FOCUS;	76	if $FOCUS;
56	}	77	}
57		78
58	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
59	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	80	$FOCUS->emit (key_up => $_[0])
60	if $FOCUS;	81	if $FOCUS;
61	}	82	}
62		83
63	sub feed_sdl_button_down_event {	84	sub feed_sdl_button_down_event {
64	my ($ev) = @_;	85	my ($ev) = @_;
…		…
73	check_tooltip;	94	check_tooltip;
74	}	95	}
75		96
76	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
77		98
78	if ($GRAB) {	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
79	($x, $y) = $GRAB->coord2local ($x, $y);	100	if $GRAB;
80	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81	}
82	}	101	}
83		102
84	sub feed_sdl_button_up_event {	103	sub feed_sdl_button_up_event {
85	my ($ev) = @_;	104	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	105	my ($x, $y) = ($ev->{x}, $ev->{y});
87		106
88	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
89		108
90	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91		110
92	if ($GRAB) {	111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93	($x, $y) = $GRAB->coord2local ($x, $y);	112	if $GRAB;
94	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95	}
96		113
97	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
98	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
99	$grab->update if $grab;	116	$grab->update if $grab;
100	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
…		…
116	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
117		134
118	check_tooltip;	135	check_tooltip;
119	}	136	}
120		137
121	if ($HOVER) {
122	($x, $y) = $HOVER->coord2local ($x, $y);
123	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
124	}	139	if $HOVER;
125	}	140	}
126		141
127	# convert position array to integers	142	# convert position array to integers
128	sub harmonize {	143	sub harmonize {
129	my ($vals) = @_;	144	my ($vals) = @_;
…		…
133	for (@$vals) {	148	for (@$vals) {
134	my $i = int $_ + $rem;	149	my $i = int $_ + $rem;
135	$rem += $_ - $i;	150	$rem += $_ - $i;
136	$_ = $i;	151	$_ = $i;
137	}	152	}
		153	}
		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
		171	# call when resolution changes etc.
		172	sub rescale_widgets {
		173	my ($sx, $sy) = @_;
		174
		175	for my $widget (values %WIDGET) {
		176	if ($widget->{is_toplevel}) {
		177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		180	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		181	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		182	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		183	}
		184	}
		185
		186	reconfigure_widgets;
138	}	187	}
139		188
140	#############################################################################	189	#############################################################################
141		190
142	package CFClient::UI::Base;	191	package CFClient::UI::Base;
…		…
155	can_events => 1,	204	can_events => 1,
156	@_	205	@_
157	}, $class;	206	}, $class;
158		207
159	for (keys %$self) {	208	for (keys %$self) {
160	if (/^connect_(.*)$/) {	209	if (/^on_(.*)$/) {
161	$self->connect ($1 => delete $self->{$_});	210	$self->connect ($1 => delete $self->{$_});
162	}	211	}
163	}	212	}
164		213
		214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		215
		216	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		217	$self->{req_x} = $layout->{x} * $::WIDTH;
		218	$self->{req_y} = $layout->{y} * $::HEIGHT;
		219	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		220	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		221	}
		222
165	$self	223	$self
		224	}
		225
		226	sub toggle_visibility {
		227	my ($self) = @_;
		228
		229	if ($self->{visible}) {
		230	$self->hide;
		231	} else {
		232	$self->show;
		233	}
166	}	234	}
167		235
168	sub destroy {	236	sub destroy {
169	my ($self) = @_;	237	my ($self) = @_;
170		238
…		…
172	%$self = ();	240	%$self = ();
173	}	241	}
174		242
175	sub show {	243	sub show {
176	my ($self) = @_;	244	my ($self) = @_;
177
178	return if $self->{parent};	245	return if $self->{parent};
179		246
180	$CFClient::UI::ROOT->add ($self);	247	$CFClient::UI::ROOT->add ($self);
181	}	248	}
182		249
183	sub hide {	250	sub show_centered {
184	my ($self) = @_;	251	my ($self) = @_;
		252	return if $self->{parent};
		253
		254	$self->show;
		255
		256	$CFClient::UI::ROOT->on_post_alloc (
		257	"centered $self" => sub {
		258	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		259	},
		260	);
		261	}
		262
		263	sub set_visible {
		264	my ($self) = @_;
		265
		266	return if $self->{visible};
		267
		268	$self->{root} = $self->{parent}{root};
		269	$self->{visible} = $self->{parent}{visible} + 1;
		270
		271	$self->emit (visibility_change => 1)
		272	}
		273
		274	sub set_invisible {
		275	my ($self) = @_;
		276
		277	return unless $self->{visible};
		278
		279	# broken show/hide model
		280
		281	delete $self->{root};
		282	delete $self->{visible};
185		283
186	undef $GRAB if $GRAB == $self;	284	undef $GRAB if $GRAB == $self;
187	undef $HOVER if $HOVER == $self;	285	undef $HOVER if $HOVER == $self;
		286
		287	CFClient::UI::check_tooltip
		288	if $CFClient::UI::TOOLTIP->{owner} == $self;
		289
		290	$self->focus_out;
		291
		292	$self->emit (visibility_change => 0);
		293	}
		294
		295	sub hide {
		296	my ($self) = @_;
		297
		298	$self->set_invisible;
188		299
189	$self->{parent}->remove ($self)	300	$self->{parent}->remove ($self)
190	if $self->{parent};	301	if $self->{parent};
191	}	302	}
192		303
…		…
201	}	312	}
202		313
203	sub set_size {	314	sub set_size {
204	my ($self, $w, $h) = @_;	315	my ($self, $w, $h) = @_;
205		316
206	$self->{user_w} = $w;	317	$self->{def_w} = $w;
207	$self->{user_h} = $h;	318	$self->{def_h} = $h;
208		319
209	$self->check_size;	320	$self->check_size;
210	}	321	}
211		322
212	sub size_request {	323	sub size_request {
…		…
242		353
243	sub size_allocate {	354	sub size_allocate {
244	# nothing to be done	355	# nothing to be done
245	}	356	}
246		357
		358	sub reconfigure {
		359	my ($self) = @_;
		360
		361	$self->check_size (1);
		362	$self->update;
		363	}
		364
247	sub children {	365	sub children {
248	}
249
250	# call when resolution changes etc.
251	sub reconfigure {
252	my ($self) = @_;
253
254	$_->reconfigure
255	for $self->children;
256
257	$self->check_size;
258	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
259	$self->update;
260	}	366	}
261		367
262	sub set_max_size {	368	sub set_max_size {
263	my ($self, $w, $h) = @_;	369	my ($self, $w, $h) = @_;
264		370
265	delete $self->{max_w}; $self->{max_w} = $w if $w;	371	delete $self->{max_w}; $self->{max_w} = $w if $w;
266	delete $self->{max_h}; $self->{max_h} = $h if $h;	372	delete $self->{max_h}; $self->{max_h} = $h if $h;
		373	}
		374
		375	sub set_tooltip {
		376	my ($self, $tooltip) = @_;
		377
		378	$tooltip =~ s/^\s+//;
		379	$tooltip =~ s/\s+$//;
		380
		381	return if $self->{tooltip} eq $tooltip;
		382
		383	$self->{tooltip} = $tooltip;
		384
		385	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		386	delete $CFClient::UI::TOOLTIP->{owner};
		387	CFClient::UI::check_tooltip;
		388	}
267	}	389	}
268		390
269	# translate global coordinates to local coordinate system	391	# translate global coordinates to local coordinate system
270	sub coord2local {	392	sub coord2local {
271	my ($self, $x, $y) = @_;	393	my ($self, $x, $y) = @_;
…		…
286	return if $FOCUS == $self;	408	return if $FOCUS == $self;
287	return unless $self->{can_focus};	409	return unless $self->{can_focus};
288		410
289	my $focus = $FOCUS; $FOCUS = $self;	411	my $focus = $FOCUS; $FOCUS = $self;
290		412
291	$self->emit (focus_in => $focus);	413	$self->_emit (focus_in => $focus);
292		414
293	$focus->update if $focus;	415	$focus->update if $focus;
294	$FOCUS->update;	416	$FOCUS->update;
295	}	417	}
296		418
…		…
299		421
300	return unless $FOCUS == $self;	422	return unless $FOCUS == $self;
301		423
302	my $focus = $FOCUS; undef $FOCUS;	424	my $focus = $FOCUS; undef $FOCUS;
303		425
304	$self->emit (focus_out => $focus);	426	$self->_emit (focus_out => $focus);
305		427
306	$focus->update if $focus; #?	428	$focus->update if $focus; #?
		429
		430	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		431	unless $FOCUS;
307	}	432	}
308		433
309	sub mouse_motion { }	434	sub mouse_motion { }
310	sub button_up { }	435	sub button_up { }
311	sub key_down { }	436	sub key_down { }
312	sub key_up { }	437	sub key_up { }
313		438
314	sub button_down {	439	sub button_down {
315	my ($self, $ev, $x, $y) = @_;	440	my ($self, $ev, $x, $y) = @_;
316		441
317	$self->focus_in;	442	$self->focus_in;
…		…
351	if ($ENV{PCLIENT_DEBUG}) {	476	if ($ENV{PCLIENT_DEBUG}) {
352	glPushMatrix;	477	glPushMatrix;
353	glColor 1, 1, 0, 1;	478	glColor 1, 1, 0, 1;
354	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	479	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
355	glBegin GL_LINE_LOOP;	480	glBegin GL_LINE_LOOP;
356	glVertex 0 , 0;	481	glVertex 0 , 0;
357	glVertex $self->{w}, 0;	482	glVertex $self->{w} - 1, 0;
358	glVertex $self->{w}, $self->{h};	483	glVertex $self->{w} - 1, $self->{h} - 1;
359	glVertex 0 , $self->{h};	484	glVertex 0 , $self->{h} - 1;
360	glEnd;	485	glEnd;
361	glPopMatrix;	486	glPopMatrix;
362	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	487	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
363	}	488	}
364	}	489	}
365		490
366	sub _draw {	491	sub _draw {
367	my ($self) = @_;	492	my ($self) = @_;
…		…
384	sub set_parent {	509	sub set_parent {
385	my ($self, $parent) = @_;	510	my ($self, $parent) = @_;
386		511
387	Scalar::Util::weaken ($self->{parent} = $parent);	512	Scalar::Util::weaken ($self->{parent} = $parent);
388		513
		514	$self->set_visible;
		515
389	$self->check_size	516	$self->check_size;
390	unless exists $self->{req_w};	517	$self->show;
391	}	518	}
392		519
393	sub check_size {	520	sub check_size {
394	my ($self, $forced) = @_;	521	my ($self, $forced) = @_;
395		522
…		…
408	my ($self, $signal, $cb) = @_;	535	my ($self, $signal, $cb) = @_;
409		536
410	push @{ $self->{signal_cb}{$signal} }, $cb;	537	push @{ $self->{signal_cb}{$signal} }, $cb;
411	}	538	}
412		539
		540	sub _emit {
		541	my ($self, $signal, @args) = @_;
		542
		543	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		544	}
		545
413	sub emit {	546	sub emit {
414	my ($self, $signal, @args) = @_;	547	my ($self, $signal, @args) = @_;
415		548
416	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	549	$self->_emit ($signal, @args)
		550	|| $self->$signal (@args);
		551	}
		552
		553	sub visibility_change {
		554	#my ($self, $visible) = @_;
417	}	555	}
418		556
419	sub DESTROY {	557	sub DESTROY {
420	my ($self) = @_;	558	my ($self) = @_;
421		559
		560	delete $WIDGET{$self+0};
422	#$self->deactivate;	561	#$self->deactivate;
423	}	562	}
424		563
425	#############################################################################	564	#############################################################################
426		565
…		…
435	my $class = shift;	574	my $class = shift;
436		575
437	# range [value, low, high, page]	576	# range [value, low, high, page]
438		577
439	$class->SUPER::new (	578	$class->SUPER::new (
440	bg => [0, 0, 0, 0.2],	579	#bg => [0, 0, 0, 0.2],
441	active_bg => [1, 1, 1, 0.5],	580	#active_bg => [1, 1, 1, 0.5],
442	@_	581	@_
443	)	582	)
444	}	583	}
445		584
446	sub _draw {	585	sub _draw {
447	my ($self) = @_;	586	my ($self) = @_;
448		587
		588	my $color = $FOCUS == $self && $self->{active_bg}
		589	? $self->{active_bg}
		590	: $self->{bg};
		591
		592	if ($color && (@$color < 4 || $color->[3])) {
449	my ($w, $h) = @$self{qw(w h)};	593	my ($w, $h) = @$self{qw(w h)};
450		594
451	glEnable GL_BLEND;	595	glEnable GL_BLEND;
452	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	596	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	597	glColor @$color;
454		598
455	glBegin GL_QUADS;	599	glBegin GL_QUADS;
456	glVertex 0 , 0;	600	glVertex 0 , 0;
457	glVertex 0 , $h;	601	glVertex 0 , $h;
458	glVertex $w, $h;	602	glVertex $w, $h;
459	glVertex $w, 0;	603	glVertex $w, 0;
460	glEnd;	604	glEnd;
461		605
462	glDisable GL_BLEND;	606	glDisable GL_BLEND;
		607	}
463	}	608	}
464		609
465	#############################################################################	610	#############################################################################
466		611
467	package CFClient::UI::Empty;	612	package CFClient::UI::Empty;
…		…
527	delete $child->{parent};	672	delete $child->{parent};
528	$child->hide;	673	$child->hide;
529		674
530	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	675	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531		676
532	$self->check_size;	677	$self->check_size (1);
533	$self->update;	678	$self->update;
534	}	679	}
535		680
536	sub clear {	681	sub clear {
537	my ($self) = @_;	682	my ($self) = @_;
…		…
628	}	773	}
629		774
630	sub update {	775	sub update {
631	my ($self) = @_;	776	my ($self) = @_;
632		777
633	$ROOT->on_refresh ($self => sub { $self->render_child });	778	$ROOT->on_post_alloc ($self => sub { $self->render_child });
634	$self->SUPER::update;	779	$self->SUPER::update;
635	}	780	}
636		781
637	sub size_allocate {	782	sub size_allocate {
638	my ($self, $w, $h) = @_;	783	my ($self, $w, $h) = @_;
…		…
651	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	796	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
652	glClearColor 0, 0, 0, 0;	797	glClearColor 0, 0, 0, 0;
653	glClear GL_COLOR_BUFFER_BIT;	798	glClear GL_COLOR_BUFFER_BIT;
654		799
655	$self->_render;	800	$self->_render;
656	# glColorMask 1, 1, 1, 0;
657	# glEnable GL_BLEND;
658	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659	# glRasterPos 0, 0;
660	# glCopyPixels 0, 0, $self->{w}, $self->{h};
661	# glDisable GL_BLEND;
662	# glColorMask 1, 1, 1, 1;
663	};	801	};
664	}	802	}
665		803
666	sub _draw {	804	sub _draw {
667	my ($self) = @_;	805	my ($self) = @_;
…		…
671	my $tex = $self->{texture}	809	my $tex = $self->{texture}
672	or return;	810	or return;
673		811
674	glEnable GL_TEXTURE_2D;	812	glEnable GL_TEXTURE_2D;
675	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676	glColor 0, 0, 0, 1;	814	glColor 1, 1, 1, 1;
677		815
678	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	816	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679		817
680	glDisable GL_TEXTURE_2D;	818	glDisable GL_TEXTURE_2D;
681	}	819	}
…		…
684		822
685	package CFClient::UI::ViewPort;	823	package CFClient::UI::ViewPort;
686		824
687	our @ISA = CFClient::UI::Window::;	825	our @ISA = CFClient::UI::Window::;
688		826
		827	sub new {
		828	my $class = shift;
		829
		830	$class->SUPER::new (
		831	scroll_x => 0,
		832	scroll_y => 1,
		833	@_,
		834	)
		835	}
		836
689	sub size_request {	837	sub size_request {
690	my ($self) = @_;	838	my ($self) = @_;
691		839
692	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	840	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
693	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
694		841
695	@$self{qw(child_w child_h)}	842	@$self{qw(child_w child_h)}
696	}	843	}
697		844
698	sub size_allocate {	845	sub size_allocate {
699	my ($self, $w, $h) = @_;	846	my ($self, $w, $h) = @_;
700		847
		848	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		849	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		850
		851	$self->child->configure (0, 0, $w, $h);
701	$self->update;	852	$self->update;
702	}	853	}
703		854
704	sub set_offset {	855	sub set_offset {
705	my ($self, $x, $y) = @_;	856	my ($self, $x, $y) = @_;
…		…
756	my $class = shift;	907	my $class = shift;
757		908
758	my $self;	909	my $self;
759		910
760	my $slider = new CFClient::UI::Slider	911	my $slider = new CFClient::UI::Slider
761	vertical => 1,	912	vertical => 1,
762	range => [0, 0, 1, 0.01], # HACK fix	913	range => [0, 0, 1, 0.01], # HACK fix
763	connect_changed => sub {	914	on_changed => sub {
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	915	$self->{vp}->set_offset (0, $_[1]);
765	},	916	},
766	;	917	;
767		918
768	$self = $class->SUPER::new (	919	$self = $class->SUPER::new (
769	vp => (new CFClient::UI::ViewPort),	920	vp => (new CFClient::UI::ViewPort expand => 1),
770	slider => $slider,	921	slider => $slider,
771	@_,	922	@_,
772	);	923	);
773		924
774	$self->{vp}->add ($self->{scrolled});	925	$self->{vp}->add ($self->{scrolled});
…		…
776	$self->add ($self->{slider});	927	$self->add ($self->{slider});
777		928
778	$self	929	$self
779	}	930	}
780		931
		932	sub update {
		933	my ($self) = @_;
		934
		935	$self->SUPER::update;
		936
		937	# todo: overwrite size_allocate of child
		938	my $child = $self->{vp}->child;
		939	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		940	}
		941
		942	sub size_allocate {
		943	my ($self, $w, $h) = @_;
		944
		945	$self->SUPER::size_allocate ($w, $h);
		946
		947	my $child = $self->{vp}->child;
		948	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		949	}
		950
781	#TODO# update range on size_allocate depeneing on child	951	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	952	# update viewport offset on scroll
783		953
784	#############################################################################	954	#############################################################################
785		955
786	package CFClient::UI::Frame;	956	package CFClient::UI::Frame;
787		957
788	our @ISA = CFClient::UI::Bin::;	958	our @ISA = CFClient::UI::Bin::;
789		959
790	use CFClient::OpenGL;	960	use CFClient::OpenGL;
		961
		962	sub new {
		963	my $class = shift;
		964
		965	$class->SUPER::new (
		966	bg => undef,
		967	@_,
		968	)
		969	}
		970
		971	sub _draw {
		972	my ($self) = @_;
		973
		974	if ($self->{bg}) {
		975	my ($w, $h) = @$self{qw(w h)};
		976
		977	glEnable GL_BLEND;
		978	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		979	glColor @{ $self->{bg} };
		980
		981	glBegin GL_QUADS;
		982	glVertex 0 , 0;
		983	glVertex 0 , $h;
		984	glVertex $w, $h;
		985	glVertex $w, 0;
		986	glEnd;
		987
		988	glDisable GL_BLEND;
		989	}
		990
		991	$self->SUPER::_draw;
		992	}
791		993
792	#############################################################################	994	#############################################################################
793		995
794	package CFClient::UI::FancyFrame;	996	package CFClient::UI::FancyFrame;
795		997
…		…
802	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1004	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
803		1005
804	sub new {	1006	sub new {
805	my $class = shift;	1007	my $class = shift;
806		1008
807	# TODO: user_x, user_y, overwrite moveto?
808
809	my $self = $class->SUPER::new (	1009	my $self = $class->SUPER::new (
810	bg => [1, 1, 1, 1],	1010	bg => [1, 1, 1, 1],
811	border_bg => [1, 1, 1, 1],	1011	border_bg => [1, 1, 1, 1],
812	border => 0.6,	1012	border => 0.6,
		1013	is_toplevel => 1,
813	can_events => 1,	1014	can_events => 1,
814	@_	1015	@_
815	);	1016	);
816		1017
817	$self->{title} &&= new CFClient::UI::Label	1018	$self->{title} &&= new CFClient::UI::Label
818	align => 0,	1019	align => 0,
…		…
842	my ($self, $w, $h) = @_;	1043	my ($self, $w, $h) = @_;
843		1044
844	$h -= List::Util::max 0, $self->border * 2;	1045	$h -= List::Util::max 0, $self->border * 2;
845	$w -= List::Util::max 0, $self->border * 2;	1046	$w -= List::Util::max 0, $self->border * 2;
846		1047
847	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1048	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
848	if $self->{title};	1049	if $self->{title};
849		1050
850	$self->child->configure ($self->border, $self->border, $w, $h);	1051	$self->child->configure ($self->border, $self->border, $w, $h);
851	}	1052	}
852		1053
…		…
871	my ($ev, $x, $y) = @_;	1072	my ($ev, $x, $y) = @_;
872		1073
873	my $dx = $ev->{x} - $ox;	1074	my $dx = $ev->{x} - $ox;
874	my $dy = $ev->{y} - $oy;	1075	my $dy = $ev->{y} - $oy;
875		1076
		1077	$self->{user_x} = $wx + $dx * $mx;
		1078	$self->{user_y} = $wy + $dy * $my;
876	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1079	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
877	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1080	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
878	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1081	$self->move ($self->{user_x}, $self->{user_y});
879	$self->check_size;	1082	$self->check_size;
880	};	1083	};
881		1084
882	} elsif ($lr ^ $td) {	1085	} elsif ($lr ^ $td) {
883	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1086	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
886	$self->{motion} = sub {	1089	$self->{motion} = sub {
887	my ($ev, $x, $y) = @_;	1090	my ($ev, $x, $y) = @_;
888		1091
889	($x, $y) = ($ev->{x}, $ev->{y});	1092	($x, $y) = ($ev->{x}, $ev->{y});
890		1093
891	$self->move ($bx + $x - $ox, $by + $y - $oy);	1094	$self->{user_x} = $bx + $x - $ox;
		1095	$self->{user_y} = $by + $y - $oy;
		1096
		1097	$self->move ($self->{user_x}, $self->{user_y});
892	$self->update;	1098	$self->update;
893	};	1099	};
894	}	1100	}
895	}	1101	}
896		1102
…		…
958	sub new {	1164	sub new {
959	my $class = shift;	1165	my $class = shift;
960		1166
961	$class->SUPER::new (	1167	$class->SUPER::new (
962	col_expand => [],	1168	col_expand => [],
963	@_	1169	@_,
964	)	1170	)
		1171	}
		1172
		1173	sub children {
		1174	grep $_, map @$_, grep $_, @{ $_[0]{children} }
965	}	1175	}
966		1176
967	sub add {	1177	sub add {
968	my ($self, $x, $y, $child) = @_;	1178	my ($self, $x, $y, $child) = @_;
969		1179
970	$child->set_parent ($self);	1180	$child->set_parent ($self);
971	$self->{children}[$y][$x] = $child;	1181	$self->{children}[$y][$x] = $child;
972		1182
973	$child->check_size;	1183	$self->check_size (1);
974	}	1184	}
975		1185
976	sub children {
977	grep $_, map @$_, grep $_, @{ $_[0]{children} }
978	}
979
980	# TODO: move to container class maybe? send childs a signal on removal?	1186	# TODO: move to container class maybe? send children a signal on removal?
981	sub clear {	1187	sub clear {
982	my ($self) = @_;	1188	my ($self) = @_;
983		1189
984	my @children = $self->children;	1190	my @children = $self->children;
985	delete $self->{children};	1191	delete $self->{children};
…		…
987	for (@children) {	1193	for (@children) {
988	delete $_->{parent};	1194	delete $_->{parent};
989	$_->hide;	1195	$_->hide;
990	}	1196	}
991		1197
		1198	$self->check_size (1);
992	$self->update;	1199	$self->update;
993	}	1200	}
994		1201
995	sub get_wh {	1202	sub get_wh {
996	my ($self) = @_;	1203	my ($self) = @_;
…		…
1028	sub size_allocate {	1235	sub size_allocate {
1029	my ($self, $w, $h) = @_;	1236	my ($self, $w, $h) = @_;
1030		1237
1031	my ($ws, $hs) = $self->get_wh;	1238	my ($ws, $hs) = $self->get_wh;
1032		1239
1033	my $req_w = sum @$ws;	1240	my $req_w = (sum @$ws) || 1;
1034	my $req_h = sum @$hs;	1241	my $req_h = (sum @$hs) || 1;
1035		1242
1036	# TODO: nicer code && do row_expand	1243	# TODO: nicer code && do row_expand
1037	my @col_expand = @{$self->{col_expand}};	1244	my @col_expand = @{$self->{col_expand}};
1038	@col_expand = (1) x @$ws unless @col_expand;	1245	@col_expand = (1) x @$ws unless @col_expand;
1039	my $col_expand = (sum @col_expand) || 1;	1246	my $col_expand = (sum @col_expand) || 1;
…		…
1093	}	1300	}
1094	}	1301	}
1095		1302
1096	#############################################################################	1303	#############################################################################
1097		1304
1098	package CFClient::UI::HBox;	1305	package CFClient::UI::Box;
1099
1100	# TODO: wrap into common Box base class
1101		1306
1102	our @ISA = CFClient::UI::Container::;	1307	our @ISA = CFClient::UI::Container::;
1103		1308
1104	sub size_request {	1309	sub size_request {
1105	my ($self) = @_;	1310	my ($self) = @_;
1106		1311
1107	my @alloc = map [$_->size_request], @{$self->{children}};	1312	$self->{vertical}
1108		1313	? (
1109	(	1314	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1110	(List::Util::sum map $_->[0], @alloc),	1315	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1111	(List::Util::max map $_->[1], @alloc),	1316	)
1112	)	1317	: (
		1318	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1319	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1320	)
1113	}	1321	}
1114		1322
1115	sub size_allocate {	1323	sub size_allocate {
1116	my ($self, $w, $h) = @_;	1324	my ($self, $w, $h) = @_;
1117		1325
1118	($h, $w) = ($w, $h);	1326	my $space = $self->{vertical} ? $h : $w;
1119
1120	my $children = $self->{children};	1327	my $children = $self->{children};
1121		1328
1122	my @h = map $_->{req_w}, @$children;	1329	my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1123
1124	my $req_h = List::Util::sum @h;	1330	my $req = List::Util::sum @req;
1125		1331
1126	if ($req_h > $h) {	1332	if ($req > $space) {
1127	# ah well, not enough space	1333	# ah well, not enough space
1128	$_ *= $h / $req_h for @h;	1334	$_ *= $space / $req for @req;
1129	} else {	1335	} else {
1130	my $exp = List::Util::sum map $_->{expand}, @$children;	1336	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1131	$exp ||= 1;
1132		1337
		1338	$req[$_] += ($space - $req) * $children->[$_]{expand} / $expand
1133	for (0 .. $#$children) {	1339	for 0 .. $#$children;
1134	my $child = $children->[$_];
1135
1136	my $alloc_h = $h[$_];
1137	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1138	$h[$_] = $alloc_h;
1139	}
1140	}	1340	}
1141		1341
1142	CFClient::UI::harmonize \@h;	1342	CFClient::UI::harmonize \@req;
1143		1343
1144	my $y = 0;	1344	my $pos = 0;
1145	for (0 .. $#$children) {	1345	for (0 .. $#$children) {
1146	my $child = $children->[$_];
1147	my $h = $h[$_];	1346	my $alloc = $req[$_];
1148	$child->configure ($y, 0, $h, $w);	1347	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1149		1348
1150	$y += $h;	1349	$pos += $alloc;
1151	}	1350	}
1152		1351
1153	1	1352	1
1154	}	1353	}
1155		1354
1156	#############################################################################	1355	#############################################################################
1157		1356
		1357	package CFClient::UI::HBox;
		1358
		1359	our @ISA = CFClient::UI::Box::;
		1360
		1361	sub new {
		1362	my $class = shift;
		1363
		1364	$class->SUPER::new (
		1365	vertical => 0,
		1366	@_,
		1367	)
		1368	}
		1369
		1370	#############################################################################
		1371
1158	package CFClient::UI::VBox;	1372	package CFClient::UI::VBox;
1159		1373
1160	# TODO: wrap into common Box base class
1161
1162	our @ISA = CFClient::UI::Container::;	1374	our @ISA = CFClient::UI::Box::;
1163		1375
1164	sub size_request {	1376	sub new {
1165	my ($self) = @_;	1377	my $class = shift;
1166		1378
1167	my @alloc = map [$_->size_request], @{$self->{children}};	1379	$class->SUPER::new (
1168		1380	vertical => 1,
1169	(	1381	@_,
1170	(List::Util::max map $_->[0], @alloc),
1171	(List::Util::sum map $_->[1], @alloc),
1172	)	1382	)
1173	}	1383	}
1174		1384
1175	sub size_allocate {
1176	my ($self, $w, $h) = @_;
1177
1178	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1179
1180	my $children = $self->{children};
1181
1182	my @h = map $_->{req_h}, @$children;
1183
1184	my $req_h = List::Util::sum @h;
1185
1186	if ($req_h > $h) {
1187	# ah well, not enough space
1188	$_ *= $h / $req_h for @h;
1189	} else {
1190	my $exp = List::Util::sum map $_->{expand}, @$children;
1191	$exp ||= 1;
1192
1193	for (0 .. $#$children) {
1194	my $child = $children->[$_];
1195
1196	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1197	}
1198	}
1199
1200	CFClient::UI::harmonize \@h;
1201
1202	my $y = 0;
1203	for (0 .. $#$children) {
1204	my $child = $children->[$_];
1205	my $h = $h[$_];
1206	$child->configure (0, $y, $w, $h);
1207
1208	$y += $h;
1209	}
1210
1211	1
1212	}
1213
1214	#############################################################################	1385	#############################################################################
1215		1386
1216	package CFClient::UI::Label;	1387	package CFClient::UI::Label;
1217		1388
1218	our @ISA = CFClient::UI::Base::;	1389	our @ISA = CFClient::UI::DrawBG::;
1219		1390
1220	use CFClient::OpenGL;	1391	use CFClient::OpenGL;
1221		1392
1222	sub new {	1393	sub new {
1223	my ($class, %arg) = @_;	1394	my ($class, %arg) = @_;
1224		1395
1225	my $self = $class->SUPER::new (	1396	my $self = $class->SUPER::new (
1226	fg => [1, 1, 1],	1397	fg => [1, 1, 1],
		1398	#bg => none
		1399	#active_bg => none
1227	#font => default_font	1400	#font => default_font
1228	#text => initial text	1401	#text => initial text
1229	#markup => initial narkup	1402	#markup => initial narkup
		1403	#max_w => maximum pixel width
		1404	ellipsise => 3, # end
1230	layout => (new CFClient::Layout),	1405	layout => (new CFClient::Layout),
1231	fontsize => 1,	1406	fontsize => 1,
1232	align => -1,	1407	align => -1,
1233	valign => -1,	1408	valign => -1,
1234	padding => 2,	1409	padding => 2,
…		…
1249	}	1424	}
1250		1425
1251	$self	1426	$self
1252	}	1427	}
1253		1428
1254	sub escape {	1429	sub escape($) {
1255	local $_ = $_[1];	1430	local $_ = $_[0];
1256		1431
1257	s/&/&amp;/g;	1432	s/&/&amp;/g;
1258	s/>/&gt;/g;	1433	s/>/&gt;/g;
1259	s/</&lt;/g;	1434	s/</&lt;/g;
1260		1435
1261	$_[1]	1436	$_
1262	}	1437	}
1263		1438
1264	sub update {	1439	sub update {
1265	my ($self) = @_;	1440	my ($self) = @_;
1266		1441
…		…
1299	sub size_request {	1474	sub size_request {
1300	my ($self) = @_;	1475	my ($self) = @_;
1301		1476
1302	$self->{layout}->set_font ($self->{font}) if $self->{font};	1477	$self->{layout}->set_font ($self->{font}) if $self->{font};
1303	$self->{layout}->set_width ($self->{max_w} || -1);	1478	$self->{layout}->set_width ($self->{max_w} || -1);
		1479	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1480	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1304	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1481	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1305		1482
1306	my ($w, $h) = $self->{layout}->size;	1483	my ($w, $h) = $self->{layout}->size;
1307		1484
1308	if (exists $self->{template}) {	1485	if (exists $self->{template}) {
…		…
1338	}	1515	}
1339		1516
1340	sub _draw {	1517	sub _draw {
1341	my ($self) = @_;	1518	my ($self) = @_;
1342		1519
		1520	$self->SUPER::_draw; # draw background, if applicable
		1521
1343	my $tex = $self->{texture} ||= do {	1522	my $tex = $self->{texture} ||= do {
1344	$self->{layout}->set_foreground (@{$self->{fg}});	1523	$self->{layout}->set_foreground (@{$self->{fg}});
1345	$self->{layout}->set_font ($self->{font}) if $self->{font};	1524	$self->{layout}->set_font ($self->{font}) if $self->{font};
1346	$self->{layout}->set_width ($self->{w});	1525	$self->{layout}->set_width ($self->{w});
		1526	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1527	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1347	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1528	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1348		1529
1349	my $tex = new_from_layout CFClient::Texture $self->{layout};	1530	my $tex = new_from_layout CFClient::Texture $self->{layout};
1350		1531
1351	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1532	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1352	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1533	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1353	: ($self->{w} - $tex->{w}) * 0.5;	1534	: ($self->{w} - $tex->{w}) * 0.5);
1354		1535
1355	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1536	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1356	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1537	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1357	: ($self->{h} - $tex->{h}) * 0.5;	1538	: ($self->{h} - $tex->{h}) * 0.5);
1358		1539
1359	$tex	1540	$tex
1360	};	1541	};
1361		1542
1362	glEnable GL_TEXTURE_2D;	1543	glEnable GL_TEXTURE_2D;
…		…
1390	active_fg => [0, 0, 0],	1571	active_fg => [0, 0, 0],
1391	can_hover => 1,	1572	can_hover => 1,
1392	can_focus => 1,	1573	can_focus => 1,
1393	valign => 0,	1574	valign => 0,
1394	can_events => 1,	1575	can_events => 1,
		1576	#text => ...
1395	@_	1577	@_
1396	)	1578	)
1397	}	1579	}
1398		1580
1399	sub _set_text {	1581	sub _set_text {
…		…
1409	$self->{text} = $text;	1591	$self->{text} = $text;
1410		1592
1411	$text =~ s/./*/g if $self->{hidden};	1593	$text =~ s/./*/g if $self->{hidden};
1412	$self->{layout}->set_text ("$text ");	1594	$self->{layout}->set_text ("$text ");
1413		1595
1414	$self->emit (changed => $self->{text});	1596	$self->_emit (changed => $self->{text});
1415	}	1597	}
1416		1598
1417	sub set_text {	1599	sub set_text {
1418	my ($self, $text) = @_;	1600	my ($self, $text) = @_;
1419		1601
1420	$self->{cursor} = length $text;	1602	$self->{cursor} = length $text;
1421	$self->_set_text ($text);	1603	$self->_set_text ($text);
		1604	$self->update;
1422	$self->check_size;	1605	$self->check_size;
1423	$self->update;
1424	}	1606	}
1425		1607
1426	sub get_text {	1608	sub get_text {
1427	$_[0]{text}	1609	$_[0]{text}
1428	}	1610	}
…		…
1431	my ($self) = @_;	1613	my ($self) = @_;
1432		1614
1433	my ($w, $h) = $self->SUPER::size_request;	1615	my ($w, $h) = $self->SUPER::size_request;
1434		1616
1435	($w + 1, $h) # add 1 for cursor	1617	($w + 1, $h) # add 1 for cursor
1436	}
1437
1438	sub size_allocate {
1439	my ($self, $w, $h) = @_;
1440
1441	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1442	}	1618	}
1443		1619
1444	sub key_down {	1620	sub key_down {
1445	my ($self, $ev) = @_;	1621	my ($self, $ev) = @_;
1446		1622
…		…
1448	my $sym = $ev->{sym};	1624	my $sym = $ev->{sym};
1449	my $uni = $ev->{unicode};	1625	my $uni = $ev->{unicode};
1450		1626
1451	my $text = $self->get_text;	1627	my $text = $self->get_text;
1452		1628
1453	if ($sym == 8) {	1629	if ($uni == 8) {
1454	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1630	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1455	} elsif ($sym == 127) {	1631	} elsif ($uni == 127) {
1456	substr $text, $self->{cursor}, 1, "";	1632	substr $text, $self->{cursor}, 1, "";
1457	} elsif ($sym == CFClient::SDLK_LEFT) {	1633	} elsif ($sym == CFClient::SDLK_LEFT) {
1458	--$self->{cursor} if $self->{cursor};	1634	--$self->{cursor} if $self->{cursor};
1459	} elsif ($sym == CFClient::SDLK_RIGHT) {	1635	} elsif ($sym == CFClient::SDLK_RIGHT) {
1460	++$self->{cursor} if $self->{cursor} < length $self->{text};	1636	++$self->{cursor} if $self->{cursor} < length $self->{text};
1461	} elsif ($sym == CFClient::SDLK_HOME) {	1637	} elsif ($sym == CFClient::SDLK_HOME) {
1462	$self->{cursor} = 0;	1638	$self->{cursor} = 0;
1463	} elsif ($sym == CFClient::SDLK_END) {	1639	} elsif ($sym == CFClient::SDLK_END) {
1464	$self->{cursor} = length $text;	1640	$self->{cursor} = length $text;
1465	} elsif ($sym == 27) {	1641	} elsif ($uni == 27) {
1466	$self->emit ('escape');	1642	$self->_emit ('escape');
1467	} elsif ($uni) {	1643	} elsif ($uni) {
1468	substr $text, $self->{cursor}++, 0, chr $uni;	1644	substr $text, $self->{cursor}++, 0, chr $uni;
1469	}	1645	}
1470		1646
1471	$self->_set_text ($text);	1647	$self->_set_text ($text);
1472	$self->update;	1648	$self->update;
		1649	$self->check_size;
1473	}	1650	}
1474		1651
1475	sub focus_in {	1652	sub focus_in {
1476	my ($self) = @_;	1653	my ($self) = @_;
1477		1654
…		…
1557	if ($sym == 13) {	1734	if ($sym == 13) {
1558	unshift @{$self->{history}},	1735	unshift @{$self->{history}},
1559	my $txt = $self->get_text;	1736	my $txt = $self->get_text;
1560	$self->{history_pointer} = -1;	1737	$self->{history_pointer} = -1;
1561	$self->{history_saveback} = '';	1738	$self->{history_saveback} = '';
1562	$self->emit (activate => $txt);	1739	$self->_emit (activate => $txt);
1563	$self->update;	1740	$self->update;
1564		1741
1565	} elsif ($sym == CFClient::SDLK_UP) {	1742	} elsif ($sym == CFClient::SDLK_UP) {
1566	if ($self->{history_pointer} < 0) {	1743	if ($self->{history_pointer} < 0) {
1567	$self->{history_saveback} = $self->get_text;	1744	$self->{history_saveback} = $self->get_text;
…		…
1606	my $class = shift;	1783	my $class = shift;
1607		1784
1608	$class->SUPER::new (	1785	$class->SUPER::new (
1609	padding => 4,	1786	padding => 4,
1610	fg => [1, 1, 1],	1787	fg => [1, 1, 1],
1611	bg => [1, 1, 1, 0.2],
1612	active_fg => [0, 0, 1],	1788	active_fg => [0, 0, 1],
1613	can_hover => 1,	1789	can_hover => 1,
1614	align => 0,	1790	align => 0,
1615	valign => 0,	1791	valign => 0,
1616	can_events => 1,	1792	can_events => 1,
1617	@_	1793	@_
1618	)	1794	)
1619	}	1795	}
1620		1796
		1797	sub activate { }
		1798
1621	sub button_up {	1799	sub button_up {
1622	my ($self, $ev, $x, $y) = @_;	1800	my ($self, $ev, $x, $y) = @_;
1623		1801
		1802	$self->emit ("activate")
1624	if ($x >= 0 && $x < $self->{w}	1803	if $x >= 0 && $x < $self->{w}
1625	&& $y >= 0 && $y < $self->{h}) {	1804	&& $y >= 0 && $y < $self->{h};
1626	$self->emit ("activate");
1627	}
1628	}	1805	}
1629		1806
1630	sub _draw {	1807	sub _draw {
1631	my ($self) = @_;	1808	my ($self) = @_;
1632		1809
…		…
1664		1841
1665	$class->SUPER::new (	1842	$class->SUPER::new (
1666	padding => 2,	1843	padding => 2,
1667	fg => [1, 1, 1],	1844	fg => [1, 1, 1],
1668	active_fg => [1, 1, 0],	1845	active_fg => [1, 1, 0],
		1846	bg => [0, 0, 0, 0.2],
		1847	active_bg => [1, 1, 1, 0.5],
1669	state => 0,	1848	state => 0,
1670	can_hover => 1,	1849	can_hover => 1,
1671	@_	1850	@_
1672	)	1851	)
1673	}	1852	}
…		…
1682	my ($self, $ev, $x, $y) = @_;	1861	my ($self, $ev, $x, $y) = @_;
1683		1862
1684	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1863	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1685	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1864	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1686	$self->{state} = !$self->{state};	1865	$self->{state} = !$self->{state};
1687	$self->emit (changed => $self->{state});	1866	$self->_emit (changed => $self->{state});
1688	}	1867	}
1689	}	1868	}
1690		1869
1691	sub _draw {	1870	sub _draw {
1692	my ($self) = @_;	1871	my ($self) = @_;
…		…
1957	qw(s1_slider.png s1_slider_bg.png);	2136	qw(s1_slider.png s1_slider_bg.png);
1958		2137
1959	sub new {	2138	sub new {
1960	my $class = shift;	2139	my $class = shift;
1961		2140
1962	# range [value, low, high, page]	2141	# range [value, low, high, page, unit]
1963		2142
1964	# TODO: 0-width page	2143	# TODO: 0-width page
1965	# TODO: req_w/h are wrong with vertical	2144	# TODO: req_w/h are wrong with vertical
1966	# TODO: calculations are off	2145	# TODO: calculations are off
1967	my $self = $class->SUPER::new (	2146	my $self = $class->SUPER::new (
1968	fg => [1, 1, 1],	2147	fg => [1, 1, 1],
1969	active_fg => [0, 0, 0],	2148	active_fg => [0, 0, 0],
		2149	bg => [0, 0, 0, 0.2],
		2150	active_bg => [1, 1, 1, 0.5],
1970	range => [0, 0, 100, 10],	2151	range => [0, 0, 100, 10, 0],
1971	req_w => $::WIDTH / 80,	2152	req_w => $::WIDTH / 80,
1972	req_h => $::WIDTH / 80,	2153	req_h => $::WIDTH / 80,
1973	vertical => 0,	2154	vertical => 0,
1974	can_hover => 1,	2155	can_hover => 1,
1975	inner_pad => 5,	2156	inner_pad => 0.02,
1976	@_	2157	@_
1977	);	2158	);
1978		2159
		2160	$self->set_value ($self->{range}[0]);
		2161	$self->update;
		2162
1979	$self	2163	$self
		2164	}
		2165
		2166	sub set_range {
		2167	my ($self, $range) = @_;
		2168
		2169	($range, $self->{range}) = ($self->{range}, $range);
		2170
		2171	$self->update
		2172	if "@$range" ne "@{$self->{range}}";
		2173	}
		2174
		2175	sub set_value {
		2176	my ($self, $value) = @_;
		2177
		2178	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2179
		2180	$hi = $lo + 1 if $hi <= $lo;
		2181
		2182	$page = $hi - $lo if $page > $hi - $lo;
		2183
		2184	$value = $lo if $value < $lo;
		2185	$value = $hi - $page if $value > $hi - $page;
		2186
		2187	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2188	if $unit;
		2189
		2190	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2191
		2192	if ($value != $old_value) {
		2193	$self->_emit (changed => $value);
		2194	$self->update;
		2195	}
1980	}	2196	}
1981		2197
1982	sub size_request {	2198	sub size_request {
1983	my ($self) = @_;	2199	my ($self) = @_;
1984		2200
…		…
1990		2206
1991	sub button_down {	2207	sub button_down {
1992	my ($self, $ev, $x, $y) = @_;	2208	my ($self, $ev, $x, $y) = @_;
1993		2209
1994	$self->SUPER::button_down ($ev, $x, $y);	2210	$self->SUPER::button_down ($ev, $x, $y);
		2211
		2212	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2213
1995	$self->mouse_motion ($ev, $x, $y);	2214	$self->mouse_motion ($ev, $x, $y);
1996	}	2215	}
1997		2216
1998	sub mouse_motion {	2217	sub mouse_motion {
1999	my ($self, $ev, $x, $y) = @_;	2218	my ($self, $ev, $x, $y) = @_;
2000		2219
2001	if ($GRAB == $self) {	2220	if ($GRAB == $self) {
		2221	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2222
		2223	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2224
		2225	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2226
		2227	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2228	}
		2229	}
		2230
		2231	sub update {
		2232	my ($self) = @_;
		2233
		2234	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2235	$self->set_value ($self->{range}[0]);
		2236
2002	my ($value, $lo, $hi, $page) = @{$self->{range}};	2237	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2238	my $range = ($hi - $page - $lo) || 1e-100;
2003		2239
2004	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2240	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2005		2241
2006	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2242	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2007	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2243	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2008		2244
2009	$x -= $inner_pad_px; # substract the padding	2245	$value = ($value - $lo) / $range;
2010	$x = $x * ($hi - $lo) / $inner_w + $lo;	2246	$value = $value * $self->{scale} + $self->{offset};
2011	$x = $lo if $x < $lo;
2012	$x = $hi - $page if $x > $hi - $page;
2013	$self->{range}[0] = $x;
2014		2247
2015	$self->emit (changed => $x);	2248	$self->{knob_x} = $value - $knob_w * 0.5;
2016	$self->update;	2249	$self->{knob_w} = $knob_w;
2017	}	2250	});
2018	}
2019		2251
2020	# the inner_* stuff is for generating a padding for the slider handle,	2252	$self->SUPER::update;
2021	# so that the handle doesn't leave the texture. This calculation isn't 100%
2022	# correct propably, but it does the job for now
2023	sub _calc_inner_pad_px {
2024	my ($self, $w) = @_;
2025	($w / 100) * $self->{inner_pad} # % to pixels
2026	}	2253	}
2027		2254
2028	sub _draw {	2255	sub _draw {
2029	my ($self) = @_;	2256	my ($self) = @_;
2030		2257
2031	$self->SUPER::_draw ();	2258	$self->SUPER::_draw ();
2032		2259
2033	my ($w, $h) = @$self{qw(w h)};	2260	glScale $self->{w}, $self->{h};
2034		2261
2035	if ($self->{vertical}) {	2262	if ($self->{vertical}) {
2036	# draw a vertical slider like a rotated horizontal slider	2263	# draw a vertical slider like a rotated horizontal slider
2037		2264
		2265	glTranslate 1, 0, 0;
2038	glRotate 90, 0, 0, 1;	2266	glRotate 90, 0, 0, 1;
2039	glTranslate 0, -$self->{w}, 0;
2040
2041	($w, $h) = ($h, $w);
2042	}	2267	}
2043		2268
2044	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2269	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2045	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2270	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2046		2271
2047	my ($value, $lo, $hi, $page) = @{$self->{range}};
2048
2049	$hi = $value + 1 if $lo == $hi;
2050
2051	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2052	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2053
2054	$page = int $page * $inner_w / ($hi - $lo);
2055	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2056
2057	$w -= $page;
2058	$page &= ~1;
2059	glTranslate $page * 0.5, 0, 0;
2060	$page ||= 2;
2061
2062	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2063	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2064
2065	glEnable GL_TEXTURE_2D;	2272	glEnable GL_TEXTURE_2D;
2066	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2273	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2067		2274
2068	# draw background	2275	# draw background
2069	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2276	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2070		2277
2071	# draw handle	2278	# draw handle
2072	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2279	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2073		2280
2074	glDisable GL_TEXTURE_2D;	2281	glDisable GL_TEXTURE_2D;
2075	}	2282	}
		2283
		2284	#############################################################################
		2285
		2286	package CFClient::UI::ValSlider;
		2287
		2288	our @ISA = CFClient::UI::HBox::;
		2289
		2290	sub new {
		2291	my ($class, %arg) = @_;
		2292
		2293	my $range = delete $arg{range};
		2294
		2295	my $self = $class->SUPER::new (
		2296	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2297	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2298	to_value => sub { shift },
		2299	from_value => sub { shift },
		2300	%arg,
		2301	);
		2302
		2303	$self->{slider}->connect (changed => sub {
		2304	my ($self, $value) = @_;
		2305	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2306	$self->{parent}->emit (changed => $value);
		2307	});
		2308
		2309	# $self->{entry}->connect (changed => sub {
		2310	# my ($self, $value) = @_;
		2311	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2312	# $self->{parent}->emit (changed => $value);
		2313	# });
		2314
		2315	$self->add ($self->{slider}, $self->{entry});
		2316
		2317	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2318
		2319	$self
		2320	}
		2321
		2322	sub set_range { shift->{slider}->set_range (@_) }
		2323	sub set_value { shift->{slider}->set_value (@_) }
2076		2324
2077	#############################################################################	2325	#############################################################################
2078		2326
2079	package CFClient::UI::TextView;	2327	package CFClient::UI::TextView;
2080		2328
…		…
2110		2358
2111	$self->{fontsize} = $fontsize;	2359	$self->{fontsize} = $fontsize;
2112	$self->reflow;	2360	$self->reflow;
2113	}	2361	}
2114		2362
2115	sub text_height {
2116	my ($self, $text) = @_;
2117
2118	my $layout = $self->{layout};
2119
2120	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2121	$layout->set_width ($self->{children}[0]{w});
2122	$layout->set_markup ($text);
2123
2124	($layout->size)[1]
2125	}
2126
2127	sub reflow {
2128	my ($self) = @_;
2129
2130	$self->{need_reflow}++;
2131	$self->update;
2132	}
2133
2134	sub size_allocate {	2363	sub size_allocate {
2135	my ($self, $w, $h) = @_;	2364	my ($self, $w, $h) = @_;
2136		2365
2137	$self->SUPER::size_allocate ($w, $h);	2366	$self->SUPER::size_allocate ($w, $h);
2138		2367
…		…
2141	$self->{layout}->set_width ($self->{children}[0]{w});	2370	$self->{layout}->set_width ($self->{children}[0]{w});
2142		2371
2143	$self->reflow;	2372	$self->reflow;
2144	}	2373	}
2145		2374
		2375	sub text_size {
		2376	my ($self, $text, $indent) = @_;
		2377
		2378	my $layout = $self->{layout};
		2379
		2380	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2381	$layout->set_width ($self->{children}[0]{w} - $indent);
		2382	$layout->set_markup ($text);
		2383
		2384	$layout->size
		2385	}
		2386
		2387	sub reflow {
		2388	my ($self) = @_;
		2389
		2390	$self->{need_reflow}++;
		2391	$self->update;
		2392	}
		2393
		2394	sub set_offset {
		2395	my ($self, $offset) = @_;
		2396
		2397	# todo: base offset on lines or so, not on pixels
		2398	$self->{children}[1]->set_value ($offset);
		2399	}
		2400
		2401	sub clear {
		2402	my ($self) = @_;
		2403
		2404	$self->{par} = [];
		2405	$self->{height} = 0;
		2406	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2407	}
		2408
2146	sub add_paragraph {	2409	sub add_paragraph {
2147	my ($self, $color, $text) = @_;	2410	my ($self, $color, $text, $indent) = @_;
2148		2411
2149	#TODO: intelligently "reformat" paragraph	2412	for my $line (split /\n/, $text) {
2150		2413	my ($w, $h) = $self->text_size ($line);
2151	my $height = $self->text_height ($text);
2152
2153	$self->{height} += $height;	2414	$self->{height} += $h;
		2415	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2416	}
2154		2417
2155	push @{$self->{par}}, [$height, $color, $text];
2156
2157	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2418	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2158	$self->{children}[1]->update;
2159	}	2419	}
2160		2420
2161	sub update {	2421	sub update {
2162	my ($self) = @_;	2422	my ($self) = @_;
2163		2423
…		…
2165		2425
2166	return unless $self->{h} > 0;	2426	return unless $self->{h} > 0;
2167		2427
2168	delete $self->{texture};	2428	delete $self->{texture};
2169		2429
2170	$ROOT->on_refresh ($self, sub {	2430	$ROOT->on_post_alloc ($self, sub {
		2431	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2432
2171	if (delete $self->{need_reflow}) {	2433	if (delete $self->{need_reflow}) {
2172	my $height = 0;	2434	my $height = 0;
2173		2435
2174	$height += $_->[0] = $self->text_height ($_->[2])	2436	my $layout = $self->{layout};
		2437
		2438	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2439
2175	for @{$self->{par}};	2440	for (@{$self->{par}}) {
		2441	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2442	$layout->set_width ($W - $_->[3]);
		2443	$layout->set_markup ($_->[4]);
		2444	my ($w, $h) = $layout->size;
		2445	$_->[0] = $w + $_->[3];
		2446	$_->[1] = $h;
		2447	}
		2448
		2449	$height += $_->[1];
		2450	}
2176		2451
2177	$self->{height} = $height;	2452	$self->{height} = $height;
2178		2453
2179	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2454	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2180		2455
2181	delete $self->{texture};	2456	delete $self->{texture};
2182	}	2457	}
2183		2458
2184	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2459	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2185	glClearColor 0, 0, 0, 0;	2460	glClearColor 0.5, 0.5, 0.5, 0;
2186	glClear GL_COLOR_BUFFER_BIT;	2461	glClear GL_COLOR_BUFFER_BIT;
2187		2462
2188	glEnable GL_TEXTURE_2D;
2189	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2190
2191	my $top = int $self->{children}[1]{range}[0];	2463	my $top = int $self->{children}[1]{range}[0];
2192		2464
2193	my $y0 = $top;	2465	my $y0 = $top;
2194	my $y1 = $top + $self->{h};	2466	my $y1 = $top + $H;
2195		2467
2196	my $y = 0;	2468	my $y = 0;
2197		2469
2198	my $layout = $self->{layout};	2470	my $layout = $self->{layout};
2199		2471
2200	$layout->set_font ($self->{font}) if $self->{font};	2472	$layout->set_font ($self->{font}) if $self->{font};
2201		2473
		2474	glEnable GL_BLEND;
		2475	#TODO# not correct in windows where rgba is forced off
		2476	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2477
2202	for my $par (@{$self->{par}}) {	2478	for my $par (@{$self->{par}}) {
2203	my $h = $par->[0];	2479	my $h = $par->[1];
2204		2480
2205	if ($y0 < $y + $h && $y < $y1) {	2481	if ($y0 < $y + $h && $y < $y1) {
2206	$layout->set_foreground (@{ $par->[1] });	2482	$layout->set_foreground (@{ $par->[2] });
		2483	$layout->set_width ($W - $par->[3]);
2207	$layout->set_markup ($par->[2]);	2484	$layout->set_markup ($par->[4]);
2208		2485
2209	my ($W, $H) = $layout->size;	2486	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2210	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2487
		2488	glRasterPos $par->[3], $y - $y0;
		2489	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2211	}	2490	}
2212		2491
2213	$y += $h;	2492	$y += $h;
2214	}	2493	}
2215		2494
2216	glDisable GL_TEXTURE_2D;	2495	glDisable GL_BLEND;
2217	};	2496	};
2218	});	2497	});
2219	}	2498	}
2220		2499
2221	sub _draw {	2500	sub _draw {
2222	my ($self) = @_;	2501	my ($self) = @_;
2223		2502
2224	glEnable GL_TEXTURE_2D;	2503	glEnable GL_TEXTURE_2D;
2225	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2504	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2226	glColor 1, 1, 1, 1;	2505	glColor 1, 1, 1, 1;
2227	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2506	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2228	glDisable GL_TEXTURE_2D;	2507	glDisable GL_TEXTURE_2D;
2229		2508
2230	$self->{children}[1]->draw;	2509	$self->{children}[1]->draw;
2231		2510
2232	}	2511	}
…		…
2281		2560
2282	sub new {	2561	sub new {
2283	my $class = shift;	2562	my $class = shift;
2284		2563
2285	my $self = $class->SUPER::new (	2564	my $self = $class->SUPER::new (
2286	state => 0,	2565	state => 0,
2287	connect_activate => \&toggle_flopper,	2566	on_activate => \&toggle_flopper,
2288	@_	2567	@_
2289	);	2568	);
2290		2569
2291	if ($self->{state}) {
2292	$self->{state} = 0;
2293	$self->toggle_flopper;
2294	}
2295
2296	$self	2570	$self
2297	}	2571	}
2298		2572
2299	sub toggle_flopper {	2573	sub toggle_flopper {
2300	my ($self) = @_;	2574	my ($self) = @_;
2301		2575
2302	# TODO: use animation	2576	$self->{other}->toggle_visibility;
2303	if ($self->{state} = !$self->{state}) {
2304	$CFClient::UI::ROOT->add ($self->{other});
2305	$self->{other}->move ($self->coord2global (0, $self->{h}));
2306	$self->emit ("open");
2307	} else {
2308	$CFClient::UI::ROOT->remove ($self->{other});
2309	$self->emit ("close");
2310	}
2311
2312	$self->emit (changed => $self->{state});
2313	}	2577	}
2314		2578
2315	#############################################################################	2579	#############################################################################
2316		2580
2317	package CFClient::UI::Tooltip;	2581	package CFClient::UI::Tooltip;
…		…
2331		2595
2332	sub set_tooltip_from {	2596	sub set_tooltip_from {
2333	my ($self, $widget) = @_;	2597	my ($self, $widget) = @_;
2334		2598
2335	$self->add (new CFClient::UI::Label	2599	$self->add (new CFClient::UI::Label
2336	markup => $widget->{tooltip},	2600	markup => $widget->{tooltip},
2337	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2601	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338	fontsize => 0.8,	2602	fontsize => 0.8,
2339	fg => [0, 0, 0, 1],	2603	fg => [0, 0, 0, 1],
		2604	ellipsise => 0,
2340	font => ($widget->{tooltip_font} || $::FONT_PROP),	2605	font => ($widget->{tooltip_font} || $::FONT_PROP),
2341	);	2606	);
2342	}	2607	}
2343		2608
2344	sub size_request {	2609	sub size_request {
2345	my ($self) = @_;	2610	my ($self) = @_;
…		…
2391	use CFClient::OpenGL;	2656	use CFClient::OpenGL;
2392		2657
2393	sub new {	2658	sub new {
2394	my $class = shift;	2659	my $class = shift;
2395		2660
2396	$class->SUPER::new (	2661	my $self = $class->SUPER::new (
2397	aspect => 1,	2662	aspect => 1,
		2663	can_events => 0,
2398	@_,	2664	@_,
2399	)	2665	);
		2666
		2667	if ($self->{anim} && $self->{animspeed}) {
		2668	Scalar::Util::weaken (my $widget = $self);
		2669
		2670	$self->{timer} = Event->timer (
		2671	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2672	hard => 1,
		2673	interval => $self->{animspeed},
		2674	cb => sub {
		2675	++$widget->{frame};
		2676	$widget->update;
		2677	},
		2678	);
		2679	}
		2680
		2681	$self
2400	}	2682	}
2401		2683
2402	sub size_request {	2684	sub size_request {
2403	(32, 8)	2685	(32, 8)
2404	}	2686	}
2405		2687
		2688	sub update {
		2689	my ($self) = @_;
		2690
		2691	return unless $self->{visible};
		2692
		2693	$self->SUPER::update;
		2694	}
		2695
2406	sub _draw {	2696	sub _draw {
2407	my ($self) = @_;	2697	my ($self) = @_;
2408		2698
2409	return unless $::CONN;#d# manage and cache textures differently	2699	return unless $::CONN;
		2700
		2701	my $face;
		2702
		2703	if ($self->{frame}) {
		2704	my $anim = $::CONN->{anim}[$self->{anim}];
		2705
		2706	$face = $anim->[ $self->{frame} % @$anim ]
		2707	if $anim && @$anim;
		2708	}
		2709
2410	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2710	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411		2711
2412	# TODO animation
2413	if ($tex) {	2712	if ($tex) {
2414	glEnable GL_TEXTURE_2D;	2713	glEnable GL_TEXTURE_2D;
2415	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2714	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2416	glColor 1, 1, 1, 1;	2715	glColor 1, 1, 1, 1;
2417	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2716	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418	glDisable GL_TEXTURE_2D;	2717	glDisable GL_TEXTURE_2D;
2419	}	2718	}
2420	}	2719	}
2421		2720
2422	#############################################################################	2721	sub DESTROY {
		2722	my ($self) = @_;
2423		2723
		2724	$self->{timer}->cancel
		2725	if $self->{timer};
		2726
		2727	$self->SUPER::DESTROY;
		2728	}
		2729
		2730	#############################################################################
		2731
2424	package CFClient::UI::InventoryItem;	2732	package CFClient::UI::Inventory;
2425		2733
2426	our @ISA = CFClient::UI::HBox::;	2734	our @ISA = CFClient::UI::ScrolledWindow::;
2427		2735
2428	sub new {	2736	sub new {
2429	my $class = shift;	2737	my $class = shift;
2430		2738
2431	my %args = @_;
2432
2433	my $item = delete $args{item};
2434
2435	my $desc = $item->{nrof} < 2
2436	? $item->{name}
2437	: "$item->{nrof} $item->{name_pl}";
2438
2439
2440	my $self = $class->SUPER::new (	2739	my $self = $class->SUPER::new (
2441	can_hover => 1,	2740	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2442	can_events => 1,
2443	tooltip => (CFClient::UI::Label->escape ($desc)
2444	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2445	connect_button_down => sub {
2446	my ($self, $ev, $x, $y) = @_;
2447
2448	# todo: maybe put examine on 1? but should just be a tooltip :(
2449	if ($ev->{button} == 1) {
2450	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2451	} elsif ($ev->{button} == 2) {
2452	$::CONN->send ("apply $item->{tag}");
2453	} elsif ($ev->{button} == 3) {
2454	CFClient::UI::Menu->new (
2455	items => [
2456	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2457	[
2458	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2459	sub { $::CONN->send ("lock $item->{tag}") },
2460	],
2461	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2462	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2463	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2464	],
2465	)->popup ($ev);
2466	}
2467
2468	1
2469	},
2470	%args
2471	);
2472
2473	$self->add (new CFClient::UI::Face
2474	can_events => 0,
2475	face => $item->{face},
2476	anim => $item->{anim},
2477	animspeed => $item->{animspeed},
2478	);
2479
2480	$self->add (new CFClient::UI::Label
2481	can_events => 0,
2482	text => $desc,
2483	);
2484
2485	$self
2486	}
2487
2488	#############################################################################
2489
2490	package CFClient::UI::Inventory;
2491
2492	our @ISA = CFClient::UI::ScrolledWindow::;
2493
2494	sub new {
2495	my $class = shift;
2496
2497	my $self = $class->SUPER::new (
2498	scrolled => (new CFClient::UI::VBox),
2499	@_,	2741	@_,
2500	);	2742	);
2501		2743
2502	$self	2744	$self
2503	}	2745	}
…		…
2506	my ($self, $items) = @_;	2748	my ($self, $items) = @_;
2507		2749
2508	$self->{scrolled}->clear;	2750	$self->{scrolled}->clear;
2509	return unless $items;	2751	return unless $items;
2510		2752
2511	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2753	my @items = sort {
		2754	($a->{type} <=> $b->{type})
		2755	or ($a->{name} cmp $b->{name})
		2756	} @$items;
2512		2757
2513	$self->{real_items} = \@items;	2758	$self->{real_items} = \@items;
2514		2759
		2760	my $row = 0;
2515	for my $item (@items) {	2761	for my $item (@items) {
2516	my $desc = $item->{nrof} < 2	2762	CFClient::Item::update_widgets $item;
2517	? $item->{name}
2518	: "$item->{nrof} $item->{name_pl}";
2519		2763
2520	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);	2764	$self->{scrolled}->add (0, $row, $item->{face_widget});
2521	}	2765	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2766	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2522		2767
2523	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2768	$row++;
2524	}	2769	}
2525
2526	sub size_request {
2527	my ($self) = @_;
2528	($self->{req_w}, $self->{req_h});
2529	}	2770	}
2530		2771
2531	#############################################################################	2772	#############################################################################
2532		2773
2533	package CFClient::UI::Menu;	2774	package CFClient::UI::Menu;
…		…
2568		2809
2569	# popup given the event (must be a mouse button down event currently)	2810	# popup given the event (must be a mouse button down event currently)
2570	sub popup {	2811	sub popup {
2571	my ($self, $ev) = @_;	2812	my ($self, $ev) = @_;
2572		2813
2573	$self->emit ("popdown");	2814	$self->_emit ("popdown");
2574		2815
2575	# maybe save $GRAB? must be careful about events...	2816	# maybe save $GRAB? must be careful about events...
2576	$GRAB = $self;	2817	$GRAB = $self;
2577	$self->{button} = $ev->{button};	2818	$self->{button} = $ev->{button};
2578		2819
…		…
2593		2834
2594	if ($ev->{button} == $self->{button}) {	2835	if ($ev->{button} == $self->{button}) {
2595	undef $GRAB;	2836	undef $GRAB;
2596	$self->hide;	2837	$self->hide;
2597		2838
2598	$self->emit ("popdown");	2839	$self->_emit ("popdown");
2599	$self->{hover}[1]->() if $self->{hover};	2840	$self->{hover}[1]->() if $self->{hover};
2600	}	2841	}
2601	}	2842	}
2602		2843
2603	#############################################################################	2844	#############################################################################
2604		2845
2605	package CFClient::UI::Statusbox;	2846	package CFClient::UI::Statusbox;
2606		2847
2607	our @ISA = CFClient::UI::VBox::;	2848	our @ISA = CFClient::UI::VBox::;
		2849
		2850	sub new {
		2851	my $class = shift;
		2852
		2853	$class->SUPER::new (
		2854	fontsize => 0.8,
		2855	@_,
		2856	)
		2857	}
2608		2858
2609	sub reorder {	2859	sub reorder {
2610	my ($self) = @_;	2860	my ($self) = @_;
2611	my $NOW = time;	2861	my $NOW = time;
2612		2862
…		…
2631	? "<b>$item->{count} ×</b> $item->{text}"	2881	? "<b>$item->{count} ×</b> $item->{text}"
2632	: $item->{text};	2882	: $item->{text};
2633		2883
2634	for ($short) {	2884	for ($short) {
2635	s/^\s+//;	2885	s/^\s+//;
2636	s/\012.*/…/s;	2886	s/\s+/ /g;
2637	my $len = int 30 / $item->{fontsize};
2638	substr $_, $len, length, "…" if $len < length;
2639	}	2887	}
2640		2888
2641	new CFClient::UI::Label	2889	new CFClient::UI::Label
2642	markup => $short,	2890	markup => $short,
2643	tooltip => $item->{tooltip},	2891	tooltip => $item->{tooltip},
2644	tooltip_font => $::FONT_PROP,	2892	tooltip_font => $::FONT_PROP,
2645	tooltip_width => 0.67,	2893	tooltip_width => 0.67,
2646	fontsize => $item->{fontsize},	2894	fontsize => $item->{fontsize} || $self->{fontsize},
		2895	max_w => $::WIDTH * 0.44,
2647	color => $item->{color},	2896	fg => $item->{fg},
2648	can_events => 1,	2897	can_events => 1,
2649	can_hover => 1	2898	can_hover => 1
2650	};	2899	};
2651	}	2900	}
2652		2901
…		…
2654	$self->SUPER::add (reverse @widgets);	2903	$self->SUPER::add (reverse @widgets);
2655	}	2904	}
2656		2905
2657	sub add {	2906	sub add {
2658	my ($self, $text, %arg) = @_;	2907	my ($self, $text, %arg) = @_;
		2908
		2909	$text =~ s/^\s+//;
		2910	$text =~ s/\s+$//;
		2911
		2912	return unless $text;
2659		2913
2660	my $timeout = time + ((delete $arg{timeout}) || 60);	2914	my $timeout = time + ((delete $arg{timeout}) || 60);
2661		2915
2662	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2916	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663		2917
…		…
2666	$item->{count}++;	2920	$item->{count}++;
2667	} else {	2921	} else {
2668	$item->{count} = 1;	2922	$item->{count} = 1;
2669	$item->{text} = $item->{tooltip} = $text;	2923	$item->{text} = $item->{tooltip} = $text;
2670	}	2924	}
		2925	$item->{id} = ++$self->{id};
2671	$item->{timeout} = $timeout;	2926	$item->{timeout} = $timeout;
2672	delete $item->{label};	2927	delete $item->{label};
2673	} else {	2928	} else {
2674	$self->{item}{$group} = {	2929	$self->{item}{$group} = {
2675	id => ++$self->{id},	2930	id => ++$self->{id},
2676	text => $text,	2931	text => $text,
2677	timeout => $timeout,	2932	timeout => $timeout,
2678	tooltip => $text,	2933	tooltip => $text,
2679	fontsize => 0.8,
2680	color => [0.8, 0.8, 0.8, 0.8],	2934	fg => [0.8, 0.8, 0.8, 0.8],
2681	pri => 0,	2935	pri => 0,
2682	count => 1,	2936	count => 1,
2683	%arg,	2937	%arg,
2684	};	2938	};
2685	}	2939	}
2686		2940
2687	$self->reorder;	2941	$self->reorder;
2688	}	2942	}
2689		2943
		2944	sub reconfigure {
		2945	my ($self) = @_;
		2946
		2947	delete $_->{label}
		2948	for values %{ $self->{item} || {} };
		2949
		2950	$self->reorder;
		2951	$self->SUPER::reconfigure;
		2952	}
		2953
2690	#############################################################################	2954	#############################################################################
2691		2955
2692	package CFClient::UI::Root;	2956	package CFClient::UI::Root;
2693		2957
2694	our @ISA = CFClient::UI::Container::;	2958	our @ISA = CFClient::UI::Container::;
…		…
2697		2961
2698	sub new {	2962	sub new {
2699	my $class = shift;	2963	my $class = shift;
2700		2964
2701	$class->SUPER::new (	2965	$class->SUPER::new (
		2966	visible => 1,
2702	@_,	2967	@_,
2703	)	2968	)
2704	}	2969	}
2705		2970
2706	sub configure {	2971	sub configure {
…		…
2724	}	2989	}
2725		2990
2726	sub size_allocate {	2991	sub size_allocate {
2727	my ($self, $w, $h) = @_;	2992	my ($self, $w, $h) = @_;
2728		2993
2729	my $old_w = $self->{old_w};
2730	my $old_h = $self->{old_h};
2731
2732	if ($old_w && $old_h) {
2733	for my $child ($self->children) {
2734	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2735	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2736	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2737	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2738	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2739	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2740	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2741	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2742	}
2743	}
2744
2745	for my $child ($self->children) {	2994	for my $child ($self->children) {
2746	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2995	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2747		2996
		2997	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2998	if exists $child->{req_x};
		2999
		3000	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3001	if exists $child->{req_y};
		3002
		3003	delete @$child{qw(req_x req_y)};
		3004
2748	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3005	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2749	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3006	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3007
2750	$child->configure ($X, $Y, $W, $H);	3008	$child->configure ($X, $Y, $W, $H);
2751	}	3009	}
2752
2753	$self->{old_w} = $w;
2754	$self->{old_h} = $h;
2755	}	3010	}
2756		3011
2757	sub coord2local {	3012	sub coord2local {
2758	my ($self, $x, $y) = @_;	3013	my ($self, $x, $y) = @_;
2759		3014
…		…
2772	$self->check_size;	3027	$self->check_size;
2773	$::WANT_REFRESH++;	3028	$::WANT_REFRESH++;
2774	}	3029	}
2775		3030
2776	sub add {	3031	sub add {
2777	my ($self, $child) = @_;	3032	my ($self, @children) = @_;
2778		3033
		3034	for my $child (@children) {
		3035	$child->{is_toplevel} = 1;
		3036
2779	# integerise window positions	3037	# integerise window positions
2780	$child->{x} = int $child->{x};	3038	$child->{x} = int $child->{x};
2781	$child->{y} = int $child->{y};	3039	$child->{y} = int $child->{y};
		3040	}
2782		3041
2783	$self->SUPER::add ($child);	3042	$self->SUPER::add (@children);
		3043
		3044	for (my @widgets = @children; my $w = pop @widgets; ) {
		3045	push @widgets, $w->children;
		3046	$w->set_visible;
		3047	}
		3048
		3049	}
		3050
		3051	sub remove {
		3052	my ($self, @children) = @_;
		3053
		3054	$self->SUPER::remove (@children);
		3055
		3056	while (@children) {
		3057	my $w = pop @children;
		3058	push @children, $w->children;
		3059	$w->set_invisible;
		3060	}
2784	}	3061	}
2785		3062
2786	sub on_refresh {	3063	sub on_refresh {
2787	my ($self, $id, $cb) = @_;	3064	my ($self, $id, $cb) = @_;
2788		3065
2789	$self->{refresh_hook}{$id} = $cb;	3066	$self->{refresh_hook}{$id} = $cb;
2790	}	3067	}
2791		3068
		3069	sub on_post_alloc {
		3070	my ($self, $id, $cb) = @_;
		3071
		3072	$self->{post_alloc_hook}{$id} = $cb;
		3073	}
		3074
2792	sub draw {	3075	sub draw {
2793	my ($self) = @_;	3076	my ($self) = @_;
2794		3077
		3078	while ($self->{refresh_hook}) {
		3079	$_->()
		3080	for values %{delete $self->{refresh_hook}};
		3081	}
		3082
2795	if ($self->{check_size}) {	3083	if ($self->{check_size}) {
2796	my @queue = ([], []);	3084	my @queue;
2797		3085
2798	for (;;) {	3086	for (;;) {
2799	if ($self->{check_size}) {	3087	if ($self->{check_size}) {
2800	# heuristic: check containers last	3088	#TODO use array-of-depth approach
2801	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3089
		3090	@queue = sort { $a->{visible} <=> $b->{visible} }
2802	for values %{delete $self->{check_size}}	3091	@queue, values %{delete $self->{check_size}};
2803	}	3092	}
2804		3093
2805	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3094	my $widget = pop @queue || last;
2806		3095
		3096	defined $widget->{visible} or last; # do not resize invisible widgets
		3097
2807	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3098	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2808	? @$widget{qw(user_w user_h)}	3099	? @$widget{qw(def_w def_h)}
2809	: $widget->size_request;	3100	: $widget->size_request;
2810		3101
2811	if (delete $widget->{force_alloc}	3102	if (delete $widget->{force_alloc}
2812	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3103	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2813	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3104	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
…		…
2830	$w = 0 if $w < 0;	3121	$w = 0 if $w < 0;
2831	$h = 0 if $h < 0;	3122	$h = 0 if $h < 0;
2832		3123
2833	$widget->{w} = $w;	3124	$widget->{w} = $w;
2834	$widget->{h} = $h;	3125	$widget->{h} = $h;
2835	$widget->size_allocate ($w, $h);
2836	$widget->emit (size_allocate => $w, $h);	3126	$widget->emit (size_allocate => $w, $h);
2837	}	3127	}
2838	}	3128	}
2839		3129
2840	while ($self->{refresh_hook}) {	3130	while ($self->{post_alloc_hook}) {
2841	$_->()	3131	$_->()
2842	for values %{delete $self->{refresh_hook}};	3132	for values %{delete $self->{post_alloc_hook}};
2843	}	3133	}
2844		3134
2845	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3135	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2846	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3136	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2847	glClear GL_COLOR_BUFFER_BIT;	3137	glClear GL_COLOR_BUFFER_BIT;
2848		3138
2849	glMatrixMode GL_PROJECTION;	3139	glMatrixMode GL_PROJECTION;
2850	glLoadIdentity;	3140	glLoadIdentity;
2851	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3141	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2852	glMatrixMode GL_MODELVIEW;	3142	glMatrixMode GL_MODELVIEW;
2853	glLoadIdentity;	3143	glLoadIdentity;
2854		3144
2855	$self->_draw;	3145	$self->_draw;
2856	}	3146	}
…		…
2858	#############################################################################	3148	#############################################################################
2859		3149
2860	package CFClient::UI;	3150	package CFClient::UI;
2861		3151
2862	$ROOT = new CFClient::UI::Root;	3152	$ROOT = new CFClient::UI::Root;
2863	$TOOLTIP = new CFClient::UI::Tooltip;	3153	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2864		3154
2865	1	3155	1
2866		3156

Diff Legend

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