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.258 by root, Tue May 30 02:55:45 2006 UTC vs.
Revision 1.362 by root, Sat Dec 9 21:26:46 2006 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
		7	use Event;
8		8
9	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
10	use CFClient::Texture;	11	use CFPlus::Texture;
11		12
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
13		14
14	our $LAYOUT;	15	our $LAYOUT;
15	our $ROOT;	16	our $ROOT;
16	our $TOOLTIP;	17	our $TOOLTIP;
17	our $BUTTON_STATE;	18	our $BUTTON_STATE;
18		19
19	our %WIDGET; # all widgets, weak-referenced	20	our %WIDGET; # all widgets, weak-referenced
		21
		22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
		23	if (!$GRAB) {
		24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		25	if (length $widget->{tooltip}) {
		26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->hide;
		28
		29	$TOOLTIP->{owner} = $widget;
		30
		31	return if $ENV{CFPLUS_DEBUG} & 8;
		32
		33	my $tip = $widget->{tooltip};
		34
		35	$tip = $tip->($widget) if CODE:: eq ref $tip;
		36
		37	$TOOLTIP->set_tooltip_from ($widget);
		38	$TOOLTIP->show;
		39	}
		40
		41	return;
		42	}
		43	}
		44	}
		45
		46	$TOOLTIP->hide;
		47	delete $TOOLTIP->{owner};
		48	});
20		49
21	sub get_layout {	50	sub get_layout {
22	my $layout;	51	my $layout;
23		52
24	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
39	my ($layout) = @_;	68	my ($layout) = @_;
40		69
41	$LAYOUT = $layout;	70	$LAYOUT = $layout;
42	}	71	}
43		72
44	sub check_tooltip {
45	if (!$GRAB) {
46	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47	if (length $widget->{tooltip}) {
48
49	if ($TOOLTIP->{owner} != $widget) {
50	$TOOLTIP->hide;
51
52	$TOOLTIP->{owner} = $widget;
53
54	my $tip = $widget->{tooltip};
55
56	$tip = $tip->($widget) if CODE:: eq ref $tip;
57
58	$TOOLTIP->set_tooltip_from ($widget);
59	$TOOLTIP->show;
60	}
61
62	return;
63	}
64	}
65	}
66
67	$TOOLTIP->hide;
68	delete $TOOLTIP->{owner};
69	}
70
71	# class methods for events	73	# class methods for events
72	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
73	$FOCUS->emit (key_down => $_[0])	75	$FOCUS->emit (key_down => $_[0])
74	if $FOCUS;	76	if $FOCUS;
75	}	77	}
…		…
77	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
78	$FOCUS->emit (key_up => $_[0])	80	$FOCUS->emit (key_up => $_[0])
79	if $FOCUS;	81	if $FOCUS;
80	}	82	}
81		83
		84	sub check_hover {
		85	my ($widget) = @_;
		86
		87	if ($widget != $HOVER) {
		88	my $hover = $HOVER; $HOVER = $widget;
		89
		90	$hover->update if $hover && $hover->{can_hover};
		91	$HOVER->update if $HOVER && $HOVER->{can_hover};
		92
		93	$TOOLTIP_WATCHER->start;
		94	}
		95	}
		96
82	sub feed_sdl_button_down_event {	97	sub feed_sdl_button_down_event {
83	my ($ev) = @_;	98	my ($ev) = @_;
84	my ($x, $y) = ($ev->{x}, $ev->{y});	99	my ($x, $y) = ($ev->{x}, $ev->{y});
85		100
86	if (!$BUTTON_STATE) {	101	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		102
		103	unless ($GRAB) {
87	my $widget = $ROOT->find_widget ($x, $y);	104	my $widget = $ROOT->find_widget ($x, $y);
88		105
89	$GRAB = $widget;	106	$GRAB = $widget;
90	$GRAB->update if $GRAB;	107	$GRAB->update if $GRAB;
91		108
92	check_tooltip;	109	$TOOLTIP_WATCHER->cb->();
93	}	110	}
94		111
95	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	112	if ($GRAB) {
96		113	if ($ev->{button} == 4 || $ev->{button} == 5) {
97	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	114	# mousewheel
98	if $GRAB;	115	$ev->{dx} = 0;
		116	$ev->{dy} = $ev->{button} * 2 - 9;
		117	$GRAB->emit (mouse_wheel => $ev);
		118	} else {
		119	$GRAB->emit (button_down => $ev)
		120	}
		121	}
99	}	122	}
100		123
101	sub feed_sdl_button_up_event {	124	sub feed_sdl_button_up_event {
102	my ($ev) = @_;	125	my ($ev) = @_;
103	my ($x, $y) = ($ev->{x}, $ev->{y});
104		126
105	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	127	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
106		128
107	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	129	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
108		130
109	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	131	$GRAB->emit (button_up => $ev)
110	if $GRAB;	132	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
111		133
112	if (!$BUTTON_STATE) {	134	unless ($BUTTON_STATE) {
113	my $grab = $GRAB; undef $GRAB;	135	my $grab = $GRAB; undef $GRAB;
114	$grab->update if $grab;	136	$grab->update if $grab;
115	$GRAB->update if $GRAB;	137	$GRAB->update if $GRAB;
116		138
117	check_tooltip;	139	check_hover $widget;
		140	$TOOLTIP_WATCHER->cb->();
118	}	141	}
119	}	142	}
120		143
121	sub feed_sdl_motion_event {	144	sub feed_sdl_motion_event {
122	my ($ev) = @_;	145	my ($ev) = @_;
123	my ($x, $y) = ($ev->{x}, $ev->{y});	146	my ($x, $y) = ($ev->{x}, $ev->{y});
124		147
125	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	148	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
126		149
127	if ($widget != $HOVER) {	150	check_hover $widget;
128	my $hover = $HOVER; $HOVER = $widget;
129		151
130	$hover->update if $hover && $hover->{can_hover};	152	$HOVER->emit (mouse_motion => $ev)
131	$HOVER->update if $HOVER && $HOVER->{can_hover};
132
133	check_tooltip;
134	}
135
136	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137	if $HOVER;	153	if $HOVER;
138	}	154	}
139		155
140	# convert position array to integers	156	# convert position array to integers
141	sub harmonize {	157	sub harmonize {
…		…
170	sub rescale_widgets {	186	sub rescale_widgets {
171	my ($sx, $sy) = @_;	187	my ($sx, $sy) = @_;
172		188
173	for my $widget (values %WIDGET) {	189	for my $widget (values %WIDGET) {
174	if ($widget->{is_toplevel}) {	190	if ($widget->{is_toplevel}) {
175	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	191	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	192	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177		193
178	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;	194	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	195	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};	196	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;	197	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	198	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};	199	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184		200
185	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	201	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	202	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187		203
188	}	204	}
189	}	205	}
190		206
191	reconfigure_widgets;	207	reconfigure_widgets;
192	}	208	}
193		209
194	#############################################################################	210	#############################################################################
195		211
		212	package CFPlus::UI::Event;
		213
		214	sub xy {
		215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		216	}
		217
		218	#############################################################################
		219
196	package CFClient::UI::Base;	220	package CFPlus::UI::Base;
197		221
198	use strict;	222	use strict;
199		223
200	use CFClient::OpenGL;	224	use CFPlus::OpenGL;
201		225
202	sub new {	226	sub new {
203	my $class = shift;	227	my $class = shift;
204		228
205	my $self = bless {	229	my $self = bless {
…		…
210	h => undef,	234	h => undef,
211	can_events => 1,	235	can_events => 1,
212	@_	236	@_
213	}, $class;	237	}, $class;
214		238
215	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	239	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
216		240
217	for (keys %$self) {	241	for (keys %$self) {
218	if (/^on_(.*)$/) {	242	if (/^on_(.*)$/) {
219	$self->connect ($1 => delete $self->{$_});	243	$self->connect ($1 => delete $self->{$_});
220	}	244	}
221	}	245	}
222		246
223	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	247	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
224	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};	248	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
225	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};	249	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
226	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};	250	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
227	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};	251	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
228		252
229	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231		255
232	$self->show if $layout->{show};	256	$self->show if $layout->{show};
…		…
237		261
238	sub destroy {	262	sub destroy {
239	my ($self) = @_;	263	my ($self) = @_;
240		264
241	$self->hide;	265	$self->hide;
		266	$self->emit ("destroy");
242	%$self = ();	267	%$self = ();
243	}	268	}
244		269
245	sub show {	270	sub show {
246	my ($self) = @_;	271	my ($self) = @_;
247		272
248	return if $self->{parent};	273	return if $self->{parent};
249		274
250	$CFClient::UI::ROOT->add ($self);	275	$CFPlus::UI::ROOT->add ($self);
251	}	276	}
252		277
253	sub set_visible {	278	sub set_visible {
254	my ($self) = @_;	279	my ($self) = @_;
255		280
…		…
270		295
271	return unless $self->{visible};	296	return unless $self->{visible};
272		297
273	$_->set_invisible for $self->children;	298	$_->set_invisible for $self->children;
274		299
		300	delete $self->{visible};
275	delete $self->{root};	301	delete $self->{root};
276	delete $self->{visible};
277		302
278	undef $GRAB if $GRAB == $self;	303	undef $GRAB if $GRAB == $self;
279	undef $HOVER if $HOVER == $self;	304	undef $HOVER if $HOVER == $self;
280		305
281	CFClient::UI::check_tooltip	306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
282	if $TOOLTIP->{owner} == $self;	307	if $TOOLTIP->{owner} == $self;
283		308
284	$self->focus_out;	309	$self->emit ("focus_out");
285
286	$self->emit (visibility_change => 0);	310	$self->emit (visibility_change => 0);
287	}	311	}
288		312
289	sub set_visibility {	313	sub set_visibility {
290	my ($self, $visible) = @_;	314	my ($self, $visible) = @_;
…		…
313	}	337	}
314		338
315	sub move_abs {	339	sub move_abs {
316	my ($self, $x, $y, $z) = @_;	340	my ($self, $x, $y, $z) = @_;
317		341
318	$self->{x} = List::Util::max 0, int $x;	342	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
319	$self->{y} = List::Util::max 0, int $y;	343	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
320	$self->{z} = $z if defined $z;	344	$self->{z} = $z if defined $z;
321		345
322	$self->update;	346	$self->update;
323	}	347	}
324		348
…		…
334	sub size_request {	358	sub size_request {
335	require Carp;	359	require Carp;
336	Carp::confess "size_request is abstract";	360	Carp::confess "size_request is abstract";
337	}	361	}
338		362
		363	sub baseline_shift {
		364	0
		365	}
		366
339	sub configure {	367	sub configure {
340	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
341		369
342	if ($self->{aspect}) {	370	if ($self->{aspect}) {
343	my ($ow, $oh) = ($w, $h);	371	my ($ow, $oh) = ($w, $h);
344		372
345	$w = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
346	$h = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
347		375
348	# use alignment to adjust x, y	376	# use alignment to adjust x, y
349		377
350	$x += int 0.5 * ($ow - $w);	378	$x += int 0.5 * ($ow - $w);
351	$y += int 0.5 * ($oh - $h);	379	$y += int 0.5 * ($oh - $h);
…		…
355	$self->{x} = $x;	383	$self->{x} = $x;
356	$self->{y} = $y;	384	$self->{y} = $y;
357	$self->update;	385	$self->update;
358	}	386	}
359		387
360	if ($self->{w} != $w || $self->{h} != $h) {	388	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361	return unless $self->{visible};	389	return unless $self->{visible};
362		390
		391	$self->{alloc_w} = $w;
		392	$self->{alloc_h} = $h;
		393
363	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];	394	$self->{root}{size_alloc}{$self+0} = $self;
364	}	395	}
365	}
366
367	sub size_allocate {
368	# nothing to be done
369	}	396	}
370		397
371	sub children {	398	sub children {
		399	# nop
		400	}
		401
		402	sub visible_children {
		403	$_[0]->children
372	}	404	}
373		405
374	sub set_max_size {	406	sub set_max_size {
375	my ($self, $w, $h) = @_;	407	my ($self, $w, $h) = @_;
376		408
377	delete $self->{max_w}; $self->{max_w} = $w if $w;	409	$self->{max_w} = int $w if defined $w;
378	delete $self->{max_h}; $self->{max_h} = $h if $h;	410	$self->{max_h} = int $h if defined $h;
		411
		412	$self->realloc;
379	}	413	}
380		414
381	sub set_tooltip {	415	sub set_tooltip {
382	my ($self, $tooltip) = @_;	416	my ($self, $tooltip) = @_;
383		417
…		…
386		420
387	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
388		422
389	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
390		424
391	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
392	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
393	CFClient::UI::check_tooltip;	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
394	}	428	}
395	}	429	}
396		430
397	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
398	sub coord2local {	432	sub coord2local {
399	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
400		434
		435	Carp::confess unless $self->{parent};#d#
		436
401	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
402	}	438	}
403		439
404	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
405	sub coord2global {	441	sub coord2global {
406	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
407		443
		444	Carp::confess unless $self->{parent};#d#
		445
408	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
409	}	447	}
410		448
411	sub focus_in {	449	sub invoke_focus_in {
412	my ($self) = @_;	450	my ($self) = @_;
413		451
414	return if $FOCUS == $self;	452	return if $FOCUS == $self;
415	return unless $self->{can_focus};	453	return unless $self->{can_focus};
416		454
417	my $focus = $FOCUS; $FOCUS = $self;	455	$FOCUS = $self;
418		456
419	$self->_emit (focus_in => $focus);	457	$self->update;
420		458
421	$focus->update if $focus;	459	0
422	$FOCUS->update;
423	}	460	}
424		461
425	sub focus_out {	462	sub invoke_focus_out {
426	my ($self) = @_;	463	my ($self) = @_;
427		464
428	return unless $FOCUS == $self;	465	return unless $FOCUS == $self;
429		466
430	my $focus = $FOCUS; undef $FOCUS;	467	undef $FOCUS;
431		468
432	$self->_emit (focus_out => $focus);	469	$self->update;
433		470
434	$focus->update if $focus; #?
435
436	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	471	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
437	unless $FOCUS;	472	unless $FOCUS;
438	}
439		473
		474	0
		475	}
		476
		477	sub grab_focus {
		478	my ($self) = @_;
		479
		480	$FOCUS->emit ("focus_out") if $FOCUS;
		481	$self->emit ("focus_in");
		482	}
		483
440	sub mouse_motion { }	484	sub invoke_mouse_motion { 0 }
441	sub button_up { }	485	sub invoke_button_up { 0 }
442	sub key_down { }	486	sub invoke_key_down { 0 }
443	sub key_up { }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
444		489
445	sub button_down {	490	sub invoke_button_down {
446	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
447		492
448	$self->focus_in;	493	$self->grab_focus;
449	}
450		494
451	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	495	0
452	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	496	}
453	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	497
454	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	498	sub connect {
455	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	499	my ($self, $signal, $cb) = @_;
		500
		501	push @{ $self->{signal_cb}{$signal} }, $cb;
		502
		503	defined wantarray and CFPlus::guard {
		504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		505	@{ $self->{signal_cb}{$signal} };
		506	}
		507	}
		508
		509	sub disconnect_all {
		510	my ($self, $signal) = @_;
		511
		512	delete $self->{signal_cb}{$signal};
		513	}
		514
		515	my %has_coords = (
		516	button_down => 1,
		517	button_up => 1,
		518	mouse_motion => 1,
		519	mouse_wheel => 1,
		520	);
		521
		522	sub emit {
		523	my ($self, $signal, @args) = @_;
		524
		525	# I do not really like this solution, but I do not like duplication
		526	# and needlessly verbose code, either.
		527	my @append
		528	= $has_coords{$signal}
		529	? $args[0]->xy ($self)
		530	: ();
		531
		532	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		533
		534	for my $cb (
		535	@{$self->{signal_cb}{$signal} || []}, # before
		536	($self->can ("invoke_$signal") || sub { 1 }), # closure
		537	) {
		538	return $cb->($self, @args, @append) || next;
		539	}
		540
		541	# parent
		542	$self->{parent} && $self->{parent}->emit ($signal, @args)
		543	}
456		544
457	sub find_widget {	545	sub find_widget {
458	my ($self, $x, $y) = @_;	546	my ($self, $x, $y) = @_;
459		547
460	return () unless $self->{can_events};	548	return () unless $self->{can_events};
…		…
467	}	555	}
468		556
469	sub set_parent {	557	sub set_parent {
470	my ($self, $parent) = @_;	558	my ($self, $parent) = @_;
471		559
472	Scalar::Util::weaken ($self->{parent} = $parent);	560	CFPlus::weaken ($self->{parent} = $parent);
473	$self->set_visible if $parent->{visible};	561	$self->set_visible if $parent->{visible};
474	}	562	}
475		563
476	sub connect {
477	my ($self, $signal, $cb) = @_;
478
479	push @{ $self->{signal_cb}{$signal} }, $cb;
480	}
481
482	sub _emit {
483	my ($self, $signal, @args) = @_;
484
485	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486	}
487
488	sub emit {
489	my ($self, $signal, @args) = @_;
490
491	$self->_emit ($signal, @args)
492	|| $self->$signal (@args);
493	}
494
495	sub visibility_change {
496	#my ($self, $visible) = @_;
497	}
498
499	sub realloc {	564	sub realloc {
500	my ($self) = @_;	565	my ($self) = @_;
501		566
502	if ($self->{visible}) {	567	if ($self->{visible}) {
503	return if $self->{root}{realloc}{$self};	568	return if $self->{root}{realloc}{$self+0};
504		569
505	$self->{root}{realloc}{$self} = $self;	570	$self->{root}{realloc}{$self+0} = $self;
506	$self->{root}->update;	571	$self->{root}->update;
507	} else {	572	} else {
508	delete $self->{req_w};	573	delete $self->{req_w};
		574	delete $self->{req_h};
509	}	575	}
510	}	576	}
511		577
512	sub update {	578	sub update {
513	my ($self) = @_;	579	my ($self) = @_;
…		…
521		587
522	$self->realloc;	588	$self->realloc;
523	$self->update;	589	$self->update;
524	}	590	}
525		591
		592	# using global variables seems a bit hacky, but passing through all drawing
		593	# functions seems pointless.
		594	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
		595
