ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

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

Diff Legend

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