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.197 by root, Fri May 12 01:47:04 2006 UTC vs.
Revision 1.253 by root, Sun May 28 23:28:12 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
		18
		19	our %WIDGET; # all widgets, weak-referenced
		20
		21	sub get_layout {
		22	for (grep { $_->{name} } values %WIDGET) {
		23	$LAYOUT->{$_->{name}} = {
		24	x => $_->{x} / $::WIDTH,
		25	y => $_->{y} / $::HEIGHT,
		26	w => $_->{w} / $::WIDTH,
		27	h => $_->{h} / $::HEIGHT
		28	};
		29	}
		30
		31	return $LAYOUT;
		32	}
		33
		34	sub set_layout {
		35	my ($layout) = @_;
		36	$LAYOUT = $layout;
		37	}
16		38
17	sub check_tooltip {	39	sub check_tooltip {
18	if (!$GRAB) {	40	if (!$GRAB) {
19	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
21		43
22	if ($TOOLTIP->{owner} != $widget) {	44	if ($TOOLTIP->{owner} != $widget) {
		45	$TOOLTIP->hide;
		46
23	$TOOLTIP->{owner} = $widget;	47	$TOOLTIP->{owner} = $widget;
24		48
25	my $tip = $widget->{tooltip};	49	my $tip = $widget->{tooltip};
26		50
27	$tip = $tip->($widget) if CODE:: eq ref $tip;	51	$tip = $tip->($widget) if CODE:: eq ref $tip;
28		52
29	$TOOLTIP->set_tooltip_from ($widget);	53	$TOOLTIP->set_tooltip_from ($widget);
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	$TOOLTIP->check_size;
40	$TOOLTIP->update;
41	}	55	}
42		56
43	return;	57	return;
44	}	58	}
45	}	59	}
…		…
49	delete $TOOLTIP->{owner};	63	delete $TOOLTIP->{owner};
50	}	64	}
51		65
52	# class methods for events	66	# class methods for events
53	sub feed_sdl_key_down_event {	67	sub feed_sdl_key_down_event {
54	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	68	$FOCUS->emit (key_down => $_[0])
55	if $FOCUS;	69	if $FOCUS;
56	}	70	}
57		71
58	sub feed_sdl_key_up_event {	72	sub feed_sdl_key_up_event {
59	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	73	$FOCUS->emit (key_up => $_[0])
60	if $FOCUS;	74	if $FOCUS;
61	}	75	}
62		76
63	sub feed_sdl_button_down_event {	77	sub feed_sdl_button_down_event {
64	my ($ev) = @_;	78	my ($ev) = @_;
…		…
73	check_tooltip;	87	check_tooltip;
74	}	88	}
75		89
76	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	90	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
77		91
78	if ($GRAB) {	92	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
79	($x, $y) = $GRAB->coord2local ($x, $y);	93	if $GRAB;
80	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81	}
82	}	94	}
83		95
84	sub feed_sdl_button_up_event {	96	sub feed_sdl_button_up_event {
85	my ($ev) = @_;	97	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	98	my ($x, $y) = ($ev->{x}, $ev->{y});
87		99
88	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	100	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
89		101
90	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	102	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91		103
92	if ($GRAB) {	104	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93	($x, $y) = $GRAB->coord2local ($x, $y);	105	if $GRAB;
94	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95	}
96		106
97	if (!$BUTTON_STATE) {	107	if (!$BUTTON_STATE) {
98	my $grab = $GRAB; undef $GRAB;	108	my $grab = $GRAB; undef $GRAB;
99	$grab->update if $grab;	109	$grab->update if $grab;
100	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
…		…
116	$HOVER->update if $HOVER && $HOVER->{can_hover};	126	$HOVER->update if $HOVER && $HOVER->{can_hover};
117		127
118	check_tooltip;	128	check_tooltip;
119	}	129	}
120		130
121	if ($HOVER) {
122	($x, $y) = $HOVER->coord2local ($x, $y);
123	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	131	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
124	}	132	if $HOVER;
125	}	133	}
126		134
127	# convert position array to integers	135	# convert position array to integers
128	sub harmonize {	136	sub harmonize {
129	my ($vals) = @_;	137	my ($vals) = @_;
…		…
133	for (@$vals) {	141	for (@$vals) {
134	my $i = int $_ + $rem;	142	my $i = int $_ + $rem;
135	$rem += $_ - $i;	143	$rem += $_ - $i;
136	$_ = $i;	144	$_ = $i;
137	}	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;
138	}	180	}
139		181
140	#############################################################################	182	#############################################################################
141		183
142	package CFClient::UI::Base;	184	package CFClient::UI::Base;
…		…
155	can_events => 1,	197	can_events => 1,
156	@_	198	@_
157	}, $class;	199	}, $class;
158		200
159	for (keys %$self) {	201	for (keys %$self) {
160	if (/^connect_(.*)$/) {	202	if (/^on_(.*)$/) {
161	$self->connect ($1 => delete $self->{$_});	203	$self->connect ($1 => delete $self->{$_});
162	}	204	}
163	}	205	}
164		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
165	$self	216	$self
166	}	217	}
167		218
168	sub destroy {	219	sub destroy {
169	my ($self) = @_;	220	my ($self) = @_;
…		…
178	return if $self->{parent};	229	return if $self->{parent};
179		230
180	$CFClient::UI::ROOT->add ($self);	231	$CFClient::UI::ROOT->add ($self);
181	}	232	}
182		233
183	sub hide {	234	sub center {
184	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};
185		270
186	undef $GRAB if $GRAB == $self;	271	undef $GRAB if $GRAB == $self;
187	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;
188		303
189	$self->{parent}->remove ($self)	304	$self->{parent}->remove ($self)
190	if $self->{parent};	305	if $self->{parent};
191	}	306	}
192		307
…		…
201	}	316	}
202		317
203	sub set_size {	318	sub set_size {
204	my ($self, $w, $h) = @_;	319	my ($self, $w, $h) = @_;
205		320
206	$self->{user_w} = $w;	321	$self->{def_w} = $w;
207	$self->{user_h} = $h;	322	$self->{def_h} = $h;
208		323
209	$self->check_size;	324	$self->realloc;
210	}	325	}
211		326
212	sub size_request {	327	sub size_request {
213	require Carp;	328	require Carp;
214	Carp::confess "size_request is abstract";	329	Carp::confess "size_request is abstract";
…		…
234	$self->{y} = $y;	349	$self->{y} = $y;
235	$self->update;	350	$self->update;
236	}	351	}
237		352
238	if ($self->{w} != $w || $self->{h} != $h) {	353	if ($self->{w} != $w || $self->{h} != $h) {
		354	return unless $self->{visible};
		355
239	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	356	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
240	}	357	}
241	}	358	}
242		359
243	sub size_allocate {	360	sub size_allocate {
244	# nothing to be done	361	# nothing to be done
245	}	362	}
246		363
247	sub children {	364	sub children {
248	}	365	}
249		366
250	# call when resolution changes etc.
251	sub reconfigure {
252	my ($self) = @_;
253
254	$_->reconfigure
255	for $self->children;
256
257	$self->check_size;
258	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
259	$self->update;
260	}
261
262	sub set_max_size {	367	sub set_max_size {
263	my ($self, $w, $h) = @_;	368	my ($self, $w, $h) = @_;
264		369
265	delete $self->{max_w}; $self->{max_w} = $w if $w;	370	delete $self->{max_w}; $self->{max_w} = $w if $w;
266	delete $self->{max_h}; $self->{max_h} = $h if $h;	371	delete $self->{max_h}; $self->{max_h} = $h if $h;
		372	}
		373
		374	sub set_tooltip {
		375	my ($self, $tooltip) = @_;
		376
		377	$tooltip =~ s/^\s+//;
		378	$tooltip =~ s/\s+$//;
		379
		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	}
267	}	388	}
268		389
269	# translate global coordinates to local coordinate system	390	# translate global coordinates to local coordinate system
270	sub coord2local {	391	sub coord2local {
271	my ($self, $x, $y) = @_;	392	my ($self, $x, $y) = @_;
…		…
286	return if $FOCUS == $self;	407	return if $FOCUS == $self;
287	return unless $self->{can_focus};	408	return unless $self->{can_focus};
288		409
289	my $focus = $FOCUS; $FOCUS = $self;	410	my $focus = $FOCUS; $FOCUS = $self;
290		411
291	$self->emit (focus_in => $focus);	412	$self->_emit (focus_in => $focus);
292		413
293	$focus->update if $focus;	414	$focus->update if $focus;
294	$FOCUS->update;	415	$FOCUS->update;
295	}	416	}
296		417
…		…
299		420
300	return unless $FOCUS == $self;	421	return unless $FOCUS == $self;
301		422
302	my $focus = $FOCUS; undef $FOCUS;	423	my $focus = $FOCUS; undef $FOCUS;
303		424
304	$self->emit (focus_out => $focus);	425	$self->_emit (focus_out => $focus);
305		426
306	$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;
307	}	431	}
308		432
309	sub mouse_motion { }	433	sub mouse_motion { }
310	sub button_up { }	434	sub button_up { }
311	sub key_down { }	435	sub key_down { }
312	sub key_up { }	436	sub key_up { }
313		437
314	sub button_down {	438	sub button_down {
315	my ($self, $ev, $x, $y) = @_;	439	my ($self, $ev, $x, $y) = @_;
316		440
317	$self->focus_in;	441	$self->focus_in;
…		…
320	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	444	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
321	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	445	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
322	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	446	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
323	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	447	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
324	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	}
325		512
326	sub draw {	513	sub draw {
327	my ($self) = @_;	514	my ($self) = @_;
328		515
329	return unless $self->{h} && $self->{w};	516	return unless $self->{h} && $self->{w};
…		…
351	if ($ENV{PCLIENT_DEBUG}) {	538	if ($ENV{PCLIENT_DEBUG}) {
352	glPushMatrix;	539	glPushMatrix;
353	glColor 1, 1, 0, 1;	540	glColor 1, 1, 0, 1;
354	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	541	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
355	glBegin GL_LINE_LOOP;	542	glBegin GL_LINE_LOOP;
356	glVertex 0 , 0;	543	glVertex 0 , 0;
357	glVertex $self->{w}, 0;	544	glVertex $self->{w} - 1, 0;
358	glVertex $self->{w}, $self->{h};	545	glVertex $self->{w} - 1, $self->{h} - 1;
359	glVertex 0 , $self->{h};	546	glVertex 0 , $self->{h} - 1;
360	glEnd;	547	glEnd;
361	glPopMatrix;	548	glPopMatrix;
362	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;
363	}	550	}
364	}	551	}
365		552
366	sub _draw {	553	sub _draw {
367	my ($self) = @_;	554	my ($self) = @_;
368		555
369	warn "no draw defined for $self\n";	556	warn "no draw defined for $self\n";
370	}	557	}
371		558
372	sub find_widget {
373	my ($self, $x, $y) = @_;
374
375	return () unless $self->{can_events};
376
377	return $self
378	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
379	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
380
381	()
382	}
383
384	sub set_parent {
385	my ($self, $parent) = @_;
386
387	Scalar::Util::weaken ($self->{parent} = $parent);
388
389	$self->check_size
390	unless exists $self->{req_w};
391	}
392
393	sub check_size {
394	my ($self, $forced) = @_;
395
396	$self->{force_alloc} = 1 if $forced;
397	$CFClient::UI::ROOT->{check_size}{$self} = $self;
398	}
399
400	sub update {
401	my ($self) = @_;
402
403	$self->{parent}->update
404	if $self->{parent};
405	}
406
407	sub connect {
408	my ($self, $signal, $cb) = @_;
409
410	push @{ $self->{signal_cb}{$signal} }, $cb;
411	}
412
413	sub emit {
414	my ($self, $signal, @args) = @_;
415
416	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
417	}
418
419	sub DESTROY {	559	sub DESTROY {
420	my ($self) = @_;	560	my ($self) = @_;
421		561
		562	delete $WIDGET{$self+0};
422	#$self->deactivate;	563	#$self->deactivate;
423	}	564	}
424		565
425	#############################################################################	566	#############################################################################
426		567
…		…
435	my $class = shift;	576	my $class = shift;
436		577
437	# range [value, low, high, page]	578	# range [value, low, high, page]
438		579
439	$class->SUPER::new (	580	$class->SUPER::new (
440	bg => [0, 0, 0, 0.2],	581	#bg => [0, 0, 0, 0.2],
441	active_bg => [1, 1, 1, 0.5],	582	#active_bg => [1, 1, 1, 0.5],
442	@_	583	@_
443	)	584	)
444	}	585	}
445		586
446	sub _draw {	587	sub _draw {
447	my ($self) = @_;	588	my ($self) = @_;
448		589
		590	my $color = $FOCUS == $self && $self->{active_bg}
		591	? $self->{active_bg}
		592	: $self->{bg};
		593
		594	if ($color && (@$color < 4 || $color->[3])) {
449	my ($w, $h) = @$self{qw(w h)};	595	my ($w, $h) = @$self{qw(w h)};
450		596
451	glEnable GL_BLEND;	597	glEnable GL_BLEND;
452	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	598	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	599	glColor @$color;
454		600
455	glBegin GL_QUADS;	601	glBegin GL_QUADS;
456	glVertex 0 , 0;	602	glVertex 0 , 0;
457	glVertex 0 , $h;	603	glVertex 0 , $h;
458	glVertex $w, $h;	604	glVertex $w, $h;
459	glVertex $w, 0;	605	glVertex $w, 0;
460	glEnd;	606	glEnd;
461		607
462	glDisable GL_BLEND;	608	glDisable GL_BLEND;
		609	}
463	}	610	}
464		611
465	#############################################################################	612	#############################################################################
466		613
467	package CFClient::UI::Empty;	614	package CFClient::UI::Empty;
…		…
511	$self->{children} = [	658	$self->{children} = [
512	sort { $a->{z} <=> $b->{z} }	659	sort { $a->{z} <=> $b->{z} }
513	@{$self->{children}}, @widgets	660	@{$self->{children}}, @widgets
514	];	661	];
515		662
516	$self->check_size (1);	663	$self->realloc;
517	$self->update;
518	}	664	}
519		665
520	sub children {	666	sub children {
521	@{ $_[0]{children} }	667	@{ $_[0]{children} }
522	}	668	}
…		…
527	delete $child->{parent};	673	delete $child->{parent};
528	$child->hide;	674	$child->hide;
529		675
530	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	676	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531		677
532	$self->check_size;	678	$self->realloc;
533	$self->update;
534	}	679	}
535		680
536	sub clear {	681	sub clear {
537	my ($self) = @_;	682	my ($self) = @_;
538		683
…		…
542	for (@$children) {	687	for (@$children) {
543	delete $_->{parent};	688	delete $_->{parent};
544	$_->hide;	689	$_->hide;
545	}	690	}
546		691
547	$self->check_size;	692	$self->realloc;
548	$self->update;
549	}	693	}
550		694
551	sub find_widget {	695	sub find_widget {
552	my ($self, $x, $y) = @_;	696	my ($self, $x, $y) = @_;
553		697
…		…
606	sub size_request {	750	sub size_request {
607	$_[0]{children}[0]->size_request	751	$_[0]{children}[0]->size_request
608	}	752	}
609		753
610	sub size_allocate {	754	sub size_allocate {
611	my ($self, $w, $h) = @_;	755	my ($self, $w, $h, $changed) = @_;
612		756
613	$self->{children}[0]->configure (0, 0, $w, $h);	757	$self->{children}[0]->configure (0, 0, $w, $h);
614	}	758	}
615		759
616	#############################################################################	760	#############################################################################
…		…
628	}	772	}
629		773
630	sub update {	774	sub update {
631	my ($self) = @_;	775	my ($self) = @_;
632		776
633	$ROOT->on_refresh ($self => sub { $self->render_child });	777	$ROOT->on_post_alloc ($self => sub { $self->render_child });
634	$self->SUPER::update;	778	$self->SUPER::update;
635	}	779	}
636		780
637	sub size_allocate {	781	sub size_allocate {
638	my ($self, $w, $h) = @_;	782	my ($self, $w, $h, $changed) = @_;
639		783
640	$self->SUPER::size_allocate ($w, $h);	784	$self->SUPER::size_allocate ($w, $h, $changed);
641	$self->update;	785	$self->update
		786	if $changed;
642	}	787	}
643		788
644	sub _render {	789	sub _render {
645	$_[0]{children}[0]->draw;	790	$_[0]{children}[0]->draw;
646	}	791	}
…		…
651	$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 {
652	glClearColor 0, 0, 0, 0;	797	glClearColor 0, 0, 0, 0;
653	glClear GL_COLOR_BUFFER_BIT;	798	glClear GL_COLOR_BUFFER_BIT;
654		799
655	$self->_render;	800	$self->_render;
656	# glColorMask 1, 1, 1, 0;
657	# glEnable GL_BLEND;
658	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659	# glRasterPos 0, 0;
660	# glCopyPixels 0, 0, $self->{w}, $self->{h};
661	# glDisable GL_BLEND;
662	# glColorMask 1, 1, 1, 1;
663	};	801	};
664	}	802	}
665		803
666	sub _draw {	804	sub _draw {
667	my ($self) = @_;	805	my ($self) = @_;
…		…
671	my $tex = $self->{texture}	809	my $tex = $self->{texture}
672	or return;	810	or return;
673		811
674	glEnable GL_TEXTURE_2D;	812	glEnable GL_TEXTURE_2D;
675	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676	glColor 0, 0, 0, 1;	814	glColor 1, 1, 1, 1;
677		815
678	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	816	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679		817
680	glDisable GL_TEXTURE_2D;	818	glDisable GL_TEXTURE_2D;
681	}	819	}
…		…
684		822
685	package CFClient::UI::ViewPort;	823	package CFClient::UI::ViewPort;
686		824
687	our @ISA = CFClient::UI::Window::;	825	our @ISA = CFClient::UI::Window::;
688		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
689	sub size_request {	837	sub size_request {
690	my ($self) = @_;	838	my ($self) = @_;
691		839
692	@$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)};
693	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
694		841
695	@$self{qw(child_w child_h)}	842	$w = 10 if $self->{scroll_x};
		843	$h = 10 if $self->{scroll_y};
		844
		845	($w, $h)
