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.194 by root, Thu May 11 23:41:47 2006 UTC vs.
Revision 1.245 by elmex, Sat May 27 21:15:57 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
		18
		19	our %WIDGET; # all widgets, weak-referenced
		20
		21	sub get_layout {
		22	for (grep { $_->{name} } values %WIDGET) {
		23	$LAYOUT->{$_->{name}} = {
		24	x => $_->{x} / $::WIDTH,
		25	y => $_->{y} / $::HEIGHT,
		26	w => $_->{w} / $::WIDTH,
		27	h => $_->{h} / $::HEIGHT
		28	};
		29	}
		30
		31	return $LAYOUT;
		32	}
		33
		34	sub set_layout {
		35	my ($layout) = @_;
		36	$LAYOUT = $layout;
		37	}
16		38
17	sub check_tooltip {	39	sub check_tooltip {
18	if (!$GRAB) {	40	if (!$GRAB) {
19	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
…		…
24		46
25	my $tip = $widget->{tooltip};	47	my $tip = $widget->{tooltip};
26		48
27	$tip = $tip->($widget) if CODE:: eq ref $tip;	49	$tip = $tip->($widget) if CODE:: eq ref $tip;
28		50
29	$TOOLTIP->set_markup ($widget->{tooltip});	51	$TOOLTIP->set_tooltip_from ($widget);
30
31	$TOOLTIP->show;	52	$TOOLTIP->show;
32		53
33	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
34		55
35	if ($x + $TOOLTIP->{w} > $::WIDTH) {
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	}	57	if $x + $TOOLTIP->{w} > $::WIDTH;
38		58
39	$TOOLTIP->move ($x, $y);	59	$TOOLTIP->move ($x, $y);
		60	$TOOLTIP->check_size;
		61	$TOOLTIP->update;
40	}	62	}
41		63
42	return;	64	return;
43	}	65	}
44	}	66	}
…		…
48	delete $TOOLTIP->{owner};	70	delete $TOOLTIP->{owner};
49	}	71	}
50		72
51	# class methods for events	73	# class methods for events
52	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
53	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	75	$FOCUS->emit (key_down => $_[0])
54	if $FOCUS;	76	if $FOCUS;
55	}	77	}
56		78
57	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
58	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	80	$FOCUS->emit (key_up => $_[0])
59	if $FOCUS;	81	if $FOCUS;
60	}	82	}
61		83
62	sub feed_sdl_button_down_event {	84	sub feed_sdl_button_down_event {
63	my ($ev) = @_;	85	my ($ev) = @_;
…		…
72	check_tooltip;	94	check_tooltip;
73	}	95	}
74		96
75	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
76		98
77	if ($GRAB) {	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
78	($x, $y) = $GRAB->coord2local ($x, $y);	100	if $GRAB;
79	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
80	}
81	}	101	}
82		102
83	sub feed_sdl_button_up_event {	103	sub feed_sdl_button_up_event {
84	my ($ev) = @_;	104	my ($ev) = @_;
85	my ($x, $y) = ($ev->{x}, $ev->{y});	105	my ($x, $y) = ($ev->{x}, $ev->{y});
86		106
87	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
88		108
89	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
90		110
91	if ($GRAB) {	111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
92	($x, $y) = $GRAB->coord2local ($x, $y);	112	if $GRAB;
93	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
94	}
95		113
96	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
97	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
98	$grab->update if $grab;	116	$grab->update if $grab;
99	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
…		…
115	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
116		134
117	check_tooltip;	135	check_tooltip;
118	}	136	}
119		137
120	if ($HOVER) {
121	($x, $y) = $HOVER->coord2local ($x, $y);
122	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
123	}	139	if $HOVER;
124	}	140	}
125		141
126	# convert position array to integers	142	# convert position array to integers
127	sub harmonize {	143	sub harmonize {
128	my ($vals) = @_;	144	my ($vals) = @_;
…		…
132	for (@$vals) {	148	for (@$vals) {
133	my $i = int $_ + $rem;	149	my $i = int $_ + $rem;
134	$rem += $_ - $i;	150	$rem += $_ - $i;
135	$_ = $i;	151	$_ = $i;
136	}	152	}
		153	}
		154
		155	sub full_refresh {
		156	# make a copy, otherwise for complains about freed values.
		157	my @widgets = values %WIDGET;
		158
		159	$_->update
		160	for @widgets;
		161	}
		162
		163	sub reconfigure_widgets {
		164	# make a copy, otherwise C<for> complains about freed values.
		165	my @widgets = values %WIDGET;
		166
		167	$_->reconfigure
		168	for @widgets;
		169	}
		170
		171	# call when resolution changes etc.
		172	sub rescale_widgets {
		173	my ($sx, $sy) = @_;
		174
		175	for my $widget (values %WIDGET) {
		176	if ($widget->{is_toplevel}) {
		177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		180	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		181	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		182	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		183	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		184	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		185	}
		186	}
		187
		188	reconfigure_widgets;
137	}	189	}
138		190
139	#############################################################################	191	#############################################################################
140		192
141	package CFClient::UI::Base;	193	package CFClient::UI::Base;
…		…
154	can_events => 1,	206	can_events => 1,
155	@_	207	@_
156	}, $class;	208	}, $class;
157		209
158	for (keys %$self) {	210	for (keys %$self) {
159	if (/^connect_(.*)$/) {	211	if (/^on_(.*)$/) {
160	$self->connect ($1 => delete $self->{$_});	212	$self->connect ($1 => delete $self->{$_});
161	}	213	}
162	}	214	}
163		215
		216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		217
		218	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		219	$self->{user_x} = $layout->{x} * $::WIDTH;
		220	$self->{user_y} = $layout->{y} * $::HEIGHT;
		221	$self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		222	$self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		223	}
		224
164	$self	225	$self
		226	}
		227
		228	sub toggle_visibility {
		229	my ($self) = @_;
		230
		231	if ($self->{visible}) {
		232	$self->hide;
		233	} else {
		234	$self->show;
		235	}
165	}	236	}
166		237
167	sub destroy {	238	sub destroy {
168	my ($self) = @_;	239	my ($self) = @_;
169		240
…		…
171	%$self = ();	242	%$self = ();
172	}	243	}
173		244
174	sub show {	245	sub show {
175	my ($self) = @_;	246	my ($self) = @_;
176
177	return if $self->{parent};	247	return if $self->{parent};
178		248
179	$CFClient::UI::ROOT->add ($self);	249	$CFClient::UI::ROOT->add ($self);
180	}	250	}
181		251
182	sub hide {	252	sub show_centered {
183	my ($self) = @_;	253	my ($self) = @_;
		254	return if $self->{parent};
		255
		256	$self->show;
		257
		258	$CFClient::UI::ROOT->on_post_alloc (
		259	"centered $self" => sub {
		260	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		261	},
		262	);
		263	}
		264
		265	sub set_invisible {
		266	my ($self) = @_;
		267
		268	return unless $self->{visible};
		269
		270	# broken show/hide model
		271
		272	delete $self->{root};
		273	delete $self->{visible};
184		274
185	undef $GRAB if $GRAB == $self;	275	undef $GRAB if $GRAB == $self;
186	undef $HOVER if $HOVER == $self;	276	undef $HOVER if $HOVER == $self;
		277
		278	CFClient::UI::check_tooltip
		279	if $CFClient::UI::TOOLTIP->{owner} == $self;
		280
		281	$self->focus_out;
		282
		283	$self->emit (visibility_change => 0);
		284	}
		285
		286	sub hide {
		287	my ($self) = @_;
		288
		289	$self->set_invisible;
187		290
188	$self->{parent}->remove ($self)	291	$self->{parent}->remove ($self)
189	if $self->{parent};	292	if $self->{parent};
190	}	293	}
191		294
…		…
241		344
242	sub size_allocate {	345	sub size_allocate {
243	# nothing to be done	346	# nothing to be done
244	}	347	}
245		348
		349	sub reconfigure {
		350	my ($self) = @_;
		351
		352	$self->check_size (1);
		353	$self->update;
		354	}
		355
246	sub children {	356	sub children {
247	}
248
249	# call when resolution changes etc.
250	sub reconfigure {
251	my ($self) = @_;
252
253	$_->reconfigure
254	for $self->children;
255
256	$self->check_size;
257	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258	$self->update;
259	}	357	}
260		358
261	sub set_max_size {	359	sub set_max_size {
262	my ($self, $w, $h) = @_;	360	my ($self, $w, $h) = @_;
263		361
264	delete $self->{max_w}; $self->{max_w} = $w if $w;	362	delete $self->{max_w}; $self->{max_w} = $w if $w;
265	delete $self->{max_h}; $self->{max_h} = $h if $h;	363	delete $self->{max_h}; $self->{max_h} = $h if $h;
		364	}
		365
		366	sub set_tooltip {
		367	my ($self, $tooltip) = @_;
		368
		369	$tooltip =~ s/^\s+//;
		370	$tooltip =~ s/\s+$//;
		371
		372	return if $self->{tooltip} eq $tooltip;
		373
		374	$self->{tooltip} = $tooltip;
		375
		376	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		377	delete $CFClient::UI::TOOLTIP->{owner};
		378	CFClient::UI::check_tooltip;
		379	}
266	}	380	}
267		381
268	# translate global coordinates to local coordinate system	382	# translate global coordinates to local coordinate system
269	sub coord2local {	383	sub coord2local {
270	my ($self, $x, $y) = @_;	384	my ($self, $x, $y) = @_;
…		…
285	return if $FOCUS == $self;	399	return if $FOCUS == $self;
286	return unless $self->{can_focus};	400	return unless $self->{can_focus};
287		401
288	my $focus = $FOCUS; $FOCUS = $self;	402	my $focus = $FOCUS; $FOCUS = $self;
289		403
290	$self->emit (focus_in => $focus);	404	$self->_emit (focus_in => $focus);
291		405
292	$focus->update if $focus;	406	$focus->update if $focus;
293	$FOCUS->update;	407	$FOCUS->update;
294	}	408	}
295		409
…		…
298		412
299	return unless $FOCUS == $self;	413	return unless $FOCUS == $self;
300		414
301	my $focus = $FOCUS; undef $FOCUS;	415	my $focus = $FOCUS; undef $FOCUS;
302		416
303	$self->emit (focus_out => $focus);	417	$self->_emit (focus_out => $focus);
304		418
305	$focus->update if $focus; #?	419	$focus->update if $focus; #?
		420
		421	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		422	unless $FOCUS;
