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.196 by root, Fri May 12 00:16:34 2006 UTC vs.
Revision 1.239 by root, Thu May 25 22:29:57 2006 UTC

…		…
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		12
13	our $ROOT;	13	our $ROOT;
14	our $TOOLTIP;	14	our $TOOLTIP;
15	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
16		18
17	sub check_tooltip {	19	sub check_tooltip {
18	if (!$GRAB) {	20	if (!$GRAB) {
19	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
29	$TOOLTIP->set_tooltip_from ($widget);	31	$TOOLTIP->set_tooltip_from ($widget);
30	$TOOLTIP->show;	32	$TOOLTIP->show;
31		33
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		35
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
37		38
38	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
39	}	42	}
40		43
41	return;	44	return;
42	}	45	}
43	}	46	}
…		…
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	}	51	}
49		52
50	# class methods for events	53	# class methods for events
51	sub feed_sdl_key_down_event {	54	sub feed_sdl_key_down_event {
52	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	55	$FOCUS->emit (key_down => $_[0])
53	if $FOCUS;	56	if $FOCUS;
54	}	57	}
55		58
56	sub feed_sdl_key_up_event {	59	sub feed_sdl_key_up_event {
57	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	60	$FOCUS->emit (key_up => $_[0])
58	if $FOCUS;	61	if $FOCUS;
59	}	62	}
60		63
61	sub feed_sdl_button_down_event {	64	sub feed_sdl_button_down_event {
62	my ($ev) = @_;	65	my ($ev) = @_;
…		…
71	check_tooltip;	74	check_tooltip;
72	}	75	}
73		76
74	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
75		78
76	if ($GRAB) {	79	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77	($x, $y) = $GRAB->coord2local ($x, $y);	80	if $GRAB;
78	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79	}
80	}	81	}
81		82
82	sub feed_sdl_button_up_event {	83	sub feed_sdl_button_up_event {
83	my ($ev) = @_;	84	my ($ev) = @_;
84	my ($x, $y) = ($ev->{x}, $ev->{y});	85	my ($x, $y) = ($ev->{x}, $ev->{y});
85		86
86	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	87	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87		88
88	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	89	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89		90
90	if ($GRAB) {	91	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91	($x, $y) = $GRAB->coord2local ($x, $y);	92	if $GRAB;
92	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93	}
94		93
95	if (!$BUTTON_STATE) {	94	if (!$BUTTON_STATE) {
96	my $grab = $GRAB; undef $GRAB;	95	my $grab = $GRAB; undef $GRAB;
97	$grab->update if $grab;	96	$grab->update if $grab;
98	$GRAB->update if $GRAB;	97	$GRAB->update if $GRAB;
…		…
114	$HOVER->update if $HOVER && $HOVER->{can_hover};	113	$HOVER->update if $HOVER && $HOVER->{can_hover};
115		114
116	check_tooltip;	115	check_tooltip;
117	}	116	}
118		117
119	if ($HOVER) {
120	($x, $y) = $HOVER->coord2local ($x, $y);
121	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	118	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122	}	119	if $HOVER;
123	}	120	}
124		121
125	# convert position array to integers	122	# convert position array to integers
126	sub harmonize {	123	sub harmonize {
127	my ($vals) = @_;	124	my ($vals) = @_;
…		…
131	for (@$vals) {	128	for (@$vals) {
132	my $i = int $_ + $rem;	129	my $i = int $_ + $rem;
133	$rem += $_ - $i;	130	$rem += $_ - $i;
134	$_ = $i;	131	$_ = $i;
135	}	132	}
		133	}
		134
		135	sub full_refresh {
		136	# make a copy, otherwise for complains about freed values.
		137	my @widgets = values %WIDGET;
		138
		139	$_->update
		140	for @widgets;
		141	}
		142
		143	sub reconfigure_widgets {
		144	# make a copy, otherwise C<for> complains about freed values.
		145	my @widgets = values %WIDGET;
		146
		147	$_->reconfigure
		148	for @widgets;
		149	}
		150
		151	# call when resolution changes etc.
		152	sub rescale_widgets {
		153	my ($sx, $sy) = @_;
		154
		155	for my $widget (values %WIDGET) {
		156	if ($widget->{is_toplevel}) {
		157	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		158	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		159	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		160	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		161	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		162	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		163	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		164	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		165	}
		166	}
		167
		168	reconfigure_widgets;
136	}	169	}
137		170
138	#############################################################################	171	#############################################################################
139		172
140	package CFClient::UI::Base;	173	package CFClient::UI::Base;
…		…
158	if (/^connect_(.*)$/) {	191	if (/^connect_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	192	$self->connect ($1 => delete $self->{$_});
160	}	193	}
161	}	194	}
162		195
		196	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		197
163	$self	198	$self
164	}	199	}
165		200
166	sub destroy {	201	sub destroy {
167	my ($self) = @_;	202	my ($self) = @_;
…		…
170	%$self = ();	205	%$self = ();
171	}	206	}
172		207
173	sub show {	208	sub show {
174	my ($self) = @_;	209	my ($self) = @_;
175
176	return if $self->{parent};	210	return if $self->{parent};
177		211
178	$CFClient::UI::ROOT->add ($self);	212	$CFClient::UI::ROOT->add ($self);
179	}	213	}
180		214
181	sub hide {	215	sub show_centered {
182	my ($self) = @_;	216	my ($self) = @_;
		217	return if $self->{parent};
		218
		219	$self->show;
		220
		221	$CFClient::UI::ROOT->on_post_alloc (
		222	"centered $self" => sub {
		223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		224	},
		225	);
		226	}
		227
		228	sub set_invisible {
		229	my ($self) = @_;
		230
		231	# broken show/hide model
		232
		233	delete $self->{visible};
183		234
184	undef $GRAB if $GRAB == $self;	235	undef $GRAB if $GRAB == $self;
185	undef $HOVER if $HOVER == $self;	236	undef $HOVER if $HOVER == $self;
		237
		238	CFClient::UI::check_tooltip
		239	if $CFClient::UI::TOOLTIP->{owner} == $self;
		240
		241	$self->focus_out;
		242	}
		243
		244	sub hide {
		245	my ($self) = @_;
		246
		247	$self->set_invisible;
186		248
187	$self->{parent}->remove ($self)	249	$self->{parent}->remove ($self)
188	if $self->{parent};	250	if $self->{parent};
189	}	251	}
190		252
…		…
240		302
241	sub size_allocate {	303	sub size_allocate {
242	# nothing to be done	304	# nothing to be done
243	}	305	}
244		306
		307	sub reconfigure {
		308	my ($self) = @_;
		309
		310	$self->check_size (1);
		311	$self->update;
		312	}
		313
245	sub children {	314	sub children {
246	}
247
248	# call when resolution changes etc.
249	sub reconfigure {
250	my ($self) = @_;
251
252	$_->reconfigure
253	for $self->children;
254
255	$self->check_size;
256	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257	$self->update;
258	}	315	}
259		316
260	sub set_max_size {	317	sub set_max_size {
261	my ($self, $w, $h) = @_;	318	my ($self, $w, $h) = @_;
262		319
263	delete $self->{max_w}; $self->{max_w} = $w if $w;	320	delete $self->{max_w}; $self->{max_w} = $w if $w;
264	delete $self->{max_h}; $self->{max_h} = $h if $h;	321	delete $self->{max_h}; $self->{max_h} = $h if $h;
		322	}
		323
		324	sub set_tooltip {
		325	my ($self, $tooltip) = @_;
		326
		327	$tooltip =~ s/^\s+//;
		328	$tooltip =~ s/\s+$//;
		329
		330	return if $self->{tooltip} eq $tooltip;
		331
		332	$self->{tooltip} = $tooltip;
		333
		334	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		335	delete $CFClient::UI::TOOLTIP->{owner};
		336	CFClient::UI::check_tooltip;
		337	}
265	}	338	}
266		339
267	# translate global coordinates to local coordinate system	340	# translate global coordinates to local coordinate system
268	sub coord2local {	341	sub coord2local {
269	my ($self, $x, $y) = @_;	342	my ($self, $x, $y) = @_;
…		…
284	return if $FOCUS == $self;	357	return if $FOCUS == $self;
285	return unless $self->{can_focus};	358	return unless $self->{can_focus};
286		359
287	my $focus = $FOCUS; $FOCUS = $self;	360	my $focus = $FOCUS; $FOCUS = $self;
288		361
289	$self->emit (focus_in => $focus);	362	$self->_emit (focus_in => $focus);
290		363
291	$focus->update if $focus;	364	$focus->update if $focus;
292	$FOCUS->update;	365	$FOCUS->update;
293	}	366	}
294		367
…		…
297		370
298	return unless $FOCUS == $self;	371	return unless $FOCUS == $self;
299		372
300	my $focus = $FOCUS; undef $FOCUS;	373	my $focus = $FOCUS; undef $FOCUS;
301		374
302	$self->emit (focus_out => $focus);	375	$self->_emit (focus_out => $focus);
303		376
304	$focus->update if $focus; #?	377	$focus->update if $focus; #?
		378
		379	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		380	unless $FOCUS;
