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.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.250 by root, Sun May 28 02:31:03 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
		20
		21	sub get_layout {
		22	for (grep { $_->{name} } values %WIDGET) {
		23	$LAYOUT->{$_->{name}} = {
		24	x => $_->{x} / $::WIDTH,
		25	y => $_->{y} / $::HEIGHT,
		26	w => $_->{w} / $::WIDTH,
		27	h => $_->{h} / $::HEIGHT
		28	};
		29	}
		30
		31	return $LAYOUT;
		32	}
		33
		34	sub set_layout {
		35	my ($layout) = @_;
		36	$LAYOUT = $layout;
		37	}
18		38
19	sub check_tooltip {	39	sub check_tooltip {
20	if (!$GRAB) {	40	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
…		…
31	$TOOLTIP->set_tooltip_from ($widget);	51	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	52	$TOOLTIP->show;
33		53
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35		55
36	if ($x + $TOOLTIP->{w} > $::WIDTH) {
37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38	}	57	if $x + $TOOLTIP->{w} > $::WIDTH;
39		58
40	$TOOLTIP->move ($x, $y);	59	$TOOLTIP->move ($x, $y);
41	$TOOLTIP->check_size;	60	$TOOLTIP->check_size;
42	$TOOLTIP->update;	61	$TOOLTIP->update;
43	}	62	}
…		…
51	delete $TOOLTIP->{owner};	70	delete $TOOLTIP->{owner};
52	}	71	}
53		72
54	# class methods for events	73	# class methods for events
55	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
56	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	75	$FOCUS->emit (key_down => $_[0])
57	if $FOCUS;	76	if $FOCUS;
58	}	77	}
59		78
60	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
61	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	80	$FOCUS->emit (key_up => $_[0])
62	if $FOCUS;	81	if $FOCUS;
63	}	82	}
64		83
65	sub feed_sdl_button_down_event {	84	sub feed_sdl_button_down_event {
66	my ($ev) = @_;	85	my ($ev) = @_;
…		…
75	check_tooltip;	94	check_tooltip;
76	}	95	}
77		96
78	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
79		98
80	if ($GRAB) {	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
81	($x, $y) = $GRAB->coord2local ($x, $y);	100	if $GRAB;
82	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
83	}
84	}	101	}
85		102
86	sub feed_sdl_button_up_event {	103	sub feed_sdl_button_up_event {
87	my ($ev) = @_;	104	my ($ev) = @_;
88	my ($x, $y) = ($ev->{x}, $ev->{y});	105	my ($x, $y) = ($ev->{x}, $ev->{y});
89		106
90	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
91		108
92	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
93		110
94	if ($GRAB) {	111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
95	($x, $y) = $GRAB->coord2local ($x, $y);	112	if $GRAB;
96	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
97	}
98		113
99	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
100	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
101	$grab->update if $grab;	116	$grab->update if $grab;
102	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
…		…
118	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
119		134
120	check_tooltip;	135	check_tooltip;
121	}	136	}
122		137
123	if ($HOVER) {
124	($x, $y) = $HOVER->coord2local ($x, $y);
125	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
126	}	139	if $HOVER;
127	}	140	}
128		141
129	# convert position array to integers	142	# convert position array to integers
130	sub harmonize {	143	sub harmonize {
131	my ($vals) = @_;	144	my ($vals) = @_;
…		…
137	$rem += $_ - $i;	150	$rem += $_ - $i;
138	$_ = $i;	151	$_ = $i;
139	}	152	}
140	}	153	}
141		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
142	# call when resolution changes etc.	171	# call when resolution changes etc.
143	sub rescale_widgets {	172	sub rescale_widgets {
144	my ($sx, $sy) = @_;	173	my ($sx, $sy) = @_;
145		174
146	for my $widget (values %WIDGET) {	175	for my $widget (values %WIDGET) {
147	if ($widget->{toplevel}) {	176	if ($widget->{is_toplevel}) {
148	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
149	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
150	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
151	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
152	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	180	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
153	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	181	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
154	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	182	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
155	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
156	}	183	}
157
158	$widget->reconfigure;
159	}	184	}
		185
		186	reconfigure_widgets;
160	}	187	}
161		188
162	#############################################################################	189	#############################################################################
163		190
164	package CFClient::UI::Base;	191	package CFClient::UI::Base;
…		…
177	can_events => 1,	204	can_events => 1,
178	@_	205	@_
179	}, $class;	206	}, $class;
180		207
181	for (keys %$self) {	208	for (keys %$self) {
182	if (/^connect_(.*)$/) {	209	if (/^on_(.*)$/) {
183	$self->connect ($1 => delete $self->{$_});	210	$self->connect ($1 => delete $self->{$_});
184	}	211	}
185	}	212	}
186		213
187	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
188		215
		216	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		217	$self->{req_x} = $layout->{x} * $::WIDTH;
		218	$self->{req_y} = $layout->{y} * $::HEIGHT;
		219	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		220	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		221	}
		222