306	}	423	}
307		424
308	sub mouse_motion { }	425	sub mouse_motion { }
309	sub button_up { }	426	sub button_up { }
310	sub key_down { }	427	sub key_down { }
311	sub key_up { }	428	sub key_up { }
312		429
313	sub button_down {	430	sub button_down {
314	my ($self, $ev, $x, $y) = @_;	431	my ($self, $ev, $x, $y) = @_;
315		432
316	$self->focus_in;	433	$self->focus_in;
…		…
350	if ($ENV{PCLIENT_DEBUG}) {	467	if ($ENV{PCLIENT_DEBUG}) {
351	glPushMatrix;	468	glPushMatrix;
352	glColor 1, 1, 0, 1;	469	glColor 1, 1, 0, 1;
353	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	470	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354	glBegin GL_LINE_LOOP;	471	glBegin GL_LINE_LOOP;
355	glVertex 0 , 0;	472	glVertex 0 , 0;
356	glVertex $self->{w}, 0;	473	glVertex $self->{w} - 1, 0;
357	glVertex $self->{w}, $self->{h};	474	glVertex $self->{w} - 1, $self->{h} - 1;
358	glVertex 0 , $self->{h};	475	glVertex 0 , $self->{h} - 1;
359	glEnd;	476	glEnd;
360	glPopMatrix;	477	glPopMatrix;
361	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	478	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362	}	479	}
363	}	480	}
364		481
365	sub _draw {	482	sub _draw {
366	my ($self) = @_;	483	my ($self) = @_;
…		…
383	sub set_parent {	500	sub set_parent {
384	my ($self, $parent) = @_;	501	my ($self, $parent) = @_;
385		502
386	Scalar::Util::weaken ($self->{parent} = $parent);	503	Scalar::Util::weaken ($self->{parent} = $parent);
387		504
		505	if ($parent->{visible} || 1) {
		506	$self->{root} = $parent->{root};
		507	$self->{visible} = $parent->{visible} + 1;
		508
		509	$self->emit (visibility_change => 1)
		510	unless $self->{parent}{visible};
		511	}
		512
		513	# TODO: req_w _does_change after ->reconfigure
388	$self->check_size	514	$self->check_size
389	unless exists $self->{req_w};	515	unless exists $self->{req_w};
		516
		517	$self->show;
390	}	518	}
391		519
392	sub check_size {	520	sub check_size {
393	my ($self) = @_;	521	my ($self, $forced) = @_;
394		522
		523	$self->{force_alloc} = 1 if $forced;
395	$CFClient::UI::ROOT->{check_size}{$self} = $self;	524	$CFClient::UI::ROOT->{check_size}{$self} = $self;
396	}	525	}
397		526
398	sub update {	527	sub update {
399	my ($self) = @_;	528	my ($self) = @_;
…		…
406	my ($self, $signal, $cb) = @_;	535	my ($self, $signal, $cb) = @_;
407		536
408	push @{ $self->{signal_cb}{$signal} }, $cb;	537	push @{ $self->{signal_cb}{$signal} }, $cb;
409	}	538	}
410		539
		540	sub _emit {
		541	my ($self, $signal, @args) = @_;
		542
		543	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		544	}
		545
411	sub emit {	546	sub emit {
412	my ($self, $signal, @args) = @_;	547	my ($self, $signal, @args) = @_;
413		548
414	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	549	$self->_emit ($signal, @args)
		550	|| $self->$signal (@args);
		551	}
		552
		553	sub visibility_change {
		554	#my ($self, $visible) = @_;
415	}	555	}
416		556
417	sub DESTROY {	557	sub DESTROY {
418	my ($self) = @_;	558	my ($self) = @_;
419		559
		560	delete $WIDGET{$self+0};
420	#$self->deactivate;	561	#$self->deactivate;
421	}	562	}
422		563
423	#############################################################################	564	#############################################################################
424		565
…		…
433	my $class = shift;	574	my $class = shift;
434		575
435	# range [value, low, high, page]	576	# range [value, low, high, page]
436		577
437	$class->SUPER::new (	578	$class->SUPER::new (
438	bg => [0, 0, 0, 0.2],	579	#bg => [0, 0, 0, 0.2],
439	active_bg => [1, 1, 1, 0.5],	580	#active_bg => [1, 1, 1, 0.5],
440	@_	581	@_
441	)	582	)
442	}	583	}
443		584
444	sub _draw {	585	sub _draw {
445	my ($self) = @_;	586	my ($self) = @_;
446		587
		588	my $color = $FOCUS == $self && $self->{active_bg}
		589	? $self->{active_bg}
		590	: $self->{bg};
		591
		592	if ($color && (@$color < 4 || $color->[3])) {
447	my ($w, $h) = @$self{qw(w h)};	593	my ($w, $h) = @$self{qw(w h)};
448		594
449	glEnable GL_BLEND;	595	glEnable GL_BLEND;
450	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	596	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
451	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	597	glColor @$color;
452		598
453	glBegin GL_QUADS;	599	glBegin GL_QUADS;
454	glVertex 0 , 0;	600	glVertex 0 , 0;
455	glVertex 0 , $h;	601	glVertex 0 , $h;
456	glVertex $w, $h;	602	glVertex $w, $h;
457	glVertex $w, 0;	603	glVertex $w, 0;
458	glEnd;	604	glEnd;
459		605
460	glDisable GL_BLEND;	606	glDisable GL_BLEND;
		607	}
461	}	608	}
462		609
463	#############################################################################	610	#############################################################################
464		611
465	package CFClient::UI::Empty;	612	package CFClient::UI::Empty;
…		…
509	$self->{children} = [	656	$self->{children} = [
510	sort { $a->{z} <=> $b->{z} }	657	sort { $a->{z} <=> $b->{z} }
511	@{$self->{children}}, @widgets	658	@{$self->{children}}, @widgets
512	];	659	];
513		660
514	$self->check_size;	661	$self->check_size (1);
515	$self->update;	662	$self->update;
516	}	663	}
517		664
518	sub children {	665	sub children {
519	@{ $_[0]{children} }	666	@{ $_[0]{children} }
…		…
525	delete $child->{parent};	672	delete $child->{parent};
526	$child->hide;	673	$child->hide;
527		674
528	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	675	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
529		676
530	$self->check_size;	677	$self->check_size (1);
531	$self->update;	678	$self->update;
532	}	679	}
533		680
534	sub clear {	681	sub clear {
535	my ($self) = @_;	682	my ($self) = @_;
…		…
626	}	773	}
627		774
628	sub update {	775	sub update {
629	my ($self) = @_;	776	my ($self) = @_;
630		777
631	$ROOT->on_refresh ($self => sub { $self->render_child });	778	$ROOT->on_post_alloc ($self => sub { $self->render_child });
632	$self->SUPER::update;	779	$self->SUPER::update;
633	}	780	}
634		781
635	sub size_allocate {	782	sub size_allocate {
636	my ($self, $w, $h) = @_;	783	my ($self, $w, $h) = @_;
…		…
649	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	796	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
650	glClearColor 0, 0, 0, 0;	797	glClearColor 0, 0, 0, 0;
651	glClear GL_COLOR_BUFFER_BIT;	798	glClear GL_COLOR_BUFFER_BIT;
652		799
653	$self->_render;	800	$self->_render;
654	# glColorMask 1, 1, 1, 0;
655	# glEnable GL_BLEND;
656	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
657	# glRasterPos 0, 0;
658	# glCopyPixels 0, 0, $self->{w}, $self->{h};
659	# glDisable GL_BLEND;
660	# glColorMask 1, 1, 1, 1;
661	};	801	};
662	}	802	}
663		803
664	sub _draw {	804	sub _draw {
665	my ($self) = @_;	805	my ($self) = @_;
…		…
669	my $tex = $self->{texture}	809	my $tex = $self->{texture}
670	or return;	810	or return;
671		811
672	glEnable GL_TEXTURE_2D;	812	glEnable GL_TEXTURE_2D;
673	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
674	glColor 0, 0, 0, 1;	814	glColor 1, 1, 1, 1;
675		815
676	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	816	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
677		817
678	glDisable GL_TEXTURE_2D;	818	glDisable GL_TEXTURE_2D;
679	}	819	}
…		…
682		822
683	package CFClient::UI::ViewPort;	823	package CFClient::UI::ViewPort;
684		824
685	our @ISA = CFClient::UI::Window::;	825	our @ISA = CFClient::UI::Window::;
686		826
		827	sub new {
		828	my $class = shift;
		829
		830	$class->SUPER::new (
		831	scroll_x => 0,
		832	scroll_y => 1,
		833	@_,
		834	)
		835	}
		836
687	sub size_request {	837	sub size_request {
688	my ($self) = @_;	838	my ($self) = @_;
689		839
690	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	840	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
691	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
692		841
693	@$self{qw(child_w child_h)}	842	@$self{qw(child_w child_h)}
694	}	843	}
695		844
696	sub size_allocate {	845	sub size_allocate {
697	my ($self, $w, $h) = @_;	846	my ($self, $w, $h) = @_;
698		847
		848	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		849	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		850
		851	$self->child->configure (0, 0, $w, $h);
699	$self->update;	852	$self->update;
700	}	853	}
701		854
702	sub set_offset {	855	sub set_offset {
703	my ($self, $x, $y) = @_;	856	my ($self, $x, $y) = @_;
…		…
754	my $class = shift;	907	my $class = shift;
755		908
756	my $self;	909	my $self;
757		910
758	my $slider = new CFClient::UI::Slider	911	my $slider = new CFClient::UI::Slider
759	vertical => 1,	912	vertical => 1,
760	range => [0, 0, 1, 0.01], # HACK fix	913	range => [0, 0, 1, 0.01], # HACK fix
761	connect_changed => sub {	914	on_changed => sub {
762	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	915	$self->{vp}->set_offset (0, $_[1]);
763	},	916	},
764	;	917	;
765		918
766	$self = $class->SUPER::new (	919	$self = $class->SUPER::new (
767	vp => (new CFClient::UI::ViewPort),	920	vp => (new CFClient::UI::ViewPort expand => 1),
768	slider => $slider,	921	slider => $slider,
769	@_,	922	@_,
770	);	923	);
771		924
772	$self->{vp}->add ($self->{scrolled});	925	$self->{vp}->add ($self->{scrolled});
…		…
774	$self->add ($self->{slider});	927	$self->add ($self->{slider});
775		928
776	$self	929	$self
777	}	930	}
778		931
		932	sub update {
		933	my ($self) = @_;
		934
		935	$self->SUPER::update;
		936
		937	# todo: overwrite size_allocate of child
		938	my $child = $self->{vp}->child;
		939	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		940	}
		941
		942	sub size_allocate {
		943	my ($self, $w, $h) = @_;
		944
		945	$self->SUPER::size_allocate ($w, $h);
		946
		947	my $child = $self->{vp}->child;
		948	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		949	}
		950
