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.184 by root, Wed May 3 19:56:05 2006 UTC vs.
Revision 1.254 by root, Mon May 29 01:53:23 2006 UTC

1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
8	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
9		11
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		13
		14	our $LAYOUT;
12	our $ROOT;	15	our $ROOT;
13	our $TOOLTIP;	16	our $TOOLTIP;
14	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	}
15		38
16	sub check_tooltip {	39	sub check_tooltip {
17	if (!$GRAB) {	40	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
20		43
21	if ($TOOLTIP->{owner} != $widget) {	44	if ($TOOLTIP->{owner} != $widget) {
		45	$TOOLTIP->hide;
		46
22	$TOOLTIP->{owner} = $widget;	47	$TOOLTIP->{owner} = $widget;
23		48
24	my $tip = $widget->{tooltip};	49	my $tip = $widget->{tooltip};
25		50
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	51	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		52
28	$TOOLTIP->set_markup ($widget->{tooltip});	53	$TOOLTIP->set_tooltip_from ($widget);
29
30	$TOOLTIP->show;	54	$TOOLTIP->show;
31
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36	}
37
38	$TOOLTIP->move ($x, $y);
39	}	55	}
40		56
41	return;	57	return;
42	}	58	}
43	}	59	}
…		…
47	delete $TOOLTIP->{owner};	63	delete $TOOLTIP->{owner};
48	}	64	}
49		65
50	# class methods for events	66	# class methods for events
51	sub feed_sdl_key_down_event {	67	sub feed_sdl_key_down_event {
52	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	68	$FOCUS->emit (key_down => $_[0])
53	if $FOCUS;	69	if $FOCUS;
54	}	70	}
55		71
56	sub feed_sdl_key_up_event {	72	sub feed_sdl_key_up_event {
57	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	73	$FOCUS->emit (key_up => $_[0])
58	if $FOCUS;	74	if $FOCUS;
59	}	75	}
60		76
61	sub feed_sdl_button_down_event {	77	sub feed_sdl_button_down_event {
62	my ($ev) = @_;	78	my ($ev) = @_;
…		…
71	check_tooltip;	87	check_tooltip;
72	}	88	}
73		89
74	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	90	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
75		91
76	if ($GRAB) {	92	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77	($x, $y) = $GRAB->coord2local ($x, $y);	93	if $GRAB;
78	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79	}
80	}	94	}
81		95
82	sub feed_sdl_button_up_event {	96	sub feed_sdl_button_up_event {
83	my ($ev) = @_;	97	my ($ev) = @_;
84	my ($x, $y) = ($ev->{x}, $ev->{y});	98	my ($x, $y) = ($ev->{x}, $ev->{y});
85		99
86	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	100	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87		101
88	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	102	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89		103
90	if ($GRAB) {	104	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91	($x, $y) = $GRAB->coord2local ($x, $y);	105	if $GRAB;
92	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93	}
94		106
95	if (!$BUTTON_STATE) {	107	if (!$BUTTON_STATE) {
96	my $grab = $GRAB; undef $GRAB;	108	my $grab = $GRAB; undef $GRAB;
97	$grab->update if $grab;	109	$grab->update if $grab;
98	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
…		…
114	$HOVER->update if $HOVER && $HOVER->{can_hover};	126	$HOVER->update if $HOVER && $HOVER->{can_hover};
115		127
116	check_tooltip;	128	check_tooltip;
117	}	129	}
118		130
119	if ($HOVER) {
120	($x, $y) = $HOVER->coord2local ($x, $y);
121	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	131	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122	}	132	if $HOVER;
123	}	133	}
124		134
125	# convert position array to integers	135	# convert position array to integers
126	sub harmonize {	136	sub harmonize {
127	my ($vals) = @_;	137	my ($vals) = @_;
…		…
131	for (@$vals) {	141	for (@$vals) {
132	my $i = int $_ + $rem;	142	my $i = int $_ + $rem;
133	$rem += $_ - $i;	143	$rem += $_ - $i;
134	$_ = $i;	144	$_ = $i;
135	}	145	}
		146	}
		147
		148	sub full_refresh {
		149	# make a copy, otherwise for complains about freed values.
		150	my @widgets = values %WIDGET;
		151
		152	$_->update
		153	for @widgets;
		154	}
		155
		156	sub reconfigure_widgets {
		157	# make a copy, otherwise C<for> complains about freed values.
		158	my @widgets = values %WIDGET;
		159
		160	$_->reconfigure
		161	for @widgets;
		162	}
		163
		164	# call when resolution changes etc.
		165	sub rescale_widgets {
		166	my ($sx, $sy) = @_;
		167
		168	for my $widget (values %WIDGET) {
		169	if ($widget->{is_toplevel}) {
		170	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		171	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		172	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		173	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		174	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		175	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		176	}
		177	}
		178
		179	reconfigure_widgets;
136	}	180	}
137		181
138	#############################################################################	182	#############################################################################
139		183
140	package CFClient::UI::Base;	184	package CFClient::UI::Base;
…		…
153	can_events => 1,	197	can_events => 1,
154	@_	198	@_
155	}, $class;	199	}, $class;
156		200
157	for (keys %$self) {	201	for (keys %$self) {
158	if (/^connect_(.*)$/) {	202	if (/^on_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	203	$self->connect ($1 => delete $self->{$_});
160	}	204	}
161	}	205	}
162		206
		207	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		208
		209	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		210	$self->{req_x} = $layout->{x} * $::WIDTH;
		211	$self->{req_y} = $layout->{y} * $::HEIGHT;
		212	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		213	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		214	}
		215
163	$self	216	$self
164	}	217	}
165		218
166	sub destroy {	219	sub destroy {
167	my ($self) = @_;	220	my ($self) = @_;
…		…
176	return if $self->{parent};	229	return if $self->{parent};
177		230
178	$CFClient::UI::ROOT->add ($self);	231	$CFClient::UI::ROOT->add ($self);
179	}	232	}
180		233
181	sub hide {	234	sub center {
182	my ($self) = @_;	235	my ($self) = @_;
		236
		237	$CFClient::UI::ROOT->on_post_alloc (
		238	"center_$self" => sub {
		239	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
		240	},
		241	);
		242
		243	$self->update;
		244	}
		245
		246	sub set_visible {
		247	my ($self) = @_;
		248
		249	return if $self->{visible};
		250
		251	$self->{root} = $self->{parent}{root};
		252	$self->{visible} = $self->{parent}{visible} + 1;
		253
		254	$self->emit (visibility_change => 1);
		255
		256	$self->realloc if !exists $self->{req_w};
		257
		258	$_->set_visible for $self->children;
		259	}
		260
		261	sub set_invisible {
		262	my ($self) = @_;
		263
		264	return unless $self->{visible};
		265
		266	$_->set_invisible for $self->children;
		267
		268	delete $self->{root};
		269	delete $self->{visible};
183		270
184	undef $GRAB if $GRAB == $self;	271	undef $GRAB if $GRAB == $self;
185	undef $HOVER if $HOVER == $self;	272	undef $HOVER if $HOVER == $self;
		273
		274	CFClient::UI::check_tooltip
		275	if $TOOLTIP->{owner} == $self;
		276
		277	$self->focus_out;
		278
		279	$self->emit (visibility_change => 0);
		280	}
		281
		282	sub set_visibility {
		283	my ($self, $visible) = @_;
		284
		285	return if $self->{visible} == $visible;
		286
		287	$visible ? $self->hide
		288	: $self->show;
		289	}
		290
		291	sub toggle_visibility {
		292	my ($self) = @_;
		293
		294	$self->{visible}
		295	? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub hide {
		300	my ($self) = @_;
		301
		302	$self->set_invisible;
186		303
187	$self->{parent}->remove ($self)	304	$self->{parent}->remove ($self)
188	if $self->{parent};	305	if $self->{parent};
189	}	306	}
190		307
…		…
199	}	316	}
200		317
201	sub set_size {	318	sub set_size {
202	my ($self, $w, $h) = @_;	319	my ($self, $w, $h) = @_;
203		320
204	$self->{user_w} = $w;	321	$self->{def_w} = $w;
205	$self->{user_h} = $h;	322	$self->{def_h} = $h;
206		323
207	$self->check_size;	324	$self->realloc;
208	}	325	}
209		326
210	sub size_request {	327	sub size_request {
211	require Carp;	328	require Carp;
212	Carp::confess "size_request is abstract";	329	Carp::confess "size_request is abstract";
…		…
232	$self->{y} = $y;	349	$self->{y} = $y;
233	$self->update;	350	$self->update;
234	}	351	}
235		352
236	if ($self->{w} != $w || $self->{h} != $h) {	353	if ($self->{w} != $w || $self->{h} != $h) {
237	$self->{w} = $w;	354	return unless $self->{visible};
238	$self->{h} = $h;
239		355
240	$self->size_allocate ($w, $h);	356	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
241	$self->update;
242	$self->emit (size_allocate => $w, $h);
243	}	357	}
244	}	358	}
245		359
246	sub size_allocate {	360	sub size_allocate {
247	# nothing to be done	361	# nothing to be done
248	}	362	}
249		363
250	sub children {	364	sub children {
251	}	365	}
252		366
253	# call when resolution changes etc.
254	sub reconfigure {
255	my ($self) = @_;
256
257	$_->reconfigure
258	for $self->children;
259
260	$_->check_size;
261	}
262
263	sub set_max_size {	367	sub set_max_size {
264	my ($self, $w, $h) = @_;	368	my ($self, $w, $h) = @_;
265		369
266	delete $self->{max_w}; $self->{max_w} = $w if $w;	370	delete $self->{max_w}; $self->{max_w} = $w if $w;
267	delete $self->{max_h}; $self->{max_h} = $h if $h;	371	delete $self->{max_h}; $self->{max_h} = $h if $h;
268	}	372	}
269		373
270	# return top left coordinates	374	sub set_tooltip {
271	sub _topleft {
272	my ($self, $x, $y) = @_;	375	my ($self, $tooltip) = @_;
273		376
274	$self->{parent}	377	$tooltip =~ s/^\s+//;
275	or Carp::confess "no parent widget in _topleft\n";#d#	378	$tooltip =~ s/\s+$//;
276		379
277	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	380	return if $self->{tooltip} eq $tooltip;
		381
		382	$self->{tooltip} = $tooltip;
		383
		384	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		385	delete $CFClient::UI::TOOLTIP->{owner};
		386	CFClient::UI::check_tooltip;
		387	}
278	}	388	}
279		389
280	# translate global coordinates to local coordinate system	390	# translate global coordinates to local coordinate system
281	sub coord2local {	391	sub coord2local {
282	my ($self, $x, $y) = @_;	392	my ($self, $x, $y) = @_;
283		393
284	my ($X, $Y) = $self->_topleft;	394	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
285	($x - $X, $y - $Y)
286	}	395	}
287		396
288	# translate local coordinates to global coordinate system	397	# translate local coordinates to global coordinate system
289	sub coord2global {	398	sub coord2global {
290	my ($self, $x, $y) = @_;	399	my ($self, $x, $y) = @_;
291		400
292	my ($X, $Y) = $self->_topleft;	401	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
293	($x + $X, $y + $Y)
294	}	402	}
295		403
296	sub focus_in {	404	sub focus_in {
297	my ($self) = @_;	405	my ($self) = @_;
298		406
299	return if $FOCUS == $self;	407	return if $FOCUS == $self;
300	return unless $self->{can_focus};	408	return unless $self->{can_focus};
301		409
302	my $focus = $FOCUS; $FOCUS = $self;	410	my $focus = $FOCUS; $FOCUS = $self;
303		411
304	$self->emit (focus_in => $focus);	412	$self->_emit (focus_in => $focus);
305		413
306	$focus->update if $focus;	414	$focus->update if $focus;
307	$FOCUS->update;	415	$FOCUS->update;
308	}	416	}
309		417
…		…
312		420
313	return unless $FOCUS == $self;	421	return unless $FOCUS == $self;
314		422
315	my $focus = $FOCUS; undef $FOCUS;	423	my $focus = $FOCUS; undef $FOCUS;
316		424
317	$self->emit (focus_out => $focus);	425	$self->_emit (focus_out => $focus);
318		426
319	$focus->update if $focus; #?	427	$focus->update if $focus; #?
		428
		429	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		430	unless $FOCUS;