696	}	846	}
697		847
698	sub size_allocate {	848	sub size_allocate {
699	my ($self, $w, $h) = @_;	849	my ($self, $w, $h, $changed) = @_;
700		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);
701	$self->update;	855	$self->update;
702	}	856	}
703		857
704	sub set_offset {	858	sub set_offset {
705	my ($self, $x, $y) = @_;	859	my ($self, $x, $y) = @_;
…		…
756	my $class = shift;	910	my $class = shift;
757		911
758	my $self;	912	my $self;
759		913
760	my $slider = new CFClient::UI::Slider	914	my $slider = new CFClient::UI::Slider
761	vertical => 1,	915	vertical => 1,
762	range => [0, 0, 1, 0.01], # HACK fix	916	range => [0, 0, 1, 0.01], # HACK fix
763	connect_changed => sub {	917	on_changed => sub {
764	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	918	$self->{vp}->set_offset (0, $_[1]);
765	},	919	},
766	;	920	;
767		921
768	$self = $class->SUPER::new (	922	$self = $class->SUPER::new (
769	vp => (new CFClient::UI::ViewPort),	923	vp => (new CFClient::UI::ViewPort expand => 1),
770	slider => $slider,	924	slider => $slider,
771	@_,	925	@_,
772	);	926	);
773		927
774	$self->{vp}->add ($self->{scrolled});	928	$self->{vp}->add ($self->{scrolled});
…		…
776	$self->add ($self->{slider});	930	$self->add ($self->{slider});
777		931
778	$self	932	$self
779	}	933	}
780		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
781	#TODO# update range on size_allocate depeneing on child	954	#TODO# update range on size_allocate depending on child
782	# update viewport offset on scroll	955	# update viewport offset on scroll
783		956
784	#############################################################################	957	#############################################################################
785		958
786	package CFClient::UI::Frame;	959	package CFClient::UI::Frame;
787		960
788	our @ISA = CFClient::UI::Bin::;	961	our @ISA = CFClient::UI::Bin::;
789		962
790	use CFClient::OpenGL;	963	use CFClient::OpenGL;
		964
		965	sub new {
		966	my $class = shift;
		967
		968	$class->SUPER::new (
		969	bg => undef,
		970	@_,
		971	)
		972	}
		973
		974	sub _draw {
		975	my ($self) = @_;
		976
		977	if ($self->{bg}) {
		978	my ($w, $h) = @$self{qw(w h)};
		979
		980	glEnable GL_BLEND;
		981	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		982	glColor @{ $self->{bg} };
		983
		984	glBegin GL_QUADS;
		985	glVertex 0 , 0;
		986	glVertex 0 , $h;
		987	glVertex $w, $h;
		988	glVertex $w, 0;
		989	glEnd;
		990
		991	glDisable GL_BLEND;
		992	}
		993
		994	$self->SUPER::_draw;
		995	}