305	}	381	}
306		382
307	sub mouse_motion { }	383	sub mouse_motion { }
308	sub button_up { }	384	sub button_up { }
309	sub key_down { }	385	sub key_down { }
310	sub key_up { }	386	sub key_up { }
311		387
312	sub button_down {	388	sub button_down {
313	my ($self, $ev, $x, $y) = @_;	389	my ($self, $ev, $x, $y) = @_;
314		390
315	$self->focus_in;	391	$self->focus_in;
…		…
349	if ($ENV{PCLIENT_DEBUG}) {	425	if ($ENV{PCLIENT_DEBUG}) {
350	glPushMatrix;	426	glPushMatrix;
351	glColor 1, 1, 0, 1;	427	glColor 1, 1, 0, 1;
352	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	428	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
353	glBegin GL_LINE_LOOP;	429	glBegin GL_LINE_LOOP;
354	glVertex 0 , 0;	430	glVertex 0 , 0;
355	glVertex $self->{w}, 0;	431	glVertex $self->{w} - 1, 0;
356	glVertex $self->{w}, $self->{h};	432	glVertex $self->{w} - 1, $self->{h} - 1;
357	glVertex 0 , $self->{h};	433	glVertex 0 , $self->{h} - 1;
358	glEnd;	434	glEnd;
359	glPopMatrix;	435	glPopMatrix;
360	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	436	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361	}	437	}
362	}	438	}
363		439
364	sub _draw {	440	sub _draw {
365	my ($self) = @_;	441	my ($self) = @_;
…		…
382	sub set_parent {	458	sub set_parent {
383	my ($self, $parent) = @_;	459	my ($self, $parent) = @_;
384		460
385	Scalar::Util::weaken ($self->{parent} = $parent);	461	Scalar::Util::weaken ($self->{parent} = $parent);
386		462
		463	$self->{root} = $parent->{root};
		464	$self->{visible} = $parent->{visible};
		465
		466	# TODO: req_w _does_change after ->reconfigure
387	$self->check_size	467	$self->check_size
388	unless exists $self->{req_w};	468	unless exists $self->{req_w};
		469
		470	$self->show;
389	}	471	}
390		472
391	sub check_size {	473	sub check_size {
392	my ($self) = @_;	474	my ($self, $forced) = @_;
393		475
		476	$self->{force_alloc} = 1 if $forced;
394	$CFClient::UI::ROOT->{check_size}{$self} = $self;	477	$CFClient::UI::ROOT->{check_size}{$self} = $self;
395	}	478	}
396		479
397	sub update {	480	sub update {
398	my ($self) = @_;	481	my ($self) = @_;
…		…
405	my ($self, $signal, $cb) = @_;	488	my ($self, $signal, $cb) = @_;
406		489
407	push @{ $self->{signal_cb}{$signal} }, $cb;	490	push @{ $self->{signal_cb}{$signal} }, $cb;
408	}	491	}
409		492
		493	sub _emit {
		494	my ($self, $signal, @args) = @_;
		495
		496	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		497	}
		498
410	sub emit {	499	sub emit {
411	my ($self, $signal, @args) = @_;	500	my ($self, $signal, @args) = @_;
412		501
413	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	502	$self->_emit ($signal, @args)
		503	|| $self->$signal (@args);
414	}	504	}
415		505
416	sub DESTROY {	506	sub DESTROY {
417	my ($self) = @_;	507	my ($self) = @_;
418		508
		509	delete $WIDGET{$self+0};
419	#$self->deactivate;	510	#$self->deactivate;
420	}	511	}
421		512
422	#############################################################################	513	#############################################################################
423		514
…		…
432	my $class = shift;	523	my $class = shift;
433		524
434	# range [value, low, high, page]	525	# range [value, low, high, page]
435		526
436	$class->SUPER::new (	527	$class->SUPER::new (
437	bg => [0, 0, 0, 0.2],	528	#bg => [0, 0, 0, 0.2],
438	active_bg => [1, 1, 1, 0.5],	529	#active_bg => [1, 1, 1, 0.5],
439	@_	530	@_
440	)	531	)
441	}	532	}
442		533
443	sub _draw {	534	sub _draw {
444	my ($self) = @_;	535	my ($self) = @_;
445		536
		537	my $color = $FOCUS == $self && $self->{active_bg}
		538	? $self->{active_bg}
		539	: $self->{bg};
		540
		541	if ($color && (@$color < 4 || $color->[3])) {
446	my ($w, $h) = @$self{qw(w h)};	542	my ($w, $h) = @$self{qw(w h)};
447		543
448	glEnable GL_BLEND;	544	glEnable GL_BLEND;
449	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	545	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	546	glColor @$color;
451		547
452	glBegin GL_QUADS;	548	glBegin GL_QUADS;
453	glVertex 0 , 0;	549	glVertex 0 , 0;
454	glVertex 0 , $h;	550	glVertex 0 , $h;
455	glVertex $w, $h;	551	glVertex $w, $h;
456	glVertex $w, 0;	552	glVertex $w, 0;
457	glEnd;	553	glEnd;
458		554
459	glDisable GL_BLEND;	555	glDisable GL_BLEND;
		556	}
460	}	557	}
461		558
462	#############################################################################	559	#############################################################################
463		560
464	package CFClient::UI::Empty;	561	package CFClient::UI::Empty;
…		…
508	$self->{children} = [	605	$self->{children} = [
509	sort { $a->{z} <=> $b->{z} }	606	sort { $a->{z} <=> $b->{z} }
510	@{$self->{children}}, @widgets	607	@{$self->{children}}, @widgets
511	];	608	];
512		609
513	$self->check_size;	610	$self->check_size (1);
514	$self->update;	611	$self->update;
515	}	612	}
516		613
517	sub children {	614	sub children {
518	@{ $_[0]{children} }	615	@{ $_[0]{children} }
…		…
524	delete $child->{parent};	621	delete $child->{parent};
525	$child->hide;	622	$child->hide;
526		623
527	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	624	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
528		625
529	$self->check_size;	626	$self->check_size (1);
530	$self->update;	627	$self->update;
531	}	628	}
532		629
533	sub clear {	630	sub clear {
534	my ($self) = @_;	631	my ($self) = @_;
…		…
625	}	722	}
626		723
627	sub update {	724	sub update {
628	my ($self) = @_;	725	my ($self) = @_;
629		726
630	$ROOT->on_refresh ($self => sub { $self->render_child });	727	$ROOT->on_post_alloc ($self => sub { $self->render_child });
631	$self->SUPER::update;	728	$self->SUPER::update;
632	}	729	}
633		730
634	sub size_allocate {	731	sub size_allocate {
635	my ($self, $w, $h) = @_;	732	my ($self, $w, $h) = @_;
…		…
648	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	745	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649	glClearColor 0, 0, 0, 0;	746	glClearColor 0, 0, 0, 0;
650	glClear GL_COLOR_BUFFER_BIT;	747	glClear GL_COLOR_BUFFER_BIT;
651		748
652	$self->_render;	749	$self->_render;
653	# glColorMask 1, 1, 1, 0;
654	# glEnable GL_BLEND;
655	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656	# glRasterPos 0, 0;
657	# glCopyPixels 0, 0, $self->{w}, $self->{h};
658	# glDisable GL_BLEND;
659	# glColorMask 1, 1, 1, 1;
660	};	750	};
661	}	751	}
662		752
663	sub _draw {	753	sub _draw {
664	my ($self) = @_;	754	my ($self) = @_;
…		…
668	my $tex = $self->{texture}	758	my $tex = $self->{texture}
669	or return;	759	or return;
670		760
671	glEnable GL_TEXTURE_2D;	761	glEnable GL_TEXTURE_2D;
672	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	762	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
673	glColor 0, 0, 0, 1;	763	glColor 1, 1, 1, 1;
674		764
675	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	765	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
676		766
677	glDisable GL_TEXTURE_2D;	767	glDisable GL_TEXTURE_2D;
678	}	768	}
…		…
681		771
682	package CFClient::UI::ViewPort;	772	package CFClient::UI::ViewPort;
683		773
684	our @ISA = CFClient::UI::Window::;	774	our @ISA = CFClient::UI::Window::;
685		775
		776	sub new {
		777	my $class = shift;
		778
		779	$class->SUPER::new (
		780	scroll_x => 0,
		781	scroll_y => 1,
		782	@_,
		783	)
		784	}
		785
686	sub size_request {	786	sub size_request {
687	my ($self) = @_;	787	my ($self) = @_;
688		788
689	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	789	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
690	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
691		790
692	@$self{qw(child_w child_h)}	791	@$self{qw(child_w child_h)}
693	}	792	}
694		793
695	sub size_allocate {	794	sub size_allocate {
696	my ($self, $w, $h) = @_;	795	my ($self, $w, $h) = @_;
697		796
		797	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		798	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		799
		800	$self->child->configure (0, 0, $w, $h);
698	$self->update;	801	$self->update;
699	}	802	}
700		803
701	sub set_offset {	804	sub set_offset {
702	my ($self, $x, $y) = @_;	805	my ($self, $x, $y) = @_;
…		…
756		859
757	my $slider = new CFClient::UI::Slider	860	my $slider = new CFClient::UI::Slider
758	vertical => 1,	861	vertical => 1,
759	range => [0, 0, 1, 0.01], # HACK fix	862	range => [0, 0, 1, 0.01], # HACK fix
760	connect_changed => sub {	863	connect_changed => sub {
761	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	864	$self->{vp}->set_offset (0, $_[1]);
762	},	865	},
763	;	866	;
764		867
765	$self = $class->SUPER::new (	868	$self = $class->SUPER::new (
766	vp => (new CFClient::UI::ViewPort),	869	vp => (new CFClient::UI::ViewPort expand => 1),
767	slider => $slider,	870	slider => $slider,
768	@_,	871	@_,
769	);	872	);
770		873
771	$self->{vp}->add ($self->{scrolled});	874	$self->{vp}->add ($self->{scrolled});
…		…
773	$self->add ($self->{slider});	876	$self->add ($self->{slider});
774		877
775	$self	878	$self
776	}	879	}
777		880
		881	sub update {
		882	my ($self) = @_;
		883
		884	$self->SUPER::update;
		885
		886	# todo: overwrite size_allocate of child
		887	my $child = $self->{vp}->child;
		888	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		889	}
		890
		891	sub size_allocate {
		892	my ($self, $w, $h) = @_;
		893
		894	$self->SUPER::size_allocate ($w, $h);
		895
		896	my $child = $self->{vp}->child;
		897	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		898	}
		899
