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

Diff Legend

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