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.162 by root, Mon Apr 24 06:05:35 2006 UTC vs.
Revision 1.212 by elmex, Wed May 17 14:55:14 2006 UTC

1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
…		…
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		12
12	our $ROOT;	13	our $ROOT;
13	our $TOOLTIP;	14	our $TOOLTIP;
14	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
15		18
16	sub check_tooltip {	19	sub check_tooltip {
17	if (!$GRAB) {	20	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
23		26
24	my $tip = $widget->{tooltip};	27	my $tip = $widget->{tooltip};
25		28
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	29	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		30
28	$TOOLTIP->set_markup ($widget->{tooltip});	31	$TOOLTIP->set_tooltip_from ($widget);
29	$TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30	$TOOLTIP->show;	32	$TOOLTIP->show;
		33
		34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		35
		36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
		37	if $x + $TOOLTIP->{w} > $::WIDTH;
		38
		39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
31	}	42	}
32		43
33	return;	44	return;
34	}	45	}
35	}	46	}
…		…
39	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
40	}	51	}
41		52
42	# class methods for events	53	# class methods for events
43	sub feed_sdl_key_down_event {	54	sub feed_sdl_key_down_event {
44	$FOCUS->key_down ($_[0]) if $FOCUS;	55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
		56	if $FOCUS;
45	}	57	}
46		58
47	sub feed_sdl_key_up_event {	59	sub feed_sdl_key_up_event {
48	$FOCUS->key_up ($_[0]) if $FOCUS;	60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
		61	if $FOCUS;
49	}	62	}
50		63
51	sub feed_sdl_button_down_event {	64	sub feed_sdl_button_down_event {
52	my ($ev) = @_;	65	my ($ev) = @_;
53	my ($x, $y) = ($ev->{x}, $ev->{y});	66	my ($x, $y) = ($ev->{x}, $ev->{y});
…		…
61	check_tooltip;	74	check_tooltip;
62	}	75	}
63		76
64	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
65		78
66	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	79	if ($GRAB) {
		80	($x, $y) = $GRAB->coord2local ($x, $y);
		81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
		82	}
67	}	83	}
68		84
69	sub feed_sdl_button_up_event {	85	sub feed_sdl_button_up_event {
70	my ($ev) = @_;	86	my ($ev) = @_;
71	my ($x, $y) = ($ev->{x}, $ev->{y});	87	my ($x, $y) = ($ev->{x}, $ev->{y});
72		88
73	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74		90
75	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76		92
77	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	93	if ($GRAB) {
		94	($x, $y) = $GRAB->coord2local ($x, $y);
		95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
		96	}
78		97
79	if (!$BUTTON_STATE) {	98	if (!$BUTTON_STATE) {
80	my $grab = $GRAB; undef $GRAB;	99	my $grab = $GRAB; undef $GRAB;
81	$grab->update if $grab;	100	$grab->update if $grab;
82	$GRAB->update if $GRAB;	101	$GRAB->update if $GRAB;
…		…
98	$HOVER->update if $HOVER && $HOVER->{can_hover};	117	$HOVER->update if $HOVER && $HOVER->{can_hover};
99		118
100	check_tooltip;	119	check_tooltip;
101	}	120	}
102		121
103	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;	122	if ($HOVER) {
		123	($x, $y) = $HOVER->coord2local ($x, $y);
		124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
		125	}
104	}	126	}
105		127
106	# convert position array to integers	128	# convert position array to integers
107	sub harmonize {	129	sub harmonize {
108	my ($vals) = @_;	130	my ($vals) = @_;
…		…
114	$rem += $_ - $i;	136	$rem += $_ - $i;
115	$_ = $i;	137	$_ = $i;
116	}	138	}
117	}	139	}
118		140
		141	# call when resolution changes etc.
		142	sub rescale_widgets {
		143	my ($sx, $sy) = @_;
		144
		145	for my $widget (values %WIDGET) {
		146	if ($widget->{toplevel}) {
		147	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		148	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		149	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		150	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		151	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		152	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		153	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		154	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		155	}
		156
		157	$widget->reconfigure;
		158	}
		159	}
		160
119	#############################################################################	161	#############################################################################
120		162
121	package CFClient::UI::Base;	163	package CFClient::UI::Base;
122		164
123	use strict;	165	use strict;
…		…
126		168
127	sub new {	169	sub new {
128	my $class = shift;	170	my $class = shift;
129		171
130	my $self = bless {	172	my $self = bless {
131	x => 0,	173	x => 0,
132	y => 0,	174	y => 0,
133	z => 0,	175	z => 0,
134	can_events => 1,	176	can_events => 1,
135	@_	177	@_
136	}, $class;	178	}, $class;
137		179
138	for (keys %$self) {	180	for (keys %$self) {
139	if (/^connect_(.*)$/) {	181	if (/^connect_(.*)$/) {
140	$self->connect ($1 => delete $self->{$_});	182	$self->connect ($1 => delete $self->{$_});
141	}	183	}
142	}	184	}
143		185
		186	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		187
144	$self	188	$self
145	}	189	}
146		190
147	sub destroy {	191	sub destroy {
148	my ($self) = @_;	192	my ($self) = @_;
…		…
160	}	204	}
161		205
162	sub hide {	206	sub hide {
163	my ($self) = @_;	207	my ($self) = @_;
164		208
165	return unless $self->{parent};	209	undef $GRAB if $GRAB == $self;
		210	undef $HOVER if $HOVER == $self;
166		211
167	$self->{parent}->remove ($self);	212	$self->{parent}->remove ($self)
		213	if $self->{parent};
168	}	214	}
169		215
170	sub move {	216	sub move {
171	my ($self, $x, $y, $z) = @_;	217	my ($self, $x, $y, $z) = @_;
172		218
…		…
211	$self->{y} = $y;	257	$self->{y} = $y;
212	$self->update;	258	$self->update;
213	}	259	}
214		260
215	if ($self->{w} != $w || $self->{h} != $h) {	261	if ($self->{w} != $w || $self->{h} != $h) {
216	$self->{w} = $w;	262	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
217	$self->{h} = $h;
218
219	$self->size_allocate ($w, $h);
220	$self->update;
221	}	263	}
222	}	264	}
223		265
224	sub size_allocate {	266	sub size_allocate {
225	# nothing to be done	267	# nothing to be done
226	}	268	}
227		269
		270	sub reconfigure {
		271	my ($self) = @_;
		272
		273	$self->check_size (1);
		274	$self->update;
		275	}
		276
		277	sub children {
		278	}
		279
228	sub set_max_size {	280	sub set_max_size {
229	my ($self, $w, $h) = @_;	281	my ($self, $w, $h) = @_;
230		282
231	delete $self->{max_w}; $self->{max_w} = $w if $w;	283	delete $self->{max_w}; $self->{max_w} = $w if $w;
232	delete $self->{max_h}; $self->{max_h} = $h if $h;	284	delete $self->{max_h}; $self->{max_h} = $h if $h;
233	}	285	}
234		286
235	# return top left coordinates	287	sub set_tooltip {
236	sub _topleft {
237	my ($self, $x, $y) = @_;	288	my ($self, $tooltip) = @_;
238		289
239	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	290	$self->{tooltip} = $tooltip;
		291
		292	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		293	delete $CFClient::UI::TOOLTIP->{owner};
		294	CFClient::UI::check_tooltip;
		295	}