320	}	431	}
321		432
322	sub mouse_motion { }	433	sub mouse_motion { }
323	sub button_up { }	434	sub button_up { }
324	sub key_down { }	435	sub key_down { }
325	sub key_up { }	436	sub key_up { }
326		437
327	sub button_down {	438	sub button_down {
328	my ($self, $ev, $x, $y) = @_;	439	my ($self, $ev, $x, $y) = @_;
329		440
330	$self->focus_in;	441	$self->focus_in;
…		…
333	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	444	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
334	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	445	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
335	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	446	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
336	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	447	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
337	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	448	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
		449
		450	sub find_widget {
		451	my ($self, $x, $y) = @_;
		452
		453	return () unless $self->{can_events};
		454
		455	return $self
		456	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		457	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		458
		459	()
		460	}
		461
		462	sub set_parent {
		463	my ($self, $parent) = @_;
		464
		465	Scalar::Util::weaken ($self->{parent} = $parent);
		466
		467	$self->set_visible if $parent->{visible};
		468	}
		469
		470	sub connect {
		471	my ($self, $signal, $cb) = @_;
		472
		473	push @{ $self->{signal_cb}{$signal} }, $cb;
		474	}
		475
		476	sub _emit {
		477	my ($self, $signal, @args) = @_;
		478
		479	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		480	}
		481
		482	sub emit {
		483	my ($self, $signal, @args) = @_;
		484
		485	$self->_emit ($signal, @args)
		486	|| $self->$signal (@args);
		487	}
		488
		489	sub visibility_change {
		490	#my ($self, $visible) = @_;
		491	}
		492
		493	sub realloc {
		494	my ($self) = @_;
		495
		496	if ($self->{visible}) {
		497	return if $self->{root}{realloc}{$self};
		498
		499	$self->{root}{realloc}{$self} = $self;
		500	$self->{root}->update;
		501	} else {
		502	delete $self->{req_w};
		503	}
		504	}
		505
		506	sub update {
		507	my ($self) = @_;
		508
		509	$self->{parent}->update
		510	if $self->{parent};
		511	}
338		512
339	sub draw {	513	sub draw {
340	my ($self) = @_;	514	my ($self) = @_;
341		515
342	return unless $self->{h} && $self->{w};	516	return unless $self->{h} && $self->{w};
…		…
364	if ($ENV{PCLIENT_DEBUG}) {	538	if ($ENV{PCLIENT_DEBUG}) {
365	glPushMatrix;	539	glPushMatrix;
366	glColor 1, 1, 0, 1;	540	glColor 1, 1, 0, 1;
367	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	541	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
368	glBegin GL_LINE_LOOP;	542	glBegin GL_LINE_LOOP;
369	glVertex 0 , 0;	543	glVertex 0 , 0;
370	glVertex $self->{w}, 0;	544	glVertex $self->{w} - 1, 0;
371	glVertex $self->{w}, $self->{h};	545	glVertex $self->{w} - 1, $self->{h} - 1;
372	glVertex 0 , $self->{h};	546	glVertex 0 , $self->{h} - 1;
373	glEnd;	547	glEnd;
374	glPopMatrix;	548	glPopMatrix;
375	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	549	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
376	}	550	}
377	}	551	}
378		552
379	sub _draw {	553	sub _draw {
380	my ($self) = @_;	554	my ($self) = @_;
381		555
382	warn "no draw defined for $self\n";	556	warn "no draw defined for $self\n";
383	}	557	}
384		558
385	sub find_widget {
386	my ($self, $x, $y) = @_;
387
388	return () unless $self->{can_events};
389
390	return $self
391	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
392	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
393
394	()
395	}
396
397	sub set_parent {
398	my ($self, $parent) = @_;
399
400	Scalar::Util::weaken ($self->{parent} = $parent);
401	}
402
403	sub check_size {
404	my ($self) = @_;
405
406	$self->{parent}
407	or return 1;
408
409	my ($w, $h) = $self->{user_w} && $self->{user_h}
410	? @$self{qw(user_w user_h)}
411	: $self->size_request;
412
413	if ($w != $self->{req_w} || $h != $self->{req_h}) {
414	$self->{req_w} = $w;
415	$self->{req_h} = $h;
416
417	$self->{parent}->check_size
418	or $self->size_allocate (
419	(List::Util::max $self->{w}, $w),
420	(List::Util::max $self->{h}, $h),
421	);
422
423	1
424	} else {
425	0
426	}
427	}
428
429	sub update {
430	my ($self) = @_;
431
432	$self->{parent}->update
433	if $self->{parent};
434	}
435
436	sub connect {
437	my ($self, $signal, $cb) = @_;
438
439	push @{ $self->{signal_cb}{$signal} }, $cb;
440	}
441
442	sub emit {
443	my ($self, $signal, @args) = @_;
444
445	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
446	}
447
448	sub DESTROY {	559	sub DESTROY {
449	my ($self) = @_;	560	my ($self) = @_;
450		561
		562	delete $WIDGET{$self+0};
451	#$self->deactivate;	563	#$self->deactivate;
452	}	564	}
453		565
454	#############################################################################	566	#############################################################################
455		567
…		…
464	my $class = shift;	576	my $class = shift;
465		577
466	# range [value, low, high, page]	578	# range [value, low, high, page]
467		579
468	$class->SUPER::new (	580	$class->SUPER::new (
469	bg => [0, 0, 0, 0.2],	581	#bg => [0, 0, 0, 0.2],
470	active_bg => [1, 1, 1, 0.5],	582	#active_bg => [1, 1, 1, 0.5],
471	@_	583	@_
472	)	584	)
473	}	585	}
474		586
475	sub _draw {	587	sub _draw {
476	my ($self) = @_;	588	my ($self) = @_;
477		589
		590	my $color = $FOCUS == $self && $self->{active_bg}
		591	? $self->{active_bg}
		592	: $self->{bg};
		593
		594	if ($color && (@$color < 4 || $color->[3])) {
478	my ($w, $h) = @$self{qw(w h)};	595	my ($w, $h) = @$self{qw(w h)};
479		596
480	glEnable GL_BLEND;	597	glEnable GL_BLEND;
481	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	598	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
482	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	599	glColor @$color;
483		600
484	glBegin GL_QUADS;	601	glBegin GL_QUADS;
485	glVertex 0 , 0;	602	glVertex 0 , 0;
486	glVertex 0 , $h;	603	glVertex 0 , $h;
487	glVertex $w, $h;	604	glVertex $w, $h;
488	glVertex $w, 0;	605	glVertex $w, 0;
489	glEnd;	606	glEnd;
490		607
491	glDisable GL_BLEND;	608	glDisable GL_BLEND;
		609	}
492	}	610	}
493		611
494	#############################################################################	612	#############################################################################
495		613
496	package CFClient::UI::Empty;	614	package CFClient::UI::Empty;
…		…
528		646
529	$self	647	$self
530	}	648	}
531		649
532	sub add {	650	sub add {
533	my ($self, $child) = @_;	651	my ($self, @widgets) = @_;
534		652
535	$child->set_parent ($self);	653	$_->set_parent ($self)
		654	for @widgets;
536		655
537	use sort 'stable';	656	use sort 'stable';
538		657
539	$self->{children} = [	658	$self->{children} = [
540	sort { $a->{z} <=> $b->{z} }	659	sort { $a->{z} <=> $b->{z} }
541	@{$self->{children}}, $child	660	@{$self->{children}}, @widgets
542	];	661	];
543		662
544	$child->check_size;	663	$self->realloc;
545	$self->update;
546	}	664	}
547		665
548	sub children {	666	sub children {
549	@{ $_[0]{children} }	667	@{ $_[0]{children} }
550	}	668	}
…		…
555	delete $child->{parent};	673	delete $child->{parent};
556	$child->hide;	674	$child->hide;
557		675
558	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	676	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
559		677
560	$self->check_size;	678	$self->realloc;
561	$self->update;
562	}	679	}
563		680
564	sub clear {	681	sub clear {
565	my ($self) = @_;	682	my ($self) = @_;
566		683
…		…
570	for (@$children) {	687	for (@$children) {
571	delete $_->{parent};	688	delete $_->{parent};
572	$_->hide;	689	$_->hide;
573	}	690	}
574		691
575	$self->check_size;	692	$self->realloc;
576	$self->update;
577	}	693	}
578		694
579	sub find_widget {	695	sub find_widget {
580	my ($self, $x, $y) = @_;	696	my ($self, $x, $y) = @_;
581		697
…		…
634	sub size_request {	750	sub size_request {
635	$_[0]{children}[0]->size_request	751	$_[0]{children}[0]->size_request
636	}	752	}
637		753
638	sub size_allocate {	754	sub size_allocate {
639	my ($self, $w, $h) = @_;	755	my ($self, $w, $h, $changed) = @_;
640		756
641	$self->{children}[0]->configure (0, 0, $w, $h);	757	$self->{children}[0]->configure (0, 0, $w, $h);
642	}	758	}
643		759
644	#############################################################################	760	#############################################################################
…		…
656	}	772	}
657		773
658	sub update {	774	sub update {
659	my ($self) = @_;	775	my ($self) = @_;
660		776
661	$ROOT->on_refresh ($self => sub { $self->render_child });	777	$ROOT->on_post_alloc ($self => sub { $self->render_child });
662	$self->SUPER::update;	778	$self->SUPER::update;
663	}	779	}
664		780
665	sub size_allocate {	781	sub size_allocate {
666	my ($self, $w, $h) = @_;	782	my ($self, $w, $h, $changed) = @_;
667		783
668	$self->SUPER::size_allocate ($w, $h);	784	$self->SUPER::size_allocate ($w, $h, $changed);
669	$self->update;	785	$self->update
		786	if $changed;
670	}	787	}
671		788
672	sub _render {	789	sub _render {
673	$_[0]{children}[0]->draw;	790	$_[0]{children}[0]->draw;
674	}	791	}
…		…
679	$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 {
680	glClearColor 0, 0, 0, 0;	797	glClearColor 0, 0, 0, 0;
681	glClear GL_COLOR_BUFFER_BIT;	798	glClear GL_COLOR_BUFFER_BIT;
682		799
683	$self->_render;	800	$self->_render;
684	# glColorMask 1, 1, 1, 0;
685	# glEnable GL_BLEND;
686	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
687	# glRasterPos 0, 0;
688	# glCopyPixels 0, 0, $self->{w}, $self->{h};
689	# glDisable GL_BLEND;
690	# glColorMask 1, 1, 1, 1;
691	};	801	};
692	}	802	}
693		803
694	sub _draw {	804	sub _draw {
695	my ($self) = @_;	805	my ($self) = @_;
…		…
697	my ($w, $h) = ($self->w, $self->h);	807	my ($w, $h) = ($self->w, $self->h);
698		808
699	my $tex = $self->{texture}	809	my $tex = $self->{texture}
700	or return;	810	or return;
701		811
702	glEnable GL_BLEND;
703	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704	glEnable GL_TEXTURE_2D;	812	glEnable GL_TEXTURE_2D;
705	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706	glColor 0, 0, 0, 1;	814	glColor 1, 1, 1, 1;
707		815
708	$tex->draw_quad (0, 0, $w, $h);	816	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
709		817
710	glDisable GL_BLEND;
711	glDisable GL_TEXTURE_2D;	818	glDisable GL_TEXTURE_2D;
712	}	819	}
713		820
714	#############################################################################	821	#############################################################################
715		822
716	package CFClient::UI::ViewPort;	823	package CFClient::UI::ViewPort;
717		824
718	our @ISA = CFClient::UI::Window::;	825	our @ISA = CFClient::UI::Window::;
719		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
720	sub size_request {	837	sub size_request {
721	my ($self) = @_;	838	my ($self) = @_;
722		839
723	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	840	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
724	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
725		841
726	@$self{qw(child_w child_h)}	842	$w = 10 if $self->{scroll_x};
		843	$h = 10 if $self->{scroll_y};
		844
		845	($w, $h)
727	}	846	}
728		847
729	sub size_allocate {	848	sub size_allocate {
730	my ($self, $w, $h) = @_;	849	my ($self, $w, $h, $changed) = @_;
731		850
		851	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		852	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		853
		854	$self->child->configure (0, 0, $w, $h);
732	$self->update;	855	$self->update;
733	}	856	}
734		857
735	sub set_offset {	858	sub set_offset {
736	my ($self, $x, $y) = @_;	859	my ($self, $x, $y) = @_;
…		…
739	$self->{view_y} = int $y;	862	$self->{view_y} = int $y;
740		863
741	$self->update;	864	$self->update;
742	}	865	}
743		866
744	# hmm, this does not work for topleft of $self... but we should not aks for that	867	# hmm, this does not work for topleft of $self... but we should not ask for that
745	sub _topleft {	868	sub coord2local {
746	my ($self, $x, $y) = @_;	869	my ($self, $x, $y) = @_;
747		870
748	$self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})	871	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		872	}
		873
		874	sub coord2global {
		875	my ($self, $x, $y) = @_;
		876
		877	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		878	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		879
		880	$self->SUPER::coord2global ($x, $y)
749	}	881	}
750		882
751	sub find_widget {	883	sub find_widget {
752	my ($self, $x, $y) = @_;	884	my ($self, $x, $y) = @_;
753		885
…		…
778	my $class = shift;	910	my $class = shift;
779		911
780	my $self;	912	my $self;
781		913
782	my $slider = new CFClient::UI::Slider	914	my $slider = new CFClient::UI::Slider
783	vertical => 1,	915	vertical => 1,
784	range => [0, 0, 1, 0.01], # HACK fix	916	range => [0, 0, 1, 0.01], # HACK fix
785	connect_changed => sub {	917	on_changed => sub {
786	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	918	$self->{vp}->set_offset (0, $_[1]);
787	},	919	},
788	;	920	;
789		921
790	$self = $class->SUPER::new (	922	$self = $class->SUPER::new (
791	vp => (new CFClient::UI::ViewPort),	923	vp => (new CFClient::UI::ViewPort expand => 1),
792	slider => $slider,	924	slider => $slider,
793	@_,	925	@_,
794	);	926	);
795		927
796	$self->{vp}->add ($self->{scrolled});	928	$self->{vp}->add ($self->{scrolled});
…		…
798	$self->add ($self->{slider});	930	$self->add ($self->{slider});
799		931
800	$self	932	$self
801	}	933	}
802		934
		935	sub update {
		936	my ($self) = @_;
		937
		938	$self->SUPER::update;
		939
		940	# todo: overwrite size_allocate of child
		941	my $child = $self->{vp}->child;
		942	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		943	}
		944
		945	sub size_allocate {
		946	my ($self, $w, $h, $changed) = @_;
		947
		948	$self->SUPER::size_allocate ($w, $h, $changed);
		949
		950	my $child = $self->{vp}->child;
		951	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		952	}
		953