526	sub draw {	596	sub draw {
527	my ($self) = @_;	597	my ($self) = @_;
528		598
529	return unless $self->{h} && $self->{w};	599	return unless $self->{h} && $self->{w};
		600
		601	# update screen rectangle
		602	local $draw_x = $draw_x + $self->{x};
		603	local $draw_y = $draw_y + $self->{y};
		604
		605	# skip widgets that are entirely outside the drawing area
		606	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		607	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
530		608
531	glPushMatrix;	609	glPushMatrix;
532	glTranslate $self->{x}, $self->{y}, 0;	610	glTranslate $self->{x}, $self->{y}, 0;
533	$self->_draw;
534	glPopMatrix;
535		611
536	if ($self == $HOVER && $self->{can_hover}) {	612	if ($self == $HOVER && $self->{can_hover}) {
537	my ($x, $y) = @$self{qw(x y)};
538
539	glColor 1, 0.8, 0.5, 0.2;	613	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
540	glEnable GL_BLEND;	614	glEnable GL_BLEND;
541	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	615	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
542	glBegin GL_QUADS;	616	glBegin GL_QUADS;
543	glVertex $x , $y;	617	glVertex 0 , 0;
544	glVertex $x + $self->{w}, $y;	618	glVertex $self->{w}, 0;
545	glVertex $x + $self->{w}, $y + $self->{h};	619	glVertex $self->{w}, $self->{h};
546	glVertex $x , $y + $self->{h};	620	glVertex 0 , $self->{h};
547	glEnd;	621	glEnd;
548	glDisable GL_BLEND;	622	glDisable GL_BLEND;
549	}	623	}
550		624
551	if ($ENV{CFPLUS_DEBUG}) {	625	if ($ENV{CFPLUS_DEBUG} & 1) {
552	glPushMatrix;	626	glPushMatrix;
553	glColor 1, 1, 0, 1;	627	glColor 1, 1, 0, 1;
554	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	628	glTranslate 0.375, 0.375;
555	glBegin GL_LINE_LOOP;	629	glBegin GL_LINE_LOOP;
556	glVertex 0 , 0;	630	glVertex 0 , 0;
557	glVertex $self->{w} - 1, 0;	631	glVertex $self->{w} - 1, 0;
558	glVertex $self->{w} - 1, $self->{h} - 1;	632	glVertex $self->{w} - 1, $self->{h} - 1;
559	glVertex 0 , $self->{h} - 1;	633	glVertex 0 , $self->{h} - 1;
560	glEnd;	634	glEnd;
561	glPopMatrix;	635	glPopMatrix;
562	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	636	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
563	}	637	}
		638
		639	$self->_draw;
		640	glPopMatrix;
564	}	641	}
565		642
566	sub _draw {	643	sub _draw {
567	my ($self) = @_;	644	my ($self) = @_;
568		645
569	warn "no draw defined for $self\n";	646	warn "no draw defined for $self\n";
570	}	647	}
571		648
		649	my $cntx;#d#
572	sub DESTROY {	650	sub DESTROY {
573	my ($self) = @_;	651	my ($self) = @_;
574		652
		653	return if CFPlus::in_destruct;
		654
		655	eval { $self->destroy };
		656	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		657
575	delete $WIDGET{$self+0};	658	delete $WIDGET{$self+0};
576	#$self->deactivate;
577	}	659	}
578		660
579	#############################################################################	661	#############################################################################
580		662
581	package CFClient::UI::DrawBG;	663	package CFPlus::UI::DrawBG;
582		664
583	our @ISA = CFClient::UI::Base::;	665	our @ISA = CFPlus::UI::Base::;
584		666
585	use strict;	667	use strict;
586	use CFClient::OpenGL;	668	use CFPlus::OpenGL;
587		669
588	sub new {	670	sub new {
589	my $class = shift;	671	my $class = shift;
590		672
591	# range [value, low, high, page]	673	# range [value, low, high, page]
…		…
606		688
607	if ($color && (@$color < 4 || $color->[3])) {	689	if ($color && (@$color < 4 || $color->[3])) {
608	my ($w, $h) = @$self{qw(w h)};	690	my ($w, $h) = @$self{qw(w h)};
609		691
610	glEnable GL_BLEND;	692	glEnable GL_BLEND;
611	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	693	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
612	glColor @$color;	694	glColor_premultiply @$color;
613		695
614	glBegin GL_QUADS;	696	glBegin GL_QUADS;
615	glVertex 0 , 0;	697	glVertex 0 , 0;
616	glVertex 0 , $h;	698	glVertex 0 , $h;
617	glVertex $w, $h;	699	glVertex $w, $h;
…		…
622	}	704	}
623	}	705	}
624		706
625	#############################################################################	707	#############################################################################
626		708
627	package CFClient::UI::Empty;	709	package CFPlus::UI::Empty;
628		710
629	our @ISA = CFClient::UI::Base::;	711	our @ISA = CFPlus::UI::Base::;
630		712
631	sub new {	713	sub new {
632	my ($class, %arg) = @_;	714	my ($class, %arg) = @_;
633	$class->SUPER::new (can_events => 0, %arg);	715	$class->SUPER::new (can_events => 0, %arg);
634	}	716	}
…		…
641		723
642	sub draw { }	724	sub draw { }
643		725
644	#############################################################################	726	#############################################################################
645		727
646	package CFClient::UI::Container;	728	package CFPlus::UI::Container;
647		729
648	our @ISA = CFClient::UI::Base::;	730	our @ISA = CFPlus::UI::Base::;
649		731
650	sub new {	732	sub new {
651	my ($class, %arg) = @_;	733	my ($class, %arg) = @_;
652		734
653	my $children = delete $arg{children} || [];	735	my $children = delete $arg{children};
654		736
655	my $self = $class->SUPER::new (	737	my $self = $class->SUPER::new (
656	children => [],	738	children => [],
657	can_events => 0,	739	can_events => 0,
658	%arg,	740	%arg,
659	);	741	);
		742
660	$self->add ($_) for @$children;	743	$self->add (@$children)
		744	if $children;
661		745
662	$self	746	$self
		747	}
		748
		749	sub realloc {
		750	my ($self) = @_;
		751
		752	$self->{force_realloc} = 1;
		753	$self->{force_size_alloc} = 1;
		754	$self->SUPER::realloc;
663	}	755	}
664		756
665	sub add {	757	sub add {
666	my ($self, @widgets) = @_;	758	my ($self, @widgets) = @_;
667		759
…		…
713	$x -= $self->{x};	805	$x -= $self->{x};
714	$y -= $self->{y};	806	$y -= $self->{y};
715		807
716	my $res;	808	my $res;
717		809
718	for (reverse @{ $self->{children} }) {	810	for (reverse $self->visible_children) {
719	$res = $_->find_widget ($x, $y)	811	$res = $_->find_widget ($x, $y)
720	and return $res;	812	and return $res;
721	}	813	}
722		814
723	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	815	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
729	$_->draw for @{$self->{children}};	821	$_->draw for @{$self->{children}};
730	}	822	}
731		823
732	#############################################################################	824	#############################################################################
733		825
734	package CFClient::UI::Bin;	826	package CFPlus::UI::Bin;
735		827
736	our @ISA = CFClient::UI::Container::;	828	our @ISA = CFPlus::UI::Container::;
737		829
738	sub new {	830	sub new {
739	my ($class, %arg) = @_;	831	my ($class, %arg) = @_;
740		832
741	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	833	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
742		834
743	$class->SUPER::new (children => [$child], %arg)	835	$class->SUPER::new (children => [$child], %arg)
744	}	836	}
745		837
746	sub add {	838	sub add {
747	my ($self, $child) = @_;	839	my ($self, $child) = @_;
748		840
749	$self->{children} = [];	841	$self->SUPER::remove ($_) for @{ $self->{children} };
750
751	$self->SUPER::add ($child);	842	$self->SUPER::add ($child);
752	}	843	}
753		844
754	sub remove {	845	sub remove {
755	my ($self, $widget) = @_;	846	my ($self, $widget) = @_;
756		847
757	$self->SUPER::remove ($widget);	848	$self->SUPER::remove ($widget);
758		849
759	$self->{children} = [new CFClient::UI::Empty]	850	$self->{children} = [new CFPlus::UI::Empty]
760	unless @{$self->{children}};	851	unless @{$self->{children}};
761	}	852	}
762		853
763	sub child { $_[0]->{children}[0] }	854	sub child { $_[0]->{children}[0] }
764		855
765	sub size_request {	856	sub size_request {
766	$_[0]{children}[0]->size_request	857	$_[0]{children}[0]->size_request
767	}	858	}
768		859
769	sub size_allocate {	860	sub invoke_size_allocate {
770	my ($self, $w, $h, $changed) = @_;	861	my ($self, $w, $h) = @_;
771		862
772	$self->{children}[0]->configure (0, 0, $w, $h);	863	$self->{children}[0]->configure (0, 0, $w, $h);
		864
		865	1
773	}	866	}
774		867
775	#############################################################################	868	#############################################################################
776		869
		870	# back-buffered drawing area
		871
777	package CFClient::UI::Window;	872	package CFPlus::UI::Window;
778		873
779	our @ISA = CFClient::UI::Bin::;	874	our @ISA = CFPlus::UI::Bin::;
780		875
781	use CFClient::OpenGL;	876	use CFPlus::OpenGL;
782		877
783	sub new {	878	sub new {
784	my ($class, %arg) = @_;	879	my ($class, %arg) = @_;
785		880
786	my $self = $class->SUPER::new (%arg);	881	my $self = $class->SUPER::new (%arg);
…		…
791		886
792	$ROOT->on_post_alloc ($self => sub { $self->render_child });	887	$ROOT->on_post_alloc ($self => sub { $self->render_child });
793	$self->SUPER::update;	888	$self->SUPER::update;
794	}	889	}
795		890
796	sub size_allocate {	891	sub invoke_size_allocate {
797	my ($self, $w, $h, $changed) = @_;	892	my ($self, $w, $h) = @_;
798		893
799	$self->SUPER::size_allocate ($w, $h, $changed);
800	$self->update	894	$self->update;
801	if $changed;	895
		896	$self->SUPER::invoke_size_allocate ($w, $h)
802	}	897	}
803		898
804	sub _render {	899	sub _render {
		900	my ($self) = @_;
		901
805	$_[0]{children}[0]->draw;	902	$self->{children}[0]->draw;
806	}	903	}
807		904
808	sub render_child {	905	sub render_child {
809	my ($self) = @_;	906	my ($self) = @_;
810		907
811	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	908	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
812	glClearColor 0, 0, 0, 0;	909	glClearColor 0, 0, 0, 0;
813	glClear GL_COLOR_BUFFER_BIT;	910	glClear GL_COLOR_BUFFER_BIT;
814		911
		912	{
		913	package CFPlus::UI::Base;
		914
		915	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		916	(0, 0, $self->{w}, $self->{h});
		917
815	$self->_render;	918	$self->_render;
		919	}
816	};	920	};
817	}	921	}
818		922
819	sub _draw {	923	sub _draw {
820	my ($self) = @_;	924	my ($self) = @_;
821
822	my ($w, $h) = ($self->w, $self->h);
823		925
824	my $tex = $self->{texture}	926	my $tex = $self->{texture}
825	or return;	927	or return;
826		928
827	glEnable GL_TEXTURE_2D;	929	glEnable GL_TEXTURE_2D;
828	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	930	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
829	glColor 1, 1, 1, 1;	931	glColor 0, 0, 0, 1;
830		932
831	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	933	$tex->draw_quad_alpha_premultiplied (0, 0);
832		934
833	glDisable GL_TEXTURE_2D;	935	glDisable GL_TEXTURE_2D;
834	}	936	}
835		937
836	#############################################################################	938	#############################################################################
837		939
838	package CFClient::UI::ViewPort;	940	package CFPlus::UI::ViewPort;
839		941
840	our @ISA = CFClient::UI::Window::;	942	our @ISA = CFPlus::UI::Window::;
841		943
842	sub new {	944	sub new {
843	my $class = shift;	945	my $class = shift;
844		946
845	$class->SUPER::new (	947	$class->SUPER::new (
…		…
850	}	952	}
851		953
852	sub size_request {	954	sub size_request {
853	my ($self) = @_;	955	my ($self) = @_;
854		956
855	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	957	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
856		958
857	$w = 10 if $self->{scroll_x};	959	$w = 10 if $self->{scroll_x};
858	$h = 10 if $self->{scroll_y};	960	$h = 10 if $self->{scroll_y};
859		961
860	($w, $h)	962	($w, $h)
861	}	963	}
862		964
863	sub size_allocate {	965	sub invoke_size_allocate {
864	my ($self, $w, $h, $changed) = @_;	966	my ($self, $w, $h) = @_;
865		967
		968	my $child = $self->child;
		969
866	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	970	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
867	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	971	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
868		972
869	$self->child->configure (0, 0, $w, $h);	973	$self->child->configure (0, 0, $w, $h);
870	$self->update;	974	$self->update;
		975
		976	1
871	}	977	}
872		978
873	sub set_offset {	979	sub set_offset {
874	my ($self, $x, $y) = @_;	980	my ($self, $x, $y) = @_;
875		981
…		…
901	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1007	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
902	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1008	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
903	) {	1009	) {
904	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1010	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
905	} else {	1011	} else {
906	$self->CFClient::UI::Base::find_widget ($x, $y)	1012	$self->CFPlus::UI::Base::find_widget ($x, $y)
907	}	1013	}
908	}	1014	}
909		1015
910	sub _render {	1016	sub _render {
911	my ($self) = @_;	1017	my ($self) = @_;
912		1018
		1019	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
		1020	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
		1021
913	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1022	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
914		1023
915	$self->SUPER::_render;	1024	$self->SUPER::_render;
916	}	1025	}
917		1026
918	#############################################################################	1027	#############################################################################
919		1028
920	package CFClient::UI::ScrolledWindow;	1029	package CFPlus::UI::ScrolledWindow;
921		1030
922	our @ISA = CFClient::UI::HBox::;	1031	our @ISA = CFPlus::UI::HBox::;
923		1032
924	sub new {	1033	sub new {
925	my $class = shift;	1034	my ($class, %arg) = @_;
		1035
		1036	my $child = delete $arg{child};
926		1037
927	my $self;	1038	my $self;
928		1039
929	my $slider = new CFClient::UI::Slider	1040	my $slider = new CFPlus::UI::Slider
930	vertical => 1,	1041	vertical => 1,
931	range => [0, 0, 1, 0.01], # HACK fix	1042	range => [0, 0, 1, 0.01], # HACK fix
932	on_changed => sub {	1043	on_changed => sub {
933	$self->{vp}->set_offset (0, $_[1]);	1044	$self->{vp}->set_offset (0, $_[1]);
934	},	1045	},
935	;	1046	;
936		1047
937	$self = $class->SUPER::new (	1048	$self = $class->SUPER::new (
938	vp => (new CFClient::UI::ViewPort expand => 1),	1049	vp => (new CFPlus::UI::ViewPort expand => 1),
		1050	can_events => 1,
939	slider => $slider,	1051	slider => $slider,
940	@_,	1052	%arg,
941	);	1053	);
942		1054
943	$self->{vp}->add ($self->{scrolled});
944	$self->add ($self->{vp});
945	$self->add ($self->{slider});	1055	$self->SUPER::add ($self->{vp}, $self->{slider});
		1056	$self->add ($child) if $child;
946		1057
947	$self	1058	$self
948	}	1059	}
949		1060
		1061	#TODO# update range on size_allocate depending on child
		1062
		1063	sub add {
		1064	my ($self, $widget) = @_;
		1065
		1066	$self->{vp}->add ($self->{child} = $widget);
		1067	}
		1068
		1069	sub invoke_mouse_wheel {
		1070	my ($self, $ev) = @_;
		1071
		1072	return 0 unless $ev->{dy}; # only vertical movements
		1073
		1074	$self->{slider}->emit (mouse_wheel => $ev);
		1075
		1076	1
		1077	}
		1078
		1079	sub update_slider {
		1080	my ($self) = @_;
		1081
		1082	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1083	}
		1084