778	#TODO# update range on size_allocate depeneing on child	900	#TODO# update range on size_allocate depending on child
779	# update viewport offset on scroll	901	# update viewport offset on scroll
780		902
781	#############################################################################	903	#############################################################################
782		904
783	package CFClient::UI::Frame;	905	package CFClient::UI::Frame;
…		…
787	use CFClient::OpenGL;	909	use CFClient::OpenGL;
788		910
789	sub new {	911	sub new {
790	my $class = shift;	912	my $class = shift;
791		913
792	my $self = $class->SUPER::new (	914	$class->SUPER::new (
793	bg => [1, 1, 1, 1],	915	bg => undef,
794	border_bg => [1, 1, 1, 1],
795	border => 0.8,
796	@_	916	@_,
797	);	917	)
798
799	$self
800	}	918	}
801		919
802	sub _draw {	920	sub _draw {
803	my ($self) = @_;	921	my ($self) = @_;
804		922
805	my ($w, $h) = ($self->{w}, $self->{h});	923	if ($self->{bg}) {
		924	my ($w, $h) = @$self{qw(w h)};
806		925
807	glEnable GL_BLEND;	926	glEnable GL_BLEND;
808	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	927	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809	glEnable GL_TEXTURE_2D;	928	glColor @{ $self->{bg} };
810	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
811		929
812	# glBegin GL_QUADS;	930	glBegin GL_QUADS;
813	# glColor 0, 0, 0, 0;
814	# glVertex 0 , 0;	931	glVertex 0 , 0;
815	# glVertex 0 , $h;	932	glVertex 0 , $h;
816	# glVertex $w, $h;	933	glVertex $w, $h;
817	# glVertex $w, 0;	934	glVertex $w, 0;
818	# glEnd;	935	glEnd;
819		936
820
821	$self->child->draw;
822	glDisable GL_BLEND;	937	glDisable GL_BLEND;
823	glDisable GL_TEXTURE_2D;	938	}
		939
		940	$self->SUPER::_draw;
824	}	941	}
825		942
826	#############################################################################	943	#############################################################################
827		944
828	package CFClient::UI::FancyFrame;	945	package CFClient::UI::FancyFrame;
…		…
839	my $class = shift;	956	my $class = shift;
840		957
841	# TODO: user_x, user_y, overwrite moveto?	958	# TODO: user_x, user_y, overwrite moveto?
842		959
843	my $self = $class->SUPER::new (	960	my $self = $class->SUPER::new (
844	bg => [1, 1, 1, 1],	961	bg => [1, 1, 1, 1],
845	border_bg => [1, 1, 1, 1],	962	border_bg => [1, 1, 1, 1],
846	border => 0.6,	963	border => 0.6,
		964	is_toplevel => 1,
847	can_events => 1,	965	can_events => 1,
848	@_	966	@_
849	);	967	);
850		968
851	$self->{title} &&= new CFClient::UI::Label	969	$self->{title} &&= new CFClient::UI::Label
852	align => 0,	970	align => 0,
…		…
876	my ($self, $w, $h) = @_;	994	my ($self, $w, $h) = @_;
877		995
878	$h -= List::Util::max 0, $self->border * 2;	996	$h -= List::Util::max 0, $self->border * 2;
879	$w -= List::Util::max 0, $self->border * 2;	997	$w -= List::Util::max 0, $self->border * 2;
880		998
881	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	999	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
882	if $self->{title};	1000	if $self->{title};
883		1001
884	$self->child->configure ($self->border, $self->border, $w, $h);	1002	$self->child->configure ($self->border, $self->border, $w, $h);
885	}	1003	}
886		1004
…		…
944	my ($self) = @_;	1062	my ($self) = @_;
945		1063
946	my ($w, $h ) = ($self->{w}, $self->{h});	1064	my ($w, $h ) = ($self->{w}, $self->{h});
947	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1065	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
948		1066
949	glEnable GL_BLEND;
950	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
951	glEnable GL_TEXTURE_2D;	1067	glEnable GL_TEXTURE_2D;
952	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1068	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
953		1069
954	my $border = $self->border;	1070	my $border = $self->border;
955		1071
956	glColor @{ $self->{border_bg} };	1072	glColor @{ $self->{border_bg} };
957	$tex[1]->draw_quad (0, 0, $w, $border);	1073	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
958	$tex[3]->draw_quad (0, $border, $border, $ch);	1074	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
959	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1075	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
960	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1076	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
961		1077
962	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1078	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
963	my $bg = $tex[0];	1079	my $bg = $tex[0];
964		1080
965	# TODO: repeat texture not scale	1081	# TODO: repeat texture not scale
…		…
969	glColor @{ $self->{bg} };	1085	glColor @{ $self->{bg} };
970		1086
971	$bg->{s} = $rep_x;	1087	$bg->{s} = $rep_x;
972	$bg->{t} = $rep_y;	1088	$bg->{t} = $rep_y;
973	$bg->{wrap_mode} = 1;	1089	$bg->{wrap_mode} = 1;
974	$bg->draw_quad ($border, $border, $cw, $ch);	1090	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1091	}
975		1092
976	glDisable GL_TEXTURE_2D;	1093	glDisable GL_TEXTURE_2D;
977	glDisable GL_BLEND;
978	}
979		1094
980	$self->{title}->draw if $self->{title};	1095	$self->{title}->draw if $self->{title};
981		1096
982	$self->child->draw;	1097	$self->child->draw;
983	}	1098	}
…		…
995	sub new {	1110	sub new {
996	my $class = shift;	1111	my $class = shift;
997		1112
998	$class->SUPER::new (	1113	$class->SUPER::new (
999	col_expand => [],	1114	col_expand => [],
1000	@_	1115	@_,
1001	)	1116	)
		1117	}
		1118
		1119	sub children {
		1120	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1002	}	1121	}
