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

Diff Legend

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