791		996
792	#############################################################################	997	#############################################################################
793		998
794	package CFClient::UI::FancyFrame;	999	package CFClient::UI::FancyFrame;
795		1000
…		…
802	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);
803		1008
804	sub new {	1009	sub new {
805	my $class = shift;	1010	my $class = shift;
806		1011
807	# TODO: user_x, user_y, overwrite moveto?
808
809	my $self = $class->SUPER::new (	1012	my $self = $class->SUPER::new (
810	bg => [1, 1, 1, 1],	1013	bg => [1, 1, 1, 1],
811	border_bg => [1, 1, 1, 1],	1014	border_bg => [1, 1, 1, 1],
812	border => 0.6,	1015	border => 0.6,
		1016	is_toplevel => 1,
813	can_events => 1,	1017	can_events => 1,
814	@_	1018	@_
815	);	1019	);
816		1020
817	$self->{title} &&= new CFClient::UI::Label	1021	$self->{title} &&= new CFClient::UI::Label
818	align => 0,	1022	align => 0,
…		…
837	$h + $self->border * 2,	1041	$h + $self->border * 2,
838	)	1042	)
839	}	1043	}
840		1044
841	sub size_allocate {	1045	sub size_allocate {
842	my ($self, $w, $h) = @_;	1046	my ($self, $w, $h, $changed) = @_;
		1047
		1048	return unless $changed;
843		1049
844	$h -= List::Util::max 0, $self->border * 2;	1050	$h -= List::Util::max 0, $self->border * 2;
845	$w -= List::Util::max 0, $self->border * 2;	1051	$w -= List::Util::max 0, $self->border * 2;
846		1052
847	$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)
848	if $self->{title};	1054	if $self->{title};
849		1055
850	$self->child->configure ($self->border, $self->border, $w, $h);	1056	$self->child->configure ($self->border, $self->border, $w, $h);
851	}	1057	}
852		1058
…		…
871	my ($ev, $x, $y) = @_;	1077	my ($ev, $x, $y) = @_;
872		1078
873	my $dx = $ev->{x} - $ox;	1079	my $dx = $ev->{x} - $ox;
874	my $dy = $ev->{y} - $oy;	1080	my $dy = $ev->{y} - $oy;
875		1081
		1082	$self->{user_x} = $wx + $dx * $mx;
		1083	$self->{user_y} = $wy + $dy * $my;