1003		1122
1004	sub add {	1123	sub add {
1005	my ($self, $x, $y, $child) = @_;	1124	my ($self, $x, $y, $child) = @_;
1006		1125
1007	$child->set_parent ($self);	1126	$child->set_parent ($self);
1008	$self->{children}[$y][$x] = $child;	1127	$self->{children}[$y][$x] = $child;
1009		1128
1010	$child->check_size;	1129	$self->check_size (1);
1011	}	1130	}
1012		1131
1013	sub children {
1014	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1015	}
1016
1017	# TODO: move to container class maybe? send childs a signal on removal?	1132	# TODO: move to container class maybe? send children a signal on removal?
1018	sub clear {	1133	sub clear {
1019	my ($self) = @_;	1134	my ($self) = @_;
1020		1135
1021	my @children = $self->children;	1136	my @children = $self->children;
1022	delete $self->{children};	1137	delete $self->{children};
…		…
1024	for (@children) {	1139	for (@children) {
1025	delete $_->{parent};	1140	delete $_->{parent};
1026	$_->hide;	1141	$_->hide;
1027	}	1142	}
1028		1143
		1144	$self->check_size (1);
1029	$self->update;	1145	$self->update;
1030	}	1146	}
1031		1147
1032	sub get_wh {	1148	sub get_wh {
1033	my ($self) = @_;	1149	my ($self) = @_;
…		…
1065	sub size_allocate {	1181	sub size_allocate {
1066	my ($self, $w, $h) = @_;	1182	my ($self, $w, $h) = @_;
1067		1183
1068	my ($ws, $hs) = $self->get_wh;	1184	my ($ws, $hs) = $self->get_wh;
1069		1185
1070	my $req_w = sum @$ws;	1186	my $req_w = (sum @$ws) || 1;
1071	my $req_h = sum @$hs;	1187	my $req_h = (sum @$hs) || 1;
1072		1188
1073	# TODO: nicer code && do row_expand	1189	# TODO: nicer code && do row_expand
1074	my @col_expand = @{$self->{col_expand}};	1190	my @col_expand = @{$self->{col_expand}};
1075	@col_expand = (1) x @$ws unless @col_expand;	1191	@col_expand = (1) x @$ws unless @col_expand;
1076	my $col_expand = (sum @col_expand) || 1;	1192	my $col_expand = (sum @col_expand) || 1;
…		…
1250		1366
1251	#############################################################################	1367	#############################################################################
1252		1368
1253	package CFClient::UI::Label;	1369	package CFClient::UI::Label;
1254		1370
1255	our @ISA = CFClient::UI::Base::;	1371	our @ISA = CFClient::UI::DrawBG::;
1256		1372
1257	use CFClient::OpenGL;	1373	use CFClient::OpenGL;
1258		1374
1259	sub new {	1375	sub new {
1260	my ($class, %arg) = @_;	1376	my ($class, %arg) = @_;
1261		1377
1262	my $self = $class->SUPER::new (	1378	my $self = $class->SUPER::new (
1263	fg => [1, 1, 1],	1379	fg => [1, 1, 1],
		1380	#bg => none
		1381	#active_bg => none
1264	#font => default_font	1382	#font => default_font
1265	#text => initial text	1383	#text => initial text
1266	#markup => initial narkup	1384	#markup => initial narkup
		1385	#max_w => maximum pixel width
		1386	ellipsise => 3, # end
1267	layout => (new CFClient::Layout),	1387	layout => (new CFClient::Layout),
1268	fontsize => 1,	1388	fontsize => 1,
1269	align => -1,	1389	align => -1,
1270	valign => -1,	1390	valign => -1,
1271	padding => 2,	1391	padding => 2,
…		…
1286	}	1406	}
1287		1407
1288	$self	1408	$self
1289	}	1409	}
1290		1410
1291	sub escape {	1411	sub escape($) {
1292	local $_ = $_[1];	1412	local $_ = $_[0];
1293		1413
1294	s/&/&amp;/g;	1414	s/&/&amp;/g;
1295	s/>/&gt;/g;	1415	s/>/&gt;/g;
1296	s/</&lt;/g;	1416	s/</&lt;/g;
1297		1417
1298	$_[1]	1418	$_
1299	}	1419	}
1300		1420
1301	sub update {	1421	sub update {
1302	my ($self) = @_;	1422	my ($self) = @_;
1303		1423
…		…
1336	sub size_request {	1456	sub size_request {
1337	my ($self) = @_;	1457	my ($self) = @_;
1338		1458
1339	$self->{layout}->set_font ($self->{font}) if $self->{font};	1459	$self->{layout}->set_font ($self->{font}) if $self->{font};
1340	$self->{layout}->set_width ($self->{max_w} || -1);	1460	$self->{layout}->set_width ($self->{max_w} || -1);
		1461	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1462	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1341	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1463	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1342		1464
1343	my ($w, $h) = $self->{layout}->size;	1465	my ($w, $h) = $self->{layout}->size;
1344		1466
1345	if (exists $self->{template}) {	1467	if (exists $self->{template}) {
…		…
1375	}	1497	}
1376		1498
1377	sub _draw {	1499	sub _draw {
1378	my ($self) = @_;	1500	my ($self) = @_;
1379		1501
		1502	$self->SUPER::_draw; # draw background, if applicable
		1503
1380	my $tex = $self->{texture} ||= do {	1504	my $tex = $self->{texture} ||= do {
1381	$self->{layout}->set_foreground (@{$self->{fg}});	1505	$self->{layout}->set_foreground (@{$self->{fg}});
1382	$self->{layout}->set_font ($self->{font}) if $self->{font};	1506	$self->{layout}->set_font ($self->{font}) if $self->{font};
1383	$self->{layout}->set_width ($self->{w});	1507	$self->{layout}->set_width ($self->{w});
		1508	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1509	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1384	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1510	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1385		1511
1386	my $tex = new_from_layout CFClient::Texture $self->{layout};	1512	my $tex = new_from_layout CFClient::Texture $self->{layout};
1387		1513
1388	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1514	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1389	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1515	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1390	: ($self->{w} - $tex->{w}) * 0.5;	1516	: ($self->{w} - $tex->{w}) * 0.5);
1391		1517
1392	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1518	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1393	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1519	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1394	: ($self->{h} - $tex->{h}) * 0.5;	1520	: ($self->{h} - $tex->{h}) * 0.5);
1395		1521
1396	$tex	1522	$tex
1397	};	1523	};
1398		1524
1399	glEnable GL_TEXTURE_2D;	1525	glEnable GL_TEXTURE_2D;
…		…
1427	active_fg => [0, 0, 0],	1553	active_fg => [0, 0, 0],
1428	can_hover => 1,	1554	can_hover => 1,
1429	can_focus => 1,	1555	can_focus => 1,
1430	valign => 0,	1556	valign => 0,
1431	can_events => 1,	1557	can_events => 1,
		1558	#text => ...
1432	@_	1559	@_
1433	)	1560	)
1434	}	1561	}
1435		1562
1436	sub _set_text {	1563	sub _set_text {
…		…
1446	$self->{text} = $text;	1573	$self->{text} = $text;
1447		1574
1448	$text =~ s/./*/g if $self->{hidden};	1575	$text =~ s/./*/g if $self->{hidden};
1449	$self->{layout}->set_text ("$text ");	1576	$self->{layout}->set_text ("$text ");
1450		1577
1451	$self->emit (changed => $self->{text});	1578	$self->_emit (changed => $self->{text});
1452	}	1579	}
1453		1580
1454	sub set_text {	1581	sub set_text {
1455	my ($self, $text) = @_;	1582	my ($self, $text) = @_;
1456		1583
1457	$self->{cursor} = length $text;	1584	$self->{cursor} = length $text;
1458	$self->_set_text ($text);	1585	$self->_set_text ($text);
		1586	$self->update;
1459	$self->check_size;	1587	$self->check_size;
1460	$self->update;
1461	}	1588	}
1462		1589
1463	sub get_text {	1590	sub get_text {
1464	$_[0]{text}	1591	$_[0]{text}
1465	}	1592	}
…		…
1468	my ($self) = @_;	1595	my ($self) = @_;
1469		1596
1470	my ($w, $h) = $self->SUPER::size_request;	1597	my ($w, $h) = $self->SUPER::size_request;
1471		1598
1472	($w + 1, $h) # add 1 for cursor	1599	($w + 1, $h) # add 1 for cursor
1473	}
1474
1475	sub size_allocate {
1476	my ($self, $w, $h) = @_;
1477
1478	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1479	}	1600	}
1480		1601
1481	sub key_down {	1602	sub key_down {
1482	my ($self, $ev) = @_;	1603	my ($self, $ev) = @_;
1483		1604
…		…
1485	my $sym = $ev->{sym};	1606	my $sym = $ev->{sym};
1486	my $uni = $ev->{unicode};	1607	my $uni = $ev->{unicode};
1487		1608
1488	my $text = $self->get_text;	1609	my $text = $self->get_text;
1489		1610
1490	if ($sym == 8) {	1611	if ($uni == 8) {
1491	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1612	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1492	} elsif ($sym == 127) {	1613	} elsif ($uni == 127) {
1493	substr $text, $self->{cursor}, 1, "";	1614	substr $text, $self->{cursor}, 1, "";
1494	} elsif ($sym == CFClient::SDLK_LEFT) {	1615	} elsif ($sym == CFClient::SDLK_LEFT) {
1495	--$self->{cursor} if $self->{cursor};	1616	--$self->{cursor} if $self->{cursor};
1496	} elsif ($sym == CFClient::SDLK_RIGHT) {	1617	} elsif ($sym == CFClient::SDLK_RIGHT) {
1497	++$self->{cursor} if $self->{cursor} < length $self->{text};	1618	++$self->{cursor} if $self->{cursor} < length $self->{text};
1498	} elsif ($sym == CFClient::SDLK_HOME) {	1619	} elsif ($sym == CFClient::SDLK_HOME) {
1499	$self->{cursor} = 0;	1620	$self->{cursor} = 0;
1500	} elsif ($sym == CFClient::SDLK_END) {	1621	} elsif ($sym == CFClient::SDLK_END) {
1501	$self->{cursor} = length $text;	1622	$self->{cursor} = length $text;
1502	} elsif ($sym == 27) {	1623	} elsif ($uni == 27) {
1503	$self->emit ('escape');	1624	$self->_emit ('escape');
1504	} elsif ($uni) {	1625	} elsif ($uni) {
1505	substr $text, $self->{cursor}++, 0, chr $uni;	1626	substr $text, $self->{cursor}++, 0, chr $uni;
1506	}	1627	}
1507		1628
1508	$self->_set_text ($text);	1629	$self->_set_text ($text);
1509	$self->update;	1630	$self->update;
		1631	$self->check_size;
1510	}	1632	}
1511		1633
1512	sub focus_in {	1634	sub focus_in {
1513	my ($self) = @_;	1635	my ($self) = @_;
1514		1636
…		…
1594	if ($sym == 13) {	1716	if ($sym == 13) {
1595	unshift @{$self->{history}},	1717	unshift @{$self->{history}},
1596	my $txt = $self->get_text;	1718	my $txt = $self->get_text;
1597	$self->{history_pointer} = -1;	1719	$self->{history_pointer} = -1;
1598	$self->{history_saveback} = '';	1720	$self->{history_saveback} = '';
1599	$self->emit (activate => $txt);	1721	$self->_emit (activate => $txt);
1600	$self->update;	1722	$self->update;
1601		1723
1602	} elsif ($sym == CFClient::SDLK_UP) {	1724	} elsif ($sym == CFClient::SDLK_UP) {
1603	if ($self->{history_pointer} < 0) {	1725	if ($self->{history_pointer} < 0) {
1604	$self->{history_saveback} = $self->get_text;	1726	$self->{history_saveback} = $self->get_text;
…		…
1643	my $class = shift;	1765	my $class = shift;
1644		1766
1645	$class->SUPER::new (	1767	$class->SUPER::new (
1646	padding => 4,	1768	padding => 4,
1647	fg => [1, 1, 1],	1769	fg => [1, 1, 1],
1648	bg => [1, 1, 1, 0.2],
1649	active_fg => [0, 0, 1],	1770	active_fg => [0, 0, 1],
1650	can_hover => 1,	1771	can_hover => 1,
1651	align => 0,	1772	align => 0,
1652	valign => 0,	1773	valign => 0,
1653	can_events => 1,	1774	can_events => 1,
1654	@_	1775	@_
1655	)	1776	)
1656	}	1777	}
1657		1778
		1779	sub activate { }
		1780
1658	sub button_up {	1781	sub button_up {
1659	my ($self, $ev, $x, $y) = @_;	1782	my ($self, $ev, $x, $y) = @_;
1660		1783
		1784	$self->emit ("activate")
1661	if ($x >= 0 && $x < $self->{w}	1785	if $x >= 0 && $x < $self->{w}
1662	&& $y >= 0 && $y < $self->{h}) {	1786	&& $y >= 0 && $y < $self->{h};
1663	$self->emit ("activate");
1664	}
1665	}	1787	}
1666		1788
1667	sub _draw {	1789	sub _draw {
1668	my ($self) = @_;	1790	my ($self) = @_;
1669		1791
…		…
1701		1823
1702	$class->SUPER::new (	1824	$class->SUPER::new (
1703	padding => 2,	1825	padding => 2,
1704	fg => [1, 1, 1],	1826	fg => [1, 1, 1],
1705	active_fg => [1, 1, 0],	1827	active_fg => [1, 1, 0],
		1828	bg => [0, 0, 0, 0.2],
		1829	active_bg => [1, 1, 1, 0.5],
1706	state => 0,	1830	state => 0,
1707	can_hover => 1,	1831	can_hover => 1,
1708	@_	1832	@_
1709	)	1833	)
1710	}	1834	}
…		…
1719	my ($self, $ev, $x, $y) = @_;	1843	my ($self, $ev, $x, $y) = @_;
1720		1844
1721	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1845	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1722	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1846	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1723	$self->{state} = !$self->{state};	1847	$self->{state} = !$self->{state};
1724	$self->emit (changed => $self->{state});	1848	$self->_emit (changed => $self->{state});
1725	}	1849	}
1726	}	1850	}
1727		1851
1728	sub _draw {	1852	sub _draw {
1729	my ($self) = @_;	1853	my ($self) = @_;
…		…
1734		1858
1735	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1859	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1736		1860
1737	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1861	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1738		1862
		1863	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1864
1739	glEnable GL_TEXTURE_2D;	1865	glEnable GL_TEXTURE_2D;
1740
1741	my $tex = $self->{state} ? $tex[1] : $tex[0];
1742
1743	$tex->draw_quad_alpha (0, 0, $s, $s);	1866	$tex->draw_quad_alpha (0, 0, $s, $s);
1744
1745	glDisable GL_TEXTURE_2D;	1867	glDisable GL_TEXTURE_2D;
1746	}	1868	}
1747		1869
1748	#############################################################################	1870	#############################################################################
1749		1871
…		…
1996	qw(s1_slider.png s1_slider_bg.png);	2118	qw(s1_slider.png s1_slider_bg.png);
1997		2119
1998	sub new {	2120	sub new {
1999	my $class = shift;	2121	my $class = shift;
2000		2122
2001	# range [value, low, high, page]	2123	# range [value, low, high, page, unit]
2002		2124
2003	# TODO: 0-width page	2125	# TODO: 0-width page
2004	# TODO: req_w/h are wrong with vertical	2126	# TODO: req_w/h are wrong with vertical
2005	# TODO: calculations are off	2127	# TODO: calculations are off
2006	my $self = $class->SUPER::new (	2128	my $self = $class->SUPER::new (
2007	fg => [1, 1, 1],	2129	fg => [1, 1, 1],
2008	active_fg => [0, 0, 0],	2130	active_fg => [0, 0, 0],
		2131	bg => [0, 0, 0, 0.2],
		2132	active_bg => [1, 1, 1, 0.5],
2009	range => [0, 0, 100, 10],	2133	range => [0, 0, 100, 10, 0],
2010	req_w => $::WIDTH / 80,	2134	req_w => $::WIDTH / 80,
2011	req_h => $::WIDTH / 80,	2135	req_h => $::WIDTH / 80,
2012	vertical => 0,	2136	vertical => 0,
2013	can_hover => 1,	2137	can_hover => 1,
2014	inner_pad => 5,	2138	inner_pad => 0.02,
2015	@_	2139	@_
2016	);	2140	);
2017		2141
		2142	$self->set_value ($self->{range}[0]);
		2143	$self->update;
		2144
2018	$self	2145	$self
		2146	}
		2147
		2148	sub set_range {
		2149	my ($self, $range) = @_;
		2150
		2151	($range, $self->{range}) = ($self->{range}, $range);
		2152
		2153	$self->update
		2154	if "@$range" ne "@{$self->{range}}";
		2155	}
		2156
		2157	sub set_value {
		2158	my ($self, $value) = @_;
		2159
		2160	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2161
		2162	$hi = $lo + 1 if $hi <= $lo;
		2163
		2164	$page = $hi - $lo if $page > $hi - $lo;
		2165
		2166	$value = $lo if $value < $lo;
		2167	$value = $hi - $page if $value > $hi - $page;
		2168
		2169	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2170	if $unit;
		2171
		2172	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2173
		2174	if ($value != $old_value) {
		2175	$self->_emit (changed => $value);
		2176	$self->update;
		2177	}
2019	}	2178	}
2020		2179
2021	sub size_request {	2180	sub size_request {
2022	my ($self) = @_;	2181	my ($self) = @_;
2023		2182
…		…
2029		2188
2030	sub button_down {	2189	sub button_down {
2031	my ($self, $ev, $x, $y) = @_;	2190	my ($self, $ev, $x, $y) = @_;
2032		2191
2033	$self->SUPER::button_down ($ev, $x, $y);	2192	$self->SUPER::button_down ($ev, $x, $y);
		2193
		2194	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2195
2034	$self->mouse_motion ($ev, $x, $y);	2196	$self->mouse_motion ($ev, $x, $y);
2035	}	2197	}
2036		2198
2037	sub mouse_motion {	2199	sub mouse_motion {
2038	my ($self, $ev, $x, $y) = @_;	2200	my ($self, $ev, $x, $y) = @_;
2039		2201
2040	if ($GRAB == $self) {	2202	if ($GRAB == $self) {
		2203	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2204
		2205	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2206
		2207	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2208
		2209	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2210	}
		2211	}
		2212
		2213	sub update {
		2214	my ($self) = @_;
		2215
		2216	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2217	$self->set_value ($self->{range}[0]);
		2218
2041	my ($value, $lo, $hi, $page) = @{$self->{range}};	2219	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2220	my $range = ($hi - $page - $lo) || 1e-100;
2042		2221
2043	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2222	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2044		2223
2045	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2224	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2046	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2225	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2047		2226
2048	$x -= $inner_pad_px; # substract the padding	2227	$value = ($value - $lo) / $range;
2049	$x = $x * ($hi - $lo) / $inner_w + $lo;	2228	$value = $value * $self->{scale} + $self->{offset};
2050	$x = $lo if $x < $lo;
2051	$x = $hi - $page if $x > $hi - $page;
2052	$self->{range}[0] = $x;
2053		2229
2054	$self->emit (changed => $x);	2230	$self->{knob_x} = $value - $knob_w * 0.5;
2055	$self->update;	2231	$self->{knob_w} = $knob_w;
2056	}	2232	});
2057	}
2058		2233
2059	# the inner_* stuff is for generating a padding for the slider handle,	2234	$self->SUPER::update;
2060	# so that the handle doesn't leave the texture. This calculation isn't 100%
2061	# correct propably, but it does the job for now
2062	sub _calc_inner_pad_px {
2063	my ($self, $w) = @_;
2064	($w / 100) * $self->{inner_pad} # % to pixels
2065	}	2235	}
2066		2236
2067	sub _draw {	2237	sub _draw {
2068	my ($self) = @_;	2238	my ($self) = @_;
2069		2239
2070	$self->SUPER::_draw ();	2240	$self->SUPER::_draw ();
2071		2241
2072	my ($w, $h) = @$self{qw(w h)};	2242	glScale $self->{w}, $self->{h};
2073		2243
2074	if ($self->{vertical}) {	2244	if ($self->{vertical}) {
2075	# draw a vertical slider like a rotated horizontal slider	2245	# draw a vertical slider like a rotated horizontal slider
2076		2246
		2247	glTranslate 1, 0, 0;
2077	glRotate 90, 0, 0, 1;	2248	glRotate 90, 0, 0, 1;
2078	glTranslate 0, -$self->{w}, 0;
2079
2080	($w, $h) = ($h, $w);
2081	}	2249	}
2082		2250
2083	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2251	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2084	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2252	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2085		2253
2086	my ($value, $lo, $hi, $page) = @{$self->{range}};
2087
2088	$hi = $value + 1 if $lo == $hi;
2089
2090	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2091	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2092
2093	$page = int $page * $inner_w / ($hi - $lo);
2094	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2095
2096	$w -= $page;
2097	$page &= ~1;
2098	glTranslate $page * 0.5, 0, 0;
2099	$page ||= 2;
2100
2101	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2102	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2103
2104	glEnable GL_TEXTURE_2D;	2254	glEnable GL_TEXTURE_2D;
2105	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2255	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2106		2256
2107	# draw background	2257	# draw background
2108	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2258	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2109		2259
2110	# draw handle	2260	# draw handle
2111	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2261	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2112		2262
2113	glDisable GL_TEXTURE_2D;	2263	glDisable GL_TEXTURE_2D;
2114	}	2264	}
		2265
		2266	#############################################################################
		2267
		2268	package CFClient::UI::ValSlider;
		2269
		2270	our @ISA = CFClient::UI::HBox::;
		2271
		2272	sub new {
		2273	my ($class, %arg) = @_;
		2274
		2275	my $range = delete $arg{range};
		2276
		2277	my $self = $class->SUPER::new (
		2278	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2279	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2280	to_value => sub { shift },
		2281	from_value => sub { shift },
		2282	%arg,
		2283	);
		2284
		2285	$self->{slider}->connect (changed => sub {
		2286	my ($self, $value) = @_;
		2287	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2288	$self->{parent}->emit (changed => $value);
		2289	});
		2290
		2291	# $self->{entry}->connect (changed => sub {
		2292	# my ($self, $value) = @_;
		2293	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2294	# $self->{parent}->emit (changed => $value);
		2295	# });
		2296
		2297	$self->add ($self->{slider}, $self->{entry});
		2298
		2299	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2300
		2301	$self
		2302	}
		2303
		2304	sub set_range { shift->{slider}->set_range (@_) }
		2305	sub set_value { shift->{slider}->set_value (@_) }
2115		2306
2116	#############################################################################	2307	#############################################################################
2117		2308
2118	package CFClient::UI::TextView;	2309	package CFClient::UI::TextView;
2119		2310
…		…
2149		2340
2150	$self->{fontsize} = $fontsize;	2341	$self->{fontsize} = $fontsize;
2151	$self->reflow;	2342	$self->reflow;
2152	}	2343	}
2153		2344
2154	sub text_height {
2155	my ($self, $text) = @_;
2156
2157	my $layout = $self->{layout};
2158
2159	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2160	$layout->set_width ($self->{children}[0]{w});
2161	$layout->set_markup ($text);
2162
2163	($layout->size)[1]
2164	}
2165
2166	sub reflow {
2167	my ($self) = @_;
2168
2169	$self->{need_reflow}++;
2170	$self->update;
2171	}
2172
2173	sub size_allocate {	2345	sub size_allocate {
2174	my ($self, $w, $h) = @_;	2346	my ($self, $w, $h) = @_;
2175		2347
2176	$self->SUPER::size_allocate ($w, $h);	2348	$self->SUPER::size_allocate ($w, $h);
2177		2349
…		…
2180	$self->{layout}->set_width ($self->{children}[0]{w});	2352	$self->{layout}->set_width ($self->{children}[0]{w});
2181		2353
2182	$self->reflow;	2354	$self->reflow;
2183	}	2355	}
2184		2356
		2357	sub text_size {
		2358	my ($self, $text, $indent) = @_;
		2359
		2360	my $layout = $self->{layout};
		2361
		2362	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2363	$layout->set_width ($self->{children}[0]{w} - $indent);
		2364	$layout->set_markup ($text);
		2365
		2366	$layout->size
		2367	}
		2368
		2369	sub reflow {
		2370	my ($self) = @_;
		2371
		2372	$self->{need_reflow}++;
		2373	$self->update;
		2374	}
		2375
		2376	sub set_offset {
		2377	my ($self, $offset) = @_;
		2378
		2379	# todo: base offset on lines or so, not on pixels
		2380	$self->{children}[1]->set_value ($offset);
		2381	}
		2382
		2383	sub clear {
		2384	my ($self) = @_;
		2385
		2386	$self->{par} = [];
		2387	$self->{height} = 0;
		2388	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2389	}
		2390