779	#TODO# update range on size_allocate depeneing on child	951	#TODO# update range on size_allocate depending on child
780	# update viewport offset on scroll	952	# update viewport offset on scroll
781		953
782	#############################################################################	954	#############################################################################
783		955
784	package CFClient::UI::Frame;	956	package CFClient::UI::Frame;
…		…
788	use CFClient::OpenGL;	960	use CFClient::OpenGL;
789		961
790	sub new {	962	sub new {
791	my $class = shift;	963	my $class = shift;
792		964
793	my $self = $class->SUPER::new (	965	$class->SUPER::new (
794	bg => [1, 1, 1, 1],	966	bg => undef,
795	border_bg => [1, 1, 1, 1],
796	border => 0.8,
797	@_	967	@_,
798	);	968	)
799
800	$self
801	}	969	}
802		970
803	sub _draw {	971	sub _draw {
804	my ($self) = @_;	972	my ($self) = @_;
805		973
806	my ($w, $h) = ($self->{w}, $self->{h});	974	if ($self->{bg}) {
		975	my ($w, $h) = @$self{qw(w h)};
807		976
808	glEnable GL_BLEND;	977	glEnable GL_BLEND;
809	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	978	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
810	glEnable GL_TEXTURE_2D;	979	glColor @{ $self->{bg} };
811	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812		980
813	# glBegin GL_QUADS;	981	glBegin GL_QUADS;
814	# glColor 0, 0, 0, 0;
815	# glVertex 0 , 0;	982	glVertex 0 , 0;
816	# glVertex 0 , $h;	983	glVertex 0 , $h;
817	# glVertex $w, $h;	984	glVertex $w, $h;
818	# glVertex $w, 0;	985	glVertex $w, 0;
819	# glEnd;	986	glEnd;
820		987
821
822	$self->child->draw;
823	glDisable GL_BLEND;	988	glDisable GL_BLEND;
824	glDisable GL_TEXTURE_2D;	989	}
		990
		991	$self->SUPER::_draw;
825	}	992	}
826		993
827	#############################################################################	994	#############################################################################
828		995
829	package CFClient::UI::FancyFrame;	996	package CFClient::UI::FancyFrame;
…		…
840	my $class = shift;	1007	my $class = shift;
841		1008
842	# TODO: user_x, user_y, overwrite moveto?	1009	# TODO: user_x, user_y, overwrite moveto?
843		1010
844	my $self = $class->SUPER::new (	1011	my $self = $class->SUPER::new (
845	bg => [1, 1, 1, 1],	1012	bg => [1, 1, 1, 1],
846	border_bg => [1, 1, 1, 1],	1013	border_bg => [1, 1, 1, 1],
847	border => 0.6,	1014	border => 0.6,
		1015	is_toplevel => 1,
848	can_events => 1,	1016	can_events => 1,
849	@_	1017	@_
850	);	1018	);
851		1019
852	$self->{title} &&= new CFClient::UI::Label	1020	$self->{title} &&= new CFClient::UI::Label
853	align => 0,	1021	align => 0,
…		…
877	my ($self, $w, $h) = @_;	1045	my ($self, $w, $h) = @_;
878		1046
879	$h -= List::Util::max 0, $self->border * 2;	1047	$h -= List::Util::max 0, $self->border * 2;
880	$w -= List::Util::max 0, $self->border * 2;	1048	$w -= List::Util::max 0, $self->border * 2;
881		1049
882	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1050	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
883	if $self->{title};	1051	if $self->{title};
884		1052
885	$self->child->configure ($self->border, $self->border, $w, $h);	1053	$self->child->configure ($self->border, $self->border, $w, $h);
886	}	1054	}
887		1055
…		…
906	my ($ev, $x, $y) = @_;	1074	my ($ev, $x, $y) = @_;
907		1075
908	my $dx = $ev->{x} - $ox;	1076	my $dx = $ev->{x} - $ox;
909	my $dy = $ev->{y} - $oy;	1077	my $dy = $ev->{y} - $oy;
910		1078
		1079	$self->{user_x} = $wx + $dx * $mx;
		1080	$self->{user_y} = $wy + $dy * $my;
911	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1081	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
912	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1082	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
913	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1083	$self->move ($self->{user_x}, $self->{user_y});
914	$self->check_size;	1084	$self->check_size;
915	};	1085	};
916		1086
917	} elsif ($lr ^ $td) {	1087	} elsif ($lr ^ $td) {
918	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1088	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
921	$self->{motion} = sub {	1091	$self->{motion} = sub {
922	my ($ev, $x, $y) = @_;	1092	my ($ev, $x, $y) = @_;
923		1093
924	($x, $y) = ($ev->{x}, $ev->{y});	1094	($x, $y) = ($ev->{x}, $ev->{y});
925		1095
926	$self->move ($bx + $x - $ox, $by + $y - $oy);	1096	$self->{user_x} = $bx + $x - $ox;
		1097	$self->{user_y} = $by + $y - $oy;
		1098	$self->move ($self->{user_x}, $self->{user_y});
927	$self->update;	1099	$self->update;
928	};	1100	};
929	}	1101	}
930	}	1102	}
931		1103
…		…
945	my ($self) = @_;	1117	my ($self) = @_;
946		1118
947	my ($w, $h ) = ($self->{w}, $self->{h});	1119	my ($w, $h ) = ($self->{w}, $self->{h});
948	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1120	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
949		1121
950	glEnable GL_BLEND;
951	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
952	glEnable GL_TEXTURE_2D;	1122	glEnable GL_TEXTURE_2D;
953	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1123	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
954		1124
955	my $border = $self->border;	1125	my $border = $self->border;
956		1126
957	glColor @{ $self->{border_bg} };	1127	glColor @{ $self->{border_bg} };
958	$tex[1]->draw_quad (0, 0, $w, $border);	1128	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
959	$tex[3]->draw_quad (0, $border, $border, $ch);	1129	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
960	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1130	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
961	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1131	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
962		1132
963	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1133	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
964	my $bg = $tex[0];	1134	my $bg = $tex[0];
965		1135
966	# TODO: repeat texture not scale	1136	# TODO: repeat texture not scale
…		…
970	glColor @{ $self->{bg} };	1140	glColor @{ $self->{bg} };
971		1141
972	$bg->{s} = $rep_x;	1142	$bg->{s} = $rep_x;
973	$bg->{t} = $rep_y;	1143	$bg->{t} = $rep_y;
974	$bg->{wrap_mode} = 1;	1144	$bg->{wrap_mode} = 1;
975	$bg->draw_quad ($border, $border, $cw, $ch);	1145	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1146	}
976		1147
977	glDisable GL_TEXTURE_2D;	1148	glDisable GL_TEXTURE_2D;
978	glDisable GL_BLEND;
979	}
980		1149
981	$self->{title}->draw if $self->{title};	1150	$self->{title}->draw if $self->{title};
982		1151
983	$self->child->draw;	1152	$self->child->draw;
984	}	1153	}
…		…
996	sub new {	1165	sub new {
997	my $class = shift;	1166	my $class = shift;
998		1167
999	$class->SUPER::new (	1168	$class->SUPER::new (
1000	col_expand => [],	1169	col_expand => [],
1001	@_	1170	@_,
1002	)	1171	)
		1172	}
		1173
		1174	sub children {
		1175	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1003	}	1176	}