950	sub update {	1085	sub update {
951	my ($self) = @_;	1086	my ($self) = @_;
952		1087
953	$self->SUPER::update;	1088	$self->SUPER::update;
954		1089
955	# todo: overwrite size_allocate of child	1090	$self->update_slider;
956	my $child = $self->{vp}->child;
957	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958	}	1091	}
959		1092
960	sub size_allocate {	1093	sub invoke_size_allocate {
961	my ($self, $w, $h, $changed) = @_;	1094	my ($self, $w, $h) = @_;
962		1095
		1096	$self->update_slider;
		1097
963	$self->SUPER::size_allocate ($w, $h, $changed);	1098	$self->SUPER::invoke_size_allocate ($w, $h)
964
965	my $child = $self->{vp}->child;
966	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
967	}	1099	}
968
969	#TODO# update range on size_allocate depending on child
970	# update viewport offset on scroll
971		1100
972	#############################################################################	1101	#############################################################################
973		1102
974	package CFClient::UI::Frame;	1103	package CFPlus::UI::Frame;
975		1104
976	our @ISA = CFClient::UI::Bin::;	1105	our @ISA = CFPlus::UI::Bin::;
977		1106
978	use CFClient::OpenGL;	1107	use CFPlus::OpenGL;
979		1108
980	sub new {	1109	sub new {
981	my $class = shift;	1110	my $class = shift;
982		1111
983	$class->SUPER::new (	1112	$class->SUPER::new (
…		…
991		1120
992	if ($self->{bg}) {	1121	if ($self->{bg}) {
993	my ($w, $h) = @$self{qw(w h)};	1122	my ($w, $h) = @$self{qw(w h)};
994		1123
995	glEnable GL_BLEND;	1124	glEnable GL_BLEND;
996	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1125	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
997	glColor @{ $self->{bg} };	1126	glColor_premultiply @{ $self->{bg} };
998		1127
999	glBegin GL_QUADS;	1128	glBegin GL_QUADS;
1000	glVertex 0 , 0;	1129	glVertex 0 , 0;
1001	glVertex 0 , $h;	1130	glVertex 0 , $h;
1002	glVertex $w, $h;	1131	glVertex $w, $h;
…		…
1009	$self->SUPER::_draw;	1138	$self->SUPER::_draw;
1010	}	1139	}
1011		1140
1012	#############################################################################	1141	#############################################################################
1013		1142
1014	package CFClient::UI::FancyFrame;	1143	package CFPlus::UI::FancyFrame;
1015		1144
1016	our @ISA = CFClient::UI::Bin::;	1145	our @ISA = CFPlus::UI::Bin::;
1017		1146
1018	use CFClient::OpenGL;	1147	use CFPlus::OpenGL;
		1148
		1149	sub new {
		1150	my ($class, %arg) = @_;
		1151
		1152	if ((exists $arg{label}) && !ref $arg{label}) {
		1153	$arg{label} = new CFPlus::UI::Label
		1154	align => 1,
		1155	valign => 0,
		1156	text => $arg{label},
		1157	fontsize => ($arg{border} || 0.8) * 0.75;
		1158	}
		1159
		1160	my $self = $class->SUPER::new (
		1161	# label => "",
		1162	fg => [0.6, 0.3, 0.1],
		1163	border => 0.8,
		1164	style => 'single',
		1165	%arg,
		1166	);
		1167
		1168	$self
		1169	}
		1170
		1171	sub add {
		1172	my ($self, @widgets) = @_;
		1173
		1174	$self->SUPER::add (@widgets);
		1175	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1176	}
		1177
		1178	sub border {
		1179	int $_[0]{border} * $::FONTSIZE
		1180	}
		1181
		1182	sub size_request {
		1183	my ($self) = @_;
		1184
		1185	($self->{label_w}, undef) = $self->{label}->size_request
		1186	if $self->{label};
		1187
		1188	my ($w, $h) = $self->SUPER::size_request;
		1189
		1190	(
		1191	$w + $self->border * 2,
		1192	$h + $self->border * 2,
		1193	)
		1194	}
		1195
		1196	sub invoke_size_allocate {
		1197	my ($self, $w, $h) = @_;
		1198
		1199	my $border = $self->border;
		1200
		1201	$w -= List::Util::max 0, $border * 2;
		1202	$h -= List::Util::max 0, $border * 2;
		1203
		1204	if (my $label = $self->{label}) {
		1205	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1206	$label->{h} = List::Util::min $h, $border;
		1207	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1208	}
		1209
		1210	$self->child->configure ($border, $border, $w, $h);
		1211
		1212	1
		1213	}
		1214
		1215	sub _draw {
		1216	my ($self) = @_;
		1217
		1218	my $child = $self->{children}[0];
		1219
		1220	my $border = $self->border;
		1221	my ($w, $h) = ($self->{w}, $self->{h});
		1222
		1223	$child->draw;
		1224
		1225	glColor @{$self->{fg}};
		1226	glBegin GL_LINE_STRIP;
		1227	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1228	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1229	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1230	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1231	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1232	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1233	glEnd;
		1234
		1235	if ($self->{label}) {
		1236	glTranslate $border * 2, 0;
		1237	$self->{label}->_draw;
		1238	}
		1239	}
		1240
		1241	#############################################################################
		1242
		1243	package CFPlus::UI::Toplevel;
		1244
		1245	our @ISA = CFPlus::UI::Bin::;
		1246
		1247	use CFPlus::OpenGL;
1019		1248
1020	my $bg =	1249	my $bg =
1021	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1250	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1022	mipmap => 1, wrap => 1;	1251	mipmap => 1, wrap => 1;
1023		1252
1024	my @border =	1253	my @border =
1025	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1254	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1026	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1255	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1027		1256
1028	sub new {	1257	sub new {
1029	my $class = shift;	1258	my ($class, %arg) = @_;
1030		1259
1031	my $self = $class->SUPER::new (	1260	my $self = $class->SUPER::new (
1032	bg => [1, 1, 1, 1],	1261	bg => [1, 1, 1, 1],
1033	border_bg => [1, 1, 1, 1],	1262	border_bg => [1, 1, 1, 1],
1034	border => 0.6,	1263	border => 0.6,
1035	can_events => 1,	1264	can_events => 1,
1036	min_w => 16,	1265	min_w => 64,
1037	min_h => 16,	1266	min_h => 32,
1038	@_	1267	%arg,
1039	);	1268	);
1040		1269
1041	$self->{title} &&= new CFClient::UI::Label	1270	$self->{title_widget} = new CFPlus::UI::Label
1042	align => 0,	1271	align => 0,
1043	valign => 1,	1272	valign => 1,
1044	text => $self->{title},	1273	text => $self->{title},
1045	fontsize => $self->{border};	1274	fontsize => $self->{border},
		1275	if exists $self->{title};
		1276
		1277	if ($self->{has_close_button}) {
		1278	$self->{close_button} =
		1279	new CFPlus::UI::ImageButton
		1280	path => 'x1_close.png',
		1281	on_activate => sub { $self->emit ("delete") };
		1282
		1283	$self->CFPlus::UI::Container::add ($self->{close_button});
		1284	}
1046		1285
1047	$self	1286	$self
		1287	}
		1288
		1289	sub add {
		1290	my ($self, @widgets) = @_;
		1291
		1292	$self->SUPER::add (@widgets);
		1293	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
		1294	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1048	}	1295	}
1049		1296
1050	sub border {	1297	sub border {
1051	int $_[0]{border} * $::FONTSIZE	1298	int $_[0]{border} * $::FONTSIZE
1052	}	1299	}
1053		1300
1054	sub size_request {	1301	sub size_request {
1055	my ($self) = @_;	1302	my ($self) = @_;
		1303
		1304	$self->{title_widget}->size_request
		1305	if $self->{title_widget};
		1306
		1307	$self->{close_button}->size_request
		1308	if $self->{close_button};
1056		1309
1057	my ($w, $h) = $self->SUPER::size_request;	1310	my ($w, $h) = $self->SUPER::size_request;
1058		1311
1059	(	1312	(
1060	$w + $self->border * 2,	1313	$w + $self->border * 2,
1061	$h + $self->border * 2,	1314	$h + $self->border * 2,
1062	)	1315	)
1063	}	1316	}
1064		1317
1065	sub size_allocate {	1318	sub invoke_size_allocate {
1066	my ($self, $w, $h, $changed) = @_;	1319	my ($self, $w, $h) = @_;
1067		1320
1068	return unless $changed;	1321	if ($self->{title_widget}) {
		1322	$self->{title_widget}{w} = $w;
		1323	$self->{title_widget}{h} = $h;
		1324	$self->{title_widget}->invoke_size_allocate ($w, $h);
		1325	}
1069		1326
		1327	my $border = $self->border;
		1328
1070	$h -= List::Util::max 0, $self->border * 2;	1329	$h -= List::Util::max 0, $border * 2;
1071	$w -= List::Util::max 0, $self->border * 2;	1330	$w -= List::Util::max 0, $border * 2;
1072		1331
1073	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1074	if $self->{title};
1075
1076	$self->child->configure ($self->border, $self->border, $w, $h);	1332	$self->child->configure ($border, $border, $w, $h);
1077	}
1078		1333
		1334	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1335	if $self->{close_button};
		1336
		1337	1
		1338	}
		1339
		1340	sub invoke_delete {
		1341	my ($self) = @_;
		1342
		1343	$self->hide;
		1344
		1345	1
		1346	}
		1347
1079	sub button_down {	1348	sub invoke_button_down {
1080	my ($self, $ev, $x, $y) = @_;	1349	my ($self, $ev, $x, $y) = @_;
1081		1350
1082	my ($w, $h) = @$self{qw(w h)};	1351	my ($w, $h) = @$self{qw(w h)};
1083	my $border = $self->border;	1352	my $border = $self->border;
1084		1353
…		…
1100	my $dy = $ev->{y} - $oy;	1369	my $dy = $ev->{y} - $oy;
1101		1370
1102	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1371	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1103	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1372	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104		1373
		1374	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1105	$self->realloc;	1375	$self->realloc;
1106	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1107	};	1376	};
1108		1377
1109	} elsif ($lr ^ $td) {	1378	} elsif ($lr ^ $td) {
1110	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1379	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1111	my ($bx, $by) = ($self->{x}, $self->{y});	1380	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1114	my ($ev, $x, $y) = @_;	1383	my ($ev, $x, $y) = @_;
1115		1384
1116	($x, $y) = ($ev->{x}, $ev->{y});	1385	($x, $y) = ($ev->{x}, $ev->{y});
1117		1386
1118	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1387	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1388	# HACK: the next line is required to enforce placement
		1389	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1119	};	1390	};
		1391	} else {
		1392	return 0;
		1393	}
		1394
1120	}	1395	1
1121	}	1396	}
1122		1397
1123	sub button_up {	1398	sub invoke_button_up {
1124	my ($self, $ev, $x, $y) = @_;	1399	my ($self, $ev, $x, $y) = @_;
1125		1400
1126	delete $self->{motion};	1401	! ! delete $self->{motion}
1127	}	1402	}
1128		1403
1129	sub mouse_motion {	1404	sub invoke_mouse_motion {
1130	my ($self, $ev, $x, $y) = @_;	1405	my ($self, $ev, $x, $y) = @_;
1131		1406
1132	$self->{motion}->($ev, $x, $y) if $self->{motion};	1407	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1408
		1409	! ! $self->{motion}
		1410	}
		1411
		1412	sub invoke_visibility_change {
		1413	my ($self, $visible) = @_;
		1414
		1415	delete $self->{motion} unless $visible;
		1416
		1417	0
1133	}	1418	}
1134		1419
1135	sub _draw {	1420	sub _draw {
1136	my ($self) = @_;	1421	my ($self) = @_;
1137		1422
		1423	my $child = $self->{children}[0];
		1424
1138	my ($w, $h ) = ($self->{w}, $self->{h});	1425	my ($w, $h ) = ($self->{w}, $self->{h});
1139	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1426	my ($cw, $ch) = ($child->{w}, $child->{h});
1140		1427
1141	glEnable GL_TEXTURE_2D;	1428	glEnable GL_TEXTURE_2D;
1142	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1429	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1143		1430
1144	my $border = $self->border;	1431	my $border = $self->border;
…		…
1159	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1446	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160	}	1447	}
1161		1448
1162	glDisable GL_TEXTURE_2D;	1449	glDisable GL_TEXTURE_2D;
1163		1450
1164	$self->{title}->draw if $self->{title};
1165
1166	$self->child->draw;	1451	$child->draw;
		1452
		1453	if ($self->{title_widget}) {
		1454	glTranslate 0, $border - $self->{h};
		1455	$self->{title_widget}->_draw;
		1456
		1457	glTranslate 0, - ($border - $self->{h});
		1458	}
		1459
		1460	$self->{close_button}->draw
		1461	if $self->{close_button};