2185	sub add_paragraph {	2391	sub add_paragraph {
2186	my ($self, $color, $text) = @_;	2392	my ($self, $color, $text, $indent) = @_;
2187		2393
2188	#TODO: intelligently "reformat" paragraph	2394	for my $line (split /\n/, $text) {
2189		2395	my ($w, $h) = $self->text_size ($line);
2190	my $height = $self->text_height ($text);
2191
2192	$self->{height} += $height;	2396	$self->{height} += $h;
		2397	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2398	}
2193		2399
2194	push @{$self->{par}}, [$height, $color, $text];
2195
2196	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2400	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2197	$self->{children}[1]->update;
2198	}	2401	}
2199		2402
2200	sub update {	2403	sub update {
2201	my ($self) = @_;	2404	my ($self) = @_;
2202		2405
…		…
2204		2407
2205	return unless $self->{h} > 0;	2408	return unless $self->{h} > 0;
2206		2409
2207	delete $self->{texture};	2410	delete $self->{texture};
2208		2411
2209	$ROOT->on_refresh ($self, sub {	2412	$ROOT->on_post_alloc ($self, sub {
		2413	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2414
2210	if (delete $self->{need_reflow}) {	2415	if (delete $self->{need_reflow}) {
2211	my $height = 0;	2416	my $height = 0;
2212		2417
2213	$height += $_->[0] = $self->text_height ($_->[2])	2418	my $layout = $self->{layout};
		2419
		2420	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2421
2214	for @{$self->{par}};	2422	for (@{$self->{par}}) {
		2423	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2424	$layout->set_width ($W - $_->[3]);
		2425	$layout->set_markup ($_->[4]);
		2426	my ($w, $h) = $layout->size;
		2427	$_->[0] = $w + $_->[3];
		2428	$_->[1] = $h;
		2429	}
		2430
		2431	$height += $_->[1];
		2432	}
2215		2433
2216	$self->{height} = $height;	2434	$self->{height} = $height;
2217		2435
2218	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2436	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2219		2437
2220	delete $self->{texture};	2438	delete $self->{texture};
2221	}	2439	}
2222		2440
2223	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2441	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2224	glClearColor 0, 0, 0, 0;	2442	glClearColor 0.5, 0.5, 0.5, 0;
2225	glClear GL_COLOR_BUFFER_BIT;	2443	glClear GL_COLOR_BUFFER_BIT;
2226		2444
2227	glEnable GL_TEXTURE_2D;
2228	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2229
2230	my $top = int $self->{children}[1]{range}[0];	2445	my $top = int $self->{children}[1]{range}[0];
2231		2446
2232	my $y0 = $top;	2447	my $y0 = $top;
2233	my $y1 = $top + $self->{h};	2448	my $y1 = $top + $H;
2234		2449
2235	my $y = 0;	2450	my $y = 0;
2236		2451
2237	my $layout = $self->{layout};	2452	my $layout = $self->{layout};
2238		2453
2239	$layout->set_font ($self->{font}) if $self->{font};	2454	$layout->set_font ($self->{font}) if $self->{font};
2240		2455
		2456	glEnable GL_BLEND;
		2457	#TODO# not correct in windows where rgba is forced off
		2458	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2459
2241	for my $par (@{$self->{par}}) {	2460	for my $par (@{$self->{par}}) {
2242	my $h = $par->[0];	2461	my $h = $par->[1];
2243		2462
2244	if ($y0 < $y + $h && $y < $y1) {	2463	if ($y0 < $y + $h && $y < $y1) {
2245	$layout->set_foreground (@{ $par->[1] });	2464	$layout->set_foreground (@{ $par->[2] });
		2465	$layout->set_width ($W - $par->[3]);
2246	$layout->set_markup ($par->[2]);	2466	$layout->set_markup ($par->[4]);
2247		2467
2248	my ($W, $H) = $layout->size;	2468	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2249	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2469
		2470	glRasterPos $par->[3], $y - $y0;
		2471	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2250	}	2472	}
2251		2473
2252	$y += $h;	2474	$y += $h;
2253	}	2475	}
2254		2476
2255	glDisable GL_TEXTURE_2D;	2477	glDisable GL_BLEND;
2256	};	2478	};
2257	});	2479	});
2258	}	2480	}
2259		2481
2260	sub _draw {	2482	sub _draw {
2261	my ($self) = @_;	2483	my ($self) = @_;
2262		2484
2263	glEnable GL_TEXTURE_2D;	2485	glEnable GL_TEXTURE_2D;
2264	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2486	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2265	glColor 1, 1, 1, 1;	2487	glColor 1, 1, 1, 1;
2266	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2488	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2267	glDisable GL_TEXTURE_2D;	2489	glDisable GL_TEXTURE_2D;
2268		2490
2269	$self->{children}[1]->draw;	2491	$self->{children}[1]->draw;
2270		2492
2271	}	2493	}
…		…
2340		2562
2341	# TODO: use animation	2563	# TODO: use animation
2342	if ($self->{state} = !$self->{state}) {	2564	if ($self->{state} = !$self->{state}) {
2343	$CFClient::UI::ROOT->add ($self->{other});	2565	$CFClient::UI::ROOT->add ($self->{other});
2344	$self->{other}->move ($self->coord2global (0, $self->{h}));	2566	$self->{other}->move ($self->coord2global (0, $self->{h}));
2345	$self->emit ("open");	2567	$self->_emit ("open");
2346	} else {	2568	} else {
2347	$CFClient::UI::ROOT->remove ($self->{other});	2569	$CFClient::UI::ROOT->remove ($self->{other});
2348	$self->emit ("close");	2570	$self->_emit ("close");
2349	}	2571	}
2350		2572
2351	$self->emit (changed => $self->{state});	2573	$self->_emit (changed => $self->{state});
2352	}	2574	}
2353		2575
2354	#############################################################################	2576	#############################################################################
2355		2577
2356	package CFClient::UI::Tooltip;	2578	package CFClient::UI::Tooltip;
…		…
2369	}	2591	}
2370		2592
2371	sub set_tooltip_from {	2593	sub set_tooltip_from {
2372	my ($self, $widget) = @_;	2594	my ($self, $widget) = @_;
2373		2595
2374	$self->{label} = new CFClient::UI::Label	2596	$self->add (new CFClient::UI::Label
2375	markup => $widget->{tooltip},	2597	markup => $widget->{tooltip},
2376	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2598	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2377	fontsize => 0.8,	2599	fontsize => 0.8,
2378	fg => [0, 0, 0, 1],	2600	fg => [0, 0, 0, 1],
		2601	ellipsise => 0,
2379	font => ($widget->{tooltip_font} || $::FONT_PROP);	2602	font => ($widget->{tooltip_font} || $::FONT_PROP),
2380		2603	);
2381	$self->add ($self->{label});
2382	}	2604	}
2383		2605
2384	sub size_request {	2606	sub size_request {
2385	my ($self) = @_;	2607	my ($self) = @_;
2386		2608
…		…
2396	}	2618	}
2397		2619
2398	sub _draw {	2620	sub _draw {
2399	my ($self) = @_;	2621	my ($self) = @_;
2400		2622
2401	glPushMatrix;
2402	glTranslate 0.375, 0.375;	2623	glTranslate 0.375, 0.375;
2403		2624
2404	my ($w, $h) = @$self{qw(w h)};	2625	my ($w, $h) = @$self{qw(w h)};
2405		2626
2406	glColor 1, 0.8, 0.4;	2627	glColor 1, 0.8, 0.4;
…		…
2417	glVertex 0 , $h;	2638	glVertex 0 , $h;
2418	glVertex $w, $h;	2639	glVertex $w, $h;
2419	glVertex $w, 0;	2640	glVertex $w, 0;
2420	glEnd;	2641	glEnd;
2421		2642
2422	glPopMatrix;	2643	glTranslate 2 - 0.375, 2 - 0.375;
2423
2424	glTranslate 2, 2;
2425	$self->SUPER::_draw;	2644	$self->SUPER::_draw;
2426	}	2645	}
2427		2646
2428	#############################################################################	2647	#############################################################################
2429		2648
…		…
2434	use CFClient::OpenGL;	2653	use CFClient::OpenGL;
2435		2654
2436	sub new {	2655	sub new {
2437	my $class = shift;	2656	my $class = shift;
2438		2657
2439	$class->SUPER::new (	2658	my $self = $class->SUPER::new (
2440	aspect => 1,	2659	aspect => 1,
		2660	can_events => 0,
2441	@_,	2661	@_,
2442	)	2662	);
		2663
		2664	if ($self->{anim} && $self->{animspeed}) {
		2665	Scalar::Util::weaken (my $widget = $self);
		2666
		2667	$self->{timer} = Event->timer (
		2668	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2669	hard => 1,
		2670	interval => $self->{animspeed},
		2671	cb => sub {
		2672	++$widget->{frame};
		2673	$widget->update;
		2674	},
		2675	);
		2676	}
		2677
		2678	$self
2443	}	2679	}
2444		2680
2445	sub size_request {	2681	sub size_request {
2446	(32, 8)	2682	(32, 8)
2447	}	2683	}
2448		2684
		2685	sub update {
		2686	my ($self) = @_;
		2687
		2688	return unless $self->{visible};
		2689
		2690	$self->SUPER::update;
		2691	}
		2692