803	#TODO# update range on size_allocate depeneing on child	954	#TODO# update range on size_allocate depending on child
804	# update viewport offset on scroll	955	# update viewport offset on scroll
805		956
806	#############################################################################	957	#############################################################################
807		958
808	package CFClient::UI::Frame;	959	package CFClient::UI::Frame;
…		…
812	use CFClient::OpenGL;	963	use CFClient::OpenGL;
813		964
814	sub new {	965	sub new {
815	my $class = shift;	966	my $class = shift;
816		967
817	my $self = $class->SUPER::new (	968	$class->SUPER::new (
818	bg => [1, 1, 1, 1],	969	bg => undef,
819	border_bg => [1, 1, 1, 1],
820	border => 0.8,
821	@_	970	@_,
822	);	971	)
823
824	$self
825	}	972	}
826		973
827	sub _draw {	974	sub _draw {
828	my ($self) = @_;	975	my ($self) = @_;
829		976
830	my ($w, $h) = ($self->{w}, $self->{h});	977	if ($self->{bg}) {
		978	my ($w, $h) = @$self{qw(w h)};
831		979
832	glEnable GL_BLEND;	980	glEnable GL_BLEND;
833	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	981	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
834	glEnable GL_TEXTURE_2D;	982	glColor @{ $self->{bg} };
835	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
836		983
837	# glBegin GL_QUADS;	984	glBegin GL_QUADS;
838	# glColor 0, 0, 0, 0;
839	# glVertex 0 , 0;	985	glVertex 0 , 0;
840	# glVertex 0 , $h;	986	glVertex 0 , $h;
841	# glVertex $w, $h;	987	glVertex $w, $h;
842	# glVertex $w, 0;	988	glVertex $w, 0;
843	# glEnd;	989	glEnd;
844		990
845
846	$self->child->draw;
847	glDisable GL_BLEND;	991	glDisable GL_BLEND;
848	glDisable GL_TEXTURE_2D;	992	}
		993
		994	$self->SUPER::_draw;
849	}	995	}
850		996
851	#############################################################################	997	#############################################################################
852		998
853	package CFClient::UI::FancyFrame;	999	package CFClient::UI::FancyFrame;
…		…
861	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1007	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
862		1008
863	sub new {	1009	sub new {
864	my $class = shift;	1010	my $class = shift;
865		1011
866	# TODO: user_x, user_y, overwrite moveto?
867
868	my $self = $class->SUPER::new (	1012	my $self = $class->SUPER::new (
869	bg => [1, 1, 1, 1],	1013	bg => [1, 1, 1, 1],
870	border_bg => [1, 1, 1, 1],	1014	border_bg => [1, 1, 1, 1],
871	border => 0.6,	1015	border => 0.6,
		1016	is_toplevel => 1,
872	can_events => 1,	1017	can_events => 1,
873	@_	1018	@_
874	);	1019	);
875		1020
876	$self->{title} &&= new CFClient::UI::Label	1021	$self->{title} &&= new CFClient::UI::Label
877	align => 0,	1022	align => 0,
…		…
896	$h + $self->border * 2,	1041	$h + $self->border * 2,
897	)	1042	)
898	}	1043	}
899		1044
900	sub size_allocate {	1045	sub size_allocate {
901	my ($self, $w, $h) = @_;	1046	my ($self, $w, $h, $changed) = @_;
		1047
		1048	return unless $changed;
902		1049
903	$h -= List::Util::max 0, $self->border * 2;	1050	$h -= List::Util::max 0, $self->border * 2;
904	$w -= List::Util::max 0, $self->border * 2;	1051	$w -= List::Util::max 0, $self->border * 2;
905		1052
906	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1053	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
907	if $self->{title};	1054	if $self->{title};
908		1055
909	$self->child->configure ($self->border, $self->border, $w, $h);	1056	$self->child->configure ($self->border, $self->border, $w, $h);
910	}	1057	}
911		1058
…		…
930	my ($ev, $x, $y) = @_;	1077	my ($ev, $x, $y) = @_;
931		1078
932	my $dx = $ev->{x} - $ox;	1079	my $dx = $ev->{x} - $ox;
933	my $dy = $ev->{y} - $oy;	1080	my $dy = $ev->{y} - $oy;
934		1081
		1082	$self->{user_x} = $wx + $dx * $mx;
		1083	$self->{user_y} = $wy + $dy * $my;
935	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1084	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
936	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1085	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
937	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1086	$self->move ($self->{user_x}, $self->{user_y});
938	$self->check_size;	1087	$self->realloc;
939	};	1088	};
940		1089
941	} elsif ($lr ^ $td) {	1090	} elsif ($lr ^ $td) {
942	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1091	my ($ox, $oy) = ($ev->{x}, $ev->{y});
943	my ($bx, $by) = ($self->{x}, $self->{y});	1092	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
945	$self->{motion} = sub {	1094	$self->{motion} = sub {
946	my ($ev, $x, $y) = @_;	1095	my ($ev, $x, $y) = @_;
947		1096
948	($x, $y) = ($ev->{x}, $ev->{y});	1097	($x, $y) = ($ev->{x}, $ev->{y});
949		1098
950	$self->move ($bx + $x - $ox, $by + $y - $oy);	1099	$self->{user_x} = $bx + $x - $ox;
		1100	$self->{user_y} = $by + $y - $oy;
		1101
		1102	$self->move ($self->{user_x}, $self->{user_y});
951	$self->update;	1103	$self->realloc;
952	};	1104	};
953	}	1105	}
954	}	1106	}
955		1107
956	sub button_up {	1108	sub button_up {
…		…
969	my ($self) = @_;	1121	my ($self) = @_;
970		1122
971	my ($w, $h ) = ($self->{w}, $self->{h});	1123	my ($w, $h ) = ($self->{w}, $self->{h});
972	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1124	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
973		1125
974	glEnable GL_BLEND;
975	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
976	glEnable GL_TEXTURE_2D;	1126	glEnable GL_TEXTURE_2D;
977	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1127	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
978		1128
979	my $border = $self->border;	1129	my $border = $self->border;
980		1130
981	glColor @{ $self->{border_bg} };	1131	glColor @{ $self->{border_bg} };
982	$tex[1]->draw_quad (0, 0, $w, $border);	1132	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
983	$tex[3]->draw_quad (0, $border, $border, $ch);	1133	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
984	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1134	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
985	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1135	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
986		1136
987	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1137	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
988	my $bg = $tex[0];	1138	my $bg = $tex[0];
989		1139
990	# TODO: repeat texture not scale	1140	# TODO: repeat texture not scale
…		…
994	glColor @{ $self->{bg} };	1144	glColor @{ $self->{bg} };
995		1145
996	$bg->{s} = $rep_x;	1146	$bg->{s} = $rep_x;
997	$bg->{t} = $rep_y;	1147	$bg->{t} = $rep_y;
998	$bg->{wrap_mode} = 1;	1148	$bg->{wrap_mode} = 1;
999	$bg->draw_quad ($border, $border, $cw, $ch);	1149	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1150	}
1000		1151
1001	glDisable GL_TEXTURE_2D;	1152	glDisable GL_TEXTURE_2D;
1002	glDisable GL_BLEND;
1003	}
1004		1153
1005	$self->{title}->draw if $self->{title};	1154	$self->{title}->draw if $self->{title};
1006		1155
1007	$self->child->draw;	1156	$self->child->draw;
1008	}	1157	}
…		…
1020	sub new {	1169	sub new {
1021	my $class = shift;	1170	my $class = shift;
1022		1171
1023	$class->SUPER::new (	1172	$class->SUPER::new (
1024	col_expand => [],	1173	col_expand => [],
1025	@_	1174	@_,
1026	)	1175	)
		1176	}
		1177
		1178	sub children {
		1179	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1027	}	1180	}
1028		1181
1029	sub add {	1182	sub add {
1030	my ($self, $x, $y, $child) = @_;	1183	my ($self, $x, $y, $child) = @_;
1031		1184
1032	$child->set_parent ($self);	1185	$child->set_parent ($self);
1033	$self->{children}[$y][$x] = $child;	1186	$self->{children}[$y][$x] = $child;
1034		1187
1035	$child->check_size;	1188	$self->realloc;
1036	}	1189	}
1037		1190
1038	sub children {
1039	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1040	}
1041
1042	# TODO: move to container class maybe? send childs a signal on removal?	1191	# TODO: move to container class maybe? send children a signal on removal?
1043	sub clear {	1192	sub clear {
1044	my ($self) = @_;	1193	my ($self) = @_;
1045		1194
1046	my @children = $self->children;	1195	my @children = $self->children;
1047	delete $self->{children};	1196	delete $self->{children};
…		…
1049	for (@children) {	1198	for (@children) {
1050	delete $_->{parent};	1199	delete $_->{parent};
1051	$_->hide;	1200	$_->hide;
1052	}	1201	}
1053		1202
1054	$self->update;	1203	$self->realloc;
1055	}	1204	}
1056		1205
1057	sub get_wh {	1206	sub get_wh {
1058	my ($self) = @_;	1207	my ($self) = @_;
1059		1208
…		…
1086	(sum @$hs),	1235	(sum @$hs),
1087	)	1236	)
1088	}	1237	}
1089		1238
1090	sub size_allocate {	1239	sub size_allocate {
1091	my ($self, $w, $h) = @_;	1240	my ($self, $w, $h, $changed) = @_;
1092		1241
1093	my ($ws, $hs) = $self->get_wh;	1242	my ($ws, $hs) = $self->get_wh;
1094		1243
1095	my $req_w = sum @$ws;	1244	my $req_w = (sum @$ws) || 1;
1096	my $req_h = sum @$hs;	1245	my $req_h = (sum @$hs) || 1;
1097		1246
1098	# TODO: nicer code && do row_expand	1247	# TODO: nicer code && do row_expand
1099	my @col_expand = @{$self->{col_expand}};	1248	my @col_expand = @{$self->{col_expand}};
1100	@col_expand = (1) x @$ws unless @col_expand;	1249	@col_expand = (1) x @$ws unless @col_expand;
1101	my $col_expand = (sum @col_expand) || 1;	1250	my $col_expand = (sum @col_expand) || 1;
…		…
1155	}	1304	}
1156	}	1305	}
1157		1306
1158	#############################################################################	1307	#############################################################################
1159		1308
		1309	package CFClient::UI::Box;
		1310
		1311	our @ISA = CFClient::UI::Container::;
		1312
		1313	sub size_request {
		1314	my ($self) = @_;
		1315
		1316	$self->{vertical}
		1317	? (
		1318	(List::Util::max map $_->{req_w}, @{$self->{children}}),
		1319	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
		1320	)
		1321	: (
		1322	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1323	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1324	)
		1325	}
		1326
		1327	sub size_allocate {
		1328	my ($self, $w, $h, $changed) = @_;
		1329
		1330	my $space = $self->{vertical} ? $h : $w;
		1331	my $children = $self->{children};
		1332
		1333	my @req;
		1334
		1335	if ($self->{homogeneous}) {
		1336	@req = ($space / (@$children || 1)) x @$children;
		1337	} else {
		1338	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1339	my $req = List::Util::sum @req;
		1340
		1341	if ($req > $space) {
		1342	# ah well, not enough space
		1343	$_ *= $space / $req for @req;
		1344	} else {
		1345	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
		1346
		1347	$space = ($space - $req) / $expand; # remaining space to give away
		1348
		1349	$req[$_] += $space * $children->[$_]{expand}
		1350	for 0 .. $#$children;
		1351	}
		1352	}
		1353
		1354	CFClient::UI::harmonize \@req;
		1355
		1356	my $pos = 0;
		1357	for (0 .. $#$children) {
		1358	my $alloc = $req[$_];
		1359	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
		1360
		1361	$pos += $alloc;
		1362	}
		1363
		1364	1
		1365	}
		1366
		1367	#############################################################################
		1368
