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

Diff Legend

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