ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.279 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.389 by root, Sat Jul 21 13:02:05 2007 UTC

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

Diff Legend

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