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

Diff Legend

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