189	$self	223	$self
190	}	224	}
191		225
192	sub destroy {	226	sub destroy {
193	my ($self) = @_;	227	my ($self) = @_;
…		…
202	return if $self->{parent};	236	return if $self->{parent};
203		237
204	$CFClient::UI::ROOT->add ($self);	238	$CFClient::UI::ROOT->add ($self);
205	}	239	}
206		240
207	sub hide {	241	sub center {
208	my ($self) = @_;	242	my ($self) = @_;
		243
		244	$CFClient::UI::ROOT->on_post_alloc (
		245	"center_$self" => sub {
		246	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
		247	},
		248	);
		249
		250	$self->update;
		251	}
		252
		253	sub set_visible {
		254	my ($self) = @_;
		255
		256	return if $self->{visible};
		257
		258	$self->{root} = $self->{parent}{root};
		259	$self->{visible} = $self->{parent}{visible} + 1;
		260
		261	$self->emit (visibility_change => 1);
		262	}
		263
		264	sub set_invisible {
		265	my ($self) = @_;
		266
		267	return unless $self->{visible};
		268
		269	# broken show/hide model
		270
		271	delete $self->{root};
		272	delete $self->{visible};
209		273
210	undef $GRAB if $GRAB == $self;	274	undef $GRAB if $GRAB == $self;
211	undef $HOVER if $HOVER == $self;	275	undef $HOVER if $HOVER == $self;
		276
		277	CFClient::UI::check_tooltip
		278	if $CFClient::UI::TOOLTIP->{owner} == $self;
		279
		280	$self->focus_out;
		281
		282	$self->emit (visibility_change => 0);
		283	}
		284
		285	sub set_visibility {
		286	my ($self, $visible) = @_;
		287
		288	return if $self->{visible} == $visible;
		289
		290	$visible ? $self->hide
		291	: $self->show;
		292	}
		293
		294	sub toggle_visibility {
		295	my ($self) = @_;
		296
		297	$self->{visible}
		298	? $self->hide
		299	: $self->show;
		300	}
		301
		302	sub hide {
		303	my ($self) = @_;
		304
		305	$self->set_invisible;
212		306
213	$self->{parent}->remove ($self)	307	$self->{parent}->remove ($self)
214	if $self->{parent};	308	if $self->{parent};
215	}	309	}
216		310
…		…
225	}	319	}
226		320
227	sub set_size {	321	sub set_size {
228	my ($self, $w, $h) = @_;	322	my ($self, $w, $h) = @_;
229		323
230	$self->{user_w} = $w;	324	$self->{def_w} = $w;
231	$self->{user_h} = $h;	325	$self->{def_h} = $h;
232		326
233	$self->check_size;	327	$self->check_size;
234	}	328	}
235		329
236	sub size_request {	330	sub size_request {
…		…
258	$self->{y} = $y;	352	$self->{y} = $y;
259	$self->update;	353	$self->update;
260	}	354	}
261		355
262	if ($self->{w} != $w || $self->{h} != $h) {	356	if ($self->{w} != $w || $self->{h} != $h) {
263	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	357	$CFClient::UI::ROOT->{size_alloc}{$self+0} = [$self, $w, $h];
264	}	358	}
265	}	359	}
266		360
267	sub size_allocate {	361	sub size_allocate {
268	# nothing to be done	362	# nothing to be done
…		…
281	sub set_max_size {	375	sub set_max_size {
282	my ($self, $w, $h) = @_;	376	my ($self, $w, $h) = @_;
283		377
284	delete $self->{max_w}; $self->{max_w} = $w if $w;	378	delete $self->{max_w}; $self->{max_w} = $w if $w;
285	delete $self->{max_h}; $self->{max_h} = $h if $h;	379	delete $self->{max_h}; $self->{max_h} = $h if $h;
		380	}
		381
		382	sub set_tooltip {
		383	my ($self, $tooltip) = @_;
		384
		385	$tooltip =~ s/^\s+//;
		386	$tooltip =~ s/\s+$//;
		387
		388	return if $self->{tooltip} eq $tooltip;
		389
		390	$self->{tooltip} = $tooltip;
		391
		392	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		393	delete $CFClient::UI::TOOLTIP->{owner};
		394	CFClient::UI::check_tooltip;
		395	}
286	}	396	}
287		397
288	# translate global coordinates to local coordinate system	398	# translate global coordinates to local coordinate system
289	sub coord2local {	399	sub coord2local {
290	my ($self, $x, $y) = @_;	400	my ($self, $x, $y) = @_;
…		…
305	return if $FOCUS == $self;	415	return if $FOCUS == $self;
306	return unless $self->{can_focus};	416	return unless $self->{can_focus};
307		417
308	my $focus = $FOCUS; $FOCUS = $self;	418	my $focus = $FOCUS; $FOCUS = $self;
309		419
310	$self->emit (focus_in => $focus);	420	$self->_emit (focus_in => $focus);
311		421
312	$focus->update if $focus;	422	$focus->update if $focus;
313	$FOCUS->update;	423	$FOCUS->update;
314	}	424	}
315		425
…		…
318		428
319	return unless $FOCUS == $self;	429	return unless $FOCUS == $self;
320		430
321	my $focus = $FOCUS; undef $FOCUS;	431	my $focus = $FOCUS; undef $FOCUS;
322		432
323	$self->emit (focus_out => $focus);	433	$self->_emit (focus_out => $focus);
324		434
325	$focus->update if $focus; #?	435	$focus->update if $focus; #?
		436
		437	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		438	unless $FOCUS;
326	}	439	}
327		440
328	sub mouse_motion { }	441	sub mouse_motion { }
329	sub button_up { }	442	sub button_up { }
330	sub key_down { }	443	sub key_down { }
331	sub key_up { }	444	sub key_up { }
332		445
333	sub button_down {	446	sub button_down {
334	my ($self, $ev, $x, $y) = @_;	447	my ($self, $ev, $x, $y) = @_;
335		448
336	$self->focus_in;	449	$self->focus_in;
…		…
370	if ($ENV{PCLIENT_DEBUG}) {	483	if ($ENV{PCLIENT_DEBUG}) {
371	glPushMatrix;	484	glPushMatrix;
372	glColor 1, 1, 0, 1;	485	glColor 1, 1, 0, 1;
373	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	486	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
374	glBegin GL_LINE_LOOP;	487	glBegin GL_LINE_LOOP;
375	glVertex 0 , 0;	488	glVertex 0 , 0;
376	glVertex $self->{w}, 0;	489	glVertex $self->{w} - 1, 0;
377	glVertex $self->{w}, $self->{h};	490	glVertex $self->{w} - 1, $self->{h} - 1;
378	glVertex 0 , $self->{h};	491	glVertex 0 , $self->{h} - 1;
379	glEnd;	492	glEnd;
380	glPopMatrix;	493	glPopMatrix;
381	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	494	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
382	}	495	}
383	}	496	}
384		497
385	sub _draw {	498	sub _draw {
386	my ($self) = @_;	499	my ($self) = @_;
…		…
403	sub set_parent {	516	sub set_parent {
404	my ($self, $parent) = @_;	517	my ($self, $parent) = @_;
405		518
406	Scalar::Util::weaken ($self->{parent} = $parent);	519	Scalar::Util::weaken ($self->{parent} = $parent);
407		520
408	# TODO: req_w _does_change after ->reconfigure	521	$self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
		522
409	$self->check_size	523	$self->check_size;
410	unless exists $self->{req_w};
411	}	524	}
412		525
413	sub check_size {	526	sub check_size {
414	my ($self, $forced) = @_;	527	my ($self, $forced) = @_;
415		528
…		…
428	my ($self, $signal, $cb) = @_;	541	my ($self, $signal, $cb) = @_;
429		542
430	push @{ $self->{signal_cb}{$signal} }, $cb;	543	push @{ $self->{signal_cb}{$signal} }, $cb;
431	}	544	}
432		545
		546	sub _emit {
		547	my ($self, $signal, @args) = @_;
		548
		549	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		550	}
		551
433	sub emit {	552	sub emit {
434	my ($self, $signal, @args) = @_;	553	my ($self, $signal, @args) = @_;
435		554
436	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	555	$self->_emit ($signal, @args)
		556	|| $self->$signal (@args);
		557	}
		558
		559	sub visibility_change {
		560	#my ($self, $visible) = @_;
437	}	561	}
438		562
439	sub DESTROY {	563	sub DESTROY {
440	my ($self) = @_;	564	my ($self) = @_;
441		565
…		…
456	my $class = shift;	580	my $class = shift;
457		581
458	# range [value, low, high, page]	582	# range [value, low, high, page]
459		583
460	$class->SUPER::new (	584	$class->SUPER::new (
461	bg => [0, 0, 0, 0.2],	585	#bg => [0, 0, 0, 0.2],
462	active_bg => [1, 1, 1, 0.5],	586	#active_bg => [1, 1, 1, 0.5],
463	@_	587	@_
464	)	588	)
465	}	589	}
466		590
467	sub _draw {	591	sub _draw {
468	my ($self) = @_;	592	my ($self) = @_;
469		593
		594	my $color = $FOCUS == $self && $self->{active_bg}
		595	? $self->{active_bg}
		596	: $self->{bg};
		597
		598	if ($color && (@$color < 4 || $color->[3])) {
470	my ($w, $h) = @$self{qw(w h)};	599	my ($w, $h) = @$self{qw(w h)};
471		600
472	glEnable GL_BLEND;	601	glEnable GL_BLEND;
473	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	602	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
474	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	603	glColor @$color;
475		604
476	glBegin GL_QUADS;	605	glBegin GL_QUADS;
477	glVertex 0 , 0;	606	glVertex 0 , 0;
478	glVertex 0 , $h;	607	glVertex 0 , $h;
479	glVertex $w, $h;	608	glVertex $w, $h;
480	glVertex $w, 0;	609	glVertex $w, 0;
481	glEnd;	610	glEnd;
482		611
483	glDisable GL_BLEND;	612	glDisable GL_BLEND;
		613	}
484	}	614	}
485		615
486	#############################################################################	616	#############################################################################
487		617
488	package CFClient::UI::Empty;	618	package CFClient::UI::Empty;
…		…
548	delete $child->{parent};	678	delete $child->{parent};
549	$child->hide;	679	$child->hide;
550		680
551	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	681	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
552		682
553	$self->check_size;	683	$self->check_size (1);
554	$self->update;	684	$self->update;
555	}	685	}
556		686
557	sub clear {	687	sub clear {
558	my ($self) = @_;	688	my ($self) = @_;
…		…
672	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	802	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
673	glClearColor 0, 0, 0, 0;	803	glClearColor 0, 0, 0, 0;
674	glClear GL_COLOR_BUFFER_BIT;	804	glClear GL_COLOR_BUFFER_BIT;
675		805
676	$self->_render;	806	$self->_render;
677	# glColorMask 1, 1, 1, 0;
678	# glEnable GL_BLEND;
679	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
680	# glRasterPos 0, 0;
681	# glCopyPixels 0, 0, $self->{w}, $self->{h};
682	# glDisable GL_BLEND;
683	# glColorMask 1, 1, 1, 1;
684	};	807	};
685	}	808	}
686		809
687	sub _draw {	810	sub _draw {
688	my ($self) = @_;	811	my ($self) = @_;
…		…
692	my $tex = $self->{texture}	815	my $tex = $self->{texture}
693	or return;	816	or return;
694		817
695	glEnable GL_TEXTURE_2D;	818	glEnable GL_TEXTURE_2D;
696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	819	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
697	glColor 0, 0, 0, 1;	820	glColor 1, 1, 1, 1;
698		821
699	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	822	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
700		823
701	glDisable GL_TEXTURE_2D;	824	glDisable GL_TEXTURE_2D;
702	}	825	}
…		…
705		828
706	package CFClient::UI::ViewPort;	829	package CFClient::UI::ViewPort;
707		830
708	our @ISA = CFClient::UI::Window::;	831	our @ISA = CFClient::UI::Window::;
709		832
		833	sub new {
		834	my $class = shift;
		835
		836	$class->SUPER::new (
		837	scroll_x => 0,
		838	scroll_y => 1,
		839	@_,
		840	)
		841	}
		842