1160	package CFClient::UI::HBox;	1369	package CFClient::UI::HBox;
1161		1370
1162	# TODO: wrap into common Box base class
1163
1164	our @ISA = CFClient::UI::Container::;	1371	our @ISA = CFClient::UI::Box::;
1165		1372
1166	sub size_request {	1373	sub new {
1167	my ($self) = @_;	1374	my $class = shift;
1168		1375
1169	my @alloc = map [$_->size_request], @{$self->{children}};	1376	$class->SUPER::new (
1170		1377	vertical => 0,
1171	(	1378	@_,
1172	(List::Util::sum map $_->[0], @alloc),
1173	(List::Util::max map $_->[1], @alloc),
1174	)	1379	)
1175	}	1380	}
1176		1381
1177	sub size_allocate {
1178	my ($self, $w, $h) = @_;
1179
1180	($h, $w) = ($w, $h);
1181
1182	my $children = $self->{children};
1183
1184	my @h = map $_->{req_w}, @$children;
1185
1186	my $req_h = List::Util::sum @h;
1187
1188	if ($req_h > $h) {
1189	# ah well, not enough space
1190	$_ *= $h / $req_h for @h;
1191	} else {
1192	my $exp = List::Util::sum map $_->{expand}, @$children;
1193	$exp ||= 1;
1194
1195	for (0 .. $#$children) {
1196	my $child = $children->[$_];
1197
1198	my $alloc_h = $h[$_];
1199	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1200	$h[$_] = $alloc_h;
1201	}
1202	}
1203
1204	CFClient::UI::harmonize \@h;
1205
1206	my $y = 0;
1207	for (0 .. $#$children) {
1208	my $child = $children->[$_];
1209	my $h = $h[$_];
1210	$child->configure ($y, 0, $h, $w);
1211
1212	$y += $h;
1213	}
1214
1215	1
1216	}
1217
1218	#############################################################################	1382	#############################################################################
1219		1383
1220	package CFClient::UI::VBox;	1384	package CFClient::UI::VBox;
1221		1385
1222	# TODO: wrap into common Box base class
1223
1224	our @ISA = CFClient::UI::Container::;	1386	our @ISA = CFClient::UI::Box::;
1225		1387
1226	sub size_request {	1388	sub new {
1227	my ($self) = @_;	1389	my $class = shift;
1228		1390
1229	my @alloc = map [$_->size_request], @{$self->{children}};	1391	$class->SUPER::new (
1230		1392	vertical => 1,
1231	(	1393	@_,
1232	(List::Util::max map $_->[0], @alloc),
1233	(List::Util::sum map $_->[1], @alloc),
1234	)	1394	)
1235	}	1395	}
1236		1396
1237	sub size_allocate {
1238	my ($self, $w, $h) = @_;
1239
1240	my $children = $self->{children};
1241
1242	my @h = map $_->{req_h}, @$children;
1243
1244	my $req_h = List::Util::sum @h;
1245
1246	if ($req_h > $h) {
1247	# ah well, not enough space
1248	$_ *= $h / $req_h for @h;
1249	} else {
1250	my $exp = List::Util::sum map $_->{expand}, @$children;
1251	$exp ||= 1;
1252
1253	for (0 .. $#$children) {
1254	my $child = $children->[$_];
1255
1256	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1257	}
1258	}
1259
1260	CFClient::UI::harmonize \@h;
1261
1262	my $y = 0;
1263	for (0 .. $#$children) {
1264	my $child = $children->[$_];
1265	my $h = $h[$_];
1266	$child->configure (0, $y, $w, $h);
1267
1268	$y += $h;
1269	}
1270
1271	1
1272	}
1273
1274	#############################################################################	1397	#############################################################################
1275		1398
1276	package CFClient::UI::Label;	1399	package CFClient::UI::Label;
1277		1400
1278	our @ISA = CFClient::UI::Base::;	1401	our @ISA = CFClient::UI::DrawBG::;
1279		1402
1280	use CFClient::OpenGL;	1403	use CFClient::OpenGL;
1281		1404
1282	sub new {	1405	sub new {
1283	my ($class, %arg) = @_;	1406	my ($class, %arg) = @_;
1284		1407
1285	my $self = $class->SUPER::new (	1408	my $self = $class->SUPER::new (
1286	fg => [1, 1, 1],	1409	fg => [1, 1, 1],
		1410	#bg => none
		1411	#active_bg => none
1287	#font => default_font	1412	#font => default_font
		1413	#text => initial text
		1414	#markup => initial narkup
		1415	#max_w => maximum pixel width
		1416	ellipsise => 3, # end
		1417	layout => (new CFClient::Layout),
1288	fontsize => 1,	1418	fontsize => 1,
1289	text => "",
1290	align => -1,	1419	align => -1,
1291	valign => -1,	1420	valign => -1,
1292	padding => 2,	1421	padding => 2,
1293	layout => new CFClient::Layout,
1294	can_events => 0,	1422	can_events => 0,
1295	%arg	1423	%arg
1296	);	1424	);
1297		1425
1298	if (exists $self->{template}) {	1426	if (exists $self->{template}) {
1299	my $layout = new CFClient::Layout;	1427	my $layout = new CFClient::Layout;
1300	$layout->set_text (delete $self->{template});	1428	$layout->set_text (delete $self->{template});
1301	$self->{template} = $layout;	1429	$self->{template} = $layout;
1302	}	1430	}
1303		1431
1304	$self->set_text (delete $self->{text}) if exists $self->{text};	1432	if (exists $self->{markup}) {
1305	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1433	$self->set_markup (delete $self->{markup});
		1434	} else {
		1435	$self->set_text (delete $self->{text});
		1436	}
1306		1437
1307	$self	1438	$self
1308	}	1439	}
1309		1440
1310	sub escape {	1441	sub escape($) {
1311	local $_ = $_[1];	1442	local $_ = $_[0];
1312		1443
1313	s/&/&amp;/g;	1444	s/&/&amp;/g;
1314	s/>/&gt;/g;	1445	s/>/&gt;/g;
1315	s/</&lt;/g;	1446	s/</&lt;/g;
1316		1447
1317	$_[1]	1448	$_
1318	}	1449	}
1319		1450
1320	sub update {	1451	sub update {
1321	my ($self) = @_;	1452	my ($self) = @_;
1322		1453
1323	delete $self->{texture};	1454	delete $self->{texture};
1324	$self->SUPER::update;	1455	$self->SUPER::update;
1325	}	1456	}
1326		1457
1327	sub reconfigure {
1328	my ($self) = @_;
1329
1330	delete $self->{texture};
1331	}
1332
1333	sub set_text {	1458	sub set_text {
1334	my ($self, $text) = @_;	1459	my ($self, $text) = @_;
1335		1460
1336	return if $self->{text} eq "T$text";	1461	return if $self->{text} eq "T$text";
1337	$self->{text} = "T$text";	1462	$self->{text} = "T$text";
1338		1463
		1464	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1339	$self->{layout}->set_text ($text);	1465	$self->{layout}->set_text ($text);
1340		1466
1341	delete $self->{texture};	1467	$self->realloc;
1342	$self->update;	1468	$self->update;
1343	$self->check_size;
1344	}	1469	}
1345		1470
1346	sub set_markup {	1471	sub set_markup {
1347	my ($self, $markup) = @_;	1472	my ($self, $markup) = @_;
1348		1473
1349	return if $self->{text} eq "M$markup";	1474	return if $self->{text} eq "M$markup";
1350	$self->{text} = "M$markup";	1475	$self->{text} = "M$markup";
1351		1476
		1477	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1478
		1479	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1352	$self->{layout}->set_markup ($markup);	1480	$self->{layout}->set_markup ($markup);
1353		1481
1354	delete $self->{texture};	1482	$self->realloc;
1355	$self->update;	1483	$self->update;
1356	$self->check_size;
1357	}	1484	}
1358		1485
1359	sub size_request {	1486	sub size_request {
1360	my ($self) = @_;	1487	my ($self) = @_;
1361		1488
1362	$self->{layout}->set_font ($self->{font}) if $self->{font};	1489	$self->{layout}->set_font ($self->{font}) if $self->{font};
1363	$self->{layout}->set_width ($self->{max_w} || -1);	1490	$self->{layout}->set_width ($self->{max_w} || -1);
		1491	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1492	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1364	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1493	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1365		1494
1366	my ($w, $h) = $self->{layout}->size;	1495	my ($w, $h) = $self->{layout}->size;
1367		1496
1368	if (exists $self->{template}) {	1497	if (exists $self->{template}) {
…		…
1380	$h + $self->{padding} * 2,	1509	$h + $self->{padding} * 2,
1381	)	1510	)
1382	}	1511	}
1383		1512
1384	sub size_allocate {	1513	sub size_allocate {
1385	my ($self, $w, $h) = @_;	1514	my ($self, $w, $h, $changed) = @_;
1386		1515
1387	delete $self->{texture};	1516	delete $self->{texture}
		1517	if $changed;
1388	}	1518	}
1389		1519
1390	sub set_fontsize {	1520	sub set_fontsize {
1391	my ($self, $fontsize) = @_;	1521	my ($self, $fontsize) = @_;
1392		1522
1393	$self->{fontsize} = $fontsize;	1523	$self->{fontsize} = $fontsize;
1394	delete $self->{texture};	1524	delete $self->{texture};
1395	$self->check_size;	1525
1396	$self->update;	1526	$self->realloc;
1397	}	1527	}
1398		1528
1399	sub _draw {	1529	sub _draw {
1400	my ($self) = @_;	1530	my ($self) = @_;
1401		1531
		1532	$self->SUPER::_draw; # draw background, if applicable
		1533
1402	my $tex = $self->{texture} ||= do {	1534	my $tex = $self->{texture} ||= do {
		1535	$self->{layout}->set_foreground (@{$self->{fg}});
1403	$self->{layout}->set_font ($self->{font}) if $self->{font};	1536	$self->{layout}->set_font ($self->{font}) if $self->{font};
1404	$self->{layout}->set_width ($self->{w});	1537	$self->{layout}->set_width ($self->{w});
		1538	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1539	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1405	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1540	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1541
1406	new_from_layout CFClient::Texture $self->{layout}	1542	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1543
		1544	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1545	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1546	: ($self->{w} - $tex->{w}) * 0.5);
		1547
		1548	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1549	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1550	: ($self->{h} - $tex->{h}) * 0.5);
		1551
		1552	$tex
1407	};	1553	};
1408		1554
1409	glEnable GL_BLEND;
1410	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1411	glEnable GL_TEXTURE_2D;	1555	glEnable GL_TEXTURE_2D;
1412	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1556	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1413		1557
		1558	if ($tex->{format} == GL_ALPHA) {
1414	glColor @{$self->{fg}};	1559	glColor @{$self->{fg}};
1415
1416	$self->{ox} = int (
1417	$self->{align} < 0 ? $self->{padding}
1418	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1419	: ($self->{w} - $tex->{w}) * 0.5
1420	);
1421
1422	$self->{oy} = int (
1423	$self->{valign} < 0 ? $self->{padding}
1424	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1425	: ($self->{h} - $tex->{h}) * 0.5
1426	);
1427
1428	$tex->draw_quad ($self->{ox}, $self->{oy});	1560	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1561	} else {
		1562	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1563	}
