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.293 by root, Tue Jun 6 03:05:16 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 ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 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
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
98 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
100 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 }
101} 125}
102 126
103sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
104 my ($ev) = @_; 128 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 129
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 131
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 133
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
112 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 136
114 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 139 $grab->update if $grab;
117 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
118 141
142 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 143 $TOOLTIP_WATCHER->cb->();
120 } 144 }
121} 145}
122 146
123sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
124 my ($ev) = @_; 148 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
126 150
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 152
129 if ($widget != $HOVER) { 153 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 154
132 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 156 if $HOVER;
140} 157}
141 158
142# convert position array to integers 159# convert position array to integers
143sub harmonize { 160sub harmonize {
… …
193 reconfigure_widgets; 210 reconfigure_widgets;
194} 211}
195 212
196############################################################################# 213#############################################################################
197 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
198package CFClient::UI::Base; 223package CFPlus::UI::Base;
199 224
200use strict; 225use strict;
201 226
202use CFClient::OpenGL; 227use CFPlus::OpenGL;
203 228
204sub new { 229sub new {
205 my $class = shift; 230 my $class = shift;
206 231
207 my $self = bless { 232 my $self = bless {
… …
212 h => undef, 237 h => undef,
213 can_events => 1, 238 can_events => 1,
214 @_ 239 @_
215 }, $class; 240 }, $class;
216 241
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 243
219 for (keys %$self) { 244 for (keys %$self) {
220 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
222 } 247 }
223 } 248 }
224 249
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $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};
227 $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};
228 $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};
229 $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};
230 255
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 258
234 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
239 264
240sub destroy { 265sub destroy {
241 my ($self) = @_; 266 my ($self) = @_;
242 267
243 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
244 %$self = (); 270 %$self = ();
245} 271}
246 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
247sub show { 277sub show {
248 my ($self) = @_; 278 my ($self) = @_;
249 279
250 return if $self->{parent}; 280 return if $self->{parent};
251 281
252 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
253} 283}
254 284
255sub set_visible { 285sub set_visible {
256 my ($self) = @_; 286 my ($self) = @_;
257 287
… …
272 302
273 return unless $self->{visible}; 303 return unless $self->{visible};
274 304
275 $_->set_invisible for $self->children; 305 $_->set_invisible for $self->children;
276 306
307 delete $self->{visible};
277 delete $self->{root}; 308 delete $self->{root};
278 delete $self->{visible};
279 309
280 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
282 312
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
285 315
286 $self->focus_out; 316 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
289} 318}
290 319
291sub set_visibility { 320sub set_visibility {
292 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
… …
315} 344}
316 345
317sub move_abs { 346sub move_abs {
318 my ($self, $x, $y, $z) = @_; 347 my ($self, $x, $y, $z) = @_;
319 348
320 $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;
321 $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;
322 $self->{z} = $z if defined $z; 351 $self->{z} = $z if defined $z;
323 352
324 $self->update; 353 $self->update;
325} 354}
326 355
… …
336sub size_request { 365sub size_request {
337 require Carp; 366 require Carp;
338 Carp::confess "size_request is abstract"; 367 Carp::confess "size_request is abstract";
339} 368}
340 369
370sub baseline_shift {
371 0
372}
373
341sub configure { 374sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 375 my ($self, $x, $y, $w, $h) = @_;
343 376
344 if ($self->{aspect}) { 377 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h); 378 my ($ow, $oh) = ($w, $h);
346 379
347 $w = List::Util::min $w, int $h * $self->{aspect}; 380 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
348 $h = List::Util::min $h, int $w / $self->{aspect}; 381 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
349 382
350 # use alignment to adjust x, y 383 # use alignment to adjust x, y
351 384
352 $x += int 0.5 * ($ow - $w); 385 $x += int 0.5 * ($ow - $w);
353 $y += int 0.5 * ($oh - $h); 386 $y += int 0.5 * ($oh - $h);
… …
367 400
368 $self->{root}{size_alloc}{$self+0} = $self; 401 $self->{root}{size_alloc}{$self+0} = $self;
369 } 402 }
370} 403}
371 404
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 405sub children {
377 # nop 406 # nop
378} 407}
379 408
380sub visible_children { 409sub visible_children {
… …
398 427
399 return if $self->{tooltip} eq $tooltip; 428 return if $self->{tooltip} eq $tooltip;
400 429
401 $self->{tooltip} = $tooltip; 430 $self->{tooltip} = $tooltip;
402 431
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 432 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner}; 433 delete $CFPlus::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 434 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
406 } 435 }
407} 436}
408 437
409# translate global coordinates to local coordinate system 438# translate global coordinates to local coordinate system
410sub coord2local { 439sub coord2local {
411 my ($self, $x, $y) = @_; 440 my ($self, $x, $y) = @_;
412 441
442 Carp::confess unless $self->{parent};#d#
443
413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 444 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414} 445}
415 446
416# translate local coordinates to global coordinate system 447# translate local coordinates to global coordinate system
417sub coord2global { 448sub coord2global {
418 my ($self, $x, $y) = @_; 449 my ($self, $x, $y) = @_;
419 450
451 Carp::confess unless $self->{parent};#d#
452
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 453 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 454}
422 455
423sub focus_in { 456sub invoke_focus_in {
424 my ($self) = @_; 457 my ($self) = @_;
425 458
426 return if $FOCUS == $self; 459 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 460 return unless $self->{can_focus};
428 461
429 my $focus = $FOCUS; $FOCUS = $self; 462 $FOCUS = $self;
430 463
431 $self->_emit (focus_in => $focus); 464 $self->update;
432 465
433 $focus->update if $focus; 466 0
434 $FOCUS->update;
435} 467}
436 468
437sub focus_out { 469sub invoke_focus_out {
438 my ($self) = @_; 470 my ($self) = @_;
439 471
440 return unless $FOCUS == $self; 472 return unless $FOCUS == $self;
441 473
442 my $focus = $FOCUS; undef $FOCUS; 474 undef $FOCUS;
443 475
444 $self->_emit (focus_out => $focus); 476 $self->update;
445 477
446 $focus->update if $focus; #?
447
448 $::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
449 unless $FOCUS; 479 unless $FOCUS;
450}
451 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
452sub mouse_motion { 0 } 491sub invoke_mouse_motion { 0 }
453sub button_up { 0 } 492sub invoke_button_up { 0 }
454sub key_down { 0 } 493sub invoke_key_down { 0 }
455sub key_up { 0 } 494sub invoke_key_up { 0 }
495sub invoke_mouse_wheel { 0 }
456 496
457sub button_down { 497sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 498 my ($self, $ev, $x, $y) = @_;
459 499
460 $self->focus_in; 500 $self->grab_focus;
461 501
462 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)
463} 550}
464 551
465sub find_widget { 552sub find_widget {
466 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
467 554
… …
475} 562}
476 563
477sub set_parent { 564sub set_parent {
478 my ($self, $parent) = @_; 565 my ($self, $parent) = @_;
479 566
480 Scalar::Util::weaken ($self->{parent} = $parent); 567 CFPlus::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 568 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505} 569}
506 570
507sub realloc { 571sub realloc {
508 my ($self) = @_; 572 my ($self) = @_;
509 573
… …
542 return unless $self->{h} && $self->{w}; 606 return unless $self->{h} && $self->{w};
543 607
544 # update screen rectangle 608 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 609 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 610 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 611
550 # skip widgets that are entirely outside the drawing area 612 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 615
… …
576 glVertex $self->{w} - 1, 0; 638 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1; 639 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1; 640 glVertex 0 , $self->{h} - 1;
579 glEnd; 641 glEnd;
580 glPopMatrix; 642 glPopMatrix;
581 #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;
582 } 644 }
583 645
584 $self->_draw; 646 $self->_draw;
585 glPopMatrix; 647 glPopMatrix;
586} 648}
… …
589 my ($self) = @_; 651 my ($self) = @_;
590 652
591 warn "no draw defined for $self\n"; 653 warn "no draw defined for $self\n";
592} 654}
593 655
656my $cntx;#d#
594sub DESTROY { 657sub DESTROY {
595 my ($self) = @_; 658 my ($self) = @_;
596 659
660 return if CFPlus::in_destruct;
661
662 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664
597 delete $WIDGET{$self+0}; 665 delete $WIDGET{$self+0};
598 #$self->deactivate;
599} 666}
600 667
601############################################################################# 668#############################################################################
602 669
603package CFClient::UI::DrawBG; 670package CFPlus::UI::DrawBG;
604 671
605our @ISA = CFClient::UI::Base::; 672our @ISA = CFPlus::UI::Base::;
606 673
607use strict; 674use strict;
608use CFClient::OpenGL; 675use CFPlus::OpenGL;
609 676
610sub new { 677sub new {
611 my $class = shift; 678 my $class = shift;
612 679
613 # range [value, low, high, page] 680 # range [value, low, high, page]
… …
644 } 711 }
645} 712}
646 713
647############################################################################# 714#############################################################################
648 715
649package CFClient::UI::Empty; 716package CFPlus::UI::Empty;
650 717
651our @ISA = CFClient::UI::Base::; 718our @ISA = CFPlus::UI::Base::;
652 719
653sub new { 720sub new {
654 my ($class, %arg) = @_; 721 my ($class, %arg) = @_;
655 $class->SUPER::new (can_events => 0, %arg); 722 $class->SUPER::new (can_events => 0, %arg);
656} 723}
… …
663 730
664sub draw { } 731sub draw { }
665 732
666############################################################################# 733#############################################################################
667 734
668package CFClient::UI::Container; 735package CFPlus::UI::Container;
669 736
670our @ISA = CFClient::UI::Base::; 737our @ISA = CFPlus::UI::Base::;
671 738
672sub new { 739sub new {
673 my ($class, %arg) = @_; 740 my ($class, %arg) = @_;
674 741
675 my $children = delete $arg{children}; 742 my $children = delete $arg{children};
… …
684 if $children; 751 if $children;
685 752
686 $self 753 $self
687} 754}
688 755
756sub realloc {
757 my ($self) = @_;
758
759 $self->{force_realloc} = 1;
760 $self->{force_size_alloc} = 1;
761 $self->SUPER::realloc;
762}
763
689sub add { 764sub add {
690 my ($self, @widgets) = @_; 765 my ($self, @widgets) = @_;
691 766
692 $_->set_parent ($self) 767 $_->set_parent ($self)
693 for @widgets; 768 for @widgets;
… …
753 $_->draw for @{$self->{children}}; 828 $_->draw for @{$self->{children}};
754} 829}
755 830
756############################################################################# 831#############################################################################
757 832
758package CFClient::UI::Bin; 833package CFPlus::UI::Bin;
759 834
760our @ISA = CFClient::UI::Container::; 835our @ISA = CFPlus::UI::Container::;
761 836
762sub new { 837sub new {
763 my ($class, %arg) = @_; 838 my ($class, %arg) = @_;
764 839
765 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 840 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
766 841
767 $class->SUPER::new (children => [$child], %arg) 842 $class->SUPER::new (children => [$child], %arg)
768} 843}
769 844
770sub add { 845sub add {
771 my ($self, $child) = @_; 846 my ($self, $child) = @_;
772 847
773 $self->{children} = []; 848 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 849 $self->SUPER::add ($child);
776} 850}
777 851
778sub remove { 852sub remove {
779 my ($self, $widget) = @_; 853 my ($self, $widget) = @_;
780 854
781 $self->SUPER::remove ($widget); 855 $self->SUPER::remove ($widget);
782 856
783 $self->{children} = [new CFClient::UI::Empty] 857 $self->{children} = [new CFPlus::UI::Empty]
784 unless @{$self->{children}}; 858 unless @{$self->{children}};
785} 859}
786 860
787sub child { $_[0]->{children}[0] } 861sub child { $_[0]->{children}[0] }
788 862
789sub size_request { 863sub size_request {
790 $_[0]{children}[0]->size_request 864 $_[0]{children}[0]->size_request
791} 865}
792 866
793sub size_allocate { 867sub invoke_size_allocate {
794 my ($self, $w, $h) = @_; 868 my ($self, $w, $h) = @_;
795 869
796 $self->{children}[0]->configure (0, 0, $w, $h); 870 $self->{children}[0]->configure (0, 0, $w, $h);
871
872 1
797} 873}
798 874
799############################################################################# 875#############################################################################
800 876
801# back-buffered drawing area 877# back-buffered drawing area
802 878
803package CFClient::UI::Window; 879package CFPlus::UI::Window;
804 880
805our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
806 882
807use CFClient::OpenGL; 883use CFPlus::OpenGL;
808 884
809sub new { 885sub new {
810 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
811 887
812 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
817 893
818 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 894 $ROOT->on_post_alloc ($self => sub { $self->render_child });
819 $self->SUPER::update; 895 $self->SUPER::update;
820} 896}
821 897
822sub size_allocate { 898sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
824 900
825 $self->SUPER::size_allocate ($w, $h);
826 $self->update; 901 $self->update;
902
903 $self->SUPER::invoke_size_allocate ($w, $h)
827} 904}
828 905
829sub _render { 906sub _render {
830 my ($self) = @_; 907 my ($self) = @_;
831 908
… …
833} 910}
834 911
835sub render_child { 912sub render_child {
836 my ($self) = @_; 913 my ($self) = @_;
837 914
838 $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 {
839 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
840 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
841 918
842 { 919 {
843 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
844 921
845 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
847 } 926 }
848
849 $self->_render;
850 }; 927 };
851} 928}
852 929
853sub _draw { 930sub _draw {
854 my ($self) = @_; 931 my ($self) = @_;
855
856 my ($w, $h) = @$self{qw(w h)};
857 932
858 my $tex = $self->{texture} 933 my $tex = $self->{texture}
859 or return; 934 or return;
860 935
861 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863 glColor 0, 0, 0, 1; 938 glColor 0, 0, 0, 1;
864 939
865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
866 941
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;
… …
1552 my ($self, $text) = @_; 1782 my ($self, $text) = @_;
1553 1783
1554 return if $self->{text} eq "T$text"; 1784 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1785 $self->{text} = "T$text";
1556 1786
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1787 $self->{layout}->set_text ($text);
1559 1788
1560 delete $self->{size_req}; 1789 delete $self->{size_req};
1561 $self->realloc; 1790 $self->realloc;
1562 $self->update; 1791 $self->update;
… …
1568 return if $self->{text} eq "M$markup"; 1797 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1798 $self->{text} = "M$markup";
1570 1799
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1800 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1801
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1802 $self->{layout}->set_markup ($markup);
1575 1803
1576 delete $self->{size_req}; 1804 delete $self->{size_req};
1577 $self->realloc; 1805 $self->realloc;
1578 $self->update; 1806 $self->update;
… …
1590 1818
1591 my ($w, $h) = $self->{layout}->size; 1819 my ($w, $h) = $self->{layout}->size;
1592 1820
1593 if (exists $self->{template}) { 1821 if (exists $self->{template}) {
1594 $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);
1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1824 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1825
1597 my ($w2, $h2) = $self->{template}->size; 1826 my ($w2, $h2) = $self->{template}->size;
1598 1827
1599 $w = List::Util::max $w, $w2; 1828 $w = List::Util::max $w, $w2;
… …
1604 }; 1833 };
1605 1834
1606 @{ $self->{size_req} } 1835 @{ $self->{size_req} }
1607} 1836}
1608 1837
1838sub baseline_shift {
1839 $_[0]{layout}->descent
1840}
1841
1609sub size_allocate { 1842sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1843 my ($self, $w, $h) = @_;
1611 1844
1612 delete $self->{ox}; 1845 delete $self->{ox};
1613 1846
1614 delete $self->{texture} 1847 delete $self->{texture}
1615 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
1616} 1851}
1617 1852
1618sub set_fontsize { 1853sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1854 my ($self, $fontsize) = @_;
1620 1855
1621 $self->{fontsize} = $fontsize; 1856 $self->{fontsize} = $fontsize;
1857 delete $self->{size_req};
1622 delete $self->{texture}; 1858 delete $self->{texture};
1623 1859
1624 $self->realloc; 1860 $self->realloc;
1625} 1861}
1626 1862
1627sub reconfigure { 1863sub reconfigure {
1628 my ($self) = @_; 1864 my ($self) = @_;
1629 1865
1630 delete $self->{size_req}; 1866 delete $self->{size_req};
1867 delete $self->{texture};
1631 1868
1632 $self->SUPER::reconfigure; 1869 $self->SUPER::reconfigure;
1633} 1870}
1634 1871
1635sub _draw { 1872sub _draw {
1636 my ($self) = @_; 1873 my ($self) = @_;
1637 1874
1638 $self->SUPER::_draw; # draw background, if applicable 1875 $self->SUPER::_draw; # draw background, if applicable
1639 1876
1640 my $tex = $self->{texture} ||= do { 1877 my $size = $self->{texture} ||= do {
1641 $self->{layout}->set_foreground (@{$self->{fg}}); 1878 $self->{layout}->set_foreground (@{$self->{fg}});
1642 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1879 $self->{layout}->set_font ($self->{font}) if $self->{font};
1643 $self->{layout}->set_width ($self->{w}); 1880 $self->{layout}->set_width ($self->{w});
1644 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1881 $self->{layout}->set_ellipsise ($self->{ellipsise});
1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1882 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1883 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1647 1884
1648 new_from_layout CFClient::Texture $self->{layout} 1885 [$self->{layout}->size]
1649 }; 1886 };
1650 1887
1651 unless (exists $self->{ox}) { 1888 unless (exists $self->{ox}) {
1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1889 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1890 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1654 : ($self->{w} - $tex->{w}) * 0.5); 1891 : ($self->{w} - $size->[0]) * 0.5);
1655 1892
1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1893 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1894 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1658 : ($self->{h} - $tex->{h}) * 0.5); 1895 : ($self->{h} - $size->[1]) * 0.5);
1659 }; 1896 };
1660 1897
1661 glEnable GL_TEXTURE_2D; 1898 my $w = List::Util::min $self->{w} + 4, $size->[0];
1899 my $h = List::Util::min $self->{h} + 2, $size->[1];
1662 1900
1663 if ($tex->{format} == GL_ALPHA) { 1901 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1665 glColor @{$self->{fg}};
1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1670 }
1671
1672 glDisable GL_TEXTURE_2D;
1673} 1902}
1674 1903
1675############################################################################# 1904#############################################################################
1676 1905
1677package CFClient::UI::EntryBase; 1906package CFPlus::UI::EntryBase;
1678 1907
1679our @ISA = CFClient::UI::Label::; 1908our @ISA = CFPlus::UI::Label::;
1680 1909
1681use CFClient::OpenGL; 1910use CFPlus::OpenGL;
1682 1911
1683sub new { 1912sub new {
1684 my $class = shift; 1913 my $class = shift;
1685 1914
1686 $class->SUPER::new ( 1915 $class->SUPER::new (
… …
1690 active_fg => [0, 0, 0], 1919 active_fg => [0, 0, 0],
1691 can_hover => 1, 1920 can_hover => 1,
1692 can_focus => 1, 1921 can_focus => 1,
1693 valign => 0, 1922 valign => 0,
1694 can_events => 1, 1923 can_events => 1,
1924 ellipsise => 0,
1695 #text => ... 1925 #text => ...
1696 #hidden => "*", 1926 #hidden => "*",
1697 @_ 1927 @_
1698 ) 1928 )
1699} 1929}
… …
1710 1940
1711 $text =~ s/./*/g if $self->{hidden}; 1941 $text =~ s/./*/g if $self->{hidden};
1712 $self->{layout}->set_text ("$text "); 1942 $self->{layout}->set_text ("$text ");
1713 delete $self->{size_req}; 1943 delete $self->{size_req};
1714 1944
1715 $self->_emit (changed => $self->{text}); 1945 $self->emit (changed => $self->{text});
1716 1946
1717 $self->realloc; 1947 $self->realloc;
1718 $self->update; 1948 $self->update;
1719} 1949}
1720 1950
… …
1735 my ($w, $h) = $self->SUPER::size_request; 1965 my ($w, $h) = $self->SUPER::size_request;
1736 1966
1737 ($w + 1, $h) # add 1 for cursor 1967 ($w + 1, $h) # add 1 for cursor
1738} 1968}
1739 1969
1740sub key_down { 1970sub invoke_key_down {
1741 my ($self, $ev) = @_; 1971 my ($self, $ev) = @_;
1742 1972
1743 my $mod = $ev->{mod}; 1973 my $mod = $ev->{mod};
1744 my $sym = $ev->{sym}; 1974 my $sym = $ev->{sym};
1745 my $uni = $ev->{unicode}; 1975 my $uni = $ev->{unicode};
1746 1976
1747 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;
1748 1980
1749 if ($uni == 8) { 1981 if ($uni == 8) {
1750 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1982 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1751 } elsif ($uni == 127) { 1983 } elsif ($uni == 127) {
1752 substr $text, $self->{cursor}, 1, ""; 1984 substr $text, $self->{cursor}, 1, "";
1753 } elsif ($sym == CFClient::SDLK_LEFT) { 1985 } elsif ($sym == CFPlus::SDLK_LEFT) {
1754 --$self->{cursor} if $self->{cursor}; 1986 --$self->{cursor} if $self->{cursor};
1755 } elsif ($sym == CFClient::SDLK_RIGHT) { 1987 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1756 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1988 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1757 } 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 = "";
1758 $self->{cursor} = 0; 2003 $self->{cursor} = 0;
1759 } elsif ($sym == CFClient::SDLK_END) {
1760 $self->{cursor} = length $text;
1761 } elsif ($uni == 27) { 2004 } elsif ($uni == 27) {
1762 $self->_emit ('escape'); 2005 $self->emit ('escape');
1763 } elsif ($uni) { 2006 } elsif ($uni == 0x0d) {
2007 substr $text, $self->{cursor}++, 0, "\012";
2008 } elsif ($uni >= 0x20) {
1764 substr $text, $self->{cursor}++, 0, chr $uni; 2009 substr $text, $self->{cursor}++, 0, chr $uni;
1765 } else { 2010 } else {
1766 return 0; 2011 return 0;
1767 } 2012 }
1768 2013
1769 $self->_set_text ($text); 2014 $self->_set_text ($text);
1770 2015
1771 $self->realloc; 2016 $self->realloc;
2017 $self->update;
1772 2018
1773 1 2019 1
1774} 2020}
1775 2021
1776sub focus_in { 2022sub invoke_focus_in {
1777 my ($self) = @_; 2023 my ($self) = @_;
1778 2024
1779 $self->{last_activity} = $::NOW; 2025 $self->{last_activity} = $::NOW;
1780 2026
1781 $self->SUPER::focus_in; 2027 $self->SUPER::invoke_focus_in
1782} 2028}
1783 2029
1784sub button_down { 2030sub invoke_button_down {
1785 my ($self, $ev, $x, $y) = @_; 2031 my ($self, $ev, $x, $y) = @_;
1786 2032
1787 $self->SUPER::button_down ($ev, $x, $y); 2033 $self->SUPER::invoke_button_down ($ev, $x, $y);
1788 2034
1789 my $idx = $self->{layout}->xy_to_index ($x, $y); 2035 my $idx = $self->{layout}->xy_to_index ($x, $y);
1790 2036
1791 # byte-index to char-index 2037 # byte-index to char-index
1792 my $text = $self->{text}; 2038 my $text = $self->{text};
1793 utf8::encode $text; 2039 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1794 $self->{cursor} = length substr $text, 0, $idx; 2040 $self->{cursor} = length $text;
1795 2041
1796 $self->_set_text ($self->{text}); 2042 $self->_set_text ($self->{text});
1797 $self->update; 2043 $self->update;
1798 2044
1799 1 2045 1
1800} 2046}
1801 2047
1802sub mouse_motion { 2048sub invoke_mouse_motion {
1803 my ($self, $ev, $x, $y) = @_; 2049 my ($self, $ev, $x, $y) = @_;
1804# 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#
1805 2051
1806 0 2052 1
1807} 2053}
1808 2054
1809sub _draw { 2055sub _draw {
1810 my ($self) = @_; 2056 my ($self) = @_;
1811 2057
… …
1838 utf8::encode $text; 2084 utf8::encode $text;
1839 2085
1840 @$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)
1841 } 2087 }
1842 2088
1843 glColor @{$self->{fg}};
1844 glBegin GL_LINES; 2089 glBegin GL_LINES;
1845 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};
1846 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};
1847 glEnd; 2092 glEnd;
1848 } 2093 }
1849} 2094}
1850 2095
2096#############################################################################
2097
1851package CFClient::UI::Entry; 2098package CFPlus::UI::Entry;
1852 2099
1853our @ISA = CFClient::UI::EntryBase::; 2100our @ISA = CFPlus::UI::EntryBase::;
1854 2101
1855use CFClient::OpenGL; 2102use CFPlus::OpenGL;
1856 2103
1857sub key_down { 2104sub invoke_key_down {
1858 my ($self, $ev) = @_; 2105 my ($self, $ev) = @_;
1859 2106
1860 my $sym = $ev->{sym}; 2107 my $sym = $ev->{sym};
1861 2108
1862 if ($sym == 13) { 2109 if ($ev->{uni} == 0x0d || $sym == 13) {
1863 unshift @{$self->{history}}, 2110 unshift @{$self->{history}},
1864 my $txt = $self->get_text; 2111 my $txt = $self->get_text;
2112
1865 $self->{history_pointer} = -1; 2113 $self->{history_pointer} = -1;
1866 $self->{history_saveback} = ''; 2114 $self->{history_saveback} = '';
1867 $self->_emit (activate => $txt); 2115 $self->emit (activate => $txt);
1868 $self->update; 2116 $self->update;
1869 2117
1870 } elsif ($sym == CFClient::SDLK_UP) { 2118 } elsif ($sym == CFPlus::SDLK_UP) {
1871 if ($self->{history_pointer} < 0) { 2119 if ($self->{history_pointer} < 0) {
1872 $self->{history_saveback} = $self->get_text; 2120 $self->{history_saveback} = $self->get_text;
1873 } 2121 }
1874 if (@{$self->{history} || []} > 0) { 2122 if (@{$self->{history} || []} > 0) {
1875 $self->{history_pointer}++; 2123 $self->{history_pointer}++;
… …
1877 $self->{history_pointer} = @{$self->{history} || []} - 1; 2125 $self->{history_pointer} = @{$self->{history} || []} - 1;
1878 } 2126 }
1879 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2127 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1880 } 2128 }
1881 2129
1882 } elsif ($sym == CFClient::SDLK_DOWN) { 2130 } elsif ($sym == CFPlus::SDLK_DOWN) {
1883 $self->{history_pointer}--; 2131 $self->{history_pointer}--;
1884 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2132 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1885 2133
1886 if ($self->{history_pointer} >= 0) { 2134 if ($self->{history_pointer} >= 0) {
1887 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2135 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1888 } else { 2136 } else {
1889 $self->set_text ($self->{history_saveback}); 2137 $self->set_text ($self->{history_saveback});
1890 } 2138 }
1891 2139
1892 } else { 2140 } else {
1893 return $self->SUPER::key_down ($ev) 2141 return $self->SUPER::invoke_key_down ($ev)
1894 } 2142 }
1895 2143
1896 1 2144 1
1897} 2145}
1898 2146
1899############################################################################# 2147#############################################################################
1900 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
1901package CFClient::UI::Button; 2188package CFPlus::UI::Button;
1902 2189
1903our @ISA = CFClient::UI::Label::; 2190our @ISA = CFPlus::UI::Label::;
1904 2191
1905use CFClient::OpenGL; 2192use CFPlus::OpenGL;
1906 2193
1907my @tex = 2194my @tex =
1908 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2195 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1909 qw(b1_button_active.png); 2196 qw(b1_button_active.png);
1910 2197
1911sub new { 2198sub new {
1912 my $class = shift; 2199 my $class = shift;
1913 2200
… …
1922 can_events => 1, 2209 can_events => 1,
1923 @_ 2210 @_
1924 ) 2211 )
1925} 2212}
1926 2213
1927sub activate { }
1928
1929sub button_up { 2214sub invoke_button_up {
1930 my ($self, $ev, $x, $y) = @_; 2215 my ($self, $ev, $x, $y) = @_;
1931 2216
1932 $self->emit ("activate") 2217 $self->emit ("activate")
1933 if $x >= 0 && $x < $self->{w} 2218 if $x >= 0 && $x < $self->{w}
1934 && $y >= 0 && $y < $self->{h}; 2219 && $y >= 0 && $y < $self->{h};
… …
1952 $self->SUPER::_draw; 2237 $self->SUPER::_draw;
1953} 2238}
1954 2239
1955############################################################################# 2240#############################################################################
1956 2241
1957package CFClient::UI::CheckBox; 2242package CFPlus::UI::CheckBox;
1958 2243
1959our @ISA = CFClient::UI::DrawBG::; 2244our @ISA = CFPlus::UI::DrawBG::;
1960 2245
1961my @tex = 2246my @tex =
1962 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2247 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1963 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2248 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1964 2249
1965use CFClient::OpenGL; 2250use CFPlus::OpenGL;
1966 2251
1967sub new { 2252sub new {
1968 my $class = shift; 2253 my $class = shift;
1969 2254
1970 $class->SUPER::new ( 2255 $class->SUPER::new (
… …
1984 my ($self) = @_; 2269 my ($self) = @_;
1985 2270
1986 (6) x 2 2271 (6) x 2
1987} 2272}
1988 2273
2274sub toggle {
2275 my ($self) = @_;
2276
2277 $self->{state} = !$self->{state};
2278 $self->emit (changed => $self->{state});
2279 $self->update;
2280}
2281
1989sub button_down { 2282sub invoke_button_down {
1990 my ($self, $ev, $x, $y) = @_; 2283 my ($self, $ev, $x, $y) = @_;
1991 2284
1992 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2285 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1993 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2286 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1994 $self->{state} = !$self->{state}; 2287 $self->toggle;
1995 $self->_emit (changed => $self->{state});
1996 } else { 2288 } else {
1997 return 0 2289 return 0
1998 } 2290 }
1999 2291
2000 1 2292 1
… …
2020 glDisable GL_TEXTURE_2D; 2312 glDisable GL_TEXTURE_2D;
2021} 2313}
2022 2314
2023############################################################################# 2315#############################################################################
2024 2316
2025package CFClient::UI::Image; 2317package CFPlus::UI::Image;
2026 2318
2027our @ISA = CFClient::UI::Base::; 2319our @ISA = CFPlus::UI::Base::;
2028 2320
2029use CFClient::OpenGL; 2321use CFPlus::OpenGL;
2030use Carp qw/confess/;
2031 2322
2032our %loaded_images; 2323our %texture_cache;
2033 2324
2034sub new { 2325sub new {
2035 my $class = shift; 2326 my $class = shift;
2036 2327
2037 my $self = $class->SUPER::new (can_events => 0, @_); 2328 my $self = $class->SUPER::new (
2329 can_events => 0,
2330 @_,
2331 );
2038 2332
2039 $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";
2040 2335
2041 $loaded_images{$self->{image}} ||= 2336 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2042 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;
2043 2338
2044 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2339 CFPlus::weaken $texture_cache{$self->{path}};
2045 2340
2046 Scalar::Util::weaken $loaded_images{$self->{image}}; 2341 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2047
2048 $self->{aspect} = $tex->{w} / $tex->{h};
2049 2342
2050 $self 2343 $self
2051} 2344}
2052 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
2053sub size_request { 2361sub size_request {
2054 my ($self) = @_; 2362 my ($self) = @_;
2055 2363
2056 ($self->{tex}->{w}, $self->{tex}->{h}) 2364 ($self->{tex}{w}, $self->{tex}{h})
2057} 2365}
2058 2366
2059sub _draw { 2367sub _draw {
2060 my ($self) = @_; 2368 my ($self) = @_;
2061 2369
… …
2071 } 2379 }
2072 2380
2073 glEnable GL_TEXTURE_2D; 2381 glEnable GL_TEXTURE_2D;
2074 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2382 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2075 2383
2076 $tex->draw_quad_alpha (0, 0, $w, $h); 2384 $tex->draw_quad (0, 0, $w, $h);
2077 2385
2078 glDisable GL_TEXTURE_2D; 2386 glDisable GL_TEXTURE_2D;
2079} 2387}
2080 2388
2081############################################################################# 2389#############################################################################
2082 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
2083package CFClient::UI::VGauge; 2427package CFPlus::UI::VGauge;
2084 2428
2085our @ISA = CFClient::UI::Base::; 2429our @ISA = CFPlus::UI::Base::;
2086 2430
2087use List::Util qw(min max); 2431use List::Util qw(min max);
2088 2432
2089use CFClient::OpenGL; 2433use CFPlus::OpenGL;
2090 2434
2091my %tex = ( 2435my %tex = (
2092 food => [ 2436 food => [
2093 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2437 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2094 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2438 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2095 ], 2439 ],
2096 grace => [ 2440 grace => [
2097 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2441 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2098 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/
2099 ], 2443 ],
2100 hp => [ 2444 hp => [
2101 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2445 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2446 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2103 ], 2447 ],
2104 mana => [ 2448 mana => [
2105 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2449 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2106 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/
2107 ], 2451 ],
2108); 2452);
2109 2453
2110# eg. VGauge->new (gauge => 'food'), default gauge: food 2454# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2170 my $ycut1 = max 0, min 1, $ycut; 2514 my $ycut1 = max 0, min 1, $ycut;
2171 my $ycut2 = max 0, min 1, $ycut - 1; 2515 my $ycut2 = max 0, min 1, $ycut - 1;
2172 2516
2173 my $h1 = $self->{h} * (1 - $ycut1); 2517 my $h1 = $self->{h} * (1 - $ycut1);
2174 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);
2175 2522
2176 glEnable GL_BLEND; 2523 glEnable GL_BLEND;
2177 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2524 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2178 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2525 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2179 glEnable GL_TEXTURE_2D; 2526 glEnable GL_TEXTURE_2D;
… …
2198 2545
2199 if ($t3) { 2546 if ($t3) {
2200 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2547 glBindTexture GL_TEXTURE_2D, $t3->{name};
2201 glBegin GL_QUADS; 2548 glBegin GL_QUADS;
2202 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2549 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2203 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2550 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2204 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2551 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2205 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2552 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2206 glEnd; 2553 glEnd;
2207 } 2554 }
2208 2555
2209 glDisable GL_BLEND; 2556 glDisable GL_BLEND;
2210 glDisable GL_TEXTURE_2D; 2557 glDisable GL_TEXTURE_2D;
2211} 2558}
2212 2559
2213############################################################################# 2560#############################################################################
2214 2561
2215package CFClient::UI::Gauge; 2562package CFPlus::UI::Gauge;
2216 2563
2217our @ISA = CFClient::UI::VBox::; 2564our @ISA = CFPlus::UI::VBox::;
2218 2565
2219sub new { 2566sub new {
2220 my ($class, %arg) = @_; 2567 my ($class, %arg) = @_;
2221 2568
2222 my $self = $class->SUPER::new ( 2569 my $self = $class->SUPER::new (
… …
2224 can_hover => 1, 2571 can_hover => 1,
2225 can_events => 1, 2572 can_events => 1,
2226 %arg, 2573 %arg,
2227 ); 2574 );
2228 2575
2229 $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");
2230 $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);
2231 $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");
2232 2579
2233 $self 2580 $self
2234} 2581}
2235 2582
2236sub set_fontsize { 2583sub set_fontsize {
… …
2257 $self->{value}->set_text ($val); 2604 $self->{value}->set_text ($val);
2258} 2605}
2259 2606
2260############################################################################# 2607#############################################################################
2261 2608
2262package CFClient::UI::Slider; 2609package CFPlus::UI::Slider;
2263 2610
2264use strict; 2611use strict;
2265 2612
2266use CFClient::OpenGL; 2613use CFPlus::OpenGL;
2267 2614
2268our @ISA = CFClient::UI::DrawBG::; 2615our @ISA = CFPlus::UI::DrawBG::;
2269 2616
2270my @tex = 2617my @tex =
2271 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2618 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2272 qw(s1_slider.png s1_slider_bg.png); 2619 qw(s1_slider.png s1_slider_bg.png);
2273 2620
2274sub new { 2621sub new {
2275 my $class = shift; 2622 my $class = shift;
2276 2623
… …
2297 $self->update; 2644 $self->update;
2298 2645
2299 $self 2646 $self
2300} 2647}
2301 2648
2302sub changed { }
2303
2304sub set_range { 2649sub set_range {
2305 my ($self, $range) = @_; 2650 my ($self, $range) = @_;
2306 2651
2307 ($range, $self->{range}) = ($self->{range}, $range); 2652 ($range, $self->{range}) = ($self->{range}, $range);
2308 2653
2309 $self->update
2310 if "@$range" ne "@{$self->{range}}"; 2654 if ("@$range" ne "@{$self->{range}}") {
2655 $self->update;
2656 $self->set_value ($self->{range}[0]);
2657 }
2311} 2658}
2312 2659
2313sub set_value { 2660sub set_value {
2314 my ($self, $value) = @_; 2661 my ($self, $value) = @_;
2315 2662
… …
2326 if $unit; 2673 if $unit;
2327 2674
2328 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2675 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2329 2676
2330 if ($value != $old_value) { 2677 if ($value != $old_value) {
2331 $self->_emit (changed => $value); 2678 $self->emit (changed => $value);
2332 $self->update; 2679 $self->update;
2333 } 2680 }
2334} 2681}
2335 2682
2336sub size_request { 2683sub size_request {
2337 my ($self) = @_; 2684 my ($self) = @_;
2338 2685
2339 ($self->{req_w}, $self->{req_h}) 2686 ($self->{req_w}, $self->{req_h})
2340} 2687}
2341 2688
2342sub button_down { 2689sub invoke_button_down {
2343 my ($self, $ev, $x, $y) = @_; 2690 my ($self, $ev, $x, $y) = @_;
2344 2691
2345 $self->SUPER::button_down ($ev, $x, $y); 2692 $self->SUPER::invoke_button_down ($ev, $x, $y);
2346 2693
2347 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2694 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2348 2695
2349 $self->mouse_motion ($ev, $x, $y) 2696 $self->invoke_mouse_motion ($ev, $x, $y)
2350} 2697}
2351 2698
2352sub mouse_motion { 2699sub invoke_mouse_motion {
2353 my ($self, $ev, $x, $y) = @_; 2700 my ($self, $ev, $x, $y) = @_;
2354 2701
2355 if ($GRAB == $self) { 2702 if ($GRAB == $self) {
2356 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2703 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2357 2704
… …
2363 } else { 2710 } else {
2364 return 0; 2711 return 0;
2365 } 2712 }
2366 2713
2367 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
2368} 2727}
2369 2728
2370sub update { 2729sub update {
2371 my ($self) = @_; 2730 my ($self) = @_;
2372 2731
… …
2421 glDisable GL_TEXTURE_2D; 2780 glDisable GL_TEXTURE_2D;
2422} 2781}
2423 2782
2424############################################################################# 2783#############################################################################
2425 2784
2426package CFClient::UI::ValSlider; 2785package CFPlus::UI::ValSlider;
2427 2786
2428our @ISA = CFClient::UI::HBox::; 2787our @ISA = CFPlus::UI::HBox::;
2429 2788
2430sub new { 2789sub new {
2431 my ($class, %arg) = @_; 2790 my ($class, %arg) = @_;
2432 2791
2433 my $range = delete $arg{range}; 2792 my $range = delete $arg{range};
2434 2793
2435 my $self = $class->SUPER::new ( 2794 my $self = $class->SUPER::new (
2436 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2795 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2437 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2796 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2438 to_value => sub { shift }, 2797 to_value => sub { shift },
2439 from_value => sub { shift }, 2798 from_value => sub { shift },
2440 %arg, 2799 %arg,
2441 ); 2800 );
2442 2801
… …
2462sub set_range { shift->{slider}->set_range (@_) } 2821sub set_range { shift->{slider}->set_range (@_) }
2463sub set_value { shift->{slider}->set_value (@_) } 2822sub set_value { shift->{slider}->set_value (@_) }
2464 2823
2465############################################################################# 2824#############################################################################
2466 2825
2467package CFClient::UI::TextView; 2826package CFPlus::UI::TextScroller;
2468 2827
2469our @ISA = CFClient::UI::HBox::; 2828our @ISA = CFPlus::UI::HBox::;
2470 2829
2471use CFClient::OpenGL; 2830use CFPlus::OpenGL;
2472 2831
2473sub new { 2832sub new {
2474 my $class = shift; 2833 my $class = shift;
2475 2834
2476 my $self = $class->SUPER::new ( 2835 my $self = $class->SUPER::new (
2477 fontsize => 1, 2836 fontsize => 1,
2478 can_events => 0, 2837 can_events => 1,
2479 indent => 0, 2838 indent => 0,
2480 #font => default_font 2839 #font => default_font
2481 @_, 2840 @_,
2482 2841
2483 layout => (new CFClient::Layout 1), 2842 layout => (new CFPlus::Layout),
2484 par => [], 2843 par => [],
2844 max_par => 0,
2485 height => 0, 2845 height => 0,
2486 children => [ 2846 children => [
2487 (new CFClient::UI::Empty expand => 1), 2847 (new CFPlus::UI::Empty expand => 1),
2488 (new CFClient::UI::Slider vertical => 1), 2848 (new CFPlus::UI::Slider vertical => 1),
2489 ], 2849 ],
2490 ); 2850 );
2491 2851
2492 $self->{children}[1]->connect (changed => sub { $self->update }); 2852 $self->{children}[1]->connect (changed => sub { $self->update });
2493 2853
… …
2499 2859
2500 $self->{fontsize} = $fontsize; 2860 $self->{fontsize} = $fontsize;
2501 $self->reflow; 2861 $self->reflow;
2502} 2862}
2503 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
2504sub size_allocate { 2873sub invoke_size_allocate {
2505 my ($self, $w, $h) = @_; 2874 my ($self, $w, $h) = @_;
2506 2875
2507 $self->SUPER::size_allocate ($w, $h); 2876 my ($empty, $slider, @other) = @{ $self->{children} };
2877 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2508 2878
2509 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2879 $self->{layout}->set_font ($self->{font}) if $self->{font};
2510 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2880 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2511 $self->{layout}->set_width ($self->{children}[0]{w}); 2881 $self->{layout}->set_width ($empty->{w});
2512 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2882 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2513 2883
2514 $self->reflow; 2884 $self->reflow;
2515}
2516 2885
2517sub text_size { 2886 local $self->{children} = [$empty, $slider];
2887 $self->SUPER::invoke_size_allocate ($w, $h)
2888}
2889
2890sub invoke_mouse_wheel {
2518 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) = @_;
2519 2902
2520 my $layout = $self->{layout}; 2903 my $layout = $self->{layout};
2521 2904
2905 $layout->set_font ($self->{font}) if $self->{font};
2906 $layout->set_foreground (@{$para->{fg}});
2522 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2907 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2523 $layout->set_width ($self->{children}[0]{w} - $indent); 2908 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2524 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2909 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2525 $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}}
2526 2916 );
2917
2527 $layout->size 2918 $layout
2528} 2919}
2529 2920
2530sub reflow { 2921sub reflow {
2531 my ($self) = @_; 2922 my ($self) = @_;
2532 2923
… …
2539 2930
2540 # todo: base offset on lines or so, not on pixels 2931 # todo: base offset on lines or so, not on pixels
2541 $self->{children}[1]->set_value ($offset); 2932 $self->{children}[1]->set_value ($offset);
2542} 2933}
2543 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
2544sub clear { 2950sub clear {
2545 my ($self) = @_; 2951 my ($self) = @_;
2952
2953 my (undef, undef, @other) = @{ $self->{children} };
2954 $self->remove ($_) for @other;
2546 2955
2547 $self->{par} = []; 2956 $self->{par} = [];
2548 $self->{height} = 0; 2957 $self->{height} = 0;
2549 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2958 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2550} 2959}
2551 2960
2552sub add_paragraph { 2961sub add_paragraph {
2553 my ($self, $color, $text, $indent) = @_; 2962 my $self = shift;
2554 2963
2555 for my $line (split /\n/, $text) { 2964 for my $para (@_) {
2556 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
2557 $self->{height} += $h; 3016 $self->{height} = $height;
2558 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3017 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2559 }
2560 3018
2561 $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 }
2562} 3025}
2563 3026
2564sub update { 3027sub update {
2565 my ($self) = @_; 3028 my ($self) = @_;
2566 3029
… …
2568 3031
2569 return unless $self->{h} > 0; 3032 return unless $self->{h} > 0;
2570 3033
2571 delete $self->{texture}; 3034 delete $self->{texture};
2572 3035
2573 $ROOT->on_post_alloc ($self, sub { 3036 $ROOT->on_post_alloc ($self => sub {
3037 $self->force_uptodate;
3038
2574 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3039 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2575 3040
2576 if (delete $self->{need_reflow}) {
2577 my $height = 0;
2578
2579 my $layout = $self->{layout};
2580
2581 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2582
2583 for (@{$self->{par}}) {
2584 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2585 $layout->set_width ($W - $_->[3]);
2586 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2587 $layout->set_markup ($_->[4]);
2588 my ($w, $h) = $layout->size;
2589 $_->[0] = $w + $_->[3];
2590 $_->[1] = $h;
2591 }
2592
2593 $height += $_->[1];
2594 }
2595
2596 $self->{height} = $height;
2597
2598 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2599
2600 delete $self->{texture};
2601 }
2602
2603 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3041 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2604 glClearColor 0, 0, 0, 0; 3042 glClearColor 0, 0, 0, 0;
2605 glClear GL_COLOR_BUFFER_BIT; 3043 glClear GL_COLOR_BUFFER_BIT;
2606 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;
2607 my $top = int $self->{children}[1]{range}[0]; 3053 my $top = int $self->{children}[1]{range}[0];
2608 3054
2609 my $y0 = $top; 3055 my $y0 = $top;
2610 my $y1 = $top + $H; 3056 my $y1 = $top + $H;
2611 3057
2612 my $y = 0;
2613
2614 my $layout = $self->{layout};
2615
2616 $layout->set_font ($self->{font}) if $self->{font};
2617
2618 glEnable GL_BLEND;
2619 #TODO# not correct in windows where rgba is forced off
2620 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2621
2622 for my $par (@{$self->{par}}) { 3058 for my $para (@{$self->{par}}) {
2623 my $h = $par->[1]; 3059 my $h = $para->{h};
3060 my $y = $para->{y};
2624 3061
2625 if ($y0 < $y + $h && $y < $y1) { 3062 if ($y0 < $y + $h && $y < $y1) {
2626 $layout->set_foreground (@{ $par->[2] }); 3063 my $layout = $self->get_layout ($para);
2627 $layout->set_width ($W - $par->[3]);
2628 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2629 $layout->set_markup ($par->[4]);
2630 3064
2631 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3065 $layout->render ($para->{indent}, $y - $y0);
2632 3066
2633 glRasterPos $par->[3], $y - $y0; 3067 if (my @w = @{ $para->{widget} }) {
2634 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 }
2635 } 3079 }
2636 3080
2637 $y += $h; 3081 $paridx++;
3082 $top_paragraph ||= $paridx if $y >= $top;
2638 } 3083 }
2639 3084
2640 glDisable GL_BLEND; 3085 $self->{top_paragraph} = $top_paragraph;
2641 }; 3086 };
2642 }); 3087 });
3088}
3089
3090sub reconfigure {
3091 my ($self) = @_;
3092
3093 $self->SUPER::reconfigure;
3094
3095 $_->{w} = 1e10 for @{ $self->{par} };
3096 $self->reflow;
2643} 3097}
2644 3098
2645sub _draw { 3099sub _draw {
2646 my ($self) = @_; 3100 my ($self) = @_;
2647 3101
… …
2650 glColor 0, 0, 0, 1; 3104 glColor 0, 0, 0, 1;
2651 $self->{texture}->draw_quad_alpha_premultiplied (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});
2652 glDisable GL_TEXTURE_2D; 3106 glDisable GL_TEXTURE_2D;
2653 3107
2654 $self->{children}[1]->draw; 3108 $self->{children}[1]->draw;
2655
2656} 3109}
2657 3110
2658############################################################################# 3111#############################################################################
2659 3112
2660package CFClient::UI::Animator; 3113package CFPlus::UI::Animator;
2661 3114
2662use CFClient::OpenGL; 3115use CFPlus::OpenGL;
2663 3116
2664our @ISA = CFClient::UI::Bin::; 3117our @ISA = CFPlus::UI::Bin::;
2665 3118
2666sub moveto { 3119sub moveto {
2667 my ($self, $x, $y) = @_; 3120 my ($self, $x, $y) = @_;
2668 3121
2669 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3122 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2697 glPopMatrix; 3150 glPopMatrix;
2698} 3151}
2699 3152
2700############################################################################# 3153#############################################################################
2701 3154
2702package CFClient::UI::Flopper; 3155package CFPlus::UI::Flopper;
2703 3156
2704our @ISA = CFClient::UI::Button::; 3157our @ISA = CFPlus::UI::Button::;
2705 3158
2706sub new { 3159sub new {
2707 my $class = shift; 3160 my $class = shift;
2708 3161
2709 my $self = $class->SUPER::new ( 3162 my $self = $class->SUPER::new (
… …
2721 $self->{other}->toggle_visibility; 3174 $self->{other}->toggle_visibility;
2722} 3175}
2723 3176
2724############################################################################# 3177#############################################################################
2725 3178
2726package CFClient::UI::Tooltip; 3179package CFPlus::UI::Tooltip;
2727 3180
2728our @ISA = CFClient::UI::Bin::; 3181our @ISA = CFPlus::UI::Bin::;
2729 3182
2730use CFClient::OpenGL; 3183use CFPlus::OpenGL;
2731 3184
2732sub new { 3185sub new {
2733 my $class = shift; 3186 my $class = shift;
2734 3187
2735 $class->SUPER::new ( 3188 $class->SUPER::new (
… …
2738 ) 3191 )
2739} 3192}
2740 3193
2741sub set_tooltip_from { 3194sub set_tooltip_from {
2742 my ($self, $widget) = @_; 3195 my ($self, $widget) = @_;
3196
3197 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3198 if $widget->{tooltip} =~ /^#(.*)$/;
2743 3199
2744 my $tooltip = $widget->{tooltip}; 3200 my $tooltip = $widget->{tooltip};
2745 3201
2746 if ($ENV{CFPLUS_DEBUG} & 2) { 3202 if ($ENV{CFPLUS_DEBUG} & 2) {
2747 $tooltip .= "\n\n" . (ref $widget) . "\n" 3203 $tooltip .= "\n\n" . (ref $widget) . "\n"
2748 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3204 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2749 . "req $widget->{req_w} $widget->{req_h}\n" 3205 . "req $widget->{req_w} $widget->{req_h}\n"
2750 . "visible $widget->{visible}"; 3206 . "visible $widget->{visible}";
2751 } 3207 }
2752 3208
3209 $tooltip =~ s/^\n+//;
3210 $tooltip =~ s/\n+$//;
3211
2753 $self->add (new CFClient::UI::Label 3212 $self->add (new CFPlus::UI::Label
2754 markup => $tooltip, 3213 markup => $tooltip,
2755 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3214 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2756 fontsize => 0.8, 3215 fontsize => 0.8,
2757 fg => [0, 0, 0, 1], 3216 style => 1, # FLAG_INVERSE
2758 ellipsise => 0, 3217 ellipsise => 0,
2759 font => ($widget->{tooltip_font} || $::FONT_PROP), 3218 font => ($widget->{tooltip_font} || $::FONT_PROP),
2760 ); 3219 );
2761} 3220}
2762 3221
… …
2766 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3225 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2767 3226
2768 ($w + 4, $h + 4) 3227 ($w + 4, $h + 4)
2769} 3228}
2770 3229
2771sub size_allocate { 3230sub invoke_size_allocate {
2772 my ($self, $w, $h) = @_; 3231 my ($self, $w, $h) = @_;
2773 3232
2774 $self->SUPER::size_allocate ($w - 4, $h - 4); 3233 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2775} 3234}
2776 3235
2777sub visibility_change { 3236sub invoke_visibility_change {
2778 my ($self, $visible) = @_; 3237 my ($self, $visible) = @_;
2779 3238
2780 return unless $visible; 3239 return unless $visible;
2781 3240
2782 $self->{root}->on_post_alloc ("move_$self" => sub { 3241 $self->{root}->on_post_alloc ("move_$self" => sub {
2783 my $widget = $self->{owner} 3242 my $widget = $self->{owner}
2784 or return; 3243 or return;
2785 3244
3245 if ($widget->{visible}) {
2786 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3246 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2787 3247
2788 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3248 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2789 if $x + $self->{w} > $::WIDTH; 3249 if $x + $self->{w} > $self->{root}{w};
2790 3250
2791 $self->move_abs ($x, $y); 3251 $self->move_abs ($x, $y);
3252 } else {
3253 $self->hide;
3254 }
2792 }); 3255 });
2793} 3256}
2794 3257
2795sub _draw { 3258sub _draw {
2796 my ($self) = @_; 3259 my ($self) = @_;
… …
2820 $self->SUPER::_draw; 3283 $self->SUPER::_draw;
2821} 3284}
2822 3285
2823############################################################################# 3286#############################################################################
2824 3287
2825package CFClient::UI::Face; 3288package CFPlus::UI::Face;
2826 3289
2827our @ISA = CFClient::UI::Base::; 3290our @ISA = CFPlus::UI::DrawBG::;
2828 3291
2829use CFClient::OpenGL; 3292use CFPlus::OpenGL;
2830 3293
2831sub new { 3294sub new {
2832 my $class = shift; 3295 my $class = shift;
2833 3296
2834 my $self = $class->SUPER::new ( 3297 my $self = $class->SUPER::new (
… …
2836 can_events => 0, 3299 can_events => 0,
2837 @_, 3300 @_,
2838 ); 3301 );
2839 3302
2840 if ($self->{anim} && $self->{animspeed}) { 3303 if ($self->{anim} && $self->{animspeed}) {
2841 Scalar::Util::weaken (my $widget = $self); 3304 CFPlus::weaken (my $widget = $self);
2842 3305
2843 $self->{timer} = Event->timer ( 3306 $self->{timer} = Event->timer (
2844 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3307 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2845 hard => 1, 3308 hard => 1,
2846 interval => $self->{animspeed}, 3309 interval => $self->{animspeed},
… …
2869sub _draw { 3332sub _draw {
2870 my ($self) = @_; 3333 my ($self) = @_;
2871 3334
2872 return unless $::CONN; 3335 return unless $::CONN;
2873 3336
3337 $self->SUPER::_draw;
3338
2874 my $face; 3339 my $face;
2875 3340
2876 if ($self->{frame}) { 3341 if ($self->{frame}) {
2877 my $anim = $::CONN->{anim}[$self->{anim}]; 3342 my $anim = $::CONN->{anim}[$self->{anim}];
2878 3343
… …
2889 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3354 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2890 glDisable GL_TEXTURE_2D; 3355 glDisable GL_TEXTURE_2D;
2891 } 3356 }
2892} 3357}
2893 3358
2894sub DESTROY { 3359sub destroy {
2895 my ($self) = @_; 3360 my ($self) = @_;
2896 3361
2897 $self->{timer}->cancel 3362 $self->{timer}->cancel
2898 if $self->{timer}; 3363 if $self->{timer};
2899 3364
2900 $self->SUPER::DESTROY; 3365 $self->SUPER::destroy;
2901} 3366}
2902 3367
2903############################################################################# 3368#############################################################################
2904 3369
2905package CFClient::UI::Buttonbar; 3370package CFPlus::UI::Buttonbar;
2906 3371
2907our @ISA = CFClient::UI::HBox::; 3372our @ISA = CFPlus::UI::HBox::;
2908 3373
2909# TODO: should actualyl wrap buttons and other goodies. 3374# TODO: should actually wrap buttons and other goodies.
2910 3375
2911############################################################################# 3376#############################################################################
2912 3377
2913package CFClient::UI::Menu; 3378package CFPlus::UI::Menu;
2914 3379
2915our @ISA = CFClient::UI::FancyFrame::; 3380our @ISA = CFPlus::UI::Toplevel::;
2916 3381
2917use CFClient::OpenGL; 3382use CFPlus::OpenGL;
2918 3383
2919sub new { 3384sub new {
2920 my $class = shift; 3385 my $class = shift;
2921 3386
2922 my $self = $class->SUPER::new ( 3387 my $self = $class->SUPER::new (
2923 items => [], 3388 items => [],
2924 z => 100, 3389 z => 100,
2925 @_, 3390 @_,
2926 ); 3391 );
2927 3392
2928 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3393 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2929 3394
2930 for my $item (@{ $self->{items} }) { 3395 for my $item (@{ $self->{items} }) {
2931 my ($widget, $cb, $tooltip) = @$item; 3396 my ($widget, $cb, $tooltip) = @$item;
2932 3397
2933 # handle various types of items, only text for now 3398 # handle various types of items, only text for now
2934 if (!ref $widget) { 3399 if (!ref $widget) {
3400 if ($widget =~ /\t/) {
3401 my ($left, $right) = split /\t/, $widget, 2;
3402
2935 $widget = new CFClient::UI::Label 3403 $widget = new CFPlus::UI::HBox
2936 can_hover => 1, 3404 can_hover => 1,
2937 can_events => 1, 3405 can_events => 1,
2938 text => $widget,
2939 tooltip => $tooltip 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,
3417 markup => $widget,
3418 tooltip => $tooltip;
3419 }
2940 } 3420 }
2941 3421
2942 $self->{item}{$widget} = $item; 3422 $self->{item}{$widget} = $item;
2943 3423
2944 $self->{vbox}->add ($widget); 3424 $self->{vbox}->add ($widget);
… …
2949 3429
2950# 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)
2951sub popup { 3431sub popup {
2952 my ($self, $ev) = @_; 3432 my ($self, $ev) = @_;
2953 3433
2954 $self->_emit ("popdown"); 3434 $self->emit ("popdown");
2955 3435
2956 # maybe save $GRAB? must be careful about events... 3436 # maybe save $GRAB? must be careful about events...
2957 $GRAB = $self; 3437 $GRAB = $self;
2958 $self->{button} = $ev->{button}; 3438 $self->{button} = $ev->{button};
2959 3439
2960 $self->show; 3440 $self->show;
2961 $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);
2962} 3442}
2963 3443
2964sub mouse_motion { 3444sub invoke_mouse_motion {
2965 my ($self, $ev, $x, $y) = @_; 3445 my ($self, $ev, $x, $y) = @_;
2966 3446
2967 # TODO: should use vbox->find_widget or so 3447 # TODO: should use vbox->find_widget or so
2968 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3448 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2969 $self->{hover} = $self->{item}{$HOVER}; 3449 $self->{hover} = $self->{item}{$HOVER};
2970 3450
2971 0 3451 0
2972} 3452}
2973 3453
2974sub button_up { 3454sub invoke_button_up {
2975 my ($self, $ev, $x, $y) = @_; 3455 my ($self, $ev, $x, $y) = @_;
2976 3456
2977 if ($ev->{button} == $self->{button}) { 3457 if ($ev->{button} == $self->{button}) {
2978 undef $GRAB; 3458 undef $GRAB;
2979 $self->hide; 3459 $self->hide;
2980 3460
2981 $self->_emit ("popdown"); 3461 $self->emit ("popdown");
2982 $self->{hover}[1]->() if $self->{hover}; 3462 $self->{hover}[1]->() if $self->{hover};
2983 } else { 3463 } else {
2984 return 0 3464 return 0
2985 } 3465 }
2986 3466
2987 1 3467 1
2988} 3468}
2989 3469
2990############################################################################# 3470#############################################################################
2991 3471
2992package CFClient::UI::Multiplexer; 3472package CFPlus::UI::Multiplexer;
2993 3473
2994our @ISA = CFClient::UI::Container::; 3474our @ISA = CFPlus::UI::Container::;
2995 3475
2996sub new { 3476sub new {
2997 my $class = shift; 3477 my $class = shift;
2998 3478
2999 my $self = $class->SUPER::new ( 3479 my $self = $class->SUPER::new (
… …
3013 3493
3014 $self->{current} = $self->{children}[0] 3494 $self->{current} = $self->{children}[0]
3015 if @{ $self->{children} }; 3495 if @{ $self->{children} };
3016} 3496}
3017 3497
3498sub get_current_page {
3499 my ($self) = @_;
3500
3501 $self->{current}
3502}
3503
3018sub set_current_page { 3504sub set_current_page {
3019 my ($self, $page_or_widget) = @_; 3505 my ($self, $page_or_widget) = @_;
3020 3506
3021 my $widget = ref $page_or_widget 3507 my $widget = ref $page_or_widget
3022 ? $page_or_widget 3508 ? $page_or_widget
3023 : $self->{children}[$page_or_widget]; 3509 : $self->{children}[$page_or_widget];
3024 3510
3025 $self->{current} = $widget; 3511 $self->{current} = $widget;
3026 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3512 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3027 3513
3028 $self->_emit (page_changed => $self->{current}); 3514 $self->emit (page_changed => $self->{current});
3029 3515
3030 $self->realloc; 3516 $self->realloc;
3031} 3517}
3032 3518
3033sub visible_children { 3519sub visible_children {
… …
3038 my ($self) = @_; 3524 my ($self) = @_;
3039 3525
3040 $self->{current}->size_request 3526 $self->{current}->size_request
3041} 3527}
3042 3528
3043sub size_allocate { 3529sub invoke_size_allocate {
3044 my ($self, $w, $h) = @_; 3530 my ($self, $w, $h) = @_;
3045 3531
3046 $self->{current}->configure (0, 0, $w, $h); 3532 $self->{current}->configure (0, 0, $w, $h);
3533
3534 1
3047} 3535}
3048 3536
3049sub _draw { 3537sub _draw {
3050 my ($self) = @_; 3538 my ($self) = @_;
3051 3539
3052 $self->{current}->draw; 3540 $self->{current}->draw;
3053} 3541}
3054 3542
3055############################################################################# 3543#############################################################################
3056 3544
3057package CFClient::UI::Notebook; 3545package CFPlus::UI::Notebook;
3058 3546
3059our @ISA = CFClient::UI::VBox::; 3547our @ISA = CFPlus::UI::VBox::;
3060 3548
3061sub new { 3549sub new {
3062 my $class = shift; 3550 my $class = shift;
3063 3551
3064 my $self = $class->SUPER::new ( 3552 my $self = $class->SUPER::new (
3065 buttonbar => (new CFClient::UI::Buttonbar), 3553 buttonbar => (new CFPlus::UI::Buttonbar),
3066 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3554 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3067 # filter => # will be put between multiplexer and $self 3555 # filter => # will be put between multiplexer and $self
3068 @_, 3556 @_,
3069 ); 3557 );
3070 3558
3071 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3559 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3075} 3563}
3076 3564
3077sub add { 3565sub add {
3078 my ($self, $title, $widget, $tooltip) = @_; 3566 my ($self, $title, $widget, $tooltip) = @_;
3079 3567
3080 Scalar::Util::weaken $self; 3568 CFPlus::weaken $self;
3081 3569
3082 $self->{buttonbar}->add (new CFClient::UI::Button 3570 $self->{buttonbar}->add (new CFPlus::UI::Button
3083 markup => $title, 3571 markup => $title,
3084 tooltip => $tooltip, 3572 tooltip => $tooltip,
3085 on_activate => sub { $self->set_current_page ($widget) }, 3573 on_activate => sub { $self->set_current_page ($widget) },
3086 ); 3574 );
3087 3575
3088 $self->{multiplexer}->add ($widget); 3576 $self->{multiplexer}->add ($widget);
3089} 3577}
3090 3578
3579sub get_current_page {
3580 my ($self) = @_;
3581
3582 $self->{multiplexer}->get_current_page
3583}
3584
3091sub set_current_page { 3585sub set_current_page {
3092 my ($self, $page) = @_; 3586 my ($self, $page) = @_;
3093 3587
3094 $self->{multiplexer}->set_current_page ($page); 3588 $self->{multiplexer}->set_current_page ($page);
3095 $self->_emit (page_changed => $self->{multiplexer}{current}); 3589 $self->emit (page_changed => $self->{multiplexer}{current});
3096} 3590}
3097 3591
3098############################################################################# 3592#############################################################################
3099 3593
3100package CFClient::UI::Combobox; 3594package CFPlus::UI::Selector;
3101 3595
3102use utf8; 3596use utf8;
3103 3597
3104our @ISA = CFClient::UI::Button::; 3598our @ISA = CFPlus::UI::Button::;
3105 3599
3106sub new { 3600sub new {
3107 my $class = shift; 3601 my $class = shift;
3108 3602
3109 my $self = $class->SUPER::new ( 3603 my $self = $class->SUPER::new (
3110 options => [], # [title, value, tooltip], ... 3604 options => [], # [value, title, longdesc], ...
3111 value => undef, 3605 value => undef,
3112 @_, 3606 @_,
3113 ); 3607 );
3114 3608
3115 $self->_set_value ($self->{value}); 3609 $self->_set_value ($self->{value});
3116 3610
3117 $self 3611 $self
3118} 3612}
3119 3613
3120sub button_down { 3614sub invoke_button_down {
3121 my ($self, $ev) = @_; 3615 my ($self, $ev) = @_;
3122 3616
3123 my @menu_items; 3617 my @menu_items;
3124 3618
3125 for (@{ $self->{options} }) { 3619 for (@{ $self->{options} }) {
3126 my ($title, $value, $tooltip) = @$_; 3620 my ($value, $title, $tooltip) = @$_;
3127 3621
3128 push @menu_items, [$tooltip, sub { $self->set_value ($value) }]; 3622 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3129 } 3623 }
3130 3624
3131 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3625 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3132} 3626}
3133 3627
3134sub _set_value { 3628sub _set_value {
3135 my ($self, $value) = @_; 3629 my ($self, $value) = @_;
3136 3630
3137 my ($item) = grep $_->[1] eq $value, @{ $self->{options} } 3631 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3138 or return; 3632 or return;
3139 3633
3140 $self->{value} = $item->[1]; 3634 $self->{value} = $item->[0];
3141 $self->set_markup ("$item->[0] ⇓"); 3635 $self->set_markup ("$item->[1] ⇓");
3142 $self->set_tooltip ($item->[2]); 3636 $self->set_tooltip ($item->[2]);
3143} 3637}
3144 3638
3145sub set_value { 3639sub set_value {
3146 my ($self, $value) = @_; 3640 my ($self, $value) = @_;
3147 3641
3148 return unless $self->{value} ne $value; 3642 return unless $self->{value} ne $value;
3149 3643
3150 $self->_set_value ($value); 3644 $self->_set_value ($value);
3151 $self->_emit (changed => $value); 3645 $self->emit (changed => $value);
3152} 3646}
3153 3647
3154############################################################################# 3648#############################################################################
3155 3649
3156package CFClient::UI::Statusbox; 3650package CFPlus::UI::Statusbox;
3157 3651
3158our @ISA = CFClient::UI::VBox::; 3652our @ISA = CFPlus::UI::VBox::;
3159 3653
3160sub new { 3654sub new {
3161 my $class = shift; 3655 my $class = shift;
3162 3656
3163 my $self = $class->SUPER::new ( 3657 my $self = $class->SUPER::new (
3164 fontsize => 0.8, 3658 fontsize => 0.8,
3165 @_, 3659 @_,
3166 ); 3660 );
3167 3661
3168 Scalar::Util::weaken (my $this = $self); 3662 CFPlus::weaken (my $this = $self);
3169 3663
3170 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3664 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3171 3665
3172 $self 3666 $self
3173} 3667}
… …
3175sub reorder { 3669sub reorder {
3176 my ($self) = @_; 3670 my ($self) = @_;
3177 my $NOW = Time::HiRes::time; 3671 my $NOW = Time::HiRes::time;
3178 3672
3179 # freeze display when hovering over any label 3673 # freeze display when hovering over any label
3180 return if $CFClient::UI::TOOLTIP->{owner} 3674 return if $CFPlus::UI::TOOLTIP->{owner}
3181 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3675 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3182 values %{ $self->{item} }; 3676 values %{ $self->{item} };
3183 3677
3184 while (my ($k, $v) = each %{ $self->{item} }) { 3678 while (my ($k, $v) = each %{ $self->{item} }) {
3185 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3679 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3186 } 3680 }
… …
3207 for ($short) { 3701 for ($short) {
3208 s/^\s+//; 3702 s/^\s+//;
3209 s/\s+/ /g; 3703 s/\s+/ /g;
3210 } 3704 }
3211 3705
3212 new CFClient::UI::Label 3706 new CFPlus::UI::Label
3213 markup => $short, 3707 markup => $short,
3214 tooltip => $item->{tooltip}, 3708 tooltip => $item->{tooltip},
3215 tooltip_font => $::FONT_PROP, 3709 tooltip_font => $::FONT_PROP,
3216 tooltip_width => 0.67, 3710 tooltip_width => 0.67,
3217 fontsize => $item->{fontsize} || $self->{fontsize}, 3711 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3255 $item->{count}++; 3749 $item->{count}++;
3256 } else { 3750 } else {
3257 $item->{count} = 1; 3751 $item->{count} = 1;
3258 $item->{text} = $item->{tooltip} = $text; 3752 $item->{text} = $item->{tooltip} = $text;
3259 } 3753 }
3260 $item->{id} = ++$self->{id}; 3754 $item->{id} += 0.2;#d#
3261 $item->{timeout} = $timeout; 3755 $item->{timeout} = $timeout;
3262 delete $item->{label}; 3756 delete $item->{label};
3263 } else { 3757 } else {
3264 $self->{item}{$group} = { 3758 $self->{item}{$group} = {
3265 id => ++$self->{id}, 3759 id => ++$self->{id},
… …
3271 count => 1, 3765 count => 1,
3272 %arg, 3766 %arg,
3273 }; 3767 };
3274 } 3768 }
3275 3769
3770 $ROOT->on_refresh (reorder => sub {
3276 $self->reorder; 3771 $self->reorder;
3772 });
3277} 3773}
3278 3774
3279sub reconfigure { 3775sub reconfigure {
3280 my ($self) = @_; 3776 my ($self) = @_;
3281 3777
… …
3284 3780
3285 $self->reorder; 3781 $self->reorder;
3286 $self->SUPER::reconfigure; 3782 $self->SUPER::reconfigure;
3287} 3783}
3288 3784
3289sub DESTROY { 3785sub destroy {
3290 my ($self) = @_; 3786 my ($self) = @_;
3291 3787
3292 $self->{timer}->cancel; 3788 $self->{timer}->cancel;
3293 3789
3294 $self->SUPER::DESTROY; 3790 $self->SUPER::destroy;
3295} 3791}
3296 3792
3297############################################################################# 3793#############################################################################
3298 3794
3299package CFClient::UI::Inventory;
3300
3301our @ISA = CFClient::UI::ScrolledWindow::;
3302
3303sub new {
3304 my $class = shift;
3305
3306 my $self = $class->SUPER::new (
3307 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3308 @_,
3309 );
3310
3311 $self
3312}
3313
3314sub set_items {
3315 my ($self, $items) = @_;
3316
3317 $self->{child}->clear;
3318 return unless $items;
3319
3320 my @items = sort {
3321 ($a->{type} <=> $b->{type})
3322 or ($a->{name} cmp $b->{name})
3323 } @$items;
3324
3325 $self->{real_items} = \@items;
3326
3327 my $row = 0;
3328 for my $item (@items) {
3329 CFClient::Item::update_widgets $item;
3330
3331 $self->{child}->add (0, $row, $item->{face_widget});
3332 $self->{child}->add (1, $row, $item->{desc_widget});
3333 $self->{child}->add (2, $row, $item->{weight_widget});
3334
3335 $row++;
3336 }
3337}
3338
3339#############################################################################
3340
3341package CFClient::UI::BindEditor;
3342
3343our @ISA = CFClient::UI::FancyFrame::;
3344
3345sub new {
3346 my $class = shift;
3347
3348 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3349
3350 $self->add (my $vb = new CFClient::UI::VBox);
3351
3352
3353 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3354 text => "start recording",
3355 tooltip => "Start/Stops recording of actions."
3356 ."All subsequent actions after the recording started will be captured."
3357 ."The actions are displayed after the record was stopped."
3358 ."To bind the action you have to click on the 'Bind' button",
3359 on_activate => sub {
3360 unless ($self->{recording}) {
3361 $self->start;
3362 } else {
3363 $self->stop;
3364 }
3365 });
3366
3367 $vb->add (new CFClient::UI::Label text => "Actions:");
3368 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3369
3370 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3371 $vb->add (my $hb = new CFClient::UI::HBox);
3372 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3373 $hb->add (new CFClient::UI::Button
3374 text => "bind",
3375 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3376 on_activate => sub {
3377 $self->ask_for_bind;
3378 });
3379
3380 $vb->add (my $hb = new CFClient::UI::HBox);
3381 $hb->add (new CFClient::UI::Button
3382 text => "ok",
3383 expand => 1,
3384 tooltip => "This closes the binding editor and saves the binding",
3385 on_activate => sub {
3386 $self->hide;
3387 $self->commit;
3388 });
3389
3390 $hb->add (new CFClient::UI::Button
3391 text => "cancel",
3392 expand => 1,
3393 tooltip => "This closes the binding editor without saving",
3394 on_activate => sub {
3395 $self->hide;
3396 $self->{binding_cancel}->()
3397 if $self->{binding_cancel};
3398 });
3399
3400 $self->update_binding_widgets;
3401
3402 $self
3403}
3404
3405sub commit {
3406 my ($self) = @_;
3407 my ($mod, $sym, $cmds) = $self->get_binding;
3408 if ($sym != 0 && @$cmds > 0) {
3409 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3410 ."'. Don't forget 'Save Config'!");
3411 $self->{binding_change}->($mod, $sym, $cmds)
3412 if $self->{binding_change};
3413 } else {
3414 $::STATUSBOX->add ("No action bound, no key or action specified!");
3415 $self->{binding_cancel}->()
3416 if $self->{binding_cancel};
3417 }
3418}
3419
3420sub start {
3421 my ($self) = @_;
3422
3423 $self->{rec_btn}->set_text ("stop recording");
3424 $self->{recording} = 1;
3425 $self->clear_command_list;
3426 $::CONN->start_record if $::CONN;
3427}
3428
3429sub stop {
3430 my ($self) = @_;
3431
3432 $self->{rec_btn}->set_text ("start recording");
3433 $self->{recording} = 0;
3434
3435 my $rec;
3436 $rec = $::CONN->stop_record if $::CONN;
3437 return unless ref $rec eq 'ARRAY';
3438 $self->set_command_list ($rec);
3439}
3440
3441
3442sub ask_for_bind_and_commit {
3443 my ($self) = @_;
3444 $self->ask_for_bind (1);
3445}
3446
3447sub ask_for_bind {
3448 my ($self, $commit) = @_;
3449
3450 CFClient::Binder::open_binding_dialog (sub {
3451 my ($mod, $sym) = @_;
3452 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3453 $self->update_binding_widgets;
3454 $self->commit if $commit;
3455 });
3456}
3457
3458# $mod and $sym are the modifiers and key symbol
3459# $cmds is a array ref of strings (the commands)
3460# $cb is the callback that is executed on OK
3461# $ccb is the callback that is executed on CANCEL and
3462# when the binding was unsuccessful on OK
3463sub set_binding {
3464 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3465
3466 $self->clear_command_list;
3467 $self->{recording} = 0;
3468 $self->{rec_btn}->set_text ("start recording");
3469
3470 $self->{binding} = [$mod, $sym];
3471 $self->{commands} = $cmds;
3472
3473 $self->{binding_change} = $cb;
3474 $self->{binding_cancel} = $ccb;
3475
3476 $self->update_binding_widgets;
3477}
3478
3479# this is a shortcut method that asks for a binding
3480# and then just binds it.
3481sub do_quick_binding {
3482 my ($self, $cmds) = @_;
3483 $self->set_binding (undef, undef, $cmds, sub {
3484 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3485 });
3486 $self->ask_for_bind (1);
3487}
3488
3489sub update_binding_widgets {
3490 my ($self) = @_;
3491 my ($mod, $sym, $cmds) = $self->get_binding;
3492 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3493 $self->set_command_list ($cmds);
3494}
3495
3496sub get_binding {
3497 my ($self) = @_;
3498 return (
3499 $self->{binding}->[0],
3500 $self->{binding}->[1],
3501 [ grep { defined $_ } @{$self->{commands}} ]
3502 );
3503}
3504
3505sub clear_command_list {
3506 my ($self) = @_;
3507 $self->{cmdbox}->clear ();
3508}
3509
3510sub set_command_list {
3511 my ($self, $cmds) = @_;
3512
3513 $self->{cmdbox}->clear ();
3514 $self->{commands} = $cmds;
3515
3516 my $idx = 0;
3517
3518 for (@$cmds) {
3519 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3520
3521 my $i = $idx;
3522 $hb->add (new CFClient::UI::Label text => $_);
3523 $hb->add (new CFClient::UI::Button
3524 text => "delete",
3525 tooltip => "Deletes the action from the record",
3526 on_activate => sub {
3527 $self->{cmdbox}->remove ($hb);
3528 $cmds->[$i] = undef;
3529 });
3530
3531
3532 $idx++
3533 }
3534}
3535
3536#############################################################################
3537
3538package CFClient::UI::SpellList;
3539
3540our @ISA = CFClient::UI::Table::;
3541
3542sub new {
3543 my $class = shift;
3544
3545 my $self = $class->SUPER::new (
3546 binding => [],
3547 commands => [],
3548 @_,
3549 )
3550}
3551
3552my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3553 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3554my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3555 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3556my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3557 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3558
3559sub rebuild_spell_list {
3560 my ($self) = @_;
3561
3562 $CFClient::UI::ROOT->on_refresh ($self => sub {
3563 $self->clear;
3564
3565 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3566 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3567 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3568 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3569
3570 my $row = 0;
3571
3572 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3573 my $spell = $self->{spell}{$_};
3574
3575 $row++;
3576
3577 $self->add (0, $row, new CFClient::UI::Face
3578 face => $spell->{face},
3579 can_hover => 1,
3580 can_events => 1,
3581 tooltip => $spell->{message},
3582 );
3583
3584 $self->add (1, $row, new CFClient::UI::Label
3585 expand => 1,
3586 text => $spell->{name},
3587 can_hover => 1,
3588 can_events => 1,
3589 tooltip => $spell->{message},
3590 );
3591
3592 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3593 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3594 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3595
3596 # TODO: should be done via popup
3597 $self->add (5, $row, new CFClient::UI::Button
3598 text => "bind",
3599 tooltip => "bind spell readying (cast command) to key",
3600 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3601 );
3602 }
3603 });
3604}
3605
3606sub add_spell {
3607 my ($self, $spell) = @_;
3608
3609 $self->{spell}->{$spell->{name}} = $spell;
3610 $self->rebuild_spell_list;
3611}
3612
3613sub remove_spell {
3614 my ($self, $spell) = @_;
3615
3616 delete $self->{spell}->{$spell->{name}};
3617 $self->rebuild_spell_list;
3618}
3619
3620#############################################################################
3621
3622package CFClient::UI::Root; 3795package CFPlus::UI::Root;
3623 3796
3624our @ISA = CFClient::UI::Container::; 3797our @ISA = CFPlus::UI::Container::;
3625 3798
3626use List::Util qw(min max); 3799use List::Util qw(min max);
3627 3800
3628use CFClient::OpenGL; 3801use CFPlus::OpenGL;
3629 3802
3630sub new { 3803sub new {
3631 my $class = shift; 3804 my $class = shift;
3632 3805
3633 my $self = $class->SUPER::new ( 3806 my $self = $class->SUPER::new (
3634 visible => 1, 3807 visible => 1,
3635 @_, 3808 @_,
3636 ); 3809 );
3637 3810
3638 Scalar::Util::weaken ($self->{root} = $self); 3811 CFPlus::weaken ($self->{root} = $self);
3639 3812
3640 $self 3813 $self
3641} 3814}
3642 3815
3643sub size_request { 3816sub size_request {
… …
3658 $coord = $max - $size if $coord > $max - $size; 3831 $coord = $max - $size if $coord > $max - $size;
3659 3832
3660 int $coord + 0.5 3833 int $coord + 0.5
3661} 3834}
3662 3835
3663sub size_allocate { 3836sub invoke_size_allocate {
3664 my ($self, $w, $h) = @_; 3837 my ($self, $w, $h) = @_;
3665 3838
3666 for my $child ($self->children) { 3839 for my $child ($self->children) {
3667 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)};
3668 3841
… …
3672 $X = _to_pixel $X, $W, $self->{w}; 3845 $X = _to_pixel $X, $W, $self->{w};
3673 $Y = _to_pixel $Y, $H, $self->{h}; 3846 $Y = _to_pixel $Y, $H, $self->{h};
3674 3847
3675 $child->configure ($X, $Y, $W, $H); 3848 $child->configure ($X, $Y, $W, $H);
3676 } 3849 }
3850
3851 1
3677} 3852}
3678 3853
3679sub coord2local { 3854sub coord2local {
3680 my ($self, $x, $y) = @_; 3855 my ($self, $x, $y) = @_;
3681 3856
… …
3807 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3982 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3808 3983
3809 $w = 0 if $w < 0; 3984 $w = 0 if $w < 0;
3810 $h = 0 if $h < 0; 3985 $h = 0 if $h < 0;
3811 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};
3995
3812 $w = int $w + 0.5; 3996 $w = int $w + 0.5;
3813 $h = int $h + 0.5; 3997 $h = int $h + 0.5;
3814 3998
3815 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}) {
3816 $widget->{old_w} = $widget->{w}; 4000 $widget->{old_w} = $widget->{w};
… …
3839 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4023 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3840 glMatrixMode GL_MODELVIEW; 4024 glMatrixMode GL_MODELVIEW;
3841 glLoadIdentity; 4025 glLoadIdentity;
3842 4026
3843 { 4027 {
3844 package CFClient::UI::Base; 4028 package CFPlus::UI::Base;
3845 4029
3846 ($draw_x, $draw_y, $draw_w, $draw_h) = 4030 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3847 (0, 0, $self->{w}, $self->{h}); 4031 (0, 0, $self->{w}, $self->{h});
3848 }
3849 4032
3850 $self->_draw; 4033 $self->_draw;
4034 }
3851} 4035}
3852 4036
3853############################################################################# 4037#############################################################################
3854 4038
3855package CFClient::UI; 4039package CFPlus::UI;
3856 4040
3857$ROOT = new CFClient::UI::Root; 4041$ROOT = new CFPlus::UI::Root;
3858$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4042$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3859 4043
38601 40441
3861 4045

Diff Legend

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