710	sub size_request {	843	sub size_request {
711	my ($self) = @_;	844	my ($self) = @_;
712		845
713	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	846	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
714	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
715		847
716	@$self{qw(child_w child_h)}	848	$w = 10 if $self->{scroll_x};
		849	$h = 10 if $self->{scroll_y};
		850
		851	($w, $h)
717	}	852	}
718		853
719	sub size_allocate {	854	sub size_allocate {
720	my ($self, $w, $h) = @_;	855	my ($self, $w, $h) = @_;
721		856
		857	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		858	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		859
		860	$self->child->configure (0, 0, $w, $h);
722	$self->update;	861	$self->update;
723	}	862	}
724		863
725	sub set_offset {	864	sub set_offset {
726	my ($self, $x, $y) = @_;	865	my ($self, $x, $y) = @_;
…		…
777	my $class = shift;	916	my $class = shift;
778		917
779	my $self;	918	my $self;
780		919
781	my $slider = new CFClient::UI::Slider	920	my $slider = new CFClient::UI::Slider
782	vertical => 1,	921	vertical => 1,
783	range => [0, 0, 1, 0.01], # HACK fix	922	range => [0, 0, 1, 0.01], # HACK fix
784	connect_changed => sub {	923	on_changed => sub {
785	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	924	$self->{vp}->set_offset (0, $_[1]);
786	},	925	},
787	;	926	;
788		927
789	$self = $class->SUPER::new (	928	$self = $class->SUPER::new (
790	vp => (new CFClient::UI::ViewPort),	929	vp => (new CFClient::UI::ViewPort expand => 1),
791	slider => $slider,	930	slider => $slider,
792	@_,	931	@_,
793	);	932	);
794		933
795	$self->{vp}->add ($self->{scrolled});	934	$self->{vp}->add ($self->{scrolled});
796	$self->add ($self->{vp});	935	$self->add ($self->{vp});
797	$self->add ($self->{slider});	936	$self->add ($self->{slider});
798		937
799	$self	938	$self
		939	}
		940
		941	sub update {
		942	my ($self) = @_;
		943
		944	$self->SUPER::update;
		945
		946	# todo: overwrite size_allocate of child
		947	my $child = $self->{vp}->child;
		948	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		949	}
		950
		951	sub size_allocate {
		952	my ($self, $w, $h) = @_;
		953
		954	$self->SUPER::size_allocate ($w, $h);
		955
		956	my $child = $self->{vp}->child;
		957	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
800	}	958	}
801		959
802	#TODO# update range on size_allocate depending on child	960	#TODO# update range on size_allocate depending on child
803	# update viewport offset on scroll	961	# update viewport offset on scroll
804		962
…		…
855	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1013	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
856		1014
857	sub new {	1015	sub new {
858	my $class = shift;	1016	my $class = shift;
859		1017
860	# TODO: user_x, user_y, overwrite moveto?
861
862	my $self = $class->SUPER::new (	1018	my $self = $class->SUPER::new (
863	bg => [1, 1, 1, 1],	1019	bg => [1, 1, 1, 1],
864	border_bg => [1, 1, 1, 1],	1020	border_bg => [1, 1, 1, 1],
865	border => 0.6,	1021	border => 0.6,
866	toplevel => 1,	1022	is_toplevel => 1,
867	can_events => 1,	1023	can_events => 1,
868	@_	1024	@_
869	);	1025	);
870		1026
871	$self->{title} &&= new CFClient::UI::Label	1027	$self->{title} &&= new CFClient::UI::Label
872	align => 0,	1028	align => 0,
…		…
896	my ($self, $w, $h) = @_;	1052	my ($self, $w, $h) = @_;
897		1053
898	$h -= List::Util::max 0, $self->border * 2;	1054	$h -= List::Util::max 0, $self->border * 2;
899	$w -= List::Util::max 0, $self->border * 2;	1055	$w -= List::Util::max 0, $self->border * 2;
900		1056
901	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1057	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
902	if $self->{title};	1058	if $self->{title};
903		1059
904	$self->child->configure ($self->border, $self->border, $w, $h);	1060	$self->child->configure ($self->border, $self->border, $w, $h);
905	}	1061	}
906		1062
…		…
925	my ($ev, $x, $y) = @_;	1081	my ($ev, $x, $y) = @_;
926		1082
927	my $dx = $ev->{x} - $ox;	1083	my $dx = $ev->{x} - $ox;
928	my $dy = $ev->{y} - $oy;	1084	my $dy = $ev->{y} - $oy;
929		1085
		1086	$self->{user_x} = $wx + $dx * $mx;
		1087	$self->{user_y} = $wy + $dy * $my;
930	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1088	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
931	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1089	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
932	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1090	$self->move ($self->{user_x}, $self->{user_y});
933	$self->check_size;	1091	$self->check_size;
934	};	1092	};
935		1093
936	} elsif ($lr ^ $td) {	1094	} elsif ($lr ^ $td) {
937	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1095	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
940	$self->{motion} = sub {	1098	$self->{motion} = sub {
941	my ($ev, $x, $y) = @_;	1099	my ($ev, $x, $y) = @_;
942		1100
943	($x, $y) = ($ev->{x}, $ev->{y});	1101	($x, $y) = ($ev->{x}, $ev->{y});
944		1102
945	$self->move ($bx + $x - $ox, $by + $y - $oy);	1103	$self->{user_x} = $bx + $x - $ox;
		1104	$self->{user_y} = $by + $y - $oy;
		1105
		1106	$self->move ($self->{user_x}, $self->{user_y});
946	$self->update;	1107	$self->update;
947	};	1108	};
948	}	1109	}
949	}	1110	}
950		1111
…		…
1012	sub new {	1173	sub new {
1013	my $class = shift;	1174	my $class = shift;
1014		1175
1015	$class->SUPER::new (	1176	$class->SUPER::new (
1016	col_expand => [],	1177	col_expand => [],
1017	@_	1178	@_,
1018	)	1179	)
		1180	}
		1181
		1182	sub children {
		1183	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1019	}	1184	}
1020		1185
1021	sub add {	1186	sub add {
1022	my ($self, $x, $y, $child) = @_;	1187	my ($self, $x, $y, $child) = @_;
1023		1188
1024	$child->set_parent ($self);	1189	$child->set_parent ($self);
1025	$self->{children}[$y][$x] = $child;	1190	$self->{children}[$y][$x] = $child;
1026		1191
1027	$child->check_size;	1192	$self->check_size (1);
1028	}	1193	}
1029		1194
1030	sub children {
1031	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032	}
1033
1034	# TODO: move to container class maybe? send childs a signal on removal?	1195	# TODO: move to container class maybe? send children a signal on removal?
1035	sub clear {	1196	sub clear {
1036	my ($self) = @_;	1197	my ($self) = @_;
1037		1198
1038	my @children = $self->children;	1199	my @children = $self->children;
1039	delete $self->{children};	1200	delete $self->{children};
…		…
1041	for (@children) {	1202	for (@children) {
1042	delete $_->{parent};	1203	delete $_->{parent};
1043	$_->hide;	1204	$_->hide;
1044	}	1205	}
1045		1206
		1207	$self->check_size (1);
1046	$self->update;	1208	$self->update;
1047	}	1209	}
1048		1210
1049	sub get_wh {	1211	sub get_wh {
1050	my ($self) = @_;	1212	my ($self) = @_;
…		…
1082	sub size_allocate {	1244	sub size_allocate {
1083	my ($self, $w, $h) = @_;	1245	my ($self, $w, $h) = @_;
1084		1246
1085	my ($ws, $hs) = $self->get_wh;	1247	my ($ws, $hs) = $self->get_wh;
1086		1248
1087	my $req_w = sum @$ws;	1249	my $req_w = (sum @$ws) || 1;
1088	my $req_h = sum @$hs;	1250	my $req_h = (sum @$hs) || 1;
1089		1251
1090	# TODO: nicer code && do row_expand	1252	# TODO: nicer code && do row_expand
1091	my @col_expand = @{$self->{col_expand}};	1253	my @col_expand = @{$self->{col_expand}};
1092	@col_expand = (1) x @$ws unless @col_expand;	1254	@col_expand = (1) x @$ws unless @col_expand;
1093	my $col_expand = (sum @col_expand) || 1;	1255	my $col_expand = (sum @col_expand) || 1;
…		…
1147	}	1309	}
1148	}	1310	}
1149		1311
1150	#############################################################################	1312	#############################################################################
1151		1313
1152	package CFClient::UI::HBox;	1314	package CFClient::UI::Box;
1153
1154	# TODO: wrap into common Box base class
1155		1315
1156	our @ISA = CFClient::UI::Container::;	1316	our @ISA = CFClient::UI::Container::;
1157		1317
1158	sub size_request {	1318	sub size_request {
1159	my ($self) = @_;	1319	my ($self) = @_;
1160		1320
1161	my @alloc = map [$_->size_request], @{$self->{children}};	1321	$self->{vertical}
1162		1322	? (
1163	(	1323	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1164	(List::Util::sum map $_->[0], @alloc),	1324	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1165	(List::Util::max map $_->[1], @alloc),	1325	)
1166	)	1326	: (
		1327	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1328	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1329	)
1167	}	1330	}
1168		1331
1169	sub size_allocate {	1332	sub size_allocate {
1170	my ($self, $w, $h) = @_;	1333	my ($self, $w, $h) = @_;
1171		1334
1172	($h, $w) = ($w, $h);	1335	my $space = $self->{vertical} ? $h : $w;
1173
1174	my $children = $self->{children};	1336	my $children = $self->{children};
1175		1337
1176	my @h = map $_->{req_w}, @$children;	1338	my @req;
1177		1339
1178	my $req_h = List::Util::sum @h;	1340	if ($self->{homogeneous}) {
1179		1341	@req = ($space / (@$children || 1)) x @$children;
1180	if ($req_h > $h) {
1181	# ah well, not enough space
1182	$_ *= $h / $req_h for @h;
1183	} else {	1342	} else {
		1343	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1344	my $req = List::Util::sum @req;
		1345
		1346	if ($req > $space) {
		1347	# ah well, not enough space
		1348	$_ *= $space / $req for @req;
		1349	} else {
1184	my $exp = List::Util::sum map $_->{expand}, @$children;	1350	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1185	$exp ||= 1;
1186		1351
		1352	$space = ($space - $req) / $expand; # remaining space to give away
		1353
		1354	$req[$_] += $space * $children->[$_]{expand}
1187	for (0 .. $#$children) {	1355	for 0 .. $#$children;
1188	my $child = $children->[$_];
1189
1190	my $alloc_h = $h[$_];
1191	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1192	$h[$_] = $alloc_h;
1193	}	1356	}
1194	}	1357	}
1195		1358
1196	CFClient::UI::harmonize \@h;	1359	CFClient::UI::harmonize \@req;
1197		1360
1198	my $y = 0;	1361	my $pos = 0;
1199	for (0 .. $#$children) {	1362	for (0 .. $#$children) {
1200	my $child = $children->[$_];
1201	my $h = $h[$_];	1363	my $alloc = $req[$_];
1202	$child->configure ($y, 0, $h, $w);	1364	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1203		1365
1204	$y += $h;	1366	$pos += $alloc;
1205	}	1367	}
1206		1368
1207	1	1369	1
1208	}	1370	}
1209		1371
1210	#############################################################################	1372	#############################################################################
1211		1373
		1374	package CFClient::UI::HBox;
		1375
		1376	our @ISA = CFClient::UI::Box::;
		1377
		1378	sub new {
		1379	my $class = shift;
		1380
		1381	$class->SUPER::new (
		1382	vertical => 0,
		1383	@_,
		1384	)
		1385	}
		1386
		1387	#############################################################################
		1388
