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

Diff Legend

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