ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.264 by root, Thu Jun 1 02:58:30 2006 UTC vs.
Revision 1.354 by root, Sat Nov 18 23:31:23 2006 UTC

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

Diff Legend

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