1212	package CFClient::UI::VBox;	1389	package CFClient::UI::VBox;
1213		1390
1214	# TODO: wrap into common Box base class
1215
1216	our @ISA = CFClient::UI::Container::;	1391	our @ISA = CFClient::UI::Box::;
1217		1392
1218	sub size_request {	1393	sub new {
1219	my ($self) = @_;	1394	my $class = shift;
1220		1395
1221	my @alloc = map [$_->size_request], @{$self->{children}};	1396	$class->SUPER::new (
1222		1397	vertical => 1,
1223	(	1398	@_,
1224	(List::Util::max map $_->[0], @alloc),
1225	(List::Util::sum map $_->[1], @alloc),
1226	)	1399	)
1227	}	1400	}
1228		1401
1229	sub size_allocate {
1230	my ($self, $w, $h) = @_;
1231
1232	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1233
1234	my $children = $self->{children};
1235
1236	my @h = map $_->{req_h}, @$children;
1237
1238	my $req_h = List::Util::sum @h;
1239
1240	if ($req_h > $h) {
1241	# ah well, not enough space
1242	$_ *= $h / $req_h for @h;
1243	} else {
1244	my $exp = List::Util::sum map $_->{expand}, @$children;
1245	$exp ||= 1;
1246
1247	for (0 .. $#$children) {
1248	my $child = $children->[$_];
1249
1250	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1251	}
1252	}
1253
1254	CFClient::UI::harmonize \@h;
1255
1256	my $y = 0;
1257	for (0 .. $#$children) {
1258	my $child = $children->[$_];
1259	my $h = $h[$_];
1260	$child->configure (0, $y, $w, $h);
1261
1262	$y += $h;
1263	}
1264
1265	1
1266	}
1267
1268	#############################################################################	1402	#############################################################################
1269		1403
1270	package CFClient::UI::Label;	1404	package CFClient::UI::Label;
1271		1405
1272	our @ISA = CFClient::UI::Base::;	1406	our @ISA = CFClient::UI::DrawBG::;
1273		1407
1274	use CFClient::OpenGL;	1408	use CFClient::OpenGL;
1275		1409
1276	sub new {	1410	sub new {
1277	my ($class, %arg) = @_;	1411	my ($class, %arg) = @_;
1278		1412
1279	my $self = $class->SUPER::new (	1413	my $self = $class->SUPER::new (
1280	fg => [1, 1, 1],	1414	fg => [1, 1, 1],
		1415	#bg => none
		1416	#active_bg => none
1281	#font => default_font	1417	#font => default_font
1282	#text => initial text	1418	#text => initial text
1283	#markup => initial narkup	1419	#markup => initial narkup
		1420	#max_w => maximum pixel width
		1421	ellipsise => 3, # end
1284	layout => (new CFClient::Layout),	1422	layout => (new CFClient::Layout),
1285	fontsize => 1,	1423	fontsize => 1,
1286	align => -1,	1424	align => -1,
1287	valign => -1,	1425	valign => -1,
1288	padding => 2,	1426	padding => 2,
…		…
1303	}	1441	}
1304		1442
1305	$self	1443	$self
1306	}	1444	}
1307		1445
1308	sub escape {	1446	sub escape($) {
1309	local $_ = $_[1];	1447	local $_ = $_[0];
1310		1448
1311	s/&/&amp;/g;	1449	s/&/&amp;/g;
1312	s/>/&gt;/g;	1450	s/>/&gt;/g;
1313	s/</&lt;/g;	1451	s/</&lt;/g;
1314		1452
1315	$_[1]	1453	$_
1316	}	1454	}
1317		1455
1318	sub update {	1456	sub update {
1319	my ($self) = @_;	1457	my ($self) = @_;
1320		1458
…		…
1353	sub size_request {	1491	sub size_request {
1354	my ($self) = @_;	1492	my ($self) = @_;
1355		1493
1356	$self->{layout}->set_font ($self->{font}) if $self->{font};	1494	$self->{layout}->set_font ($self->{font}) if $self->{font};
1357	$self->{layout}->set_width ($self->{max_w} || -1);	1495	$self->{layout}->set_width ($self->{max_w} || -1);
		1496	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1497	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1358	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1498	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359		1499
1360	my ($w, $h) = $self->{layout}->size;	1500	my ($w, $h) = $self->{layout}->size;
1361		1501
1362	if (exists $self->{template}) {	1502	if (exists $self->{template}) {
…		…
1392	}	1532	}
1393		1533
1394	sub _draw {	1534	sub _draw {
1395	my ($self) = @_;	1535	my ($self) = @_;
1396		1536
		1537	$self->SUPER::_draw; # draw background, if applicable
		1538
1397	my $tex = $self->{texture} ||= do {	1539	my $tex = $self->{texture} ||= do {
1398	$self->{layout}->set_foreground (@{$self->{fg}});	1540	$self->{layout}->set_foreground (@{$self->{fg}});
1399	$self->{layout}->set_font ($self->{font}) if $self->{font};	1541	$self->{layout}->set_font ($self->{font}) if $self->{font};
1400	$self->{layout}->set_width ($self->{w});	1542	$self->{layout}->set_width ($self->{w});
		1543	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1544	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1401	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1545	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402		1546
1403	my $tex = new_from_layout CFClient::Texture $self->{layout};	1547	my $tex = new_from_layout CFClient::Texture $self->{layout};
1404		1548
1405	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1549	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1406	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1550	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1407	: ($self->{w} - $tex->{w}) * 0.5;	1551	: ($self->{w} - $tex->{w}) * 0.5);
1408		1552
1409	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1553	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1410	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1554	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1411	: ($self->{h} - $tex->{h}) * 0.5;	1555	: ($self->{h} - $tex->{h}) * 0.5);
1412		1556
1413	$tex	1557	$tex
1414	};	1558	};
1415		1559
1416	glEnable GL_TEXTURE_2D;	1560	glEnable GL_TEXTURE_2D;
…		…
1444	active_fg => [0, 0, 0],	1588	active_fg => [0, 0, 0],
1445	can_hover => 1,	1589	can_hover => 1,
1446	can_focus => 1,	1590	can_focus => 1,
1447	valign => 0,	1591	valign => 0,
1448	can_events => 1,	1592	can_events => 1,
		1593	#text => ...
1449	@_	1594	@_
1450	)	1595	)
1451	}	1596	}
1452		1597
1453	sub _set_text {	1598	sub _set_text {
…		…
1463	$self->{text} = $text;	1608	$self->{text} = $text;
1464		1609
1465	$text =~ s/./*/g if $self->{hidden};	1610	$text =~ s/./*/g if $self->{hidden};
1466	$self->{layout}->set_text ("$text ");	1611	$self->{layout}->set_text ("$text ");
1467		1612
1468	$self->emit (changed => $self->{text});	1613	$self->_emit (changed => $self->{text});
1469	}	1614	}
1470		1615
1471	sub set_text {	1616	sub set_text {
1472	my ($self, $text) = @_;	1617	my ($self, $text) = @_;
1473		1618
1474	$self->{cursor} = length $text;	1619	$self->{cursor} = length $text;
1475	$self->_set_text ($text);	1620	$self->_set_text ($text);
		1621	$self->update;
1476	$self->check_size;	1622	$self->check_size;
1477	$self->update;
1478	}	1623	}
1479		1624
1480	sub get_text {	1625	sub get_text {
1481	$_[0]{text}	1626	$_[0]{text}
1482	}	1627	}
…		…
1485	my ($self) = @_;	1630	my ($self) = @_;
1486		1631
1487	my ($w, $h) = $self->SUPER::size_request;	1632	my ($w, $h) = $self->SUPER::size_request;
1488		1633
1489	($w + 1, $h) # add 1 for cursor	1634	($w + 1, $h) # add 1 for cursor
1490	}
1491
1492	sub size_allocate {
1493	my ($self, $w, $h) = @_;
1494
1495	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1496	}	1635	}
1497		1636
1498	sub key_down {	1637	sub key_down {
1499	my ($self, $ev) = @_;	1638	my ($self, $ev) = @_;
1500		1639
…		…
1515	} elsif ($sym == CFClient::SDLK_HOME) {	1654	} elsif ($sym == CFClient::SDLK_HOME) {
1516	$self->{cursor} = 0;	1655	$self->{cursor} = 0;
1517	} elsif ($sym == CFClient::SDLK_END) {	1656	} elsif ($sym == CFClient::SDLK_END) {
1518	$self->{cursor} = length $text;	1657	$self->{cursor} = length $text;
1519	} elsif ($uni == 27) {	1658	} elsif ($uni == 27) {
1520	$self->emit ('escape');	1659	$self->_emit ('escape');
1521	} elsif ($uni) {	1660	} elsif ($uni) {
1522	substr $text, $self->{cursor}++, 0, chr $uni;	1661	substr $text, $self->{cursor}++, 0, chr $uni;
1523	}	1662	}
1524		1663
1525	$self->_set_text ($text);	1664	$self->_set_text ($text);
1526	$self->update;	1665	$self->update;
		1666	$self->check_size;