1167	}	1462	}
1168		1463
1169	#############################################################################	1464	#############################################################################
1170		1465
1171	package CFClient::UI::Table;	1466	package CFPlus::UI::Table;
1172		1467
1173	our @ISA = CFClient::UI::Base::;	1468	our @ISA = CFPlus::UI::Base::;
1174		1469
1175	use List::Util qw(max sum);	1470	use List::Util qw(max sum);
1176		1471
1177	use CFClient::OpenGL;	1472	use CFPlus::OpenGL;
1178		1473
1179	sub new {	1474	sub new {
1180	my $class = shift;	1475	my $class = shift;
1181		1476
1182	$class->SUPER::new (	1477	$class->SUPER::new (
…		…
1188	sub children {	1483	sub children {
1189	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1484	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1190	}	1485	}
1191		1486
1192	sub add {	1487	sub add {
1193	my ($self, $x, $y, $child) = @_;	1488	my ($self) = shift;
1194		1489
		1490	while (@_) {
		1491	my ($x, $y, $child) = splice @_, 0, 3, ();
1195	$child->set_parent ($self);	1492	$child->set_parent ($self);
1196	$self->{children}[$y][$x] = $child;	1493	$self->{children}[$y][$x] = $child;
		1494	}
1197		1495
		1496	$self->{force_realloc} = 1;
		1497	$self->{force_size_alloc} = 1;
1198	$self->realloc;	1498	$self->realloc;
		1499	}
		1500
		1501	sub remove {
		1502	my ($self, $child) = @_;
		1503
		1504	# TODO: not yet implemented
1199	}	1505	}
1200		1506
1201	# TODO: move to container class maybe? send children a signal on removal?	1507	# TODO: move to container class maybe? send children a signal on removal?
1202	sub clear {	1508	sub clear {
1203	my ($self) = @_;	1509	my ($self) = @_;
…		…
1244	(sum @$ws),	1550	(sum @$ws),
1245	(sum @$hs),	1551	(sum @$hs),
1246	)	1552	)
1247	}	1553	}
1248		1554
1249	sub size_allocate {	1555	sub invoke_size_allocate {
1250	my ($self, $w, $h, $changed) = @_;	1556	my ($self, $w, $h) = @_;
1251		1557
1252	my ($ws, $hs) = $self->get_wh;	1558	my ($ws, $hs) = $self->get_wh;
1253		1559
1254	my $req_w = (sum @$ws) || 1;	1560	my $req_w = (sum @$ws) || 1;
1255	my $req_h = (sum @$hs) || 1;	1561	my $req_h = (sum @$hs) || 1;
…		…
1261		1567
1262	# linearly scale sizes	1568	# linearly scale sizes
1263	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1569	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1264	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1570	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1265		1571
1266	CFClient::UI::harmonize $ws;	1572	CFPlus::UI::harmonize $ws;
1267	CFClient::UI::harmonize $hs;	1573	CFPlus::UI::harmonize $hs;
1268		1574
1269	my $y;	1575	my $y;
1270		1576
1271	for my $r (0 .. $#{$self->{children}}) {	1577	for my $r (0 .. $#{$self->{children}}) {
1272	my $row = $self->{children}[$r]	1578	my $row = $self->{children}[$r]
…		…
1286	}	1592	}
1287		1593
1288	$y += $row_h;	1594	$y += $row_h;
1289	}	1595	}
1290		1596
		1597	1
1291	}	1598	}
1292		1599
1293	sub find_widget {	1600	sub find_widget {
1294	my ($self, $x, $y) = @_;	1601	my ($self, $x, $y) = @_;
1295		1602
…		…
1314	}	1621	}
1315	}	1622	}
1316		1623
1317	#############################################################################	1624	#############################################################################
1318		1625
1319	package CFClient::UI::Box;	1626	package CFPlus::UI::Box;
1320		1627
1321	our @ISA = CFClient::UI::Container::;	1628	our @ISA = CFPlus::UI::Container::;
1322		1629
1323	sub size_request {	1630	sub size_request {
1324	my ($self) = @_;	1631	my ($self) = @_;
1325		1632
1326	$self->{vertical}	1633	$self->{vertical}
…		…
1332	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1639	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1333	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1640	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1334	)	1641	)
1335	}	1642	}
1336		1643
1337	sub size_allocate {	1644	sub invoke_size_allocate {
1338	my ($self, $w, $h, $changed) = @_;	1645	my ($self, $w, $h) = @_;
1339		1646
1340	my $space = $self->{vertical} ? $h : $w;	1647	my $space = $self->{vertical} ? $h : $w;
1341	my $children = $self->{children};	1648	my @children = $self->visible_children;
1342		1649
1343	my @req;	1650	my @req;
1344		1651
1345	if ($self->{homogeneous}) {	1652	if ($self->{homogeneous}) {
1346	@req = ($space / (@$children || 1)) x @$children;	1653	@req = ($space / (@children || 1)) x @children;
1347	} else {	1654	} else {
1348	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1655	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1349	my $req = List::Util::sum @req;	1656	my $req = List::Util::sum @req;
1350		1657
1351	if ($req > $space) {	1658	if ($req > $space) {
1352	# ah well, not enough space	1659	# ah well, not enough space
1353	$_ *= $space / $req for @req;	1660	$_ *= $space / $req for @req;
1354	} else {	1661	} else {
1355	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1662	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1356		1663
1357	$space = ($space - $req) / $expand; # remaining space to give away	1664	$space = ($space - $req) / $expand; # remaining space to give away
1358		1665
1359	$req[$_] += $space * $children->[$_]{expand}	1666	$req[$_] += $space * $children[$_]{expand}
1360	for 0 .. $#$children;	1667	for 0 .. $#children;
1361	}	1668	}
1362	}	1669	}
1363		1670
1364	CFClient::UI::harmonize \@req;	1671	CFPlus::UI::harmonize \@req;
1365		1672
1366	my $pos = 0;	1673	my $pos = 0;
1367	for (0 .. $#$children) {	1674	for (0 .. $#children) {
1368	my $alloc = $req[$_];	1675	my $alloc = $req[$_];
1369	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1676	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1370		1677
1371	$pos += $alloc;	1678	$pos += $alloc;
1372	}	1679	}
1373		1680
1374	1	1681	1
1375	}	1682	}
1376		1683
1377	#############################################################################	1684	#############################################################################
1378		1685
1379	package CFClient::UI::HBox;	1686	package CFPlus::UI::HBox;
1380		1687
1381	our @ISA = CFClient::UI::Box::;	1688	our @ISA = CFPlus::UI::Box::;
1382		1689
1383	sub new {	1690	sub new {
1384	my $class = shift;	1691	my $class = shift;
1385		1692
1386	$class->SUPER::new (	1693	$class->SUPER::new (
…		…
1389	)	1696	)
1390	}	1697	}
1391		1698
1392	#############################################################################	1699	#############################################################################
1393		1700
1394	package CFClient::UI::VBox;	1701	package CFPlus::UI::VBox;
1395		1702
1396	our @ISA = CFClient::UI::Box::;	1703	our @ISA = CFPlus::UI::Box::;
1397		1704
1398	sub new {	1705	sub new {
1399	my $class = shift;	1706	my $class = shift;
1400		1707
1401	$class->SUPER::new (	1708	$class->SUPER::new (
…		…
1404	)	1711	)
1405	}	1712	}
1406		1713
1407	#############################################################################	1714	#############################################################################
1408		1715
1409	package CFClient::UI::Label;	1716	package CFPlus::UI::Label;
1410		1717
1411	our @ISA = CFClient::UI::DrawBG::;	1718	our @ISA = CFPlus::UI::DrawBG::;
1412		1719
1413	use CFClient::OpenGL;	1720	use CFPlus::OpenGL;
1414		1721
1415	sub new {	1722	sub new {
1416	my ($class, %arg) = @_;	1723	my ($class, %arg) = @_;
1417		1724
1418	my $self = $class->SUPER::new (	1725	my $self = $class->SUPER::new (
…		…
1421	#active_bg => none	1728	#active_bg => none
1422	#font => default_font	1729	#font => default_font
1423	#text => initial text	1730	#text => initial text
1424	#markup => initial narkup	1731	#markup => initial narkup
1425	#max_w => maximum pixel width	1732	#max_w => maximum pixel width
		1733	#style => 0, # render flags
1426	ellipsise => 3, # end	1734	ellipsise => 3, # end
1427	layout => (new CFClient::Layout),	1735	layout => (new CFPlus::Layout),
1428	fontsize => 1,	1736	fontsize => 1,
1429	align => -1,	1737	align => -1,
1430	valign => -1,	1738	valign => -1,
1431	padding_x => 2,	1739	padding_x => 2,
1432	padding_y => 2,	1740	padding_y => 2,
1433	can_events => 0,	1741	can_events => 0,
1434	%arg	1742	%arg
1435	);	1743	);
1436		1744
1437	if (exists $self->{template}) {	1745	if (exists $self->{template}) {
1438	my $layout = new CFClient::Layout;	1746	my $layout = new CFPlus::Layout;
1439	$layout->set_text (delete $self->{template});	1747	$layout->set_text (delete $self->{template});
1440	$self->{template} = $layout;	1748	$self->{template} = $layout;
1441	}	1749	}
1442		1750
1443	if (exists $self->{markup}) {	1751	if (exists $self->{markup}) {
…		…
1447	}	1755	}
1448		1756
1449	$self	1757	$self
1450	}	1758	}
1451		1759
1452	sub escape($) {
1453	local $_ = $_[0];
1454
1455	s/&/&amp;/g;
1456	s/>/&gt;/g;
1457	s/</&lt;/g;
1458
1459	$_
1460	}
1461
1462	sub update {	1760	sub update {
1463	my ($self) = @_;	1761	my ($self) = @_;
1464		1762
1465	delete $self->{texture};	1763	delete $self->{texture};
1466	$self->SUPER::update;	1764	$self->SUPER::update;
1467	}	1765	}
1468		1766
		1767	sub realloc {
		1768	my ($self) = @_;
		1769
		1770	delete $self->{ox};
		1771	$self->SUPER::realloc;
		1772	}
		1773
1469	sub set_text {	1774	sub set_text {
1470	my ($self, $text) = @_;	1775	my ($self, $text) = @_;
1471		1776
1472	return if $self->{text} eq "T$text";	1777	return if $self->{text} eq "T$text";
1473	$self->{text} = "T$text";	1778	$self->{text} = "T$text";
1474		1779
1475	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1476	$self->{layout}->set_text ($text);	1780	$self->{layout}->set_text ($text);
1477		1781
		1782	delete $self->{size_req};
1478	$self->realloc;	1783	$self->realloc;
1479	$self->update;	1784	$self->update;
1480	}	1785	}
1481		1786
1482	sub set_markup {	1787	sub set_markup {
…		…
1485	return if $self->{text} eq "M$markup";	1790	return if $self->{text} eq "M$markup";
1486	$self->{text} = "M$markup";	1791	$self->{text} = "M$markup";
1487		1792
1488	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1793	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1489		1794
1490	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1491	$self->{layout}->set_markup ($markup);	1795	$self->{layout}->set_markup ($markup);
1492		1796
		1797	delete $self->{size_req};
1493	$self->realloc;	1798	$self->realloc;
1494	$self->update;	1799	$self->update;
1495	}	1800	}
1496		1801
1497	sub size_request {	1802	sub size_request {
1498	my ($self) = @_;	1803	my ($self) = @_;
1499		1804
		1805	$self->{size_req} ||= do {
1500	$self->{layout}->set_font ($self->{font}) if $self->{font};	1806	$self->{layout}->set_font ($self->{font}) if $self->{font};
1501	$self->{layout}->set_width ($self->{max_w} || -1);	1807	$self->{layout}->set_width ($self->{max_w} || -1);
1502	$self->{layout}->set_ellipsise ($self->{ellipsise});	1808	$self->{layout}->set_ellipsise ($self->{ellipsise});
1503	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1809	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1504	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1810	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1505		1811
1506	my ($w, $h) = $self->{layout}->size;	1812	my ($w, $h) = $self->{layout}->size;
1507		1813
1508	if (exists $self->{template}) {	1814	if (exists $self->{template}) {
1509	$self->{template}->set_font ($self->{font}) if $self->{font};	1815	$self->{template}->set_font ($self->{font}) if $self->{font};
		1816	$self->{template}->set_width ($self->{max_w} || -1);
1510	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1817	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1511		1818
1512	my ($w2, $h2) = $self->{template}->size;	1819	my ($w2, $h2) = $self->{template}->size;
1513		1820
1514	$w = List::Util::max $w, $w2;	1821	$w = List::Util::max $w, $w2;
1515	$h = List::Util::max $h, $h2;	1822	$h = List::Util::max $h, $h2;
		1823	}
		1824
		1825	[$w, $h]
1516	}	1826	};
1517		1827
1518	($w, $h)	1828	@{ $self->{size_req} }
1519	}	1829	}
1520		1830
		1831	sub baseline_shift {
		1832	$_[0]{layout}->descent
		1833	}
		1834
1521	sub size_allocate {	1835	sub invoke_size_allocate {
1522	my ($self, $w, $h, $changed) = @_;	1836	my ($self, $w, $h) = @_;
		1837
		1838	delete $self->{ox};
1523		1839
1524	delete $self->{texture}	1840	delete $self->{texture}
1525	if $changed;	1841	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1842
		1843	1
1526	}	1844	}
1527		1845
1528	sub set_fontsize {	1846	sub set_fontsize {
1529	my ($self, $fontsize) = @_;	1847	my ($self, $fontsize) = @_;
1530		1848
1531	$self->{fontsize} = $fontsize;	1849	$self->{fontsize} = $fontsize;
		1850	delete $self->{size_req};
1532	delete $self->{texture};	1851	delete $self->{texture};
1533		1852
1534	$self->realloc;	1853	$self->realloc;
1535	}	1854	}
1536		1855
		1856	sub reconfigure {
		1857	my ($self) = @_;
		1858
		1859	delete $self->{size_req};
		1860	delete $self->{texture};
		1861
		1862	$self->SUPER::reconfigure;
		1863	}
		1864
1537	sub _draw {	1865	sub _draw {
1538	my ($self) = @_;	1866	my ($self) = @_;
1539		1867
1540	$self->SUPER::_draw; # draw background, if applicable	1868	$self->SUPER::_draw; # draw background, if applicable
1541		1869
1542	my $tex = $self->{texture} ||= do {	1870	my $size = $self->{texture} ||= do {
1543	$self->{layout}->set_foreground (@{$self->{fg}});	1871	$self->{layout}->set_foreground (@{$self->{fg}});
1544	$self->{layout}->set_font ($self->{font}) if $self->{font};	1872	$self->{layout}->set_font ($self->{font}) if $self->{font};
1545	$self->{layout}->set_width ($self->{w});	1873	$self->{layout}->set_width ($self->{w});
1546	$self->{layout}->set_ellipsise ($self->{ellipsise});	1874	$self->{layout}->set_ellipsise ($self->{ellipsise});
1547	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1875	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1548	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1876	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549		1877
1550	my $tex = new_from_layout CFClient::Texture $self->{layout};	1878	[$self->{layout}->size]
		1879	};
1551		1880
		1881	unless (exists $self->{ox}) {
1552	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1882	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1883	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1554	: ($self->{w} - $tex->{w}) * 0.5);	1884	: ($self->{w} - $size->[0]) * 0.5);
1555		1885
1556	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1886	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1887	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1558	: ($self->{h} - $tex->{h}) * 0.5);	1888	: ($self->{h} - $size->[1]) * 0.5);
1559
1560	$tex
1561	};	1889	};
1562		1890
1563	glEnable GL_TEXTURE_2D;	1891	my $w = List::Util::min $self->{w} + 4, $size->[0];
1564	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1892	my $h = List::Util::min $self->{h} + 2, $size->[1];
1565		1893
1566	if ($tex->{format} == GL_ALPHA) {	1894	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1567	glColor @{$self->{fg}};
1568	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1569	} else {
1570	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1571	}
1572
1573	glDisable GL_TEXTURE_2D;
1574	}	1895	}
1575		1896
1576	#############################################################################	1897	#############################################################################
1577		1898
1578	package CFClient::UI::EntryBase;	1899	package CFPlus::UI::EntryBase;
1579		1900
1580	our @ISA = CFClient::UI::Label::;	1901	our @ISA = CFPlus::UI::Label::;
1581		1902
1582	use CFClient::OpenGL;	1903	use CFPlus::OpenGL;
1583		1904
1584	sub new {	1905	sub new {
1585	my $class = shift;	1906	my $class = shift;
1586		1907
1587	$class->SUPER::new (	1908	$class->SUPER::new (
…		…
1591	active_fg => [0, 0, 0],	1912	active_fg => [0, 0, 0],
1592	can_hover => 1,	1913	can_hover => 1,
1593	can_focus => 1,	1914	can_focus => 1,
1594	valign => 0,	1915	valign => 0,
1595	can_events => 1,	1916	can_events => 1,
		1917	ellipsise => 0,
1596	#text => ...	1918	#text => ...
		1919	#hidden => "*",
1597	@_	1920	@_
1598	)	1921	)
1599	}	1922	}
1600		1923
1601	sub _set_text {	1924	sub _set_text {
…		…
1603		1926
1604	delete $self->{cur_h};	1927	delete $self->{cur_h};
1605		1928
1606	return if $self->{text} eq $text;	1929	return if $self->{text} eq $text;
1607		1930
1608	delete $self->{texture};
1609
1610	$self->{last_activity} = $::NOW;	1931	$self->{last_activity} = $::NOW;
1611	$self->{text} = $text;	1932	$self->{text} = $text;
1612		1933
1613	$text =~ s/./*/g if $self->{hidden};	1934	$text =~ s/./*/g if $self->{hidden};
1614	$self->{layout}->set_text ("$text ");	1935	$self->{layout}->set_text ("$text ");
		1936	delete $self->{size_req};
1615		1937
1616	$self->_emit (changed => $self->{text});	1938	$self->emit (changed => $self->{text});
		1939
		1940	$self->realloc;
		1941	$self->update;
1617	}	1942	}
1618		1943
1619	sub set_text {	1944	sub set_text {
1620	my ($self, $text) = @_;	1945	my ($self, $text) = @_;
1621		1946
1622	$self->{cursor} = length $text;	1947	$self->{cursor} = length $text;
1623	$self->_set_text ($text);	1948	$self->_set_text ($text);
1624
1625	$self->realloc;
1626	}	1949	}
1627		1950
1628	sub get_text {	1951	sub get_text {
1629	$_[0]{text}	1952	$_[0]{text}
1630	}	1953	}
…		…
1635	my ($w, $h) = $self->SUPER::size_request;	1958	my ($w, $h) = $self->SUPER::size_request;
1636		1959
1637	($w + 1, $h) # add 1 for cursor	1960	($w + 1, $h) # add 1 for cursor
1638	}	1961	}
1639		1962
1640	sub key_down {	1963	sub invoke_key_down {
1641	my ($self, $ev) = @_;	1964	my ($self, $ev) = @_;
1642		1965
1643	my $mod = $ev->{mod};	1966	my $mod = $ev->{mod};
1644	my $sym = $ev->{sym};	1967	my $sym = $ev->{sym};
1645	my $uni = $ev->{unicode};	1968	my $uni = $ev->{unicode};
…		…
1648		1971
1649	if ($uni == 8) {	1972	if ($uni == 8) {
1650	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1973	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1651	} elsif ($uni == 127) {	1974	} elsif ($uni == 127) {
1652	substr $text, $self->{cursor}, 1, "";	1975	substr $text, $self->{cursor}, 1, "";
1653	} elsif ($sym == CFClient::SDLK_LEFT) {	1976	} elsif ($sym == CFPlus::SDLK_LEFT) {
1654	--$self->{cursor} if $self->{cursor};	1977	--$self->{cursor} if $self->{cursor};
1655	} elsif ($sym == CFClient::SDLK_RIGHT) {	1978	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1656	++$self->{cursor} if $self->{cursor} < length $self->{text};	1979	++$self->{cursor} if $self->{cursor} < length $self->{text};
1657	} elsif ($sym == CFClient::SDLK_HOME) {	1980	} elsif ($sym == CFPlus::SDLK_HOME) {
1658	$self->{cursor} = 0;	1981	$self->{cursor} = 0;
1659	} elsif ($sym == CFClient::SDLK_END) {	1982	} elsif ($sym == CFPlus::SDLK_END) {
1660	$self->{cursor} = length $text;	1983	$self->{cursor} = length $text;
		1984	} elsif ($uni == 21) { # ctrl-u
		1985	$text = "";
		1986	$self->{cursor} = 0;
1661	} elsif ($uni == 27) {	1987	} elsif ($uni == 27) {
1662	$self->_emit ('escape');	1988	$self->emit ('escape');
1663	} elsif ($uni) {	1989	} elsif ($uni >= 0x20 || $uni == 0x0d) {
1664	substr $text, $self->{cursor}++, 0, chr $uni;	1990	substr $text, $self->{cursor}++, 0, chr $uni;
		1991	} else {
		1992	return 0;
1665	}	1993	}
1666		1994
1667	$self->_set_text ($text);	1995	$self->_set_text ($text);
1668		1996
1669	$self->realloc;	1997	$self->realloc;
1670	}	1998	$self->update;
1671		1999
		2000	1
		2001	}
		2002