1429		1564
1430	glDisable GL_TEXTURE_2D;	1565	glDisable GL_TEXTURE_2D;
1431	glDisable GL_BLEND;
1432	}	1566	}
1433		1567
1434	#############################################################################	1568	#############################################################################
1435		1569
1436	package CFClient::UI::EntryBase;	1570	package CFClient::UI::EntryBase;
…		…
1449	active_fg => [0, 0, 0],	1583	active_fg => [0, 0, 0],
1450	can_hover => 1,	1584	can_hover => 1,
1451	can_focus => 1,	1585	can_focus => 1,
1452	valign => 0,	1586	valign => 0,
1453	can_events => 1,	1587	can_events => 1,
		1588	#text => ...
1454	@_	1589	@_
1455	)	1590	)
1456	}	1591	}
1457		1592
1458	sub _set_text {	1593	sub _set_text {
…		…
1468	$self->{text} = $text;	1603	$self->{text} = $text;
1469		1604
1470	$text =~ s/./*/g if $self->{hidden};	1605	$text =~ s/./*/g if $self->{hidden};
1471	$self->{layout}->set_text ("$text ");	1606	$self->{layout}->set_text ("$text ");
1472		1607
1473	$self->emit (changed => $self->{text});	1608	$self->_emit (changed => $self->{text});
		1609	}
		1610
		1611	sub set_text {
		1612	my ($self, $text) = @_;
		1613
		1614	$self->{cursor} = length $text;
		1615	$self->_set_text ($text);
		1616
		1617	$self->realloc;
1474	}	1618	}
1475		1619
1476	sub get_text {	1620	sub get_text {
1477	$_[0]{text}	1621	$_[0]{text}
1478	}	1622	}
…		…
1481	my ($self) = @_;	1625	my ($self) = @_;
1482		1626
1483	my ($w, $h) = $self->SUPER::size_request;	1627	my ($w, $h) = $self->SUPER::size_request;
1484		1628
1485	($w + 1, $h) # add 1 for cursor	1629	($w + 1, $h) # add 1 for cursor
1486	}
1487
1488	sub size_allocate {
1489	my ($self, $w, $h) = @_;
1490
1491	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1492	}
1493
1494	sub set_text {
1495	my ($self, $text) = @_;
1496
1497	$self->{cursor} = length $text;
1498	$self->_set_text ($text);
1499	$self->update;
1500	}	1630	}
1501		1631
1502	sub key_down {	1632	sub key_down {
1503	my ($self, $ev) = @_;	1633	my ($self, $ev) = @_;
1504		1634
…		…
1506	my $sym = $ev->{sym};	1636	my $sym = $ev->{sym};
1507	my $uni = $ev->{unicode};	1637	my $uni = $ev->{unicode};
1508		1638
1509	my $text = $self->get_text;	1639	my $text = $self->get_text;
1510		1640
1511	if ($sym == 8) {	1641	if ($uni == 8) {
1512	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1642	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1513	} elsif ($sym == 127) {	1643	} elsif ($uni == 127) {
1514	substr $text, $self->{cursor}, 1, "";	1644	substr $text, $self->{cursor}, 1, "";
1515	} elsif ($sym == CFClient::SDLK_LEFT) {	1645	} elsif ($sym == CFClient::SDLK_LEFT) {
1516	--$self->{cursor} if $self->{cursor};	1646	--$self->{cursor} if $self->{cursor};
1517	} elsif ($sym == CFClient::SDLK_RIGHT) {	1647	} elsif ($sym == CFClient::SDLK_RIGHT) {
1518	++$self->{cursor} if $self->{cursor} < length $self->{text};	1648	++$self->{cursor} if $self->{cursor} < length $self->{text};
1519	} elsif ($sym == CFClient::SDLK_HOME) {	1649	} elsif ($sym == CFClient::SDLK_HOME) {
1520	$self->{cursor} = 0;	1650	$self->{cursor} = 0;
1521	} elsif ($sym == CFClient::SDLK_END) {	1651	} elsif ($sym == CFClient::SDLK_END) {
1522	$self->{cursor} = length $text;	1652	$self->{cursor} = length $text;
1523	} elsif ($sym == 27) {	1653	} elsif ($uni == 27) {
1524	$self->emit ('escape');	1654	$self->_emit ('escape');
1525	} elsif ($uni) {	1655	} elsif ($uni) {
1526	substr $text, $self->{cursor}++, 0, chr $uni;	1656	substr $text, $self->{cursor}++, 0, chr $uni;
1527	}	1657	}
1528		1658
1529	$self->_set_text ($text);	1659	$self->_set_text ($text);
1530	$self->update;	1660
		1661	$self->realloc;
1531	}	1662	}
1532		1663
1533	sub focus_in {	1664	sub focus_in {
1534	my ($self) = @_;	1665	my ($self) = @_;
1535		1666
…		…
1615	if ($sym == 13) {	1746	if ($sym == 13) {
1616	unshift @{$self->{history}},	1747	unshift @{$self->{history}},
1617	my $txt = $self->get_text;	1748	my $txt = $self->get_text;
1618	$self->{history_pointer} = -1;	1749	$self->{history_pointer} = -1;
1619	$self->{history_saveback} = '';	1750	$self->{history_saveback} = '';
1620	$self->emit (activate => $txt);	1751	$self->_emit (activate => $txt);
1621	$self->update;	1752	$self->update;
1622		1753
1623	} elsif ($sym == CFClient::SDLK_UP) {	1754	} elsif ($sym == CFClient::SDLK_UP) {
1624	if ($self->{history_pointer} < 0) {	1755	if ($self->{history_pointer} < 0) {
1625	$self->{history_saveback} = $self->get_text;	1756	$self->{history_saveback} = $self->get_text;
…		…
1664	my $class = shift;	1795	my $class = shift;
1665		1796
1666	$class->SUPER::new (	1797	$class->SUPER::new (
1667	padding => 4,	1798	padding => 4,
1668	fg => [1, 1, 1],	1799	fg => [1, 1, 1],
1669	bg => [1, 1, 1, 0.2],
1670	active_fg => [0, 0, 1],	1800	active_fg => [0, 0, 1],
1671	can_hover => 1,	1801	can_hover => 1,
1672	align => 0,	1802	align => 0,
1673	valign => 0,	1803	valign => 0,
1674	can_events => 1,	1804	can_events => 1,
1675	@_	1805	@_
1676	)	1806	)
1677	}	1807	}
1678		1808
		1809	sub activate { }
		1810
1679	sub button_up {	1811	sub button_up {
1680	my ($self, $ev, $x, $y) = @_;	1812	my ($self, $ev, $x, $y) = @_;
1681		1813
		1814	$self->emit ("activate")
1682	if ($x >= 0 && $x < $self->{w}	1815	if $x >= 0 && $x < $self->{w}
1683	&& $y >= 0 && $y < $self->{h}) {	1816	&& $y >= 0 && $y < $self->{h};
1684	$self->emit ("activate");
1685	}
1686	}	1817	}
1687		1818
1688	sub _draw {	1819	sub _draw {
1689	my ($self) = @_;	1820	my ($self) = @_;
1690		1821
…		…
1692		1823
1693	if ($GRAB == $self) {	1824	if ($GRAB == $self) {
1694	$self->{fg} = $self->{active_fg};	1825	$self->{fg} = $self->{active_fg};
1695	}	1826	}
1696		1827
1697	glEnable GL_BLEND;
1698	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1699	glEnable GL_TEXTURE_2D;	1828	glEnable GL_TEXTURE_2D;
1700	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1829	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701	glColor 0, 0, 0, 1;	1830	glColor 0, 0, 0, 1;
1702		1831
1703	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1832	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1704		1833
1705	glDisable GL_TEXTURE_2D;	1834	glDisable GL_TEXTURE_2D;
1706	glDisable GL_BLEND;
1707		1835
1708	$self->SUPER::_draw;	1836	$self->SUPER::_draw;
1709	}	1837	}
1710		1838
1711	#############################################################################	1839	#############################################################################
…		…
1725		1853
1726	$class->SUPER::new (	1854	$class->SUPER::new (
1727	padding => 2,	1855	padding => 2,
1728	fg => [1, 1, 1],	1856	fg => [1, 1, 1],
1729	active_fg => [1, 1, 0],	1857	active_fg => [1, 1, 0],
		1858	bg => [0, 0, 0, 0.2],
		1859	active_bg => [1, 1, 1, 0.5],
1730	state => 0,	1860	state => 0,
1731	can_hover => 1,	1861	can_hover => 1,
1732	@_	1862	@_
1733	)	1863	)
1734	}	1864	}
…		…
1743	my ($self, $ev, $x, $y) = @_;	1873	my ($self, $ev, $x, $y) = @_;
1744		1874
1745	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1875	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1746	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1876	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1747	$self->{state} = !$self->{state};	1877	$self->{state} = !$self->{state};
1748	$self->emit (changed => $self->{state});	1878	$self->_emit (changed => $self->{state});
1749	}	1879	}
1750	}	1880	}
1751		1881
1752	sub _draw {	1882	sub _draw {
1753	my ($self) = @_;	1883	my ($self) = @_;
…		…
1758		1888
1759	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1889	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1760		1890
1761	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1891	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1762		1892
1763	glEnable GL_BLEND;	1893	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1894
1764	glEnable GL_TEXTURE_2D;	1895	glEnable GL_TEXTURE_2D;
1765	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1766
1767	my $tex = $self->{state} ? $tex[1] : $tex[0];
1768
1769	$tex->draw_quad (0, 0, $s, $s);	1896	$tex->draw_quad_alpha (0, 0, $s, $s);
1770
1771	glDisable GL_TEXTURE_2D;	1897	glDisable GL_TEXTURE_2D;
1772	glDisable GL_BLEND;
1773	}	1898	}
1774		1899
1775	#############################################################################	1900	#############################################################################
1776		1901
1777	package CFClient::UI::Image;	1902	package CFClient::UI::Image;
…		…
1820	glTranslate 0, -$self->{w}, 0;	1945	glTranslate 0, -$self->{w}, 0;
1821		1946
1822	($w, $h) = ($h, $w);	1947	($w, $h) = ($h, $w);
1823	}	1948	}
1824		1949
1825	glEnable GL_BLEND;
1826	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1827	glEnable GL_TEXTURE_2D;	1950	glEnable GL_TEXTURE_2D;
1828	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1951	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829		1952
1830	$tex->draw_quad (0, 0, $w, $h);	1953	$tex->draw_quad_alpha (0, 0, $w, $h);
1831		1954
1832	glDisable GL_BLEND;
1833	glDisable GL_TEXTURE_2D;	1955	glDisable GL_TEXTURE_2D;
1834	}	1956	}
1835		1957
1836	#############################################################################	1958	#############################################################################
1837		1959
…		…
2026	qw(s1_slider.png s1_slider_bg.png);	2148	qw(s1_slider.png s1_slider_bg.png);
2027		2149
2028	sub new {	2150	sub new {
2029	my $class = shift;	2151	my $class = shift;
2030		2152
2031	# range [value, low, high, page]	2153	# range [value, low, high, page, unit]
2032		2154
2033	# TODO: 0-width page	2155	# TODO: 0-width page
2034	# TODO: req_w/h are wrong with vertical	2156	# TODO: req_w/h are wrong with vertical
2035	# TODO: calculations are off	2157	# TODO: calculations are off
2036	my $self = $class->SUPER::new (	2158	my $self = $class->SUPER::new (
2037	fg => [1, 1, 1],	2159	fg => [1, 1, 1],
2038	active_fg => [0, 0, 0],	2160	active_fg => [0, 0, 0],
		2161	bg => [0, 0, 0, 0.2],
		2162	active_bg => [1, 1, 1, 0.5],
2039	range => [0, 0, 100, 10],	2163	range => [0, 0, 100, 10, 0],
2040	req_w => $::WIDTH / 80,	2164	req_w => $::WIDTH / 80,
2041	req_h => $::WIDTH / 80,	2165	req_h => $::WIDTH / 80,
2042	vertical => 0,	2166	vertical => 0,
2043	can_hover => 1,	2167	can_hover => 1,
2044	inner_pad => 5,	2168	inner_pad => 0.02,
2045	@_	2169	@_
2046	);	2170	);
2047		2171
		2172	$self->set_value ($self->{range}[0]);
		2173	$self->update;
		2174
2048	$self	2175	$self
		2176	}
		2177
		2178	sub changed { }
		2179
		2180	sub set_range {
		2181	my ($self, $range) = @_;
		2182
		2183	($range, $self->{range}) = ($self->{range}, $range);
		2184
		2185	$self->update
		2186	if "@$range" ne "@{$self->{range}}";
		2187	}
		2188
		2189	sub set_value {
		2190	my ($self, $value) = @_;
		2191
		2192	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2193
		2194	$hi = $lo + 1 if $hi <= $lo;
		2195
		2196	$page = $hi - $lo if $page > $hi - $lo;
		2197
		2198	$value = $lo if $value < $lo;
		2199	$value = $hi - $page if $value > $hi - $page;
		2200
		2201	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2202	if $unit;
		2203
		2204	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2205
		2206	if ($value != $old_value) {
		2207	$self->_emit (changed => $value);
		2208	$self->update;
		2209	}
2049	}	2210	}
2050		2211
2051	sub size_request {	2212	sub size_request {
2052	my ($self) = @_;	2213	my ($self) = @_;
2053		2214
…		…
2059		2220
2060	sub button_down {	2221	sub button_down {
2061	my ($self, $ev, $x, $y) = @_;	2222	my ($self, $ev, $x, $y) = @_;
2062		2223
2063	$self->SUPER::button_down ($ev, $x, $y);	2224	$self->SUPER::button_down ($ev, $x, $y);
		2225
		2226	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2227
2064	$self->mouse_motion ($ev, $x, $y);	2228	$self->mouse_motion ($ev, $x, $y);
2065	}	2229	}
2066		2230
2067	sub mouse_motion {	2231	sub mouse_motion {
2068	my ($self, $ev, $x, $y) = @_;	2232	my ($self, $ev, $x, $y) = @_;
2069		2233
2070	if ($GRAB == $self) {	2234	if ($GRAB == $self) {
		2235	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2236
		2237	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2238
		2239	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2240
		2241	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2242	}
		2243	}
		2244
		2245	sub update {
		2246	my ($self) = @_;
		2247
		2248	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2249	$self->set_value ($self->{range}[0]);
		2250
2071	my ($value, $lo, $hi, $page) = @{$self->{range}};	2251	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2252	my $range = ($hi - $page - $lo) || 1e-100;
2072		2253
2073	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2254	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2074		2255
2075	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2256	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2076	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2257	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2077		2258
2078	$x -= $inner_pad_px; # substract the padding	2259	$value = ($value - $lo) / $range;
2079	$x = $x * ($hi - $lo) / $inner_w + $lo;	2260	$value = $value * $self->{scale} + $self->{offset};
2080	$x = $lo if $x < $lo;
2081	$x = $hi - $page if $x > $hi - $page;
2082	$self->{range}[0] = $x;
2083		2261
2084	$self->emit (changed => $x);	2262	$self->{knob_x} = $value - $knob_w * 0.5;
2085	$self->update;	2263	$self->{knob_w} = $knob_w;
2086	}	2264	});
2087	}
2088		2265
2089	# the inner_* stuff is for generating a padding for the slider handle,	2266	$self->SUPER::update;
2090	# so that the handle doesn't leave the texture. This calculation isn't 100%
2091	# correct propably, but it does the job for now
2092	sub _calc_inner_pad_px {
2093	my ($self, $w) = @_;
2094	($w / 100) * $self->{inner_pad} # % to pixels
2095	}	2267	}
2096		2268
2097	sub _draw {	2269	sub _draw {
2098	my ($self) = @_;	2270	my ($self) = @_;
2099		2271
2100	$self->SUPER::_draw ();	2272	$self->SUPER::_draw ();
2101		2273
2102	my ($w, $h) = @$self{qw(w h)};	2274	glScale $self->{w}, $self->{h};
2103		2275
2104	if ($self->{vertical}) {	2276	if ($self->{vertical}) {
2105	# draw a vertical slider like a rotated horizontal slider	2277	# draw a vertical slider like a rotated horizontal slider
2106		2278
		2279	glTranslate 1, 0, 0;
2107	glRotate 90, 0, 0, 1;	2280	glRotate 90, 0, 0, 1;
2108	glTranslate 0, -$self->{w}, 0;
2109
2110	($w, $h) = ($h, $w);
2111	}	2281	}
2112		2282
2113	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2283	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2114	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2284	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2115		2285
2116	my ($value, $lo, $hi, $page) = @{$self->{range}};
2117
2118	$hi = $value + 1 if $lo == $hi;
2119
2120	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2121	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2122
2123	$page = int $page * $inner_w / ($hi - $lo);
2124	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2125
2126	$w -= $page;
2127	$page &= ~1;
2128	glTranslate $page * 0.5, 0, 0;
2129	$page ||= 2;
2130
2131	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2132	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2133
2134	glEnable GL_BLEND;
2135	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2136	glEnable GL_TEXTURE_2D;	2286	glEnable GL_TEXTURE_2D;
2137	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2287	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2138		2288
2139	# draw background	2289	# draw background
2140	$tex[1]->draw_quad (0, 0, $w, $h);	2290	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2141		2291
2142	# draw handle	2292	# draw handle
2143	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2293	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2144		2294
2145	glDisable GL_BLEND;
2146	glDisable GL_TEXTURE_2D;	2295	glDisable GL_TEXTURE_2D;
2147	}	2296	}
		2297
		2298	#############################################################################
		2299
		2300	package CFClient::UI::ValSlider;
		2301
		2302	our @ISA = CFClient::UI::HBox::;
		2303
		2304	sub new {
		2305	my ($class, %arg) = @_;
		2306
		2307	my $range = delete $arg{range};
		2308
		2309	my $self = $class->SUPER::new (
		2310	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2311	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2312	to_value => sub { shift },
		2313	from_value => sub { shift },
		2314	%arg,
		2315	);
		2316
		2317	$self->{slider}->connect (changed => sub {
		2318	my ($self, $value) = @_;
		2319	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2320	$self->{parent}->emit (changed => $value);
		2321	});
		2322
		2323	# $self->{entry}->connect (changed => sub {
		2324	# my ($self, $value) = @_;
		2325	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2326	# $self->{parent}->emit (changed => $value);
		2327	# });
		2328
		2329	$self->add ($self->{slider}, $self->{entry});
		2330
		2331	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2332
		2333	$self
		2334	}
		2335
		2336	sub set_range { shift->{slider}->set_range (@_) }
		2337	sub set_value { shift->{slider}->set_value (@_) }