1527	}	1667	}
1528		1668
1529	sub focus_in {	1669	sub focus_in {
1530	my ($self) = @_;	1670	my ($self) = @_;
1531		1671
…		…
1611	if ($sym == 13) {	1751	if ($sym == 13) {
1612	unshift @{$self->{history}},	1752	unshift @{$self->{history}},
1613	my $txt = $self->get_text;	1753	my $txt = $self->get_text;
1614	$self->{history_pointer} = -1;	1754	$self->{history_pointer} = -1;
1615	$self->{history_saveback} = '';	1755	$self->{history_saveback} = '';
1616	$self->emit (activate => $txt);	1756	$self->_emit (activate => $txt);
1617	$self->update;	1757	$self->update;
1618		1758
1619	} elsif ($sym == CFClient::SDLK_UP) {	1759	} elsif ($sym == CFClient::SDLK_UP) {
1620	if ($self->{history_pointer} < 0) {	1760	if ($self->{history_pointer} < 0) {
1621	$self->{history_saveback} = $self->get_text;	1761	$self->{history_saveback} = $self->get_text;
…		…
1660	my $class = shift;	1800	my $class = shift;
1661		1801
1662	$class->SUPER::new (	1802	$class->SUPER::new (
1663	padding => 4,	1803	padding => 4,
1664	fg => [1, 1, 1],	1804	fg => [1, 1, 1],
1665	bg => [1, 1, 1, 0.2],
1666	active_fg => [0, 0, 1],	1805	active_fg => [0, 0, 1],
1667	can_hover => 1,	1806	can_hover => 1,
1668	align => 0,	1807	align => 0,
1669	valign => 0,	1808	valign => 0,
1670	can_events => 1,	1809	can_events => 1,
1671	@_	1810	@_
1672	)	1811	)
1673	}	1812	}
1674		1813
		1814	sub activate { }
		1815
1675	sub button_up {	1816	sub button_up {
1676	my ($self, $ev, $x, $y) = @_;	1817	my ($self, $ev, $x, $y) = @_;
1677		1818
		1819	$self->emit ("activate")
1678	if ($x >= 0 && $x < $self->{w}	1820	if $x >= 0 && $x < $self->{w}
1679	&& $y >= 0 && $y < $self->{h}) {	1821	&& $y >= 0 && $y < $self->{h};
1680	$self->emit ("activate");
1681	}
1682	}	1822	}
1683		1823
1684	sub _draw {	1824	sub _draw {
1685	my ($self) = @_;	1825	my ($self) = @_;
1686		1826
…		…
1718		1858
1719	$class->SUPER::new (	1859	$class->SUPER::new (
1720	padding => 2,	1860	padding => 2,
1721	fg => [1, 1, 1],	1861	fg => [1, 1, 1],
1722	active_fg => [1, 1, 0],	1862	active_fg => [1, 1, 0],
		1863	bg => [0, 0, 0, 0.2],
		1864	active_bg => [1, 1, 1, 0.5],
1723	state => 0,	1865	state => 0,
1724	can_hover => 1,	1866	can_hover => 1,
1725	@_	1867	@_
1726	)	1868	)
1727	}	1869	}
…		…
1736	my ($self, $ev, $x, $y) = @_;	1878	my ($self, $ev, $x, $y) = @_;
1737		1879
1738	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1880	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1739	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1881	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1740	$self->{state} = !$self->{state};	1882	$self->{state} = !$self->{state};
1741	$self->emit (changed => $self->{state});	1883	$self->_emit (changed => $self->{state});
1742	}	1884	}
1743	}	1885	}
1744		1886
1745	sub _draw {	1887	sub _draw {
1746	my ($self) = @_;	1888	my ($self) = @_;
…		…
2011	qw(s1_slider.png s1_slider_bg.png);	2153	qw(s1_slider.png s1_slider_bg.png);
2012		2154
2013	sub new {	2155	sub new {
2014	my $class = shift;	2156	my $class = shift;
2015		2157
2016	# range [value, low, high, page]	2158	# range [value, low, high, page, unit]
2017		2159
2018	# TODO: 0-width page	2160	# TODO: 0-width page
2019	# TODO: req_w/h are wrong with vertical	2161	# TODO: req_w/h are wrong with vertical
2020	# TODO: calculations are off	2162	# TODO: calculations are off
2021	my $self = $class->SUPER::new (	2163	my $self = $class->SUPER::new (
2022	fg => [1, 1, 1],	2164	fg => [1, 1, 1],
2023	active_fg => [0, 0, 0],	2165	active_fg => [0, 0, 0],
		2166	bg => [0, 0, 0, 0.2],
		2167	active_bg => [1, 1, 1, 0.5],
2024	range => [0, 0, 100, 10],	2168	range => [0, 0, 100, 10, 0],
2025	req_w => $::WIDTH / 80,	2169	req_w => $::WIDTH / 80,
2026	req_h => $::WIDTH / 80,	2170	req_h => $::WIDTH / 80,
2027	vertical => 0,	2171	vertical => 0,
2028	can_hover => 1,	2172	can_hover => 1,
2029	inner_pad => 5,	2173	inner_pad => 0.02,
2030	@_	2174	@_
2031	);	2175	);
2032		2176
		2177	$self->set_value ($self->{range}[0]);
		2178	$self->update;
		2179
2033	$self	2180	$self
		2181	}
		2182
		2183	sub set_range {
		2184	my ($self, $range) = @_;
		2185
		2186	($range, $self->{range}) = ($self->{range}, $range);
		2187
		2188	$self->update
		2189	if "@$range" ne "@{$self->{range}}";
		2190	}
		2191
		2192	sub set_value {
		2193	my ($self, $value) = @_;
		2194
		2195	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2196
		2197	$hi = $lo + 1 if $hi <= $lo;
		2198
		2199	$page = $hi - $lo if $page > $hi - $lo;
		2200
		2201	$value = $lo if $value < $lo;
		2202	$value = $hi - $page if $value > $hi - $page;
		2203
		2204	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2205	if $unit;
		2206
		2207	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2208
		2209	if ($value != $old_value) {
		2210	$self->_emit (changed => $value);
		2211	$self->update;
		2212	}
2034	}	2213	}
2035		2214
2036	sub size_request {	2215	sub size_request {
2037	my ($self) = @_;	2216	my ($self) = @_;
2038		2217
…		…
2044		2223
2045	sub button_down {	2224	sub button_down {
2046	my ($self, $ev, $x, $y) = @_;	2225	my ($self, $ev, $x, $y) = @_;
2047		2226
2048	$self->SUPER::button_down ($ev, $x, $y);	2227	$self->SUPER::button_down ($ev, $x, $y);
		2228
		2229	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2230
2049	$self->mouse_motion ($ev, $x, $y);	2231	$self->mouse_motion ($ev, $x, $y);
2050	}	2232	}
2051		2233
2052	sub mouse_motion {	2234	sub mouse_motion {
2053	my ($self, $ev, $x, $y) = @_;	2235	my ($self, $ev, $x, $y) = @_;
2054		2236
2055	if ($GRAB == $self) {	2237	if ($GRAB == $self) {
		2238	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2239
		2240	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2241
		2242	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2243
		2244	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2245	}
		2246	}
		2247
		2248	sub update {
		2249	my ($self) = @_;
		2250
		2251	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2252	$self->set_value ($self->{range}[0]);
		2253
2056	my ($value, $lo, $hi, $page) = @{$self->{range}};	2254	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2255	my $range = ($hi - $page - $lo) || 1e-100;
2057		2256
2058	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2257	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2059		2258
2060	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2259	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2061	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2260	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2062		2261
2063	$x -= $inner_pad_px; # substract the padding	2262	$value = ($value - $lo) / $range;
2064	$x = $x * ($hi - $lo) / $inner_w + $lo;	2263	$value = $value * $self->{scale} + $self->{offset};
2065	$x = $lo if $x < $lo;
2066	$x = $hi - $page if $x > $hi - $page;
2067	$self->{range}[0] = $x;
2068		2264
2069	$self->emit (changed => $x);	2265	$self->{knob_x} = $value - $knob_w * 0.5;
2070	$self->update;	2266	$self->{knob_w} = $knob_w;
2071	}	2267	});
2072	}
2073		2268
2074	# the inner_* stuff is for generating a padding for the slider handle,	2269	$self->SUPER::update;
2075	# so that the handle doesn't leave the texture. This calculation isn't 100%
2076	# correct propably, but it does the job for now
2077	sub _calc_inner_pad_px {
2078	my ($self, $w) = @_;
2079	($w / 100) * $self->{inner_pad} # % to pixels
2080	}	2270	}
2081		2271
2082	sub _draw {	2272	sub _draw {
2083	my ($self) = @_;	2273	my ($self) = @_;
2084		2274
2085	$self->SUPER::_draw ();	2275	$self->SUPER::_draw ();
2086		2276
2087	my ($w, $h) = @$self{qw(w h)};	2277	glScale $self->{w}, $self->{h};
2088		2278
2089	if ($self->{vertical}) {	2279	if ($self->{vertical}) {
2090	# draw a vertical slider like a rotated horizontal slider	2280	# draw a vertical slider like a rotated horizontal slider
2091		2281
		2282	glTranslate 1, 0, 0;
2092	glRotate 90, 0, 0, 1;	2283	glRotate 90, 0, 0, 1;
2093	glTranslate 0, -$self->{w}, 0;
2094
2095	($w, $h) = ($h, $w);
2096	}	2284	}
2097		2285
2098	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2286	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2287	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100		2288
2101	my ($value, $lo, $hi, $page) = @{$self->{range}};
2102
2103	$hi = $value + 1 if $lo == $hi;
2104
2105	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2106	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2107
2108	$page = int $page * $inner_w / ($hi - $lo);
2109	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2110
2111	$w -= $page;
2112	$page &= ~1;
2113	glTranslate $page * 0.5, 0, 0;
2114	$page ||= 2;
2115
2116	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2117	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2118
2119	glEnable GL_TEXTURE_2D;	2289	glEnable GL_TEXTURE_2D;
2120	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2290	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121		2291
2122	# draw background	2292	# draw background
2123	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2293	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124		2294
2125	# draw handle	2295	# draw handle
2126	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2296	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127		2297
2128	glDisable GL_TEXTURE_2D;	2298	glDisable GL_TEXTURE_2D;
2129	}	2299	}
		2300
		2301	#############################################################################
		2302
		2303	package CFClient::UI::ValSlider;
		2304
		2305	our @ISA = CFClient::UI::HBox::;
		2306
		2307	sub new {
		2308	my ($class, %arg) = @_;
		2309
		2310	my $range = delete $arg{range};
		2311
		2312	my $self = $class->SUPER::new (
		2313	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2314	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2315	to_value => sub { shift },
		2316	from_value => sub { shift },
		2317	%arg,
		2318	);
		2319
		2320	$self->{slider}->connect (changed => sub {
		2321	my ($self, $value) = @_;
		2322	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2323	$self->{parent}->emit (changed => $value);
		2324	});
		2325
		2326	# $self->{entry}->connect (changed => sub {
		2327	# my ($self, $value) = @_;
		2328	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2329	# $self->{parent}->emit (changed => $value);
		2330	# });
		2331
		2332	$self->add ($self->{slider}, $self->{entry});
		2333
		2334	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2335
		2336	$self
		2337	}
		2338
		2339	sub set_range { shift->{slider}->set_range (@_) }
		2340	sub set_value { shift->{slider}->set_value (@_) }
2130		2341
2131	#############################################################################	2342	#############################################################################
2132		2343
2133	package CFClient::UI::TextView;	2344	package CFClient::UI::TextView;
2134		2345
…		…
2164		2375
2165	$self->{fontsize} = $fontsize;	2376	$self->{fontsize} = $fontsize;
2166	$self->reflow;	2377	$self->reflow;
2167	}	2378	}
2168		2379
2169	sub text_height {
2170	my ($self, $text) = @_;
2171
2172	my $layout = $self->{layout};
2173
2174	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2175	$layout->set_width ($self->{children}[0]{w});
2176	$layout->set_markup ($text);
2177
2178	($layout->size)[1]
2179	}
2180
2181	sub reflow {
2182	my ($self) = @_;
2183
2184	$self->{need_reflow}++;
2185	$self->update;
2186	}
2187
2188	sub size_allocate {	2380	sub size_allocate {
2189	my ($self, $w, $h) = @_;	2381	my ($self, $w, $h) = @_;
2190		2382
2191	$self->SUPER::size_allocate ($w, $h);	2383	$self->SUPER::size_allocate ($w, $h);
2192		2384
…		…
2195	$self->{layout}->set_width ($self->{children}[0]{w});	2387	$self->{layout}->set_width ($self->{children}[0]{w});
2196		2388
2197	$self->reflow;	2389	$self->reflow;
2198	}	2390	}
2199		2391
		2392	sub text_size {
		2393	my ($self, $text, $indent) = @_;
		2394
		2395	my $layout = $self->{layout};
		2396
		2397	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2398	$layout->set_width ($self->{children}[0]{w} - $indent);
		2399	$layout->set_markup ($text);
		2400
		2401	$layout->size
		2402	}
		2403
		2404	sub reflow {
		2405	my ($self) = @_;
		2406
		2407	$self->{need_reflow}++;
		2408	$self->update;
		2409	}
		2410
		2411	sub set_offset {
		2412	my ($self, $offset) = @_;
		2413
		2414	# todo: base offset on lines or so, not on pixels
		2415	$self->{children}[1]->set_value ($offset);
		2416	}
		2417
		2418	sub clear {
		2419	my ($self) = @_;
		2420
		2421	$self->{par} = [];
		2422	$self->{height} = 0;
		2423	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2424	}
		2425
