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

Diff Legend

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