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.278 by root, Sun Jun 4 23:05:06 2006 UTC vs.
Revision 1.368 by root, Mon Jun 25 05:43:37 2007 UTC

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

Diff Legend

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