1004		1177
1005	sub add {	1178	sub add {
1006	my ($self, $x, $y, $child) = @_;	1179	my ($self, $x, $y, $child) = @_;
1007		1180
1008	$child->set_parent ($self);	1181	$child->set_parent ($self);
1009	$self->{children}[$y][$x] = $child;	1182	$self->{children}[$y][$x] = $child;
1010		1183
1011	$child->check_size;	1184	$self->check_size (1);
1012	}	1185	}
1013		1186
1014	sub children {
1015	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1016	}
1017
1018	# TODO: move to container class maybe? send childs a signal on removal?	1187	# TODO: move to container class maybe? send children a signal on removal?
1019	sub clear {	1188	sub clear {
1020	my ($self) = @_;	1189	my ($self) = @_;
1021		1190
1022	my @children = $self->children;	1191	my @children = $self->children;
1023	delete $self->{children};	1192	delete $self->{children};
…		…
1025	for (@children) {	1194	for (@children) {
1026	delete $_->{parent};	1195	delete $_->{parent};
1027	$_->hide;	1196	$_->hide;
1028	}	1197	}
1029		1198
		1199	$self->check_size (1);
1030	$self->update;	1200	$self->update;
1031	}	1201	}
1032		1202
1033	sub get_wh {	1203	sub get_wh {
1034	my ($self) = @_;	1204	my ($self) = @_;
…		…
1066	sub size_allocate {	1236	sub size_allocate {
1067	my ($self, $w, $h) = @_;	1237	my ($self, $w, $h) = @_;
1068		1238
1069	my ($ws, $hs) = $self->get_wh;	1239	my ($ws, $hs) = $self->get_wh;
1070		1240
1071	my $req_w = sum @$ws;	1241	my $req_w = (sum @$ws) || 1;
1072	my $req_h = sum @$hs;	1242	my $req_h = (sum @$hs) || 1;
1073		1243
1074	# TODO: nicer code && do row_expand	1244	# TODO: nicer code && do row_expand
1075	my @col_expand = @{$self->{col_expand}};	1245	my @col_expand = @{$self->{col_expand}};
1076	@col_expand = (1) x @$ws unless @col_expand;	1246	@col_expand = (1) x @$ws unless @col_expand;
1077	my $col_expand = (sum @col_expand) || 1;	1247	my $col_expand = (sum @col_expand) || 1;
…		…
1251		1421
1252	#############################################################################	1422	#############################################################################
1253		1423
1254	package CFClient::UI::Label;	1424	package CFClient::UI::Label;
1255		1425
1256	our @ISA = CFClient::UI::Base::;	1426	our @ISA = CFClient::UI::DrawBG::;
1257		1427
1258	use CFClient::OpenGL;	1428	use CFClient::OpenGL;
1259		1429
1260	sub new {	1430	sub new {
1261	my ($class, %arg) = @_;	1431	my ($class, %arg) = @_;
1262		1432
1263	my $self = $class->SUPER::new (	1433	my $self = $class->SUPER::new (
1264	fg => [1, 1, 1],	1434	fg => [1, 1, 1],
		1435	#bg => none
		1436	#active_bg => none
1265	#font => default_font	1437	#font => default_font
1266	#text => initial text	1438	#text => initial text
1267	#markup => initial narkup	1439	#markup => initial narkup
		1440	#max_w => maximum pixel width
		1441	ellipsise => 3, # end
1268	layout => (new CFClient::Layout),	1442	layout => (new CFClient::Layout),
1269	fontsize => 1,	1443	fontsize => 1,
1270	align => -1,	1444	align => -1,
1271	valign => -1,	1445	valign => -1,
1272	padding => 2,	1446	padding => 2,
…		…
1287	}	1461	}
1288		1462
1289	$self	1463	$self
1290	}	1464	}
1291		1465
1292	sub escape {	1466	sub escape($) {
1293	local $_ = $_[1];	1467	local $_ = $_[0];
1294		1468
1295	s/&/&amp;/g;	1469	s/&/&amp;/g;
1296	s/>/&gt;/g;	1470	s/>/&gt;/g;
1297	s/</&lt;/g;	1471	s/</&lt;/g;
1298		1472
1299	$_[1]	1473	$_
1300	}	1474	}
1301		1475
1302	sub update {	1476	sub update {
1303	my ($self) = @_;	1477	my ($self) = @_;
1304		1478
…		…
1337	sub size_request {	1511	sub size_request {
1338	my ($self) = @_;	1512	my ($self) = @_;
1339		1513
1340	$self->{layout}->set_font ($self->{font}) if $self->{font};	1514	$self->{layout}->set_font ($self->{font}) if $self->{font};
1341	$self->{layout}->set_width ($self->{max_w} || -1);	1515	$self->{layout}->set_width ($self->{max_w} || -1);
		1516	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1517	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1342	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1518	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1343		1519
1344	my ($w, $h) = $self->{layout}->size;	1520	my ($w, $h) = $self->{layout}->size;
1345		1521
1346	if (exists $self->{template}) {	1522	if (exists $self->{template}) {
…		…
1376	}	1552	}
1377		1553
1378	sub _draw {	1554	sub _draw {
1379	my ($self) = @_;	1555	my ($self) = @_;
1380		1556
		1557	$self->SUPER::_draw; # draw background, if applicable
		1558
1381	my $tex = $self->{texture} ||= do {	1559	my $tex = $self->{texture} ||= do {
1382	$self->{layout}->set_foreground (@{$self->{fg}});	1560	$self->{layout}->set_foreground (@{$self->{fg}});
1383	$self->{layout}->set_font ($self->{font}) if $self->{font};	1561	$self->{layout}->set_font ($self->{font}) if $self->{font};
1384	$self->{layout}->set_width ($self->{w});	1562	$self->{layout}->set_width ($self->{w});
		1563	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1564	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1385	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1565	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1386		1566
1387	my $tex = new_from_layout CFClient::Texture $self->{layout};	1567	my $tex = new_from_layout CFClient::Texture $self->{layout};
1388		1568
1389	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1569	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1390	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1570	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391	: ($self->{w} - $tex->{w}) * 0.5;	1571	: ($self->{w} - $tex->{w}) * 0.5);
1392		1572
1393	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1573	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1394	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1574	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395	: ($self->{h} - $tex->{h}) * 0.5;	1575	: ($self->{h} - $tex->{h}) * 0.5);
1396		1576
1397	$tex	1577	$tex
1398	};	1578	};
1399		1579
1400	glEnable GL_TEXTURE_2D;	1580	glEnable GL_TEXTURE_2D;
…		…
1428	active_fg => [0, 0, 0],	1608	active_fg => [0, 0, 0],
1429	can_hover => 1,	1609	can_hover => 1,
1430	can_focus => 1,	1610	can_focus => 1,
1431	valign => 0,	1611	valign => 0,
1432	can_events => 1,	1612	can_events => 1,
		1613	#text => ...
1433	@_	1614	@_
1434	)	1615	)
1435	}	1616	}
1436		1617
1437	sub _set_text {	1618	sub _set_text {
…		…
1447	$self->{text} = $text;	1628	$self->{text} = $text;
1448		1629
1449	$text =~ s/./*/g if $self->{hidden};	1630	$text =~ s/./*/g if $self->{hidden};
1450	$self->{layout}->set_text ("$text ");	1631	$self->{layout}->set_text ("$text ");
1451		1632
1452	$self->emit (changed => $self->{text});	1633	$self->_emit (changed => $self->{text});
1453	}	1634	}
1454		1635
1455	sub set_text {	1636	sub set_text {
1456	my ($self, $text) = @_;	1637	my ($self, $text) = @_;
1457		1638
1458	$self->{cursor} = length $text;	1639	$self->{cursor} = length $text;
1459	$self->_set_text ($text);	1640	$self->_set_text ($text);
		1641	$self->update;
1460	$self->check_size;	1642	$self->check_size;
1461	$self->update;
1462	}	1643	}
1463		1644
1464	sub get_text {	1645	sub get_text {
1465	$_[0]{text}	1646	$_[0]{text}
1466	}	1647	}
…		…
1469	my ($self) = @_;	1650	my ($self) = @_;
1470		1651
1471	my ($w, $h) = $self->SUPER::size_request;	1652	my ($w, $h) = $self->SUPER::size_request;
1472		1653
1473	($w + 1, $h) # add 1 for cursor	1654	($w + 1, $h) # add 1 for cursor
1474	}
1475
1476	sub size_allocate {
1477	my ($self, $w, $h) = @_;
1478
1479	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1480	}	1655	}
1481		1656
1482	sub key_down {	1657	sub key_down {
1483	my ($self, $ev) = @_;	1658	my ($self, $ev) = @_;
1484		1659
…		…
1486	my $sym = $ev->{sym};	1661	my $sym = $ev->{sym};
1487	my $uni = $ev->{unicode};	1662	my $uni = $ev->{unicode};
1488		1663
1489	my $text = $self->get_text;	1664	my $text = $self->get_text;
1490		1665
1491	if ($sym == 8) {	1666	if ($uni == 8) {
1492	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1667	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1493	} elsif ($sym == 127) {	1668	} elsif ($uni == 127) {
1494	substr $text, $self->{cursor}, 1, "";	1669	substr $text, $self->{cursor}, 1, "";
1495	} elsif ($sym == CFClient::SDLK_LEFT) {	1670	} elsif ($sym == CFClient::SDLK_LEFT) {
1496	--$self->{cursor} if $self->{cursor};	1671	--$self->{cursor} if $self->{cursor};
1497	} elsif ($sym == CFClient::SDLK_RIGHT) {	1672	} elsif ($sym == CFClient::SDLK_RIGHT) {
1498	++$self->{cursor} if $self->{cursor} < length $self->{text};	1673	++$self->{cursor} if $self->{cursor} < length $self->{text};
1499	} elsif ($sym == CFClient::SDLK_HOME) {	1674	} elsif ($sym == CFClient::SDLK_HOME) {
1500	$self->{cursor} = 0;	1675	$self->{cursor} = 0;
1501	} elsif ($sym == CFClient::SDLK_END) {	1676	} elsif ($sym == CFClient::SDLK_END) {
1502	$self->{cursor} = length $text;	1677	$self->{cursor} = length $text;
1503	} elsif ($sym == 27) {	1678	} elsif ($uni == 27) {
1504	$self->emit ('escape');	1679	$self->_emit ('escape');
1505	} elsif ($uni) {	1680	} elsif ($uni) {
1506	substr $text, $self->{cursor}++, 0, chr $uni;	1681	substr $text, $self->{cursor}++, 0, chr $uni;
1507	}	1682	}
1508		1683
1509	$self->_set_text ($text);	1684	$self->_set_text ($text);
1510	$self->update;	1685	$self->update;
		1686	$self->check_size;
1511	}	1687	}
1512		1688
1513	sub focus_in {	1689	sub focus_in {
1514	my ($self) = @_;	1690	my ($self) = @_;
1515		1691
…		…
1595	if ($sym == 13) {	1771	if ($sym == 13) {
1596	unshift @{$self->{history}},	1772	unshift @{$self->{history}},
1597	my $txt = $self->get_text;	1773	my $txt = $self->get_text;
1598	$self->{history_pointer} = -1;	1774	$self->{history_pointer} = -1;
1599	$self->{history_saveback} = '';	1775	$self->{history_saveback} = '';
1600	$self->emit (activate => $txt);	1776	$self->_emit (activate => $txt);
1601	$self->update;	1777	$self->update;
1602		1778
1603	} elsif ($sym == CFClient::SDLK_UP) {	1779	} elsif ($sym == CFClient::SDLK_UP) {
1604	if ($self->{history_pointer} < 0) {	1780	if ($self->{history_pointer} < 0) {
1605	$self->{history_saveback} = $self->get_text;	1781	$self->{history_saveback} = $self->get_text;
…		…
1644	my $class = shift;	1820	my $class = shift;
1645		1821
1646	$class->SUPER::new (	1822	$class->SUPER::new (
1647	padding => 4,	1823	padding => 4,
1648	fg => [1, 1, 1],	1824	fg => [1, 1, 1],
1649	bg => [1, 1, 1, 0.2],
1650	active_fg => [0, 0, 1],	1825	active_fg => [0, 0, 1],
1651	can_hover => 1,	1826	can_hover => 1,
1652	align => 0,	1827	align => 0,
1653	valign => 0,	1828	valign => 0,
1654	can_events => 1,	1829	can_events => 1,
1655	@_	1830	@_
1656	)	1831	)
1657	}	1832	}
1658		1833
		1834	sub activate { }
		1835
1659	sub button_up {	1836	sub button_up {
1660	my ($self, $ev, $x, $y) = @_;	1837	my ($self, $ev, $x, $y) = @_;
1661		1838
		1839	$self->emit ("activate")
1662	if ($x >= 0 && $x < $self->{w}	1840	if $x >= 0 && $x < $self->{w}
1663	&& $y >= 0 && $y < $self->{h}) {	1841	&& $y >= 0 && $y < $self->{h};
1664	$self->emit ("activate");
1665	}
1666	}	1842	}
1667		1843
1668	sub _draw {	1844	sub _draw {
1669	my ($self) = @_;	1845	my ($self) = @_;
1670		1846
…		…
1672		1848
1673	if ($GRAB == $self) {	1849	if ($GRAB == $self) {
1674	$self->{fg} = $self->{active_fg};	1850	$self->{fg} = $self->{active_fg};
1675	}	1851	}
1676		1852
1677	glEnable GL_BLEND;
1678	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679	glEnable GL_TEXTURE_2D;	1853	glEnable GL_TEXTURE_2D;
1680	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1854	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681	glColor 0, 0, 0, 1;	1855	glColor 0, 0, 0, 1;
1682		1856
1683	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1857	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1684		1858
1685	glDisable GL_TEXTURE_2D;	1859	glDisable GL_TEXTURE_2D;
1686	glDisable GL_BLEND;
1687		1860
1688	$self->SUPER::_draw;	1861	$self->SUPER::_draw;
1689	}	1862	}
1690		1863
1691	#############################################################################	1864	#############################################################################
…		…
1705		1878
1706	$class->SUPER::new (	1879	$class->SUPER::new (
1707	padding => 2,	1880	padding => 2,
1708	fg => [1, 1, 1],	1881	fg => [1, 1, 1],
1709	active_fg => [1, 1, 0],	1882	active_fg => [1, 1, 0],
		1883	bg => [0, 0, 0, 0.2],
		1884	active_bg => [1, 1, 1, 0.5],
1710	state => 0,	1885	state => 0,
1711	can_hover => 1,	1886	can_hover => 1,
1712	@_	1887	@_
1713	)	1888	)
1714	}	1889	}
…		…
1723	my ($self, $ev, $x, $y) = @_;	1898	my ($self, $ev, $x, $y) = @_;
1724		1899
1725	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1900	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1726	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1901	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1727	$self->{state} = !$self->{state};	1902	$self->{state} = !$self->{state};
1728	$self->emit (changed => $self->{state});	1903	$self->_emit (changed => $self->{state});
1729	}	1904	}
1730	}	1905	}
1731		1906
1732	sub _draw {	1907	sub _draw {
1733	my ($self) = @_;	1908	my ($self) = @_;
…		…
1738		1913
1739	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1914	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1740		1915
1741	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1916	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1742		1917
1743	glEnable GL_BLEND;	1918	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1919
1744	glEnable GL_TEXTURE_2D;	1920	glEnable GL_TEXTURE_2D;
1745	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1746
1747	my $tex = $self->{state} ? $tex[1] : $tex[0];
1748
1749	$tex->draw_quad (0, 0, $s, $s);	1921	$tex->draw_quad_alpha (0, 0, $s, $s);
1750
1751	glDisable GL_TEXTURE_2D;	1922	glDisable GL_TEXTURE_2D;
1752	glDisable GL_BLEND;
1753	}	1923	}
1754		1924
1755	#############################################################################	1925	#############################################################################
1756		1926
1757	package CFClient::UI::Image;	1927	package CFClient::UI::Image;
…		…
1800	glTranslate 0, -$self->{w}, 0;	1970	glTranslate 0, -$self->{w}, 0;
1801		1971
1802	($w, $h) = ($h, $w);	1972	($w, $h) = ($h, $w);
1803	}	1973	}
1804		1974
1805	glEnable GL_BLEND;
1806	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1807	glEnable GL_TEXTURE_2D;	1975	glEnable GL_TEXTURE_2D;
1808	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1976	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1809		1977
1810	$tex->draw_quad (0, 0, $w, $h);	1978	$tex->draw_quad_alpha (0, 0, $w, $h);
1811		1979
1812	glDisable GL_BLEND;
1813	glDisable GL_TEXTURE_2D;	1980	glDisable GL_TEXTURE_2D;
1814	}	1981	}
1815		1982
1816	#############################################################################	1983	#############################################################################
1817		1984
…		…
2006	qw(s1_slider.png s1_slider_bg.png);	2173	qw(s1_slider.png s1_slider_bg.png);
2007		2174
2008	sub new {	2175	sub new {
2009	my $class = shift;	2176	my $class = shift;
2010		2177
2011	# range [value, low, high, page]	2178	# range [value, low, high, page, unit]
2012		2179
2013	# TODO: 0-width page	2180	# TODO: 0-width page
2014	# TODO: req_w/h are wrong with vertical	2181	# TODO: req_w/h are wrong with vertical
2015	# TODO: calculations are off	2182	# TODO: calculations are off
2016	my $self = $class->SUPER::new (	2183	my $self = $class->SUPER::new (
2017	fg => [1, 1, 1],	2184	fg => [1, 1, 1],
2018	active_fg => [0, 0, 0],	2185	active_fg => [0, 0, 0],
		2186	bg => [0, 0, 0, 0.2],
		2187	active_bg => [1, 1, 1, 0.5],
2019	range => [0, 0, 100, 10],	2188	range => [0, 0, 100, 10, 0],
2020	req_w => $::WIDTH / 80,	2189	req_w => $::WIDTH / 80,
2021	req_h => $::WIDTH / 80,	2190	req_h => $::WIDTH / 80,
2022	vertical => 0,	2191	vertical => 0,
2023	can_hover => 1,	2192	can_hover => 1,
2024	inner_pad => 5,	2193	inner_pad => 0.02,
2025	@_	2194	@_
2026	);	2195	);
2027		2196
		2197	$self->set_value ($self->{range}[0]);
		2198	$self->update;
		2199
2028	$self	2200	$self
		2201	}
		2202
		2203	sub set_range {
		2204	my ($self, $range) = @_;
		2205
		2206	($range, $self->{range}) = ($self->{range}, $range);
		2207
		2208	$self->update
		2209	if "@$range" ne "@{$self->{range}}";
		2210	}
		2211
		2212	sub set_value {
		2213	my ($self, $value) = @_;
		2214
		2215	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2216
		2217	$hi = $lo + 1 if $hi <= $lo;
		2218
		2219	$page = $hi - $lo if $page > $hi - $lo;
		2220
		2221	$value = $lo if $value < $lo;
		2222	$value = $hi - $page if $value > $hi - $page;
		2223
		2224	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2225	if $unit;
		2226
		2227	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2228
		2229	if ($value != $old_value) {
		2230	$self->_emit (changed => $value);
		2231	$self->update;
		2232	}
2029	}	2233	}
2030		2234
2031	sub size_request {	2235	sub size_request {
2032	my ($self) = @_;	2236	my ($self) = @_;
2033		2237
…		…
2039		2243
2040	sub button_down {	2244	sub button_down {
2041	my ($self, $ev, $x, $y) = @_;	2245	my ($self, $ev, $x, $y) = @_;
2042		2246
2043	$self->SUPER::button_down ($ev, $x, $y);	2247	$self->SUPER::button_down ($ev, $x, $y);
		2248
		2249	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2250
2044	$self->mouse_motion ($ev, $x, $y);	2251	$self->mouse_motion ($ev, $x, $y);
2045	}	2252	}
2046		2253
2047	sub mouse_motion {	2254	sub mouse_motion {
2048	my ($self, $ev, $x, $y) = @_;	2255	my ($self, $ev, $x, $y) = @_;
2049		2256
2050	if ($GRAB == $self) {	2257	if ($GRAB == $self) {
		2258	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2259
		2260	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2261
		2262	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2263
		2264	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2265	}
		2266	}
		2267
		2268	sub update {
		2269	my ($self) = @_;
		2270
		2271	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2272	$self->set_value ($self->{range}[0]);
		2273
2051	my ($value, $lo, $hi, $page) = @{$self->{range}};	2274	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2275	my $range = ($hi - $page - $lo) || 1e-100;
2052		2276
2053	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2277	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2054		2278
2055	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2279	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2056	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2280	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2057		2281
2058	$x -= $inner_pad_px; # substract the padding	2282	$value = ($value - $lo) / $range;
2059	$x = $x * ($hi - $lo) / $inner_w + $lo;	2283	$value = $value * $self->{scale} + $self->{offset};
2060	$x = $lo if $x < $lo;
2061	$x = $hi - $page if $x > $hi - $page;
2062	$self->{range}[0] = $x;
2063		2284
2064	$self->emit (changed => $x);	2285	$self->{knob_x} = $value - $knob_w * 0.5;
2065	$self->update;	2286	$self->{knob_w} = $knob_w;
2066	}	2287	});
2067	}
2068		2288
2069	# the inner_* stuff is for generating a padding for the slider handle,	2289	$self->SUPER::update;
2070	# so that the handle doesn't leave the texture. This calculation isn't 100%
2071	# correct propably, but it does the job for now
2072	sub _calc_inner_pad_px {
2073	my ($self, $w) = @_;
2074	($w / 100) * $self->{inner_pad} # % to pixels
2075	}	2290	}
2076		2291
2077	sub _draw {	2292	sub _draw {
2078	my ($self) = @_;	2293	my ($self) = @_;
2079		2294
2080	$self->SUPER::_draw ();	2295	$self->SUPER::_draw ();
2081		2296
2082	my ($w, $h) = @$self{qw(w h)};	2297	glScale $self->{w}, $self->{h};
2083		2298
2084	if ($self->{vertical}) {	2299	if ($self->{vertical}) {
2085	# draw a vertical slider like a rotated horizontal slider	2300	# draw a vertical slider like a rotated horizontal slider
2086		2301
		2302	glTranslate 1, 0, 0;
2087	glRotate 90, 0, 0, 1;	2303	glRotate 90, 0, 0, 1;
2088	glTranslate 0, -$self->{w}, 0;
2089
2090	($w, $h) = ($h, $w);
2091	}	2304	}
2092		2305
2093	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2306	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2094	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2307	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2095		2308
2096	my ($value, $lo, $hi, $page) = @{$self->{range}};
2097
2098	$hi = $value + 1 if $lo == $hi;
2099
2100	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2101	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2102
2103	$page = int $page * $inner_w / ($hi - $lo);
2104	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2105
2106	$w -= $page;
2107	$page &= ~1;
2108	glTranslate $page * 0.5, 0, 0;
2109	$page ||= 2;
2110
2111	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2112	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2113
2114	glEnable GL_BLEND;
2115	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2116	glEnable GL_TEXTURE_2D;	2309	glEnable GL_TEXTURE_2D;
2117	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2310	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118		2311
2119	# draw background	2312	# draw background
2120	$tex[1]->draw_quad (0, 0, $w, $h);	2313	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2121		2314
2122	# draw handle	2315	# draw handle
2123	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2316	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2124		2317
2125	glDisable GL_BLEND;
2126	glDisable GL_TEXTURE_2D;	2318	glDisable GL_TEXTURE_2D;
2127	}	2319	}
		2320
		2321	#############################################################################
		2322
		2323	package CFClient::UI::ValSlider;
		2324
		2325	our @ISA = CFClient::UI::HBox::;
		2326
		2327	sub new {
		2328	my ($class, %arg) = @_;
		2329
		2330	my $range = delete $arg{range};
		2331
		2332	my $self = $class->SUPER::new (
		2333	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2334	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2335	to_value => sub { shift },
		2336	from_value => sub { shift },
		2337	%arg,
		2338	);
		2339
		2340	$self->{slider}->connect (changed => sub {
		2341	my ($self, $value) = @_;
		2342	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2343	$self->{parent}->emit (changed => $value);
		2344	});
		2345
		2346	# $self->{entry}->connect (changed => sub {
		2347	# my ($self, $value) = @_;
		2348	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2349	# $self->{parent}->emit (changed => $value);
		2350	# });
		2351
		2352	$self->add ($self->{slider}, $self->{entry});
		2353
		2354	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2355
		2356	$self
		2357	}
		2358
		2359	sub set_range { shift->{slider}->set_range (@_) }
		2360	sub set_value { shift->{slider}->set_value (@_) }