2449	sub _draw {	2693	sub _draw {
2450	my ($self) = @_;	2694	my ($self) = @_;
2451		2695
2452	return unless $::CONN;#d# manage and cache textures differently	2696	return unless $::CONN;
		2697
		2698	my $face;
		2699
		2700	if ($self->{frame}) {
		2701	my $anim = $::CONN->{anim}[$self->{anim}];
		2702
		2703	$face = $anim->[ $self->{frame} % @$anim ]
		2704	if $anim && @$anim;
		2705	}
		2706
2453	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2707	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2454		2708
2455	# TODO animation
2456	if ($tex) {	2709	if ($tex) {
2457	glEnable GL_TEXTURE_2D;	2710	glEnable GL_TEXTURE_2D;
2458	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2711	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2459	glColor 1, 1, 1, 1;	2712	glColor 1, 1, 1, 1;
2460	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2713	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2461	glDisable GL_TEXTURE_2D;	2714	glDisable GL_TEXTURE_2D;
2462	}	2715	}
2463	}	2716	}
2464		2717
		2718	sub DESTROY {
		2719	my ($self) = @_;
		2720
		2721	$self->{timer}->cancel
		2722	if $self->{timer};
		2723
		2724	$self->SUPER::DESTROY;
		2725	}
		2726