2200	sub add_paragraph {	2426	sub add_paragraph {
2201	my ($self, $color, $text) = @_;	2427	my ($self, $color, $text, $indent) = @_;
2202		2428
2203	#TODO: intelligently "reformat" paragraph	2429	for my $line (split /\n/, $text) {
2204		2430	my ($w, $h) = $self->text_size ($line);
2205	my $height = $self->text_height ($text);
2206
2207	$self->{height} += $height;	2431	$self->{height} += $h;
		2432	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2433	}
2208		2434
2209	push @{$self->{par}}, [$height, $color, $text];
2210
2211	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2435	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2212	$self->{children}[1]->update;
2213	}	2436	}
2214		2437
2215	sub update {	2438	sub update {
2216	my ($self) = @_;	2439	my ($self) = @_;
2217		2440
…		…
2220	return unless $self->{h} > 0;	2443	return unless $self->{h} > 0;
2221		2444
2222	delete $self->{texture};	2445	delete $self->{texture};
2223		2446
2224	$ROOT->on_post_alloc ($self, sub {	2447	$ROOT->on_post_alloc ($self, sub {
		2448	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2449
2225	if (delete $self->{need_reflow}) {	2450	if (delete $self->{need_reflow}) {
2226	my $height = 0;	2451	my $height = 0;
2227		2452
2228	$height += $_->[0] = $self->text_height ($_->[2])	2453	my $layout = $self->{layout};
		2454
		2455	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2456
2229	for @{$self->{par}};	2457	for (@{$self->{par}}) {
		2458	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2459	$layout->set_width ($W - $_->[3]);
		2460	$layout->set_markup ($_->[4]);
		2461	my ($w, $h) = $layout->size;
		2462	$_->[0] = $w + $_->[3];
		2463	$_->[1] = $h;
		2464	}
		2465
		2466	$height += $_->[1];
		2467	}
2230		2468
2231	$self->{height} = $height;	2469	$self->{height} = $height;
2232		2470
2233	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2471	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2234		2472
2235	delete $self->{texture};	2473	delete $self->{texture};
2236	}	2474	}
2237		2475
2238	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2476	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2239	glClearColor 0, 0, 0, 0;	2477	glClearColor 0.5, 0.5, 0.5, 0;
2240	glClear GL_COLOR_BUFFER_BIT;	2478	glClear GL_COLOR_BUFFER_BIT;
2241		2479
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];	2480	my $top = int $self->{children}[1]{range}[0];
2246		2481
2247	my $y0 = $top;	2482	my $y0 = $top;
2248	my $y1 = $top + $self->{h};	2483	my $y1 = $top + $H;
2249		2484
2250	my $y = 0;	2485	my $y = 0;
2251		2486
2252	my $layout = $self->{layout};	2487	my $layout = $self->{layout};
2253		2488
2254	$layout->set_font ($self->{font}) if $self->{font};	2489	$layout->set_font ($self->{font}) if $self->{font};
2255		2490
		2491	glEnable GL_BLEND;
		2492	#TODO# not correct in windows where rgba is forced off
		2493	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2494
2256	for my $par (@{$self->{par}}) {	2495	for my $par (@{$self->{par}}) {
2257	my $h = $par->[0];	2496	my $h = $par->[1];
2258		2497
2259	if ($y0 < $y + $h && $y < $y1) {	2498	if ($y0 < $y + $h && $y < $y1) {
2260	$layout->set_foreground (@{ $par->[1] });	2499	$layout->set_foreground (@{ $par->[2] });
		2500	$layout->set_width ($W - $par->[3]);
2261	$layout->set_markup ($par->[2]);	2501	$layout->set_markup ($par->[4]);
2262		2502
2263	my ($W, $H) = $layout->size;	2503	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2504
		2505	glRasterPos $par->[3], $y - $y0;
		2506	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265	}	2507	}
2266		2508
2267	$y += $h;	2509	$y += $h;
2268	}	2510	}
2269		2511
2270	glDisable GL_TEXTURE_2D;	2512	glDisable GL_BLEND;
2271	};	2513	};
2272	});	2514	});
2273	}	2515	}
2274		2516
2275	sub _draw {	2517	sub _draw {
2276	my ($self) = @_;	2518	my ($self) = @_;
2277		2519
2278	glEnable GL_TEXTURE_2D;	2520	glEnable GL_TEXTURE_2D;
2279	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2521	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280	glColor 1, 1, 1, 1;	2522	glColor 1, 1, 1, 1;
2281	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2523	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2282	glDisable GL_TEXTURE_2D;	2524	glDisable GL_TEXTURE_2D;
2283		2525
2284	$self->{children}[1]->draw;	2526	$self->{children}[1]->draw;
2285		2527
2286	}	2528	}
…		…
2335		2577
2336	sub new {	2578	sub new {
2337	my $class = shift;	2579	my $class = shift;
2338		2580
2339	my $self = $class->SUPER::new (	2581	my $self = $class->SUPER::new (
2340	state => 0,	2582	state => 0,
2341	connect_activate => \&toggle_flopper,	2583	on_activate => \&toggle_flopper,
2342	@_	2584	@_
2343	);	2585	);
2344		2586
2345	if ($self->{state}) {
2346	$self->{state} = 0;
2347	$self->toggle_flopper;
2348	}
2349
2350	$self	2587	$self
2351	}	2588	}
2352		2589
2353	sub toggle_flopper {	2590	sub toggle_flopper {
2354	my ($self) = @_;	2591	my ($self) = @_;
2355		2592
2356	# TODO: use animation	2593	$self->{other}->toggle_visibility;
2357	if ($self->{state} = !$self->{state}) {
2358	$CFClient::UI::ROOT->add ($self->{other});
2359	$self->{other}->move ($self->coord2global (0, $self->{h}));
2360	$self->emit ("open");
2361	} else {
2362	$CFClient::UI::ROOT->remove ($self->{other});
2363	$self->emit ("close");
2364	}
2365
2366	$self->emit (changed => $self->{state});
2367	}	2594	}
2368		2595
2369	#############################################################################	2596	#############################################################################
2370		2597
2371	package CFClient::UI::Tooltip;	2598	package CFClient::UI::Tooltip;
…		…
2385		2612
2386	sub set_tooltip_from {	2613	sub set_tooltip_from {
2387	my ($self, $widget) = @_;	2614	my ($self, $widget) = @_;
2388		2615
2389	$self->add (new CFClient::UI::Label	2616	$self->add (new CFClient::UI::Label
2390	markup => $widget->{tooltip},	2617	markup => $widget->{tooltip},
2391	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2618	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392	fontsize => 0.8,	2619	fontsize => 0.8,
2393	fg => [0, 0, 0, 1],	2620	fg => [0, 0, 0, 1],
		2621	ellipsise => 0,
2394	font => ($widget->{tooltip_font} || $::FONT_PROP),	2622	font => ($widget->{tooltip_font} || $::FONT_PROP),
2395	);	2623	);
2396	}	2624	}
2397		2625
2398	sub size_request {	2626	sub size_request {
2399	my ($self) = @_;	2627	my ($self) = @_;
…		…
2445	use CFClient::OpenGL;	2673	use CFClient::OpenGL;
2446		2674
2447	sub new {	2675	sub new {
2448	my $class = shift;	2676	my $class = shift;
2449		2677
2450	$class->SUPER::new (	2678	my $self = $class->SUPER::new (
2451	aspect => 1,	2679	aspect => 1,
		2680	can_events => 0,
2452	@_,	2681	@_,
2453	)	2682	);
		2683
		2684	if ($self->{anim} && $self->{animspeed}) {
		2685	Scalar::Util::weaken (my $widget = $self);
		2686
		2687	$self->{timer} = Event->timer (
		2688	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2689	hard => 1,
		2690	interval => $self->{animspeed},
		2691	cb => sub {
		2692	++$widget->{frame};
		2693	$widget->update;
		2694	},
		2695	);
		2696	}
		2697
		2698	$self
2454	}	2699	}
2455		2700
2456	sub size_request {	2701	sub size_request {
2457	(32, 8)	2702	(32, 8)
2458	}	2703	}
2459		2704
		2705	sub update {
		2706	my ($self) = @_;
		2707
		2708	return unless $self->{visible};
		2709
		2710	$self->SUPER::update;
		2711	}
		2712
2460	sub _draw {	2713	sub _draw {
2461	my ($self) = @_;	2714	my ($self) = @_;
2462		2715
2463	return unless $::CONN;#d# manage and cache textures differently	2716	return unless $::CONN;
		2717
		2718	my $face;
		2719
		2720	if ($self->{frame}) {
		2721	my $anim = $::CONN->{anim}[$self->{anim}];
		2722
		2723	$face = $anim->[ $self->{frame} % @$anim ]
		2724	if $anim && @$anim;
		2725	}
		2726
2464	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2727	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2465		2728
2466	# TODO animation
2467	if ($tex) {	2729	if ($tex) {
2468	glEnable GL_TEXTURE_2D;	2730	glEnable GL_TEXTURE_2D;
2469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2731	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470	glColor 1, 1, 1, 1;	2732	glColor 1, 1, 1, 1;
2471	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2733	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472	glDisable GL_TEXTURE_2D;	2734	glDisable GL_TEXTURE_2D;
2473	}	2735	}
2474	}	2736	}
2475		2737
2476	#############################################################################	2738	sub DESTROY {
		2739	my ($self) = @_;
2477		2740
		2741	$self->{timer}->cancel
		2742	if $self->{timer};
		2743
		2744	$self->SUPER::DESTROY;
		2745	}
		2746
		2747	#############################################################################
		2748
2478	package CFClient::UI::InventoryItem;	2749	package CFClient::UI::Inventory;
2479		2750
2480	our @ISA = CFClient::UI::HBox::;	2751	our @ISA = CFClient::UI::ScrolledWindow::;
2481		2752
2482	sub new {	2753	sub new {
2483	my $class = shift;	2754	my $class = shift;
2484		2755
2485	my %args = @_;
2486
2487	my $item = delete $args{item};
2488
2489	my $desc = $item->{nrof} < 2
2490	? $item->{name}
2491	: "$item->{nrof} $item->{name_pl}";
2492
2493
2494	my $self = $class->SUPER::new (	2756	my $self = $class->SUPER::new (
2495	can_hover => 1,	2757	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2496	can_events => 1,
2497	tooltip => (CFClient::UI::Label->escape ($desc)
2498	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2499	connect_button_down => sub {
2500	my ($self, $ev, $x, $y) = @_;
2501
2502	# todo: maybe put examine on 1? but should just be a tooltip :(
2503	if ($ev->{button} == 1) {
2504	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2505	} elsif ($ev->{button} == 2) {
2506	$::CONN->send ("apply $item->{tag}");
2507	} elsif ($ev->{button} == 3) {
2508	CFClient::UI::Menu->new (
2509	items => [
2510	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2511	[
2512	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2513	sub { $::CONN->send ("lock $item->{tag}") },
2514	],
2515	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2516	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2517	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2518	],
2519	)->popup ($ev);
2520	}
2521
2522	1
2523	},
2524	%args
2525	);
2526
2527	$self->add (new CFClient::UI::Face
2528	can_events => 0,
2529	face => $item->{face},
2530	anim => $item->{anim},
2531	animspeed => $item->{animspeed},
2532	);
2533
2534	$self->add (new CFClient::UI::Label
2535	can_events => 0,
2536	text => $desc,
2537	);
2538
2539	$self
2540	}
2541
2542	#############################################################################
2543
2544	package CFClient::UI::Inventory;
2545
2546	our @ISA = CFClient::UI::ScrolledWindow::;
2547
2548	sub new {
2549	my $class = shift;
2550
2551	my $self = $class->SUPER::new (
2552	scrolled => (new CFClient::UI::VBox),
2553	@_,	2758	@_,
2554	);	2759	);
2555		2760
2556	$self	2761	$self
2557	}	2762	}
…		…
2567	or ($a->{name} cmp $b->{name})	2772	or ($a->{name} cmp $b->{name})
2568	} @$items;	2773	} @$items;
2569		2774
2570	$self->{real_items} = \@items;	2775	$self->{real_items} = \@items;
2571		2776
		2777	my $row = 0;