876	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1084	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
877	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1085	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
878	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1086	$self->move ($self->{user_x}, $self->{user_y});
879	$self->check_size;	1087	$self->realloc;
880	};	1088	};
881		1089
882	} elsif ($lr ^ $td) {	1090	} elsif ($lr ^ $td) {
883	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1091	my ($ox, $oy) = ($ev->{x}, $ev->{y});
884	my ($bx, $by) = ($self->{x}, $self->{y});	1092	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
886	$self->{motion} = sub {	1094	$self->{motion} = sub {
887	my ($ev, $x, $y) = @_;	1095	my ($ev, $x, $y) = @_;
888		1096
889	($x, $y) = ($ev->{x}, $ev->{y});	1097	($x, $y) = ($ev->{x}, $ev->{y});
890		1098
891	$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});
892	$self->update;	1103	$self->realloc;
893	};	1104	};
894	}	1105	}
895	}	1106	}
896		1107
897	sub button_up {	1108	sub button_up {
…		…
958	sub new {	1169	sub new {
959	my $class = shift;	1170	my $class = shift;
960		1171
961	$class->SUPER::new (	1172	$class->SUPER::new (
962	col_expand => [],	1173	col_expand => [],
963	@_	1174	@_,
964	)	1175	)
		1176	}
		1177
		1178	sub children {
		1179	grep $_, map @$_, grep $_, @{ $_[0]{children} }
965	}	1180	}
966		1181
967	sub add {	1182	sub add {
968	my ($self, $x, $y, $child) = @_;	1183	my ($self, $x, $y, $child) = @_;
969		1184
970	$child->set_parent ($self);	1185	$child->set_parent ($self);
971	$self->{children}[$y][$x] = $child;	1186	$self->{children}[$y][$x] = $child;
972		1187
973	$child->check_size;	1188	$self->realloc;
974	}	1189	}
975		1190
976	sub children {
977	grep $_, map @$_, grep $_, @{ $_[0]{children} }
978	}
979
980	# 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?
981	sub clear {	1192	sub clear {
982	my ($self) = @_;	1193	my ($self) = @_;
983		1194
984	my @children = $self->children;	1195	my @children = $self->children;
985	delete $self->{children};	1196	delete $self->{children};
…		…
987	for (@children) {	1198	for (@children) {
988	delete $_->{parent};	1199	delete $_->{parent};
989	$_->hide;	1200	$_->hide;
990	}	1201	}
991		1202
992	$self->update;	1203	$self->realloc;
993	}	1204	}
994		1205
995	sub get_wh {	1206	sub get_wh {
996	my ($self) = @_;	1207	my ($self) = @_;
997		1208
…		…
1024	(sum @$hs),	1235	(sum @$hs),
1025	)	1236	)
1026	}	1237	}
1027		1238
1028	sub size_allocate {	1239	sub size_allocate {
1029	my ($self, $w, $h) = @_;	1240	my ($self, $w, $h, $changed) = @_;
1030		1241
1031	my ($ws, $hs) = $self->get_wh;	1242	my ($ws, $hs) = $self->get_wh;
1032		1243
1033	my $req_w = sum @$ws;	1244	my $req_w = (sum @$ws) || 1;
1034	my $req_h = sum @$hs;	1245	my $req_h = (sum @$hs) || 1;
1035		1246
1036	# TODO: nicer code && do row_expand	1247	# TODO: nicer code && do row_expand
1037	my @col_expand = @{$self->{col_expand}};	1248	my @col_expand = @{$self->{col_expand}};
1038	@col_expand = (1) x @$ws unless @col_expand;	1249	@col_expand = (1) x @$ws unless @col_expand;
1039	my $col_expand = (sum @col_expand) || 1;	1250	my $col_expand = (sum @col_expand) || 1;
…		…
1093	}	1304	}
1094	}	1305	}
1095		1306
1096	#############################################################################	1307	#############################################################################
1097		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
1098	package CFClient::UI::HBox;	1369	package CFClient::UI::HBox;
1099		1370
1100	# TODO: wrap into common Box base class
1101
1102	our @ISA = CFClient::UI::Container::;	1371	our @ISA = CFClient::UI::Box::;
1103		1372
1104	sub size_request {	1373	sub new {
1105	my ($self) = @_;	1374	my $class = shift;
1106		1375
1107	my @alloc = map [$_->size_request], @{$self->{children}};	1376	$class->SUPER::new (
1108		1377	vertical => 0,
1109	(	1378	@_,
1110	(List::Util::sum map $_->[0], @alloc),
1111	(List::Util::max map $_->[1], @alloc),
1112	)	1379	)
1113	}	1380	}
1114		1381
1115	sub size_allocate {
1116	my ($self, $w, $h) = @_;
1117
1118	($h, $w) = ($w, $h);
1119
1120	my $children = $self->{children};
1121
1122	my @h = map $_->{req_w}, @$children;
1123
1124	my $req_h = List::Util::sum @h;
1125
1126	if ($req_h > $h) {
1127	# ah well, not enough space
1128	$_ *= $h / $req_h for @h;
1129	} else {
1130	my $exp = List::Util::sum map $_->{expand}, @$children;
1131	$exp ||= 1;
1132
1133	for (0 .. $#$children) {
1134	my $child = $children->[$_];
1135
1136	my $alloc_h = $h[$_];
1137	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1138	$h[$_] = $alloc_h;
1139	}
1140	}
1141
1142	CFClient::UI::harmonize \@h;
1143
1144	my $y = 0;
1145	for (0 .. $#$children) {
1146	my $child = $children->[$_];
1147	my $h = $h[$_];
1148	$child->configure ($y, 0, $h, $w);
1149
1150	$y += $h;
1151	}
1152
1153	1
1154	}
1155
1156	#############################################################################	1382	#############################################################################
1157		1383
1158	package CFClient::UI::VBox;	1384	package CFClient::UI::VBox;
1159		1385
1160	# TODO: wrap into common Box base class
1161
1162	our @ISA = CFClient::UI::Container::;	1386	our @ISA = CFClient::UI::Box::;
1163		1387
1164	sub size_request {	1388	sub new {
1165	my ($self) = @_;	1389	my $class = shift;
1166		1390
1167	my @alloc = map [$_->size_request], @{$self->{children}};	1391	$class->SUPER::new (
1168		1392	vertical => 1,
1169	(	1393	@_,
1170	(List::Util::max map $_->[0], @alloc),
1171	(List::Util::sum map $_->[1], @alloc),
1172	)	1394	)
1173	}	1395	}
1174		1396
1175	sub size_allocate {
1176	my ($self, $w, $h) = @_;
1177
1178	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1179
1180	my $children = $self->{children};
1181
1182	my @h = map $_->{req_h}, @$children;
1183
1184	my $req_h = List::Util::sum @h;
1185
1186	if ($req_h > $h) {
1187	# ah well, not enough space
1188	$_ *= $h / $req_h for @h;
1189	} else {
1190	my $exp = List::Util::sum map $_->{expand}, @$children;
1191	$exp ||= 1;
1192
1193	for (0 .. $#$children) {
1194	my $child = $children->[$_];
1195
1196	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1197	}
1198	}
1199
1200	CFClient::UI::harmonize \@h;
1201
1202	my $y = 0;
1203	for (0 .. $#$children) {
1204	my $child = $children->[$_];
1205	my $h = $h[$_];
1206	$child->configure (0, $y, $w, $h);
1207
1208	$y += $h;
1209	}
1210
1211	1
1212	}
1213
1214	#############################################################################	1397	#############################################################################
1215		1398
1216	package CFClient::UI::Label;	1399	package CFClient::UI::Label;
1217		1400
1218	our @ISA = CFClient::UI::Base::;	1401	our @ISA = CFClient::UI::DrawBG::;
1219		1402
1220	use CFClient::OpenGL;	1403	use CFClient::OpenGL;
1221		1404
1222	sub new {	1405	sub new {
1223	my ($class, %arg) = @_;	1406	my ($class, %arg) = @_;
1224		1407
1225	my $self = $class->SUPER::new (	1408	my $self = $class->SUPER::new (
1226	fg => [1, 1, 1],	1409	fg => [1, 1, 1],
		1410	#bg => none
		1411	#active_bg => none
1227	#font => default_font	1412	#font => default_font
1228	#text => initial text	1413	#text => initial text
1229	#markup => initial narkup	1414	#markup => initial narkup
		1415	#max_w => maximum pixel width
		1416	ellipsise => 3, # end
1230	layout => (new CFClient::Layout),	1417	layout => (new CFClient::Layout),
1231	fontsize => 1,	1418	fontsize => 1,
1232	align => -1,	1419	align => -1,
1233	valign => -1,	1420	valign => -1,
1234	padding => 2,	1421	padding => 2,
…		…
1249	}	1436	}
1250		1437
1251	$self	1438	$self
1252	}	1439	}
1253		1440
1254	sub escape {	1441	sub escape($) {
1255	local $_ = $_[1];	1442	local $_ = $_[0];
1256		1443
1257	s/&/&amp;/g;	1444	s/&/&amp;/g;
1258	s/>/&gt;/g;	1445	s/>/&gt;/g;
1259	s/</&lt;/g;	1446	s/</&lt;/g;
1260		1447
1261	$_[1]	1448	$_
1262	}	1449	}
1263		1450
1264	sub update {	1451	sub update {
1265	my ($self) = @_;	1452	my ($self) = @_;
1266		1453
…		…
1275	$self->{text} = "T$text";	1462	$self->{text} = "T$text";
1276		1463
1277	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1464	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1278	$self->{layout}->set_text ($text);	1465	$self->{layout}->set_text ($text);
1279		1466
		1467	$self->realloc;
1280	$self->update;	1468	$self->update;
1281	$self->check_size;
1282	}	1469	}
1283		1470
1284	sub set_markup {	1471	sub set_markup {
1285	my ($self, $markup) = @_;	1472	my ($self, $markup) = @_;
1286		1473
…		…
1290	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1477	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1291		1478
1292	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1479	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1293	$self->{layout}->set_markup ($markup);	1480	$self->{layout}->set_markup ($markup);
1294		1481
		1482	$self->realloc;
1295	$self->update;	1483	$self->update;
1296	$self->check_size;
1297	}	1484	}
1298		1485
1299	sub size_request {	1486	sub size_request {
1300	my ($self) = @_;	1487	my ($self) = @_;
1301		1488
1302	$self->{layout}->set_font ($self->{font}) if $self->{font};	1489	$self->{layout}->set_font ($self->{font}) if $self->{font};
1303	$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});
1304	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1493	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1305		1494
1306	my ($w, $h) = $self->{layout}->size;	1495	my ($w, $h) = $self->{layout}->size;
1307		1496
1308	if (exists $self->{template}) {	1497	if (exists $self->{template}) {
…		…
1320	$h + $self->{padding} * 2,	1509	$h + $self->{padding} * 2,
1321	)	1510	)
1322	}	1511	}
1323		1512
1324	sub size_allocate {	1513	sub size_allocate {
1325	my ($self, $w, $h) = @_;	1514	my ($self, $w, $h, $changed) = @_;
1326		1515
1327	delete $self->{texture};	1516	delete $self->{texture}
		1517	if $changed;
1328	}	1518	}
1329		1519
1330	sub set_fontsize {	1520	sub set_fontsize {
1331	my ($self, $fontsize) = @_;	1521	my ($self, $fontsize) = @_;
1332		1522
1333	$self->{fontsize} = $fontsize;	1523	$self->{fontsize} = $fontsize;
1334	delete $self->{texture};	1524	delete $self->{texture};
1335		1525
1336	$self->update;	1526	$self->realloc;
1337	$self->check_size;
1338	}	1527	}
1339		1528
1340	sub _draw {	1529	sub _draw {
1341	my ($self) = @_;	1530	my ($self) = @_;
		1531
		1532	$self->SUPER::_draw; # draw background, if applicable
1342		1533
1343	my $tex = $self->{texture} ||= do {	1534	my $tex = $self->{texture} ||= do {
1344	$self->{layout}->set_foreground (@{$self->{fg}});	1535	$self->{layout}->set_foreground (@{$self->{fg}});
1345	$self->{layout}->set_font ($self->{font}) if $self->{font};	1536	$self->{layout}->set_font ($self->{font}) if $self->{font};
1346	$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});
1347	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1540	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1348		1541
1349	my $tex = new_from_layout CFClient::Texture $self->{layout};	1542	my $tex = new_from_layout CFClient::Texture $self->{layout};
1350		1543
1351	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1544	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1352	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1545	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1353	: ($self->{w} - $tex->{w}) * 0.5;	1546	: ($self->{w} - $tex->{w}) * 0.5);
1354		1547
1355	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1548	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1356	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1549	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1357	: ($self->{h} - $tex->{h}) * 0.5;	1550	: ($self->{h} - $tex->{h}) * 0.5);
1358		1551
1359	$tex	1552	$tex
1360	};	1553	};
1361		1554
1362	glEnable GL_TEXTURE_2D;	1555	glEnable GL_TEXTURE_2D;
…		…
1390	active_fg => [0, 0, 0],	1583	active_fg => [0, 0, 0],
1391	can_hover => 1,	1584	can_hover => 1,
1392	can_focus => 1,	1585	can_focus => 1,
1393	valign => 0,	1586	valign => 0,
1394	can_events => 1,	1587	can_events => 1,
		1588	#text => ...