2465	#############################################################################	2727	#############################################################################
2466		2728
2467	package CFClient::UI::InventoryItem;	2729	package CFClient::UI::Inventory;
2468		2730
2469	our @ISA = CFClient::UI::HBox::;	2731	our @ISA = CFClient::UI::ScrolledWindow::;
2470		2732
2471	sub new {	2733	sub new {
2472	my $class = shift;	2734	my $class = shift;
2473		2735
2474	my %args = @_;
2475
2476	my $item = delete $args{item};
2477
2478	my $desc = $item->{nrof} < 2
2479	? $item->{name}
2480	: "$item->{nrof} $item->{name_pl}";
2481
2482
2483	my $self = $class->SUPER::new (	2736	my $self = $class->SUPER::new (
2484	can_hover => 1,	2737	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2485	can_events => 1,
2486	tooltip => (CFClient::UI::Label->escape ($desc)
2487	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2488	connect_button_down => sub {
2489	my ($self, $ev, $x, $y) = @_;
2490
2491	# todo: maybe put examine on 1? but should just be a tooltip :(
2492	if ($ev->{button} == 1) {
2493	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2494	} elsif ($ev->{button} == 2) {
2495	$::CONN->send ("apply $item->{tag}");
2496	} elsif ($ev->{button} == 3) {
2497	CFClient::UI::Menu->new (
2498	items => [
2499	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2500	[
2501	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2502	sub { $::CONN->send ("lock $item->{tag}") },
2503	],
2504	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2505	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2506	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2507	],
2508	)->popup ($ev);
2509	}
2510
2511	1
2512	},
2513	%args
2514	);
2515
2516	$self->add (new CFClient::UI::Face
2517	can_events => 0,
2518	face => $item->{face},
2519	anim => $item->{anim},
2520	animspeed => $item->{animspeed},
2521	);
2522
2523	$self->add (new CFClient::UI::Label
2524	can_events => 0,
2525	text => $desc,
2526	);
2527
2528	$self
2529	}
2530
2531	#############################################################################
2532
2533	package CFClient::UI::Inventory;
2534
2535	our @ISA = CFClient::UI::ScrolledWindow::;
2536
2537	sub new {
2538	my $class = shift;
2539
2540	my $self = $class->SUPER::new (
2541	scrolled => (new CFClient::UI::VBox),
2542	@_,	2738	@_,
2543	);	2739	);
2544		2740
2545	$self	2741	$self
2546	}	2742	}
…		…
2549	my ($self, $items) = @_;	2745	my ($self, $items) = @_;
2550		2746
2551	$self->{scrolled}->clear;	2747	$self->{scrolled}->clear;
2552	return unless $items;	2748	return unless $items;
2553		2749
2554	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2750	my @items = sort {
		2751	($a->{type} <=> $b->{type})
		2752	or ($a->{name} cmp $b->{name})
		2753	} @$items;
2555		2754
2556	$self->{real_items} = \@items;	2755	$self->{real_items} = \@items;
2557		2756
		2757	my $row = 0;
2558	for my $item (@items) {	2758	for my $item (@items) {
2559	my $desc = $item->{nrof} < 2	2759	CFClient::Item::update_widgets $item;
2560	? $item->{name}
2561	: "$item->{nrof} $item->{name_pl}";
2562		2760
2563	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);	2761	$self->{scrolled}->add (0, $row, $item->{face_widget});
2564	}	2762	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2763	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2565		2764
2566	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2765	$row++;
		2766	}