2128		2361
2129	#############################################################################	2362	#############################################################################
2130		2363
2131	package CFClient::UI::TextView;	2364	package CFClient::UI::TextView;
2132		2365
…		…
2141	fontsize => 1,	2374	fontsize => 1,
2142	can_events => 0,	2375	can_events => 0,
2143	#font => default_font	2376	#font => default_font
2144	@_,	2377	@_,
2145		2378
2146	layout => (new CFClient::Layout),	2379	layout => (new CFClient::Layout 1),
2147	par => [],	2380	par => [],
2148	height => 0,	2381	height => 0,
2149	children => [	2382	children => [
2150	(new CFClient::UI::Empty expand => 1),	2383	(new CFClient::UI::Empty expand => 1),
2151	(new CFClient::UI::Slider vertical => 1),	2384	(new CFClient::UI::Slider vertical => 1),
…		…
2162		2395
2163	$self->{fontsize} = $fontsize;	2396	$self->{fontsize} = $fontsize;
2164	$self->reflow;	2397	$self->reflow;
2165	}	2398	}
2166		2399
2167	sub text_height {
2168	my ($self, $text) = @_;
2169
2170	my $layout = $self->{layout};
2171
2172	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2173	$layout->set_width ($self->{children}[0]{w});
2174	$layout->set_text ($text);
2175
2176	($layout->size)[1]
2177	}
2178
2179	sub reflow {
2180	my ($self) = @_;
2181
2182	$self->{need_reflow}++;
2183	$self->update;
2184	}
2185
2186	sub size_allocate {	2400	sub size_allocate {
2187	my ($self, $w, $h) = @_;	2401	my ($self, $w, $h) = @_;
2188		2402
2189	$self->SUPER::size_allocate ($w, $h);	2403	$self->SUPER::size_allocate ($w, $h);
2190		2404
…		…
2193	$self->{layout}->set_width ($self->{children}[0]{w});	2407	$self->{layout}->set_width ($self->{children}[0]{w});
2194		2408
2195	$self->reflow;	2409	$self->reflow;
2196	}	2410	}
2197		2411
		2412	sub text_size {
		2413	my ($self, $text, $indent) = @_;
		2414
		2415	my $layout = $self->{layout};
		2416
		2417	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2418	$layout->set_width ($self->{children}[0]{w} - $indent);
		2419	$layout->set_markup ($text);
		2420
		2421	$layout->size
		2422	}
		2423
		2424	sub reflow {
		2425	my ($self) = @_;
		2426
		2427	$self->{need_reflow}++;
		2428	$self->update;
		2429	}
		2430
		2431	sub set_offset {
		2432	my ($self, $offset) = @_;
		2433
		2434	# todo: base offset on lines or so, not on pixels
		2435	$self->{children}[1]->set_value ($offset);
		2436	}
		2437
		2438	sub clear {
		2439	my ($self) = @_;
		2440
		2441	$self->{par} = [];
		2442	$self->{height} = 0;
		2443	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2444	}
		2445
