ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

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

Diff Legend

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