2567	}	2767	}
2568		2768
2569	sub size_request {	2769	sub size_request {
2570	my ($self) = @_;	2770	my ($self) = @_;
2571	($self->{req_w}, $self->{req_h});	2771	($self->{req_w}, $self->{req_h});
…		…
2611		2811
2612	# popup given the event (must be a mouse button down event currently)	2812	# popup given the event (must be a mouse button down event currently)
2613	sub popup {	2813	sub popup {
2614	my ($self, $ev) = @_;	2814	my ($self, $ev) = @_;
2615		2815
2616	$self->emit ("popdown");	2816	$self->_emit ("popdown");
2617		2817
2618	# maybe save $GRAB? must be careful about events...	2818	# maybe save $GRAB? must be careful about events...
2619	$GRAB = $self;	2819	$GRAB = $self;
2620	$self->{button} = $ev->{button};	2820	$self->{button} = $ev->{button};
2621		2821
…		…
2636		2836
2637	if ($ev->{button} == $self->{button}) {	2837	if ($ev->{button} == $self->{button}) {
2638	undef $GRAB;	2838	undef $GRAB;
2639	$self->hide;	2839	$self->hide;
2640		2840
2641	$self->emit ("popdown");	2841	$self->_emit ("popdown");
2642	$self->{hover}[1]->() if $self->{hover};	2842	$self->{hover}[1]->() if $self->{hover};
2643	}	2843	}
2644	}	2844	}
2645		2845
2646	#############################################################################	2846	#############################################################################
2647		2847
2648	package CFClient::UI::Statusbox;	2848	package CFClient::UI::Statusbox;
2649		2849
2650	our @ISA = CFClient::UI::VBox::;	2850	our @ISA = CFClient::UI::VBox::;
		2851
		2852	sub new {
		2853	my $class = shift;
		2854
		2855	$class->SUPER::new (
		2856	fontsize => 0.8,
		2857	@_,
		2858	)
		2859	}
2651		2860
2652	sub reorder {	2861	sub reorder {
2653	my ($self) = @_;	2862	my ($self) = @_;
2654	my $NOW = time;	2863	my $NOW = time;
2655		2864
2656	while (my ($k, $v) = each %{ $self->{item} }) {	2865	while (my ($k, $v) = each %{ $self->{item} }) {
2657	delete $self->{item}{$k} if $v->{timeout} < $NOW;	2866	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2658	}	2867	}
2659		2868
2660	my @widgets;	2869	my @widgets;
2661	my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };	2870
		2871	my @items = sort {
		2872	$a->{pri} <=> $b->{pri}
		2873	or $b->{id} <=> $a->{id}
		2874	} values %{ $self->{item} };
		2875
2662	my $count = 10 + 1;	2876	my $count = 10 + 1;
2663	for my $item (@items) {	2877	for my $item (@items) {
2664	last unless --$count;	2878	last unless --$count;
2665		2879
2666	push @widgets, $item->{label} ||= do {	2880	push @widgets, $item->{label} ||= do {
2667	# TODO: doesn't handle markup well (read as: at all)	2881	# TODO: doesn't handle markup well (read as: at all)
2668	my $short = delete $item->{text};	2882	my $short = $item->{count} > 1
		2883	? "<b>$item->{count} ×</b> $item->{text}"
		2884	: $item->{text};
		2885
2669	for ($short) {	2886	for ($short) {
2670	s/^\s+//;	2887	s/^\s+//;
2671	s/\012.*//s;	2888	s/\s+/ /g;
2672	my $len = int 30 / $item->{fontsize};
2673	substr $_, $len, length, "…" if $len < length;
2674	}	2889	}
2675		2890
2676	new CFClient::UI::Label	2891	new CFClient::UI::Label
2677	markup => $short,	2892	markup => $short,
2678	tooltip => delete $item->{tooltip},	2893	tooltip => $item->{tooltip},
2679	tooltip_font => $::FONT_PROP,	2894	tooltip_font => $::FONT_PROP,
2680	tooltip_width => 0.75,	2895	tooltip_width => 0.67,
2681	fontsize => delete $item->{fontsize},	2896	fontsize => $item->{fontsize} || $self->{fontsize},
2682	color => delete $item->{color},	2897	max_w => $::WIDTH * 0.44,
		2898	fg => $item->{fg},
2683	can_events => 1,	2899	can_events => 1,
2684	can_hover => 1,	2900	can_hover => 1
2685	};	2901	};
2686	}	2902	}
2687		2903
2688	$self->clear;	2904	$self->clear;
2689	$self->SUPER::add (@widgets);	2905	$self->SUPER::add (reverse @widgets);
2690	}	2906	}
2691		2907
2692	sub add {	2908	sub add {
2693	my ($self, $text, %arg) = @_;	2909	my ($self, $text, %arg) = @_;
2694		2910
2695	my $item = {	2911	$text =~ s/^\s+//;
2696	time => time,	2912	$text =~ s/\s+$//;
		2913
		2914	return unless $text;
		2915
		2916	my $timeout = time + ((delete $arg{timeout}) || 60);
		2917
		2918	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2919
		2920	if (my $item = $self->{item}{$group}) {
		2921	if ($item->{text} eq $text) {
		2922	$item->{count}++;
		2923	} else {
		2924	$item->{count} = 1;
		2925	$item->{text} = $item->{tooltip} = $text;
		2926	}
		2927	$item->{id} = ++$self->{id};
		2928	$item->{timeout} = $timeout;
		2929	delete $item->{label};
		2930	} else {
		2931	$self->{item}{$group} = {
		2932	id => ++$self->{id},
2697	text => $text,	2933	text => $text,
2698	timeout => 60,	2934	timeout => $timeout,
2699	tooltip => $text,	2935	tooltip => $text,
2700	fontsize => 0.8,
2701	color => [0.8, 0.8, 0.8, 0.8],	2936	fg => [0.8, 0.8, 0.8, 0.8],
		2937	pri => 0,
		2938	count => 1,
2702	%arg,	2939	%arg,
		2940	};
2703	};	2941	}
2704
2705	$item->{timeout} += time;
2706	$item->{group} ||= $item+0;
2707
2708	$item = $self->{item}{$item->{group}} ||= $item;
2709		2942
2710	$self->reorder;	2943	$self->reorder;
		2944	}
		2945
		2946	sub reconfigure {
		2947	my ($self) = @_;
		2948
		2949	delete $_->{label}
		2950	for values %{ $self->{item} || {} };
		2951
		2952	$self->reorder;
		2953	$self->SUPER::reconfigure;
2711	}	2954	}
2712		2955
2713	#############################################################################	2956	#############################################################################
2714		2957
2715	package CFClient::UI::Root;	2958	package CFClient::UI::Root;
…		…
2747	}	2990	}
2748		2991
2749	sub size_allocate {	2992	sub size_allocate {
2750	my ($self, $w, $h) = @_;	2993	my ($self, $w, $h) = @_;
2751		2994
2752	my $old_w = $self->{old_w};
2753	my $old_h = $self->{old_h};
2754
2755	if ($old_w && $old_h) {
2756	for my $child ($self->children) {
2757	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2758	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2759	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2760	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2761	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2762	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2763	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2764	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2765	}
2766	}
2767
2768	for my $child ($self->children) {	2995	for my $child ($self->children) {
2769	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2996	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2770		2997
		2998	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2999	if exists $child->{req_x};
		3000
		3001	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3002	if exists $child->{req_y};
		3003
2771	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3004	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2772	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3005	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3006
2773	$child->configure ($X, $Y, $W, $H);	3007	$child->configure ($X, $Y, $W, $H);
2774	}	3008	}
2775
2776	$self->{old_w} = $w;
2777	$self->{old_h} = $h;
2778	}	3009	}
2779		3010
2780	sub coord2local {	3011	sub coord2local {
2781	my ($self, $x, $y) = @_;	3012	my ($self, $x, $y) = @_;
2782		3013
…		…
2795	$self->check_size;	3026	$self->check_size;
2796	$::WANT_REFRESH++;	3027	$::WANT_REFRESH++;
2797	}	3028	}
2798		3029
2799	sub add {	3030	sub add {
2800	my ($self, $child) = @_;	3031	my ($self, @children) = @_;
2801		3032
		3033	for (my @widgets = @children; my $w = pop @widgets; ) {
		3034	push @widgets, $w->children;
		3035	$w->{root} = $self;
		3036	$w->{visible} = 1;
		3037	}
		3038
		3039	for my $child (@children) {
		3040	$child->{is_toplevel} = 1;
		3041
2802	# integerise window positions	3042	# integerise window positions
2803	$child->{x} = int $child->{x};	3043	$child->{x} = int $child->{x};
2804	$child->{y} = int $child->{y};	3044	$child->{y} = int $child->{y};
		3045	}
2805		3046
2806	$self->SUPER::add ($child);	3047	$self->SUPER::add (@children);
		3048	}
		3049
		3050	sub remove {
		3051	my ($self, @children) = @_;
		3052
		3053	$self->SUPER::remove (@children);
		3054
		3055	while (@children) {
		3056	my $w = pop @children;
		3057	push @children, $w->children;
		3058	$w->set_invisible;
		3059	}
2807	}	3060	}
2808		3061
2809	sub on_refresh {	3062	sub on_refresh {
2810	my ($self, $id, $cb) = @_;	3063	my ($self, $id, $cb) = @_;
2811		3064
2812	$self->{refresh_hook}{$id} = $cb;	3065	$self->{refresh_hook}{$id} = $cb;
2813	}	3066	}
2814		3067
		3068	sub on_post_alloc {
		3069	my ($self, $id, $cb) = @_;
		3070
		3071	$self->{post_alloc_hook}{$id} = $cb;
		3072	}
		3073
2815	sub draw {	3074	sub draw {
2816	my ($self) = @_;	3075	my ($self) = @_;
		3076
		3077	while ($self->{refresh_hook}) {
		3078	$_->()
		3079	for values %{delete $self->{refresh_hook}};
		3080	}
2817		3081
2818	if ($self->{check_size}) {	3082	if ($self->{check_size}) {
2819	my @queue = ([], []);	3083	my @queue = ([], []);
2820		3084
2821	for (;;) {	3085	for (;;) {
…		…
2829		3093
2830	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3094	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2831	? @$widget{qw(user_w user_h)}	3095	? @$widget{qw(user_w user_h)}
2832	: $widget->size_request;	3096	: $widget->size_request;
2833		3097
		3098	if (delete $widget->{force_alloc}
2834	if ($w != $widget->{req_w} || $h != $widget->{req_h}) {	3099	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2835	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3100	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2836		3101
2837	$widget->{req_w} = $w;	3102	$widget->{req_w} = $w;
2838	$widget->{req_h} = $h;	3103	$widget->{req_h} = $h;
2839		3104
2840	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];	3105	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2841		3106
2842	$widget->{parent}->check_size	3107	$widget->{parent}->check_size
2843	if $widget->{parent};	3108	if $widget->{parent};
2844	}	3109	}
2845	}	3110	}
…		…
2852	$w = 0 if $w < 0;	3117	$w = 0 if $w < 0;
2853	$h = 0 if $h < 0;	3118	$h = 0 if $h < 0;
2854		3119
2855	$widget->{w} = $w;	3120	$widget->{w} = $w;
2856	$widget->{h} = $h;	3121	$widget->{h} = $h;
2857	$widget->size_allocate ($w, $h);
2858	$widget->emit (size_allocate => $w, $h);	3122	$widget->emit (size_allocate => $w, $h);
2859	}	3123	}
2860	}	3124	}
2861		3125
2862	while ($self->{refresh_hook}) {	3126	while ($self->{post_alloc_hook}) {
2863	$_->()	3127	$_->()
2864	for values %{delete $self->{refresh_hook}};	3128	for values %{delete $self->{post_alloc_hook}};
2865	}	3129	}
2866		3130
2867	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3131	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2868	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3132	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2869	glClear GL_COLOR_BUFFER_BIT;	3133	glClear GL_COLOR_BUFFER_BIT;
2870		3134
2871	glMatrixMode GL_PROJECTION;	3135	glMatrixMode GL_PROJECTION;
2872	glLoadIdentity;	3136	glLoadIdentity;
2873	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3137	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2874	glMatrixMode GL_MODELVIEW;	3138	glMatrixMode GL_MODELVIEW;
2875	glLoadIdentity;	3139	glLoadIdentity;
2876		3140
2877	$self->_draw;	3141	$self->_draw;
2878	}	3142	}
…		…
2880	#############################################################################	3144	#############################################################################
2881		3145
2882	package CFClient::UI;	3146	package CFClient::UI;
2883		3147
2884	$ROOT = new CFClient::UI::Root;	3148	$ROOT = new CFClient::UI::Root;
2885	$TOOLTIP = new CFClient::UI::Tooltip;	3149	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2886		3150
2887	1	3151	1
2888		3152

Diff Legend

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