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.266 by root, Thu Jun 1 03:42:58 2006 UTC vs.
Revision 1.383 by root, Fri Jul 20 16:32:04 2007 UTC

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

Diff Legend

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