1395	@_	1589	@_
1396	)	1590	)
1397	}	1591	}
1398		1592
1399	sub _set_text {	1593	sub _set_text {
…		…
1409	$self->{text} = $text;	1603	$self->{text} = $text;
1410		1604
1411	$text =~ s/./*/g if $self->{hidden};	1605	$text =~ s/./*/g if $self->{hidden};
1412	$self->{layout}->set_text ("$text ");	1606	$self->{layout}->set_text ("$text ");
1413		1607
1414	$self->emit (changed => $self->{text});	1608	$self->_emit (changed => $self->{text});
1415	}	1609	}
1416		1610
1417	sub set_text {	1611	sub set_text {
1418	my ($self, $text) = @_;	1612	my ($self, $text) = @_;
1419		1613
1420	$self->{cursor} = length $text;	1614	$self->{cursor} = length $text;
1421	$self->_set_text ($text);	1615	$self->_set_text ($text);
1422	$self->check_size;	1616
1423	$self->update;	1617	$self->realloc;
1424	}	1618	}
1425		1619
1426	sub get_text {	1620	sub get_text {
1427	$_[0]{text}	1621	$_[0]{text}
1428	}	1622	}
…		…
1431	my ($self) = @_;	1625	my ($self) = @_;
1432		1626
1433	my ($w, $h) = $self->SUPER::size_request;	1627	my ($w, $h) = $self->SUPER::size_request;
1434		1628
1435	($w + 1, $h) # add 1 for cursor	1629	($w + 1, $h) # add 1 for cursor
1436	}
1437
1438	sub size_allocate {
1439	my ($self, $w, $h) = @_;
1440
1441	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1442	}	1630	}
1443		1631
1444	sub key_down {	1632	sub key_down {
1445	my ($self, $ev) = @_;	1633	my ($self, $ev) = @_;
1446		1634
…		…
1448	my $sym = $ev->{sym};	1636	my $sym = $ev->{sym};
1449	my $uni = $ev->{unicode};	1637	my $uni = $ev->{unicode};
1450		1638
1451	my $text = $self->get_text;	1639	my $text = $self->get_text;
1452		1640
1453	if ($sym == 8) {	1641	if ($uni == 8) {
1454	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1642	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1455	} elsif ($sym == 127) {	1643	} elsif ($uni == 127) {
1456	substr $text, $self->{cursor}, 1, "";	1644	substr $text, $self->{cursor}, 1, "";
1457	} elsif ($sym == CFClient::SDLK_LEFT) {	1645	} elsif ($sym == CFClient::SDLK_LEFT) {
1458	--$self->{cursor} if $self->{cursor};	1646	--$self->{cursor} if $self->{cursor};
1459	} elsif ($sym == CFClient::SDLK_RIGHT) {	1647	} elsif ($sym == CFClient::SDLK_RIGHT) {
1460	++$self->{cursor} if $self->{cursor} < length $self->{text};	1648	++$self->{cursor} if $self->{cursor} < length $self->{text};
1461	} elsif ($sym == CFClient::SDLK_HOME) {	1649	} elsif ($sym == CFClient::SDLK_HOME) {
1462	$self->{cursor} = 0;	1650	$self->{cursor} = 0;
1463	} elsif ($sym == CFClient::SDLK_END) {	1651	} elsif ($sym == CFClient::SDLK_END) {
1464	$self->{cursor} = length $text;	1652	$self->{cursor} = length $text;
1465	} elsif ($sym == 27) {	1653	} elsif ($uni == 27) {
1466	$self->emit ('escape');	1654	$self->_emit ('escape');
1467	} elsif ($uni) {	1655	} elsif ($uni) {
1468	substr $text, $self->{cursor}++, 0, chr $uni;	1656	substr $text, $self->{cursor}++, 0, chr $uni;
1469	}	1657	}
1470		1658
1471	$self->_set_text ($text);	1659	$self->_set_text ($text);
1472	$self->update;	1660
		1661	$self->realloc;
1473	}	1662	}
1474		1663
1475	sub focus_in {	1664	sub focus_in {
1476	my ($self) = @_;	1665	my ($self) = @_;
1477		1666
…		…
1557	if ($sym == 13) {	1746	if ($sym == 13) {
1558	unshift @{$self->{history}},	1747	unshift @{$self->{history}},
1559	my $txt = $self->get_text;	1748	my $txt = $self->get_text;
1560	$self->{history_pointer} = -1;	1749	$self->{history_pointer} = -1;
1561	$self->{history_saveback} = '';	1750	$self->{history_saveback} = '';
1562	$self->emit (activate => $txt);	1751	$self->_emit (activate => $txt);
1563	$self->update;	1752	$self->update;
1564		1753
1565	} elsif ($sym == CFClient::SDLK_UP) {	1754	} elsif ($sym == CFClient::SDLK_UP) {
1566	if ($self->{history_pointer} < 0) {	1755	if ($self->{history_pointer} < 0) {
1567	$self->{history_saveback} = $self->get_text;	1756	$self->{history_saveback} = $self->get_text;
…		…
1606	my $class = shift;	1795	my $class = shift;
1607		1796
1608	$class->SUPER::new (	1797	$class->SUPER::new (
1609	padding => 4,	1798	padding => 4,
1610	fg => [1, 1, 1],	1799	fg => [1, 1, 1],
1611	bg => [1, 1, 1, 0.2],
1612	active_fg => [0, 0, 1],	1800	active_fg => [0, 0, 1],
1613	can_hover => 1,	1801	can_hover => 1,
1614	align => 0,	1802	align => 0,
1615	valign => 0,	1803	valign => 0,
1616	can_events => 1,	1804	can_events => 1,
1617	@_	1805	@_
1618	)	1806	)
1619	}	1807	}
1620		1808
		1809	sub activate { }
		1810
1621	sub button_up {	1811	sub button_up {
1622	my ($self, $ev, $x, $y) = @_;	1812	my ($self, $ev, $x, $y) = @_;
1623		1813
		1814	$self->emit ("activate")
1624	if ($x >= 0 && $x < $self->{w}	1815	if $x >= 0 && $x < $self->{w}
1625	&& $y >= 0 && $y < $self->{h}) {	1816	&& $y >= 0 && $y < $self->{h};
1626	$self->emit ("activate");
1627	}
1628	}	1817	}
1629		1818
1630	sub _draw {	1819	sub _draw {
1631	my ($self) = @_;	1820	my ($self) = @_;
1632		1821
…		…
1664		1853
1665	$class->SUPER::new (	1854	$class->SUPER::new (
1666	padding => 2,	1855	padding => 2,
1667	fg => [1, 1, 1],	1856	fg => [1, 1, 1],
1668	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],
1669	state => 0,	1860	state => 0,
1670	can_hover => 1,	1861	can_hover => 1,
1671	@_	1862	@_
1672	)	1863	)
1673	}	1864	}
…		…
1682	my ($self, $ev, $x, $y) = @_;	1873	my ($self, $ev, $x, $y) = @_;
1683		1874
1684	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1875	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1685	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1876	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1686	$self->{state} = !$self->{state};	1877	$self->{state} = !$self->{state};
1687	$self->emit (changed => $self->{state});	1878	$self->_emit (changed => $self->{state});
1688	}	1879	}
1689	}	1880	}
1690		1881
1691	sub _draw {	1882	sub _draw {
1692	my ($self) = @_;	1883	my ($self) = @_;
…		…
1957	qw(s1_slider.png s1_slider_bg.png);	2148	qw(s1_slider.png s1_slider_bg.png);
1958		2149
1959	sub new {	2150	sub new {
1960	my $class = shift;	2151	my $class = shift;
1961		2152
1962	# range [value, low, high, page]	2153	# range [value, low, high, page, unit]
1963		2154
1964	# TODO: 0-width page	2155	# TODO: 0-width page
1965	# TODO: req_w/h are wrong with vertical	2156	# TODO: req_w/h are wrong with vertical
1966	# TODO: calculations are off	2157	# TODO: calculations are off
1967	my $self = $class->SUPER::new (	2158	my $self = $class->SUPER::new (
1968	fg => [1, 1, 1],	2159	fg => [1, 1, 1],
1969	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],
1970	range => [0, 0, 100, 10],	2163	range => [0, 0, 100, 10, 0],
1971	req_w => $::WIDTH / 80,	2164	req_w => $::WIDTH / 80,
1972	req_h => $::WIDTH / 80,	2165	req_h => $::WIDTH / 80,
1973	vertical => 0,	2166	vertical => 0,
1974	can_hover => 1,	2167	can_hover => 1,
1975	inner_pad => 5,	2168	inner_pad => 0.02,
1976	@_	2169	@_
1977	);	2170	);
1978		2171
		2172	$self->set_value ($self->{range}[0]);
		2173	$self->update;
		2174
1979	$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	}
1980	}	2210	}
1981		2211
1982	sub size_request {	2212	sub size_request {
1983	my ($self) = @_;	2213	my ($self) = @_;
1984		2214
…		…
1990		2220
1991	sub button_down {	2221	sub button_down {
1992	my ($self, $ev, $x, $y) = @_;	2222	my ($self, $ev, $x, $y) = @_;
1993		2223
1994	$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
1995	$self->mouse_motion ($ev, $x, $y);	2228	$self->mouse_motion ($ev, $x, $y);
1996	}	2229	}
1997		2230
1998	sub mouse_motion {	2231	sub mouse_motion {
1999	my ($self, $ev, $x, $y) = @_;	2232	my ($self, $ev, $x, $y) = @_;
2000		2233
2001	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
2002	my ($value, $lo, $hi, $page) = @{$self->{range}};	2251	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2252	my $range = ($hi - $page - $lo) || 1e-100;
2003		2253
2004	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2254	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2005		2255
2006	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2256	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2007	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2257	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2008		2258
2009	$x -= $inner_pad_px; # substract the padding	2259	$value = ($value - $lo) / $range;
2010	$x = $x * ($hi - $lo) / $inner_w + $lo;	2260	$value = $value * $self->{scale} + $self->{offset};
2011	$x = $lo if $x < $lo;
2012	$x = $hi - $page if $x > $hi - $page;
2013	$self->{range}[0] = $x;
2014		2261
2015	$self->emit (changed => $x);	2262	$self->{knob_x} = $value - $knob_w * 0.5;
2016	$self->update;	2263	$self->{knob_w} = $knob_w;
2017	}	2264	});
2018	}
2019		2265
2020	# the inner_* stuff is for generating a padding for the slider handle,	2266	$self->SUPER::update;
2021	# so that the handle doesn't leave the texture. This calculation isn't 100%
2022	# correct propably, but it does the job for now
2023	sub _calc_inner_pad_px {
2024	my ($self, $w) = @_;
2025	($w / 100) * $self->{inner_pad} # % to pixels
2026	}	2267	}
2027		2268
2028	sub _draw {	2269	sub _draw {
2029	my ($self) = @_;	2270	my ($self) = @_;
2030		2271
2031	$self->SUPER::_draw ();	2272	$self->SUPER::_draw ();
2032		2273
2033	my ($w, $h) = @$self{qw(w h)};	2274	glScale $self->{w}, $self->{h};
2034		2275
2035	if ($self->{vertical}) {	2276	if ($self->{vertical}) {
2036	# draw a vertical slider like a rotated horizontal slider	2277	# draw a vertical slider like a rotated horizontal slider
2037		2278
		2279	glTranslate 1, 0, 0;
2038	glRotate 90, 0, 0, 1;	2280	glRotate 90, 0, 0, 1;
2039	glTranslate 0, -$self->{w}, 0;
2040
2041	($w, $h) = ($h, $w);
2042	}	2281	}
2043		2282
2044	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2283	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2045	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2284	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2046		2285
2047	my ($value, $lo, $hi, $page) = @{$self->{range}};
2048
2049	$hi = $value + 1 if $lo == $hi;
2050
2051	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2052	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2053
2054	$page = int $page * $inner_w / ($hi - $lo);
2055	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2056
2057	$w -= $page;
2058	$page &= ~1;
2059	glTranslate $page * 0.5, 0, 0;
2060	$page ||= 2;
2061
2062	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2063	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2064
2065	glEnable GL_TEXTURE_2D;	2286	glEnable GL_TEXTURE_2D;
2066	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2287	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2067		2288
2068	# draw background	2289	# draw background
2069	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2290	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2070		2291
2071	# draw handle	2292	# draw handle
2072	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2293	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2073		2294
2074	glDisable GL_TEXTURE_2D;	2295	glDisable GL_TEXTURE_2D;
2075	}	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 (@_) }
2076		2338
2077	#############################################################################	2339	#############################################################################
2078		2340
2079	package CFClient::UI::TextView;	2341	package CFClient::UI::TextView;
2080		2342
…		…
2110		2372
2111	$self->{fontsize} = $fontsize;	2373	$self->{fontsize} = $fontsize;
2112	$self->reflow;	2374	$self->reflow;
2113	}	2375	}
2114		2376
2115	sub text_height {
2116	my ($self, $text) = @_;
2117
2118	my $layout = $self->{layout};
2119
2120	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2121	$layout->set_width ($self->{children}[0]{w});
2122	$layout->set_markup ($text);
2123
2124	($layout->size)[1]
2125	}
2126
2127	sub reflow {
2128	my ($self) = @_;
2129
2130	$self->{need_reflow}++;
2131	$self->update;
2132	}
2133
2134	sub size_allocate {	2377	sub size_allocate {
2135	my ($self, $w, $h) = @_;	2378	my ($self, $w, $h, $changed) = @_;
2136		2379
2137	$self->SUPER::size_allocate ($w, $h);	2380	$self->SUPER::size_allocate ($w, $h, $changed);
		2381
		2382	return unless $changed;
2138		2383
2139	$self->{layout}->set_font ($self->{font}) if $self->{font};	2384	$self->{layout}->set_font ($self->{font}) if $self->{font};
2140	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2385	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2141	$self->{layout}->set_width ($self->{children}[0]{w});	2386	$self->{layout}->set_width ($self->{children}[0]{w});
2142		2387
2143	$self->reflow;	2388	$self->reflow;
2144	}	2389	}
2145		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
2146	sub add_paragraph {	2425	sub add_paragraph {
2147	my ($self, $color, $text) = @_;	2426	my ($self, $color, $text, $indent) = @_;
2148		2427
2149	#TODO: intelligently "reformat" paragraph	2428	for my $line (split /\n/, $text) {
2150		2429	my ($w, $h) = $self->text_size ($line);
2151	my $height = $self->text_height ($text);
2152
2153	$self->{height} += $height;	2430	$self->{height} += $h;
		2431	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2432	}
2154		2433
2155	push @{$self->{par}}, [$height, $color, $text];
2156
2157	$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]);
2158	$self->{children}[1]->update;
2159	}	2435	}
2160		2436
2161	sub update {	2437	sub update {
2162	my ($self) = @_;	2438	my ($self) = @_;
2163		2439
…		…
2165		2441
2166	return unless $self->{h} > 0;	2442	return unless $self->{h} > 0;
2167		2443
2168	delete $self->{texture};	2444	delete $self->{texture};
2169		2445
2170	$ROOT->on_refresh ($self, sub {	2446	$ROOT->on_post_alloc ($self, sub {
		2447	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2448
2171	if (delete $self->{need_reflow}) {	2449	if (delete $self->{need_reflow}) {
2172	my $height = 0;	2450	my $height = 0;
2173		2451
2174	$height += $_->[0] = $self->text_height ($_->[2])	2452	my $layout = $self->{layout};
		2453
		2454	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2455
2175	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	}
2176		2467
2177	$self->{height} = $height;	2468	$self->{height} = $height;
2178		2469
2179	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2470	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2180		2471
2181	delete $self->{texture};	2472	delete $self->{texture};
2182	}	2473	}
2183		2474
2184	$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 {
2185	glClearColor 0, 0, 0, 0;	2476	glClearColor 0.5, 0.5, 0.5, 0;
2186	glClear GL_COLOR_BUFFER_BIT;	2477	glClear GL_COLOR_BUFFER_BIT;
2187		2478
2188	glEnable GL_TEXTURE_2D;
2189	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2190
2191	my $top = int $self->{children}[1]{range}[0];	2479	my $top = int $self->{children}[1]{range}[0];
2192		2480
2193	my $y0 = $top;	2481	my $y0 = $top;
2194	my $y1 = $top + $self->{h};	2482	my $y1 = $top + $H;
2195		2483
2196	my $y = 0;	2484	my $y = 0;
2197		2485
2198	my $layout = $self->{layout};	2486	my $layout = $self->{layout};
2199		2487
2200	$layout->set_font ($self->{font}) if $self->{font};	2488	$layout->set_font ($self->{font}) if $self->{font};
2201		2489
		2490	glEnable GL_BLEND;
		2491	#TODO# not correct in windows where rgba is forced off
		2492	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2493
2202	for my $par (@{$self->{par}}) {	2494	for my $par (@{$self->{par}}) {
2203	my $h = $par->[0];	2495	my $h = $par->[1];
2204		2496
2205	if ($y0 < $y + $h && $y < $y1) {	2497	if ($y0 < $y + $h && $y < $y1) {
2206	$layout->set_foreground (@{ $par->[1] });	2498	$layout->set_foreground (@{ $par->[2] });
		2499	$layout->set_width ($W - $par->[3]);
2207	$layout->set_markup ($par->[2]);	2500	$layout->set_markup ($par->[4]);
2208		2501
2209	my ($W, $H) = $layout->size;	2502	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2210	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2503
		2504	glRasterPos $par->[3], $y - $y0;
		2505	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2211	}	2506	}
2212		2507
2213	$y += $h;	2508	$y += $h;
2214	}	2509	}
2215		2510
2216	glDisable GL_TEXTURE_2D;	2511	glDisable GL_BLEND;
2217	};	2512	};
2218	});	2513	});
2219	}	2514	}
2220		2515
2221	sub _draw {	2516	sub _draw {
2222	my ($self) = @_;	2517	my ($self) = @_;
2223		2518
2224	glEnable GL_TEXTURE_2D;	2519	glEnable GL_TEXTURE_2D;
2225	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2520	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2226	glColor 1, 1, 1, 1;	2521	glColor 1, 1, 1, 1;
2227	$self->{texture}->draw_quad_alpha_premultiplied (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});
2228	glDisable GL_TEXTURE_2D;	2523	glDisable GL_TEXTURE_2D;
2229		2524
2230	$self->{children}[1]->draw;	2525	$self->{children}[1]->draw;
2231		2526
2232	}	2527	}
…		…
2281		2576
2282	sub new {	2577	sub new {
2283	my $class = shift;	2578	my $class = shift;
2284		2579
2285	my $self = $class->SUPER::new (	2580	my $self = $class->SUPER::new (
2286	state => 0,	2581	state => 0,
2287	connect_activate => \&toggle_flopper,	2582	on_activate => \&toggle_flopper,
2288	@_	2583	@_
2289	);	2584	);
2290		2585
2291	if ($self->{state}) {
2292	$self->{state} = 0;
2293	$self->toggle_flopper;
2294	}
2295
2296	$self	2586	$self
2297	}	2587	}
2298		2588
2299	sub toggle_flopper {	2589	sub toggle_flopper {
2300	my ($self) = @_;	2590	my ($self) = @_;
2301		2591
2302	# TODO: use animation	2592	$self->{other}->toggle_visibility;
2303	if ($self->{state} = !$self->{state}) {
2304	$CFClient::UI::ROOT->add ($self->{other});
2305	$self->{other}->move ($self->coord2global (0, $self->{h}));
2306	$self->emit ("open");
2307	} else {
2308	$CFClient::UI::ROOT->remove ($self->{other});
2309	$self->emit ("close");
2310	}
2311
2312	$self->emit (changed => $self->{state});
2313	}	2593	}
2314		2594
2315	#############################################################################	2595	#############################################################################
2316		2596
2317	package CFClient::UI::Tooltip;	2597	package CFClient::UI::Tooltip;
…		…
2331		2611
2332	sub set_tooltip_from {	2612	sub set_tooltip_from {
2333	my ($self, $widget) = @_;	2613	my ($self, $widget) = @_;
2334		2614
2335	$self->add (new CFClient::UI::Label	2615	$self->add (new CFClient::UI::Label
2336	markup => $widget->{tooltip},	2616	markup => $widget->{tooltip},
2337	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2617	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338	fontsize => 0.8,	2618	fontsize => 0.8,
2339	fg => [0, 0, 0, 1],	2619	fg => [0, 0, 0, 1],
		2620	ellipsise => 0,
2340	font => ($widget->{tooltip_font} || $::FONT_PROP),	2621	font => ($widget->{tooltip_font} || $::FONT_PROP),
2341	);	2622	);
2342	}	2623	}
2343		2624
2344	sub size_request {	2625	sub size_request {
2345	my ($self) = @_;	2626	my ($self) = @_;
…		…
2348		2629
2349	($w + 4, $h + 4)	2630	($w + 4, $h + 4)
2350	}	2631	}
2351		2632
2352	sub size_allocate {	2633	sub size_allocate {
2353	my ($self, $w, $h) = @_;	2634	my ($self, $w, $h, $changed) = @_;
2354		2635
		2636	return unless $changed;
		2637
2355	$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
		2649	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2650
		2651	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2652	if $x + $self->{w} > $::WIDTH;
		2653
		2654	$self->move ($x, $y);
		2655	});