2572	for my $item (@items) {	2778	for my $item (@items) {
2573	my $desc = $item->{nrof} < 2	2779	CFClient::Item::update_widgets $item;
2574	? $item->{name}
2575	: "$item->{nrof} $item->{name_pl}";
2576		2780
2577	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2781	$self->{scrolled}->add (0, $row, $item->{face_widget});
2578	}	2782	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2783	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2579		2784
2580	$self->{scrolled}->add (@items);	2785	$row++;
2581		2786	}
2582	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583	}
2584
2585	sub size_request {
2586	my ($self) = @_;
2587	($self->{req_w}, $self->{req_h});
2588	}	2787	}
2589		2788
2590	#############################################################################	2789	#############################################################################
2591		2790
2592	package CFClient::UI::Menu;	2791	package CFClient::UI::Menu;
…		…
2627		2826
2628	# popup given the event (must be a mouse button down event currently)	2827	# popup given the event (must be a mouse button down event currently)
2629	sub popup {	2828	sub popup {
2630	my ($self, $ev) = @_;	2829	my ($self, $ev) = @_;
2631		2830
2632	$self->emit ("popdown");	2831	$self->_emit ("popdown");
2633		2832
2634	# maybe save $GRAB? must be careful about events...	2833	# maybe save $GRAB? must be careful about events...
2635	$GRAB = $self;	2834	$GRAB = $self;
2636	$self->{button} = $ev->{button};	2835	$self->{button} = $ev->{button};
2637		2836
…		…
2652		2851
2653	if ($ev->{button} == $self->{button}) {	2852	if ($ev->{button} == $self->{button}) {
2654	undef $GRAB;	2853	undef $GRAB;
2655	$self->hide;	2854	$self->hide;
2656		2855
2657	$self->emit ("popdown");	2856	$self->_emit ("popdown");
2658	$self->{hover}[1]->() if $self->{hover};	2857	$self->{hover}[1]->() if $self->{hover};
2659	}	2858	}
2660	}	2859	}
2661		2860
2662	#############################################################################	2861	#############################################################################
2663		2862
2664	package CFClient::UI::Statusbox;	2863	package CFClient::UI::Statusbox;
2665		2864
2666	our @ISA = CFClient::UI::VBox::;	2865	our @ISA = CFClient::UI::VBox::;
		2866
		2867	sub new {
		2868	my $class = shift;
		2869
		2870	$class->SUPER::new (
		2871	fontsize => 0.8,
		2872	@_,
		2873	)
		2874	}