2198	sub add_paragraph {	2446	sub add_paragraph {
2199	my ($self, $color, $text) = @_;	2447	my ($self, $color, $text, $indent) = @_;
2200		2448
2201	#TODO: intelligently "reformat" paragraph	2449	for my $line (split /\n/, $text) {
2202		2450	my ($w, $h) = $self->text_size ($line);
2203	my $height = $self->text_height ($text);
2204
2205	$self->{height} += $height;	2451	$self->{height} += $h;
		2452	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2453	}
2206		2454
2207	push @{$self->{par}}, [$height, $color, $text];
2208
2209	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2455	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2210	$self->{children}[1]->update;
2211	}	2456	}
2212		2457
2213	sub update {	2458	sub update {
2214	my ($self) = @_;	2459	my ($self) = @_;
2215		2460
…		…
2217		2462
2218	return unless $self->{h} > 0;	2463	return unless $self->{h} > 0;
2219		2464
2220	delete $self->{texture};	2465	delete $self->{texture};
2221		2466
2222	$ROOT->on_refresh ($self, sub {	2467	$ROOT->on_post_alloc ($self, sub {
		2468	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2469
2223	if (delete $self->{need_reflow}) {	2470	if (delete $self->{need_reflow}) {
2224	my $height = 0;	2471	my $height = 0;
2225		2472
2226	$height += $_->[0] = $self->text_height ($_->[2])	2473	my $layout = $self->{layout};
		2474
		2475	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2476
2227	for @{$self->{par}};	2477	for (@{$self->{par}}) {
		2478	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2479	$layout->set_width ($W - $_->[3]);
		2480	$layout->set_markup ($_->[4]);
		2481	my ($w, $h) = $layout->size;
		2482	$_->[0] = $w + $_->[3];
		2483	$_->[1] = $h;
		2484	}
		2485
		2486	$height += $_->[1];
		2487	}
2228		2488
2229	$self->{height} = $height;	2489	$self->{height} = $height;
2230		2490
2231	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2491	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2232		2492
2233	delete $self->{texture};	2493	delete $self->{texture};
2234	}	2494	}
2235		2495
2236	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2496	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2237	glClearColor 0, 0, 0, 0;	2497	glClearColor 0.5, 0.5, 0.5, 0;
2238	glClear GL_COLOR_BUFFER_BIT;	2498	glClear GL_COLOR_BUFFER_BIT;
2239		2499
		2500	my $top = int $self->{children}[1]{range}[0];
		2501
		2502	my $y0 = $top;
		2503	my $y1 = $top + $H;
		2504
		2505	my $y = 0;
		2506
		2507	my $layout = $self->{layout};
		2508
		2509	$layout->set_font ($self->{font}) if $self->{font};
		2510
2240	glEnable GL_BLEND;	2511	glEnable GL_BLEND;
		2512	#TODO# not correct in windows where rgba is forced off
2241	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2513	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2242	glEnable GL_TEXTURE_2D;
2243	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244
2245	my $top = int $self->{children}[1]{range}[0];
2246
2247	my $y0 = $top;
2248	my $y1 = $top + $self->{h};
2249
2250	my $y = 0;
2251
2252	my $layout = $self->{layout};
2253
2254	$layout->set_font ($self->{font}) if $self->{font};
2255		2514
2256	for my $par (@{$self->{par}}) {	2515	for my $par (@{$self->{par}}) {
2257	my $h = $par->[0];	2516	my $h = $par->[1];
2258		2517
2259	if ($y0 < $y + $h && $y < $y1) {	2518	if ($y0 < $y + $h && $y < $y1) {
		2519	$layout->set_foreground (@{ $par->[2] });
		2520	$layout->set_width ($W - $par->[3]);
2260	$layout->set_text ($par->[2]);	2521	$layout->set_markup ($par->[4]);
2261		2522
2262	glColor @{ $par->[1] };	2523	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2263	my ($W, $H) = $layout->size;	2524
2264	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2525	glRasterPos $par->[3], $y - $y0;
		2526	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265	}	2527	}
2266		2528
2267	$y += $h;	2529	$y += $h;
2268	}	2530	}
2269		2531
2270	glDisable GL_TEXTURE_2D;
2271	glDisable GL_BLEND;	2532	glDisable GL_BLEND;
2272	};	2533	};
2273	});	2534	});
2274	}	2535	}
2275		2536
2276	sub _draw {	2537	sub _draw {
2277	my ($self) = @_;	2538	my ($self) = @_;
2278		2539
2279	glEnable GL_BLEND;
2280	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2281	glEnable GL_TEXTURE_2D;	2540	glEnable GL_TEXTURE_2D;
2282	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2541	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2283	glColor 1, 1, 1, 1;	2542	glColor 1, 1, 1, 1;
2284	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2543	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2285	glDisable GL_TEXTURE_2D;	2544	glDisable GL_TEXTURE_2D;
2286	glDisable GL_BLEND;
2287		2545
2288	$self->{children}[1]->draw;	2546	$self->{children}[1]->draw;
2289		2547
2290	}	2548	}
2291		2549
…		…
2339		2597
2340	sub new {	2598	sub new {
2341	my $class = shift;	2599	my $class = shift;
2342		2600
2343	my $self = $class->SUPER::new (	2601	my $self = $class->SUPER::new (
2344	state => 0,	2602	state => 0,
2345	connect_activate => \&toggle_flopper,	2603	on_activate => \&toggle_flopper,
2346	@_	2604	@_
2347	);	2605	);
2348		2606
2349	if ($self->{state}) {
2350	$self->{state} = 0;
2351	$self->toggle_flopper;
2352	}
2353
2354	$self	2607	$self
2355	}	2608	}
2356		2609
2357	sub toggle_flopper {	2610	sub toggle_flopper {
2358	my ($self) = @_;	2611	my ($self) = @_;
2359		2612
2360	# TODO: use animation	2613	$self->{other}->toggle_visibility;
2361	if ($self->{state} = !$self->{state}) {
2362	$CFClient::UI::ROOT->add ($self->{other});
2363	$self->{other}->move ($self->coord2global (0, $self->{h}));
2364	$self->emit ("open");
2365	} else {
2366	$CFClient::UI::ROOT->remove ($self->{other});
2367	$self->emit ("close");
2368	}
2369
2370	$self->emit (changed => $self->{state});
2371	}	2614	}
2372		2615
2373	#############################################################################	2616	#############################################################################
2374		2617
2375	package CFClient::UI::Tooltip;	2618	package CFClient::UI::Tooltip;
…		…
2385	@_,	2628	@_,
2386	can_events => 0,	2629	can_events => 0,
2387	)	2630	)
2388	}	2631	}
2389		2632
2390	sub set_markup {	2633	sub set_tooltip_from {
2391	my ($self, $text) = @_;	2634	my ($self, $widget) = @_;
2392		2635
2393	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2636	$self->add (new CFClient::UI::Label
2394	$self->{label}->set_markup ($text);	2637	markup => $widget->{tooltip},
2395	$self->add ($self->{label});	2638	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2639	fontsize => 0.8,
		2640	fg => [0, 0, 0, 1],
		2641	ellipsise => 0,
		2642	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2643	);
2396	}	2644	}
2397		2645
2398	sub size_request {	2646	sub size_request {
2399	my ($self) = @_;	2647	my ($self) = @_;
2400
2401	$self->child->set_max_size ($::WIDTH * 0.3);
2402		2648
2403	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2649	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2404		2650
2405	($w + 4, $h + 4)	2651	($w + 4, $h + 4)
2406	}	2652	}
…		…
2412	}	2658	}
2413		2659
2414	sub _draw {	2660	sub _draw {
2415	my ($self) = @_;	2661	my ($self) = @_;
2416		2662
2417	glPushMatrix;
2418	glTranslate 0.375, 0.375;	2663	glTranslate 0.375, 0.375;
2419		2664
2420	my ($w, $h) = @$self{qw(w h)};	2665	my ($w, $h) = @$self{qw(w h)};
2421		2666
2422	glColor 1, 0.8, 0.4;	2667	glColor 1, 0.8, 0.4;
…		…
2433	glVertex 0 , $h;	2678	glVertex 0 , $h;
2434	glVertex $w, $h;	2679	glVertex $w, $h;
2435	glVertex $w, 0;	2680	glVertex $w, 0;
2436	glEnd;	2681	glEnd;
2437		2682
2438	glPopMatrix;	2683	glTranslate 2 - 0.375, 2 - 0.375;
2439
2440	glTranslate 2, 2;
2441	$self->SUPER::_draw;	2684	$self->SUPER::_draw;
2442	}	2685	}
2443		2686
2444	#############################################################################	2687	#############################################################################
2445		2688
…		…
2450	use CFClient::OpenGL;	2693	use CFClient::OpenGL;
2451		2694
2452	sub new {	2695	sub new {
2453	my $class = shift;	2696	my $class = shift;
2454		2697
2455	$class->SUPER::new (	2698	my $self = $class->SUPER::new (
2456	aspect => 1,	2699	aspect => 1,
		2700	can_events => 0,
2457	@_,	2701	@_,
2458	)	2702	);
		2703
		2704	if ($self->{anim} && $self->{animspeed}) {
		2705	Scalar::Util::weaken (my $widget = $self);
		2706
		2707	$self->{timer} = Event->timer (
		2708	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2709	hard => 1,
		2710	interval => $self->{animspeed},
		2711	cb => sub {
		2712	++$widget->{frame};
		2713	$widget->update;
		2714	},
		2715	);
		2716	}
		2717
		2718	$self
2459	}	2719	}
2460		2720
2461	sub size_request {	2721	sub size_request {
2462	(32, 8)	2722	(32, 8)
2463	}	2723	}
2464		2724
		2725	sub update {
		2726	my ($self) = @_;
		2727
		2728	return unless $self->{visible};
		2729
		2730	$self->SUPER::update;
		2731	}
		2732