2356	}	2656	}
2357		2657
2358	sub _draw {	2658	sub _draw {
2359	my ($self) = @_;	2659	my ($self) = @_;
2360		2660
…		…
2377	glVertex $w, $h;	2677	glVertex $w, $h;
2378	glVertex $w, 0;	2678	glVertex $w, 0;
2379	glEnd;	2679	glEnd;
2380		2680
2381	glTranslate 2 - 0.375, 2 - 0.375;	2681	glTranslate 2 - 0.375, 2 - 0.375;
		2682
2382	$self->SUPER::_draw;	2683	$self->SUPER::_draw;
2383	}	2684	}
2384		2685
2385	#############################################################################	2686	#############################################################################
2386		2687
…		…
2391	use CFClient::OpenGL;	2692	use CFClient::OpenGL;
2392		2693
2393	sub new {	2694	sub new {
2394	my $class = shift;	2695	my $class = shift;
2395		2696
2396	$class->SUPER::new (	2697	my $self = $class->SUPER::new (
2397	aspect => 1,	2698	aspect => 1,
		2699	can_events => 0,
2398	@_,	2700	@_,
2399	)	2701	);
		2702
		2703	if ($self->{anim} && $self->{animspeed}) {
		2704	Scalar::Util::weaken (my $widget = $self);
		2705
		2706	$self->{timer} = Event->timer (
		2707	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2708	hard => 1,
		2709	interval => $self->{animspeed},
		2710	cb => sub {
		2711	++$widget->{frame};
		2712	$widget->update;
		2713	},
		2714	);
		2715	}
		2716
		2717	$self
2400	}	2718	}
2401		2719
2402	sub size_request {	2720	sub size_request {
2403	(32, 8)	2721	(32, 8)
2404	}	2722	}
2405		2723
		2724	sub update {
		2725	my ($self) = @_;
		2726
		2727	return unless $self->{visible};
		2728
		2729	$self->SUPER::update;
		2730	}
		2731