2148		2338
2149	#############################################################################	2339	#############################################################################
2150		2340
2151	package CFClient::UI::TextView;	2341	package CFClient::UI::TextView;
2152		2342
…		…
2161	fontsize => 1,	2351	fontsize => 1,
2162	can_events => 0,	2352	can_events => 0,
2163	#font => default_font	2353	#font => default_font
2164	@_,	2354	@_,
2165		2355
2166	layout => (new CFClient::Layout),	2356	layout => (new CFClient::Layout 1),
2167	par => [],	2357	par => [],
2168	height => 0,	2358	height => 0,
2169	children => [	2359	children => [
2170	(new CFClient::UI::Empty expand => 1),	2360	(new CFClient::UI::Empty expand => 1),
2171	(new CFClient::UI::Slider vertical => 1),	2361	(new CFClient::UI::Slider vertical => 1),
…		…
2182		2372
2183	$self->{fontsize} = $fontsize;	2373	$self->{fontsize} = $fontsize;
2184	$self->reflow;	2374	$self->reflow;
2185	}	2375	}
2186		2376
2187	sub text_height {
2188	my ($self, $text) = @_;
2189
2190	my $layout = $self->{layout};
2191
2192	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2193	$layout->set_width ($self->{children}[0]{w});
2194	$layout->set_text ($text);
2195
2196	($layout->size)[1]
2197	}
2198
2199	sub reflow {
2200	my ($self) = @_;
2201
2202	$self->{need_reflow}++;
2203	$self->update;
2204	}
2205
2206	sub size_allocate {	2377	sub size_allocate {
2207	my ($self, $w, $h) = @_;	2378	my ($self, $w, $h, $changed) = @_;
2208		2379
2209	$self->SUPER::size_allocate ($w, $h);	2380	$self->SUPER::size_allocate ($w, $h, $changed);
		2381
		2382	return unless $changed;
2210		2383
2211	$self->{layout}->set_font ($self->{font}) if $self->{font};	2384	$self->{layout}->set_font ($self->{font}) if $self->{font};
2212	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2385	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2213	$self->{layout}->set_width ($self->{children}[0]{w});	2386	$self->{layout}->set_width ($self->{children}[0]{w});
2214		2387
2215	$self->reflow;	2388	$self->reflow;
2216	}	2389	}
2217		2390
		2391	sub text_size {
		2392	my ($self, $text, $indent) = @_;
		2393
		2394	my $layout = $self->{layout};
		2395
		2396	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2397	$layout->set_width ($self->{children}[0]{w} - $indent);
		2398	$layout->set_markup ($text);
		2399
		2400	$layout->size
		2401	}
		2402
		2403	sub reflow {
		2404	my ($self) = @_;
		2405
		2406	$self->{need_reflow}++;
		2407	$self->update;
		2408	}
		2409
		2410	sub set_offset {
		2411	my ($self, $offset) = @_;
		2412
		2413	# todo: base offset on lines or so, not on pixels
		2414	$self->{children}[1]->set_value ($offset);
		2415	}
		2416
		2417	sub clear {
		2418	my ($self) = @_;
		2419
		2420	$self->{par} = [];
		2421	$self->{height} = 0;
		2422	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2423	}
		2424