2465	sub _draw {	2733	sub _draw {
2466	my ($self) = @_;	2734	my ($self) = @_;
2467		2735
2468	return unless $::CONN;#d# manage and cache textures differently	2736	return unless $::CONN;
		2737
		2738	my $face;
		2739
		2740	if ($self->{frame}) {
		2741	my $anim = $::CONN->{anim}[$self->{anim}];
		2742
		2743	$face = $anim->[ $self->{frame} % @$anim ]
		2744	if $anim && @$anim;
		2745	}
		2746
2469	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2747	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2470		2748
2471	# TODO animation
2472	if ($tex) {	2749	if ($tex) {
2473	glEnable GL_BLEND;
2474	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475	glEnable GL_TEXTURE_2D;	2750	glEnable GL_TEXTURE_2D;
2476	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2751	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477	glColor 1, 1, 1, 1;	2752	glColor 1, 1, 1, 1;
2478	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2753	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2479	glDisable GL_TEXTURE_2D;	2754	glDisable GL_TEXTURE_2D;
2480	glDisable GL_BLEND;
2481	}	2755	}
		2756	}
		2757
		2758	sub DESTROY {
		2759	my ($self) = @_;
		2760
		2761	$self->{timer}->cancel
		2762	if $self->{timer};
		2763
		2764	$self->SUPER::DESTROY;
2482	}	2765	}
2483		2766
2484	#############################################################################	2767	#############################################################################
2485		2768
2486	package CFClient::UI::InventoryItem;	2769	package CFClient::UI::Inventory;
2487		2770
2488	our @ISA = CFClient::UI::HBox::;	2771	our @ISA = CFClient::UI::ScrolledWindow::;
2489		2772
2490	sub new {	2773	sub new {
2491	my $class = shift;	2774	my $class = shift;
2492		2775
2493	my %args = @_;
2494
2495	my $item = delete $args{item};
2496
2497	my $desc = $item->{nrof} < 2
2498	? $item->{name}
2499	: "$item->{nrof} $item->{name_pl}";
2500
2501
2502	my $self = $class->SUPER::new (	2776	my $self = $class->SUPER::new (
2503	can_hover => 1,	2777	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2504	can_events => 1,
2505	tooltip => (CFClient::UI::Label->escape ($desc)
2506	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2507	connect_button_down => sub {
2508	my ($self, $ev, $x, $y) = @_;
2509
2510	# todo: maybe put examine on 1? but should just be a tooltip :(
2511	if ($ev->{button} == 1) {
2512	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2513	} elsif ($ev->{button} == 2) {
2514	$::CONN->send ("apply $item->{tag}");
2515	} elsif ($ev->{button} == 3) {
2516	CFClient::UI::Menu->new (
2517	items => [
2518	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2519	[
2520	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2521	sub { $::CONN->send ("lock $item->{tag}") },
2522	],
2523	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2524	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2525	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2526	],
2527	)->popup ($ev);
2528	}
2529
2530	1
2531	},
2532	%args
2533	);
2534
2535	$self->add (new CFClient::UI::Face
2536	can_events => 0,
2537	face => $item->{face},
2538	anim => $item->{anim},
2539	animspeed => $item->{animspeed},
2540	);
2541
2542	$self->add (new CFClient::UI::Label
2543	can_events => 0,
2544	text => $desc,
2545	);
2546
2547	$self
2548	}
2549
2550	#############################################################################
2551
2552	package CFClient::UI::Inventory;
2553
2554	our @ISA = CFClient::UI::ScrolledWindow::;
2555
2556	sub new {
2557	my $class = shift;
2558
2559	my $self = $class->SUPER::new (
2560	scrolled => (new CFClient::UI::VBox),
2561	@_,	2778	@_,
2562	);	2779	);
2563		2780
2564	$self	2781	$self
2565	}	2782	}
…		…
2568	my ($self, $items) = @_;	2785	my ($self, $items) = @_;
2569		2786
2570	$self->{scrolled}->clear;	2787	$self->{scrolled}->clear;
2571	return unless $items;	2788	return unless $items;
2572		2789
2573	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2790	my @items = sort {
		2791	($a->{type} <=> $b->{type})
		2792	or ($a->{name} cmp $b->{name})
		2793	} @$items;
2574		2794
2575	$self->{real_items} = \@items;	2795	$self->{real_items} = \@items;
2576		2796
		2797	my $row = 0;
2577	for my $item (@items) {	2798	for my $item (@items) {
2578	my $desc = $item->{nrof} < 2	2799	CFClient::Item::update_widgets $item;
2579	? $item->{name}
2580	: "$item->{nrof} $item->{name_pl}";
2581		2800
2582	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);	2801	$self->{scrolled}->add (0, $row, $item->{face_widget});
2583	}	2802	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2803	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2584		2804
2585	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2805	$row++;
		2806	}