2667		2875
2668	sub reorder {	2876	sub reorder {
2669	my ($self) = @_;	2877	my ($self) = @_;
2670	my $NOW = time;	2878	my $NOW = time;
2671		2879
…		…
2690	? "<b>$item->{count} ×</b> $item->{text}"	2898	? "<b>$item->{count} ×</b> $item->{text}"
2691	: $item->{text};	2899	: $item->{text};
2692		2900
2693	for ($short) {	2901	for ($short) {
2694	s/^\s+//;	2902	s/^\s+//;
2695	s/\012.*/…/s;	2903	s/\s+/ /g;
2696	my $len = int 40 / $item->{fontsize};
2697	substr $_, $len, length, "…" if $len < length;
2698	}	2904	}
2699		2905
2700	new CFClient::UI::Label	2906	new CFClient::UI::Label
2701	markup => $short,	2907	markup => $short,
2702	tooltip => $item->{tooltip},	2908	tooltip => $item->{tooltip},
2703	tooltip_font => $::FONT_PROP,	2909	tooltip_font => $::FONT_PROP,
2704	tooltip_width => 0.67,	2910	tooltip_width => 0.67,
2705	fontsize => $item->{fontsize},	2911	fontsize => $item->{fontsize} || $self->{fontsize},
		2912	max_w => $::WIDTH * 0.44,
2706	color => $item->{color},	2913	fg => $item->{fg},
2707	can_events => 1,	2914	can_events => 1,
2708	can_hover => 1	2915	can_hover => 1
2709	};	2916	};
2710	}	2917	}
2711		2918
…		…
2716	sub add {	2923	sub add {
2717	my ($self, $text, %arg) = @_;	2924	my ($self, $text, %arg) = @_;
2718		2925
2719	$text =~ s/^\s+//;	2926	$text =~ s/^\s+//;
2720	$text =~ s/\s+$//;	2927	$text =~ s/\s+$//;
		2928
		2929	return unless $text;
2721		2930
2722	my $timeout = time + ((delete $arg{timeout}) || 60);	2931	my $timeout = time + ((delete $arg{timeout}) || 60);
2723		2932
2724	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2933	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725		2934
…		…
2737	$self->{item}{$group} = {	2946	$self->{item}{$group} = {
2738	id => ++$self->{id},	2947	id => ++$self->{id},
2739	text => $text,	2948	text => $text,
2740	timeout => $timeout,	2949	timeout => $timeout,
2741	tooltip => $text,	2950	tooltip => $text,
2742	fontsize => 0.8,
2743	color => [0.8, 0.8, 0.8, 0.8],	2951	fg => [0.8, 0.8, 0.8, 0.8],
2744	pri => 0,	2952	pri => 0,
2745	count => 1,	2953	count => 1,
2746	%arg,	2954	%arg,
2747	};	2955	};
2748	}	2956	}
2749		2957
2750	$self->reorder;	2958	$self->reorder;
2751	}	2959	}
2752		2960
		2961	sub reconfigure {
		2962	my ($self) = @_;
		2963
		2964	delete $_->{label}
		2965	for values %{ $self->{item} || {} };
		2966
		2967	$self->reorder;
		2968	$self->SUPER::reconfigure;
		2969	}
		2970
2753	#############################################################################	2971	#############################################################################
2754		2972
2755	package CFClient::UI::Root;	2973	package CFClient::UI::Root;
2756		2974
2757	our @ISA = CFClient::UI::Container::;	2975	our @ISA = CFClient::UI::Container::;
…		…
2760		2978
2761	sub new {	2979	sub new {
2762	my $class = shift;	2980	my $class = shift;
2763		2981
2764	$class->SUPER::new (	2982	$class->SUPER::new (
		2983	visible => 1,
2765	@_,	2984	@_,
2766	)	2985	)
2767	}	2986	}
2768		2987
2769	sub configure {	2988	sub configure {
…		…
2787	}	3006	}
2788		3007
2789	sub size_allocate {	3008	sub size_allocate {
2790	my ($self, $w, $h) = @_;	3009	my ($self, $w, $h) = @_;
2791		3010
2792	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2793	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2794
2795	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2796	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2797
2798	for my $child ($self->children) {	3011	for my $child ($self->children) {
2799	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3012	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2800		3013
		3014	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3015	if exists $child->{req_x};
		3016
		3017	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3018	if exists $child->{req_y};
		3019
		3020	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
		3021
2801	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3022	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2802	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3023	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3024
2803	$child->configure ($X, $Y, $W, $H);	3025	$child->configure ($X, $Y, $W, $H);
2804	}	3026	}
2805	}	3027	}
2806		3028
2807	sub coord2local {	3029	sub coord2local {
…		…
2825		3047
2826	sub add {	3048	sub add {
2827	my ($self, @children) = @_;	3049	my ($self, @children) = @_;
2828		3050
2829	for my $child (@children) {	3051	for my $child (@children) {
2830	$child->{toplevel} = 1;	3052	$child->{is_toplevel} = 1;
2831		3053
2832	# integerise window positions	3054	# integerise window positions
2833	$child->{x} = int $child->{x};	3055	$child->{x} = int $child->{x};
2834	$child->{y} = int $child->{y};	3056	$child->{y} = int $child->{y};
2835	}	3057	}
2836		3058
2837	$self->SUPER::add (@children);	3059	$self->SUPER::add (@children);
		3060
		3061	for (my @widgets = @children; my $w = pop @widgets; ) {
		3062	push @widgets, $w->children;
		3063	$w->set_visible;
		3064	}
		3065
		3066	}
		3067
		3068	sub remove {
		3069	my ($self, @children) = @_;
		3070
		3071	$self->SUPER::remove (@children);
		3072
		3073	while (@children) {
		3074	my $w = pop @children;
		3075	push @children, $w->children;
		3076	$w->set_invisible;
		3077	}
2838	}	3078	}
2839		3079
2840	sub on_refresh {	3080	sub on_refresh {
2841	my ($self, $id, $cb) = @_;	3081	my ($self, $id, $cb) = @_;
2842		3082
…		…
2856	$_->()	3096	$_->()
2857	for values %{delete $self->{refresh_hook}};	3097	for values %{delete $self->{refresh_hook}};
2858	}	3098	}
2859		3099
2860	if ($self->{check_size}) {	3100	if ($self->{check_size}) {
2861	my @queue = ([], []);	3101	my @queue;
2862		3102
2863	for (;;) {	3103	while () {
2864	if ($self->{check_size}) {	3104	if ($self->{check_size}) {
2865	# heuristic: check containers last	3105	#TODO use array-of-depth approach
2866	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3106
		3107	@queue = sort { $a->{visible} <=> $b->{visible} }
2867	for values %{delete $self->{check_size}}	3108	@queue, values %{delete $self->{check_size}};
2868	}	3109	}
2869		3110
2870	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3111	my $widget = pop @queue || last;
2871		3112
		3113	defined $widget->{visible} or last; # do not resize invisible widgets
		3114
2872	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3115	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2873	? @$widget{qw(user_w user_h)}	3116	? @$widget{qw(def_w def_h)}
2874	: $widget->size_request;	3117	: $widget->size_request;
2875		3118
2876	if (delete $widget->{force_alloc}	3119	if (delete $widget->{force_alloc}
2877	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3120	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2878	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3121	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
…		…
2886	if $widget->{parent};	3129	if $widget->{parent};
2887	}	3130	}
2888	}	3131	}
2889	}	3132	}
2890		3133
2891	while ($self->{size_alloc}) {	3134	while (my $size_alloc = delete $self->{size_alloc}) {
2892	for (values %{delete $self->{size_alloc}}) {	3135	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
2893	my ($widget, $w, $h) = @$_;	3136	values %$size_alloc;
		3137
		3138	while () {
		3139	my ($widget, $w, $h) = @{ pop @queue or last };
2894		3140
2895	$w = 0 if $w < 0;	3141	$w = 0 if $w < 0;
2896	$h = 0 if $h < 0;	3142	$h = 0 if $h < 0;
2897		3143
2898	$widget->{w} = $w;	3144	$widget->{w} = $w;
2899	$widget->{h} = $h;	3145	$widget->{h} = $h;
2900	$widget->size_allocate ($w, $h);
2901	$widget->emit (size_allocate => $w, $h);	3146	$widget->emit (size_allocate => $w, $h);
2902	}	3147	}
2903	}	3148	}
2904		3149
2905	while ($self->{post_alloc_hook}) {	3150	while ($self->{post_alloc_hook}) {
…		…
2911	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3156	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912	glClear GL_COLOR_BUFFER_BIT;	3157	glClear GL_COLOR_BUFFER_BIT;
2913		3158
2914	glMatrixMode GL_PROJECTION;	3159	glMatrixMode GL_PROJECTION;
2915	glLoadIdentity;	3160	glLoadIdentity;
2916	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3161	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917	glMatrixMode GL_MODELVIEW;	3162	glMatrixMode GL_MODELVIEW;
2918	glLoadIdentity;	3163	glLoadIdentity;
2919		3164
2920	$self->_draw;	3165	$self->_draw;
2921	}	3166	}
…		…
2923	#############################################################################	3168	#############################################################################
2924		3169
2925	package CFClient::UI;	3170	package CFClient::UI;
2926		3171
2927	$ROOT = new CFClient::UI::Root;	3172	$ROOT = new CFClient::UI::Root;
2928	$TOOLTIP = new CFClient::UI::Tooltip;	3173	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929		3174
2930	1	3175	1
2931		3176

Diff Legend

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