1672	sub focus_in {	2003	sub invoke_focus_in {
1673	my ($self) = @_;	2004	my ($self) = @_;
1674		2005
1675	$self->{last_activity} = $::NOW;	2006	$self->{last_activity} = $::NOW;
1676		2007
1677	$self->SUPER::focus_in;	2008	$self->SUPER::invoke_focus_in
1678	}	2009	}
1679		2010
1680	sub button_down {	2011	sub invoke_button_down {
1681	my ($self, $ev, $x, $y) = @_;	2012	my ($self, $ev, $x, $y) = @_;
1682		2013
1683	$self->SUPER::button_down ($ev, $x, $y);	2014	$self->SUPER::invoke_button_down ($ev, $x, $y);
1684		2015
1685	my $idx = $self->{layout}->xy_to_index ($x, $y);	2016	my $idx = $self->{layout}->xy_to_index ($x, $y);
1686		2017
1687	# byte-index to char-index	2018	# byte-index to char-index
1688	my $text = $self->{text};	2019	my $text = $self->{text};
1689	utf8::encode $text;	2020	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1690	$self->{cursor} = length substr $text, 0, $idx;	2021	$self->{cursor} = length $text;
1691		2022
1692	$self->_set_text ($self->{text});	2023	$self->_set_text ($self->{text});
1693	$self->update;	2024	$self->update;
		2025
		2026	1
1694	}	2027	}
1695		2028
1696	sub mouse_motion {	2029	sub invoke_mouse_motion {
1697	my ($self, $ev, $x, $y) = @_;	2030	my ($self, $ev, $x, $y) = @_;
1698	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2031	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		2032
		2033	1
1699	}	2034	}
1700		2035
1701	sub _draw {	2036	sub _draw {
1702	my ($self) = @_;	2037	my ($self) = @_;
1703		2038
1704	local $self->{fg} = $self->{fg};	2039	local $self->{fg} = $self->{fg};
1705		2040
1706	if ($FOCUS == $self) {	2041	if ($FOCUS == $self) {
1707	glColor @{$self->{active_bg}};	2042	glColor_premultiply @{$self->{active_bg}};
1708	$self->{fg} = $self->{active_fg};	2043	$self->{fg} = $self->{active_fg};
1709	} else {	2044	} else {
1710	glColor @{$self->{bg}};	2045	glColor_premultiply @{$self->{bg}};
1711	}	2046	}
1712		2047
1713	glEnable GL_BLEND;	2048	glEnable GL_BLEND;
1714	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2049	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1715	glBegin GL_QUADS;	2050	glBegin GL_QUADS;
1716	glVertex 0 , 0;	2051	glVertex 0 , 0;
1717	glVertex 0 , $self->{h};	2052	glVertex 0 , $self->{h};
1718	glVertex $self->{w}, $self->{h};	2053	glVertex $self->{w}, $self->{h};
1719	glVertex $self->{w}, 0;	2054	glVertex $self->{w}, 0;
…		…
1730	utf8::encode $text;	2065	utf8::encode $text;
1731		2066
1732	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2067	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1733	}	2068	}
1734		2069
1735	glColor @{$self->{fg}};
1736	glBegin GL_LINES;	2070	glBegin GL_LINES;
1737	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2071	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1738	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2072	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1739	glEnd;	2073	glEnd;
1740	}	2074	}
1741	}	2075	}
1742		2076
		2077	#############################################################################
		2078
1743	package CFClient::UI::Entry;	2079	package CFPlus::UI::Entry;
1744		2080
1745	our @ISA = CFClient::UI::EntryBase::;	2081	our @ISA = CFPlus::UI::EntryBase::;
1746		2082
1747	use CFClient::OpenGL;	2083	use CFPlus::OpenGL;
1748		2084
1749	sub key_down {	2085	sub invoke_key_down {
1750	my ($self, $ev) = @_;	2086	my ($self, $ev) = @_;
1751		2087
1752	my $sym = $ev->{sym};	2088	my $sym = $ev->{sym};
1753		2089
1754	if ($sym == 13) {	2090	if ($ev->{uni} == 0x0d || $sym == 13) {
1755	unshift @{$self->{history}},	2091	unshift @{$self->{history}},
1756	my $txt = $self->get_text;	2092	my $txt = $self->get_text;
		2093
1757	$self->{history_pointer} = -1;	2094	$self->{history_pointer} = -1;
1758	$self->{history_saveback} = '';	2095	$self->{history_saveback} = '';
1759	$self->_emit (activate => $txt);	2096	$self->emit (activate => $txt);
1760	$self->update;	2097	$self->update;
1761		2098
1762	} elsif ($sym == CFClient::SDLK_UP) {	2099	} elsif ($sym == CFPlus::SDLK_UP) {
1763	if ($self->{history_pointer} < 0) {	2100	if ($self->{history_pointer} < 0) {
1764	$self->{history_saveback} = $self->get_text;	2101	$self->{history_saveback} = $self->get_text;
1765	}	2102	}
1766	if (@{$self->{history} || []} > 0) {	2103	if (@{$self->{history} || []} > 0) {
1767	$self->{history_pointer}++;	2104	$self->{history_pointer}++;
…		…
1769	$self->{history_pointer} = @{$self->{history} || []} - 1;	2106	$self->{history_pointer} = @{$self->{history} || []} - 1;
1770	}	2107	}
1771	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2108	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1772	}	2109	}
1773		2110
1774	} elsif ($sym == CFClient::SDLK_DOWN) {	2111	} elsif ($sym == CFPlus::SDLK_DOWN) {
1775	$self->{history_pointer}--;	2112	$self->{history_pointer}--;
1776	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2113	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1777		2114
1778	if ($self->{history_pointer} >= 0) {	2115	if ($self->{history_pointer} >= 0) {
1779	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2116	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1780	} else {	2117	} else {
1781	$self->set_text ($self->{history_saveback});	2118	$self->set_text ($self->{history_saveback});
1782	}	2119	}
1783		2120
1784	} else {	2121	} else {
1785	$self->SUPER::key_down ($ev);	2122	return $self->SUPER::invoke_key_down ($ev)
		2123	}
		2124
1786	}	2125	1
1787
1788	}	2126	}
1789		2127
1790	#############################################################################	2128	#############################################################################
1791		2129
		2130	package CFPlus::UI::TextEdit;
		2131
		2132	our @ISA = CFPlus::UI::EntryBase::;
		2133
		2134	use CFPlus::OpenGL;
		2135
		2136	sub move_cursor_ver {
		2137	my ($self, $dy) = @_;
		2138
		2139	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2140
		2141	$y += $dy;
		2142
		2143	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2144	$self->{cursor} = $index;
		2145	delete $self->{cur_h};
		2146	$self->update;
		2147	return;
		2148	}
		2149	}
		2150
		2151	sub invoke_key_down {
		2152	my ($self, $ev) = @_;
		2153
		2154	my $sym = $ev->{sym};
		2155
		2156	if ($sym == CFPlus::SDLK_UP) {
		2157	$self->move_cursor_ver (-1);
		2158	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2159	$self->move_cursor_ver (+1);
		2160	} else {
		2161	return $self->SUPER::invoke_key_down ($ev)
		2162	}
		2163
		2164	1
		2165	}
		2166
		2167	#############################################################################
		2168
1792	package CFClient::UI::Button;	2169	package CFPlus::UI::Button;
1793		2170
1794	our @ISA = CFClient::UI::Label::;	2171	our @ISA = CFPlus::UI::Label::;
1795		2172
1796	use CFClient::OpenGL;	2173	use CFPlus::OpenGL;
1797		2174
1798	my @tex =	2175	my @tex =
1799	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2176	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1800	qw(b1_button_active.png);	2177	qw(b1_button_active.png);
1801		2178
1802	sub new {	2179	sub new {
1803	my $class = shift;	2180	my $class = shift;
1804		2181
…		…
1813	can_events => 1,	2190	can_events => 1,
1814	@_	2191	@_
1815	)	2192	)
1816	}	2193	}
1817		2194
1818	sub activate { }
1819
1820	sub button_up {	2195	sub invoke_button_up {
1821	my ($self, $ev, $x, $y) = @_;	2196	my ($self, $ev, $x, $y) = @_;
1822		2197
1823	$self->emit ("activate")	2198	$self->emit ("activate")
1824	if $x >= 0 && $x < $self->{w}	2199	if $x >= 0 && $x < $self->{w}
1825	&& $y >= 0 && $y < $self->{h};	2200	&& $y >= 0 && $y < $self->{h};
		2201
		2202	1
1826	}	2203	}
1827		2204
1828	sub _draw {	2205	sub _draw {
1829	my ($self) = @_;	2206	my ($self) = @_;
1830		2207
1831	local $self->{fg} = $self->{fg};	2208	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1832
1833	if ($GRAB == $self) {
1834	$self->{fg} = $self->{active_fg};
1835	}
1836		2209
1837	glEnable GL_TEXTURE_2D;	2210	glEnable GL_TEXTURE_2D;
1838	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2211	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1839	glColor 0, 0, 0, 1;	2212	glColor 0, 0, 0, 1;
1840		2213
…		…
1845	$self->SUPER::_draw;	2218	$self->SUPER::_draw;
1846	}	2219	}
1847		2220
1848	#############################################################################	2221	#############################################################################
1849		2222
1850	package CFClient::UI::CheckBox;	2223	package CFPlus::UI::CheckBox;
1851		2224
1852	our @ISA = CFClient::UI::DrawBG::;	2225	our @ISA = CFPlus::UI::DrawBG::;
1853		2226
1854	my @tex =	2227	my @tex =
1855	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2228	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1856	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2229	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1857		2230
1858	use CFClient::OpenGL;	2231	use CFPlus::OpenGL;
1859		2232
1860	sub new {	2233	sub new {
1861	my $class = shift;	2234	my $class = shift;
1862		2235
1863	$class->SUPER::new (	2236	$class->SUPER::new (
…		…
1877	my ($self) = @_;	2250	my ($self) = @_;
1878		2251
1879	(6) x 2	2252	(6) x 2
1880	}	2253	}
1881		2254
		2255	sub toggle {
		2256	my ($self) = @_;
		2257
		2258	$self->{state} = !$self->{state};
		2259	$self->emit (changed => $self->{state});
		2260	$self->update;
		2261	}
		2262
1882	sub button_down {	2263	sub invoke_button_down {
1883	my ($self, $ev, $x, $y) = @_;	2264	my ($self, $ev, $x, $y) = @_;
1884		2265
1885	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2266	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1886	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2267	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1887	$self->{state} = !$self->{state};	2268	$self->toggle;
1888	$self->_emit (changed => $self->{state});	2269	} else {
		2270	return 0
		2271	}
		2272
1889	}	2273	1
1890	}	2274	}
1891		2275
1892	sub _draw {	2276	sub _draw {
1893	my ($self) = @_;	2277	my ($self) = @_;
1894		2278
…		…
1909	glDisable GL_TEXTURE_2D;	2293	glDisable GL_TEXTURE_2D;
1910	}	2294	}
1911		2295
1912	#############################################################################	2296	#############################################################################
1913		2297
1914	package CFClient::UI::Image;	2298	package CFPlus::UI::Image;
1915		2299
1916	our @ISA = CFClient::UI::Base::;	2300	our @ISA = CFPlus::UI::Base::;
1917		2301
1918	use CFClient::OpenGL;	2302	use CFPlus::OpenGL;
1919	use Carp qw/confess/;
1920		2303
1921	our %loaded_images;	2304	our %texture_cache;
1922		2305
1923	sub new {	2306	sub new {
1924	my $class = shift;	2307	my $class = shift;
1925		2308
1926	my $self = $class->SUPER::new (can_events => 0, @_);	2309	my $self = $class->SUPER::new (
		2310	can_events => 0,
		2311	@_,
		2312	);
1927		2313
1928	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2314	$self->{path} || $self->{tex}
		2315	or Carp::croak "'path' or 'tex' attributes required";
1929		2316
1930	$loaded_images{$self->{image}} ||=	2317	$self->{tex} ||= $texture_cache{$self->{path}} ||=
1931	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2318	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1932		2319
1933	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2320	CFPlus::weaken $texture_cache{$self->{path}};
1934		2321
1935	Scalar::Util::weaken $loaded_images{$self->{image}};	2322	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1936
1937	$self->{aspect} = $tex->{w} / $tex->{h};
1938		2323
1939	$self	2324	$self
1940	}	2325	}
1941		2326
		2327	sub STORABLE_freeze {
		2328	my ($self, $cloning) = @_;
		2329
		2330	$self->{path}
		2331	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2332
		2333	$self->{path}
		2334	}
		2335
		2336	sub STORABLE_attach {
		2337	my ($self, $cloning, $path) = @_;
		2338
		2339	$self->new (path => $path)
		2340	}
		2341
1942	sub size_request {	2342	sub size_request {
1943	my ($self) = @_;	2343	my ($self) = @_;
1944		2344
1945	($self->{tex}->{w}, $self->{tex}->{h})	2345	($self->{tex}{w}, $self->{tex}{h})
1946	}	2346	}
1947		2347
1948	sub _draw {	2348	sub _draw {
1949	my ($self) = @_;	2349	my ($self) = @_;
1950		2350
…		…
1960	}	2360	}
1961		2361
1962	glEnable GL_TEXTURE_2D;	2362	glEnable GL_TEXTURE_2D;
1963	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2363	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1964		2364
1965	$tex->draw_quad_alpha (0, 0, $w, $h);	2365	$tex->draw_quad (0, 0, $w, $h);
1966		2366
1967	glDisable GL_TEXTURE_2D;	2367	glDisable GL_TEXTURE_2D;
1968	}	2368	}
1969		2369
1970	#############################################################################	2370	#############################################################################
1971		2371
		2372	package CFPlus::UI::ImageButton;
		2373
		2374	our @ISA = CFPlus::UI::Image::;
		2375
		2376	use CFPlus::OpenGL;
		2377
		2378	my %textures;
		2379
		2380	sub new {
		2381	my $class = shift;
		2382
		2383	my $self = $class->SUPER::new (
		2384	padding_x => 4,
		2385	padding_y => 4,
		2386	fg => [1, 1, 1],
		2387	active_fg => [0, 0, 1],
		2388	can_hover => 1,
		2389	align => 0,
		2390	valign => 0,
		2391	can_events => 1,
		2392	@_
		2393	);
		2394	}
		2395
		2396	sub invoke_button_up {
		2397	my ($self, $ev, $x, $y) = @_;
		2398
		2399	$self->emit ("activate")
		2400	if $x >= 0 && $x < $self->{w}
		2401	&& $y >= 0 && $y < $self->{h};
		2402
		2403	1
		2404	}
		2405
		2406	#############################################################################
		2407
1972	package CFClient::UI::VGauge;	2408	package CFPlus::UI::VGauge;
1973		2409
1974	our @ISA = CFClient::UI::Base::;	2410	our @ISA = CFPlus::UI::Base::;
1975		2411
1976	use List::Util qw(min max);	2412	use List::Util qw(min max);
1977		2413
1978	use CFClient::OpenGL;	2414	use CFPlus::OpenGL;
1979		2415
1980	my %tex = (	2416	my %tex = (
1981	food => [	2417	food => [
1982	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2418	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1983	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2419	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1984	],	2420	],
1985	grace => [	2421	grace => [
1986	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2422	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1987	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2423	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1988	],	2424	],
1989	hp => [	2425	hp => [
1990	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2426	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1991	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2427	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1992	],	2428	],
1993	mana => [	2429	mana => [
1994	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2430	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1995	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2431	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1996	],	2432	],
1997	);	2433	);
1998		2434
1999	# eg. VGauge->new (gauge => 'food'), default gauge: food	2435	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2059	my $ycut1 = max 0, min 1, $ycut;	2495	my $ycut1 = max 0, min 1, $ycut;
2060	my $ycut2 = max 0, min 1, $ycut - 1;	2496	my $ycut2 = max 0, min 1, $ycut - 1;
2061		2497
2062	my $h1 = $self->{h} * (1 - $ycut1);	2498	my $h1 = $self->{h} * (1 - $ycut1);
2063	my $h2 = $self->{h} * (1 - $ycut2);	2499	my $h2 = $self->{h} * (1 - $ycut2);
		2500	my $h3 = $self->{h};
		2501
		2502	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2064		2503