2586	}	2807	}
2587		2808
2588	sub size_request {	2809	sub size_request {
2589	my ($self) = @_;	2810	my ($self) = @_;
2590	($self->{req_w}, $self->{req_h});	2811	($self->{req_w}, $self->{req_h});
…		…
2630		2851
2631	# popup given the event (must be a mouse button down event currently)	2852	# popup given the event (must be a mouse button down event currently)
2632	sub popup {	2853	sub popup {
2633	my ($self, $ev) = @_;	2854	my ($self, $ev) = @_;
2634		2855
2635	$self->emit ("popdown");	2856	$self->_emit ("popdown");
2636		2857
2637	# maybe save $GRAB? must be careful about events...	2858	# maybe save $GRAB? must be careful about events...
2638	$GRAB = $self;	2859	$GRAB = $self;
2639	$self->{button} = $ev->{button};	2860	$self->{button} = $ev->{button};
2640		2861
…		…
2655		2876
2656	if ($ev->{button} == $self->{button}) {	2877	if ($ev->{button} == $self->{button}) {
2657	undef $GRAB;	2878	undef $GRAB;
2658	$self->hide;	2879	$self->hide;
2659		2880
2660	$self->emit ("popdown");	2881	$self->_emit ("popdown");
2661	$self->{hover}[1]->() if $self->{hover};	2882	$self->{hover}[1]->() if $self->{hover};
2662	}	2883	}
2663	}	2884	}
2664		2885
2665	#############################################################################	2886	#############################################################################
2666		2887
2667	package CFClient::UI::Statusbox;	2888	package CFClient::UI::Statusbox;
2668		2889
2669	our @ISA = CFClient::UI::VBox::;	2890	our @ISA = CFClient::UI::VBox::;
		2891
		2892	sub new {
		2893	my $class = shift;
		2894
		2895	$class->SUPER::new (
		2896	fontsize => 0.8,
		2897	@_,
		2898	)
		2899	}
2670		2900
2671	sub reorder {	2901	sub reorder {
2672	my ($self) = @_;	2902	my ($self) = @_;
2673	my $NOW = time;	2903	my $NOW = time;
2674		2904
2675	while (my ($k, $v) = each %{ $self->{item} }) {	2905	while (my ($k, $v) = each %{ $self->{item} }) {
2676	delete $self->{item}{$k} if $v->{timeout} < $NOW;	2906	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2677	}	2907	}
2678		2908
2679	my @widgets;	2909	my @widgets;
2680	my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };	2910
		2911	my @items = sort {
		2912	$a->{pri} <=> $b->{pri}
		2913	or $b->{id} <=> $a->{id}
		2914	} values %{ $self->{item} };
		2915
2681	my $count = 10 + 1;	2916	my $count = 10 + 1;
2682	for my $item (@items) {	2917	for my $item (@items) {
2683	last unless --$count;	2918	last unless --$count;
2684		2919
2685	push @widgets, $item->{label} ||= do {	2920	push @widgets, $item->{label} ||= do {
2686	# TODO: doesn't handle markup well (read as: at all)	2921	# TODO: doesn't handle markup well (read as: at all)
2687	my $short = delete $item->{text};	2922	my $short = $item->{count} > 1
		2923	? "<b>$item->{count} ×</b> $item->{text}"
		2924	: $item->{text};
		2925
2688	for ($short) {	2926	for ($short) {
2689	s/^\s+//;	2927	s/^\s+//;
2690	s/\012.*//s;	2928	s/\s+/ /g;
2691	my $len = int 30 / $item->{fontsize};
2692	substr $_, $len, length, "…" if $len < length;
2693	}	2929	}
2694		2930
2695	new CFClient::UI::Label	2931	new CFClient::UI::Label
2696	markup => $short,	2932	markup => $short,
2697	tooltip => delete $item->{tooltip},	2933	tooltip => $item->{tooltip},
2698	fontsize => delete $item->{fontsize},	2934	tooltip_font => $::FONT_PROP,
2699	color => delete $item->{color},	2935	tooltip_width => 0.67,
		2936	fontsize => $item->{fontsize} || $self->{fontsize},
		2937	max_w => $::WIDTH * 0.44,
		2938	fg => $item->{fg},
2700	can_events => 1,	2939	can_events => 1,
2701	can_hover => 1,	2940	can_hover => 1
2702	};	2941	};
2703	}	2942	}
2704		2943
2705	$self->clear;	2944	$self->clear;
2706	$self->SUPER::add (@widgets);	2945	$self->SUPER::add (reverse @widgets);
2707	}	2946	}
2708		2947
2709	sub add {	2948	sub add {
2710	my ($self, $text, %arg) = @_;	2949	my ($self, $text, %arg) = @_;
2711		2950
2712	my $item = {	2951	$text =~ s/^\s+//;
2713	time => time,	2952	$text =~ s/\s+$//;
		2953
		2954	return unless $text;
		2955
		2956	my $timeout = time + ((delete $arg{timeout}) || 60);
		2957
		2958	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2959
		2960	if (my $item = $self->{item}{$group}) {
		2961	if ($item->{text} eq $text) {
		2962	$item->{count}++;
		2963	} else {
		2964	$item->{count} = 1;
		2965	$item->{text} = $item->{tooltip} = $text;
		2966	}
		2967	$item->{id} = ++$self->{id};
		2968	$item->{timeout} = $timeout;
		2969	delete $item->{label};
		2970	} else {
		2971	$self->{item}{$group} = {
		2972	id => ++$self->{id},
2714	text => $text,	2973	text => $text,
2715	timeout => 60,	2974	timeout => $timeout,
2716	tooltip => $text,	2975	tooltip => $text,
2717	fontsize => 0.8,
2718	color => [0.8, 0.8, 0.8, 0.8],	2976	fg => [0.8, 0.8, 0.8, 0.8],
		2977	pri => 0,
		2978	count => 1,
2719	%arg,	2979	%arg,
		2980	};
2720	};	2981	}
2721
2722	$item->{timeout} += time;
2723	$item->{group} ||= $item+0;
2724
2725	$item = $self->{item}{$item->{group}} ||= $item;
2726		2982
2727	$self->reorder;	2983	$self->reorder;
		2984	}
		2985
		2986	sub reconfigure {
		2987	my ($self) = @_;
		2988
		2989	delete $_->{label}
		2990	for values %{ $self->{item} || {} };
		2991
		2992	$self->reorder;
		2993	$self->SUPER::reconfigure;
2728	}	2994	}
2729		2995
2730	#############################################################################	2996	#############################################################################
2731		2997
2732	package CFClient::UI::Root;	2998	package CFClient::UI::Root;
…		…
2737		3003
2738	sub new {	3004	sub new {
2739	my $class = shift;	3005	my $class = shift;
2740		3006
2741	$class->SUPER::new (	3007	$class->SUPER::new (
		3008	visible => 1,
2742	@_,	3009	@_,
2743	)	3010	)
2744	}	3011	}
2745		3012
2746	sub configure {	3013	sub configure {
…		…
2764	}	3031	}
2765		3032
2766	sub size_allocate {	3033	sub size_allocate {
2767	my ($self, $w, $h) = @_;	3034	my ($self, $w, $h) = @_;
2768		3035
2769	my $old_w = $self->{old_w};
2770	my $old_h = $self->{old_h};
2771
2772	if ($old_w && $old_h) {
2773	for my $child ($self->children) {
2774	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2775	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2776	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2777	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2778	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2779	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2780	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2781	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2782	}
2783	}
2784
2785	for my $child ($self->children) {	3036	for my $child ($self->children) {
2786	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3037	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2787		3038
		3039	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3040	if exists $child->{req_x};
		3041
		3042	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3043	if exists $child->{req_y};
		3044
		3045	$X = $self->{user_x} if exists $self->{user_x};
		3046	$Y = $self->{user_y} if exists $self->{user_y};
		3047
2788	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3048	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2789	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3049	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3050
2790	$child->configure ($X, $Y, $W, $H);	3051	$child->configure ($X, $Y, $W, $H);
2791	}	3052	}
2792
2793	$self->{old_w} = $w;
2794	$self->{old_h} = $h;
2795	}	3053	}
2796		3054
2797	sub coord2local {	3055	sub coord2local {
2798	my ($self, $x, $y) = @_;	3056	my ($self, $x, $y) = @_;
2799		3057
…		…
2812	$self->check_size;	3070	$self->check_size;
2813	$::WANT_REFRESH++;	3071	$::WANT_REFRESH++;
2814	}	3072	}
2815		3073
2816	sub add {	3074	sub add {
2817	my ($self, $child) = @_;	3075	my ($self, @children) = @_;
2818		3076
		3077	for (my @widgets = @children; my $w = pop @widgets; ) {
		3078	push @widgets, $w->children;
		3079	$w->{root} = $self;
		3080	$w->{visible} = $self->{visible} + 1;
		3081	}
		3082
		3083	for my $child (@children) {
		3084	$child->{is_toplevel} = 1;
		3085
2819	# integerise window positions	3086	# integerise window positions
2820	$child->{x} = int $child->{x};	3087	$child->{x} = int $child->{x};
2821	$child->{y} = int $child->{y};	3088	$child->{y} = int $child->{y};
		3089	}
2822		3090
2823	$self->SUPER::add ($child);	3091	$self->SUPER::add (@children);
		3092	}
		3093
		3094	sub remove {
		3095	my ($self, @children) = @_;
		3096
		3097	$self->SUPER::remove (@children);
		3098
		3099	while (@children) {
		3100	my $w = pop @children;
		3101	push @children, $w->children;
		3102	$w->set_invisible;
		3103	}
2824	}	3104	}
2825		3105
2826	sub on_refresh {	3106	sub on_refresh {
2827	my ($self, $id, $cb) = @_;	3107	my ($self, $id, $cb) = @_;
2828		3108
2829	$self->{refresh_hook}{$id} = $cb;	3109	$self->{refresh_hook}{$id} = $cb;
2830	}	3110	}
2831		3111
		3112	sub on_post_alloc {
		3113	my ($self, $id, $cb) = @_;
		3114
		3115	$self->{post_alloc_hook}{$id} = $cb;
		3116	}
		3117
2832	sub draw {	3118	sub draw {
2833	my ($self) = @_;	3119	my ($self) = @_;
2834		3120
		3121	while ($self->{refresh_hook}) {
		3122	$_->()
		3123	for values %{delete $self->{refresh_hook}};
		3124	}
		3125
2835	if ($self->{check_size}) {	3126	if ($self->{check_size}) {
2836	my @queue = ([], []);	3127	my @queue;
2837		3128
2838	for (;;) {	3129	for (;;) {
2839	if ($self->{check_size}) {	3130	if ($self->{check_size}) {
2840	# heuristic: check containers last	3131	#TODO use array-of-depth approach
2841	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3132
		3133	@queue = sort { $a->{visible} <=> $b->{visible} }
2842	for values %{delete $self->{check_size}}	3134	@queue, values %{delete $self->{check_size}};
2843	}	3135	}
2844		3136
2845	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3137	my $widget = pop @queue || last;
		3138
		3139	defined $widget->{visible} or last; # do not resize invisible widgets
2846		3140
2847	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3141	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2848	? @$widget{qw(user_w user_h)}	3142	? @$widget{qw(user_w user_h)}
2849	: $widget->size_request;	3143	: $widget->size_request;
2850		3144
		3145	if (delete $widget->{force_alloc}
2851	if ($w != $widget->{req_w} || $h != $widget->{req_h}) {	3146	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2852	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3147	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2853		3148
2854	$widget->{req_w} = $w;	3149	$widget->{req_w} = $w;
2855	$widget->{req_h} = $h;	3150	$widget->{req_h} = $h;
2856		3151
2857	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];	3152	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2858		3153
2859	$widget->{parent}->check_size	3154	$widget->{parent}->check_size
2860	if $widget->{parent};	3155	if $widget->{parent};
2861	}	3156	}
2862	}	3157	}
…		…
2869	$w = 0 if $w < 0;	3164	$w = 0 if $w < 0;
2870	$h = 0 if $h < 0;	3165	$h = 0 if $h < 0;
2871		3166
2872	$widget->{w} = $w;	3167	$widget->{w} = $w;
2873	$widget->{h} = $h;	3168	$widget->{h} = $h;
2874	$widget->size_allocate ($w, $h);
2875	$widget->emit (size_allocate => $w, $h);	3169	$widget->emit (size_allocate => $w, $h);
2876	}	3170	}
2877	}	3171	}
2878		3172
2879	while ($self->{refresh_hook}) {	3173	while ($self->{post_alloc_hook}) {
2880	$_->()	3174	$_->()
2881	for values %{delete $self->{refresh_hook}};	3175	for values %{delete $self->{post_alloc_hook}};
2882	}	3176	}
2883		3177
2884	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3178	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2885	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3179	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2886	glClear GL_COLOR_BUFFER_BIT;	3180	glClear GL_COLOR_BUFFER_BIT;
2887		3181
2888	glMatrixMode GL_PROJECTION;	3182	glMatrixMode GL_PROJECTION;
2889	glLoadIdentity;	3183	glLoadIdentity;
2890	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3184	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2891	glMatrixMode GL_MODELVIEW;	3185	glMatrixMode GL_MODELVIEW;
2892	glLoadIdentity;	3186	glLoadIdentity;
2893		3187
2894	$self->_draw;	3188	$self->_draw;
2895	}	3189	}
…		…
2897	#############################################################################	3191	#############################################################################
2898		3192
2899	package CFClient::UI;	3193	package CFClient::UI;
2900		3194
2901	$ROOT = new CFClient::UI::Root;	3195	$ROOT = new CFClient::UI::Root;
2902	$TOOLTIP = new CFClient::UI::Tooltip;	3196	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2903		3197
2904	1	3198	1
2905		3199

Diff Legend

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