2406	sub _draw {	2732	sub _draw {
2407	my ($self) = @_;	2733	my ($self) = @_;
2408		2734
2409	return unless $::CONN;#d# manage and cache textures differently	2735	return unless $::CONN;
		2736
		2737	my $face;
		2738
		2739	if ($self->{frame}) {
		2740	my $anim = $::CONN->{anim}[$self->{anim}];
		2741
		2742	$face = $anim->[ $self->{frame} % @$anim ]
		2743	if $anim && @$anim;
		2744	}
		2745
2410	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2746	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411		2747
2412	# TODO animation
2413	if ($tex) {	2748	if ($tex) {
2414	glEnable GL_TEXTURE_2D;	2749	glEnable GL_TEXTURE_2D;
2415	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2750	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2416	glColor 1, 1, 1, 1;	2751	glColor 1, 1, 1, 1;
2417	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2752	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418	glDisable GL_TEXTURE_2D;	2753	glDisable GL_TEXTURE_2D;
2419	}	2754	}
2420	}	2755	}
2421		2756
2422	#############################################################################	2757	sub DESTROY {
		2758	my ($self) = @_;
2423		2759
		2760	$self->{timer}->cancel
		2761	if $self->{timer};
		2762
		2763	$self->SUPER::DESTROY;
		2764	}
		2765
		2766	#############################################################################
		2767
2424	package CFClient::UI::InventoryItem;	2768	package CFClient::UI::Inventory;
2425		2769
2426	our @ISA = CFClient::UI::HBox::;	2770	our @ISA = CFClient::UI::ScrolledWindow::;
2427		2771
2428	sub new {	2772	sub new {
2429	my $class = shift;	2773	my $class = shift;
2430		2774
2431	my %args = @_;
2432
2433	my $item = delete $args{item};
2434
2435	my $desc = $item->{nrof} < 2
2436	? $item->{name}
2437	: "$item->{nrof} $item->{name_pl}";
2438
2439
2440	my $self = $class->SUPER::new (	2775	my $self = $class->SUPER::new (
2441	can_hover => 1,	2776	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2442	can_events => 1,
2443	tooltip => (CFClient::UI::Label->escape ($desc)
2444	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2445	connect_button_down => sub {
2446	my ($self, $ev, $x, $y) = @_;
2447
2448	# todo: maybe put examine on 1? but should just be a tooltip :(
2449	if ($ev->{button} == 1) {
2450	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2451	} elsif ($ev->{button} == 2) {
2452	$::CONN->send ("apply $item->{tag}");
2453	} elsif ($ev->{button} == 3) {
2454	CFClient::UI::Menu->new (
2455	items => [
2456	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2457	[
2458	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2459	sub { $::CONN->send ("lock $item->{tag}") },
2460	],
2461	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2462	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2463	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2464	],
2465	)->popup ($ev);
2466	}
2467
2468	1
2469	},
2470	%args
2471	);
2472
2473	$self->add (new CFClient::UI::Face
2474	can_events => 0,
2475	face => $item->{face},
2476	anim => $item->{anim},
2477	animspeed => $item->{animspeed},
2478	);
2479
2480	$self->add (new CFClient::UI::Label
2481	can_events => 0,
2482	text => $desc,
2483	);
2484
2485	$self
2486	}
2487
2488	#############################################################################
2489
2490	package CFClient::UI::Inventory;
2491
2492	our @ISA = CFClient::UI::ScrolledWindow::;
2493
2494	sub new {
2495	my $class = shift;
2496
2497	my $self = $class->SUPER::new (
2498	scrolled => (new CFClient::UI::VBox),
2499	@_,	2777	@_,
2500	);	2778	);
2501		2779
2502	$self	2780	$self
2503	}	2781	}
…		…
2506	my ($self, $items) = @_;	2784	my ($self, $items) = @_;
2507		2785
2508	$self->{scrolled}->clear;	2786	$self->{scrolled}->clear;
2509	return unless $items;	2787	return unless $items;
2510		2788
2511	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2789	my @items = sort {
		2790	($a->{type} <=> $b->{type})
		2791	or ($a->{name} cmp $b->{name})
		2792	} @$items;
2512		2793
2513	$self->{real_items} = \@items;	2794	$self->{real_items} = \@items;
2514		2795
		2796	my $row = 0;
2515	for my $item (@items) {	2797	for my $item (@items) {
2516	my $desc = $item->{nrof} < 2	2798	CFClient::Item::update_widgets $item;
2517	? $item->{name}
2518	: "$item->{nrof} $item->{name_pl}";
2519		2799
2520	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);	2800	$self->{scrolled}->add (0, $row, $item->{face_widget});
2521	}	2801	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2802	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2522		2803
2523	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2804	$row++;
2524	}	2805	}
2525
2526	sub size_request {
2527	my ($self) = @_;
2528	($self->{req_w}, $self->{req_h});
2529	}	2806	}
2530		2807
2531	#############################################################################	2808	#############################################################################
2532		2809
2533	package CFClient::UI::Menu;	2810	package CFClient::UI::Menu;
…		…
2568		2845
2569	# popup given the event (must be a mouse button down event currently)	2846	# popup given the event (must be a mouse button down event currently)
2570	sub popup {	2847	sub popup {
2571	my ($self, $ev) = @_;	2848	my ($self, $ev) = @_;
2572		2849
2573	$self->emit ("popdown");	2850	$self->_emit ("popdown");
2574		2851
2575	# maybe save $GRAB? must be careful about events...	2852	# maybe save $GRAB? must be careful about events...
2576	$GRAB = $self;	2853	$GRAB = $self;
2577	$self->{button} = $ev->{button};	2854	$self->{button} = $ev->{button};
2578		2855
…		…
2593		2870
2594	if ($ev->{button} == $self->{button}) {	2871	if ($ev->{button} == $self->{button}) {
2595	undef $GRAB;	2872	undef $GRAB;
2596	$self->hide;	2873	$self->hide;
2597		2874
2598	$self->emit ("popdown");	2875	$self->_emit ("popdown");
2599	$self->{hover}[1]->() if $self->{hover};	2876	$self->{hover}[1]->() if $self->{hover};
2600	}	2877	}
2601	}	2878	}
2602		2879
2603	#############################################################################	2880	#############################################################################
2604		2881
2605	package CFClient::UI::Statusbox;	2882	package CFClient::UI::Statusbox;
2606		2883
2607	our @ISA = CFClient::UI::VBox::;	2884	our @ISA = CFClient::UI::VBox::;
		2885
		2886	sub new {
		2887	my $class = shift;
		2888
		2889	$class->SUPER::new (
		2890	fontsize => 0.8,
		2891	@_,
		2892	)
		2893	}
2608		2894
2609	sub reorder {	2895	sub reorder {
2610	my ($self) = @_;	2896	my ($self) = @_;
2611	my $NOW = time;	2897	my $NOW = time;
2612		2898
…		…
2631	? "<b>$item->{count} ×</b> $item->{text}"	2917	? "<b>$item->{count} ×</b> $item->{text}"
2632	: $item->{text};	2918	: $item->{text};
2633		2919
2634	for ($short) {	2920	for ($short) {
2635	s/^\s+//;	2921	s/^\s+//;
2636	s/\012.*/…/s;	2922	s/\s+/ /g;
2637	my $len = int 30 / $item->{fontsize};
2638	substr $_, $len, length, "…" if $len < length;
2639	}	2923	}
2640		2924
2641	new CFClient::UI::Label	2925	new CFClient::UI::Label
2642	markup => $short,	2926	markup => $short,
2643	tooltip => $item->{tooltip},	2927	tooltip => $item->{tooltip},
2644	tooltip_font => $::FONT_PROP,	2928	tooltip_font => $::FONT_PROP,
2645	tooltip_width => 0.67,	2929	tooltip_width => 0.67,
2646	fontsize => $item->{fontsize},	2930	fontsize => $item->{fontsize} || $self->{fontsize},
		2931	max_w => $::WIDTH * 0.44,
2647	color => $item->{color},	2932	fg => $item->{fg},
2648	can_events => 1,	2933	can_events => 1,
2649	can_hover => 1	2934	can_hover => 1
2650	};	2935	};
2651	}	2936	}
2652		2937
…		…
2654	$self->SUPER::add (reverse @widgets);	2939	$self->SUPER::add (reverse @widgets);
2655	}	2940	}
2656		2941
2657	sub add {	2942	sub add {
2658	my ($self, $text, %arg) = @_;	2943	my ($self, $text, %arg) = @_;
		2944
		2945	$text =~ s/^\s+//;
		2946	$text =~ s/\s+$//;
		2947
		2948	return unless $text;
2659		2949
2660	my $timeout = time + ((delete $arg{timeout}) || 60);	2950	my $timeout = time + ((delete $arg{timeout}) || 60);
2661		2951
2662	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2952	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663		2953
…		…
2666	$item->{count}++;	2956	$item->{count}++;
2667	} else {	2957	} else {
2668	$item->{count} = 1;	2958	$item->{count} = 1;
2669	$item->{text} = $item->{tooltip} = $text;	2959	$item->{text} = $item->{tooltip} = $text;
2670	}	2960	}
		2961	$item->{id} = ++$self->{id};
