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

Diff Legend

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