2218	sub add_paragraph {	2425	sub add_paragraph {
2219	my ($self, $color, $text) = @_;	2426	my ($self, $color, $text, $indent) = @_;
2220		2427
2221	#TODO: intelligently "reformat" paragraph	2428	for my $line (split /\n/, $text) {
2222		2429	my ($w, $h) = $self->text_size ($line);
2223	my $height = $self->text_height ($text);
2224
2225	$self->{height} += $height;	2430	$self->{height} += $h;
		2431	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2432	}
2226		2433
2227	push @{$self->{par}}, [$height, $color, $text];
2228
2229	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2434	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2230	$self->{children}[1]->update;
2231	}	2435	}
2232		2436
2233	sub update {	2437	sub update {
2234	my ($self) = @_;	2438	my ($self) = @_;
2235		2439
…		…
2237		2441
2238	return unless $self->{h} > 0;	2442	return unless $self->{h} > 0;
2239		2443
2240	delete $self->{texture};	2444	delete $self->{texture};
2241		2445
2242	$ROOT->on_refresh ($self, sub {	2446	$ROOT->on_post_alloc ($self, sub {
		2447	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2448
2243	if (delete $self->{need_reflow}) {	2449	if (delete $self->{need_reflow}) {
2244	my $height = 0;	2450	my $height = 0;
2245		2451
2246	$height += $_->[0] = $self->text_height ($_->[2])	2452	my $layout = $self->{layout};
		2453
		2454	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2455
2247	for @{$self->{par}};	2456	for (@{$self->{par}}) {
		2457	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2458	$layout->set_width ($W - $_->[3]);
		2459	$layout->set_markup ($_->[4]);
		2460	my ($w, $h) = $layout->size;
		2461	$_->[0] = $w + $_->[3];
		2462	$_->[1] = $h;
		2463	}
		2464
		2465	$height += $_->[1];
		2466	}
2248		2467
2249	$self->{height} = $height;	2468	$self->{height} = $height;
2250		2469
2251	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2470	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2252		2471
2253	delete $self->{texture};	2472	delete $self->{texture};
2254	}	2473	}
2255		2474
2256	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2475	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2257	glClearColor 0, 0, 0, 0;	2476	glClearColor 0.5, 0.5, 0.5, 0;
2258	glClear GL_COLOR_BUFFER_BIT;	2477	glClear GL_COLOR_BUFFER_BIT;
2259		2478
		2479	my $top = int $self->{children}[1]{range}[0];
		2480
		2481	my $y0 = $top;
		2482	my $y1 = $top + $H;
		2483
		2484	my $y = 0;
		2485
		2486	my $layout = $self->{layout};
		2487
		2488	$layout->set_font ($self->{font}) if $self->{font};
		2489
2260	glEnable GL_BLEND;	2490	glEnable GL_BLEND;
		2491	#TODO# not correct in windows where rgba is forced off
2261	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2492	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2262	glEnable GL_TEXTURE_2D;
2263	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2264
2265	my $top = int $self->{children}[1]{range}[0];
2266
2267	my $y0 = $top;
2268	my $y1 = $top + $self->{h};
2269
2270	my $y = 0;
2271
2272	my $layout = $self->{layout};
2273
2274	$layout->set_font ($self->{font}) if $self->{font};
2275		2493
2276	for my $par (@{$self->{par}}) {	2494	for my $par (@{$self->{par}}) {
2277	my $h = $par->[0];	2495	my $h = $par->[1];
2278		2496
2279	if ($y0 < $y + $h && $y < $y1) {	2497	if ($y0 < $y + $h && $y < $y1) {
		2498	$layout->set_foreground (@{ $par->[2] });
		2499	$layout->set_width ($W - $par->[3]);
2280	$layout->set_text ($par->[2]);	2500	$layout->set_markup ($par->[4]);
2281		2501
2282	glColor @{ $par->[1] };	2502	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2283	my ($W, $H) = $layout->size;	2503
2284	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2504	glRasterPos $par->[3], $y - $y0;
		2505	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2285	}	2506	}
2286		2507
2287	$y += $h;	2508	$y += $h;
2288	}	2509	}
2289		2510
2290	glDisable GL_TEXTURE_2D;
2291	glDisable GL_BLEND;	2511	glDisable GL_BLEND;
2292	};	2512	};
2293	});	2513	});
2294	}	2514	}
2295		2515
2296	sub _draw {	2516	sub _draw {
2297	my ($self) = @_;	2517	my ($self) = @_;
2298		2518
2299	glEnable GL_BLEND;
2300	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2301	glEnable GL_TEXTURE_2D;	2519	glEnable GL_TEXTURE_2D;
2302	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2520	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303	glColor 1, 1, 1, 1;	2521	glColor 1, 1, 1, 1;
2304	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2522	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2305	glDisable GL_TEXTURE_2D;	2523	glDisable GL_TEXTURE_2D;
2306	glDisable GL_BLEND;
2307		2524
2308	$self->{children}[1]->draw;	2525	$self->{children}[1]->draw;
2309		2526
2310	}	2527	}
2311		2528
…		…
2359		2576
2360	sub new {	2577	sub new {
2361	my $class = shift;	2578	my $class = shift;
2362		2579
2363	my $self = $class->SUPER::new (	2580	my $self = $class->SUPER::new (
2364	state => 0,	2581	state => 0,
2365	connect_activate => \&toggle_flopper,	2582	on_activate => \&toggle_flopper,
2366	@_	2583	@_
2367	);	2584	);
2368		2585
2369	if ($self->{state}) {
2370	$self->{state} = 0;
2371	$self->toggle_flopper;
2372	}
2373
2374	$self	2586	$self
2375	}	2587	}
2376		2588
2377	sub toggle_flopper {	2589	sub toggle_flopper {
2378	my ($self) = @_;	2590	my ($self) = @_;
2379		2591
2380	# TODO: use animation	2592	$self->{other}->toggle_visibility;
2381	if ($self->{state} = !$self->{state}) {
2382	$CFClient::UI::ROOT->add ($self->{other});
2383	$self->{other}->move ($self->coord2global (0, $self->{h}));
2384	$self->emit ("open");
2385	} else {
2386	$CFClient::UI::ROOT->remove ($self->{other});
2387	$self->emit ("close");
2388	}
2389
2390	$self->emit (changed => $self->{state});
2391	}	2593	}
2392		2594
2393	#############################################################################	2595	#############################################################################
2394		2596
2395	package CFClient::UI::Tooltip;	2597	package CFClient::UI::Tooltip;
…		…
2405	@_,	2607	@_,
2406	can_events => 0,	2608	can_events => 0,
2407	)	2609	)
2408	}	2610	}
2409		2611
2410	sub set_markup {	2612	sub set_tooltip_from {
2411	my ($self, $text) = @_;	2613	my ($self, $widget) = @_;
2412		2614
2413	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2615	$self->add (new CFClient::UI::Label
2414	$self->{label}->set_markup ($text);	2616	markup => $widget->{tooltip},
2415	$self->add ($self->{label});	2617	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2618	fontsize => 0.8,
		2619	fg => [0, 0, 0, 1],
		2620	ellipsise => 0,
		2621	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2622	);
2416	}	2623	}
2417		2624
2418	sub size_request {	2625	sub size_request {
2419	my ($self) = @_;	2626	my ($self) = @_;
2420		2627
2421	$self->child->set_max_size ($::WIDTH * 0.3);
2422
2423	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2628	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2424		2629
2425	($w + 4, $h + 4)	2630	($w + 4, $h + 4)
2426	}	2631	}
2427		2632
2428	sub size_allocate {	2633	sub size_allocate {
2429	my ($self, $w, $h) = @_;	2634	my ($self, $w, $h, $changed) = @_;
2430		2635
		2636	return unless $changed;
		2637
2431	$self->SUPER::size_allocate ($w - 4, $h - 4);	2638	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
		2639	}
		2640
		2641	sub visibility_change {
		2642	my ($self, $visible) = @_;
		2643
		2644	return unless $visible;
		2645
		2646	$self->{root}->on_post_alloc ("move_$self" => sub {
		2647	my $widget = $self->{owner}
		2648	or return;
		2649
		2650	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2651
		2652	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2653	if $x + $self->{w} > $::WIDTH;
		2654
		2655	$self->move ($x, $y);
		2656	});
2432	}	2657	}
2433		2658
2434	sub _draw {	2659	sub _draw {
2435	my ($self) = @_;	2660	my ($self) = @_;
2436		2661
2437	glPushMatrix;
2438	glTranslate 0.375, 0.375;	2662	glTranslate 0.375, 0.375;
2439		2663
2440	my ($w, $h) = @$self{qw(w h)};	2664	my ($w, $h) = @$self{qw(w h)};
2441		2665
2442	glColor 1, 0.8, 0.4;	2666	glColor 1, 0.8, 0.4;
…		…
2453	glVertex 0 , $h;	2677	glVertex 0 , $h;
2454	glVertex $w, $h;	2678	glVertex $w, $h;
2455	glVertex $w, 0;	2679	glVertex $w, 0;
2456	glEnd;	2680	glEnd;
2457		2681
2458	glPopMatrix;	2682	glTranslate 2 - 0.375, 2 - 0.375;
2459		2683
2460	glTranslate 2, 2;
2461	$self->SUPER::_draw;	2684	$self->SUPER::_draw;
2462	}	2685	}
2463		2686
2464	#############################################################################	2687	#############################################################################
2465		2688
…		…
2470	use CFClient::OpenGL;	2693	use CFClient::OpenGL;
2471		2694
2472	sub new {	2695	sub new {
2473	my $class = shift;	2696	my $class = shift;
2474		2697
2475	$class->SUPER::new (	2698	my $self = $class->SUPER::new (
2476	aspect => 1,	2699	aspect => 1,
		2700	can_events => 0,
2477	@_,	2701	@_,
2478	)	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
2479	}	2719	}
2480		2720
2481	sub size_request {	2721	sub size_request {
2482	(32, 8)	2722	(32, 8)
2483	}	2723	}
2484		2724
		2725	sub update {
		2726	my ($self) = @_;
		2727
		2728	return unless $self->{visible};
		2729
		2730	$self->SUPER::update;
		2731	}
		2732
2485	sub _draw {	2733	sub _draw {
2486	my ($self) = @_;	2734	my ($self) = @_;
2487		2735
		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
2488	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2747	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2489		2748
2490	# TODO animation
2491	if ($tex) {	2749	if ($tex) {
2492	glEnable GL_BLEND;
2493	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2494	glEnable GL_TEXTURE_2D;	2750	glEnable GL_TEXTURE_2D;
2495	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2751	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2496	glColor 1, 1, 1, 1;	2752	glColor 1, 1, 1, 1;
2497	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2753	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2498	glDisable GL_TEXTURE_2D;	2754	glDisable GL_TEXTURE_2D;
2499	glDisable GL_BLEND;	2755	}
		2756	}
		2757
		2758	sub DESTROY {
		2759	my ($self) = @_;
		2760
		2761	$self->{timer}->cancel
		2762	if $self->{timer};
		2763
		2764	$self->SUPER::DESTROY;
		2765	}
		2766
		2767	#############################################################################
		2768
		2769	package CFClient::UI::Inventory;
		2770
		2771	our @ISA = CFClient::UI::ScrolledWindow::;
		2772
		2773	sub new {
		2774	my $class = shift;
		2775
		2776	my $self = $class->SUPER::new (
		2777	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		2778	@_,
		2779	);
		2780
		2781	$self
		2782	}
		2783
		2784	sub set_items {
		2785	my ($self, $items) = @_;
		2786
		2787	$self->{scrolled}->clear;
		2788	return unless $items;
		2789
		2790	my @items = sort {
		2791	($a->{type} <=> $b->{type})
		2792	or ($a->{name} cmp $b->{name})
		2793	} @$items;
		2794
		2795	$self->{real_items} = \@items;
		2796
		2797	my $row = 0;
		2798	for my $item (@items) {
		2799	CFClient::Item::update_widgets $item;
		2800
		2801	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2802	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2803	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		2804
		2805	$row++;
2500	}	2806	}
2501	}	2807	}
2502		2808
2503	#############################################################################	2809	#############################################################################
2504		2810
…		…
2540		2846
2541	# popup given the event (must be a mouse button down event currently)	2847	# popup given the event (must be a mouse button down event currently)
2542	sub popup {	2848	sub popup {
2543	my ($self, $ev) = @_;	2849	my ($self, $ev) = @_;
2544		2850
2545	$self->emit ("popdown");	2851	$self->_emit ("popdown");
2546		2852
2547	# maybe save $GRAB? must be careful about events...	2853	# maybe save $GRAB? must be careful about events...
2548	$GRAB = $self;	2854	$GRAB = $self;
2549	$self->{button} = $ev->{button};	2855	$self->{button} = $ev->{button};
2550		2856
…		…
2565		2871
2566	if ($ev->{button} == $self->{button}) {	2872	if ($ev->{button} == $self->{button}) {
2567	undef $GRAB;	2873	undef $GRAB;
2568	$self->hide;	2874	$self->hide;
2569		2875
2570	$self->emit ("popdown");	2876	$self->_emit ("popdown");
2571	$self->{hover}[1]->() if $self->{hover};	2877	$self->{hover}[1]->() if $self->{hover};
2572	}	2878	}
2573	}	2879	}
2574		2880
2575	#############################################################################	2881	#############################################################################
2576		2882
		2883	package CFClient::UI::Statusbox;
		2884
		2885	our @ISA = CFClient::UI::VBox::;
		2886
		2887	sub new {
		2888	my $class = shift;
		2889
		2890	$class->SUPER::new (
		2891	fontsize => 0.8,
		2892	@_,
		2893	)
		2894	}
		2895
		2896	sub reorder {
		2897	my ($self) = @_;
		2898	my $NOW = time;
		2899
		2900	while (my ($k, $v) = each %{ $self->{item} }) {
		2901	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2902	}
		2903
		2904	my @widgets;
		2905
		2906	my @items = sort {
		2907	$a->{pri} <=> $b->{pri}
		2908	or $b->{id} <=> $a->{id}
		2909	} values %{ $self->{item} };
		2910
		2911	my $count = 10 + 1;
		2912	for my $item (@items) {
		2913	last unless --$count;
		2914
		2915	push @widgets, $item->{label} ||= do {
		2916	# TODO: doesn't handle markup well (read as: at all)
		2917	my $short = $item->{count} > 1
		2918	? "<b>$item->{count} ×</b> $item->{text}"
		2919	: $item->{text};
		2920
		2921	for ($short) {
		2922	s/^\s+//;
		2923	s/\s+/ /g;
		2924	}
		2925
		2926	new CFClient::UI::Label
		2927	markup => $short,
		2928	tooltip => $item->{tooltip},
		2929	tooltip_font => $::FONT_PROP,
		2930	tooltip_width => 0.67,
		2931	fontsize => $item->{fontsize} || $self->{fontsize},
		2932	max_w => $::WIDTH * 0.44,
		2933	fg => $item->{fg},
		2934	can_events => 1,
		2935	can_hover => 1
		2936	};
		2937	}
		2938
		2939	$self->clear;
		2940	$self->SUPER::add (reverse @widgets);
		2941	}
		2942
		2943	sub add {
		2944	my ($self, $text, %arg) = @_;
		2945
		2946	$text =~ s/^\s+//;
		2947	$text =~ s/\s+$//;
		2948
		2949	return unless $text;
		2950
		2951	my $timeout = time + ((delete $arg{timeout}) || 60);
		2952
		2953	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2954
		2955	if (my $item = $self->{item}{$group}) {
		2956	if ($item->{text} eq $text) {
		2957	$item->{count}++;
		2958	} else {
		2959	$item->{count} = 1;
		2960	$item->{text} = $item->{tooltip} = $text;
		2961	}
		2962	$item->{id} = ++$self->{id};
		2963	$item->{timeout} = $timeout;
		2964	delete $item->{label};
		2965	} else {
		2966	$self->{item}{$group} = {
		2967	id => ++$self->{id},
		2968	text => $text,
		2969	timeout => $timeout,
		2970	tooltip => $text,
		2971	fg => [0.8, 0.8, 0.8, 0.8],
		2972	pri => 0,
		2973	count => 1,
		2974	%arg,
		2975	};
		2976	}
		2977
		2978	$self->reorder;
		2979	}
		2980
		2981	sub reconfigure {
		2982	my ($self) = @_;
		2983
		2984	delete $_->{label}
		2985	for values %{ $self->{item} || {} };
		2986
		2987	$self->reorder;
		2988	$self->SUPER::reconfigure;
		2989	}
		2990
		2991	#############################################################################
		2992
2577	package CFClient::UI::Root;	2993	package CFClient::UI::Root;
2578		2994
2579	our @ISA = CFClient::UI::Container::;	2995	our @ISA = CFClient::UI::Container::;
2580		2996
2581	use CFClient::OpenGL;	2997	use CFClient::OpenGL;
2582		2998
2583	sub check_size {	2999	sub new {
2584	my ($self) = @_;	3000	my $class = shift;
2585		3001
2586	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	3002	my $self = $class->SUPER::new (
2587	}	3003	visible => 1,
		3004	@_,
		3005	);
2588		3006
2589	sub size_request {	3007	Scalar::Util::weaken ($self->{root} = $self);
2590	($::WIDTH, $::HEIGHT)	3008
		3009	$self
2591	}	3010	}
2592		3011
2593	sub configure {	3012	sub configure {
2594	my ($self, $x, $y, $w, $h) = @_;	3013	my ($self, $x, $y, $w, $h) = @_;
2595		3014
2596	$self->SUPER::configure ($x, $y, $w, $h);	3015	$self->{w} = $w;
		3016	$self->{h} = $h;
		3017	}
2597		3018
		3019	sub reconfigure {
		3020	my ($self) = @_;
		3021
		3022	$self->SUPER::reconfigure;
		3023
		3024	$self->size_allocate ($self->{w}, $self->{h}, 1)
		3025	if $self->{w};
		3026	}
		3027
		3028	sub size_request {
		3029	my ($self) = @_;
		3030
		3031	($self->{w}, $self->{h})
		3032	}
		3033
		3034	sub size_allocate {
		3035	my ($self, $w, $h, $changed) = @_;
		3036
2598	for my $child (@{$self->{children}}) {	3037	for my $child ($self->children) {
2599	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3038	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2600		3039
		3040	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3041	if exists $child->{req_x};
		3042
		3043	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3044	if exists $child->{req_y};
		3045
		3046	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
		3047
2601	$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;
2602	$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
2603	$child->configure ($X, $Y, $W,$H);	3051	$child->configure ($X, $Y, $W, $H);
2604	}	3052	}
2605	}	3053	}
2606		3054
2607	sub _topleft {	3055	sub coord2local {
2608	my ($self, $x, $y) = @_;	3056	my ($self, $x, $y) = @_;
2609		3057
2610	($x, $y)	3058	($x, $y)
2611	}	3059	}
2612		3060
		3061	sub coord2global {
		3062	my ($self, $x, $y) = @_;
		3063
		3064	($x, $y)
		3065	}
		3066
2613	sub update {	3067	sub update {
2614	my ($self) = @_;	3068	my ($self) = @_;
2615		3069
2616	$self->check_size;	3070	$::WANT_REFRESH++;
2617	::refresh ();
2618	}	3071	}
2619		3072
2620	sub add {	3073	sub add {
2621	my ($self, $child) = @_;	3074	my ($self, @children) = @_;
2622		3075
		3076	for my $child (@children) {
		3077	$child->{is_toplevel} = 1;
		3078
2623	# integerize window positions	3079	# integerise window positions
2624	$child->{x} = int $child->{x};	3080	$child->{x} = int $child->{x};
2625	$child->{y} = int $child->{y};	3081	$child->{y} = int $child->{y};
		3082	}
2626		3083
2627	$self->SUPER::add ($child);	3084	$self->SUPER::add (@children);
		3085	}
		3086
		3087	sub remove {
		3088	my ($self, @children) = @_;
		3089
		3090	$self->SUPER::remove (@children);
		3091
		3092	while (@children) {
		3093	my $w = pop @children;
		3094	push @children, $w->children;
		3095	$w->set_invisible;
		3096	}
2628	}	3097	}
2629		3098
2630	sub on_refresh {	3099	sub on_refresh {
2631	my ($self, $id, $cb) = @_;	3100	my ($self, $id, $cb) = @_;
2632		3101
2633	$self->{refresh_hook}{$id} = $cb;	3102	$self->{refresh_hook}{$id} = $cb;
2634	}	3103	}
2635		3104
		3105	sub on_post_alloc {
		3106	my ($self, $id, $cb) = @_;
		3107
		3108	$self->{post_alloc_hook}{$id} = $cb;
		3109	}
		3110
2636	sub draw {	3111	sub draw {
2637	my ($self) = @_;	3112	my ($self) = @_;
2638		3113
2639	while (my $rcb = delete $self->{refresh_hook}) {	3114	while ($self->{refresh_hook}) {
2640	$_->() for values %$rcb;	3115	$_->()
		3116	for values %{delete $self->{refresh_hook}};
		3117	}
		3118
		3119	if ($self->{realloc}) {
		3120	my @queue;
		3121
		3122	while () {
		3123	if ($self->{realloc}) {
		3124	#TODO use array-of-depth approach
		3125
		3126	@queue = sort { $a->{visible} <=> $b->{visible} }
		3127	@queue, values %{delete $self->{realloc}};
		3128	}
		3129
		3130	my $widget = pop @queue || last;
		3131
		3132	$widget->{visible} or last; # do not resize invisible widgets
		3133
		3134	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
		3135	? @$widget{qw(def_w def_h)}
		3136	: $widget->size_request;
		3137
		3138	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3139
		3140	$widget->{req_w} = $w;
		3141	$widget->{req_h} = $h;
		3142
		3143	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		3144
		3145	push @queue, $widget->{parent}
		3146	if $widget->{parent};
		3147	}
		3148	}
		3149
		3150	while (my $size_alloc = delete $self->{size_alloc}) {
		3151	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
		3152	values %$size_alloc;
		3153
		3154	while () {
		3155	my ($widget, $w, $h) = @{ pop @queue or last };
		3156
		3157	$w = 0 if $w < 0;
		3158	$h = 0 if $h < 0;
		3159
		3160	my $changed = $widget->{w} != $w || $widget->{h} != $h;
		3161
		3162	$widget->{w} = $w;
		3163	$widget->{h} = $h;
		3164
		3165	$widget->emit (size_allocate => $w, $h, $changed);
		3166	}
		3167	}
		3168
		3169	while ($self->{post_alloc_hook}) {
		3170	$_->()
		3171	for values %{delete $self->{post_alloc_hook}};
2641	}	3172	}
2642		3173
2643	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3174	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2644	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3175	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2645	glClear GL_COLOR_BUFFER_BIT;	3176	glClear GL_COLOR_BUFFER_BIT;
2646		3177
2647	glMatrixMode GL_PROJECTION;	3178	glMatrixMode GL_PROJECTION;
2648	glLoadIdentity;	3179	glLoadIdentity;
2649	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3180	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2650	glMatrixMode GL_MODELVIEW;	3181	glMatrixMode GL_MODELVIEW;
2651	glLoadIdentity;	3182	glLoadIdentity;
2652		3183
2653	$self->_draw;	3184	$self->_draw;
2654	}	3185	}
2655		3186
2656	#############################################################################	3187	#############################################################################
2657		3188
2658	package CFClient::UI::InventoryItem;
2659
2660	our @ISA = CFClient::UI::HBox::;
2661
2662	sub new {
2663	my $class = shift;
2664
2665	my %args = @_;
2666
2667	my $item = $args{item};
2668
2669	my $desc = $item->{nrof} < 2
2670	? $item->{name}
2671	: "$item->{nrof} $item->{name_pl}";
2672
2673
2674	my $self = $class->SUPER::new (
2675	can_hover => 1,
2676	can_events => 1,
2677	tooltip => (CFClient::UI::Label->escape ($desc)
2678	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2679	connect_button_down => sub {
2680	my ($self, $ev, $x, $y) = @_;
2681
2682	# todo: maybe put examine on 1? but should just be a tooltip :(
2683	if ($ev->{button} == 1) {
2684	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2685	} elsif ($ev->{button} == 2) {
2686	$::CONN->send ("apply $item->{tag}");
2687	} elsif ($ev->{button} == 3) {
2688	CFClient::UI::Menu->new (
2689	items => [
2690	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2691	[
2692	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2693	sub { $::CONN->send ("lock $item->{tag}") },
2694	],
2695	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2696	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2697	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2698	],
2699	)->popup ($ev);
2700	}
2701
2702	1
2703	},
2704	%args
2705	);
2706	$self->add(new CFClient::UI::Face
2707	can_events => 0,
2708	face => $item->{face},
2709	anim => $item->{anim},
2710	animspeed => $item->{animspeed});
2711	$self->add(new CFClient::UI::Label
2712	can_events => 0,
2713	text => $desc);
2714
2715	$self
2716	}
2717
2718	#############################################################################
2719
2720	package CFClient::UI::Inventory;
2721
2722	our @ISA = CFClient::UI::ScrolledWindow::;
2723
2724	sub new {
2725	my $class = shift;
2726
2727	my $self = $class->SUPER::new (
2728	scrolled => (new CFClient::UI::VBox),
2729	@_,
2730	);
2731
2732	$self
2733	}
2734
2735	sub set_items {
2736	my ($self, $items) = @_;
2737
2738	$self->{scrolled}->clear;
2739	return unless $items;
2740
2741	my @items = sort { $a->{type} <=> $b->{type} } @$items;
2742
2743	$self->{real_items} = \@items;
2744
2745	for my $item (@items) {
2746	my $desc = $item->{nrof} < 2
2747	? $item->{name}
2748	: "$item->{nrof} $item->{name_pl}";
2749
2750	$self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2751	}
2752
2753	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2754	}
2755
2756	sub size_request {
2757	my ($self) = @_;
2758	($self->{req_w}, $self->{req_h});
2759	}
2760
2761	#############################################################################
2762
2763	package CFClient::UI;	3189	package CFClient::UI;
2764		3190
2765	$ROOT = new CFClient::UI::Root;	3191	$ROOT = new CFClient::UI::Root;
2766	$TOOLTIP = new CFClient::UI::Tooltip;	3192	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2767		3193
2768	1	3194	1
2769		3195

Diff Legend

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