240	}	296	}
241		297
242	# translate global coordinates to local coordinate system	298	# translate global coordinates to local coordinate system
243	sub coord2local {	299	sub coord2local {
244	my ($self, $x, $y) = @_;	300	my ($self, $x, $y) = @_;
245		301
246	my ($X, $Y) = $self->_topleft;	302	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
247	($x - $X, $y - $Y)
248	}	303	}
249		304
250	# translate local coordinates to global coordinate system	305	# translate local coordinates to global coordinate system
251	sub coord2global {	306	sub coord2global {
252	my ($self, $x, $y) = @_;	307	my ($self, $x, $y) = @_;
253		308
254	my ($X, $Y) = $self->_topleft;	309	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
255	($x + $X, $y + $Y)
256	}	310	}
257		311
258	sub focus_in {	312	sub focus_in {
259	my ($self) = @_;	313	my ($self) = @_;
260		314
…		…
332	glVertex $self->{w}, 0;	386	glVertex $self->{w}, 0;
333	glVertex $self->{w}, $self->{h};	387	glVertex $self->{w}, $self->{h};
334	glVertex 0 , $self->{h};	388	glVertex 0 , $self->{h};
335	glEnd;	389	glEnd;
336	glPopMatrix;	390	glPopMatrix;
337	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	391	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
338	}	392	}
339	}	393	}
340		394
341	sub _draw {	395	sub _draw {
342	my ($self) = @_;	396	my ($self) = @_;
…		…
358		412
359	sub set_parent {	413	sub set_parent {
360	my ($self, $parent) = @_;	414	my ($self, $parent) = @_;
361		415
362	Scalar::Util::weaken ($self->{parent} = $parent);	416	Scalar::Util::weaken ($self->{parent} = $parent);
		417
		418	# TODO: req_w _does_change after ->reconfigure
		419	$self->check_size
		420	unless exists $self->{req_w};
363	}	421	}
364		422
365	sub check_size {	423	sub check_size {
366	my ($self) = @_;	424	my ($self, $forced) = @_;
367		425
368	$self->{parent}	426	$self->{force_alloc} = 1 if $forced;
369	or return 1;	427	$CFClient::UI::ROOT->{check_size}{$self} = $self;
370
371	my ($w, $h) = $self->{user_w} && $self->{user_h}
372	? @$self{qw(user_w user_h)}
373	: $self->size_request;
374
375	if ($w != $self->{req_w} || $h != $self->{req_h}) {
376	$self->{req_w} = $w;
377	$self->{req_h} = $h;
378
379	$self->{parent}->check_size
380	or $self->size_allocate (
381	(List::Util::max $self->{w}, $w),
382	(List::Util::max $self->{h}, $h),
383	);
384
385	1
386	} else {
387	0
388	}
389	}	428	}
390		429
391	sub update {	430	sub update {
392	my ($self) = @_;	431	my ($self) = @_;
393		432
…		…
402	}	441	}
403		442
404	sub emit {	443	sub emit {
405	my ($self, $signal, @args) = @_;	444	my ($self, $signal, @args) = @_;
406		445
407	for my $cb (@{$self->{signal_cb}{$signal} || []}) {	446	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
408	$cb->($self, @args);
409	}
410	}	447	}
411		448
412	sub DESTROY {	449	sub DESTROY {
413	my ($self) = @_;	450	my ($self) = @_;
414		451
		452	delete $WIDGET{$self+0};
415	#$self->deactivate;	453	#$self->deactivate;
416	}	454	}
417		455
418	#############################################################################	456	#############################################################################
419		457
…		…
428	my $class = shift;	466	my $class = shift;
429		467
430	# range [value, low, high, page]	468	# range [value, low, high, page]
431		469
432	$class->SUPER::new (	470	$class->SUPER::new (
433	bg => [0, 0, 0, 0.2],	471	#bg => [0, 0, 0, 0.2],
434	active_bg => [1, 1, 1, 0.5],	472	#active_bg => [1, 1, 1, 0.5],
435	@_	473	@_
436	)	474	)
437	}	475	}
438		476
439	sub _draw {	477	sub _draw {
440	my ($self) = @_;	478	my ($self) = @_;
441		479
		480	my $color = $FOCUS == $self && $self->{active_bg}
		481	? $self->{active_bg}
		482	: $self->{bg};
		483
		484	if ($color && (@$color < 4 || $color->[3])) {
442	my ($w, $h) = @$self{qw(w h)};	485	my ($w, $h) = @$self{qw(w h)};
443		486
444	glEnable GL_BLEND;	487	glEnable GL_BLEND;
445	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	488	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
446	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	489	glColor @$color;
447		490
448	glBegin GL_QUADS;	491	glBegin GL_QUADS;
449	glVertex 0 , 0;	492	glVertex 0 , 0;
450	glVertex 0 , $h;	493	glVertex 0 , $h;
451	glVertex $w, $h;	494	glVertex $w, $h;
452	glVertex $w, 0;	495	glVertex $w, 0;
453	glEnd;	496	glEnd;
454		497
455	glDisable GL_BLEND;	498	glDisable GL_BLEND;
		499	}
456	}	500	}
457		501
458	#############################################################################	502	#############################################################################
459		503
460	package CFClient::UI::Empty;	504	package CFClient::UI::Empty;
…		…
481	sub new {	525	sub new {
482	my ($class, %arg) = @_;	526	my ($class, %arg) = @_;
483		527
484	my $children = delete $arg{children} || [];	528	my $children = delete $arg{children} || [];
485		529
486	my $self = $class->SUPER::new (children => [], can_events => 0, %arg);	530	my $self = $class->SUPER::new (
		531	children => [],
		532	can_events => 0,
		533	%arg,
		534	);
487	$self->add ($_) for @$children;	535	$self->add ($_) for @$children;
488		536
489	$self	537	$self
490	}	538	}
491		539
492	sub add {	540	sub add {
493	my ($self, $child) = @_;	541	my ($self, @widgets) = @_;
494		542
495	$child->set_parent ($self);	543	$_->set_parent ($self)
		544	for @widgets;
496		545
497	use sort 'stable';	546	use sort 'stable';
498		547
499	$self->{children} = [	548	$self->{children} = [
500	sort { $a->{z} <=> $b->{z} }	549	sort { $a->{z} <=> $b->{z} }
501	@{$self->{children}}, $child	550	@{$self->{children}}, @widgets
502	];	551	];
503		552
504	$child->check_size;	553	$self->check_size (1);
		554	$self->update;
		555	}
		556
		557	sub children {
		558	@{ $_[0]{children} }
505	}	559	}
506		560
507	sub remove {	561	sub remove {
508	my ($self, $child) = @_;	562	my ($self, $child) = @_;
509		563
510	delete $child->{parent};	564	delete $child->{parent};
		565	$child->hide;
511		566
512	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	567	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
513		568
514	$self->check_size;	569	$self->check_size;
515	$self->update;	570	$self->update;
516	}	571	}
517		572
518	sub clear {	573	sub clear {
519	my ($self) = @_;	574	my ($self) = @_;
520		575
521	delete $_->{parent}	576	my $children = delete $self->{children};
522	for @{ delete $self->{children} };
523
524	$self->{children} = [];	577	$self->{children} = [];
		578
		579	for (@$children) {
		580	delete $_->{parent};
		581	$_->hide;
		582	}
		583
		584	$self->check_size;
		585	$self->update;
525	}	586	}
526		587
527	sub find_widget {	588	sub find_widget {
528	my ($self, $x, $y) = @_;	589	my ($self, $x, $y) = @_;
529		590
…		…
604	}	665	}
605		666
606	sub update {	667	sub update {
607	my ($self) = @_;	668	my ($self) = @_;
608		669
609	# we want to do this delayed...	670	$ROOT->on_post_alloc ($self => sub { $self->render_child });
610	$self->render_chld;
611	$self->SUPER::update;	671	$self->SUPER::update;
612	}
613
614	sub render_chld {
615	my ($self) = @_;
616
617	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
618	glClearColor 0, 0, 0, 1;
619	glClear GL_COLOR_BUFFER_BIT;
620	$self->child->draw;
621	};
622	}	672	}
623		673
624	sub size_allocate {	674	sub size_allocate {
625	my ($self, $w, $h) = @_;	675	my ($self, $w, $h) = @_;
626		676
627	$self->child->configure (0, 0, $w, $h);	677	$self->SUPER::size_allocate ($w, $h);
		678	$self->update;
		679	}
628		680
		681	sub _render {
		682	$_[0]{children}[0]->draw;
		683	}
		684
		685	sub render_child {
		686	my ($self) = @_;
		687
		688	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
		689	glClearColor 0, 0, 0, 0;
		690	glClear GL_COLOR_BUFFER_BIT;
		691
629	$self->render_chld;	692	$self->_render;
		693	# glColorMask 1, 1, 1, 0;
		694	# glEnable GL_BLEND;
		695	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
		696	# glRasterPos 0, 0;
		697	# glCopyPixels 0, 0, $self->{w}, $self->{h};
		698	# glDisable GL_BLEND;
		699	# glColorMask 1, 1, 1, 1;
		700	};
630	}	701	}
631		702
632	sub _draw {	703	sub _draw {
633	my ($self) = @_;	704	my ($self) = @_;
634		705
635	my ($w, $h) = ($self->w, $self->h);	706	my ($w, $h) = ($self->w, $self->h);
636		707
637	my $tex = $self->{texture}	708	my $tex = $self->{texture}
638	or return;	709	or return;
639		710
640	glEnable GL_BLEND;
641	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
642	glEnable GL_TEXTURE_2D;	711	glEnable GL_TEXTURE_2D;
643	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	712	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		713	glColor 0, 0, 0, 1;
644		714
645	$tex->draw_quad (0, 0, $w, $h);	715	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
646		716
647	glDisable GL_BLEND;
648	glDisable GL_TEXTURE_2D;	717	glDisable GL_TEXTURE_2D;
649	}	718	}
650		719
651	#############################################################################	720	#############################################################################
652		721
653	package CFClient::UI::ViewPort;	722	package CFClient::UI::ViewPort;
654		723
655	our @ISA = CFClient::UI::Window::;	724	our @ISA = CFClient::UI::Window::;
656		725
657	sub new { die }
658
659	sub size_request {	726	sub size_request {
660	my ($self) = @_;	727	my ($self) = @_;
661		728
662	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	729	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
663	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});	730	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
664		731
665	@$self{qw(child_w child_h)}	732	@$self{qw(child_w child_h)}
666	}	733	}
667		734
668	sub _draw {	735	sub size_allocate {
669	my ($self) = @_;	736	my ($self, $w, $h) = @_;
670		737
671	$self->{children}[1]->draw;	738	$self->update;
672	}	739	}
673		740
		741	sub set_offset {
		742	my ($self, $x, $y) = @_;
674		743
675	#############################################################################	744	$self->{view_x} = int $x;
		745	$self->{view_y} = int $y;
676		746
		747	$self->update;
		748	}
		749
		750	# hmm, this does not work for topleft of $self... but we should not ask for that
		751	sub coord2local {
		752	my ($self, $x, $y) = @_;
		753
		754	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		755	}
		756
		757	sub coord2global {
		758	my ($self, $x, $y) = @_;
		759
		760	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		761	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		762
		763	$self->SUPER::coord2global ($x, $y)
		764	}
		765
		766	sub find_widget {
		767	my ($self, $x, $y) = @_;
		768
		769	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		770	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		771	) {
		772	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		773	} else {
		774	$self->CFClient::UI::Base::find_widget ($x, $y)
		775	}
		776	}
		777
		778	sub _render {
		779	my ($self) = @_;
		780
		781	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		782
		783	$self->SUPER::_render;
		784	}
		785
		786	#############################################################################
		787
677	package CFClient::UI::Frame;	788	package CFClient::UI::ScrolledWindow;
678		789
679	our @ISA = CFClient::UI::Bin::;	790	our @ISA = CFClient::UI::HBox::;
680
681	use CFClient::OpenGL;
682		791
683	sub new {	792	sub new {
684	my $class = shift;	793	my $class = shift;
685		794
		795	my $self;
		796
		797	my $slider = new CFClient::UI::Slider
		798	vertical => 1,
		799	range => [0, 0, 1, 0.01], # HACK fix
		800	connect_changed => sub {
		801	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		802	},
		803	;
		804
686	my $self = $class->SUPER::new (	805	$self = $class->SUPER::new (
687	bg => [1, 1, 1, 1],	806	vp => (new CFClient::UI::ViewPort),
688	border_bg => [1, 1, 1, 1],	807	slider => $slider,
689	border => 0.8,
690	@_	808	@_,
691	);	809	);
692		810
		811	$self->{vp}->add ($self->{scrolled});
		812	$self->add ($self->{vp});
		813	$self->add ($self->{slider});
		814
693	$self	815	$self
694	}	816	}
695		817
		818	#TODO# update range on size_allocate depending on child
		819	# update viewport offset on scroll
		820
		821	#############################################################################
		822
		823	package CFClient::UI::Frame;
		824
		825	our @ISA = CFClient::UI::Bin::;
		826
		827	use CFClient::OpenGL;
		828
		829	sub new {
		830	my $class = shift;
		831
		832	$class->SUPER::new (
		833	bg => undef,
		834	@_,
		835	)
		836	}
		837
