ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

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

Diff Legend

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