2065	glEnable GL_BLEND;	2504	glEnable GL_BLEND;
2066	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2505	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2506	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2067	glEnable GL_TEXTURE_2D;	2507	glEnable GL_TEXTURE_2D;
2068	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2508	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2069		2509
2070	glBindTexture GL_TEXTURE_2D, $t1->{name};	2510	glBindTexture GL_TEXTURE_2D, $t1->{name};
2071	glBegin GL_QUADS;	2511	glBegin GL_QUADS;
…		…
2086		2526
2087	if ($t3) {	2527	if ($t3) {
2088	glBindTexture GL_TEXTURE_2D, $t3->{name};	2528	glBindTexture GL_TEXTURE_2D, $t3->{name};
2089	glBegin GL_QUADS;	2529	glBegin GL_QUADS;
2090	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2530	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2091	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2531	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2092	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2532	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2093	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2533	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2094	glEnd;	2534	glEnd;
2095	}	2535	}
2096		2536
2097	glDisable GL_BLEND;	2537	glDisable GL_BLEND;
2098	glDisable GL_TEXTURE_2D;	2538	glDisable GL_TEXTURE_2D;
2099	}	2539	}
2100		2540
2101	#############################################################################	2541	#############################################################################
2102		2542
2103	package CFClient::UI::Gauge;	2543	package CFPlus::UI::Gauge;
2104		2544
2105	our @ISA = CFClient::UI::VBox::;	2545	our @ISA = CFPlus::UI::VBox::;
2106		2546
2107	sub new {	2547	sub new {
2108	my ($class, %arg) = @_;	2548	my ($class, %arg) = @_;
2109		2549
2110	my $self = $class->SUPER::new (	2550	my $self = $class->SUPER::new (
…		…
2112	can_hover => 1,	2552	can_hover => 1,
2113	can_events => 1,	2553	can_events => 1,
2114	%arg,	2554	%arg,
2115	);	2555	);
2116		2556
2117	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2557	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2118	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2558	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2119	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2559	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2120		2560
2121	$self	2561	$self
2122	}	2562	}
2123		2563
2124	sub set_fontsize {	2564	sub set_fontsize {
…		…
2145	$self->{value}->set_text ($val);	2585	$self->{value}->set_text ($val);
2146	}	2586	}
2147		2587
2148	#############################################################################	2588	#############################################################################
2149		2589
2150	package CFClient::UI::Slider;	2590	package CFPlus::UI::Slider;
2151		2591
2152	use strict;	2592	use strict;
2153		2593
2154	use CFClient::OpenGL;	2594	use CFPlus::OpenGL;
2155		2595
2156	our @ISA = CFClient::UI::DrawBG::;	2596	our @ISA = CFPlus::UI::DrawBG::;
2157		2597
2158	my @tex =	2598	my @tex =
2159	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2599	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2160	qw(s1_slider.png s1_slider_bg.png);	2600	qw(s1_slider.png s1_slider_bg.png);
2161		2601
2162	sub new {	2602	sub new {
2163	my $class = shift;	2603	my $class = shift;
2164		2604
…		…
2185	$self->update;	2625	$self->update;
2186		2626
2187	$self	2627	$self
2188	}	2628	}
2189		2629
2190	sub changed { }
2191
2192	sub set_range {	2630	sub set_range {
2193	my ($self, $range) = @_;	2631	my ($self, $range) = @_;
2194		2632
2195	($range, $self->{range}) = ($self->{range}, $range);	2633	($range, $self->{range}) = ($self->{range}, $range);
2196		2634
2197	$self->update
2198	if "@$range" ne "@{$self->{range}}";	2635	if ("@$range" ne "@{$self->{range}}") {
		2636	$self->update;
		2637	$self->set_value ($self->{range}[0]);
		2638	}
2199	}	2639	}
2200		2640
2201	sub set_value {	2641	sub set_value {
2202	my ($self, $value) = @_;	2642	my ($self, $value) = @_;
2203		2643
…		…
2214	if $unit;	2654	if $unit;
2215		2655
2216	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2656	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2217		2657
2218	if ($value != $old_value) {	2658	if ($value != $old_value) {
2219	$self->_emit (changed => $value);	2659	$self->emit (changed => $value);
2220	$self->update;	2660	$self->update;
2221	}	2661	}
2222	}	2662	}
2223		2663
2224	sub size_request {	2664	sub size_request {
2225	my ($self) = @_;	2665	my ($self) = @_;
2226		2666
2227	($self->{req_w}, $self->{req_h})	2667	($self->{req_w}, $self->{req_h})
2228	}	2668	}
2229		2669
2230	sub button_down {	2670	sub invoke_button_down {
2231	my ($self, $ev, $x, $y) = @_;	2671	my ($self, $ev, $x, $y) = @_;
2232		2672
2233	$self->SUPER::button_down ($ev, $x, $y);	2673	$self->SUPER::invoke_button_down ($ev, $x, $y);
2234		2674
2235	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2675	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236		2676
2237	$self->mouse_motion ($ev, $x, $y);	2677	$self->invoke_mouse_motion ($ev, $x, $y)
2238	}	2678	}
2239		2679
2240	sub mouse_motion {	2680	sub invoke_mouse_motion {
2241	my ($self, $ev, $x, $y) = @_;	2681	my ($self, $ev, $x, $y) = @_;
2242		2682
2243	if ($GRAB == $self) {	2683	if ($GRAB == $self) {
2244	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2684	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2245		2685
2246	my (undef, $lo, $hi, $page) = @{$self->{range}};	2686	my (undef, $lo, $hi, $page) = @{$self->{range}};
2247		2687
2248	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2688	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249		2689
2250	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2690	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2691	} else {
		2692	return 0;
		2693	}
		2694
2251	}	2695	1
		2696	}
		2697
		2698	sub invoke_mouse_wheel {
		2699	my ($self, $ev) = @_;
		2700
		2701	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2702
		2703	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2704
		2705	! ! $delta
2252	}	2706	}
2253		2707
2254	sub update {	2708	sub update {
2255	my ($self) = @_;	2709	my ($self) = @_;
2256		2710
2257	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2711	delete $self->{knob_w};
		2712	$self->SUPER::update;
		2713	}
		2714
		2715	sub _draw {
		2716	my ($self) = @_;
		2717
		2718	unless ($self->{knob_w}) {
2258	$self->set_value ($self->{range}[0]);	2719	$self->set_value ($self->{range}[0]);
2259		2720
2260	my ($value, $lo, $hi, $page) = @{$self->{range}};	2721	my ($value, $lo, $hi, $page) = @{$self->{range}};
2261	my $range = ($hi - $page - $lo) || 1e-100;	2722	my $range = ($hi - $page - $lo) || 1e-100;
2262		2723
…		…
2268	$value = ($value - $lo) / $range;	2729	$value = ($value - $lo) / $range;
2269	$value = $value * $self->{scale} + $self->{offset};	2730	$value = $value * $self->{scale} + $self->{offset};
2270		2731
2271	$self->{knob_x} = $value - $knob_w * 0.5;	2732	$self->{knob_x} = $value - $knob_w * 0.5;
2272	$self->{knob_w} = $knob_w;	2733	$self->{knob_w} = $knob_w;
2273	});	2734	}
2274
2275	$self->SUPER::update;
2276	}
2277
2278	sub _draw {
2279	my ($self) = @_;
2280		2735
2281	$self->SUPER::_draw ();	2736	$self->SUPER::_draw ();
2282		2737
2283	glScale $self->{w}, $self->{h};	2738	glScale $self->{w}, $self->{h};
2284		2739
…		…
2304	glDisable GL_TEXTURE_2D;	2759	glDisable GL_TEXTURE_2D;
2305	}	2760	}
2306		2761
2307	#############################################################################	2762	#############################################################################
2308		2763
2309	package CFClient::UI::ValSlider;	2764	package CFPlus::UI::ValSlider;
2310		2765
2311	our @ISA = CFClient::UI::HBox::;	2766	our @ISA = CFPlus::UI::HBox::;
2312		2767
2313	sub new {	2768	sub new {
2314	my ($class, %arg) = @_;	2769	my ($class, %arg) = @_;
2315		2770
2316	my $range = delete $arg{range};	2771	my $range = delete $arg{range};
2317		2772
2318	my $self = $class->SUPER::new (	2773	my $self = $class->SUPER::new (
2319	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2774	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2320	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2775	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2321	to_value => sub { shift },	2776	to_value => sub { shift },
2322	from_value => sub { shift },	2777	from_value => sub { shift },
2323	%arg,	2778	%arg,
2324	);	2779	);
2325		2780
…		…
2345	sub set_range { shift->{slider}->set_range (@_) }	2800	sub set_range { shift->{slider}->set_range (@_) }
2346	sub set_value { shift->{slider}->set_value (@_) }	2801	sub set_value { shift->{slider}->set_value (@_) }
2347		2802
2348	#############################################################################	2803	#############################################################################
2349		2804
2350	package CFClient::UI::TextView;	2805	package CFPlus::UI::TextScroller;
2351		2806
2352	our @ISA = CFClient::UI::HBox::;	2807	our @ISA = CFPlus::UI::HBox::;
2353		2808
2354	use CFClient::OpenGL;	2809	use CFPlus::OpenGL;
2355		2810
2356	sub new {	2811	sub new {
2357	my $class = shift;	2812	my $class = shift;
2358		2813
2359	my $self = $class->SUPER::new (	2814	my $self = $class->SUPER::new (
2360	fontsize => 1,	2815	fontsize => 1,
2361	can_events => 0,	2816	can_events => 1,
		2817	indent => 0,
2362	#font => default_font	2818	#font => default_font
2363	@_,	2819	@_,
2364		2820
2365	layout => (new CFClient::Layout 1),	2821	layout => (new CFPlus::Layout),
2366	par => [],	2822	par => [],
2367	height => 0,	2823	height => 0,
2368	children => [	2824	children => [
2369	(new CFClient::UI::Empty expand => 1),	2825	(new CFPlus::UI::Empty expand => 1),
2370	(new CFClient::UI::Slider vertical => 1),	2826	(new CFPlus::UI::Slider vertical => 1),
2371	],	2827	],
2372	);	2828	);
2373		2829
2374	$self->{children}[1]->connect (changed => sub { $self->update });	2830	$self->{children}[1]->connect (changed => sub { $self->update });
2375		2831
…		…
2381		2837
2382	$self->{fontsize} = $fontsize;	2838	$self->{fontsize} = $fontsize;
2383	$self->reflow;	2839	$self->reflow;
2384	}	2840	}
2385		2841
		2842	sub size_request {
		2843	my ($self) = @_;
		2844
		2845	my ($empty, $slider) = @{ $self->{children} };
		2846
		2847	local $self->{children} = [$empty, $slider];
		2848	$self->SUPER::size_request
		2849	}
		2850
2386	sub size_allocate {	2851	sub invoke_size_allocate {
2387	my ($self, $w, $h, $changed) = @_;	2852	my ($self, $w, $h) = @_;
2388		2853
2389	$self->SUPER::size_allocate ($w, $h, $changed);	2854	my ($empty, $slider, @other) = @{ $self->{children} };
2390		2855	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2391	return unless $changed;
2392		2856
2393	$self->{layout}->set_font ($self->{font}) if $self->{font};	2857	$self->{layout}->set_font ($self->{font}) if $self->{font};
2394	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2858	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395	$self->{layout}->set_width ($self->{children}[0]{w});	2859	$self->{layout}->set_width ($empty->{w});
		2860	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396		2861
2397	$self->reflow;	2862	$self->reflow;
2398	}
2399		2863
2400	sub text_size {	2864	local $self->{children} = [$empty, $slider];
		2865	$self->SUPER::invoke_size_allocate ($w, $h)
		2866	}
		2867
		2868	sub invoke_mouse_wheel {
2401	my ($self, $text, $indent) = @_;	2869	my ($self, $ev) = @_;
		2870
		2871	return 0 unless $ev->{dy}; # only vertical movements
		2872
		2873	$self->{children}[1]->emit (mouse_wheel => $ev);
		2874
		2875	1
		2876	}
		2877
		2878	sub get_layout {
		2879	my ($self, $para) = @_;
2402		2880
2403	my $layout = $self->{layout};	2881	my $layout = $self->{layout};
2404		2882
		2883	$layout->set_font ($self->{font}) if $self->{font};
		2884	$layout->set_foreground (@{$para->{fg}});
2405	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2885	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406	$layout->set_width ($self->{children}[0]{w} - $indent);	2886	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		2887	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407	$layout->set_markup ($text);	2888	$layout->set_markup ($para->{markup});
		2889
		2890	$layout->set_shapes (
		2891	map
		2892	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2893	@{$para->{widget}}
2408		2894	);
		2895
2409	$layout->size	2896	$layout
2410	}	2897	}
2411		2898
2412	sub reflow {	2899	sub reflow {
2413	my ($self) = @_;	2900	my ($self) = @_;
2414		2901
…		…
2421		2908
2422	# todo: base offset on lines or so, not on pixels	2909	# todo: base offset on lines or so, not on pixels
2423	$self->{children}[1]->set_value ($offset);	2910	$self->{children}[1]->set_value ($offset);
2424	}	2911	}
2425		2912
		2913	sub current_paragraph {
		2914	my ($self) = @_;
		2915
		2916	$self->{top_paragraph} - 1
		2917	}
		2918
		2919	sub scroll_to {
		2920	my ($self, $para) = @_;
		2921
		2922	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2923
		2924	$self->{scroll_to} = $para;
		2925	$self->update;
		2926	}
		2927
2426	sub clear {	2928	sub clear {
2427	my ($self) = @_;	2929	my ($self) = @_;
		2930
		2931	my (undef, undef, @other) = @{ $self->{children} };
		2932	$self->remove ($_) for @other;
2428		2933
2429	$self->{par} = [];	2934	$self->{par} = [];
2430	$self->{height} = 0;	2935	$self->{height} = 0;
2431	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2936	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432	}	2937	}
2433		2938
2434	sub add_paragraph {	2939	sub add_paragraph {
2435	my ($self, $color, $text, $indent) = @_;	2940	my $self = shift;
2436		2941
2437	for my $line (split /\n/, $text) {	2942	for my $para (@_) {
2438	my ($w, $h) = $self->text_size ($line);	2943	$para = {
		2944	fg => [1, 1, 1, 1],
		2945	indent => 0,
		2946	markup => "",
		2947	widget => [],
		2948	ref $para ? %$para : (markup => $para),
		2949	w => 1e10,
		2950	wrapped => 1,
		2951	};
		2952
		2953	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2954	push @{$self->{par}}, $para;
		2955	}
		2956
		2957	$self->{need_reflow}++;
		2958	$self->update;
		2959	}
		2960
		2961	sub scroll_to_bottom {
		2962	my ($self) = @_;
		2963
		2964	$self->{scroll_to} = $#{$self->{par}};
		2965	$self->update;
		2966	}
		2967
		2968	sub force_uptodate {
		2969	my ($self) = @_;
		2970
		2971	if (delete $self->{need_reflow}) {
		2972	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2973
		2974	my $height = 0;
		2975
		2976	for my $para (@{$self->{par}}) {
		2977	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2978	my $layout = $self->get_layout ($para);
		2979	my ($w, $h) = $layout->size;
		2980
		2981	$para->{w} = $w + $para->{indent};
		2982	$para->{h} = $h;
		2983	$para->{wrapped} = $layout->has_wrapped;
		2984	}
		2985
		2986	$para->{y} = $height;
		2987	$height += $para->{h};
		2988	}
		2989
2439	$self->{height} += $h;	2990	$self->{height} = $height;
2440	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2991	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2441	}
2442		2992
2443	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2993	delete $self->{texture};
		2994	}
		2995
		2996	if (my $paridx = delete $self->{scroll_to}) {
		2997	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2998	}
2444	}	2999	}
2445		3000
2446	sub update {	3001	sub update {
2447	my ($self) = @_;	3002	my ($self) = @_;
2448		3003
…		…
2450		3005
2451	return unless $self->{h} > 0;	3006	return unless $self->{h} > 0;
2452		3007
2453	delete $self->{texture};	3008	delete $self->{texture};
2454		3009
2455	$ROOT->on_post_alloc ($self, sub {	3010	$ROOT->on_post_alloc ($self => sub {
		3011	$self->force_uptodate;
		3012
2456	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3013	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457		3014
2458	if (delete $self->{need_reflow}) {
2459	my $height = 0;
2460
2461	my $layout = $self->{layout};
2462
2463	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2465	for (@{$self->{par}}) {
2466	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467	$layout->set_width ($W - $_->[3]);
2468	$layout->set_markup ($_->[4]);
2469	my ($w, $h) = $layout->size;
2470	$_->[0] = $w + $_->[3];
2471	$_->[1] = $h;
2472	}
2473
2474	$height += $_->[1];
2475	}
2476
2477	$self->{height} = $height;
2478
2479	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2480
2481	delete $self->{texture};
2482	}
2483
2484	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3015	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2485	glClearColor 0.5, 0.5, 0.5, 0;	3016	glClearColor 0, 0, 0, 0;
2486	glClear GL_COLOR_BUFFER_BIT;	3017	glClear GL_COLOR_BUFFER_BIT;
2487		3018
		3019	package CFPlus::UI::Base;
		3020	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3021	(0, 0, $self->{w}, $self->{h});
		3022
		3023	my $top = int $self->{children}[1]{range}[0];
		3024
		3025	my $paridx = 0;
		3026	my $top_paragraph;
2488	my $top = int $self->{children}[1]{range}[0];	3027	my $top = int $self->{children}[1]{range}[0];
2489		3028
2490	my $y0 = $top;	3029	my $y0 = $top;
2491	my $y1 = $top + $H;	3030	my $y1 = $top + $H;
2492		3031
2493	my $y = 0;
2494
2495	my $layout = $self->{layout};
2496
2497	$layout->set_font ($self->{font}) if $self->{font};
2498
2499	glEnable GL_BLEND;
2500	#TODO# not correct in windows where rgba is forced off
2501	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2502
2503	for my $par (@{$self->{par}}) {	3032	for my $para (@{$self->{par}}) {
2504	my $h = $par->[1];	3033	my $h = $para->{h};
		3034	my $y = $para->{y};
2505		3035
2506	if ($y0 < $y + $h && $y < $y1) {	3036	if ($y0 < $y + $h && $y < $y1) {
2507	$layout->set_foreground (@{ $par->[2] });	3037	my $layout = $self->get_layout ($para);
2508	$layout->set_width ($W - $par->[3]);
2509	$layout->set_markup ($par->[4]);
2510		3038
2511	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3039	$layout->render ($para->{indent}, $y - $y0);
2512		3040
2513	glRasterPos $par->[3], $y - $y0;	3041	if (my @w = @{ $para->{widget} }) {
2514	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3042	my @s = $layout->get_shapes;
		3043
		3044	for (@w) {
		3045	my ($dx, $dy) = splice @s, 0, 2, ();
		3046
		3047	$_->{x} = $dx + $para->{indent};
		3048	$_->{y} = $dy + $y - $y0;
		3049
		3050	$_->draw;
		3051	}
		3052	}
2515	}	3053	}
2516		3054
2517	$y += $h;	3055	$paridx++;
		3056	$top_paragraph ||= $paridx if $y >= $top;
2518	}	3057	}
2519		3058
2520	glDisable GL_BLEND;	3059	$self->{top_paragraph} = $top_paragraph;
2521	};	3060	};
2522	});	3061	});
2523	}	3062	}
2524		3063
		3064	sub reconfigure {
		3065	my ($self) = @_;
		3066
		3067	$self->SUPER::reconfigure;
		3068
		3069	$_->{w} = 1e10 for @{ $self->{par} };
		3070	$self->reflow;
		3071	}
		3072
