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.284 by root, Mon Jun 5 03:06:04 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;
… …
18our $BUTTON_STATE; 18our $BUTTON_STATE;
19 19
20our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21 21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 return if $ENV{CFPLUS_DEBUG} & 8;
24
25 if (!$GRAB) { 23 if (!$GRAB) {
26 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
27 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
28 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
29 $TOOLTIP->hide; 28 $TOOLTIP->hide;
30 29
31 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32
33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
35 $tip = $tip->($widget) if CODE:: eq ref $tip; 37 $tip = $tip->($widget) if CODE:: eq ref $tip;
36 38
… …
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);
1788
1559 delete $self->{req_h}; 1789 delete $self->{size_req};
1560
1561 $self->realloc; 1790 $self->realloc;
1562 $self->update; 1791 $self->update;
1563} 1792}
1564 1793
1565sub set_markup { 1794sub set_markup {
… …
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);
1803
1575 delete $self->{req_h}; 1804 delete $self->{size_req};
1576
1577 $self->realloc; 1805 $self->realloc;
1578 $self->update; 1806 $self->update;
1579} 1807}
1580 1808
1581sub size_request { 1809sub size_request {
1582 my ($self) = @_; 1810 my ($self) = @_;
1583 1811
1584 if (exists $self->{req_h}) { 1812 $self->{size_req} ||= do {
1585 @$self{qw(req_w req_h)}
1586 } else {
1587 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1813 $self->{layout}->set_font ($self->{font}) if $self->{font};
1588 $self->{layout}->set_width ($self->{max_w} || -1); 1814 $self->{layout}->set_width ($self->{max_w} || -1);
1589 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1815 $self->{layout}->set_ellipsise ($self->{ellipsise});
1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1816 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1817 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592 1818
1593 my ($w, $h) = $self->{layout}->size; 1819 my ($w, $h) = $self->{layout}->size;
1594 1820
1595 if (exists $self->{template}) { 1821 if (exists $self->{template}) {
1596 $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);
1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1824 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 1825
1599 my ($w2, $h2) = $self->{template}->size; 1826 my ($w2, $h2) = $self->{template}->size;
1600 1827
1601 $w = List::Util::max $w, $w2; 1828 $w = List::Util::max $w, $w2;
1602 $h = List::Util::max $h, $h2; 1829 $h = List::Util::max $h, $h2;
1603 } 1830 }
1604 1831
1605 ($w, $h) 1832 [$w, $h]
1606 } 1833 };
1607}
1608 1834
1835 @{ $self->{size_req} }
1836}
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
1863sub reconfigure {
1864 my ($self) = @_;
1865
1866 delete $self->{size_req};
1867 delete $self->{texture};
1868
1869 $self->SUPER::reconfigure;
1870}
1871
1627sub _draw { 1872sub _draw {
1628 my ($self) = @_; 1873 my ($self) = @_;
1629 1874
1630 $self->SUPER::_draw; # draw background, if applicable 1875 $self->SUPER::_draw; # draw background, if applicable
1631 1876
1632 my $tex = $self->{texture} ||= do { 1877 my $size = $self->{texture} ||= do {
1633 $self->{layout}->set_foreground (@{$self->{fg}}); 1878 $self->{layout}->set_foreground (@{$self->{fg}});
1634 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1879 $self->{layout}->set_font ($self->{font}) if $self->{font};
1635 $self->{layout}->set_width ($self->{w}); 1880 $self->{layout}->set_width ($self->{w});
1636 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1881 $self->{layout}->set_ellipsise ($self->{ellipsise});
1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1882 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1883 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639 1884
1640 new_from_layout CFClient::Texture $self->{layout} 1885 [$self->{layout}->size]
1641 }; 1886 };
1642 1887
1643 unless (exists $self->{ox}) { 1888 unless (exists $self->{ox}) {
1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1889 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1890 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1646 : ($self->{w} - $tex->{w}) * 0.5); 1891 : ($self->{w} - $size->[0]) * 0.5);
1647 1892
1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1893 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1894 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1650 : ($self->{h} - $tex->{h}) * 0.5); 1895 : ($self->{h} - $size->[1]) * 0.5);
1651 }; 1896 };
1652 1897
1653 glEnable GL_TEXTURE_2D; 1898 my $w = List::Util::min $self->{w} + 4, $size->[0];
1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1899 my $h = List::Util::min $self->{h} + 2, $size->[1];
1655 1900
1656 glColor_premultiply @{$self->{fg}} 1901 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1657 if $tex->{format} == GL_ALPHA;
1658
1659 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1660
1661 glDisable GL_TEXTURE_2D;
1662} 1902}
1663 1903
1664############################################################################# 1904#############################################################################
1665 1905
1666package CFClient::UI::EntryBase; 1906package CFPlus::UI::EntryBase;
1667 1907
1668our @ISA = CFClient::UI::Label::; 1908our @ISA = CFPlus::UI::Label::;
1669 1909
1670use CFClient::OpenGL; 1910use CFPlus::OpenGL;
1671 1911
1672sub new { 1912sub new {
1673 my $class = shift; 1913 my $class = shift;
1674 1914
1675 $class->SUPER::new ( 1915 $class->SUPER::new (
… …
1679 active_fg => [0, 0, 0], 1919 active_fg => [0, 0, 0],
1680 can_hover => 1, 1920 can_hover => 1,
1681 can_focus => 1, 1921 can_focus => 1,
1682 valign => 0, 1922 valign => 0,
1683 can_events => 1, 1923 can_events => 1,
1924 ellipsise => 0,
1684 #text => ... 1925 #text => ...
1926 #hidden => "*",
1685 @_ 1927 @_
1686 ) 1928 )
1687} 1929}
1688 1930
1689sub _set_text { 1931sub _set_text {
… …
1696 $self->{last_activity} = $::NOW; 1938 $self->{last_activity} = $::NOW;
1697 $self->{text} = $text; 1939 $self->{text} = $text;
1698 1940
1699 $text =~ s/./*/g if $self->{hidden}; 1941 $text =~ s/./*/g if $self->{hidden};
1700 $self->{layout}->set_text ("$text "); 1942 $self->{layout}->set_text ("$text ");
1701 delete $self->{req_h}; 1943 delete $self->{size_req};
1702 1944
1703 $self->_emit (changed => $self->{text}); 1945 $self->emit (changed => $self->{text});
1704 1946
1705 $self->realloc; 1947 $self->realloc;
1706 $self->update; 1948 $self->update;
1707} 1949}
1708 1950
… …
1723 my ($w, $h) = $self->SUPER::size_request; 1965 my ($w, $h) = $self->SUPER::size_request;
1724 1966
1725 ($w + 1, $h) # add 1 for cursor 1967 ($w + 1, $h) # add 1 for cursor
1726} 1968}
1727 1969
1728sub key_down { 1970sub invoke_key_down {
1729 my ($self, $ev) = @_; 1971 my ($self, $ev) = @_;
1730 1972
1731 my $mod = $ev->{mod}; 1973 my $mod = $ev->{mod};
1732 my $sym = $ev->{sym}; 1974 my $sym = $ev->{sym};
1733 my $uni = $ev->{unicode}; 1975 my $uni = $ev->{unicode};
1734 1976
1735 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;
1736 1980
1737 if ($uni == 8) { 1981 if ($uni == 8) {
1738 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1982 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1739 } elsif ($uni == 127) { 1983 } elsif ($uni == 127) {
1740 substr $text, $self->{cursor}, 1, ""; 1984 substr $text, $self->{cursor}, 1, "";
1741 } elsif ($sym == CFClient::SDLK_LEFT) { 1985 } elsif ($sym == CFPlus::SDLK_LEFT) {
1742 --$self->{cursor} if $self->{cursor}; 1986 --$self->{cursor} if $self->{cursor};
1743 } elsif ($sym == CFClient::SDLK_RIGHT) { 1987 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1744 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1988 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1745 } 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 = "";
1746 $self->{cursor} = 0; 2003 $self->{cursor} = 0;
1747 } elsif ($sym == CFClient::SDLK_END) {
1748 $self->{cursor} = length $text;
1749 } elsif ($uni == 27) { 2004 } elsif ($uni == 27) {
1750 $self->_emit ('escape'); 2005 $self->emit ('escape');
1751 } elsif ($uni) { 2006 } elsif ($uni == 0x0d) {
2007 substr $text, $self->{cursor}++, 0, "\012";
2008 } elsif ($uni >= 0x20) {
1752 substr $text, $self->{cursor}++, 0, chr $uni; 2009 substr $text, $self->{cursor}++, 0, chr $uni;
1753 } else { 2010 } else {
1754 return 0; 2011 return 0;
1755 } 2012 }
1756 2013
1757 $self->_set_text ($text); 2014 $self->_set_text ($text);
1758 2015
1759 $self->realloc; 2016 $self->realloc;
2017 $self->update;
1760 2018
1761 1 2019 1
1762} 2020}
1763 2021
1764sub focus_in { 2022sub invoke_focus_in {
1765 my ($self) = @_; 2023 my ($self) = @_;
1766 2024
1767 $self->{last_activity} = $::NOW; 2025 $self->{last_activity} = $::NOW;
1768 2026
1769 $self->SUPER::focus_in; 2027 $self->SUPER::invoke_focus_in
1770} 2028}
1771 2029
1772sub button_down { 2030sub invoke_button_down {
1773 my ($self, $ev, $x, $y) = @_; 2031 my ($self, $ev, $x, $y) = @_;
1774 2032
1775 $self->SUPER::button_down ($ev, $x, $y); 2033 $self->SUPER::invoke_button_down ($ev, $x, $y);
1776 2034
1777 my $idx = $self->{layout}->xy_to_index ($x, $y); 2035 my $idx = $self->{layout}->xy_to_index ($x, $y);
1778 2036
1779 # byte-index to char-index 2037 # byte-index to char-index
1780 my $text = $self->{text}; 2038 my $text = $self->{text};
1781 utf8::encode $text; 2039 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1782 $self->{cursor} = length substr $text, 0, $idx; 2040 $self->{cursor} = length $text;
1783 2041
1784 $self->_set_text ($self->{text}); 2042 $self->_set_text ($self->{text});
1785 $self->update; 2043 $self->update;
1786 2044
1787 1 2045 1
1788} 2046}
1789 2047
1790sub mouse_motion { 2048sub invoke_mouse_motion {
1791 my ($self, $ev, $x, $y) = @_; 2049 my ($self, $ev, $x, $y) = @_;
1792# 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#
1793 2051
1794 0 2052 1
1795} 2053}
1796 2054
1797sub _draw { 2055sub _draw {
1798 my ($self) = @_; 2056 my ($self) = @_;
1799 2057
… …
1826 utf8::encode $text; 2084 utf8::encode $text;
1827 2085
1828 @$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)
1829 } 2087 }
1830 2088
1831 glColor @{$self->{fg}};
1832 glBegin GL_LINES; 2089 glBegin GL_LINES;
1833 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};
1834 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};
1835 glEnd; 2092 glEnd;
1836 } 2093 }
1837} 2094}
1838 2095
2096#############################################################################
2097
1839package CFClient::UI::Entry; 2098package CFPlus::UI::Entry;
1840 2099
1841our @ISA = CFClient::UI::EntryBase::; 2100our @ISA = CFPlus::UI::EntryBase::;
1842 2101
1843use CFClient::OpenGL; 2102use CFPlus::OpenGL;
1844 2103
1845sub key_down { 2104sub invoke_key_down {
1846 my ($self, $ev) = @_; 2105 my ($self, $ev) = @_;
1847 2106
1848 my $sym = $ev->{sym}; 2107 my $sym = $ev->{sym};
1849 2108
1850 if ($sym == 13) { 2109 if ($ev->{uni} == 0x0d || $sym == 13) {
1851 unshift @{$self->{history}}, 2110 unshift @{$self->{history}},
1852 my $txt = $self->get_text; 2111 my $txt = $self->get_text;
2112
1853 $self->{history_pointer} = -1; 2113 $self->{history_pointer} = -1;
1854 $self->{history_saveback} = ''; 2114 $self->{history_saveback} = '';
1855 $self->_emit (activate => $txt); 2115 $self->emit (activate => $txt);
1856 $self->update; 2116 $self->update;
1857 2117
1858 } elsif ($sym == CFClient::SDLK_UP) { 2118 } elsif ($sym == CFPlus::SDLK_UP) {
1859 if ($self->{history_pointer} < 0) { 2119 if ($self->{history_pointer} < 0) {
1860 $self->{history_saveback} = $self->get_text; 2120 $self->{history_saveback} = $self->get_text;
1861 } 2121 }
1862 if (@{$self->{history} || []} > 0) { 2122 if (@{$self->{history} || []} > 0) {
1863 $self->{history_pointer}++; 2123 $self->{history_pointer}++;
… …
1865 $self->{history_pointer} = @{$self->{history} || []} - 1; 2125 $self->{history_pointer} = @{$self->{history} || []} - 1;
1866 } 2126 }
1867 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2127 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1868 } 2128 }
1869 2129
1870 } elsif ($sym == CFClient::SDLK_DOWN) { 2130 } elsif ($sym == CFPlus::SDLK_DOWN) {
1871 $self->{history_pointer}--; 2131 $self->{history_pointer}--;
1872 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2132 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1873 2133
1874 if ($self->{history_pointer} >= 0) { 2134 if ($self->{history_pointer} >= 0) {
1875 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2135 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1876 } else { 2136 } else {
1877 $self->set_text ($self->{history_saveback}); 2137 $self->set_text ($self->{history_saveback});
1878 } 2138 }
1879 2139
1880 } else { 2140 } else {
1881 return $self->SUPER::key_down ($ev) 2141 return $self->SUPER::invoke_key_down ($ev)
1882 } 2142 }
1883 2143
1884 1 2144 1
1885} 2145}
1886 2146
1887############################################################################# 2147#############################################################################
1888 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
1889package CFClient::UI::Button; 2188package CFPlus::UI::Button;
1890 2189
1891our @ISA = CFClient::UI::Label::; 2190our @ISA = CFPlus::UI::Label::;
1892 2191
1893use CFClient::OpenGL; 2192use CFPlus::OpenGL;
1894 2193
1895my @tex = 2194my @tex =
1896 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2195 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1897 qw(b1_button_active.png); 2196 qw(b1_button_active.png);
1898 2197
1899sub new { 2198sub new {
1900 my $class = shift; 2199 my $class = shift;
1901 2200
… …
1910 can_events => 1, 2209 can_events => 1,
1911 @_ 2210 @_
1912 ) 2211 )
1913} 2212}
1914 2213
1915sub activate { }
1916
1917sub button_up { 2214sub invoke_button_up {
1918 my ($self, $ev, $x, $y) = @_; 2215 my ($self, $ev, $x, $y) = @_;
1919 2216
1920 $self->emit ("activate") 2217 $self->emit ("activate")
1921 if $x >= 0 && $x < $self->{w} 2218 if $x >= 0 && $x < $self->{w}
1922 && $y >= 0 && $y < $self->{h}; 2219 && $y >= 0 && $y < $self->{h};
… …
1940 $self->SUPER::_draw; 2237 $self->SUPER::_draw;
1941} 2238}
1942 2239
1943############################################################################# 2240#############################################################################
1944 2241
1945package CFClient::UI::CheckBox; 2242package CFPlus::UI::CheckBox;
1946 2243
1947our @ISA = CFClient::UI::DrawBG::; 2244our @ISA = CFPlus::UI::DrawBG::;
1948 2245
1949my @tex = 2246my @tex =
1950 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2247 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1951 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2248 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1952 2249
1953use CFClient::OpenGL; 2250use CFPlus::OpenGL;
1954 2251
1955sub new { 2252sub new {
1956 my $class = shift; 2253 my $class = shift;
1957 2254
1958 $class->SUPER::new ( 2255 $class->SUPER::new (
… …
1972 my ($self) = @_; 2269 my ($self) = @_;
1973 2270
1974 (6) x 2 2271 (6) x 2
1975} 2272}
1976 2273
2274sub toggle {
2275 my ($self) = @_;
2276
2277 $self->{state} = !$self->{state};
2278 $self->emit (changed => $self->{state});
2279 $self->update;
2280}
2281
1977sub button_down { 2282sub invoke_button_down {
1978 my ($self, $ev, $x, $y) = @_; 2283 my ($self, $ev, $x, $y) = @_;
1979 2284
1980 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2285 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1981 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2286 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1982 $self->{state} = !$self->{state}; 2287 $self->toggle;
1983 $self->_emit (changed => $self->{state});
1984 } else { 2288 } else {
1985 return 0 2289 return 0
1986 } 2290 }
1987 2291
1988 1 2292 1
… …
2008 glDisable GL_TEXTURE_2D; 2312 glDisable GL_TEXTURE_2D;
2009} 2313}
2010 2314
2011############################################################################# 2315#############################################################################
2012 2316
2013package CFClient::UI::Image; 2317package CFPlus::UI::Image;
2014 2318
2015our @ISA = CFClient::UI::Base::; 2319our @ISA = CFPlus::UI::Base::;
2016 2320
2017use CFClient::OpenGL; 2321use CFPlus::OpenGL;
2018use Carp qw/confess/;
2019 2322
2020our %loaded_images; 2323our %texture_cache;
2021 2324
2022sub new { 2325sub new {
2023 my $class = shift; 2326 my $class = shift;
2024 2327
2025 my $self = $class->SUPER::new (can_events => 0, @_); 2328 my $self = $class->SUPER::new (
2329 can_events => 0,
2330 @_,
2331 );
2026 2332
2027 $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";
2028 2335
2029 $loaded_images{$self->{image}} ||= 2336 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2030 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;
2031 2338
2032 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2339 CFPlus::weaken $texture_cache{$self->{path}};
2033 2340
2034 Scalar::Util::weaken $loaded_images{$self->{image}}; 2341 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2035
2036 $self->{aspect} = $tex->{w} / $tex->{h};
2037 2342
2038 $self 2343 $self
2039} 2344}
2040 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
2041sub size_request { 2361sub size_request {
2042 my ($self) = @_; 2362 my ($self) = @_;
2043 2363
2044 ($self->{tex}->{w}, $self->{tex}->{h}) 2364 ($self->{tex}{w}, $self->{tex}{h})
2045} 2365}
2046 2366
2047sub _draw { 2367sub _draw {
2048 my ($self) = @_; 2368 my ($self) = @_;
2049 2369
… …
2059 } 2379 }
2060 2380
2061 glEnable GL_TEXTURE_2D; 2381 glEnable GL_TEXTURE_2D;
2062 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2382 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2063 2383
2064 $tex->draw_quad_alpha (0, 0, $w, $h); 2384 $tex->draw_quad (0, 0, $w, $h);
2065 2385
2066 glDisable GL_TEXTURE_2D; 2386 glDisable GL_TEXTURE_2D;
2067} 2387}
2068 2388
2069############################################################################# 2389#############################################################################
2070 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
2071package CFClient::UI::VGauge; 2427package CFPlus::UI::VGauge;
2072 2428
2073our @ISA = CFClient::UI::Base::; 2429our @ISA = CFPlus::UI::Base::;
2074 2430
2075use List::Util qw(min max); 2431use List::Util qw(min max);
2076 2432
2077use CFClient::OpenGL; 2433use CFPlus::OpenGL;
2078 2434
2079my %tex = ( 2435my %tex = (
2080 food => [ 2436 food => [
2081 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2437 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2082 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2438 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2083 ], 2439 ],
2084 grace => [ 2440 grace => [
2085 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2441 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2086 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/
2087 ], 2443 ],
2088 hp => [ 2444 hp => [
2089 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2445 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2090 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2446 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2091 ], 2447 ],
2092 mana => [ 2448 mana => [
2093 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2449 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2094 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/
2095 ], 2451 ],
2096); 2452);
2097 2453
2098# eg. VGauge->new (gauge => 'food'), default gauge: food 2454# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2158 my $ycut1 = max 0, min 1, $ycut; 2514 my $ycut1 = max 0, min 1, $ycut;
2159 my $ycut2 = max 0, min 1, $ycut - 1; 2515 my $ycut2 = max 0, min 1, $ycut - 1;
2160 2516
2161 my $h1 = $self->{h} * (1 - $ycut1); 2517 my $h1 = $self->{h} * (1 - $ycut1);
2162 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);
2163 2522
2164 glEnable GL_BLEND; 2523 glEnable GL_BLEND;
2165 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2524 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2166 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2525 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2167 glEnable GL_TEXTURE_2D; 2526 glEnable GL_TEXTURE_2D;
… …
2186 2545
2187 if ($t3) { 2546 if ($t3) {
2188 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2547 glBindTexture GL_TEXTURE_2D, $t3->{name};
2189 glBegin GL_QUADS; 2548 glBegin GL_QUADS;
2190 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2549 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2191 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2550 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2192 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2551 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2193 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2552 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2194 glEnd; 2553 glEnd;
2195 } 2554 }
2196 2555
2197 glDisable GL_BLEND; 2556 glDisable GL_BLEND;
2198 glDisable GL_TEXTURE_2D; 2557 glDisable GL_TEXTURE_2D;
2199} 2558}
2200 2559
2201############################################################################# 2560#############################################################################
2202 2561
2203package CFClient::UI::Gauge; 2562package CFPlus::UI::Gauge;
2204 2563
2205our @ISA = CFClient::UI::VBox::; 2564our @ISA = CFPlus::UI::VBox::;
2206 2565
2207sub new { 2566sub new {
2208 my ($class, %arg) = @_; 2567 my ($class, %arg) = @_;
2209 2568
2210 my $self = $class->SUPER::new ( 2569 my $self = $class->SUPER::new (
… …
2212 can_hover => 1, 2571 can_hover => 1,
2213 can_events => 1, 2572 can_events => 1,
2214 %arg, 2573 %arg,
2215 ); 2574 );
2216 2575
2217 $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");
2218 $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);
2219 $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");
2220 2579
2221 $self 2580 $self
2222} 2581}
2223 2582
2224sub set_fontsize { 2583sub set_fontsize {
… …
2245 $self->{value}->set_text ($val); 2604 $self->{value}->set_text ($val);
2246} 2605}
2247 2606
2248############################################################################# 2607#############################################################################
2249 2608
2250package CFClient::UI::Slider; 2609package CFPlus::UI::Slider;
2251 2610
2252use strict; 2611use strict;
2253 2612
2254use CFClient::OpenGL; 2613use CFPlus::OpenGL;
2255 2614
2256our @ISA = CFClient::UI::DrawBG::; 2615our @ISA = CFPlus::UI::DrawBG::;
2257 2616
2258my @tex = 2617my @tex =
2259 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2618 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2260 qw(s1_slider.png s1_slider_bg.png); 2619 qw(s1_slider.png s1_slider_bg.png);
2261 2620
2262sub new { 2621sub new {
2263 my $class = shift; 2622 my $class = shift;
2264 2623
… …
2285 $self->update; 2644 $self->update;
2286 2645
2287 $self 2646 $self
2288} 2647}
2289 2648
2290sub changed { }
2291
2292sub set_range { 2649sub set_range {
2293 my ($self, $range) = @_; 2650 my ($self, $range) = @_;
2294 2651
2295 ($range, $self->{range}) = ($self->{range}, $range); 2652 ($range, $self->{range}) = ($self->{range}, $range);
2296 2653
2297 $self->update
2298 if "@$range" ne "@{$self->{range}}"; 2654 if ("@$range" ne "@{$self->{range}}") {
2655 $self->update;
2656 $self->set_value ($self->{range}[0]);
2657 }
2299} 2658}
2300 2659
2301sub set_value { 2660sub set_value {
2302 my ($self, $value) = @_; 2661 my ($self, $value) = @_;
2303 2662
… …
2314 if $unit; 2673 if $unit;
2315 2674
2316 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2675 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2317 2676
2318 if ($value != $old_value) { 2677 if ($value != $old_value) {
2319 $self->_emit (changed => $value); 2678 $self->emit (changed => $value);
2320 $self->update; 2679 $self->update;
2321 } 2680 }
2322} 2681}
2323 2682
2324sub size_request { 2683sub size_request {
2325 my ($self) = @_; 2684 my ($self) = @_;
2326 2685
2327 ($self->{req_w}, $self->{req_h}) 2686 ($self->{req_w}, $self->{req_h})
2328} 2687}
2329 2688
2330sub button_down { 2689sub invoke_button_down {
2331 my ($self, $ev, $x, $y) = @_; 2690 my ($self, $ev, $x, $y) = @_;
2332 2691
2333 $self->SUPER::button_down ($ev, $x, $y); 2692 $self->SUPER::invoke_button_down ($ev, $x, $y);
2334 2693
2335 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2694 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2336 2695
2337 $self->mouse_motion ($ev, $x, $y) 2696 $self->invoke_mouse_motion ($ev, $x, $y)
2338} 2697}
2339 2698
2340sub mouse_motion { 2699sub invoke_mouse_motion {
2341 my ($self, $ev, $x, $y) = @_; 2700 my ($self, $ev, $x, $y) = @_;
2342 2701
2343 if ($GRAB == $self) { 2702 if ($GRAB == $self) {
2344 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2703 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2345 2704
… …
2351 } else { 2710 } else {
2352 return 0; 2711 return 0;
2353 } 2712 }
2354 2713
2355 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
2356} 2727}
2357 2728
2358sub update { 2729sub update {
2359 my ($self) = @_; 2730 my ($self) = @_;
2360 2731
… …
2409 glDisable GL_TEXTURE_2D; 2780 glDisable GL_TEXTURE_2D;
2410} 2781}
2411 2782
2412############################################################################# 2783#############################################################################
2413 2784
2414package CFClient::UI::ValSlider; 2785package CFPlus::UI::ValSlider;
2415 2786
2416our @ISA = CFClient::UI::HBox::; 2787our @ISA = CFPlus::UI::HBox::;
2417 2788
2418sub new { 2789sub new {
2419 my ($class, %arg) = @_; 2790 my ($class, %arg) = @_;
2420 2791
2421 my $range = delete $arg{range}; 2792 my $range = delete $arg{range};
2422 2793
2423 my $self = $class->SUPER::new ( 2794 my $self = $class->SUPER::new (
2424 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2795 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2425 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2796 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2426 to_value => sub { shift }, 2797 to_value => sub { shift },
2427 from_value => sub { shift }, 2798 from_value => sub { shift },
2428 %arg, 2799 %arg,
2429 ); 2800 );
2430 2801
… …
2450sub set_range { shift->{slider}->set_range (@_) } 2821sub set_range { shift->{slider}->set_range (@_) }
2451sub set_value { shift->{slider}->set_value (@_) } 2822sub set_value { shift->{slider}->set_value (@_) }
2452 2823
2453############################################################################# 2824#############################################################################
2454 2825
2455package CFClient::UI::TextView; 2826package CFPlus::UI::TextScroller;
2456 2827
2457our @ISA = CFClient::UI::HBox::; 2828our @ISA = CFPlus::UI::HBox::;
2458 2829
2459use CFClient::OpenGL; 2830use CFPlus::OpenGL;
2460 2831
2461sub new { 2832sub new {
2462 my $class = shift; 2833 my $class = shift;
2463 2834
2464 my $self = $class->SUPER::new ( 2835 my $self = $class->SUPER::new (
2465 fontsize => 1, 2836 fontsize => 1,
2466 can_events => 0, 2837 can_events => 1,
2838 indent => 0,
2467 #font => default_font 2839 #font => default_font
2468 @_, 2840 @_,
2469 2841
2470 layout => (new CFClient::Layout 1), 2842 layout => (new CFPlus::Layout),
2471 par => [], 2843 par => [],
2844 max_par => 0,
2472 height => 0, 2845 height => 0,
2473 children => [ 2846 children => [
2474 (new CFClient::UI::Empty expand => 1), 2847 (new CFPlus::UI::Empty expand => 1),
2475 (new CFClient::UI::Slider vertical => 1), 2848 (new CFPlus::UI::Slider vertical => 1),
2476 ], 2849 ],
2477 ); 2850 );
2478 2851
2479 $self->{children}[1]->connect (changed => sub { $self->update }); 2852 $self->{children}[1]->connect (changed => sub { $self->update });
2480 2853
… …
2486 2859
2487 $self->{fontsize} = $fontsize; 2860 $self->{fontsize} = $fontsize;
2488 $self->reflow; 2861 $self->reflow;
2489} 2862}
2490 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
2491sub size_allocate { 2873sub invoke_size_allocate {
2492 my ($self, $w, $h) = @_; 2874 my ($self, $w, $h) = @_;
2493 2875
2494 $self->SUPER::size_allocate ($w, $h); 2876 my ($empty, $slider, @other) = @{ $self->{children} };
2877 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2495 2878
2496 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2879 $self->{layout}->set_font ($self->{font}) if $self->{font};
2497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2880 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2498 $self->{layout}->set_width ($self->{children}[0]{w}); 2881 $self->{layout}->set_width ($empty->{w});
2882 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2499 2883
2500 $self->reflow; 2884 $self->reflow;
2501}
2502 2885
2503sub text_size { 2886 local $self->{children} = [$empty, $slider];
2887 $self->SUPER::invoke_size_allocate ($w, $h)
2888}
2889
2890sub invoke_mouse_wheel {
2504 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) = @_;
2505 2902
2506 my $layout = $self->{layout}; 2903 my $layout = $self->{layout};
2507 2904
2905 $layout->set_font ($self->{font}) if $self->{font};
2906 $layout->set_foreground (@{$para->{fg}});
2508 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2907 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2509 $layout->set_width ($self->{children}[0]{w} - $indent); 2908 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2909 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2510 $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}}
2511 2916 );
2917
2512 $layout->size 2918 $layout
2513} 2919}
2514 2920
2515sub reflow { 2921sub reflow {
2516 my ($self) = @_; 2922 my ($self) = @_;
2517 2923
… …
2524 2930
2525 # todo: base offset on lines or so, not on pixels 2931 # todo: base offset on lines or so, not on pixels
2526 $self->{children}[1]->set_value ($offset); 2932 $self->{children}[1]->set_value ($offset);
2527} 2933}
2528 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
2529sub clear { 2950sub clear {
2530 my ($self) = @_; 2951 my ($self) = @_;
2952
2953 my (undef, undef, @other) = @{ $self->{children} };
2954 $self->remove ($_) for @other;
2531 2955
2532 $self->{par} = []; 2956 $self->{par} = [];
2533 $self->{height} = 0; 2957 $self->{height} = 0;
2534 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2958 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2535} 2959}
2536 2960
2537sub add_paragraph { 2961sub add_paragraph {
2538 my ($self, $color, $text, $indent) = @_; 2962 my $self = shift;
2539 2963
2540 for my $line (split /\n/, $text) { 2964 for my $para (@_) {
2541 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
2542 $self->{height} += $h; 3016 $self->{height} = $height;
2543 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3017 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2544 }
2545 3018
2546 $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 }
2547} 3025}
2548 3026
2549sub update { 3027sub update {
2550 my ($self) = @_; 3028 my ($self) = @_;
2551 3029
… …
2553 3031
2554 return unless $self->{h} > 0; 3032 return unless $self->{h} > 0;
2555 3033
2556 delete $self->{texture}; 3034 delete $self->{texture};
2557 3035
2558 $ROOT->on_post_alloc ($self, sub { 3036 $ROOT->on_post_alloc ($self => sub {
3037 $self->force_uptodate;
3038
2559 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3039 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2560 3040
2561 if (delete $self->{need_reflow}) {
2562 my $height = 0;
2563
2564 my $layout = $self->{layout};
2565
2566 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2567
2568 for (@{$self->{par}}) {
2569 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2570 $layout->set_width ($W - $_->[3]);
2571 $layout->set_markup ($_->[4]);
2572 my ($w, $h) = $layout->size;
2573 $_->[0] = $w + $_->[3];
2574 $_->[1] = $h;
2575 }
2576
2577 $height += $_->[1];
2578 }
2579
2580 $self->{height} = $height;
2581
2582 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2583
2584 delete $self->{texture};
2585 }
2586
2587 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3041 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2588 glClearColor 0, 0, 0, 0; 3042 glClearColor 0, 0, 0, 0;
2589 glClear GL_COLOR_BUFFER_BIT; 3043 glClear GL_COLOR_BUFFER_BIT;
2590 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;
2591 my $top = int $self->{children}[1]{range}[0]; 3053 my $top = int $self->{children}[1]{range}[0];
2592 3054
2593 my $y0 = $top; 3055 my $y0 = $top;
2594 my $y1 = $top + $H; 3056 my $y1 = $top + $H;
2595 3057
2596 my $y = 0;
2597
2598 my $layout = $self->{layout};
2599
2600 $layout->set_font ($self->{font}) if $self->{font};
2601
2602 glEnable GL_BLEND;
2603 #TODO# not correct in windows where rgba is forced off
2604 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2605
2606 for my $par (@{$self->{par}}) { 3058 for my $para (@{$self->{par}}) {
2607 my $h = $par->[1]; 3059 my $h = $para->{h};
3060 my $y = $para->{y};
2608 3061
2609 if ($y0 < $y + $h && $y < $y1) { 3062 if ($y0 < $y + $h && $y < $y1) {
2610 $layout->set_foreground (@{ $par->[2] }); 3063 my $layout = $self->get_layout ($para);
2611 $layout->set_width ($W - $par->[3]);
2612 $layout->set_markup ($par->[4]);
2613 3064
2614 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3065 $layout->render ($para->{indent}, $y - $y0);
2615 3066
2616 glRasterPos $par->[3], $y - $y0; 3067 if (my @w = @{ $para->{widget} }) {
2617 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 }
2618 } 3079 }
2619 3080
2620 $y += $h; 3081 $paridx++;
3082 $top_paragraph ||= $paridx if $y >= $top;
2621 } 3083 }
2622 3084
2623 glDisable GL_BLEND; 3085 $self->{top_paragraph} = $top_paragraph;
2624 }; 3086 };
2625 }); 3087 });
3088}
3089
3090sub reconfigure {
3091 my ($self) = @_;
3092
3093 $self->SUPER::reconfigure;
3094
3095 $_->{w} = 1e10 for @{ $self->{par} };
3096 $self->reflow;
2626} 3097}
2627 3098
2628sub _draw { 3099sub _draw {
2629 my ($self) = @_; 3100 my ($self) = @_;
2630 3101
… …
2633 glColor 0, 0, 0, 1; 3104 glColor 0, 0, 0, 1;
2634 $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});
2635 glDisable GL_TEXTURE_2D; 3106 glDisable GL_TEXTURE_2D;
2636 3107
2637 $self->{children}[1]->draw; 3108 $self->{children}[1]->draw;
2638
2639} 3109}
2640 3110
2641############################################################################# 3111#############################################################################
2642 3112
2643package CFClient::UI::Animator; 3113package CFPlus::UI::Animator;
2644 3114
2645use CFClient::OpenGL; 3115use CFPlus::OpenGL;
2646 3116
2647our @ISA = CFClient::UI::Bin::; 3117our @ISA = CFPlus::UI::Bin::;
2648 3118
2649sub moveto { 3119sub moveto {
2650 my ($self, $x, $y) = @_; 3120 my ($self, $x, $y) = @_;
2651 3121
2652 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3122 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2680 glPopMatrix; 3150 glPopMatrix;
2681} 3151}
2682 3152
2683############################################################################# 3153#############################################################################
2684 3154
2685package CFClient::UI::Flopper; 3155package CFPlus::UI::Flopper;
2686 3156
2687our @ISA = CFClient::UI::Button::; 3157our @ISA = CFPlus::UI::Button::;
2688 3158
2689sub new { 3159sub new {
2690 my $class = shift; 3160 my $class = shift;
2691 3161
2692 my $self = $class->SUPER::new ( 3162 my $self = $class->SUPER::new (
… …
2704 $self->{other}->toggle_visibility; 3174 $self->{other}->toggle_visibility;
2705} 3175}
2706 3176
2707############################################################################# 3177#############################################################################
2708 3178
2709package CFClient::UI::Tooltip; 3179package CFPlus::UI::Tooltip;
2710 3180
2711our @ISA = CFClient::UI::Bin::; 3181our @ISA = CFPlus::UI::Bin::;
2712 3182
2713use CFClient::OpenGL; 3183use CFPlus::OpenGL;
2714 3184
2715sub new { 3185sub new {
2716 my $class = shift; 3186 my $class = shift;
2717 3187
2718 $class->SUPER::new ( 3188 $class->SUPER::new (
… …
2721 ) 3191 )
2722} 3192}
2723 3193
2724sub set_tooltip_from { 3194sub set_tooltip_from {
2725 my ($self, $widget) = @_; 3195 my ($self, $widget) = @_;
3196
3197 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3198 if $widget->{tooltip} =~ /^#(.*)$/;
2726 3199
2727 my $tooltip = $widget->{tooltip}; 3200 my $tooltip = $widget->{tooltip};
2728 3201
2729 if ($ENV{CFPLUS_DEBUG} & 2) { 3202 if ($ENV{CFPLUS_DEBUG} & 2) {
2730 $tooltip .= "\n\n" . (ref $widget) . "\n" 3203 $tooltip .= "\n\n" . (ref $widget) . "\n"
2731 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3204 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2732 . "req $widget->{req_w} $widget->{req_h}\n" 3205 . "req $widget->{req_w} $widget->{req_h}\n"
2733 . "visible $widget->{visible}"; 3206 . "visible $widget->{visible}";
2734 } 3207 }
2735 3208
3209 $tooltip =~ s/^\n+//;
3210 $tooltip =~ s/\n+$//;
3211
2736 $self->add (new CFClient::UI::Label 3212 $self->add (new CFPlus::UI::Label
2737 markup => $tooltip, 3213 markup => $tooltip,
2738 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3214 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2739 fontsize => 0.8, 3215 fontsize => 0.8,
2740 fg => [0, 0, 0, 1], 3216 style => 1, # FLAG_INVERSE
2741 ellipsise => 0, 3217 ellipsise => 0,
2742 font => ($widget->{tooltip_font} || $::FONT_PROP), 3218 font => ($widget->{tooltip_font} || $::FONT_PROP),
2743 ); 3219 );
2744} 3220}
2745 3221
… …
2749 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3225 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2750 3226
2751 ($w + 4, $h + 4) 3227 ($w + 4, $h + 4)
2752} 3228}
2753 3229
2754sub size_allocate { 3230sub invoke_size_allocate {
2755 my ($self, $w, $h) = @_; 3231 my ($self, $w, $h) = @_;
2756 3232
2757 $self->SUPER::size_allocate ($w - 4, $h - 4); 3233 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2758} 3234}
2759 3235
2760sub visibility_change { 3236sub invoke_visibility_change {
2761 my ($self, $visible) = @_; 3237 my ($self, $visible) = @_;
2762 3238
2763 return unless $visible; 3239 return unless $visible;
2764 3240
2765 $self->{root}->on_post_alloc ("move_$self" => sub { 3241 $self->{root}->on_post_alloc ("move_$self" => sub {
2766 my $widget = $self->{owner} 3242 my $widget = $self->{owner}
2767 or return; 3243 or return;
2768 3244
3245 if ($widget->{visible}) {
2769 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3246 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2770 3247
2771 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3248 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2772 if $x + $self->{w} > $::WIDTH; 3249 if $x + $self->{w} > $self->{root}{w};
2773 3250
2774 $self->move_abs ($x, $y); 3251 $self->move_abs ($x, $y);
3252 } else {
3253 $self->hide;
3254 }
2775 }); 3255 });
2776} 3256}
2777 3257
2778sub _draw { 3258sub _draw {
2779 my ($self) = @_; 3259 my ($self) = @_;
… …
2803 $self->SUPER::_draw; 3283 $self->SUPER::_draw;
2804} 3284}
2805 3285
2806############################################################################# 3286#############################################################################
2807 3287
2808package CFClient::UI::Face; 3288package CFPlus::UI::Face;
2809 3289
2810our @ISA = CFClient::UI::Base::; 3290our @ISA = CFPlus::UI::DrawBG::;
2811 3291
2812use CFClient::OpenGL; 3292use CFPlus::OpenGL;
2813 3293
2814sub new { 3294sub new {
2815 my $class = shift; 3295 my $class = shift;
2816 3296
2817 my $self = $class->SUPER::new ( 3297 my $self = $class->SUPER::new (
… …
2819 can_events => 0, 3299 can_events => 0,
2820 @_, 3300 @_,
2821 ); 3301 );
2822 3302
2823 if ($self->{anim} && $self->{animspeed}) { 3303 if ($self->{anim} && $self->{animspeed}) {
2824 Scalar::Util::weaken (my $widget = $self); 3304 CFPlus::weaken (my $widget = $self);
2825 3305
2826 $self->{timer} = Event->timer ( 3306 $self->{timer} = Event->timer (
2827 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3307 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2828 hard => 1, 3308 hard => 1,
2829 interval => $self->{animspeed}, 3309 interval => $self->{animspeed},
… …
2852sub _draw { 3332sub _draw {
2853 my ($self) = @_; 3333 my ($self) = @_;
2854 3334
2855 return unless $::CONN; 3335 return unless $::CONN;
2856 3336
3337 $self->SUPER::_draw;
3338
2857 my $face; 3339 my $face;
2858 3340
2859 if ($self->{frame}) { 3341 if ($self->{frame}) {
2860 my $anim = $::CONN->{anim}[$self->{anim}]; 3342 my $anim = $::CONN->{anim}[$self->{anim}];
2861 3343
… …
2872 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3354 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2873 glDisable GL_TEXTURE_2D; 3355 glDisable GL_TEXTURE_2D;
2874 } 3356 }
2875} 3357}
2876 3358
2877sub DESTROY { 3359sub destroy {
2878 my ($self) = @_; 3360 my ($self) = @_;
2879 3361
2880 $self->{timer}->cancel 3362 $self->{timer}->cancel
2881 if $self->{timer}; 3363 if $self->{timer};
2882 3364
2883 $self->SUPER::DESTROY; 3365 $self->SUPER::destroy;
2884} 3366}
2885 3367
2886############################################################################# 3368#############################################################################
2887 3369
2888package CFClient::UI::Buttonbar; 3370package CFPlus::UI::Buttonbar;
2889 3371
2890our @ISA = CFClient::UI::HBox::; 3372our @ISA = CFPlus::UI::HBox::;
2891 3373
2892# TODO: should actualyl wrap buttons and other goodies. 3374# TODO: should actually wrap buttons and other goodies.
2893 3375
2894############################################################################# 3376#############################################################################
2895 3377
2896package CFClient::UI::Menu; 3378package CFPlus::UI::Menu;
2897 3379
2898our @ISA = CFClient::UI::FancyFrame::; 3380our @ISA = CFPlus::UI::Toplevel::;
2899 3381
2900use CFClient::OpenGL; 3382use CFPlus::OpenGL;
2901 3383
2902sub new { 3384sub new {
2903 my $class = shift; 3385 my $class = shift;
2904 3386
2905 my $self = $class->SUPER::new ( 3387 my $self = $class->SUPER::new (
2906 items => [], 3388 items => [],
2907 z => 100, 3389 z => 100,
2908 @_, 3390 @_,
2909 ); 3391 );
2910 3392
2911 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3393 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2912 3394
2913 for my $item (@{ $self->{items} }) { 3395 for my $item (@{ $self->{items} }) {
2914 my ($widget, $cb) = @$item; 3396 my ($widget, $cb, $tooltip) = @$item;
2915 3397
2916 # handle various types of items, only text for now 3398 # handle various types of items, only text for now
2917 if (!ref $widget) { 3399 if (!ref $widget) {
3400 if ($widget =~ /\t/) {
3401 my ($left, $right) = split /\t/, $widget, 2;
3402
2918 $widget = new CFClient::UI::Label 3403 $widget = new CFPlus::UI::HBox
2919 can_hover => 1, 3404 can_hover => 1,
2920 can_events => 1, 3405 can_events => 1,
3406 tooltip => $tooltip,
3407 children => [
3408 (new CFPlus::UI::Label markup => $left, expand => 1),
3409 (new CFPlus::UI::Label markup => $right, align => +1),
3410 ],
3411 ;
3412
3413 } else {
3414 $widget = new CFPlus::UI::Label
3415 can_hover => 1,
3416 can_events => 1,
2921 text => $widget; 3417 markup => $widget,
3418 tooltip => $tooltip;
3419 }
2922 } 3420 }
2923 3421
2924 $self->{item}{$widget} = $item; 3422 $self->{item}{$widget} = $item;
2925 3423
2926 $self->{vbox}->add ($widget); 3424 $self->{vbox}->add ($widget);
… …
2931 3429
2932# 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)
2933sub popup { 3431sub popup {
2934 my ($self, $ev) = @_; 3432 my ($self, $ev) = @_;
2935 3433
2936 $self->_emit ("popdown"); 3434 $self->emit ("popdown");
2937 3435
2938 # maybe save $GRAB? must be careful about events... 3436 # maybe save $GRAB? must be careful about events...
2939 $GRAB = $self; 3437 $GRAB = $self;
2940 $self->{button} = $ev->{button}; 3438 $self->{button} = $ev->{button};
2941 3439
2942 $self->show; 3440 $self->show;
2943 $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);
2944} 3442}
2945 3443
2946sub mouse_motion { 3444sub invoke_mouse_motion {
2947 my ($self, $ev, $x, $y) = @_; 3445 my ($self, $ev, $x, $y) = @_;
2948 3446
2949 # TODO: should use vbox->find_widget or so 3447 # TODO: should use vbox->find_widget or so
2950 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3448 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2951 $self->{hover} = $self->{item}{$HOVER}; 3449 $self->{hover} = $self->{item}{$HOVER};
2952 3450
2953 0 3451 0
2954} 3452}
2955 3453
2956sub button_up { 3454sub invoke_button_up {
2957 my ($self, $ev, $x, $y) = @_; 3455 my ($self, $ev, $x, $y) = @_;
2958 3456
2959 if ($ev->{button} == $self->{button}) { 3457 if ($ev->{button} == $self->{button}) {
2960 undef $GRAB; 3458 undef $GRAB;
2961 $self->hide; 3459 $self->hide;
2962 3460
2963 $self->_emit ("popdown"); 3461 $self->emit ("popdown");
2964 $self->{hover}[1]->() if $self->{hover}; 3462 $self->{hover}[1]->() if $self->{hover};
2965 } else { 3463 } else {
2966 return 0 3464 return 0
2967 } 3465 }
2968 3466
2969 1 3467 1
2970} 3468}
2971 3469
2972############################################################################# 3470#############################################################################
2973 3471
2974package CFClient::UI::Multiplexer; 3472package CFPlus::UI::Multiplexer;
2975 3473
2976our @ISA = CFClient::UI::Container::; 3474our @ISA = CFPlus::UI::Container::;
2977 3475
2978sub new { 3476sub new {
2979 my $class = shift; 3477 my $class = shift;
2980 3478
2981 my $self = $class->SUPER::new ( 3479 my $self = $class->SUPER::new (
… …
2995 3493
2996 $self->{current} = $self->{children}[0] 3494 $self->{current} = $self->{children}[0]
2997 if @{ $self->{children} }; 3495 if @{ $self->{children} };
2998} 3496}
2999 3497
3498sub get_current_page {
3499 my ($self) = @_;
3500
3501 $self->{current}
3502}
3503
3000sub set_current_page { 3504sub set_current_page {
3001 my ($self, $page_or_widget) = @_; 3505 my ($self, $page_or_widget) = @_;
3002 3506
3003 my $widget = ref $page_or_widget 3507 my $widget = ref $page_or_widget
3004 ? $page_or_widget 3508 ? $page_or_widget
3005 : $self->{children}[$page_or_widget]; 3509 : $self->{children}[$page_or_widget];
3006 3510
3007 $self->{current} = $widget; 3511 $self->{current} = $widget;
3008 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3512 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3009 3513
3010 $self->_emit (page_changed => $self->{current}); 3514 $self->emit (page_changed => $self->{current});
3011 3515
3012 $self->realloc; 3516 $self->realloc;
3013} 3517}
3014 3518
3015sub visible_children { 3519sub visible_children {
… …
3020 my ($self) = @_; 3524 my ($self) = @_;
3021 3525
3022 $self->{current}->size_request 3526 $self->{current}->size_request
3023} 3527}
3024 3528
3025sub size_allocate { 3529sub invoke_size_allocate {
3026 my ($self, $w, $h) = @_; 3530 my ($self, $w, $h) = @_;
3027 3531
3028 $self->{current}->configure (0, 0, $w, $h); 3532 $self->{current}->configure (0, 0, $w, $h);
3533
3534 1
3029} 3535}
3030 3536
3031sub _draw { 3537sub _draw {
3032 my ($self) = @_; 3538 my ($self) = @_;
3033 3539
3034 $self->{current}->draw; 3540 $self->{current}->draw;
3035} 3541}
3036 3542
3037############################################################################# 3543#############################################################################
3038 3544
3039package CFClient::UI::Notebook; 3545package CFPlus::UI::Notebook;
3040 3546
3041our @ISA = CFClient::UI::VBox::; 3547our @ISA = CFPlus::UI::VBox::;
3042 3548
3043sub new { 3549sub new {
3044 my $class = shift; 3550 my $class = shift;
3045 3551
3046 my $self = $class->SUPER::new ( 3552 my $self = $class->SUPER::new (
3047 buttonbar => (new CFClient::UI::Buttonbar), 3553 buttonbar => (new CFPlus::UI::Buttonbar),
3048 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3554 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3049 # filter => # will be put between multiplexer and $self 3555 # filter => # will be put between multiplexer and $self
3050 @_, 3556 @_,
3051 ); 3557 );
3052 3558
3053 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3559 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3057} 3563}
3058 3564
3059sub add { 3565sub add {
3060 my ($self, $title, $widget, $tooltip) = @_; 3566 my ($self, $title, $widget, $tooltip) = @_;
3061 3567
3062 Scalar::Util::weaken $self; 3568 CFPlus::weaken $self;
3063 3569
3064 $self->{buttonbar}->add (new CFClient::UI::Button 3570 $self->{buttonbar}->add (new CFPlus::UI::Button
3065 markup => $title, 3571 markup => $title,
3066 tooltip => $tooltip, 3572 tooltip => $tooltip,
3067 on_activate => sub { $self->set_current_page ($widget) }, 3573 on_activate => sub { $self->set_current_page ($widget) },
3068 ); 3574 );
3069 3575
3070 $self->{multiplexer}->add ($widget); 3576 $self->{multiplexer}->add ($widget);
3071} 3577}
3072 3578
3579sub get_current_page {
3580 my ($self) = @_;
3581
3582 $self->{multiplexer}->get_current_page
3583}
3584
3073sub set_current_page { 3585sub set_current_page {
3074 my ($self, $page) = @_; 3586 my ($self, $page) = @_;
3075 3587
3076 $self->{multiplexer}->set_current_page ($page); 3588 $self->{multiplexer}->set_current_page ($page);
3077 $self->_emit (page_changed => $self->{multiplexer}{current}); 3589 $self->emit (page_changed => $self->{multiplexer}{current});
3078} 3590}
3079 3591
3080############################################################################# 3592#############################################################################
3081 3593
3594package CFPlus::UI::Selector;
3595
3596use utf8;
3597
3598our @ISA = CFPlus::UI::Button::;
3599
3600sub new {
3601 my $class = shift;
3602
3603 my $self = $class->SUPER::new (
3604 options => [], # [value, title, longdesc], ...
3605 value => undef,
3606 @_,
3607 );
3608
3609 $self->_set_value ($self->{value});
3610
3611 $self
3612}
3613
3614sub invoke_button_down {
3615 my ($self, $ev) = @_;
3616
3617 my @menu_items;
3618
3619 for (@{ $self->{options} }) {
3620 my ($value, $title, $tooltip) = @$_;
3621
3622 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3623 }
3624
3625 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3626}
3627
3628sub _set_value {
3629 my ($self, $value) = @_;
3630
3631 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3632 or return;
3633
3634 $self->{value} = $item->[0];
3635 $self->set_markup ("$item->[1] ⇓");
3636 $self->set_tooltip ($item->[2]);
3637}
3638
3639sub set_value {
3640 my ($self, $value) = @_;
3641
3642 return unless $self->{value} ne $value;
3643
3644 $self->_set_value ($value);
3645 $self->emit (changed => $value);
3646}
3647
3648#############################################################################
3649
3082package CFClient::UI::Statusbox; 3650package CFPlus::UI::Statusbox;
3083 3651
3084our @ISA = CFClient::UI::VBox::; 3652our @ISA = CFPlus::UI::VBox::;
3085 3653
3086sub new { 3654sub new {
3087 my $class = shift; 3655 my $class = shift;
3088 3656
3089 my $self = $class->SUPER::new ( 3657 my $self = $class->SUPER::new (
3090 fontsize => 0.8, 3658 fontsize => 0.8,
3091 @_, 3659 @_,
3092 ); 3660 );
3093 3661
3094 Scalar::Util::weaken (my $this = $self); 3662 CFPlus::weaken (my $this = $self);
3095 3663
3096 $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 });
3097 3665
3098 $self 3666 $self
3099} 3667}
… …
3101sub reorder { 3669sub reorder {
3102 my ($self) = @_; 3670 my ($self) = @_;
3103 my $NOW = Time::HiRes::time; 3671 my $NOW = Time::HiRes::time;
3104 3672
3105 # freeze display when hovering over any label 3673 # freeze display when hovering over any label
3106 return if $CFClient::UI::TOOLTIP->{owner} 3674 return if $CFPlus::UI::TOOLTIP->{owner}
3107 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3675 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3108 values %{ $self->{item} }; 3676 values %{ $self->{item} };
3109 3677
3110 while (my ($k, $v) = each %{ $self->{item} }) { 3678 while (my ($k, $v) = each %{ $self->{item} }) {
3111 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3679 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3112 } 3680 }
… …
3133 for ($short) { 3701 for ($short) {
3134 s/^\s+//; 3702 s/^\s+//;
3135 s/\s+/ /g; 3703 s/\s+/ /g;
3136 } 3704 }
3137 3705
3138 new CFClient::UI::Label 3706 new CFPlus::UI::Label
3139 markup => $short, 3707 markup => $short,
3140 tooltip => $item->{tooltip}, 3708 tooltip => $item->{tooltip},
3141 tooltip_font => $::FONT_PROP, 3709 tooltip_font => $::FONT_PROP,
3142 tooltip_width => 0.67, 3710 tooltip_width => 0.67,
3143 fontsize => $item->{fontsize} || $self->{fontsize}, 3711 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3181 $item->{count}++; 3749 $item->{count}++;
3182 } else { 3750 } else {
3183 $item->{count} = 1; 3751 $item->{count} = 1;
3184 $item->{text} = $item->{tooltip} = $text; 3752 $item->{text} = $item->{tooltip} = $text;
3185 } 3753 }
3186 $item->{id} = ++$self->{id}; 3754 $item->{id} += 0.2;#d#
3187 $item->{timeout} = $timeout; 3755 $item->{timeout} = $timeout;
3188 delete $item->{label}; 3756 delete $item->{label};
3189 } else { 3757 } else {
3190 $self->{item}{$group} = { 3758 $self->{item}{$group} = {
3191 id => ++$self->{id}, 3759 id => ++$self->{id},
… …
3197 count => 1, 3765 count => 1,
3198 %arg, 3766 %arg,
3199 }; 3767 };
3200 } 3768 }
3201 3769
3770 $ROOT->on_refresh (reorder => sub {
3202 $self->reorder; 3771 $self->reorder;
3772 });
3203} 3773}
3204 3774
3205sub reconfigure { 3775sub reconfigure {
3206 my ($self) = @_; 3776 my ($self) = @_;
3207 3777
… …
3210 3780
3211 $self->reorder; 3781 $self->reorder;
3212 $self->SUPER::reconfigure; 3782 $self->SUPER::reconfigure;
3213} 3783}
3214 3784
3215sub DESTROY { 3785sub destroy {
3216 my ($self) = @_; 3786 my ($self) = @_;
3217 3787
3218 $self->{timer}->cancel; 3788 $self->{timer}->cancel;
3219 3789
3220 $self->SUPER::DESTROY; 3790 $self->SUPER::destroy;
3221} 3791}
3222 3792
3223############################################################################# 3793#############################################################################
3224 3794
3225package CFClient::UI::Inventory;
3226
3227our @ISA = CFClient::UI::ScrolledWindow::;
3228
3229sub new {
3230 my $class = shift;
3231
3232 my $self = $class->SUPER::new (
3233 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3234 @_,
3235 );
3236
3237 $self
3238}
3239
3240sub set_items {
3241 my ($self, $items) = @_;
3242
3243 $self->{child}->clear;
3244 return unless $items;
3245
3246 my @items = sort {
3247 ($a->{type} <=> $b->{type})
3248 or ($a->{name} cmp $b->{name})
3249 } @$items;
3250
3251 $self->{real_items} = \@items;
3252
3253 my $row = 0;
3254 for my $item (@items) {
3255 CFClient::Item::update_widgets $item;
3256
3257 $self->{child}->add (0, $row, $item->{face_widget});
3258 $self->{child}->add (1, $row, $item->{desc_widget});
3259 $self->{child}->add (2, $row, $item->{weight_widget});
3260
3261 $row++;
3262 }
3263}
3264
3265#############################################################################
3266
3267package CFClient::UI::BindEditor;
3268
3269our @ISA = CFClient::UI::FancyFrame::;
3270
3271sub new {
3272 my $class = shift;
3273
3274 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3275
3276 $self->add (my $vb = new CFClient::UI::VBox);
3277
3278
3279 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3280 text => "start recording",
3281 tooltip => "Start/Stops recording of actions."
3282 ."All subsequent actions after the recording started will be captured."
3283 ."The actions are displayed after the record was stopped."
3284 ."To bind the action you have to click on the 'Bind' button",
3285 on_activate => sub {
3286 unless ($self->{recording}) {
3287 $self->start;
3288 } else {
3289 $self->stop;
3290 }
3291 });
3292
3293 $vb->add (new CFClient::UI::Label text => "Actions:");
3294 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3295
3296 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3297 $vb->add (my $hb = new CFClient::UI::HBox);
3298 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3299 $hb->add (new CFClient::UI::Button
3300 text => "bind",
3301 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3302 on_activate => sub {
3303 $self->ask_for_bind;
3304 });
3305
3306 $vb->add (my $hb = new CFClient::UI::HBox);
3307 $hb->add (new CFClient::UI::Button
3308 text => "ok",
3309 expand => 1,
3310 tooltip => "This closes the binding editor and saves the binding",
3311 on_activate => sub {
3312 $self->hide;
3313 $self->commit;
3314 });
3315
3316 $hb->add (new CFClient::UI::Button
3317 text => "cancel",
3318 expand => 1,
3319 tooltip => "This closes the binding editor without saving",
3320 on_activate => sub {
3321 $self->hide;
3322 $self->{binding_cancel}->()
3323 if $self->{binding_cancel};
3324 });
3325
3326 $self->update_binding_widgets;
3327
3328 $self
3329}
3330
3331sub commit {
3332 my ($self) = @_;
3333 my ($mod, $sym, $cmds) = $self->get_binding;
3334 if ($sym != 0 && @$cmds > 0) {
3335 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3336 ."'. Don't forget 'Save Config'!");
3337 $self->{binding_change}->($mod, $sym, $cmds)
3338 if $self->{binding_change};
3339 } else {
3340 $::STATUSBOX->add ("No action bound, no key or action specified!");
3341 $self->{binding_cancel}->()
3342 if $self->{binding_cancel};
3343 }
3344}
3345
3346sub start {
3347 my ($self) = @_;
3348
3349 $self->{rec_btn}->set_text ("stop recording");
3350 $self->{recording} = 1;
3351 $self->clear_command_list;
3352 $::CONN->start_record if $::CONN;
3353}
3354
3355sub stop {
3356 my ($self) = @_;
3357
3358 $self->{rec_btn}->set_text ("start recording");
3359 $self->{recording} = 0;
3360
3361 my $rec;
3362 $rec = $::CONN->stop_record if $::CONN;
3363 return unless ref $rec eq 'ARRAY';
3364 $self->set_command_list ($rec);
3365}
3366
3367
3368sub ask_for_bind_and_commit {
3369 my ($self) = @_;
3370 $self->ask_for_bind (1);
3371}
3372
3373sub ask_for_bind {
3374 my ($self, $commit) = @_;
3375
3376 CFClient::Binder::open_binding_dialog (sub {
3377 my ($mod, $sym) = @_;
3378 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3379 $self->update_binding_widgets;
3380 $self->commit if $commit;
3381 });
3382}
3383
3384# $mod and $sym are the modifiers and key symbol
3385# $cmds is a array ref of strings (the commands)
3386# $cb is the callback that is executed on OK
3387# $ccb is the callback that is executed on CANCEL and
3388# when the binding was unsuccessful on OK
3389sub set_binding {
3390 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3391
3392 $self->clear_command_list;
3393 $self->{recording} = 0;
3394 $self->{rec_btn}->set_text ("start recording");
3395
3396 $self->{binding} = [$mod, $sym];
3397 $self->{commands} = $cmds;
3398
3399 $self->{binding_change} = $cb;
3400 $self->{binding_cancel} = $ccb;
3401
3402 $self->update_binding_widgets;
3403}
3404
3405# this is a shortcut method that asks for a binding
3406# and then just binds it.
3407sub do_quick_binding {
3408 my ($self, $cmds) = @_;
3409 $self->set_binding (undef, undef, $cmds, sub {
3410 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3411 });
3412 $self->ask_for_bind (1);
3413}
3414
3415sub update_binding_widgets {
3416 my ($self) = @_;
3417 my ($mod, $sym, $cmds) = $self->get_binding;
3418 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3419 $self->set_command_list ($cmds);
3420}
3421
3422sub get_binding {
3423 my ($self) = @_;
3424 return (
3425 $self->{binding}->[0],
3426 $self->{binding}->[1],
3427 [ grep { defined $_ } @{$self->{commands}} ]
3428 );
3429}
3430
3431sub clear_command_list {
3432 my ($self) = @_;
3433 $self->{cmdbox}->clear ();
3434}
3435
3436sub set_command_list {
3437 my ($self, $cmds) = @_;
3438
3439 $self->{cmdbox}->clear ();
3440 $self->{commands} = $cmds;
3441
3442 my $idx = 0;
3443
3444 for (@$cmds) {
3445 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3446
3447 my $i = $idx;
3448 $hb->add (new CFClient::UI::Label text => $_);
3449 $hb->add (new CFClient::UI::Button
3450 text => "delete",
3451 tooltip => "Deletes the action from the record",
3452 on_activate => sub {
3453 $self->{cmdbox}->remove ($hb);
3454 $cmds->[$i] = undef;
3455 });
3456
3457
3458 $idx++
3459 }
3460}
3461
3462#############################################################################
3463
3464package CFClient::UI::SpellList;
3465
3466our @ISA = CFClient::UI::Table::;
3467
3468sub new {
3469 my $class = shift;
3470
3471 my $self = $class->SUPER::new (
3472 binding => [],
3473 commands => [],
3474 @_,
3475 )
3476}
3477
3478# XXX: Do sorting? Argl...
3479sub add_spell {
3480 my ($self, $spell) = @_;
3481 $self->{spells}->{$spell->{name}} = $spell;
3482
3483 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3484 face => $spell->{face},
3485 can_hover => 1,
3486 can_events => 1,
3487 tooltip => $spell->{message});
3488
3489 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3490 text => $spell->{name},
3491 can_hover => 1,
3492 can_events => 1,
3493 tooltip => $spell->{message},
3494 expand => 1);
3495
3496 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3498 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3499 expand => 1);
3500
3501 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3502 text => "bind to key",
3503 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3504}
3505
3506sub rebuild_spell_list {
3507 my ($self) = @_;
3508 $self->{tbl_idx} = 0;
3509 $self->add_spell ($_) for values %{$self->{spells}};
3510}
3511
3512sub remove_spell {
3513 my ($self, $spell) = @_;
3514 delete $self->{spells}->{$spell->{name}};
3515 $self->rebuild_spell_list;
3516}
3517
3518#############################################################################
3519
3520package CFClient::UI::Root; 3795package CFPlus::UI::Root;
3521 3796
3522our @ISA = CFClient::UI::Container::; 3797our @ISA = CFPlus::UI::Container::;
3523 3798
3524use List::Util qw(min max); 3799use List::Util qw(min max);
3525 3800
3526use CFClient::OpenGL; 3801use CFPlus::OpenGL;
3527 3802
3528sub new { 3803sub new {
3529 my $class = shift; 3804 my $class = shift;
3530 3805
3531 my $self = $class->SUPER::new ( 3806 my $self = $class->SUPER::new (
3532 visible => 1, 3807 visible => 1,
3533 @_, 3808 @_,
3534 ); 3809 );
3535 3810
3536 Scalar::Util::weaken ($self->{root} = $self); 3811 CFPlus::weaken ($self->{root} = $self);
3537 3812
3538 $self 3813 $self
3539} 3814}
3540 3815
3541sub size_request { 3816sub size_request {
… …
3556 $coord = $max - $size if $coord > $max - $size; 3831 $coord = $max - $size if $coord > $max - $size;
3557 3832
3558 int $coord + 0.5 3833 int $coord + 0.5
3559} 3834}
3560 3835
3561sub size_allocate { 3836sub invoke_size_allocate {
3562 my ($self, $w, $h) = @_; 3837 my ($self, $w, $h) = @_;
3563 3838
3564 for my $child ($self->children) { 3839 for my $child ($self->children) {
3565 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)};
3566 3841
… …
3570 $X = _to_pixel $X, $W, $self->{w}; 3845 $X = _to_pixel $X, $W, $self->{w};
3571 $Y = _to_pixel $Y, $H, $self->{h}; 3846 $Y = _to_pixel $Y, $H, $self->{h};
3572 3847
3573 $child->configure ($X, $Y, $W, $H); 3848 $child->configure ($X, $Y, $W, $H);
3574 } 3849 }
3850
3851 1
3575} 3852}
3576 3853
3577sub coord2local { 3854sub coord2local {
3578 my ($self, $x, $y) = @_; 3855 my ($self, $x, $y) = @_;
3579 3856
… …
3705 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3982 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3706 3983
3707 $w = 0 if $w < 0; 3984 $w = 0 if $w < 0;
3708 $h = 0 if $h < 0; 3985 $h = 0 if $h < 0;
3709 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
3710 $w = int $w + 0.5; 3996 $w = int $w + 0.5;
3711 $h = int $h + 0.5; 3997 $h = int $h + 0.5;
3712 3998
3713 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}) {
3714 $widget->{old_w} = $widget->{w}; 4000 $widget->{old_w} = $widget->{w};
… …
3737 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4023 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3738 glMatrixMode GL_MODELVIEW; 4024 glMatrixMode GL_MODELVIEW;
3739 glLoadIdentity; 4025 glLoadIdentity;
3740 4026
3741 { 4027 {
3742 package CFClient::UI::Base; 4028 package CFPlus::UI::Base;
3743 4029
3744 ($draw_x, $draw_y, $draw_w, $draw_h) = 4030 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3745 (0, 0, $self->{w}, $self->{h}); 4031 (0, 0, $self->{w}, $self->{h});
3746 }
3747 4032
3748 $self->_draw; 4033 $self->_draw;
4034 }
3749} 4035}
3750 4036
3751############################################################################# 4037#############################################################################
3752 4038
3753package CFClient::UI; 4039package CFPlus::UI;
3754 4040
3755$ROOT = new CFClient::UI::Root; 4041$ROOT = new CFPlus::UI::Root;
3756$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4042$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3757 4043
37581 40441
3759 4045

Diff Legend

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