696	sub _draw {	838	sub _draw {
697	my ($self) = @_;	839	my ($self) = @_;
698		840
699	my ($w, $h) = ($self->{w}, $self->{h});	841	if ($self->{bg}) {
		842	my ($w, $h) = @$self{qw(w h)};
700		843
701	glEnable GL_BLEND;	844	glEnable GL_BLEND;
702	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	845	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
703	glEnable GL_TEXTURE_2D;	846	glColor @{ $self->{bg} };
704	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
705		847
706	# glBegin GL_QUADS;	848	glBegin GL_QUADS;
707	# glColor 0, 0, 0, 0;
708	# glVertex 0 , 0;	849	glVertex 0 , 0;
709	# glVertex 0 , $h;	850	glVertex 0 , $h;
710	# glVertex $w, $h;	851	glVertex $w, $h;
711	# glVertex $w, 0;	852	glVertex $w, 0;
712	# glEnd;	853	glEnd;
713		854
714
715	$self->child->draw;
716	glDisable GL_BLEND;	855	glDisable GL_BLEND;
717	glDisable GL_TEXTURE_2D;	856	}
		857
		858	$self->SUPER::_draw;
718	}	859	}
719		860
720	#############################################################################	861	#############################################################################
721		862
722	package CFClient::UI::FancyFrame;	863	package CFClient::UI::FancyFrame;
…		…
733	my $class = shift;	874	my $class = shift;
734		875
735	# TODO: user_x, user_y, overwrite moveto?	876	# TODO: user_x, user_y, overwrite moveto?
736		877
737	my $self = $class->SUPER::new (	878	my $self = $class->SUPER::new (
738	bg => [1, 1, 1, 1],	879	bg => [1, 1, 1, 1],
739	border_bg => [1, 1, 1, 1],	880	border_bg => [1, 1, 1, 1],
740	border => 0.8,	881	border => 0.6,
		882	toplevel => 1,
741	can_events => 1,	883	can_events => 1,
742	@_	884	@_
743	);	885	);
744		886
745	$self->{title} &&= new CFClient::UI::Label	887	$self->{title} &&= new CFClient::UI::Label
746	align => 0,	888	align => 0,
747	valign => 1,	889	valign => 1,
748	text => $self->{title},	890	text => $self->{title},
749	fontsize => 1;	891	fontsize => $self->{border};
750		892
751	$self	893	$self
752	}	894	}
753		895
754	sub border {	896	sub border {
…		…
770	my ($self, $w, $h) = @_;	912	my ($self, $w, $h) = @_;
771		913
772	$h -= List::Util::max 0, $self->border * 2;	914	$h -= List::Util::max 0, $self->border * 2;
773	$w -= List::Util::max 0, $self->border * 2;	915	$w -= List::Util::max 0, $self->border * 2;
774		916
775	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	917	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
776	if $self->{title};	918	if $self->{title};
777		919
778	$self->child->configure ($self->border, $self->border, $w, $h);	920	$self->child->configure ($self->border, $self->border, $w, $h);
779	}	921	}
780		922
781	sub button_down {	923	sub button_down {
782	my ($self, $ev, $x, $y) = @_;	924	my ($self, $ev, $x, $y) = @_;
783		925
		926	my ($w, $h) = @$self{qw(w h)};
784	my $border = $self->border;	927	my $border = $self->border;
785		928
786	if ($x < $self->{w} && $x >= $self->{w} - $border	929	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
787	&& $y < $self->{h} && $y >= $self->{h} - $border) {	930	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
788		931
		932	if ($lr & $td) {
		933	my ($wx, $wy) = ($self->{x}, $self->{y});
789	my ($ox, $oy) = ($ev->{x}, $ev->{y});	934	my ($ox, $oy) = ($ev->{x}, $ev->{y});
790	my ($bw, $bh) = ($self->{w}, $self->{h});	935	my ($bw, $bh) = ($self->{w}, $self->{h});
791		936
		937	my $mx = $x < $border;
		938	my $my = $y < $border;
		939
792	$self->{motion} = sub {	940	$self->{motion} = sub {
793	my ($ev, $x, $y) = @_;	941	my ($ev, $x, $y) = @_;
794		942
795	($x, $y) = ($ev->{x}, $ev->{y});	943	my $dx = $ev->{x} - $ox;
		944	my $dy = $ev->{y} - $oy;
796		945
797	$self->{user_w} = $bw + $x - $ox;	946	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
798	$self->{user_h} = $bh + $y - $oy;	947	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
		948	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
799	$self->check_size;	949	$self->check_size;
800	};	950	};
801		951
802	} elsif ($x >= 0 && $x < $self->{w}	952	} elsif ($lr ^ $td) {
803	&& $y >= 0 && $y < $border) {
804
805	my ($ox, $oy) = ($ev->{x}, $ev->{y});	953	my ($ox, $oy) = ($ev->{x}, $ev->{y});
806	my ($bx, $by) = ($self->{x}, $self->{y});	954	my ($bx, $by) = ($self->{x}, $self->{y});
807		955
808	$self->{motion} = sub {	956	$self->{motion} = sub {
809	my ($ev, $x, $y) = @_;	957	my ($ev, $x, $y) = @_;
…		…
832	my ($self) = @_;	980	my ($self) = @_;
833		981
834	my ($w, $h ) = ($self->{w}, $self->{h});	982	my ($w, $h ) = ($self->{w}, $self->{h});
835	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	983	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
836		984
837	glEnable GL_BLEND;
838	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
839	glEnable GL_TEXTURE_2D;	985	glEnable GL_TEXTURE_2D;
840	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	986	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
841		987
842	my $border = $self->border;	988	my $border = $self->border;
843		989
844	glColor @{ $self->{border_bg} };	990	glColor @{ $self->{border_bg} };
845	$tex[1]->draw_quad (0, 0, $w, $border);	991	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
846	$tex[3]->draw_quad (0, $border, $border, $ch);	992	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
847	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	993	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
848	$tex[4]->draw_quad (0, $h - $border, $w, $border);	994	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
849		995
		996	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
850	my $bg = $tex[0];	997	my $bg = $tex[0];
851		998
852	# TODO: repeat texture not scale	999	# TODO: repeat texture not scale
853	my $rep_x = $cw / $bg->{w};	1000	my $rep_x = $cw / $bg->{w};
854	my $rep_y = $ch / $bg->{h};	1001	my $rep_y = $ch / $bg->{h};
855		1002
856	glColor @{ $self->{bg} };	1003	glColor @{ $self->{bg} };
857		1004
858	$bg->{s} = $rep_x;	1005	$bg->{s} = $rep_x;
859	$bg->{t} = $rep_y;	1006	$bg->{t} = $rep_y;
860	$bg->{wrap_mode} = 1;	1007	$bg->{wrap_mode} = 1;
861	$bg->draw_quad ($border, $border, $cw, $ch);	1008	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1009	}
862		1010
863	glDisable GL_TEXTURE_2D;	1011	glDisable GL_TEXTURE_2D;
864	glDisable GL_BLEND;
865		1012
866	$self->{title}->draw if $self->{title};	1013	$self->{title}->draw if $self->{title};
		1014
867	$self->child->draw;	1015	$self->child->draw;
868	}	1016	}
869		1017
870	#############################################################################	1018	#############################################################################
871		1019
…		…
893	$self->{children}[$y][$x] = $child;	1041	$self->{children}[$y][$x] = $child;
894		1042
895	$child->check_size;	1043	$child->check_size;
896	}	1044	}
897		1045
		1046	sub children {
		1047	grep $_, map @$_, grep $_, @{ $_[0]{children} }
		1048	}
		1049
898	# TODO: move to container class maybe? send childs a signal on removal?	1050	# TODO: move to container class maybe? send childs a signal on removal?
899	sub clear {	1051	sub clear {
900	my ($self) = @_;	1052	my ($self) = @_;
901		1053
		1054	my @children = $self->children;
902	delete $self->{children};	1055	delete $self->{children};
		1056
		1057	for (@children) {
		1058	delete $_->{parent};
		1059	$_->hide;
		1060	}
		1061
903	$self->update;	1062	$self->update;
904	}	1063	}
905		1064
906	sub get_wh {	1065	sub get_wh {
907	my ($self) = @_;	1066	my ($self) = @_;
…		…
1084	}	1243	}
1085		1244
1086	sub size_allocate {	1245	sub size_allocate {
1087	my ($self, $w, $h) = @_;	1246	my ($self, $w, $h) = @_;
1088		1247
		1248	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
		1249
1089	my $children = $self->{children};	1250	my $children = $self->{children};
1090		1251
1091	my @h = map $_->{req_h}, @$children;	1252	my @h = map $_->{req_h}, @$children;
1092		1253
1093	my $req_h = List::Util::sum @h;	1254	my $req_h = List::Util::sum @h;
…		…
1122		1283
1123	#############################################################################	1284	#############################################################################
1124		1285
1125	package CFClient::UI::Label;	1286	package CFClient::UI::Label;
1126		1287
1127	our @ISA = CFClient::UI::Base::;	1288	our @ISA = CFClient::UI::DrawBG::;
1128		1289
1129	use CFClient::OpenGL;	1290	use CFClient::OpenGL;
1130		1291
1131	sub new {	1292	sub new {
1132	my ($class, %arg) = @_;	1293	my ($class, %arg) = @_;
1133		1294
1134	my $self = $class->SUPER::new (	1295	my $self = $class->SUPER::new (
1135	fg => [1, 1, 1],	1296	fg => [1, 1, 1],
		1297	#bg => none
		1298	#active_bg => none
1136	#font => default_font	1299	#font => default_font
		1300	#text => initial text
		1301	#markup => initial narkup
		1302	layout => (new CFClient::Layout),
1137	fontsize => 1,	1303	fontsize => 1,
1138	text => "",
1139	align => -1,	1304	align => -1,
1140	valign => -1,	1305	valign => -1,
1141	padding => 2,	1306	padding => 2,
1142	layout => new CFClient::Layout,
1143	can_events => 0,	1307	can_events => 0,
1144	%arg	1308	%arg
1145	);	1309	);
1146		1310
1147	if (exists $self->{template}) {	1311	if (exists $self->{template}) {
1148	my $layout = new CFClient::Layout;	1312	my $layout = new CFClient::Layout;
1149	$layout->set_text (delete $self->{template});	1313	$layout->set_text (delete $self->{template});
1150	$self->{template} = $layout;	1314	$self->{template} = $layout;
1151	}	1315	}
1152		1316
1153	$self->set_text (delete $self->{text}) if exists $self->{text};	1317	if (exists $self->{markup}) {
1154	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1318	$self->set_markup (delete $self->{markup});
		1319	} else {
		1320	$self->set_text (delete $self->{text});
		1321	}
1155		1322
1156	$self	1323	$self
1157	}	1324	}
1158		1325
1159	sub escape {	1326	sub escape($) {
1160	local $_ = $_[1];	1327	local $_ = $_[0];
1161		1328
1162	s/&/&amp;/g;	1329	s/&/&amp;/g;
1163	s/>/&gt;/g;	1330	s/>/&gt;/g;
1164	s/</&lt;/g;	1331	s/</&lt;/g;
1165		1332
1166	$_[1]	1333	$_
		1334	}
		1335
		1336	sub update {
		1337	my ($self) = @_;
		1338
		1339	delete $self->{texture};
		1340	$self->SUPER::update;
1167	}	1341	}
1168		1342
1169	sub set_text {	1343	sub set_text {
1170	my ($self, $text) = @_;	1344	my ($self, $text) = @_;
1171		1345
		1346	return if $self->{text} eq "T$text";
		1347	$self->{text} = "T$text";
		1348
		1349	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1172	$self->{layout}->set_text ($text);	1350	$self->{layout}->set_text ($text);
1173		1351
1174	delete $self->{texture};	1352	$self->update;
1175	$self->check_size;	1353	$self->check_size;
1176	$self->update;
1177	}	1354	}
1178		1355
1179	sub set_markup {	1356	sub set_markup {
1180	my ($self, $markup) = @_;	1357	my ($self, $markup) = @_;
1181		1358
		1359	return if $self->{text} eq "M$markup";
		1360	$self->{text} = "M$markup";
		1361
		1362	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1363
		1364	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1182	$self->{layout}->set_markup ($markup);	1365	$self->{layout}->set_markup ($markup);
1183		1366
1184	delete $self->{texture};	1367	$self->update;
1185	$self->check_size;	1368	$self->check_size;
1186	$self->update;
1187	}	1369	}
1188		1370
1189	sub size_request {	1371	sub size_request {
1190	my ($self) = @_;	1372	my ($self) = @_;
1191		1373
…		…
1220	sub set_fontsize {	1402	sub set_fontsize {
1221	my ($self, $fontsize) = @_;	1403	my ($self, $fontsize) = @_;
1222		1404
1223	$self->{fontsize} = $fontsize;	1405	$self->{fontsize} = $fontsize;
1224	delete $self->{texture};	1406	delete $self->{texture};
		1407
		1408	$self->update;
1225	$self->check_size;	1409	$self->check_size;
1226	$self->update;
1227	}	1410	}
1228		1411
1229	sub _draw {	1412	sub _draw {
1230	my ($self) = @_;	1413	my ($self) = @_;
1231		1414
		1415	$self->SUPER::_draw; # draw background, if applicable
		1416
1232	my $tex = $self->{texture} ||= do {	1417	my $tex = $self->{texture} ||= do {
		1418	$self->{layout}->set_foreground (@{$self->{fg}});
1233	$self->{layout}->set_font ($self->{font}) if $self->{font};	1419	$self->{layout}->set_font ($self->{font}) if $self->{font};
1234	$self->{layout}->set_width ($self->{w});	1420	$self->{layout}->set_width ($self->{w});
1235	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1421	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
		1422
1236	new_from_layout CFClient::Texture $self->{layout}	1423	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1424
		1425	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1426	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1427	: ($self->{w} - $tex->{w}) * 0.5);
		1428
		1429	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1430	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1431	: ($self->{h} - $tex->{h}) * 0.5);
		1432
		1433	$tex
1237	};	1434	};
1238		1435
1239	glEnable GL_BLEND;
1240	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1241	glEnable GL_TEXTURE_2D;	1436	glEnable GL_TEXTURE_2D;
1242	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1437	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1243		1438
		1439	if ($tex->{format} == GL_ALPHA) {
1244	glColor @{$self->{fg}};	1440	glColor @{$self->{fg}};
1245
1246	$self->{ox} = int (
1247	$self->{align} < 0 ? $self->{padding}
1248	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1249	: ($self->{w} - $tex->{w}) * 0.5
1250	);
1251
1252	$self->{oy} = int (
1253	$self->{valign} < 0 ? $self->{padding}
1254	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1255	: ($self->{h} - $tex->{h}) * 0.5
1256	);
1257
1258	$tex->draw_quad ($self->{ox}, $self->{oy});	1441	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1442	} else {
		1443	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1444	}
1259		1445
1260	glDisable GL_TEXTURE_2D;	1446	glDisable GL_TEXTURE_2D;
1261	glDisable GL_BLEND;
1262	}	1447	}
1263		1448
1264	#############################################################################	1449	#############################################################################
1265		1450
1266	package CFClient::UI::EntryBase;	1451	package CFClient::UI::EntryBase;
…		…
1271		1456
1272	sub new {	1457	sub new {
1273	my $class = shift;	1458	my $class = shift;
1274		1459
1275	$class->SUPER::new (	1460	$class->SUPER::new (
1276	fg => [1, 1, 1],	1461	fg => [1, 1, 1],
1277	bg => [0, 0, 0, 0.2],	1462	bg => [0, 0, 0, 0.2],
1278	active_bg => [1, 1, 1, 0.5],	1463	active_bg => [1, 1, 1, 0.5],
1279	active_fg => [0, 0, 0],	1464	active_fg => [0, 0, 0],
1280	can_hover => 1,	1465	can_hover => 1,
1281	can_focus => 1,	1466	can_focus => 1,
1282	valign => 0,	1467	valign => 0,
1283	can_events => 1,	1468	can_events => 1,
1284	@_	1469	@_
1285	)	1470	)
1286	}	1471	}
1287		1472
…		…
1301	$self->{layout}->set_text ("$text ");	1486	$self->{layout}->set_text ("$text ");
1302		1487
1303	$self->emit (changed => $self->{text});	1488	$self->emit (changed => $self->{text});
1304	}	1489	}
1305		1490
1306	sub get_text {
1307	$_[0]{text}
1308	}
1309
1310	sub size_request {
1311	my ($self) = @_;
1312
1313	my ($w, $h) = $self->SUPER::size_request;
1314
1315	($w + 1, $h) # add 1 for cursor
1316	}
1317
1318	sub size_allocate {
1319	my ($self, $w, $h) = @_;
1320
1321	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1322	}
1323
1324	sub set_text {	1491	sub set_text {
1325	my ($self, $text) = @_;	1492	my ($self, $text) = @_;
1326		1493
1327	$self->{cursor} = length $text;	1494	$self->{cursor} = length $text;
1328	$self->_set_text ($text);	1495	$self->_set_text ($text);
1329	$self->update;	1496	$self->update;
		1497	$self->check_size;
		1498	}
		1499
		1500	sub get_text {
		1501	$_[0]{text}
		1502	}
		1503
		1504	sub size_request {
		1505	my ($self) = @_;
		1506
		1507	my ($w, $h) = $self->SUPER::size_request;
		1508
		1509	($w + 1, $h) # add 1 for cursor
		1510	}
		1511
		1512	sub size_allocate {
		1513	my ($self, $w, $h) = @_;
		1514
		1515	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1330	}	1516	}
1331		1517
1332	sub key_down {	1518	sub key_down {
1333	my ($self, $ev) = @_;	1519	my ($self, $ev) = @_;
1334		1520
…		…
1336	my $sym = $ev->{sym};	1522	my $sym = $ev->{sym};
1337	my $uni = $ev->{unicode};	1523	my $uni = $ev->{unicode};
1338		1524
1339	my $text = $self->get_text;	1525	my $text = $self->get_text;
1340		1526
1341	if ($sym == 8) {	1527	if ($uni == 8) {
1342	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1528	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1343	} elsif ($sym == 127) {	1529	} elsif ($uni == 127) {
1344	substr $text, $self->{cursor}, 1, "";	1530	substr $text, $self->{cursor}, 1, "";
1345	} elsif ($sym == CFClient::SDLK_LEFT) {	1531	} elsif ($sym == CFClient::SDLK_LEFT) {
1346	--$self->{cursor} if $self->{cursor};	1532	--$self->{cursor} if $self->{cursor};
1347	} elsif ($sym == CFClient::SDLK_RIGHT) {	1533	} elsif ($sym == CFClient::SDLK_RIGHT) {
1348	++$self->{cursor} if $self->{cursor} < length $self->{text};	1534	++$self->{cursor} if $self->{cursor} < length $self->{text};
1349	} elsif ($sym == CFClient::SDLK_HOME) {	1535	} elsif ($sym == CFClient::SDLK_HOME) {
1350	$self->{cursor} = 0;	1536	$self->{cursor} = 0;
1351	} elsif ($sym == CFClient::SDLK_END) {	1537	} elsif ($sym == CFClient::SDLK_END) {
1352	$self->{cursor} = length $text;	1538	$self->{cursor} = length $text;
1353	} elsif ($sym == 27) {	1539	} elsif ($uni == 27) {
1354	$self->emit ('escape');	1540	$self->emit ('escape');
1355	} elsif ($uni) {	1541	} elsif ($uni) {
1356	substr $text, $self->{cursor}++, 0, chr $uni;	1542	substr $text, $self->{cursor}++, 0, chr $uni;
1357	}	1543	}
1358		1544
1359	$self->_set_text ($text);	1545	$self->_set_text ($text);
1360	$self->update;	1546	$self->update;
		1547	$self->check_size;
1361	}	1548	}
1362		1549
1363	sub focus_in {	1550	sub focus_in {
1364	my ($self) = @_;	1551	my ($self) = @_;
1365		1552
…		…
1441	my ($self, $ev) = @_;	1628	my ($self, $ev) = @_;
1442		1629
1443	my $sym = $ev->{sym};	1630	my $sym = $ev->{sym};
1444		1631
1445	if ($sym == 13) {	1632	if ($sym == 13) {
		1633	unshift @{$self->{history}},
		1634	my $txt = $self->get_text;
		1635	$self->{history_pointer} = -1;
		1636	$self->{history_saveback} = '';
1446	$self->emit (activate => $self->get_text);	1637	$self->emit (activate => $txt);
1447	$self->update;	1638	$self->update;
		1639
		1640	} elsif ($sym == CFClient::SDLK_UP) {
		1641	if ($self->{history_pointer} < 0) {
		1642	$self->{history_saveback} = $self->get_text;
		1643	}
		1644	if (@{$self->{history} || []} > 0) {
		1645	$self->{history_pointer}++;
		1646	if ($self->{history_pointer} >= @{$self->{history} || []}) {
		1647	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1648	}
		1649	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1650	}
		1651
		1652	} elsif ($sym == CFClient::SDLK_DOWN) {
		1653	$self->{history_pointer}--;
		1654	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
		1655
		1656	if ($self->{history_pointer} >= 0) {
		1657	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1658	} else {
		1659	$self->set_text ($self->{history_saveback});
		1660	}
1448		1661
1449	} else {	1662	} else {
1450	$self->SUPER::key_down ($ev);	1663	$self->SUPER::key_down ($ev);
1451	}	1664	}
1452		1665
…		…
1466		1679
1467	sub new {	1680	sub new {
1468	my $class = shift;	1681	my $class = shift;
1469		1682
1470	$class->SUPER::new (	1683	$class->SUPER::new (
1471	padding => 4,	1684	padding => 4,
1472	fg => [1, 1, 1],	1685	fg => [1, 1, 1],
1473	bg => [1, 1, 1, 0.2],
1474	active_fg => [0, 0, 1],	1686	active_fg => [0, 0, 1],
1475	can_hover => 1,	1687	can_hover => 1,
1476	align => 0,	1688	align => 0,
1477	valign => 0,	1689	valign => 0,
1478	can_events => 1,	1690	can_events => 1,
1479	@_	1691	@_
1480	)	1692	)
1481	}	1693	}
1482		1694
…		…
1496		1708
1497	if ($GRAB == $self) {	1709	if ($GRAB == $self) {
1498	$self->{fg} = $self->{active_fg};	1710	$self->{fg} = $self->{active_fg};
1499	}	1711	}
1500		1712
1501	glEnable GL_BLEND;
1502	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1503	glEnable GL_TEXTURE_2D;	1713	glEnable GL_TEXTURE_2D;
1504	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1714	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1505	glColor 0, 0, 0, 1;	1715	glColor 0, 0, 0, 1;
1506		1716
1507	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1717	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1508		1718
1509	glDisable GL_TEXTURE_2D;	1719	glDisable GL_TEXTURE_2D;
1510	glDisable GL_BLEND;
1511		1720
1512	$self->SUPER::_draw;	1721	$self->SUPER::_draw;
1513	}	1722	}
1514		1723
1515	#############################################################################	1724	#############################################################################
…		…
1529		1738
1530	$class->SUPER::new (	1739	$class->SUPER::new (
1531	padding => 2,	1740	padding => 2,
1532	fg => [1, 1, 1],	1741	fg => [1, 1, 1],
1533	active_fg => [1, 1, 0],	1742	active_fg => [1, 1, 0],
		1743	bg => [0, 0, 0, 0.2],
		1744	active_bg => [1, 1, 1, 0.5],
1534	state => 0,	1745	state => 0,
1535	can_hover => 1,	1746	can_hover => 1,
1536	@_	1747	@_
1537	)	1748	)
1538	}	1749	}
…		…
1562		1773
1563	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1774	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1564		1775
1565	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1776	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1566		1777
1567	glEnable GL_BLEND;	1778	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1779
1568	glEnable GL_TEXTURE_2D;	1780	glEnable GL_TEXTURE_2D;
1569	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1570
1571	my $tex = $self->{state} ? $tex[1] : $tex[0];
1572
1573	$tex->draw_quad (0, 0, $s, $s);	1781	$tex->draw_quad_alpha (0, 0, $s, $s);
1574
1575	glDisable GL_TEXTURE_2D;	1782	glDisable GL_TEXTURE_2D;
1576	glDisable GL_BLEND;
1577	}	1783	}
1578		1784
1579	#############################################################################	1785	#############################################################################
1580		1786
1581	package CFClient::UI::Image;	1787	package CFClient::UI::Image;
…		…
1624	glTranslate 0, -$self->{w}, 0;	1830	glTranslate 0, -$self->{w}, 0;
1625		1831
1626	($w, $h) = ($h, $w);	1832	($w, $h) = ($h, $w);
1627	}	1833	}
1628		1834
1629	glEnable GL_BLEND;
1630	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1631	glEnable GL_TEXTURE_2D;	1835	glEnable GL_TEXTURE_2D;
1632	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1836	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1633		1837
1634	$tex->draw_quad (0, 0, $w, $h);	1838	$tex->draw_quad_alpha (0, 0, $w, $h);
1635		1839
1636	glDisable GL_BLEND;
1637	glDisable GL_TEXTURE_2D;	1840	glDisable GL_TEXTURE_2D;
1638	}	1841	}
1639		1842
1640	#############################################################################	1843	#############################################################################
1641		1844
…		…
1689	}	1892	}
1690		1893
1691	sub set_max {	1894	sub set_max {
1692	my ($self, $max) = @_;	1895	my ($self, $max) = @_;
1693		1896
		1897	return if $self->{max_val} == $max;
		1898
1694	$self->{max_val} = $max;	1899	$self->{max_val} = $max;
		1900	$self->update;
1695	}	1901	}
1696		1902
1697	sub set_value {	1903	sub set_value {
1698	my ($self, $val, $max) = @_;	1904	my ($self, $val, $max) = @_;
1699		1905
1700	$self->set_max ($max)	1906	$self->set_max ($max)
1701	if defined $max;	1907	if defined $max;
1702		1908
1703	$max = $self->{max_val};	1909	return if $self->{val} == $val;
		1910
1704	$self->{val} = $val;	1911	$self->{val} = $val;
1705
1706	$self->update;	1912	$self->update;
1707	}	1913	}
1708		1914
1709	sub _draw {	1915	sub _draw {
1710	my ($self) = @_;	1916	my ($self) = @_;
…		…
1773		1979
1774	sub new {	1980	sub new {
1775	my ($class, %arg) = @_;	1981	my ($class, %arg) = @_;
1776		1982
1777	my $self = $class->SUPER::new (	1983	my $self = $class->SUPER::new (
1778	tooltip => $arg{type},	1984	tooltip => $arg{type},
		1985	can_hover => 1,
1779	can_events => 1,	1986	can_events => 1,
1780	can_hover => 1,
1781	%arg,	1987	%arg,
1782	);	1988	);
1783		1989
1784	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	1990	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1785	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	1991	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
…		…
1793		1999
1794	$self->{value}->set_fontsize ($fsize);	2000	$self->{value}->set_fontsize ($fsize);
1795	$self->{max} ->set_fontsize ($fsize);	2001	$self->{max} ->set_fontsize ($fsize);
1796	}	2002	}
1797		2003
		2004	sub set_max {
		2005	my ($self, $max) = @_;
		2006
		2007	$self->{gauge}->set_max ($max);
		2008	$self->{max}->set_text ($max);
		2009	}
		2010
1798	sub set_value {	2011	sub set_value {
1799	my ($self, $val, $max) = @_;	2012	my ($self, $val, $max) = @_;
1800		2013
1801	$self->set_max ($max)	2014	$self->set_max ($max)
1802	if defined $max;	2015	if defined $max;
1803		2016
1804	$self->{gauge}->set_value ($val, $max);	2017	$self->{gauge}->set_value ($val, $max);
1805	$self->{value}->set_text ($val);	2018	$self->{value}->set_text ($val);
1806	}
1807
1808	sub set_max {
1809	my ($self, $max) = @_;
1810
1811	$self->{gauge}->set_max ($max);
1812	$self->{max}->set_text ($max);
1813	}	2019	}
1814		2020
1815	#############################################################################	2021	#############################################################################
1816		2022
1817	package CFClient::UI::Slider;	2023	package CFClient::UI::Slider;
…		…
1827	qw(s1_slider.png s1_slider_bg.png);	2033	qw(s1_slider.png s1_slider_bg.png);
1828		2034
1829	sub new {	2035	sub new {
1830	my $class = shift;	2036	my $class = shift;
1831		2037
1832	# range [value, low, high, page]	2038	# range [value, low, high, page, unit]
1833		2039
1834	# TODO: 0-width page	2040	# TODO: 0-width page
1835	# TODO: req_w/h are wrong with vertical	2041	# TODO: req_w/h are wrong with vertical
1836	# TODO: calculations are off	2042	# TODO: calculations are off
1837	my $self = $class->SUPER::new (	2043	my $self = $class->SUPER::new (
1838	fg => [1, 1, 1],	2044	fg => [1, 1, 1],
1839	active_fg => [0, 0, 0],	2045	active_fg => [0, 0, 0],
		2046	bg => [0, 0, 0, 0.2],
		2047	active_bg => [1, 1, 1, 0.5],
1840	range => [0, 0, 100, 10],	2048	range => [0, 0, 100, 10],
1841	req_w => 20,	2049	req_w => $::WIDTH / 80,
1842	req_h => 20,	2050	req_h => $::WIDTH / 80,
1843	vertical => 0,	2051	vertical => 0,
1844	can_hover => 1,	2052	can_hover => 1,
1845	inner_pad => 5,	2053	inner_pad => .05,
1846	@_	2054	@_
1847	);	2055	);
1848		2056
		2057	$self->set_value ($self->{range}[0]);
		2058	$self->update;
		2059
1849	$self	2060	$self
		2061	}
		2062
		2063	sub set_value {
		2064	my ($self, $value) = @_;
		2065
		2066	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2067
		2068	$hi = $lo + 1 if $hi <= $lo;
		2069
		2070	$value = $lo if $value < $lo;
		2071	$value = $hi if $value > $hi;
		2072
		2073	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2074	if $unit;
		2075
		2076	$page = $hi - $lo if $page > $hi - $lo;
		2077
		2078	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2079
		2080	if ($value != $old_value) {
		2081	$self->emit (changed => $value);
		2082	$self->update;
		2083	}
1850	}	2084	}
1851		2085
1852	sub size_request {	2086	sub size_request {
1853	my ($self) = @_;	2087	my ($self) = @_;
1854		2088
…		…
1867		2101
1868	sub mouse_motion {	2102	sub mouse_motion {
1869	my ($self, $ev, $x, $y) = @_;	2103	my ($self, $ev, $x, $y) = @_;
1870		2104
1871	if ($GRAB == $self) {	2105	if ($GRAB == $self) {
		2106	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2107
		2108	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2109
		2110	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
		2111
		2112	$self->set_value ($x * ($hi - $lo) + $lo);
		2113	}
		2114	}
		2115
		2116	sub update {
		2117	my ($self) = @_;
		2118
		2119	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2120	$self->set_value ($self->{range}[0]);
		2121
1872	my ($value, $lo, $hi, $page) = @{$self->{range}};	2122	my ($value, $lo, $hi, $page) = @{$self->{range}};
1873		2123
1874	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2124	my $inner_w = 1 - 2 * $self->{inner_pad};
1875		2125
1876	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2126	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1877	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1878		2127
1879	$x -= $inner_pad_px; # substract the padding	2128	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1880	$x = $x * ($hi - $lo) / $inner_w + $lo;	2129	$value = $self->{scale} * ($value - $lo);
1881	$x = $lo if $x < $lo;
1882	$x = $hi - $page if $x > $hi - $page;
1883	$self->{range}[0] = $x;
1884		2130
1885	$self->emit (changed => $x);	2131	$value = $self->{inner_pad} + ($value - $page * 0.5);
1886	$self->update;	2132
		2133	$value = 0 if $value < 0;
		2134	$page = 1 - $value if $value + $page > 1;
		2135
		2136	$self->{knob_x} = $value;
		2137	$self->{knob_w} = $page;
1887	}	2138	});
1888	}
1889		2139
1890	# the inner_* stuff is for generating a padding for the slider handle,	2140	$self->SUPER::update;
1891	# so that the handle doesn't leave the texture. This calculation isn't 100%
1892	# correct propably, but it does the job for now
1893	sub _calc_inner_pad_px {
1894	my ($self, $w) = @_;
1895	($w / 100) * $self->{inner_pad} # % to pixels
1896	}	2141	}
1897		2142
1898	sub _draw {	2143	sub _draw {
1899	my ($self) = @_;	2144	my ($self) = @_;
1900		2145
1901	$self->SUPER::_draw ();	2146	$self->SUPER::_draw ();
1902		2147
1903	my ($w, $h) = @$self{qw(w h)};	2148	glScale $self->{w}, $self->{h};
1904		2149
1905	if ($self->{vertical}) {	2150	if ($self->{vertical}) {
1906	# draw a vertical slider like a rotated horizontal slider	2151	# draw a vertical slider like a rotated horizontal slider
1907		2152
1908	glRotate 90, 0, 0, 1;	2153	glRotate 90, 0, 0, 1;
1909	glTranslate 0, -$self->{w}, 0;	2154	glTranslate 0, 1, 0;
1910
1911	($w, $h) = ($h, $w);
1912	}	2155	}
1913		2156
1914	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2157	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1915	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2158	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1916		2159
1917	my ($value, $lo, $hi, $page) = @{$self->{range}};
1918
1919	$hi = $value + 1 if $lo == $hi;
1920
1921	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1922	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1923
1924	$page = int $page * $inner_w / ($hi - $lo);
1925	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1926
1927	$w -= $page;
1928	$page &= ~1;
1929	glTranslate $page * 0.5, 0, 0;
1930	$page ||= 2;
1931
1932	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1933	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1934
1935	glEnable GL_BLEND;
1936	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1937	glEnable GL_TEXTURE_2D;	2160	glEnable GL_TEXTURE_2D;
1938	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2161	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1939		2162
1940	# draw background	2163	# draw background
1941	$tex[1]->draw_quad (0, 0, $w, $h);	2164	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
1942		2165
1943	# draw handle	2166	# draw handle
1944	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2167	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1945		2168
1946	glDisable GL_BLEND;
1947	glDisable GL_TEXTURE_2D;	2169	glDisable GL_TEXTURE_2D;
1948	}	2170	}
1949		2171
1950	#############################################################################	2172	#############################################################################
1951		2173
…		…
1957		2179
1958	sub new {	2180	sub new {
1959	my $class = shift;	2181	my $class = shift;
1960		2182
1961	my $self = $class->SUPER::new (	2183	my $self = $class->SUPER::new (
1962	fontsize => 1,	2184	fontsize => 1,
		2185	can_events => 0,
1963	#font => default_font	2186	#font => default_font
1964	@_,	2187	@_,
1965		2188
1966	layout => (new CFClient::Layout),	2189	layout => (new CFClient::Layout 1),
1967	par => [],	2190	par => [],
1968	height => 0,	2191	height => 0,
1969	children => [	2192	children => [
1970	(new CFClient::UI::Empty expand => 1),	2193	(new CFClient::UI::Empty expand => 1),
1971	(new CFClient::UI::Slider vertical => 1),	2194	(new CFClient::UI::Slider vertical => 1),
1972	],	2195	],
1973	);	2196	);
1974		2197
1975	$self->{children}[1]->connect (changed => sub {	2198	$self->{children}[1]->connect (changed => sub { $self->update });
1976	$self->update;
1977	});
1978		2199
1979	$self	2200	$self
1980	}	2201	}
1981		2202
1982	sub set_fontsize {	2203	sub set_fontsize {
…		…
1990	my ($self, $text) = @_;	2211	my ($self, $text) = @_;
1991		2212
1992	my $layout = $self->{layout};	2213	my $layout = $self->{layout};
1993		2214
1994	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2215	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1995	$layout->set_width ($self->{w});	2216	$layout->set_width ($self->{children}[0]{w});
1996	$layout->set_text ($text);	2217	$layout->set_markup ($text);
1997		2218
1998	($layout->size)[1]	2219	($layout->size)[1]
1999	}	2220	}
2000		2221
2001	sub reflow {	2222	sub reflow {
…		…
2039		2260
2040	return unless $self->{h} > 0;	2261	return unless $self->{h} > 0;
2041		2262
2042	delete $self->{texture};	2263	delete $self->{texture};
2043		2264
2044	$ROOT->on_refresh ($self, sub {	2265	$ROOT->on_post_alloc ($self, sub {
2045	if (delete $self->{need_reflow}) {	2266	if (delete $self->{need_reflow}) {
2046	my $height = 0;	2267	my $height = 0;
2047		2268
2048	$height += $_->[0] = $self->text_height ($_->[2])	2269	$height += $_->[0] = $self->text_height ($_->[2])
2049	for @{$self->{par}};	2270	for @{$self->{par}};
…		…
2053	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2274	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2054		2275
2055	delete $self->{texture};	2276	delete $self->{texture};
2056	}	2277	}
2057		2278
2058	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2279	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2059	glClearColor 0, 0, 0, 1;	2280	glClearColor 0, 0, 0, 0;
2060	glClear GL_COLOR_BUFFER_BIT;	2281	glClear GL_COLOR_BUFFER_BIT;
2061		2282
2062	glEnable GL_BLEND;
2063	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2064	glEnable GL_TEXTURE_2D;	2283	glEnable GL_TEXTURE_2D;
2065	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2284	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2066		2285
2067	my $top = int $self->{children}[1]{range}[0];	2286	my $top = int $self->{children}[1]{range}[0];
2068		2287
…		…
2077		2296
2078	for my $par (@{$self->{par}}) {	2297	for my $par (@{$self->{par}}) {
2079	my $h = $par->[0];	2298	my $h = $par->[0];
2080		2299
2081	if ($y0 < $y + $h && $y < $y1) {	2300	if ($y0 < $y + $h && $y < $y1) {
		2301	$layout->set_foreground (@{ $par->[1] });
2082	$layout->set_text ($par->[2]);	2302	$layout->set_markup ($par->[2]);
2083		2303
2084	glColor @{ $par->[1] };
2085	my ($W, $H) = $layout->size;	2304	my ($W, $H) = $layout->size;
2086	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2305	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
2087	}	2306	}
2088		2307
2089	$y += $h;	2308	$y += $h;
2090	}	2309	}
2091		2310
2092	glDisable GL_TEXTURE_2D;	2311	glDisable GL_TEXTURE_2D;
2093	glDisable GL_BLEND;
2094	};	2312	};
2095	});	2313	});
2096	}	2314	}
2097		2315
2098	sub _draw {	2316	sub _draw {
2099	my ($self) = @_;	2317	my ($self) = @_;
2100		2318
2101	if ($self->{texture}) {
2102	glEnable GL_TEXTURE_2D;	2319	glEnable GL_TEXTURE_2D;
2103	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2320	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2104	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2321	glColor 1, 1, 1, 1;
		2322	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2105	glDisable GL_TEXTURE_2D;	2323	glDisable GL_TEXTURE_2D;
2106	}
2107		2324
2108	$self->{children}[1]->draw;	2325	$self->{children}[1]->draw;
2109		2326
2110	}	2327	}
2111		2328
…		…
2159		2376
2160	sub new {	2377	sub new {
2161	my $class = shift;	2378	my $class = shift;
2162		2379
2163	my $self = $class->SUPER::new (	2380	my $self = $class->SUPER::new (
2164	state => 0,	2381	state => 0,
2165	connect_activate => \&toggle_flopper,	2382	connect_activate => \&toggle_flopper,
2166	can_events => 1,
2167	@_	2383	@_
2168	);	2384	);
2169		2385
2170	if ($self->{state}) {	2386	if ($self->{state}) {
2171	$self->{state} = 0;	2387	$self->{state} = 0;
…		…
2206	@_,	2422	@_,
2207	can_events => 0,	2423	can_events => 0,
2208	)	2424	)
2209	}	2425	}
2210		2426
2211	sub set_markup {	2427	sub set_tooltip_from {
2212	my ($self, $text) = @_;	2428	my ($self, $widget) = @_;
2213		2429
2214	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2430	$self->add (new CFClient::UI::Label
2215	$self->{label}->set_markup ($text);	2431	markup => $widget->{tooltip},
2216	$self->add ($self->{label});	2432	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2433	fontsize => 0.8,
		2434	fg => [0, 0, 0, 1],
		2435	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2436	);
2217	}	2437	}
2218		2438
2219	sub size_request {	2439	sub size_request {
2220	my ($self) = @_;	2440	my ($self) = @_;
2221
2222	$self->child->set_max_size ($::WIDTH * 0.3);
2223		2441
2224	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2442	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2225		2443
2226	($w + 4, $h + 4)	2444	($w + 4, $h + 4)
2227	}	2445	}
…		…
2233	}	2451	}
2234		2452
2235	sub _draw {	2453	sub _draw {
2236	my ($self) = @_;	2454	my ($self) = @_;
2237		2455
2238	glPushMatrix;
2239	glTranslate 0.375, 0.375;	2456	glTranslate 0.375, 0.375;
2240		2457
2241	my ($w, $h) = @$self{qw(w h)};	2458	my ($w, $h) = @$self{qw(w h)};
2242		2459
2243	glColor 1, 0.8, 0.4;	2460	glColor 1, 0.8, 0.4;
…		…
2254	glVertex 0 , $h;	2471	glVertex 0 , $h;
2255	glVertex $w, $h;	2472	glVertex $w, $h;
2256	glVertex $w, 0;	2473	glVertex $w, 0;
2257	glEnd;	2474	glEnd;
2258		2475
2259	glPopMatrix;	2476	glTranslate 2 - 0.375, 2 - 0.375;
2260
2261	glTranslate 2, 2;
2262	$self->SUPER::_draw;	2477	$self->SUPER::_draw;
2263	}	2478	}
2264		2479
2265	#############################################################################	2480	#############################################################################
2266		2481
…		…
2281		2496
2282	sub size_request {	2497	sub size_request {
2283	(32, 8)	2498	(32, 8)
2284	}	2499	}
2285		2500
2286	sub draw {	2501	sub _draw {
2287	my ($self) = @_;	2502	my ($self) = @_;
2288		2503
		2504	return unless $::CONN;#d# manage and cache textures differently
2289	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2505	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2290		2506
		2507	# TODO animation
2291	if ($tex) {	2508	if ($tex) {
2292	glEnable GL_BLEND;
2293	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2294	glEnable GL_TEXTURE_2D;	2509	glEnable GL_TEXTURE_2D;
2295	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2510	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296	glColor 1, 1, 1, 1;	2511	glColor 1, 1, 1, 1;
2297	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2512	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2298	glDisable GL_TEXTURE_2D;	2513	glDisable GL_TEXTURE_2D;
2299	glDisable GL_BLEND;	2514	}
		2515	}
		2516
		2517	#############################################################################
		2518
		2519	package CFClient::UI::InventoryItem;
		2520
		2521	our @ISA = CFClient::UI::HBox::;
		2522
		2523	sub _item_to_desc {
		2524	my ($item) = @_;
		2525
		2526	my $desc =
		2527	$item->{nrof} < 2
		2528	? $item->{name}
		2529	: "$item->{nrof} $item->{name_pl}";
		2530
		2531	$item->{flags} & Crossfire::Protocol::F_OPEN
		2532	and $desc .= " (open)";
		2533	$item->{flags} & Crossfire::Protocol::F_APPLIED
		2534	and $desc .= " (applied)";
		2535	$item->{flags} & Crossfire::Protocol::F_UNPAID
		2536	and $desc .= " (unpaid)";
		2537	$item->{flags} & Crossfire::Protocol::F_MAGIC
		2538	and $desc .= " (magic)";
		2539	$item->{flags} & Crossfire::Protocol::F_CURSED
		2540	and $desc .= " (cursed)";
		2541	$item->{flags} & Crossfire::Protocol::F_DAMNED
		2542	and $desc .= " (damned)";
		2543	$item->{flags} & Crossfire::Protocol::F_LOCKED
		2544	and $desc .= " *";
		2545
		2546	$desc
		2547	}
		2548
		2549	sub new {
		2550	my $class = shift;
		2551
		2552	my %args = @_;
		2553
		2554	my $item = delete $args{item};
		2555
		2556	my $desc = _item_to_desc ($item);
		2557
		2558	my $self = $class->SUPER::new (
		2559	can_hover => 1,
		2560	can_events => 1,
		2561	tooltip => ((CFClient::UI::Label::escape $desc)
		2562	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2563	connect_button_down => sub {
		2564	my ($self, $ev, $x, $y) = @_;
		2565
		2566	# todo: maybe put examine on 1? but should just be a tooltip :(
		2567	if ($ev->{button} == 1) {
		2568	my $targ = $::CONN->{player}{tag};
		2569
		2570	if ($item->{container} == $::CONN->{player}{tag}) {
		2571	$targ = $main::OPENCONT;
		2572	}
		2573
		2574	$::CONN->send ("move $targ $item->{tag} 0");
		2575	} elsif ($ev->{button} == 2) {
		2576	$::CONN->send ("apply $item->{tag}");
		2577	} elsif ($ev->{button} == 3) {
		2578	my @menu_items = (
		2579	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2580	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2581	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2582	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
		2583	[
		2584	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2585	sub { $::CONN->send ("lock $item->{tag}") },
		2586	],
		2587	);
		2588
		2589	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		2590	}
		2591
		2592	1
		2593	},
		2594	%args
		2595	);
		2596
		2597
		2598	$self->add (new CFClient::UI::Face
		2599	can_events => 0,
		2600	face => $item->{face},
		2601	anim => $item->{anim},
		2602	animspeed => $item->{animspeed},
		2603	);
		2604
		2605	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
		2606
		2607	$self->{item} = $item;
		2608
		2609	$self->update_item;
		2610
		2611	$self
		2612	}
		2613
		2614	sub update_item {
		2615	my ($self) = @_;
		2616
		2617	my $desc = _item_to_desc ($self->{item});
		2618
		2619	$self->{name_lbl}->set_text ($desc);
		2620	}
		2621
		2622	#############################################################################
		2623
		2624	package CFClient::UI::Inventory;
		2625
		2626	our @ISA = CFClient::UI::ScrolledWindow::;
		2627
		2628	sub new {
		2629	my $class = shift;
		2630
		2631	my $self = $class->SUPER::new (
		2632	scrolled => (new CFClient::UI::VBox),
		2633	@_,
		2634	);
		2635
		2636	$self
		2637	}
		2638
		2639	sub set_items {
		2640	my ($self, $items) = @_;
		2641
		2642	$self->{scrolled}->clear;
		2643	return unless $items;
		2644
		2645	my @items = sort {
		2646	($a->{type} <=> $b->{type})
		2647	or ($a->{name} cmp $b->{name})
		2648	} @$items;
		2649
		2650	$self->{real_items} = \@items;
		2651
		2652	for my $item (@items) {
		2653	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
		2654	$item->update_item ();
		2655	}
		2656
		2657	$self->{scrolled}->add (@items);
		2658
		2659	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2660	}
		2661
		2662	sub size_request {
		2663	my ($self) = @_;
		2664	($self->{req_w}, $self->{req_h});
		2665	}
		2666
		2667	#############################################################################
		2668
		2669	package CFClient::UI::Menu;
		2670
		2671	our @ISA = CFClient::UI::FancyFrame::;
		2672
		2673	use CFClient::OpenGL;
		2674
		2675	sub new {
		2676	my $class = shift;
		2677
		2678	my $self = $class->SUPER::new (
		2679	items => [],
		2680	z => 100,
		2681	@_,
		2682	);
		2683
		2684	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2685
		2686	for my $item (@{ $self->{items} }) {
		2687	my ($widget, $cb) = @$item;
		2688
		2689	# handle various types of items, only text for now
		2690	if (!ref $widget) {
		2691	$widget = new CFClient::UI::Label
		2692	can_hover => 1,
		2693	can_events => 1,
		2694	text => $widget;
		2695	}
		2696
		2697	$self->{item}{$widget} = $item;
		2698
		2699	$self->{vbox}->add ($widget);
		2700	}
		2701
		2702	$self
		2703	}
		2704
		2705	# popup given the event (must be a mouse button down event currently)
		2706	sub popup {
		2707	my ($self, $ev) = @_;
		2708
		2709	$self->emit ("popdown");
		2710
		2711	# maybe save $GRAB? must be careful about events...
		2712	$GRAB = $self;
		2713	$self->{button} = $ev->{button};
		2714
		2715	$self->show;
		2716	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2717	}
		2718
		2719	sub mouse_motion {
		2720	my ($self, $ev, $x, $y) = @_;
		2721
		2722	# TODO: should use vbox->find_widget or so
		2723	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2724	$self->{hover} = $self->{item}{$HOVER};
		2725	}
		2726
		2727	sub button_up {
		2728	my ($self, $ev, $x, $y) = @_;
		2729
		2730	if ($ev->{button} == $self->{button}) {
		2731	undef $GRAB;
		2732	$self->hide;
		2733
		2734	$self->emit ("popdown");
		2735	$self->{hover}[1]->() if $self->{hover};
		2736	}
		2737	}
		2738
		2739	#############################################################################
		2740
		2741	package CFClient::UI::Statusbox;
		2742
		2743	our @ISA = CFClient::UI::VBox::;
		2744
		2745	sub new {
		2746	my $class = shift;
		2747
		2748	$class->SUPER::new (
		2749	fontsize => 0.8,
		2750	@_,
2300	}	2751	)
		2752	}
		2753
		2754	sub reorder {
		2755	my ($self) = @_;
		2756	my $NOW = time;
		2757
		2758	while (my ($k, $v) = each %{ $self->{item} }) {
		2759	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2760	}
		2761
		2762	my @widgets;
		2763
		2764	my @items = sort {
		2765	$a->{pri} <=> $b->{pri}
		2766	or $b->{id} <=> $a->{id}
		2767	} values %{ $self->{item} };
		2768
		2769	my $count = 10 + 1;
		2770	for my $item (@items) {
		2771	last unless --$count;
		2772
		2773	push @widgets, $item->{label} ||= do {
		2774	# TODO: doesn't handle markup well (read as: at all)
		2775	my $short = $item->{count} > 1
		2776	? "<b>$item->{count} ×</b> $item->{text}"
		2777	: $item->{text};
		2778
		2779	my $fontsize = $item->{fontsize} || $self->{fontsize};
		2780
		2781	for ($short) {
		2782	s/^\s+//;
		2783	s/\s+/ /g;
		2784	my $len = int 40 / $fontsize;
		2785	substr $_, $len, length, "…" if $len < length;
		2786	}
		2787
		2788	new CFClient::UI::Label
		2789	markup => $short,
		2790	tooltip => $item->{tooltip},
		2791	tooltip_font => $::FONT_PROP,
		2792	tooltip_width => 0.67,
		2793	fontsize => $fontsize,
		2794	fg => $item->{fg},
		2795	can_events => 1,
		2796	can_hover => 1
		2797	};
		2798	}
		2799
		2800	$self->clear;
		2801	$self->SUPER::add (reverse @widgets);
		2802	}
		2803
		2804	sub add {
		2805	my ($self, $text, %arg) = @_;
		2806
		2807	$text =~ s/^\s+//;
		2808	$text =~ s/\s+$//;
		2809
		2810	my $timeout = time + ((delete $arg{timeout}) || 60);
		2811
		2812	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2813
		2814	if (my $item = $self->{item}{$group}) {
		2815	if ($item->{text} eq $text) {
		2816	$item->{count}++;
		2817	} else {
		2818	$item->{count} = 1;
		2819	$item->{text} = $item->{tooltip} = $text;
		2820	}
		2821	$item->{id} = ++$self->{id};
		2822	$item->{timeout} = $timeout;
		2823	delete $item->{label};
		2824	} else {
		2825	$self->{item}{$group} = {
		2826	id => ++$self->{id},
		2827	text => $text,
		2828	timeout => $timeout,
		2829	tooltip => $text,
		2830	fg => [0.8, 0.8, 0.8, 0.8],
		2831	pri => 0,
		2832	count => 1,
		2833	%arg,
		2834	};
		2835	}
		2836
		2837	$self->reorder;
2301	}	2838	}
2302		2839
2303	#############################################################################	2840	#############################################################################
2304		2841
2305	package CFClient::UI::Root;	2842	package CFClient::UI::Root;
2306		2843
2307	our @ISA = CFClient::UI::Container::;	2844	our @ISA = CFClient::UI::Container::;
2308		2845
2309	use CFClient::OpenGL;	2846	use CFClient::OpenGL;
2310		2847
2311	sub check_size {	2848	sub new {
2312	my ($self) = @_;	2849	my $class = shift;
2313		2850
2314	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	2851	$class->SUPER::new (
2315	}	2852	@_,
2316		2853	)
2317	sub size_request {
2318	($::WIDTH, $::HEIGHT)
2319	}	2854	}
2320		2855
2321	sub configure {	2856	sub configure {
2322	my ($self, $x, $y, $w, $h) = @_;	2857	my ($self, $x, $y, $w, $h) = @_;
2323		2858
2324	$self->SUPER::configure ($x, $y, $w, $h);	2859	$self->{w} = $w;
		2860	$self->{h} = $h;
		2861	}
2325		2862
		2863	sub check_size {
		2864	my ($self) = @_;
		2865
		2866	$self->size_allocate ($self->{w}, $self->{h})
		2867	if $self->{w};
		2868	}
		2869
		2870	sub size_request {
		2871	my ($self) = @_;
		2872
		2873	($self->{w}, $self->{h})
		2874	}
		2875
		2876	sub size_allocate {
		2877	my ($self, $w, $h) = @_;
		2878
		2879	my $old_w = $self->{old_w}; $self->{old_w} = $w;
		2880	my $old_h = $self->{old_h}; $self->{old_h} = $h;
		2881
		2882	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
		2883	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
		2884
2326	for my $child (@{$self->{children}}) {	2885	for my $child ($self->children) {
2327	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2886	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2328		2887
		2888	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2889	if exists $child->{req_x};
		2890
		2891	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2892	if exists $child->{req_y};
		2893
2329	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2894	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2330	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2895	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2896
2331	$child->configure ($X, $Y, $W,$H);	2897	$child->configure ($X, $Y, $W, $H);
2332	}	2898	}
2333	}	2899	}
2334		2900
2335	sub _topleft {	2901	sub coord2local {
2336	my ($self, $x, $y) = @_;	2902	my ($self, $x, $y) = @_;
2337		2903
2338	($x, $y)	2904	($x, $y)
2339	}	2905	}
2340		2906
		2907	sub coord2global {
		2908	my ($self, $x, $y) = @_;
		2909
		2910	($x, $y)
		2911	}
		2912
2341	sub update {	2913	sub update {
2342	my ($self) = @_;	2914	my ($self) = @_;
2343		2915
2344	$self->check_size;	2916	$self->check_size;
2345	::refresh ();	2917	$::WANT_REFRESH++;
2346	}	2918	}
2347		2919
2348	sub add {	2920	sub add {
2349	my ($self, $child) = @_;	2921	my ($self, @children) = @_;
2350		2922
		2923	for my $child (@children) {
		2924	$child->{toplevel} = 1;
		2925
2351	# integerize window positions	2926	# integerise window positions
2352	$child->{x} = int $child->{x};	2927	$child->{x} = int $child->{x};
2353	$child->{y} = int $child->{y};	2928	$child->{y} = int $child->{y};
		2929	}
2354		2930
2355	$self->SUPER::add ($child);	2931	$self->SUPER::add (@children);
2356	}	2932	}
2357		2933
2358	sub on_refresh {	2934	sub on_refresh {
2359	my ($self, $id, $cb) = @_;	2935	my ($self, $id, $cb) = @_;
2360		2936
2361	$self->{refresh_hook}{$id} = $cb;	2937	$self->{refresh_hook}{$id} = $cb;
2362	}	2938	}
2363		2939
		2940	sub on_post_alloc {
		2941	my ($self, $id, $cb) = @_;
		2942
		2943	$self->{post_alloc_hook}{$id} = $cb;
		2944	}
		2945
2364	sub draw {	2946	sub draw {
2365	my ($self) = @_;	2947	my ($self) = @_;
2366		2948
2367	while (my $rcb = delete $self->{refresh_hook}) {	2949	while ($self->{refresh_hook}) {
2368	$_->() for values %$rcb;	2950	$_->()
		2951	for values %{delete $self->{refresh_hook}};
		2952	}
		2953
		2954	if ($self->{check_size}) {
		2955	my @queue = ([], []);
		2956
		2957	for (;;) {
		2958	if ($self->{check_size}) {
		2959	# heuristic: check containers last
		2960	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
		2961	for values %{delete $self->{check_size}}
		2962	}
		2963
		2964	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
		2965
		2966	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
		2967	? @$widget{qw(user_w user_h)}
		2968	: $widget->size_request;
		2969
		2970	if (delete $widget->{force_alloc}
		2971	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
		2972	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		2973
		2974	$widget->{req_w} = $w;
		2975	$widget->{req_h} = $h;
		2976
		2977	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		2978
		2979	$widget->{parent}->check_size
		2980	if $widget->{parent};
		2981	}
		2982	}
		2983	}
		2984
		2985	while ($self->{size_alloc}) {
		2986	for (values %{delete $self->{size_alloc}}) {
		2987	my ($widget, $w, $h) = @$_;
		2988
		2989	$w = 0 if $w < 0;
		2990	$h = 0 if $h < 0;
		2991
		2992	$widget->{w} = $w;
		2993	$widget->{h} = $h;
		2994	$widget->size_allocate ($w, $h);
		2995	$widget->emit (size_allocate => $w, $h);
		2996	}
		2997	}
		2998
		2999	while ($self->{post_alloc_hook}) {
		3000	$_->()
		3001	for values %{delete $self->{post_alloc_hook}};
2369	}	3002	}
2370		3003
2371	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3004	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2372	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3005	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2373	glClear GL_COLOR_BUFFER_BIT;	3006	glClear GL_COLOR_BUFFER_BIT;

Diff Legend

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