2525	sub _draw {	3073	sub _draw {
2526	my ($self) = @_;	3074	my ($self) = @_;
2527		3075
2528	glEnable GL_TEXTURE_2D;	3076	glEnable GL_TEXTURE_2D;
2529	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3077	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530	glColor 1, 1, 1, 1;	3078	glColor 0, 0, 0, 1;
2531	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3079	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532	glDisable GL_TEXTURE_2D;	3080	glDisable GL_TEXTURE_2D;
2533		3081
2534	$self->{children}[1]->draw;	3082	$self->{children}[1]->draw;
2535
2536	}	3083	}
2537		3084
2538	#############################################################################	3085	#############################################################################
2539		3086
2540	package CFClient::UI::Animator;	3087	package CFPlus::UI::Animator;
2541		3088
2542	use CFClient::OpenGL;	3089	use CFPlus::OpenGL;
2543		3090
2544	our @ISA = CFClient::UI::Bin::;	3091	our @ISA = CFPlus::UI::Bin::;
2545		3092
2546	sub moveto {	3093	sub moveto {
2547	my ($self, $x, $y) = @_;	3094	my ($self, $x, $y) = @_;
2548		3095
2549	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3096	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2577	glPopMatrix;	3124	glPopMatrix;
2578	}	3125	}
2579		3126
2580	#############################################################################	3127	#############################################################################
2581		3128
2582	package CFClient::UI::Flopper;	3129	package CFPlus::UI::Flopper;
2583		3130
2584	our @ISA = CFClient::UI::Button::;	3131	our @ISA = CFPlus::UI::Button::;
2585		3132
2586	sub new {	3133	sub new {
2587	my $class = shift;	3134	my $class = shift;
2588		3135
2589	my $self = $class->SUPER::new (	3136	my $self = $class->SUPER::new (
…		…
2601	$self->{other}->toggle_visibility;	3148	$self->{other}->toggle_visibility;
2602	}	3149	}
2603		3150
2604	#############################################################################	3151	#############################################################################
2605		3152
2606	package CFClient::UI::Tooltip;	3153	package CFPlus::UI::Tooltip;
2607		3154
2608	our @ISA = CFClient::UI::Bin::;	3155	our @ISA = CFPlus::UI::Bin::;
2609		3156
2610	use CFClient::OpenGL;	3157	use CFPlus::OpenGL;
2611		3158
2612	sub new {	3159	sub new {
2613	my $class = shift;	3160	my $class = shift;
2614		3161
2615	$class->SUPER::new (	3162	$class->SUPER::new (
…		…
2619	}	3166	}
2620		3167
2621	sub set_tooltip_from {	3168	sub set_tooltip_from {
2622	my ($self, $widget) = @_;	3169	my ($self, $widget) = @_;
2623		3170
		3171	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3172	if $widget->{tooltip} =~ /^#(.*)$/;
		3173
		3174	my $tooltip = $widget->{tooltip};
		3175
		3176	if ($ENV{CFPLUS_DEBUG} & 2) {
		3177	$tooltip .= "\n\n" . (ref $widget) . "\n"
		3178	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		3179	. "req $widget->{req_w} $widget->{req_h}\n"
		3180	. "visible $widget->{visible}";
		3181	}
		3182
		3183	$tooltip =~ s/^\n+//;
		3184	$tooltip =~ s/\n+$//;
		3185
2624	$self->add (new CFClient::UI::Label	3186	$self->add (new CFPlus::UI::Label
2625	markup => $widget->{tooltip},	3187	markup => $tooltip,
2626	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3188	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627	fontsize => 0.8,	3189	fontsize => 0.8,
2628	fg => [0, 0, 0, 1],	3190	style => 1, # FLAG_INVERSE
2629	ellipsise => 0,	3191	ellipsise => 0,
2630	font => ($widget->{tooltip_font} || $::FONT_PROP),	3192	font => ($widget->{tooltip_font} || $::FONT_PROP),
2631	);	3193	);
2632	}	3194	}
2633		3195
…		…
2637	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3199	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2638		3200
2639	($w + 4, $h + 4)	3201	($w + 4, $h + 4)
2640	}	3202	}
2641		3203
2642	sub size_allocate {	3204	sub invoke_size_allocate {
2643	my ($self, $w, $h, $changed) = @_;	3205	my ($self, $w, $h) = @_;
2644		3206
2645	return unless $changed;
2646
2647	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	3207	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2648	}	3208	}
2649		3209
2650	sub visibility_change {	3210	sub invoke_visibility_change {
2651	my ($self, $visible) = @_;	3211	my ($self, $visible) = @_;
2652		3212
2653	return unless $visible;	3213	return unless $visible;
2654		3214
2655	$self->{root}->on_post_alloc ("move_$self" => sub {	3215	$self->{root}->on_post_alloc ("move_$self" => sub {
2656	my $widget = $self->{owner}	3216	my $widget = $self->{owner}
2657	or return;	3217	or return;
2658		3218
		3219	if ($widget->{visible}) {
2659	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3220	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2660		3221
2661	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3222	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2662	if $x + $self->{w} > $::WIDTH;	3223	if $x + $self->{w} > $self->{root}{w};
2663		3224
2664	$self->move_abs ($x, $y);	3225	$self->move_abs ($x, $y);
		3226	} else {
		3227	$self->hide;
		3228	}
2665	});	3229	});
2666	}	3230	}
2667		3231
2668	sub _draw {	3232	sub _draw {
2669	my ($self) = @_;	3233	my ($self) = @_;
…		…
2693	$self->SUPER::_draw;	3257	$self->SUPER::_draw;
2694	}	3258	}
2695		3259
2696	#############################################################################	3260	#############################################################################
2697		3261
2698	package CFClient::UI::Face;	3262	package CFPlus::UI::Face;
2699		3263
2700	our @ISA = CFClient::UI::Base::;	3264	our @ISA = CFPlus::UI::DrawBG::;
2701		3265
2702	use CFClient::OpenGL;	3266	use CFPlus::OpenGL;
2703		3267
2704	sub new {	3268	sub new {
2705	my $class = shift;	3269	my $class = shift;
2706		3270
2707	my $self = $class->SUPER::new (	3271	my $self = $class->SUPER::new (
…		…
2709	can_events => 0,	3273	can_events => 0,
2710	@_,	3274	@_,
2711	);	3275	);
2712		3276
2713	if ($self->{anim} && $self->{animspeed}) {	3277	if ($self->{anim} && $self->{animspeed}) {
2714	Scalar::Util::weaken (my $widget = $self);	3278	CFPlus::weaken (my $widget = $self);
2715		3279
2716	$self->{timer} = Event->timer (	3280	$self->{timer} = Event->timer (
2717	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3281	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2718	hard => 1,	3282	hard => 1,
2719	interval => $self->{animspeed},	3283	interval => $self->{animspeed},
…		…
2742	sub _draw {	3306	sub _draw {
2743	my ($self) = @_;	3307	my ($self) = @_;
2744		3308
2745	return unless $::CONN;	3309	return unless $::CONN;
2746		3310
		3311	$self->SUPER::_draw;
		3312
2747	my $face;	3313	my $face;
2748		3314
2749	if ($self->{frame}) {	3315	if ($self->{frame}) {
2750	my $anim = $::CONN->{anim}[$self->{anim}];	3316	my $anim = $::CONN->{anim}[$self->{anim}];
2751		3317
…		…
2756	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3322	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2757		3323
2758	if ($tex) {	3324	if ($tex) {
2759	glEnable GL_TEXTURE_2D;	3325	glEnable GL_TEXTURE_2D;
2760	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3326	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2761	glColor 1, 1, 1, 1;	3327	glColor 0, 0, 0, 1;
2762	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3328	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2763	glDisable GL_TEXTURE_2D;	3329	glDisable GL_TEXTURE_2D;
2764	}	3330	}
2765	}	3331	}
2766		3332
2767	sub DESTROY {	3333	sub destroy {
2768	my ($self) = @_;	3334	my ($self) = @_;
2769		3335
2770	$self->{timer}->cancel	3336	$self->{timer}->cancel
2771	if $self->{timer};	3337	if $self->{timer};
2772		3338
2773	$self->SUPER::DESTROY;	3339	$self->SUPER::destroy;
2774	}	3340	}
2775		3341
2776	#############################################################################	3342	#############################################################################
2777		3343
2778	package CFClient::UI::Inventory;	3344	package CFPlus::UI::Buttonbar;
2779		3345
2780	our @ISA = CFClient::UI::ScrolledWindow::;	3346	our @ISA = CFPlus::UI::HBox::;
2781		3347
2782	sub new {	3348	# TODO: should actually wrap buttons and other goodies.
2783	my $class = shift;
2784
2785	my $self = $class->SUPER::new (
2786	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2787	@_,
2788	);
2789
2790	$self
2791	}
2792
2793	sub set_items {
2794	my ($self, $items) = @_;
2795
2796	$self->{scrolled}->clear;
2797	return unless $items;
2798
2799	my @items = sort {
2800	($a->{type} <=> $b->{type})
2801	or ($a->{name} cmp $b->{name})
2802	} @$items;
2803
2804	$self->{real_items} = \@items;
2805
2806	my $row = 0;
2807	for my $item (@items) {
2808	CFClient::Item::update_widgets $item;
2809
2810	$self->{scrolled}->add (0, $row, $item->{face_widget});
2811	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2812	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2813
2814	$row++;
2815	}
2816	}
2817		3349
2818	#############################################################################	3350	#############################################################################
2819		3351
2820	package CFClient::UI::Menu;	3352	package CFPlus::UI::Menu;
2821		3353
2822	our @ISA = CFClient::UI::FancyFrame::;	3354	our @ISA = CFPlus::UI::Toplevel::;
2823		3355
2824	use CFClient::OpenGL;	3356	use CFPlus::OpenGL;
2825		3357
2826	sub new {	3358	sub new {
2827	my $class = shift;	3359	my $class = shift;
2828		3360
2829	my $self = $class->SUPER::new (	3361	my $self = $class->SUPER::new (
2830	items => [],	3362	items => [],
2831	z => 100,	3363	z => 100,
2832	@_,	3364	@_,
2833	);	3365	);
2834		3366
2835	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3367	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2836		3368
2837	for my $item (@{ $self->{items} }) {	3369	for my $item (@{ $self->{items} }) {
2838	my ($widget, $cb) = @$item;	3370	my ($widget, $cb, $tooltip) = @$item;
2839		3371
2840	# handle various types of items, only text for now	3372	# handle various types of items, only text for now
2841	if (!ref $widget) {	3373	if (!ref $widget) {
		3374	if ($widget =~ /\t/) {
		3375	my ($left, $right) = split /\t/, $widget, 2;
		3376
2842	$widget = new CFClient::UI::Label	3377	$widget = new CFPlus::UI::HBox
2843	can_hover => 1,	3378	can_hover => 1,
2844	can_events => 1,	3379	can_events => 1,
		3380	tooltip => $tooltip,
		3381	children => [
		3382	(new CFPlus::UI::Label markup => $left, expand => 1),
		3383	(new CFPlus::UI::Label markup => $right, align => +1),
		3384	],
		3385	;
		3386
		3387	} else {
		3388	$widget = new CFPlus::UI::Label
		3389	can_hover => 1,
		3390	can_events => 1,
2845	text => $widget;	3391	markup => $widget,
		3392	tooltip => $tooltip;
		3393	}
2846	}	3394	}
2847		3395
2848	$self->{item}{$widget} = $item;	3396	$self->{item}{$widget} = $item;
2849		3397
2850	$self->{vbox}->add ($widget);	3398	$self->{vbox}->add ($widget);
…		…
2855		3403
2856	# popup given the event (must be a mouse button down event currently)	3404	# popup given the event (must be a mouse button down event currently)
2857	sub popup {	3405	sub popup {
2858	my ($self, $ev) = @_;	3406	my ($self, $ev) = @_;
2859		3407
2860	$self->_emit ("popdown");	3408	$self->emit ("popdown");
2861		3409
2862	# maybe save $GRAB? must be careful about events...	3410	# maybe save $GRAB? must be careful about events...
2863	$GRAB = $self;	3411	$GRAB = $self;
2864	$self->{button} = $ev->{button};	3412	$self->{button} = $ev->{button};
2865		3413
2866	$self->show;	3414	$self->show;
2867	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3415	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2868	}	3416	}
2869		3417
2870	sub mouse_motion {	3418	sub invoke_mouse_motion {
2871	my ($self, $ev, $x, $y) = @_;	3419	my ($self, $ev, $x, $y) = @_;
2872		3420
2873	# TODO: should use vbox->find_widget or so	3421	# TODO: should use vbox->find_widget or so
2874	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3422	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875	$self->{hover} = $self->{item}{$HOVER};	3423	$self->{hover} = $self->{item}{$HOVER};
2876	}
2877		3424
		3425	0
		3426	}
		3427
2878	sub button_up {	3428	sub invoke_button_up {
2879	my ($self, $ev, $x, $y) = @_;	3429	my ($self, $ev, $x, $y) = @_;
2880		3430
2881	if ($ev->{button} == $self->{button}) {	3431	if ($ev->{button} == $self->{button}) {
2882	undef $GRAB;	3432	undef $GRAB;
2883	$self->hide;	3433	$self->hide;
2884		3434
2885	$self->_emit ("popdown");	3435	$self->emit ("popdown");
2886	$self->{hover}[1]->() if $self->{hover};	3436	$self->{hover}[1]->() if $self->{hover};
		3437	} else {
		3438	return 0
		3439	}
		3440
2887	}	3441	1
2888	}	3442	}
2889		3443
2890	#############################################################################	3444	#############################################################################
2891		3445
2892	package CFClient::UI::Statusbox;	3446	package CFPlus::UI::Multiplexer;
2893		3447
2894	our @ISA = CFClient::UI::VBox::;	3448	our @ISA = CFPlus::UI::Container::;
2895		3449
2896	sub new {	3450	sub new {
2897	my $class = shift;	3451	my $class = shift;
2898		3452
2899	$class->SUPER::new (	3453	my $self = $class->SUPER::new (
		3454	@_,
		3455	);
		3456
		3457	$self->{current} = $self->{children}[0]
		3458	if @{ $self->{children} };
		3459
		3460	$self
		3461	}
		3462
		3463	sub add {
		3464	my ($self, @widgets) = @_;
		3465
		3466	$self->SUPER::add (@widgets);
		3467
		3468	$self->{current} = $self->{children}[0]
		3469	if @{ $self->{children} };
		3470	}
		3471
		3472	sub get_current_page {
		3473	my ($self) = @_;
		3474
		3475	$self->{current}
		3476	}
		3477
		3478	sub set_current_page {
		3479	my ($self, $page_or_widget) = @_;
		3480
		3481	my $widget = ref $page_or_widget
		3482	? $page_or_widget
		3483	: $self->{children}[$page_or_widget];
		3484
		3485	$self->{current} = $widget;
		3486	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3487
		3488	$self->emit (page_changed => $self->{current});
		3489
		3490	$self->realloc;
		3491	}
		3492
		3493	sub visible_children {
		3494	$_[0]{current}
		3495	}
		3496
		3497	sub size_request {
		3498	my ($self) = @_;
		3499
		3500	$self->{current}->size_request
		3501	}
		3502
		3503	sub invoke_size_allocate {
		3504	my ($self, $w, $h) = @_;
		3505
		3506	$self->{current}->configure (0, 0, $w, $h);
		3507
		3508	1
		3509	}
		3510
		3511	sub _draw {
		3512	my ($self) = @_;
		3513
		3514	$self->{current}->draw;
		3515	}
		3516
		3517	#############################################################################
		3518
		3519	package CFPlus::UI::Notebook;
		3520
		3521	our @ISA = CFPlus::UI::VBox::;
		3522
		3523	sub new {
		3524	my $class = shift;
		3525
		3526	my $self = $class->SUPER::new (
		3527	buttonbar => (new CFPlus::UI::Buttonbar),
		3528	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3529	# filter => # will be put between multiplexer and $self
		3530	@_,
		3531	);
		3532
		3533	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3534	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3535
		3536	$self
		3537	}
		3538
		3539	sub add {
		3540	my ($self, $title, $widget, $tooltip) = @_;
		3541
		3542	CFPlus::weaken $self;
		3543
		3544	$self->{buttonbar}->add (new CFPlus::UI::Button
		3545	markup => $title,
		3546	tooltip => $tooltip,
		3547	on_activate => sub { $self->set_current_page ($widget) },
		3548	);
		3549
		3550	$self->{multiplexer}->add ($widget);
		3551	}
		3552
		3553	sub get_current_page {
		3554	my ($self) = @_;
		3555
		3556	$self->{multiplexer}->get_current_page
		3557	}
		3558
		3559	sub set_current_page {
		3560	my ($self, $page) = @_;
		3561
		3562	$self->{multiplexer}->set_current_page ($page);
		3563	$self->emit (page_changed => $self->{multiplexer}{current});
		3564	}
		3565
		3566	#############################################################################
		3567
		3568	package CFPlus::UI::Selector;
		3569
		3570	use utf8;
		3571
		3572	our @ISA = CFPlus::UI::Button::;
		3573
		3574	sub new {
		3575	my $class = shift;
		3576
		3577	my $self = $class->SUPER::new (
		3578	options => [], # [value, title, longdesc], ...
		3579	value => undef,
		3580	@_,
		3581	);
		3582
		3583	$self->_set_value ($self->{value});
		3584
		3585	$self
		3586	}
		3587
		3588	sub invoke_button_down {
		3589	my ($self, $ev) = @_;
		3590
		3591	my @menu_items;
		3592
		3593	for (@{ $self->{options} }) {
		3594	my ($value, $title, $tooltip) = @$_;
		3595
		3596	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3597	}
		3598
		3599	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3600	}
		3601
		3602	sub _set_value {
		3603	my ($self, $value) = @_;
		3604
		3605	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3606	or return;
		3607
		3608	$self->{value} = $item->[0];
		3609	$self->set_markup ("$item->[1] ⇓");
		3610	$self->set_tooltip ($item->[2]);
		3611	}
		3612
		3613	sub set_value {
		3614	my ($self, $value) = @_;
		3615
		3616	return unless $self->{value} ne $value;
		3617
		3618	$self->_set_value ($value);
		3619	$self->emit (changed => $value);
		3620	}
		3621
		3622	#############################################################################
		3623
		3624	package CFPlus::UI::Statusbox;
		3625
		3626	our @ISA = CFPlus::UI::VBox::;
		3627
		3628	sub new {
		3629	my $class = shift;
		3630
		3631	my $self = $class->SUPER::new (
2900	fontsize => 0.8,	3632	fontsize => 0.8,
2901	@_,	3633	@_,
2902	)	3634	);
		3635
		3636	CFPlus::weaken (my $this = $self);
		3637
		3638	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3639
		3640	$self
2903	}	3641	}
2904		3642
2905	sub reorder {	3643	sub reorder {
2906	my ($self) = @_;	3644	my ($self) = @_;
2907	my $NOW = time;	3645	my $NOW = Time::HiRes::time;
		3646
		3647	# freeze display when hovering over any label
		3648	return if $CFPlus::UI::TOOLTIP->{owner}
		3649	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
		3650	values %{ $self->{item} };
2908		3651
2909	while (my ($k, $v) = each %{ $self->{item} }) {	3652	while (my ($k, $v) = each %{ $self->{item} }) {
2910	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3653	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2911	}	3654	}
2912		3655
…		…
2915	my @items = sort {	3658	my @items = sort {
2916	$a->{pri} <=> $b->{pri}	3659	$a->{pri} <=> $b->{pri}
2917	or $b->{id} <=> $a->{id}	3660	or $b->{id} <=> $a->{id}
2918	} values %{ $self->{item} };	3661	} values %{ $self->{item} };
2919		3662
		3663	$self->{timer}->interval (1);
		3664
2920	my $count = 10 + 1;	3665	my $count = 10 + 1;
2921	for my $item (@items) {	3666	for my $item (@items) {
2922	last unless --$count;	3667	last unless --$count;
2923		3668
2924	push @widgets, $item->{label} ||= do {	3669	my $label = $item->{label} ||= do {
2925	# TODO: doesn't handle markup well (read as: at all)	3670	# TODO: doesn't handle markup well (read as: at all)
2926	my $short = $item->{count} > 1	3671	my $short = $item->{count} > 1
2927	? "<b>$item->{count} ×</b> $item->{text}"	3672	? "<b>$item->{count} ×</b> $item->{text}"
2928	: $item->{text};	3673	: $item->{text};
2929		3674
2930	for ($short) {	3675	for ($short) {
2931	s/^\s+//;	3676	s/^\s+//;
2932	s/\s+/ /g;	3677	s/\s+/ /g;
2933	}	3678	}
2934		3679
2935	new CFClient::UI::Label	3680	new CFPlus::UI::Label
2936	markup => $short,	3681	markup => $short,
2937	tooltip => $item->{tooltip},	3682	tooltip => $item->{tooltip},
2938	tooltip_font => $::FONT_PROP,	3683	tooltip_font => $::FONT_PROP,
2939	tooltip_width => 0.67,	3684	tooltip_width => 0.67,
2940	fontsize => $item->{fontsize} || $self->{fontsize},	3685	fontsize => $item->{fontsize} || $self->{fontsize},
2941	max_w => $::WIDTH * 0.44,	3686	max_w => $::WIDTH * 0.44,
2942	fg => $item->{fg},	3687	fg => [@{ $item->{fg} }],
2943	can_events => 1,	3688	can_events => 1,
2944	can_hover => 1	3689	can_hover => 1
2945	};	3690	};
		3691
		3692	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3693	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3694	$label->update;
		3695	$label->set_max_size (undef, $label->{req_h} * $diff)
		3696	if $diff < 1;
		3697	$self->{timer}->interval (1/30);
		3698	} else {
		3699	$label->{fg}[3] = $item->{fg}[3] || 1;
		3700	}
		3701
		3702	push @widgets, $label;
2946	}	3703	}
2947		3704
2948	$self->clear;	3705	$self->clear;
2949	$self->SUPER::add (reverse @widgets);	3706	$self->SUPER::add (reverse @widgets);
2950	}	3707	}
…		…
2955	$text =~ s/^\s+//;	3712	$text =~ s/^\s+//;
2956	$text =~ s/\s+$//;	3713	$text =~ s/\s+$//;
2957		3714
2958	return unless $text;	3715	return unless $text;
2959		3716
2960	my $timeout = time + ((delete $arg{timeout}) || 60);	3717	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2961		3718
2962	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3719	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2963		3720
2964	if (my $item = $self->{item}{$group}) {	3721	if (my $item = $self->{item}{$group}) {
2965	if ($item->{text} eq $text) {	3722	if ($item->{text} eq $text) {
2966	$item->{count}++;	3723	$item->{count}++;
2967	} else {	3724	} else {
2968	$item->{count} = 1;	3725	$item->{count} = 1;
2969	$item->{text} = $item->{tooltip} = $text;	3726	$item->{text} = $item->{tooltip} = $text;
2970	}	3727	}
2971	$item->{id} = ++$self->{id};	3728	$item->{id} += 0.2;#d#
2972	$item->{timeout} = $timeout;	3729	$item->{timeout} = $timeout;
2973	delete $item->{label};	3730	delete $item->{label};
2974	} else {	3731	} else {
2975	$self->{item}{$group} = {	3732	$self->{item}{$group} = {
2976	id => ++$self->{id},	3733	id => ++$self->{id},
…		…
2982	count => 1,	3739	count => 1,
2983	%arg,	3740	%arg,
2984	};	3741	};
2985	}	3742	}
2986		3743
		3744	$ROOT->on_refresh (reorder => sub {
2987	$self->reorder;	3745	$self->reorder;
		3746	});
2988	}	3747	}
2989		3748
2990	sub reconfigure {	3749	sub reconfigure {
2991	my ($self) = @_;	3750	my ($self) = @_;
2992		3751
…		…
2995		3754
2996	$self->reorder;	3755	$self->reorder;
2997	$self->SUPER::reconfigure;	3756	$self->SUPER::reconfigure;
2998	}	3757	}
2999		3758
		3759	sub destroy {
		3760	my ($self) = @_;
		3761
		3762	$self->{timer}->cancel;
		3763
		3764	$self->SUPER::destroy;
		3765	}
		3766
3000	#############################################################################	3767	#############################################################################
3001		3768
3002	package CFClient::UI::Root;	3769	package CFPlus::UI::Root;
3003		3770
3004	our @ISA = CFClient::UI::Container::;	3771	our @ISA = CFPlus::UI::Container::;
3005		3772
		3773	use List::Util qw(min max);
		3774
3006	use CFClient::OpenGL;	3775	use CFPlus::OpenGL;
3007		3776
3008	sub new {	3777	sub new {
3009	my $class = shift;	3778	my $class = shift;
3010		3779
3011	my $self = $class->SUPER::new (	3780	my $self = $class->SUPER::new (
3012	visible => 1,	3781	visible => 1,
3013	@_,	3782	@_,
3014	);	3783	);
3015		3784
3016	Scalar::Util::weaken ($self->{root} = $self);	3785	CFPlus::weaken ($self->{root} = $self);
3017		3786
3018	$self	3787	$self
3019	}
3020
3021	sub configure {
3022	my ($self, $x, $y, $w, $h) = @_;
3023
3024	$self->{w} = $w;
3025	$self->{h} = $h;
3026	}
3027
3028	sub reconfigure {
3029	my ($self) = @_;
3030
3031	$self->SUPER::reconfigure;
3032
3033	$self->size_allocate ($self->{w}, $self->{h}, 1)
3034	if $self->{w};
3035	}	3788	}
3036		3789
3037	sub size_request {	3790	sub size_request {
3038	my ($self) = @_;	3791	my ($self) = @_;
3039		3792
…		…
3052	$coord = $max - $size if $coord > $max - $size;	3805	$coord = $max - $size if $coord > $max - $size;
3053		3806
3054	int $coord + 0.5	3807	int $coord + 0.5
3055	}	3808	}
3056		3809
3057	sub size_allocate {	3810	sub invoke_size_allocate {
3058	my ($self, $w, $h, $changed) = @_;	3811	my ($self, $w, $h) = @_;
3059		3812
3060	for my $child ($self->children) {	3813	for my $child ($self->children) {
3061	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3814	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3062		3815
3063	$X = $child->{force_x} if exists $child->{force_x};	3816	$X = $child->{force_x} if exists $child->{force_x};
…		…
3066	$X = _to_pixel $X, $W, $self->{w};	3819	$X = _to_pixel $X, $W, $self->{w};
3067	$Y = _to_pixel $Y, $H, $self->{h};	3820	$Y = _to_pixel $Y, $H, $self->{h};
3068		3821
3069	$child->configure ($X, $Y, $W, $H);	3822	$child->configure ($X, $Y, $W, $H);
3070	}	3823	}
		3824
		3825	1
3071	}	3826	}
3072		3827
3073	sub coord2local {	3828	sub coord2local {
3074	my ($self, $x, $y) = @_;	3829	my ($self, $x, $y) = @_;
3075		3830
…		…
3131	$_->()	3886	$_->()
3132	for values %{delete $self->{refresh_hook}};	3887	for values %{delete $self->{refresh_hook}};
3133	}	3888	}
3134		3889
3135	if ($self->{realloc}) {	3890	if ($self->{realloc}) {
		3891	my %queue;
3136	my @queue;	3892	my @queue;
		3893	my $widget;
3137		3894
		3895	outer:
3138	while () {	3896	while () {
3139	if ($self->{realloc}) {	3897	if (my $realloc = delete $self->{realloc}) {
3140	#TODO use array-of-depth approach	3898	for $widget (values %$realloc) {
		3899	$widget->{visible} or next; # do not resize invisible widgets
3141		3900
3142	@queue = sort { $a->{visible} <=> $b->{visible} }	3901	$queue{$widget+0}++ and next; # duplicates are common
3143	@queue, values %{delete $self->{realloc}};	3902
		3903	push @{ $queue[$widget->{visible}] }, $widget;
		3904	}
3144	}	3905	}
3145		3906
		3907	while () {
		3908	@queue or last outer;
		3909
3146	my $widget = pop @queue || last;	3910	$widget = pop @{ $queue[-1] || [] }
		3911	and last;
		3912
		3913	pop @queue;
		3914	}
3147		3915
3148	$widget->{visible} or last; # do not resize invisible widgets	3916	delete $queue{$widget+0};
3149		3917
3150	my ($w, $h) = $widget->size_request;	3918	my ($w, $h) = $widget->size_request;
3151		3919
3152	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3920	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3153	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3921	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3922
		3923	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3924	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3154		3925
3155	$w = $widget->{force_w} if exists $widget->{force_w};	3926	$w = $widget->{force_w} if exists $widget->{force_w};
3156	$h = $widget->{force_h} if exists $widget->{force_h};	3927	$h = $widget->{force_h} if exists $widget->{force_h};
3157		3928
		3929	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		3930	|| delete $widget->{force_realloc}) {
3158	$widget->{req_w} = $w;	3931	$widget->{req_w} = $w;
3159	$widget->{req_h} = $h;	3932	$widget->{req_h} = $h;
3160		3933
3161	$self->{size_alloc}{$widget} = [$widget, undef, undef];	3934	$self->{size_alloc}{$widget+0} = $widget;
3162		3935
3163	push @queue, $widget->{parent}	3936	if (my $parent = $widget->{parent}) {
3164	if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};	3937	$self->{realloc}{$parent+0} = $parent
		3938	unless $queue{$parent+0};
		3939
		3940	$parent->{force_size_alloc} = 1;
		3941	$self->{size_alloc}{$parent+0} = $parent;
		3942	}
		3943	}
		3944
		3945	delete $self->{realloc}{$widget+0};
3165	}	3946	}
3166	}	3947	}
3167		3948
3168	while (my $size_alloc = delete $self->{size_alloc}) {	3949	while (my $size_alloc = delete $self->{size_alloc}) {
3169	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},	3950	my @queue = sort { $b->{visible} <=> $a->{visible} }
3170	values %$size_alloc;	3951	values %$size_alloc;
3171		3952
3172	while () {	3953	while () {
3173	my ($widget, $w, $h) = @{ pop @queue or last };	3954	my $widget = pop @queue || last;
3174		3955
3175	$w = $widget->{w} || $widget->{req_w} unless defined $w;	3956	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176	$h = $widget->{h} || $widget->{req_h} unless defined $h;
3177		3957
3178	$w = 0 if $w < 0;	3958	$w = 0 if $w < 0;
3179	$h = 0 if $h < 0;	3959	$h = 0 if $h < 0;
3180		3960
		3961	$w = max $widget->{min_w}, $w;
		3962	$h = max $widget->{min_h}, $h;
		3963
		3964	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3965	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3966
		3967	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3968	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3969
3181	$w = int $w + 0.5;	3970	$w = int $w + 0.5;
3182	$h = int $h + 0.5;	3971	$h = int $h + 0.5;
3183		3972
3184	my $changed = $widget->{w} != $w || $widget->{h} != $h;	3973	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		3974	$widget->{old_w} = $widget->{w};
		3975	$widget->{old_h} = $widget->{h};
3185		3976
3186	$widget->{w} = $w;	3977	$widget->{w} = $w;
3187	$widget->{h} = $h;	3978	$widget->{h} = $h;
3188		3979
3189	$widget->emit (size_allocate => $w, $h, $changed);	3980	$widget->emit (size_allocate => $w, $h);
		3981	}
3190	}	3982	}
3191	}	3983	}
3192		3984
3193	while ($self->{post_alloc_hook}) {	3985	while ($self->{post_alloc_hook}) {
3194	$_->()	3986	$_->()
3195	for values %{delete $self->{post_alloc_hook}};	3987	for values %{delete $self->{post_alloc_hook}};
3196	}	3988	}
		3989
3197		3990
3198	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3991	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3199	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3992	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3200	glClear GL_COLOR_BUFFER_BIT;	3993	glClear GL_COLOR_BUFFER_BIT;
3201		3994
…		…
3203	glLoadIdentity;	3996	glLoadIdentity;
3204	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3997	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3205	glMatrixMode GL_MODELVIEW;	3998	glMatrixMode GL_MODELVIEW;
3206	glLoadIdentity;	3999	glLoadIdentity;
3207		4000
		4001	{
		4002	package CFPlus::UI::Base;
		4003
		4004	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		4005	(0, 0, $self->{w}, $self->{h});
		4006
3208	$self->_draw;	4007	$self->_draw;
		4008	}
3209	}	4009	}
3210		4010
3211	#############################################################################	4011	#############################################################################
3212		4012
3213	package CFClient::UI;	4013	package CFPlus::UI;
3214		4014
3215	$ROOT = new CFClient::UI::Root;	4015	$ROOT = new CFPlus::UI::Root;
3216	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4016	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3217		4017
3218	1	4018	1
3219		4019

Diff Legend

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