2671	$item->{timeout} = $timeout;	2962	$item->{timeout} = $timeout;
2672	delete $item->{label};	2963	delete $item->{label};
2673	} else {	2964	} else {
2674	$self->{item}{$group} = {	2965	$self->{item}{$group} = {
2675	id => ++$self->{id},	2966	id => ++$self->{id},
2676	text => $text,	2967	text => $text,
2677	timeout => $timeout,	2968	timeout => $timeout,
2678	tooltip => $text,	2969	tooltip => $text,
2679	fontsize => 0.8,
2680	color => [0.8, 0.8, 0.8, 0.8],	2970	fg => [0.8, 0.8, 0.8, 0.8],
2681	pri => 0,	2971	pri => 0,
2682	count => 1,	2972	count => 1,
2683	%arg,	2973	%arg,
2684	};	2974	};
2685	}	2975	}
2686		2976
2687	$self->reorder;	2977	$self->reorder;
2688	}	2978	}
2689		2979
		2980	sub reconfigure {
		2981	my ($self) = @_;
		2982
		2983	delete $_->{label}
		2984	for values %{ $self->{item} || {} };
		2985
		2986	$self->reorder;
		2987	$self->SUPER::reconfigure;
		2988	}
		2989
2690	#############################################################################	2990	#############################################################################
2691		2991
2692	package CFClient::UI::Root;	2992	package CFClient::UI::Root;
2693		2993
2694	our @ISA = CFClient::UI::Container::;	2994	our @ISA = CFClient::UI::Container::;
…		…
2696	use CFClient::OpenGL;	2996	use CFClient::OpenGL;
2697		2997
2698	sub new {	2998	sub new {
2699	my $class = shift;	2999	my $class = shift;
2700		3000
2701	$class->SUPER::new (	3001	my $self = $class->SUPER::new (
		3002	visible => 1,
2702	@_,	3003	@_,
2703	)	3004	);
		3005
		3006	Scalar::Util::weaken ($self->{root} = $self);
		3007
		3008	$self
2704	}	3009	}
2705		3010
2706	sub configure {	3011	sub configure {
2707	my ($self, $x, $y, $w, $h) = @_;	3012	my ($self, $x, $y, $w, $h) = @_;
2708		3013
2709	$self->{w} = $w;	3014	$self->{w} = $w;
2710	$self->{h} = $h;	3015	$self->{h} = $h;
2711	}	3016	}
2712		3017
2713	sub check_size {	3018	sub reconfigure {
2714	my ($self) = @_;	3019	my ($self) = @_;
2715		3020
		3021	$self->SUPER::reconfigure;
		3022
2716	$self->size_allocate ($self->{w}, $self->{h})	3023	$self->size_allocate ($self->{w}, $self->{h}, 1)
2717	if $self->{w};	3024	if $self->{w};
2718	}	3025	}
2719		3026
2720	sub size_request {	3027	sub size_request {
2721	my ($self) = @_;	3028	my ($self) = @_;
2722		3029
2723	($self->{w}, $self->{h})	3030	($self->{w}, $self->{h})
2724	}	3031	}
2725		3032
2726	sub size_allocate {	3033	sub size_allocate {
2727	my ($self, $w, $h) = @_;	3034	my ($self, $w, $h, $changed) = @_;
2728
2729	my $old_w = $self->{old_w};
2730	my $old_h = $self->{old_h};
2731
2732	if ($old_w && $old_h) {
2733	for my $child ($self->children) {
2734	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2735	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2736	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2737	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2738	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2739	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2740	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2741	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2742	}
2743	}
2744		3035
2745	for my $child ($self->children) {	3036	for my $child ($self->children) {
2746	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3037	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2747		3038
		3039	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3040	if exists $child->{req_x};
		3041
		3042	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3043	if exists $child->{req_y};
		3044
		3045	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
		3046
2748	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3047	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2749	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3048	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3049
2750	$child->configure ($X, $Y, $W, $H);	3050	$child->configure ($X, $Y, $W, $H);
2751	}	3051	}
2752
2753	$self->{old_w} = $w;
2754	$self->{old_h} = $h;
2755	}	3052	}
2756		3053
2757	sub coord2local {	3054	sub coord2local {
2758	my ($self, $x, $y) = @_;	3055	my ($self, $x, $y) = @_;
2759		3056
…		…
2767	}	3064	}
2768		3065
2769	sub update {	3066	sub update {
2770	my ($self) = @_;	3067	my ($self) = @_;
2771		3068
2772	$self->check_size;
2773	$::WANT_REFRESH++;	3069	$::WANT_REFRESH++;
2774	}	3070	}
2775		3071
2776	sub add {	3072	sub add {
2777	my ($self, $child) = @_;	3073	my ($self, @children) = @_;
2778		3074
		3075	for my $child (@children) {
		3076	$child->{is_toplevel} = 1;
		3077
2779	# integerise window positions	3078	# integerise window positions
2780	$child->{x} = int $child->{x};	3079	$child->{x} = int $child->{x};
2781	$child->{y} = int $child->{y};	3080	$child->{y} = int $child->{y};
		3081	}
2782		3082
2783	$self->SUPER::add ($child);	3083	$self->SUPER::add (@children);
		3084	}
		3085
		3086	sub remove {
		3087	my ($self, @children) = @_;
		3088
		3089	$self->SUPER::remove (@children);
		3090
		3091	while (@children) {
		3092	my $w = pop @children;
		3093	push @children, $w->children;
		3094	$w->set_invisible;
		3095	}
2784	}	3096	}
2785		3097
2786	sub on_refresh {	3098	sub on_refresh {
2787	my ($self, $id, $cb) = @_;	3099	my ($self, $id, $cb) = @_;
2788		3100
2789	$self->{refresh_hook}{$id} = $cb;	3101	$self->{refresh_hook}{$id} = $cb;
2790	}	3102	}
2791		3103
		3104	sub on_post_alloc {
		3105	my ($self, $id, $cb) = @_;
		3106
		3107	$self->{post_alloc_hook}{$id} = $cb;
		3108	}
		3109
2792	sub draw {	3110	sub draw {
2793	my ($self) = @_;	3111	my ($self) = @_;
2794
2795	if ($self->{check_size}) {
2796	my @queue = ([], []);
2797
2798	for (;;) {
2799	if ($self->{check_size}) {
2800	# heuristic: check containers last
2801	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2802	for values %{delete $self->{check_size}}
2803	}
2804
2805	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2806
2807	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2808	? @$widget{qw(user_w user_h)}
2809	: $widget->size_request;
2810
2811	if (delete $widget->{force_alloc}
2812	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2813	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2814
2815	$widget->{req_w} = $w;
2816	$widget->{req_h} = $h;
2817
2818	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2819
2820	$widget->{parent}->check_size
2821	if $widget->{parent};
2822	}
2823	}
2824	}
2825
2826	while ($self->{size_alloc}) {
2827	for (values %{delete $self->{size_alloc}}) {
2828	my ($widget, $w, $h) = @$_;
2829
2830	$w = 0 if $w < 0;
2831	$h = 0 if $h < 0;
2832
2833	$widget->{w} = $w;
2834	$widget->{h} = $h;
2835	$widget->size_allocate ($w, $h);
2836	$widget->emit (size_allocate => $w, $h);
2837	}
2838	}
2839		3112
2840	while ($self->{refresh_hook}) {	3113	while ($self->{refresh_hook}) {
2841	$_->()	3114	$_->()
2842	for values %{delete $self->{refresh_hook}};	3115	for values %{delete $self->{refresh_hook}};
2843	}	3116	}
2844		3117
		3118	if ($self->{realloc}) {
		3119	my @queue;
		3120
		3121	while () {
		3122	if ($self->{realloc}) {
		3123	#TODO use array-of-depth approach
		3124
		3125	@queue = sort { $a->{visible} <=> $b->{visible} }
		3126	@queue, values %{delete $self->{realloc}};
		3127	}
		3128
		3129	my $widget = pop @queue || last;
		3130
		3131	$widget->{visible} or last; # do not resize invisible widgets
		3132
		3133	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
		3134	? @$widget{qw(def_w def_h)}
		3135	: $widget->size_request;
		3136
		3137	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3138
		3139	$widget->{req_w} = $w;
		3140	$widget->{req_h} = $h;
		3141
		3142	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		3143
		3144	push @queue, $widget->{parent}
		3145	if $widget->{parent};
		3146	}
		3147	}
		3148
		3149	while (my $size_alloc = delete $self->{size_alloc}) {
		3150	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
		3151	values %$size_alloc;
		3152
		3153	while () {
		3154	my ($widget, $w, $h) = @{ pop @queue or last };
		3155
		3156	$w = 0 if $w < 0;
		3157	$h = 0 if $h < 0;
		3158
		3159	my $changed = $widget->{w} != $w || $widget->{h} != $h;
		3160
		3161	$widget->{w} = $w;
		3162	$widget->{h} = $h;
		3163
		3164	$widget->emit (size_allocate => $w, $h, $changed);
		3165	}
		3166	}
		3167
		3168	while ($self->{post_alloc_hook}) {
		3169	$_->()
		3170	for values %{delete $self->{post_alloc_hook}};
		3171	}
		3172
2845	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3173	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2846	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3174	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2847	glClear GL_COLOR_BUFFER_BIT;	3175	glClear GL_COLOR_BUFFER_BIT;
2848		3176
2849	glMatrixMode GL_PROJECTION;	3177	glMatrixMode GL_PROJECTION;
2850	glLoadIdentity;	3178	glLoadIdentity;
2851	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3179	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2852	glMatrixMode GL_MODELVIEW;	3180	glMatrixMode GL_MODELVIEW;
2853	glLoadIdentity;	3181	glLoadIdentity;
2854		3182
2855	$self->_draw;	3183	$self->_draw;
2856	}	3184	}
…		…
2858	#############################################################################	3186	#############################################################################
2859		3187
2860	package CFClient::UI;	3188	package CFClient::UI;
2861		3189
2862	$ROOT = new CFClient::UI::Root;	3190	$ROOT = new CFClient::UI::Root;
2863	$TOOLTIP = new CFClient::UI::Tooltip;	3191	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2864		3192
2865	1	3193	1
2866		3194

Diff Legend

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