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.292 by root, Tue Jun 6 03:02:15 2006 UTC vs.
Revision 1.370 by root, Sun Jul 15 21:02:20 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFClient::Texture; 11use CFPlus::Texture;
12 12
13our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
14 14
15our $LAYOUT; 15our $LAYOUT;
16our $ROOT; 16our $ROOT;
… …
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) { 23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27 $TOOLTIP->hide; 28 $TOOLTIP->hide;
28 29
29 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30 32
31 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
32 34
33 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
34 36
… …
42 } 44 }
43 } 45 }
44 } 46 }
45 47
46 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
48}); 51});
49 52
50sub get_layout { 53sub get_layout {
51 my $layout; 54 my $layout;
… …
79sub feed_sdl_key_up_event { 82sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 83 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 84 if $FOCUS;
82} 85}
83 86
87sub check_hover {
88 my ($widget) = @_;
89
90 if ($widget != $HOVER) {
91 my $hover = $HOVER; $HOVER = $widget;
92
93 $hover->update if $hover && $hover->{can_hover};
94 $HOVER->update if $HOVER && $HOVER->{can_hover};
95
96 $TOOLTIP_WATCHER->start;
97 }
98}
99
84sub feed_sdl_button_down_event { 100sub feed_sdl_button_down_event {
85 my ($ev) = @_; 101 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 102 my ($x, $y) = ($ev->{x}, $ev->{y});
87 103
88 if (!$BUTTON_STATE) { 104 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
105
106 unless ($GRAB) {
89 my $widget = $ROOT->find_widget ($x, $y); 107 my $widget = $ROOT->find_widget ($x, $y);
90 108
91 $GRAB = $widget; 109 $GRAB = $widget;
92 $GRAB->update if $GRAB; 110 $GRAB->update if $GRAB;
93 111
94 $TOOLTIP_WATCHER->cb->(); 112 $TOOLTIP_WATCHER->cb->();
95 } 113 }
96 114
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 115 if ($GRAB) {
98 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 117 # mousewheel
100 if $GRAB; 118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9;
120 $GRAB->emit (mouse_wheel => $ev);
121 } else {
122 $GRAB->emit (button_down => $ev)
123 }
124 }
101} 125}
102 126
103sub feed_sdl_button_up_event { 127sub feed_sdl_button_up_event {
104 my ($ev) = @_; 128 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 129
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 130 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 131
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 132 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 133
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 134 $GRAB->emit (button_up => $ev)
112 if $GRAB; 135 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 136
114 if (!$BUTTON_STATE) { 137 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 138 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 139 $grab->update if $grab;
117 $GRAB->update if $GRAB; 140 $GRAB->update if $GRAB;
118 141
142 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 143 $TOOLTIP_WATCHER->cb->();
120 } 144 }
121} 145}
122 146
123sub feed_sdl_motion_event { 147sub feed_sdl_motion_event {
124 my ($ev) = @_; 148 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 149 my ($x, $y) = ($ev->{x}, $ev->{y});
126 150
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 151 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 152
129 if ($widget != $HOVER) { 153 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 154
132 $hover->update if $hover && $hover->{can_hover}; 155 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 156 if $HOVER;
140} 157}
141 158
142# convert position array to integers 159# convert position array to integers
143sub harmonize { 160sub harmonize {
… …
193 reconfigure_widgets; 210 reconfigure_widgets;
194} 211}
195 212
196############################################################################# 213#############################################################################
197 214
215package CFPlus::UI::Event;
216
217sub xy {
218 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
219}
220
221#############################################################################
222
198package CFClient::UI::Base; 223package CFPlus::UI::Base;
199 224
200use strict; 225use strict;
201 226
202use CFClient::OpenGL; 227use CFPlus::OpenGL;
203 228
204sub new { 229sub new {
205 my $class = shift; 230 my $class = shift;
206 231
207 my $self = bless { 232 my $self = bless {
… …
212 h => undef, 237 h => undef,
213 can_events => 1, 238 can_events => 1,
214 @_ 239 @_
215 }, $class; 240 }, $class;
216 241
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 243
219 for (keys %$self) { 244 for (keys %$self) {
220 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
222 } 247 }
223 } 248 }
224 249
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 250 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 251 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 252 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 253 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 254 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 255
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 256 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 257 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 258
234 $self->show if $layout->{show}; 259 $self->show if $layout->{show};
… …
239 264
240sub destroy { 265sub destroy {
241 my ($self) = @_; 266 my ($self) = @_;
242 267
243 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
244 %$self = (); 270 %$self = ();
245} 271}
246 272
273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} }
275}
276
247sub show { 277sub show {
248 my ($self) = @_; 278 my ($self) = @_;
249 279
250 return if $self->{parent}; 280 return if $self->{parent};
251 281
252 $CFClient::UI::ROOT->add ($self); 282 $CFPlus::UI::ROOT->add ($self);
253} 283}
254 284
255sub set_visible { 285sub set_visible {
256 my ($self) = @_; 286 my ($self) = @_;
257 287
… …
272 302
273 return unless $self->{visible}; 303 return unless $self->{visible};
274 304
275 $_->set_invisible for $self->children; 305 $_->set_invisible for $self->children;
276 306
307 delete $self->{visible};
277 delete $self->{root}; 308 delete $self->{root};
278 delete $self->{visible};
279 309
280 undef $GRAB if $GRAB == $self; 310 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 311 undef $HOVER if $HOVER == $self;
282 312
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 313 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 314 if $TOOLTIP->{owner} == $self;
285 315
286 $self->focus_out; 316 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 317 $self->emit (visibility_change => 0);
289} 318}
290 319
291sub set_visibility { 320sub set_visibility {
292 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
293 322
294 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
295 324
296 $visible ? $self->hide 325 $visible ? $self->show
297 : $self->show; 326 : $self->hide;
298} 327}
299 328
300sub toggle_visibility { 329sub toggle_visibility {
301 my ($self) = @_; 330 my ($self) = @_;
302 331
… …
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::Table::;
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 $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
971 vertical => 1, 1057 vertical => 1,
972 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
973 on_changed => sub { 1059 on_changed => sub {
974 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
975 }, 1062 },
976 ; 1063 ;
977 1064
978 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1), 1066 vp => (new CFPlus::UI::ViewPort expand => 1),
1067 can_events => 1,
980 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
981 %arg, 1072 %arg,
982 ); 1073 );
983 1074
1075 $self->SUPER::add (0, 0, $self->{vp});
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078
985 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
986 1080
987 $self 1081 $self
988} 1082}
1083
1084#TODO# update range on size_allocate depending on child
989 1085
990sub add { 1086sub add {
991 my ($self, $widget) = @_; 1087 my ($self, $widget) = @_;
992 1088
993 $self->{vp}->add ($self->{child} = $widget); 1089 $self->{vp}->add ($self->{child} = $widget);
994} 1090}
995 1091
1092sub invoke_mouse_wheel {
1093 my ($self, $ev) = @_;
1094
1095 return 0 unless $ev->{dy}; # only vertical movements
1096
1097 $self->{vslider}->emit (mouse_wheel => $ev);
1098
1099 1
1100}
1101
1102sub update_slider {
1103 my ($self) = @_;
1104
1105 my ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w});
1106 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1107 #$self->{hslider}->set_visibility ($w1 != $w2);
1108
1109 my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h});
1110 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1111 #$self->{vslider}->set_visibility ($h1 != $h2);
1112}
1113
996sub update { 1114sub update {
997 my ($self) = @_; 1115 my ($self) = @_;
998 1116
999 $self->SUPER::update; 1117 $self->SUPER::update;
1000 1118 $self->update_slider;
1001 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1119}
1005 1120
1006sub size_allocate { 1121sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
1008 1123
1124 $self->update_slider;
1009 $self->SUPER::size_allocate ($w, $h); 1125 $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} 1126}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1127
1018############################################################################# 1128#############################################################################
1019 1129
1020package CFClient::UI::Frame; 1130package CFPlus::UI::Frame;
1021 1131
1022our @ISA = CFClient::UI::Bin::; 1132our @ISA = CFPlus::UI::Bin::;
1023 1133
1024use CFClient::OpenGL; 1134use CFPlus::OpenGL;
1025 1135
1026sub new { 1136sub new {
1027 my $class = shift; 1137 my $class = shift;
1028 1138
1029 $class->SUPER::new ( 1139 $class->SUPER::new (
… …
1055 $self->SUPER::_draw; 1165 $self->SUPER::_draw;
1056} 1166}
1057 1167
1058############################################################################# 1168#############################################################################
1059 1169
1060package CFClient::UI::FancyFrame; 1170package CFPlus::UI::FancyFrame;
1061 1171
1062our @ISA = CFClient::UI::Bin::; 1172our @ISA = CFPlus::UI::Bin::;
1063 1173
1064use CFClient::OpenGL; 1174use 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 1175
1074sub new { 1176sub new {
1075 my ($class, %arg) = @_; 1177 my ($class, %arg) = @_;
1076 1178
1077 my $title = delete $arg{title}; 1179 if ((exists $arg{label}) && !ref $arg{label}) {
1180 $arg{label} = new CFPlus::UI::Label
1181 align => 1,
1182 valign => 0,
1183 text => $arg{label},
1184 fontsize => ($arg{border} || 0.8) * 0.75;
1185 }
1186
1187 my $self = $class->SUPER::new (
1188 # label => "",
1189 fg => [0.6, 0.3, 0.1],
1190 border => 0.8,
1191 style => 'single',
1192 %arg,
1193 );
1194
1195 $self
1196}
1197
1198sub add {
1199 my ($self, @widgets) = @_;
1200
1201 $self->SUPER::add (@widgets);
1202 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1203}
1204
1205sub border {
1206 int $_[0]{border} * $::FONTSIZE
1207}
1208
1209sub size_request {
1210 my ($self) = @_;
1211
1212 ($self->{label_w}, undef) = $self->{label}->size_request
1213 if $self->{label};
1214
1215 my ($w, $h) = $self->SUPER::size_request;
1216
1217 (
1218 $w + $self->border * 2,
1219 $h + $self->border * 2,
1220 )
1221}
1222
1223sub invoke_size_allocate {
1224 my ($self, $w, $h) = @_;
1225
1226 my $border = $self->border;
1227
1228 $w -= List::Util::max 0, $border * 2;
1229 $h -= List::Util::max 0, $border * 2;
1230
1231 if (my $label = $self->{label}) {
1232 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1233 $label->{h} = List::Util::min $h, $border;
1234 $label->invoke_size_allocate ($label->{w}, $label->{h});
1235 }
1236
1237 $self->child->configure ($border, $border, $w, $h);
1238
1239 1
1240}
1241
1242sub _draw {
1243 my ($self) = @_;
1244
1245 my $child = $self->{children}[0];
1246
1247 my $border = $self->border;
1248 my ($w, $h) = ($self->{w}, $self->{h});
1249
1250 $child->draw;
1251
1252 glColor @{$self->{fg}};
1253 glBegin GL_LINE_STRIP;
1254 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1255 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1256 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1257 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1258 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1259 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1260 glEnd;
1261
1262 if ($self->{label}) {
1263 glTranslate $border * 2, 0;
1264 $self->{label}->_draw;
1265 }
1266}
1267
1268#############################################################################
1269
1270package CFPlus::UI::Toplevel;
1271
1272our @ISA = CFPlus::UI::Bin::;
1273
1274use CFPlus::OpenGL;
1275
1276my $bg =
1277 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1278 mipmap => 1, wrap => 1;
1279
1280my @border =
1281 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1282 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1283
1284sub new {
1285 my ($class, %arg) = @_;
1078 1286
1079 my $self = $class->SUPER::new ( 1287 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1288 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1289 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1290 border => 0.6,
1083 can_events => 1, 1291 can_events => 1,
1084 min_w => 16, 1292 min_w => 64,
1085 min_h => 16, 1293 min_h => 32,
1086 %arg, 1294 %arg,
1087 ); 1295 );
1088 1296
1089 $self->{title} = new CFClient::UI::Label 1297 $self->{title_widget} = new CFPlus::UI::Label
1090 align => 0, 1298 align => 0,
1091 valign => 1, 1299 valign => 1,
1092 text => $title, 1300 text => $self->{title},
1093 fontsize => $self->{border} 1301 fontsize => $self->{border},
1094 if defined $title; 1302 if exists $self->{title};
1303
1304 if ($self->{has_close_button}) {
1305 $self->{close_button} =
1306 new CFPlus::UI::ImageButton
1307 path => 'x1_close.png',
1308 on_activate => sub { $self->emit ("delete") };
1309
1310 $self->CFPlus::UI::Container::add ($self->{close_button});
1311 }
1095 1312
1096 $self 1313 $self
1097} 1314}
1098 1315
1099sub add { 1316sub add {
1100 my ($self, @widgets) = @_; 1317 my ($self, @widgets) = @_;
1101 1318
1102 $self->SUPER::add (@widgets); 1319 $self->SUPER::add (@widgets);
1320 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1321 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1322}
1105 1323
1106sub border { 1324sub border {
1107 int $_[0]{border} * $::FONTSIZE 1325 int $_[0]{border} * $::FONTSIZE
1108} 1326}
1109 1327
1110sub size_request { 1328sub size_request {
1111 my ($self) = @_; 1329 my ($self) = @_;
1112 1330
1113 $self->{title}->size_request 1331 $self->{title_widget}->size_request
1114 if $self->{title}; 1332 if $self->{title_widget};
1333
1334 $self->{close_button}->size_request
1335 if $self->{close_button};
1115 1336
1116 my ($w, $h) = $self->SUPER::size_request; 1337 my ($w, $h) = $self->SUPER::size_request;
1117 1338
1118 ( 1339 (
1119 $w + $self->border * 2, 1340 $w + $self->border * 2,
1120 $h + $self->border * 2, 1341 $h + $self->border * 2,
1121 ) 1342 )
1122} 1343}
1123 1344
1124sub size_allocate { 1345sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1346 my ($self, $w, $h) = @_;
1126 1347
1127 if ($self->{title}) { 1348 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1349 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1350 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1351 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1352 }
1132 1353
1133 my $border = $self->border; 1354 my $border = $self->border;
1134 1355
1135 $h -= List::Util::max 0, $border * 2; 1356 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1357 $w -= List::Util::max 0, $border * 2;
1358
1359 $self->child->configure ($border, $border, $w, $h);
1360
1361 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1362 if $self->{close_button};
1363
1364 1
1365}
1366
1367sub invoke_delete {
1368 my ($self) = @_;
1369
1370 $self->hide;
1137 1371
1138 $self->child->configure ($border, $border, $w, $h); 1372 1
1139} 1373}
1140 1374
1141sub button_down { 1375sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1376 my ($self, $ev, $x, $y) = @_;
1143 1377
1144 my ($w, $h) = @$self{qw(w h)}; 1378 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1379 my $border = $self->border;
1146 1380
… …
1177 1411
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1412 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1413
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1414 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1415 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1416 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1417 };
1184 } else { 1418 } else {
1185 return 0; 1419 return 0;
1186 } 1420 }
1187 1421
1188 1 1422 1
1189} 1423}
1190 1424
1191sub button_up { 1425sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1426 my ($self, $ev, $x, $y) = @_;
1193 1427
1194 !!delete $self->{motion} 1428 ! ! delete $self->{motion}
1195} 1429}
1196 1430
1197sub mouse_motion { 1431sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1432 my ($self, $ev, $x, $y) = @_;
1199 1433
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1434 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1435
1202 !!$self->{motion} 1436 ! ! $self->{motion}
1437}
1438
1439sub invoke_visibility_change {
1440 my ($self, $visible) = @_;
1441
1442 delete $self->{motion} unless $visible;
1443
1444 0
1203} 1445}
1204 1446
1205sub _draw { 1447sub _draw {
1206 my ($self) = @_; 1448 my ($self) = @_;
1207 1449
… …
1233 1475
1234 glDisable GL_TEXTURE_2D; 1476 glDisable GL_TEXTURE_2D;
1235 1477
1236 $child->draw; 1478 $child->draw;
1237 1479
1238 if ($self->{title}) { 1480 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1481 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1482 $self->{title_widget}->_draw;
1483
1484 glTranslate 0, - ($border - $self->{h});
1241 } 1485 }
1486
1487 $self->{close_button}->draw
1488 if $self->{close_button};
1242} 1489}
1243 1490
1244############################################################################# 1491#############################################################################
1245 1492
1246package CFClient::UI::Table; 1493package CFPlus::UI::Table;
1247 1494
1248our @ISA = CFClient::UI::Base::; 1495our @ISA = CFPlus::UI::Base::;
1249 1496
1250use List::Util qw(max sum); 1497use List::Util qw(max sum);
1251 1498
1252use CFClient::OpenGL; 1499use CFPlus::OpenGL;
1253 1500
1254sub new { 1501sub new {
1255 my $class = shift; 1502 my $class = shift;
1256 1503
1257 $class->SUPER::new ( 1504 $class->SUPER::new (
1258 col_expand => [], 1505 col_expand => [],
1506 row_expand => [],
1259 @_, 1507 @_,
1260 ) 1508 )
1261} 1509}
1262 1510
1263sub children { 1511sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1512 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265} 1513}
1266 1514
1267sub add { 1515sub add {
1268 my ($self, $x, $y, $child) = @_; 1516 my ($self) = shift;
1269 1517
1518 while (@_) {
1519 my ($x, $y, $child) = splice @_, 0, 3, ();
1270 $child->set_parent ($self); 1520 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1521 $self->{children}[$y][$x] = $child;
1522 }
1272 1523
1524 $self->{force_realloc} = 1;
1525 $self->{force_size_alloc} = 1;
1273 $self->realloc; 1526 $self->realloc;
1527}
1528
1529sub remove {
1530 my ($self, $child) = @_;
1531
1532 # TODO: not yet implemented
1274} 1533}
1275 1534
1276# TODO: move to container class maybe? send children a signal on removal? 1535# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1536sub clear {
1278 my ($self) = @_; 1537 my ($self) = @_;
… …
1319 (sum @$ws), 1578 (sum @$ws),
1320 (sum @$hs), 1579 (sum @$hs),
1321 ) 1580 )
1322} 1581}
1323 1582
1324sub size_allocate { 1583sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1584 my ($self, $w, $h) = @_;
1326 1585
1327 my ($ws, $hs) = $self->get_wh; 1586 my ($ws, $hs) = $self->get_wh;
1328 1587
1329 my $req_w = (sum @$ws) || 1; 1588 my $req_w = (sum @$ws) || 1;
1330 my $req_h = (sum @$hs) || 1; 1589 my $req_h = (sum @$hs) || 1;
1331 1590
1332 # TODO: nicer code && do row_expand 1591 # TODO: nicer code
1333 my @col_expand = @{$self->{col_expand}}; 1592 my @col_expand = @{$self->{col_expand}};
1334 @col_expand = (1) x @$ws unless @col_expand; 1593 @col_expand = (1) x @$ws unless @col_expand;
1335 my $col_expand = (sum @col_expand) || 1; 1594 my $col_expand = (sum @col_expand) || 1;
1336 1595
1337 # linearly scale sizes
1338 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1596 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340 1597
1341 CFClient::UI::harmonize $ws; 1598 CFPlus::UI::harmonize $ws;
1599
1600 my @row_expand = @{$self->{row_expand}};
1601 @row_expand = (1) x @$ws unless @row_expand;
1602 my $row_expand = (sum @row_expand) || 1;
1603
1604 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1605
1342 CFClient::UI::harmonize $hs; 1606 CFPlus::UI::harmonize $hs;
1343 1607
1344 my $y; 1608 my $y;
1345 1609
1346 for my $r (0 .. $#{$self->{children}}) { 1610 for my $r (0 .. $#{$self->{children}}) {
1347 my $row = $self->{children}[$r] 1611 my $row = $self->{children}[$r]
… …
1361 } 1625 }
1362 1626
1363 $y += $row_h; 1627 $y += $row_h;
1364 } 1628 }
1365 1629
1630 1
1366} 1631}
1367 1632
1368sub find_widget { 1633sub find_widget {
1369 my ($self, $x, $y) = @_; 1634 my ($self, $x, $y) = @_;
1370 1635
… …
1389 } 1654 }
1390} 1655}
1391 1656
1392############################################################################# 1657#############################################################################
1393 1658
1394package CFClient::UI::Box; 1659package CFPlus::UI::Box;
1395 1660
1396our @ISA = CFClient::UI::Container::; 1661our @ISA = CFPlus::UI::Container::;
1397 1662
1398sub size_request { 1663sub size_request {
1399 my ($self) = @_; 1664 my ($self) = @_;
1400 1665
1401 $self->{vertical} 1666 $self->{vertical}
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1672 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1673 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1674 )
1410} 1675}
1411 1676
1412sub size_allocate { 1677sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1678 my ($self, $w, $h) = @_;
1414 1679
1415 my $space = $self->{vertical} ? $h : $w; 1680 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1681 my @children = $self->visible_children;
1417 1682
1418 my @req; 1683 my @req;
1419 1684
1420 if ($self->{homogeneous}) { 1685 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1686 @req = ($space / (@children || 1)) x @children;
1422 } else { 1687 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1688 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1689 my $req = List::Util::sum @req;
1425 1690
1426 if ($req > $space) { 1691 if ($req > $space) {
1427 # ah well, not enough space 1692 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1693 $_ *= $space / $req for @req;
1429 } else { 1694 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1695 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1696
1432 $space = ($space - $req) / $expand; # remaining space to give away 1697 $space = ($space - $req) / $expand; # remaining space to give away
1433 1698
1434 $req[$_] += $space * $children->[$_]{expand} 1699 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1700 for 0 .. $#children;
1436 } 1701 }
1437 } 1702 }
1438 1703
1439 CFClient::UI::harmonize \@req; 1704 CFPlus::UI::harmonize \@req;
1440 1705
1441 my $pos = 0; 1706 my $pos = 0;
1442 for (0 .. $#$children) { 1707 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1708 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1709 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1710
1446 $pos += $alloc; 1711 $pos += $alloc;
1447 } 1712 }
1448 1713
1449 1 1714 1
1450} 1715}
1451 1716
1452############################################################################# 1717#############################################################################
1453 1718
1454package CFClient::UI::HBox; 1719package CFPlus::UI::HBox;
1455 1720
1456our @ISA = CFClient::UI::Box::; 1721our @ISA = CFPlus::UI::Box::;
1457 1722
1458sub new { 1723sub new {
1459 my $class = shift; 1724 my $class = shift;
1460 1725
1461 $class->SUPER::new ( 1726 $class->SUPER::new (
… …
1464 ) 1729 )
1465} 1730}
1466 1731
1467############################################################################# 1732#############################################################################
1468 1733
1469package CFClient::UI::VBox; 1734package CFPlus::UI::VBox;
1470 1735
1471our @ISA = CFClient::UI::Box::; 1736our @ISA = CFPlus::UI::Box::;
1472 1737
1473sub new { 1738sub new {
1474 my $class = shift; 1739 my $class = shift;
1475 1740
1476 $class->SUPER::new ( 1741 $class->SUPER::new (
… …
1479 ) 1744 )
1480} 1745}
1481 1746
1482############################################################################# 1747#############################################################################
1483 1748
1484package CFClient::UI::Label; 1749package CFPlus::UI::Label;
1485 1750
1486our @ISA = CFClient::UI::DrawBG::; 1751our @ISA = CFPlus::UI::DrawBG::;
1487 1752
1488use CFClient::OpenGL; 1753use CFPlus::OpenGL;
1489 1754
1490sub new { 1755sub new {
1491 my ($class, %arg) = @_; 1756 my ($class, %arg) = @_;
1492 1757
1493 my $self = $class->SUPER::new ( 1758 my $self = $class->SUPER::new (
… …
1496 #active_bg => none 1761 #active_bg => none
1497 #font => default_font 1762 #font => default_font
1498 #text => initial text 1763 #text => initial text
1499 #markup => initial narkup 1764 #markup => initial narkup
1500 #max_w => maximum pixel width 1765 #max_w => maximum pixel width
1766 #style => 0, # render flags
1501 ellipsise => 3, # end 1767 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1768 layout => (new CFPlus::Layout),
1503 fontsize => 1, 1769 fontsize => 1,
1504 align => -1, 1770 align => -1,
1505 valign => -1, 1771 valign => -1,
1506 padding_x => 2, 1772 padding_x => 2,
1507 padding_y => 2, 1773 padding_y => 2,
1508 can_events => 0, 1774 can_events => 0,
1509 %arg 1775 %arg
1510 ); 1776 );
1511 1777
1512 if (exists $self->{template}) { 1778 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1779 my $layout = new CFPlus::Layout;
1514 $layout->set_text (delete $self->{template}); 1780 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1781 $self->{template} = $layout;
1516 } 1782 }
1517 1783
1518 if (exists $self->{markup}) { 1784 if (exists $self->{markup}) {
… …
1522 } 1788 }
1523 1789
1524 $self 1790 $self
1525} 1791}
1526 1792
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1793sub update {
1538 my ($self) = @_; 1794 my ($self) = @_;
1539 1795
1540 delete $self->{texture}; 1796 delete $self->{texture};
1541 $self->SUPER::update; 1797 $self->SUPER::update;
… …
1552 my ($self, $text) = @_; 1808 my ($self, $text) = @_;
1553 1809
1554 return if $self->{text} eq "T$text"; 1810 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1811 $self->{text} = "T$text";
1556 1812
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1813 $self->{layout}->set_text ($text);
1559 1814
1560 delete $self->{size_req}; 1815 delete $self->{size_req};
1561 $self->realloc; 1816 $self->realloc;
1562 $self->update; 1817 $self->update;
… …
1568 return if $self->{text} eq "M$markup"; 1823 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1824 $self->{text} = "M$markup";
1570 1825
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1826 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1827
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1828 $self->{layout}->set_markup ($markup);
1575 1829
1576 delete $self->{size_req}; 1830 delete $self->{size_req};
1577 $self->realloc; 1831 $self->realloc;
1578 $self->update; 1832 $self->update;
… …
1590 1844
1591 my ($w, $h) = $self->{layout}->size; 1845 my ($w, $h) = $self->{layout}->size;
1592 1846
1593 if (exists $self->{template}) { 1847 if (exists $self->{template}) {
1594 $self->{template}->set_font ($self->{font}) if $self->{font}; 1848 $self->{template}->set_font ($self->{font}) if $self->{font};
1849 $self->{template}->set_width ($self->{max_w} || -1);
1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1850 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596 1851
1597 my ($w2, $h2) = $self->{template}->size; 1852 my ($w2, $h2) = $self->{template}->size;
1598 1853
1599 $w = List::Util::max $w, $w2; 1854 $w = List::Util::max $w, $w2;
… …
1604 }; 1859 };
1605 1860
1606 @{ $self->{size_req} } 1861 @{ $self->{size_req} }
1607} 1862}
1608 1863
1864sub baseline_shift {
1865 $_[0]{layout}->descent
1866}
1867
1609sub size_allocate { 1868sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1869 my ($self, $w, $h) = @_;
1611 1870
1612 delete $self->{ox}; 1871 delete $self->{ox};
1613 1872
1614 delete $self->{texture} 1873 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1874 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1875
1876 1
1616} 1877}
1617 1878
1618sub set_fontsize { 1879sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1880 my ($self, $fontsize) = @_;
1620 1881
1621 $self->{fontsize} = $fontsize; 1882 $self->{fontsize} = $fontsize;
1883 delete $self->{size_req};
1622 delete $self->{texture}; 1884 delete $self->{texture};
1623 1885
1624 $self->realloc; 1886 $self->realloc;
1625} 1887}
1626 1888
1627sub reconfigure { 1889sub reconfigure {
1628 my ($self) = @_; 1890 my ($self) = @_;
1629 1891
1630 delete $self->{size_req}; 1892 delete $self->{size_req};
1893 delete $self->{texture};
1631 1894
1632 $self->SUPER::reconfigure; 1895 $self->SUPER::reconfigure;
1633} 1896}
1634 1897
1635sub _draw { 1898sub _draw {
1636 my ($self) = @_; 1899 my ($self) = @_;
1637 1900
1638 $self->SUPER::_draw; # draw background, if applicable 1901 $self->SUPER::_draw; # draw background, if applicable
1639 1902
1640 my $tex = $self->{texture} ||= do { 1903 my $size = $self->{texture} ||= do {
1641 $self->{layout}->set_foreground (@{$self->{fg}}); 1904 $self->{layout}->set_foreground (@{$self->{fg}});
1642 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1905 $self->{layout}->set_font ($self->{font}) if $self->{font};
1643 $self->{layout}->set_width ($self->{w}); 1906 $self->{layout}->set_width ($self->{w});
1644 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1907 $self->{layout}->set_ellipsise ($self->{ellipsise});
1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1908 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1909 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1647 1910
1648 new_from_layout CFClient::Texture $self->{layout} 1911 [$self->{layout}->size]
1649 }; 1912 };
1650 1913
1651 unless (exists $self->{ox}) { 1914 unless (exists $self->{ox}) {
1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1915 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1916 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1654 : ($self->{w} - $tex->{w}) * 0.5); 1917 : ($self->{w} - $size->[0]) * 0.5);
1655 1918
1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1919 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1920 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1658 : ($self->{h} - $tex->{h}) * 0.5); 1921 : ($self->{h} - $size->[1]) * 0.5);
1659 }; 1922 };
1660 1923
1661 glEnable GL_TEXTURE_2D; 1924 my $w = List::Util::min $self->{w} + 4, $size->[0];
1925 my $h = List::Util::min $self->{h} + 2, $size->[1];
1662 1926
1663 if ($tex->{format} == GL_ALPHA) { 1927 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1665 glColor @{$self->{fg}};
1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1670 }
1671
1672 glDisable GL_TEXTURE_2D;
1673} 1928}
1674 1929
1675############################################################################# 1930#############################################################################
1676 1931
1677package CFClient::UI::EntryBase; 1932package CFPlus::UI::EntryBase;
1678 1933
1679our @ISA = CFClient::UI::Label::; 1934our @ISA = CFPlus::UI::Label::;
1680 1935
1681use CFClient::OpenGL; 1936use CFPlus::OpenGL;
1682 1937
1683sub new { 1938sub new {
1684 my $class = shift; 1939 my $class = shift;
1685 1940
1686 $class->SUPER::new ( 1941 $class->SUPER::new (
… …
1690 active_fg => [0, 0, 0], 1945 active_fg => [0, 0, 0],
1691 can_hover => 1, 1946 can_hover => 1,
1692 can_focus => 1, 1947 can_focus => 1,
1693 valign => 0, 1948 valign => 0,
1694 can_events => 1, 1949 can_events => 1,
1950 ellipsise => 0,
1695 #text => ... 1951 #text => ...
1696 #hidden => "*", 1952 #hidden => "*",
1697 @_ 1953 @_
1698 ) 1954 )
1699} 1955}
… …
1710 1966
1711 $text =~ s/./*/g if $self->{hidden}; 1967 $text =~ s/./*/g if $self->{hidden};
1712 $self->{layout}->set_text ("$text "); 1968 $self->{layout}->set_text ("$text ");
1713 delete $self->{size_req}; 1969 delete $self->{size_req};
1714 1970
1715 $self->_emit (changed => $self->{text}); 1971 $self->emit (changed => $self->{text});
1716 1972
1717 $self->realloc; 1973 $self->realloc;
1718 $self->update; 1974 $self->update;
1719} 1975}
1720 1976
… …
1735 my ($w, $h) = $self->SUPER::size_request; 1991 my ($w, $h) = $self->SUPER::size_request;
1736 1992
1737 ($w + 1, $h) # add 1 for cursor 1993 ($w + 1, $h) # add 1 for cursor
1738} 1994}
1739 1995
1740sub key_down { 1996sub invoke_key_down {
1741 my ($self, $ev) = @_; 1997 my ($self, $ev) = @_;
1742 1998
1743 my $mod = $ev->{mod}; 1999 my $mod = $ev->{mod};
1744 my $sym = $ev->{sym}; 2000 my $sym = $ev->{sym};
1745 my $uni = $ev->{unicode}; 2001 my $uni = $ev->{unicode};
1746 2002
1747 my $text = $self->get_text; 2003 my $text = $self->get_text;
2004
2005 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1748 2006
1749 if ($uni == 8) { 2007 if ($uni == 8) {
1750 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2008 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1751 } elsif ($uni == 127) { 2009 } elsif ($uni == 127) {
1752 substr $text, $self->{cursor}, 1, ""; 2010 substr $text, $self->{cursor}, 1, "";
1753 } elsif ($sym == CFClient::SDLK_LEFT) { 2011 } elsif ($sym == CFPlus::SDLK_LEFT) {
1754 --$self->{cursor} if $self->{cursor}; 2012 --$self->{cursor} if $self->{cursor};
1755 } elsif ($sym == CFClient::SDLK_RIGHT) { 2013 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1756 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2014 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1757 } elsif ($sym == CFClient::SDLK_HOME) { 2015 } elsif ($sym == CFPlus::SDLK_HOME) {
2016 # what a hack
2017 $self->{cursor} =
2018 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2019 ? length $1
2020 : 0;
2021 } elsif ($sym == CFPlus::SDLK_END) {
2022 # uh, again
2023 $self->{cursor} =
2024 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2025 ? $self->{cursor} + length $1
2026 : length $self->{text};
2027 } elsif ($uni == 21) { # ctrl-u
2028 $text = "";
1758 $self->{cursor} = 0; 2029 $self->{cursor} = 0;
1759 } elsif ($sym == CFClient::SDLK_END) {
1760 $self->{cursor} = length $text;
1761 } elsif ($uni == 27) { 2030 } elsif ($uni == 27) {
1762 $self->_emit ('escape'); 2031 $self->emit ('escape');
1763 } elsif ($uni) { 2032 } elsif ($uni == 0x0d) {
2033 substr $text, $self->{cursor}++, 0, "\012";
2034 } elsif ($uni >= 0x20) {
1764 substr $text, $self->{cursor}++, 0, chr $uni; 2035 substr $text, $self->{cursor}++, 0, chr $uni;
1765 } else { 2036 } else {
1766 return 0; 2037 return 0;
1767 } 2038 }
1768 2039
1769 $self->_set_text ($text); 2040 $self->_set_text ($text);
1770 2041
1771 $self->realloc; 2042 $self->realloc;
2043 $self->update;
1772 2044
1773 1 2045 1
1774} 2046}
1775 2047
1776sub focus_in { 2048sub invoke_focus_in {
1777 my ($self) = @_; 2049 my ($self) = @_;
1778 2050
1779 $self->{last_activity} = $::NOW; 2051 $self->{last_activity} = $::NOW;
1780 2052
1781 $self->SUPER::focus_in; 2053 $self->SUPER::invoke_focus_in
1782} 2054}
1783 2055
1784sub button_down { 2056sub invoke_button_down {
1785 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1786 2058
1787 $self->SUPER::button_down ($ev, $x, $y); 2059 $self->SUPER::invoke_button_down ($ev, $x, $y);
1788 2060
1789 my $idx = $self->{layout}->xy_to_index ($x, $y); 2061 my $idx = $self->{layout}->xy_to_index ($x, $y);
1790 2062
1791 # byte-index to char-index 2063 # byte-index to char-index
1792 my $text = $self->{text}; 2064 my $text = $self->{text};
1793 utf8::encode $text; 2065 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1794 $self->{cursor} = length substr $text, 0, $idx; 2066 $self->{cursor} = length $text;
1795 2067
1796 $self->_set_text ($self->{text}); 2068 $self->_set_text ($self->{text});
1797 $self->update; 2069 $self->update;
1798 2070
1799 1 2071 1
1800} 2072}
1801 2073
1802sub mouse_motion { 2074sub invoke_mouse_motion {
1803 my ($self, $ev, $x, $y) = @_; 2075 my ($self, $ev, $x, $y) = @_;
1804# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2076# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1805 2077
1806 0 2078 1
1807} 2079}
1808 2080
1809sub _draw { 2081sub _draw {
1810 my ($self) = @_; 2082 my ($self) = @_;
1811 2083
… …
1838 utf8::encode $text; 2110 utf8::encode $text;
1839 2111
1840 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2112 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1841 } 2113 }
1842 2114
1843 glColor @{$self->{fg}};
1844 glBegin GL_LINES; 2115 glBegin GL_LINES;
1845 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2116 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1846 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2117 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1847 glEnd; 2118 glEnd;
1848 } 2119 }
1849} 2120}
1850 2121
2122#############################################################################
2123
1851package CFClient::UI::Entry; 2124package CFPlus::UI::Entry;
1852 2125
1853our @ISA = CFClient::UI::EntryBase::; 2126our @ISA = CFPlus::UI::EntryBase::;
1854 2127
1855use CFClient::OpenGL; 2128use CFPlus::OpenGL;
1856 2129
1857sub key_down { 2130sub invoke_key_down {
1858 my ($self, $ev) = @_; 2131 my ($self, $ev) = @_;
1859 2132
1860 my $sym = $ev->{sym}; 2133 my $sym = $ev->{sym};
1861 2134
1862 if ($sym == 13) { 2135 if ($ev->{uni} == 0x0d || $sym == 13) {
1863 unshift @{$self->{history}}, 2136 unshift @{$self->{history}},
1864 my $txt = $self->get_text; 2137 my $txt = $self->get_text;
2138
1865 $self->{history_pointer} = -1; 2139 $self->{history_pointer} = -1;
1866 $self->{history_saveback} = ''; 2140 $self->{history_saveback} = '';
1867 $self->_emit (activate => $txt); 2141 $self->emit (activate => $txt);
1868 $self->update; 2142 $self->update;
1869 2143
1870 } elsif ($sym == CFClient::SDLK_UP) { 2144 } elsif ($sym == CFPlus::SDLK_UP) {
1871 if ($self->{history_pointer} < 0) { 2145 if ($self->{history_pointer} < 0) {
1872 $self->{history_saveback} = $self->get_text; 2146 $self->{history_saveback} = $self->get_text;
1873 } 2147 }
1874 if (@{$self->{history} || []} > 0) { 2148 if (@{$self->{history} || []} > 0) {
1875 $self->{history_pointer}++; 2149 $self->{history_pointer}++;
… …
1877 $self->{history_pointer} = @{$self->{history} || []} - 1; 2151 $self->{history_pointer} = @{$self->{history} || []} - 1;
1878 } 2152 }
1879 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2153 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1880 } 2154 }
1881 2155
1882 } elsif ($sym == CFClient::SDLK_DOWN) { 2156 } elsif ($sym == CFPlus::SDLK_DOWN) {
1883 $self->{history_pointer}--; 2157 $self->{history_pointer}--;
1884 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2158 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1885 2159
1886 if ($self->{history_pointer} >= 0) { 2160 if ($self->{history_pointer} >= 0) {
1887 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2161 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1888 } else { 2162 } else {
1889 $self->set_text ($self->{history_saveback}); 2163 $self->set_text ($self->{history_saveback});
1890 } 2164 }
1891 2165
1892 } else { 2166 } else {
1893 return $self->SUPER::key_down ($ev) 2167 return $self->SUPER::invoke_key_down ($ev)
1894 } 2168 }
1895 2169
1896 1 2170 1
1897} 2171}
1898 2172
1899############################################################################# 2173#############################################################################
1900 2174
2175package CFPlus::UI::TextEdit;
2176
2177our @ISA = CFPlus::UI::EntryBase::;
2178
2179use CFPlus::OpenGL;
2180
2181sub move_cursor_ver {
2182 my ($self, $dy) = @_;
2183
2184 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2185
2186 $y += $dy;
2187
2188 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2189 $self->{cursor} = $index;
2190 delete $self->{cur_h};
2191 $self->update;
2192 return;
2193 }
2194}
2195
2196sub invoke_key_down {
2197 my ($self, $ev) = @_;
2198
2199 my $sym = $ev->{sym};
2200
2201 if ($sym == CFPlus::SDLK_UP) {
2202 $self->move_cursor_ver (-1);
2203 } elsif ($sym == CFPlus::SDLK_DOWN) {
2204 $self->move_cursor_ver (+1);
2205 } else {
2206 return $self->SUPER::invoke_key_down ($ev)
2207 }
2208
2209 1
2210}
2211
2212#############################################################################
2213
1901package CFClient::UI::Button; 2214package CFPlus::UI::Button;
1902 2215
1903our @ISA = CFClient::UI::Label::; 2216our @ISA = CFPlus::UI::Label::;
1904 2217
1905use CFClient::OpenGL; 2218use CFPlus::OpenGL;
1906 2219
1907my @tex = 2220my @tex =
1908 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2221 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1909 qw(b1_button_active.png); 2222 qw(b1_button_active.png);
1910 2223
1911sub new { 2224sub new {
1912 my $class = shift; 2225 my $class = shift;
1913 2226
… …
1922 can_events => 1, 2235 can_events => 1,
1923 @_ 2236 @_
1924 ) 2237 )
1925} 2238}
1926 2239
1927sub activate { }
1928
1929sub button_up { 2240sub invoke_button_up {
1930 my ($self, $ev, $x, $y) = @_; 2241 my ($self, $ev, $x, $y) = @_;
1931 2242
1932 $self->emit ("activate") 2243 $self->emit ("activate")
1933 if $x >= 0 && $x < $self->{w} 2244 if $x >= 0 && $x < $self->{w}
1934 && $y >= 0 && $y < $self->{h}; 2245 && $y >= 0 && $y < $self->{h};
… …
1952 $self->SUPER::_draw; 2263 $self->SUPER::_draw;
1953} 2264}
1954 2265
1955############################################################################# 2266#############################################################################
1956 2267
1957package CFClient::UI::CheckBox; 2268package CFPlus::UI::CheckBox;
1958 2269
1959our @ISA = CFClient::UI::DrawBG::; 2270our @ISA = CFPlus::UI::DrawBG::;
1960 2271
1961my @tex = 2272my @tex =
1962 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2273 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1963 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2274 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1964 2275
1965use CFClient::OpenGL; 2276use CFPlus::OpenGL;
1966 2277
1967sub new { 2278sub new {
1968 my $class = shift; 2279 my $class = shift;
1969 2280
1970 $class->SUPER::new ( 2281 $class->SUPER::new (
… …
1984 my ($self) = @_; 2295 my ($self) = @_;
1985 2296
1986 (6) x 2 2297 (6) x 2
1987} 2298}
1988 2299
2300sub toggle {
2301 my ($self) = @_;
2302
2303 $self->{state} = !$self->{state};
2304 $self->emit (changed => $self->{state});
2305 $self->update;
2306}
2307
1989sub button_down { 2308sub invoke_button_down {
1990 my ($self, $ev, $x, $y) = @_; 2309 my ($self, $ev, $x, $y) = @_;
1991 2310
1992 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2311 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1993 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2312 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1994 $self->{state} = !$self->{state}; 2313 $self->toggle;
1995 $self->_emit (changed => $self->{state});
1996 } else { 2314 } else {
1997 return 0 2315 return 0
1998 } 2316 }
1999 2317
2000 1 2318 1
… …
2020 glDisable GL_TEXTURE_2D; 2338 glDisable GL_TEXTURE_2D;
2021} 2339}
2022 2340
2023############################################################################# 2341#############################################################################
2024 2342
2025package CFClient::UI::Image; 2343package CFPlus::UI::Image;
2026 2344
2027our @ISA = CFClient::UI::Base::; 2345our @ISA = CFPlus::UI::Base::;
2028 2346
2029use CFClient::OpenGL; 2347use CFPlus::OpenGL;
2030use Carp qw/confess/;
2031 2348
2032our %loaded_images; 2349our %texture_cache;
2033 2350
2034sub new { 2351sub new {
2035 my $class = shift; 2352 my $class = shift;
2036 2353
2037 my $self = $class->SUPER::new (can_events => 0, @_); 2354 my $self = $class->SUPER::new (
2355 can_events => 0,
2356 @_,
2357 );
2038 2358
2039 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2359 $self->{path} || $self->{tex}
2360 or Carp::croak "'path' or 'tex' attributes required";
2040 2361
2041 $loaded_images{$self->{image}} ||= 2362 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2042 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2363 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2043 2364
2044 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2365 CFPlus::weaken $texture_cache{$self->{path}};
2045 2366
2046 Scalar::Util::weaken $loaded_images{$self->{image}}; 2367 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2047
2048 $self->{aspect} = $tex->{w} / $tex->{h};
2049 2368
2050 $self 2369 $self
2051} 2370}
2052 2371
2372sub STORABLE_freeze {
2373 my ($self, $cloning) = @_;
2374
2375 $self->{path}
2376 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2377
2378 $self->{path}
2379}
2380
2381sub STORABLE_attach {
2382 my ($self, $cloning, $path) = @_;
2383
2384 $self->new (path => $path)
2385}
2386
2053sub size_request { 2387sub size_request {
2054 my ($self) = @_; 2388 my ($self) = @_;
2055 2389
2056 ($self->{tex}->{w}, $self->{tex}->{h}) 2390 ($self->{tex}{w}, $self->{tex}{h})
2057} 2391}
2058 2392
2059sub _draw { 2393sub _draw {
2060 my ($self) = @_; 2394 my ($self) = @_;
2061 2395
… …
2071 } 2405 }
2072 2406
2073 glEnable GL_TEXTURE_2D; 2407 glEnable GL_TEXTURE_2D;
2074 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2075 2409
2076 $tex->draw_quad_alpha (0, 0, $w, $h); 2410 $tex->draw_quad (0, 0, $w, $h);
2077 2411
2078 glDisable GL_TEXTURE_2D; 2412 glDisable GL_TEXTURE_2D;
2079} 2413}
2080 2414
2081############################################################################# 2415#############################################################################
2082 2416
2417package CFPlus::UI::ImageButton;
2418
2419our @ISA = CFPlus::UI::Image::;
2420
2421use CFPlus::OpenGL;
2422
2423my %textures;
2424
2425sub new {
2426 my $class = shift;
2427
2428 my $self = $class->SUPER::new (
2429 padding_x => 4,
2430 padding_y => 4,
2431 fg => [1, 1, 1],
2432 active_fg => [0, 0, 1],
2433 can_hover => 1,
2434 align => 0,
2435 valign => 0,
2436 can_events => 1,
2437 @_
2438 );
2439}
2440
2441sub invoke_button_up {
2442 my ($self, $ev, $x, $y) = @_;
2443
2444 $self->emit ("activate")
2445 if $x >= 0 && $x < $self->{w}
2446 && $y >= 0 && $y < $self->{h};
2447
2448 1
2449}
2450
2451#############################################################################
2452
2083package CFClient::UI::VGauge; 2453package CFPlus::UI::VGauge;
2084 2454
2085our @ISA = CFClient::UI::Base::; 2455our @ISA = CFPlus::UI::Base::;
2086 2456
2087use List::Util qw(min max); 2457use List::Util qw(min max);
2088 2458
2089use CFClient::OpenGL; 2459use CFPlus::OpenGL;
2090 2460
2091my %tex = ( 2461my %tex = (
2092 food => [ 2462 food => [
2093 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2463 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2094 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2464 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2095 ], 2465 ],
2096 grace => [ 2466 grace => [
2097 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2467 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2098 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2468 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2099 ], 2469 ],
2100 hp => [ 2470 hp => [
2101 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2471 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2102 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2472 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2103 ], 2473 ],
2104 mana => [ 2474 mana => [
2105 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2475 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2106 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2476 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2107 ], 2477 ],
2108); 2478);
2109 2479
2110# eg. VGauge->new (gauge => 'food'), default gauge: food 2480# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2170 my $ycut1 = max 0, min 1, $ycut; 2540 my $ycut1 = max 0, min 1, $ycut;
2171 my $ycut2 = max 0, min 1, $ycut - 1; 2541 my $ycut2 = max 0, min 1, $ycut - 1;
2172 2542
2173 my $h1 = $self->{h} * (1 - $ycut1); 2543 my $h1 = $self->{h} * (1 - $ycut1);
2174 my $h2 = $self->{h} * (1 - $ycut2); 2544 my $h2 = $self->{h} * (1 - $ycut2);
2545 my $h3 = $self->{h};
2546
2547 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2175 2548
2176 glEnable GL_BLEND; 2549 glEnable GL_BLEND;
2177 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2550 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2178 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2551 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2179 glEnable GL_TEXTURE_2D; 2552 glEnable GL_TEXTURE_2D;
… …
2198 2571
2199 if ($t3) { 2572 if ($t3) {
2200 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2573 glBindTexture GL_TEXTURE_2D, $t3->{name};
2201 glBegin GL_QUADS; 2574 glBegin GL_QUADS;
2202 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2575 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2203 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2576 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2204 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2577 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2205 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2578 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2206 glEnd; 2579 glEnd;
2207 } 2580 }
2208 2581
2209 glDisable GL_BLEND; 2582 glDisable GL_BLEND;
2210 glDisable GL_TEXTURE_2D; 2583 glDisable GL_TEXTURE_2D;
2211} 2584}
2212 2585
2213############################################################################# 2586#############################################################################
2214 2587
2215package CFClient::UI::Gauge; 2588package CFPlus::UI::Gauge;
2216 2589
2217our @ISA = CFClient::UI::VBox::; 2590our @ISA = CFPlus::UI::VBox::;
2218 2591
2219sub new { 2592sub new {
2220 my ($class, %arg) = @_; 2593 my ($class, %arg) = @_;
2221 2594
2222 my $self = $class->SUPER::new ( 2595 my $self = $class->SUPER::new (
… …
2224 can_hover => 1, 2597 can_hover => 1,
2225 can_events => 1, 2598 can_events => 1,
2226 %arg, 2599 %arg,
2227 ); 2600 );
2228 2601
2229 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2602 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2230 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2603 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2231 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2604 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2232 2605
2233 $self 2606 $self
2234} 2607}
2235 2608
2236sub set_fontsize { 2609sub set_fontsize {
… …
2257 $self->{value}->set_text ($val); 2630 $self->{value}->set_text ($val);
2258} 2631}
2259 2632
2260############################################################################# 2633#############################################################################
2261 2634
2262package CFClient::UI::Slider; 2635package CFPlus::UI::Slider;
2263 2636
2264use strict; 2637use strict;
2265 2638
2266use CFClient::OpenGL; 2639use CFPlus::OpenGL;
2267 2640
2268our @ISA = CFClient::UI::DrawBG::; 2641our @ISA = CFPlus::UI::DrawBG::;
2269 2642
2270my @tex = 2643my @tex =
2271 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2644 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2272 qw(s1_slider.png s1_slider_bg.png); 2645 qw(s1_slider.png s1_slider_bg.png);
2273 2646
2274sub new { 2647sub new {
2275 my $class = shift; 2648 my $class = shift;
2276 2649
… …
2297 $self->update; 2670 $self->update;
2298 2671
2299 $self 2672 $self
2300} 2673}
2301 2674
2302sub changed { }
2303
2304sub set_range { 2675sub set_range {
2305 my ($self, $range) = @_; 2676 my ($self, $range) = @_;
2306 2677
2307 ($range, $self->{range}) = ($self->{range}, $range); 2678 ($range, $self->{range}) = ($self->{range}, $range);
2308 2679
2309 $self->update
2310 if "@$range" ne "@{$self->{range}}"; 2680 if ("@$range" ne "@{$self->{range}}") {
2681 $self->update;
2682 $self->set_value ($self->{range}[0]);
2683 }
2311} 2684}
2312 2685
2313sub set_value { 2686sub set_value {
2314 my ($self, $value) = @_; 2687 my ($self, $value) = @_;
2315 2688
… …
2326 if $unit; 2699 if $unit;
2327 2700
2328 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2701 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2329 2702
2330 if ($value != $old_value) { 2703 if ($value != $old_value) {
2331 $self->_emit (changed => $value); 2704 $self->emit (changed => $value);
2332 $self->update; 2705 $self->update;
2333 } 2706 }
2334} 2707}
2335 2708
2336sub size_request { 2709sub size_request {
2337 my ($self) = @_; 2710 my ($self) = @_;
2338 2711
2339 ($self->{req_w}, $self->{req_h}) 2712 ($self->{req_w}, $self->{req_h})
2340} 2713}
2341 2714
2342sub button_down { 2715sub invoke_button_down {
2343 my ($self, $ev, $x, $y) = @_; 2716 my ($self, $ev, $x, $y) = @_;
2344 2717
2345 $self->SUPER::button_down ($ev, $x, $y); 2718 $self->SUPER::invoke_button_down ($ev, $x, $y);
2346 2719
2347 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2720 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2348 2721
2349 $self->mouse_motion ($ev, $x, $y) 2722 $self->invoke_mouse_motion ($ev, $x, $y)
2350} 2723}
2351 2724
2352sub mouse_motion { 2725sub invoke_mouse_motion {
2353 my ($self, $ev, $x, $y) = @_; 2726 my ($self, $ev, $x, $y) = @_;
2354 2727
2355 if ($GRAB == $self) { 2728 if ($GRAB == $self) {
2356 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2729 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2357 2730
… …
2363 } else { 2736 } else {
2364 return 0; 2737 return 0;
2365 } 2738 }
2366 2739
2367 1 2740 1
2741}
2742
2743sub invoke_mouse_wheel {
2744 my ($self, $ev) = @_;
2745
2746 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2747
2748 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2749
2750 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2751
2752 ! ! $delta
2368} 2753}
2369 2754
2370sub update { 2755sub update {
2371 my ($self) = @_; 2756 my ($self) = @_;
2372 2757
… …
2421 glDisable GL_TEXTURE_2D; 2806 glDisable GL_TEXTURE_2D;
2422} 2807}
2423 2808
2424############################################################################# 2809#############################################################################
2425 2810
2426package CFClient::UI::ValSlider; 2811package CFPlus::UI::ValSlider;
2427 2812
2428our @ISA = CFClient::UI::HBox::; 2813our @ISA = CFPlus::UI::HBox::;
2429 2814
2430sub new { 2815sub new {
2431 my ($class, %arg) = @_; 2816 my ($class, %arg) = @_;
2432 2817
2433 my $range = delete $arg{range}; 2818 my $range = delete $arg{range};
2434 2819
2435 my $self = $class->SUPER::new ( 2820 my $self = $class->SUPER::new (
2436 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2821 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2437 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2822 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2438 to_value => sub { shift }, 2823 to_value => sub { shift },
2439 from_value => sub { shift }, 2824 from_value => sub { shift },
2440 %arg, 2825 %arg,
2441 ); 2826 );
2442 2827
… …
2462sub set_range { shift->{slider}->set_range (@_) } 2847sub set_range { shift->{slider}->set_range (@_) }
2463sub set_value { shift->{slider}->set_value (@_) } 2848sub set_value { shift->{slider}->set_value (@_) }
2464 2849
2465############################################################################# 2850#############################################################################
2466 2851
2467package CFClient::UI::TextView; 2852package CFPlus::UI::TextScroller;
2468 2853
2469our @ISA = CFClient::UI::HBox::; 2854our @ISA = CFPlus::UI::HBox::;
2470 2855
2471use CFClient::OpenGL; 2856use CFPlus::OpenGL;
2472 2857
2473sub new { 2858sub new {
2474 my $class = shift; 2859 my $class = shift;
2475 2860
2476 my $self = $class->SUPER::new ( 2861 my $self = $class->SUPER::new (
2477 fontsize => 1, 2862 fontsize => 1,
2478 can_events => 0, 2863 can_events => 1,
2864 indent => 0,
2479 #font => default_font 2865 #font => default_font
2480 @_, 2866 @_,
2481 2867
2482 layout => (new CFClient::Layout 1), 2868 layout => (new CFPlus::Layout),
2483 par => [], 2869 par => [],
2870 max_par => 0,
2484 height => 0, 2871 height => 0,
2485 children => [ 2872 children => [
2486 (new CFClient::UI::Empty expand => 1), 2873 (new CFPlus::UI::Empty expand => 1),
2487 (new CFClient::UI::Slider vertical => 1), 2874 (new CFPlus::UI::Slider vertical => 1),
2488 ], 2875 ],
2489 ); 2876 );
2490 2877
2491 $self->{children}[1]->connect (changed => sub { $self->update }); 2878 $self->{children}[1]->connect (changed => sub { $self->update });
2492 2879
… …
2498 2885
2499 $self->{fontsize} = $fontsize; 2886 $self->{fontsize} = $fontsize;
2500 $self->reflow; 2887 $self->reflow;
2501} 2888}
2502 2889
2890sub size_request {
2891 my ($self) = @_;
2892
2893 my ($empty, $slider) = @{ $self->{children} };
2894
2895 local $self->{children} = [$empty, $slider];
2896 $self->SUPER::size_request
2897}
2898
2503sub size_allocate { 2899sub invoke_size_allocate {
2504 my ($self, $w, $h) = @_; 2900 my ($self, $w, $h) = @_;
2505 2901
2506 $self->SUPER::size_allocate ($w, $h); 2902 my ($empty, $slider, @other) = @{ $self->{children} };
2903 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2507 2904
2508 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2905 $self->{layout}->set_font ($self->{font}) if $self->{font};
2509 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2906 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2510 $self->{layout}->set_width ($self->{children}[0]{w}); 2907 $self->{layout}->set_width ($empty->{w});
2511 $self->{layout}->set_indent (-$self->{fontsize} * $::FONTSIZE * 4); 2908 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2512 2909
2513 $self->reflow; 2910 $self->reflow;
2514}
2515 2911
2516sub text_size { 2912 local $self->{children} = [$empty, $slider];
2913 $self->SUPER::invoke_size_allocate ($w, $h)
2914}
2915
2916sub invoke_mouse_wheel {
2517 my ($self, $text, $indent) = @_; 2917 my ($self, $ev) = @_;
2918
2919 return 0 unless $ev->{dy}; # only vertical movements
2920
2921 $self->{children}[1]->emit (mouse_wheel => $ev);
2922
2923 1
2924}
2925
2926sub get_layout {
2927 my ($self, $para) = @_;
2518 2928
2519 my $layout = $self->{layout}; 2929 my $layout = $self->{layout};
2520 2930
2931 $layout->set_font ($self->{font}) if $self->{font};
2932 $layout->set_foreground (@{$para->{fg}});
2521 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2933 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2522 $layout->set_width ($self->{children}[0]{w} - $indent); 2934 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2523 $layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4); 2935 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2524 $layout->set_markup ($text); 2936 $layout->set_markup ($para->{markup});
2937
2938 $layout->set_shapes (
2939 map
2940 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2941 @{$para->{widget}}
2525 2942 );
2943
2526 $layout->size 2944 $layout
2527} 2945}
2528 2946
2529sub reflow { 2947sub reflow {
2530 my ($self) = @_; 2948 my ($self) = @_;
2531 2949
… …
2538 2956
2539 # todo: base offset on lines or so, not on pixels 2957 # todo: base offset on lines or so, not on pixels
2540 $self->{children}[1]->set_value ($offset); 2958 $self->{children}[1]->set_value ($offset);
2541} 2959}
2542 2960
2961sub current_paragraph {
2962 my ($self) = @_;
2963
2964 $self->{top_paragraph} - 1
2965}
2966
2967sub scroll_to {
2968 my ($self, $para) = @_;
2969
2970 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2971
2972 $self->{scroll_to} = $para;
2973 $self->update;
2974}
2975
2543sub clear { 2976sub clear {
2544 my ($self) = @_; 2977 my ($self) = @_;
2978
2979 my (undef, undef, @other) = @{ $self->{children} };
2980 $self->remove ($_) for @other;
2545 2981
2546 $self->{par} = []; 2982 $self->{par} = [];
2547 $self->{height} = 0; 2983 $self->{height} = 0;
2548 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2984 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2549} 2985}
2550 2986
2551sub add_paragraph { 2987sub add_paragraph {
2552 my ($self, $color, $text, $indent) = @_; 2988 my $self = shift;
2553 2989
2554 for my $line (split /\n/, $text) { 2990 for my $para (@_) {
2555 my ($w, $h) = $self->text_size ($line); 2991 $para = {
2992 fg => [1, 1, 1, 1],
2993 indent => 0,
2994 markup => "",
2995 widget => [],
2996 ref $para ? %$para : (markup => $para),
2997 w => 1e10,
2998 wrapped => 1,
2999 };
3000
3001 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3002 push @{$self->{par}}, $para;
3003 }
3004
3005 if (my $max = $self->{max_par}) {
3006 shift @{$self->{par}} while @{$self->{par}} > $max;
3007 }
3008
3009 $self->{need_reflow}++;
3010 $self->update;
3011}
3012
3013sub scroll_to_bottom {
3014 my ($self) = @_;
3015
3016 $self->{scroll_to} = $#{$self->{par}};
3017 $self->update;
3018}
3019
3020sub force_uptodate {
3021 my ($self) = @_;
3022
3023 if (delete $self->{need_reflow}) {
3024 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3025
3026 my $height = 0;
3027
3028 for my $para (@{$self->{par}}) {
3029 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3030 my $layout = $self->get_layout ($para);
3031 my ($w, $h) = $layout->size;
3032
3033 $para->{w} = $w + $para->{indent};
3034 $para->{h} = $h;
3035 $para->{wrapped} = $layout->has_wrapped;
3036 }
3037
3038 $para->{y} = $height;
3039 $height += $para->{h};
3040 }
3041
2556 $self->{height} += $h; 3042 $self->{height} = $height;
2557 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3043 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2558 }
2559 3044
2560 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3045 delete $self->{texture};
3046 }
3047
3048 if (my $paridx = delete $self->{scroll_to}) {
3049 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3050 }
2561} 3051}
2562 3052
2563sub update { 3053sub update {
2564 my ($self) = @_; 3054 my ($self) = @_;
2565 3055
… …
2567 3057
2568 return unless $self->{h} > 0; 3058 return unless $self->{h} > 0;
2569 3059
2570 delete $self->{texture}; 3060 delete $self->{texture};
2571 3061
2572 $ROOT->on_post_alloc ($self, sub { 3062 $ROOT->on_post_alloc ($self => sub {
3063 $self->force_uptodate;
3064
2573 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3065 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2574 3066
2575 if (delete $self->{need_reflow}) {
2576 my $height = 0;
2577
2578 my $layout = $self->{layout};
2579
2580 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2581
2582 for (@{$self->{par}}) {
2583 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2584 $layout->set_width ($W - $_->[3]);
2585 $layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2586 $layout->set_markup ($_->[4]);
2587 my ($w, $h) = $layout->size;
2588 $_->[0] = $w + $_->[3];
2589 $_->[1] = $h;
2590 }
2591
2592 $height += $_->[1];
2593 }
2594
2595 $self->{height} = $height;
2596
2597 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2598
2599 delete $self->{texture};
2600 }
2601
2602 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3067 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2603 glClearColor 0, 0, 0, 0; 3068 glClearColor 0, 0, 0, 0;
2604 glClear GL_COLOR_BUFFER_BIT; 3069 glClear GL_COLOR_BUFFER_BIT;
2605 3070
3071 package CFPlus::UI::Base;
3072 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3073 (0, 0, $self->{w}, $self->{h});
3074
3075 my $top = int $self->{children}[1]{range}[0];
3076
3077 my $paridx = 0;
3078 my $top_paragraph;
2606 my $top = int $self->{children}[1]{range}[0]; 3079 my $top = int $self->{children}[1]{range}[0];
2607 3080
2608 my $y0 = $top; 3081 my $y0 = $top;
2609 my $y1 = $top + $H; 3082 my $y1 = $top + $H;
2610 3083
2611 my $y = 0;
2612
2613 my $layout = $self->{layout};
2614
2615 $layout->set_font ($self->{font}) if $self->{font};
2616
2617 glEnable GL_BLEND;
2618 #TODO# not correct in windows where rgba is forced off
2619 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2620
2621 for my $par (@{$self->{par}}) { 3084 for my $para (@{$self->{par}}) {
2622 my $h = $par->[1]; 3085 my $h = $para->{h};
3086 my $y = $para->{y};
2623 3087
2624 if ($y0 < $y + $h && $y < $y1) { 3088 if ($y0 < $y + $h && $y < $y1) {
2625 $layout->set_foreground (@{ $par->[2] }); 3089 my $layout = $self->get_layout ($para);
2626 $layout->set_width ($W - $par->[3]);
2627 $layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2628 $layout->set_markup ($par->[4]);
2629 3090
2630 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3091 $layout->render ($para->{indent}, $y - $y0);
2631 3092
2632 glRasterPos $par->[3], $y - $y0; 3093 if (my @w = @{ $para->{widget} }) {
2633 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3094 my @s = $layout->get_shapes;
3095
3096 for (@w) {
3097 my ($dx, $dy) = splice @s, 0, 2, ();
3098
3099 $_->{x} = $dx + $para->{indent};
3100 $_->{y} = $dy + $y - $y0;
3101
3102 $_->draw;
3103 }
3104 }
2634 } 3105 }
2635 3106
2636 $y += $h; 3107 $paridx++;
3108 $top_paragraph ||= $paridx if $y >= $top;
2637 } 3109 }
2638 3110
2639 glDisable GL_BLEND; 3111 $self->{top_paragraph} = $top_paragraph;
2640 }; 3112 };
2641 }); 3113 });
3114}
3115
3116sub reconfigure {
3117 my ($self) = @_;
3118
3119 $self->SUPER::reconfigure;
3120
3121 $_->{w} = 1e10 for @{ $self->{par} };
3122 $self->reflow;
2642} 3123}
2643 3124
2644sub _draw { 3125sub _draw {
2645 my ($self) = @_; 3126 my ($self) = @_;
2646 3127
… …
2649 glColor 0, 0, 0, 1; 3130 glColor 0, 0, 0, 1;
2650 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3131 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2651 glDisable GL_TEXTURE_2D; 3132 glDisable GL_TEXTURE_2D;
2652 3133
2653 $self->{children}[1]->draw; 3134 $self->{children}[1]->draw;
2654
2655} 3135}
2656 3136
2657############################################################################# 3137#############################################################################
2658 3138
2659package CFClient::UI::Animator; 3139package CFPlus::UI::Animator;
2660 3140
2661use CFClient::OpenGL; 3141use CFPlus::OpenGL;
2662 3142
2663our @ISA = CFClient::UI::Bin::; 3143our @ISA = CFPlus::UI::Bin::;
2664 3144
2665sub moveto { 3145sub moveto {
2666 my ($self, $x, $y) = @_; 3146 my ($self, $x, $y) = @_;
2667 3147
2668 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3148 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2696 glPopMatrix; 3176 glPopMatrix;
2697} 3177}
2698 3178
2699############################################################################# 3179#############################################################################
2700 3180
2701package CFClient::UI::Flopper; 3181package CFPlus::UI::Flopper;
2702 3182
2703our @ISA = CFClient::UI::Button::; 3183our @ISA = CFPlus::UI::Button::;
2704 3184
2705sub new { 3185sub new {
2706 my $class = shift; 3186 my $class = shift;
2707 3187
2708 my $self = $class->SUPER::new ( 3188 my $self = $class->SUPER::new (
… …
2720 $self->{other}->toggle_visibility; 3200 $self->{other}->toggle_visibility;
2721} 3201}
2722 3202
2723############################################################################# 3203#############################################################################
2724 3204
2725package CFClient::UI::Tooltip; 3205package CFPlus::UI::Tooltip;
2726 3206
2727our @ISA = CFClient::UI::Bin::; 3207our @ISA = CFPlus::UI::Bin::;
2728 3208
2729use CFClient::OpenGL; 3209use CFPlus::OpenGL;
2730 3210
2731sub new { 3211sub new {
2732 my $class = shift; 3212 my $class = shift;
2733 3213
2734 $class->SUPER::new ( 3214 $class->SUPER::new (
… …
2737 ) 3217 )
2738} 3218}
2739 3219
2740sub set_tooltip_from { 3220sub set_tooltip_from {
2741 my ($self, $widget) = @_; 3221 my ($self, $widget) = @_;
3222
3223 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3224 if $widget->{tooltip} =~ /^#(.*)$/;
2742 3225
2743 my $tooltip = $widget->{tooltip}; 3226 my $tooltip = $widget->{tooltip};
2744 3227
2745 if ($ENV{CFPLUS_DEBUG} & 2) { 3228 if ($ENV{CFPLUS_DEBUG} & 2) {
2746 $tooltip .= "\n\n" . (ref $widget) . "\n" 3229 $tooltip .= "\n\n" . (ref $widget) . "\n"
2747 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3230 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2748 . "req $widget->{req_w} $widget->{req_h}\n" 3231 . "req $widget->{req_w} $widget->{req_h}\n"
2749 . "visible $widget->{visible}"; 3232 . "visible $widget->{visible}";
2750 } 3233 }
2751 3234
3235 $tooltip =~ s/^\n+//;
3236 $tooltip =~ s/\n+$//;
3237
2752 $self->add (new CFClient::UI::Label 3238 $self->add (new CFPlus::UI::Label
2753 markup => $tooltip, 3239 markup => $tooltip,
2754 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3240 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2755 fontsize => 0.8, 3241 fontsize => 0.8,
2756 fg => [0, 0, 0, 1], 3242 style => 1, # FLAG_INVERSE
2757 ellipsise => 0, 3243 ellipsise => 0,
2758 font => ($widget->{tooltip_font} || $::FONT_PROP), 3244 font => ($widget->{tooltip_font} || $::FONT_PROP),
2759 ); 3245 );
2760} 3246}
2761 3247
… …
2765 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3251 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2766 3252
2767 ($w + 4, $h + 4) 3253 ($w + 4, $h + 4)
2768} 3254}
2769 3255
2770sub size_allocate { 3256sub invoke_size_allocate {
2771 my ($self, $w, $h) = @_; 3257 my ($self, $w, $h) = @_;
2772 3258
2773 $self->SUPER::size_allocate ($w - 4, $h - 4); 3259 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2774} 3260}
2775 3261
2776sub visibility_change { 3262sub invoke_visibility_change {
2777 my ($self, $visible) = @_; 3263 my ($self, $visible) = @_;
2778 3264
2779 return unless $visible; 3265 return unless $visible;
2780 3266
2781 $self->{root}->on_post_alloc ("move_$self" => sub { 3267 $self->{root}->on_post_alloc ("move_$self" => sub {
2782 my $widget = $self->{owner} 3268 my $widget = $self->{owner}
2783 or return; 3269 or return;
2784 3270
3271 if ($widget->{visible}) {
2785 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3272 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2786 3273
2787 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3274 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2788 if $x + $self->{w} > $::WIDTH; 3275 if $x + $self->{w} > $self->{root}{w};
2789 3276
2790 $self->move_abs ($x, $y); 3277 $self->move_abs ($x, $y);
3278 } else {
3279 $self->hide;
3280 }
2791 }); 3281 });
2792} 3282}
2793 3283
2794sub _draw { 3284sub _draw {
2795 my ($self) = @_; 3285 my ($self) = @_;
… …
2819 $self->SUPER::_draw; 3309 $self->SUPER::_draw;
2820} 3310}
2821 3311
2822############################################################################# 3312#############################################################################
2823 3313
2824package CFClient::UI::Face; 3314package CFPlus::UI::Face;
2825 3315
2826our @ISA = CFClient::UI::Base::; 3316our @ISA = CFPlus::UI::DrawBG::;
2827 3317
2828use CFClient::OpenGL; 3318use CFPlus::OpenGL;
2829 3319
2830sub new { 3320sub new {
2831 my $class = shift; 3321 my $class = shift;
2832 3322
2833 my $self = $class->SUPER::new ( 3323 my $self = $class->SUPER::new (
… …
2835 can_events => 0, 3325 can_events => 0,
2836 @_, 3326 @_,
2837 ); 3327 );
2838 3328
2839 if ($self->{anim} && $self->{animspeed}) { 3329 if ($self->{anim} && $self->{animspeed}) {
2840 Scalar::Util::weaken (my $widget = $self); 3330 CFPlus::weaken (my $widget = $self);
2841 3331
2842 $self->{timer} = Event->timer ( 3332 $self->{timer} = Event->timer (
2843 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3333 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2844 hard => 1, 3334 hard => 1,
2845 interval => $self->{animspeed}, 3335 interval => $self->{animspeed},
… …
2868sub _draw { 3358sub _draw {
2869 my ($self) = @_; 3359 my ($self) = @_;
2870 3360
2871 return unless $::CONN; 3361 return unless $::CONN;
2872 3362
3363 $self->SUPER::_draw;
3364
2873 my $face; 3365 my $face;
2874 3366
2875 if ($self->{frame}) { 3367 if ($self->{frame}) {
2876 my $anim = $::CONN->{anim}[$self->{anim}]; 3368 my $anim = $::CONN->{anim}[$self->{anim}];
2877 3369
… …
2888 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3380 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2889 glDisable GL_TEXTURE_2D; 3381 glDisable GL_TEXTURE_2D;
2890 } 3382 }
2891} 3383}
2892 3384
2893sub DESTROY { 3385sub destroy {
2894 my ($self) = @_; 3386 my ($self) = @_;
2895 3387
2896 $self->{timer}->cancel 3388 $self->{timer}->cancel
2897 if $self->{timer}; 3389 if $self->{timer};
2898 3390
2899 $self->SUPER::DESTROY; 3391 $self->SUPER::destroy;
2900} 3392}
2901 3393
2902############################################################################# 3394#############################################################################
2903 3395
2904package CFClient::UI::Buttonbar; 3396package CFPlus::UI::Buttonbar;
2905 3397
2906our @ISA = CFClient::UI::HBox::; 3398our @ISA = CFPlus::UI::HBox::;
2907 3399
2908# TODO: should actualyl wrap buttons and other goodies. 3400# TODO: should actually wrap buttons and other goodies.
2909 3401
2910############################################################################# 3402#############################################################################
2911 3403
2912package CFClient::UI::Menu; 3404package CFPlus::UI::Menu;
2913 3405
2914our @ISA = CFClient::UI::FancyFrame::; 3406our @ISA = CFPlus::UI::Toplevel::;
2915 3407
2916use CFClient::OpenGL; 3408use CFPlus::OpenGL;
2917 3409
2918sub new { 3410sub new {
2919 my $class = shift; 3411 my $class = shift;
2920 3412
2921 my $self = $class->SUPER::new ( 3413 my $self = $class->SUPER::new (
2922 items => [], 3414 items => [],
2923 z => 100, 3415 z => 100,
2924 @_, 3416 @_,
2925 ); 3417 );
2926 3418
2927 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3419 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2928 3420
2929 for my $item (@{ $self->{items} }) { 3421 for my $item (@{ $self->{items} }) {
2930 my ($widget, $cb, $tooltip) = @$item; 3422 my ($widget, $cb, $tooltip) = @$item;
2931 3423
2932 # handle various types of items, only text for now 3424 # handle various types of items, only text for now
2933 if (!ref $widget) { 3425 if (!ref $widget) {
3426 if ($widget =~ /\t/) {
3427 my ($left, $right) = split /\t/, $widget, 2;
3428
2934 $widget = new CFClient::UI::Label 3429 $widget = new CFPlus::UI::HBox
2935 can_hover => 1, 3430 can_hover => 1,
2936 can_events => 1, 3431 can_events => 1,
2937 text => $widget,
2938 tooltip => $tooltip 3432 tooltip => $tooltip,
3433 children => [
3434 (new CFPlus::UI::Label markup => $left, expand => 1),
3435 (new CFPlus::UI::Label markup => $right, align => +1),
3436 ],
3437 ;
3438
3439 } else {
3440 $widget = new CFPlus::UI::Label
3441 can_hover => 1,
3442 can_events => 1,
3443 markup => $widget,
3444 tooltip => $tooltip;
3445 }
2939 } 3446 }
2940 3447
2941 $self->{item}{$widget} = $item; 3448 $self->{item}{$widget} = $item;
2942 3449
2943 $self->{vbox}->add ($widget); 3450 $self->{vbox}->add ($widget);
… …
2948 3455
2949# popup given the event (must be a mouse button down event currently) 3456# popup given the event (must be a mouse button down event currently)
2950sub popup { 3457sub popup {
2951 my ($self, $ev) = @_; 3458 my ($self, $ev) = @_;
2952 3459
2953 $self->_emit ("popdown"); 3460 $self->emit ("popdown");
2954 3461
2955 # maybe save $GRAB? must be careful about events... 3462 # maybe save $GRAB? must be careful about events...
2956 $GRAB = $self; 3463 $GRAB = $self;
2957 $self->{button} = $ev->{button}; 3464 $self->{button} = $ev->{button};
2958 3465
2959 $self->show; 3466 $self->show;
2960 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3467 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2961} 3468}
2962 3469
2963sub mouse_motion { 3470sub invoke_mouse_motion {
2964 my ($self, $ev, $x, $y) = @_; 3471 my ($self, $ev, $x, $y) = @_;
2965 3472
2966 # TODO: should use vbox->find_widget or so 3473 # TODO: should use vbox->find_widget or so
2967 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3474 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2968 $self->{hover} = $self->{item}{$HOVER}; 3475 $self->{hover} = $self->{item}{$HOVER};
2969 3476
2970 0 3477 0
2971} 3478}
2972 3479
2973sub button_up { 3480sub invoke_button_up {
2974 my ($self, $ev, $x, $y) = @_; 3481 my ($self, $ev, $x, $y) = @_;
2975 3482
2976 if ($ev->{button} == $self->{button}) { 3483 if ($ev->{button} == $self->{button}) {
2977 undef $GRAB; 3484 undef $GRAB;
2978 $self->hide; 3485 $self->hide;
2979 3486
2980 $self->_emit ("popdown"); 3487 $self->emit ("popdown");
2981 $self->{hover}[1]->() if $self->{hover}; 3488 $self->{hover}[1]->() if $self->{hover};
2982 } else { 3489 } else {
2983 return 0 3490 return 0
2984 } 3491 }
2985 3492
2986 1 3493 1
2987} 3494}
2988 3495
2989############################################################################# 3496#############################################################################
2990 3497
2991package CFClient::UI::Multiplexer; 3498package CFPlus::UI::Multiplexer;
2992 3499
2993our @ISA = CFClient::UI::Container::; 3500our @ISA = CFPlus::UI::Container::;
2994 3501
2995sub new { 3502sub new {
2996 my $class = shift; 3503 my $class = shift;
2997 3504
2998 my $self = $class->SUPER::new ( 3505 my $self = $class->SUPER::new (
… …
3012 3519
3013 $self->{current} = $self->{children}[0] 3520 $self->{current} = $self->{children}[0]
3014 if @{ $self->{children} }; 3521 if @{ $self->{children} };
3015} 3522}
3016 3523
3524sub get_current_page {
3525 my ($self) = @_;
3526
3527 $self->{current}
3528}
3529
3017sub set_current_page { 3530sub set_current_page {
3018 my ($self, $page_or_widget) = @_; 3531 my ($self, $page_or_widget) = @_;
3019 3532
3020 my $widget = ref $page_or_widget 3533 my $widget = ref $page_or_widget
3021 ? $page_or_widget 3534 ? $page_or_widget
3022 : $self->{children}[$page_or_widget]; 3535 : $self->{children}[$page_or_widget];
3023 3536
3024 $self->{current} = $widget; 3537 $self->{current} = $widget;
3025 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3538 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3026 3539
3027 $self->_emit (page_changed => $self->{current}); 3540 $self->emit (page_changed => $self->{current});
3028 3541
3029 $self->realloc; 3542 $self->realloc;
3030} 3543}
3031 3544
3032sub visible_children { 3545sub visible_children {
… …
3037 my ($self) = @_; 3550 my ($self) = @_;
3038 3551
3039 $self->{current}->size_request 3552 $self->{current}->size_request
3040} 3553}
3041 3554
3042sub size_allocate { 3555sub invoke_size_allocate {
3043 my ($self, $w, $h) = @_; 3556 my ($self, $w, $h) = @_;
3044 3557
3045 $self->{current}->configure (0, 0, $w, $h); 3558 $self->{current}->configure (0, 0, $w, $h);
3559
3560 1
3046} 3561}
3047 3562
3048sub _draw { 3563sub _draw {
3049 my ($self) = @_; 3564 my ($self) = @_;
3050 3565
3051 $self->{current}->draw; 3566 $self->{current}->draw;
3052} 3567}
3053 3568
3054############################################################################# 3569#############################################################################
3055 3570
3056package CFClient::UI::Notebook; 3571package CFPlus::UI::Notebook;
3057 3572
3058our @ISA = CFClient::UI::VBox::; 3573our @ISA = CFPlus::UI::VBox::;
3059 3574
3060sub new { 3575sub new {
3061 my $class = shift; 3576 my $class = shift;
3062 3577
3063 my $self = $class->SUPER::new ( 3578 my $self = $class->SUPER::new (
3064 buttonbar => (new CFClient::UI::Buttonbar), 3579 buttonbar => (new CFPlus::UI::Buttonbar),
3065 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3580 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3066 # filter => # will be put between multiplexer and $self 3581 # filter => # will be put between multiplexer and $self
3067 @_, 3582 @_,
3068 ); 3583 );
3069 3584
3070 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3585 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3074} 3589}
3075 3590
3076sub add { 3591sub add {
3077 my ($self, $title, $widget, $tooltip) = @_; 3592 my ($self, $title, $widget, $tooltip) = @_;
3078 3593
3079 Scalar::Util::weaken $self; 3594 CFPlus::weaken $self;
3080 3595
3081 $self->{buttonbar}->add (new CFClient::UI::Button 3596 $self->{buttonbar}->add (new CFPlus::UI::Button
3082 markup => $title, 3597 markup => $title,
3083 tooltip => $tooltip, 3598 tooltip => $tooltip,
3084 on_activate => sub { $self->set_current_page ($widget) }, 3599 on_activate => sub { $self->set_current_page ($widget) },
3085 ); 3600 );
3086 3601
3087 $self->{multiplexer}->add ($widget); 3602 $self->{multiplexer}->add ($widget);
3088} 3603}
3089 3604
3605sub get_current_page {
3606 my ($self) = @_;
3607
3608 $self->{multiplexer}->get_current_page
3609}
3610
3090sub set_current_page { 3611sub set_current_page {
3091 my ($self, $page) = @_; 3612 my ($self, $page) = @_;
3092 3613
3093 $self->{multiplexer}->set_current_page ($page); 3614 $self->{multiplexer}->set_current_page ($page);
3094 $self->_emit (page_changed => $self->{multiplexer}{current}); 3615 $self->emit (page_changed => $self->{multiplexer}{current});
3095} 3616}
3096 3617
3097############################################################################# 3618#############################################################################
3098 3619
3099package CFClient::UI::Combobox; 3620package CFPlus::UI::Selector;
3100 3621
3101use utf8; 3622use utf8;
3102 3623
3103our @ISA = CFClient::UI::Button::; 3624our @ISA = CFPlus::UI::Button::;
3104 3625
3105sub new { 3626sub new {
3106 my $class = shift; 3627 my $class = shift;
3107 3628
3108 my $self = $class->SUPER::new ( 3629 my $self = $class->SUPER::new (
3109 options => [], # [title, value, tooltip], ... 3630 options => [], # [value, title, longdesc], ...
3110 value => undef, 3631 value => undef,
3111 @_, 3632 @_,
3112 ); 3633 );
3113 3634
3114 $self->_set_value ($self->{value}); 3635 $self->_set_value ($self->{value});
3115 3636
3116 $self 3637 $self
3117} 3638}
3118 3639
3119sub button_down { 3640sub invoke_button_down {
3120 my ($self, $ev) = @_; 3641 my ($self, $ev) = @_;
3121 3642
3122 my @menu_items; 3643 my @menu_items;
3123 3644
3124 for (@{ $self->{options} }) { 3645 for (@{ $self->{options} }) {
3125 my ($title, $value, $tooltip) = @$_; 3646 my ($value, $title, $tooltip) = @$_;
3126 3647
3127 push @menu_items, [$tooltip, sub { $self->set_value ($value) }]; 3648 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3128 } 3649 }
3129 3650
3130 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3651 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3131} 3652}
3132 3653
3133sub _set_value { 3654sub _set_value {
3134 my ($self, $value) = @_; 3655 my ($self, $value) = @_;
3135 3656
3136 my ($item) = grep $_->[1] eq $value, @{ $self->{options} } 3657 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3137 or return; 3658 or return;
3138 3659
3139 $self->{value} = $item->[1]; 3660 $self->{value} = $item->[0];
3140 $self->set_markup ("$item->[0] ⇓"); 3661 $self->set_markup ("$item->[1] ⇓");
3141 $self->set_tooltip ($item->[2]); 3662 $self->set_tooltip ($item->[2]);
3142} 3663}
3143 3664
3144sub set_value { 3665sub set_value {
3145 my ($self, $value) = @_; 3666 my ($self, $value) = @_;
3146 3667
3147 return unless $self->{value} ne $value; 3668 return unless $self->{value} ne $value;
3148 3669
3149 $self->_set_value ($value); 3670 $self->_set_value ($value);
3150 $self->_emit (changed => $value); 3671 $self->emit (changed => $value);
3151} 3672}
3152 3673
3153############################################################################# 3674#############################################################################
3154 3675
3155package CFClient::UI::Statusbox; 3676package CFPlus::UI::Statusbox;
3156 3677
3157our @ISA = CFClient::UI::VBox::; 3678our @ISA = CFPlus::UI::VBox::;
3158 3679
3159sub new { 3680sub new {
3160 my $class = shift; 3681 my $class = shift;
3161 3682
3162 my $self = $class->SUPER::new ( 3683 my $self = $class->SUPER::new (
3163 fontsize => 0.8, 3684 fontsize => 0.8,
3164 @_, 3685 @_,
3165 ); 3686 );
3166 3687
3167 Scalar::Util::weaken (my $this = $self); 3688 CFPlus::weaken (my $this = $self);
3168 3689
3169 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3690 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3170 3691
3171 $self 3692 $self
3172} 3693}
… …
3174sub reorder { 3695sub reorder {
3175 my ($self) = @_; 3696 my ($self) = @_;
3176 my $NOW = Time::HiRes::time; 3697 my $NOW = Time::HiRes::time;
3177 3698
3178 # freeze display when hovering over any label 3699 # freeze display when hovering over any label
3179 return if $CFClient::UI::TOOLTIP->{owner} 3700 return if $CFPlus::UI::TOOLTIP->{owner}
3180 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3701 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3181 values %{ $self->{item} }; 3702 values %{ $self->{item} };
3182 3703
3183 while (my ($k, $v) = each %{ $self->{item} }) { 3704 while (my ($k, $v) = each %{ $self->{item} }) {
3184 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3705 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3185 } 3706 }
… …
3206 for ($short) { 3727 for ($short) {
3207 s/^\s+//; 3728 s/^\s+//;
3208 s/\s+/ /g; 3729 s/\s+/ /g;
3209 } 3730 }
3210 3731
3211 new CFClient::UI::Label 3732 new CFPlus::UI::Label
3212 markup => $short, 3733 markup => $short,
3213 tooltip => $item->{tooltip}, 3734 tooltip => $item->{tooltip},
3214 tooltip_font => $::FONT_PROP, 3735 tooltip_font => $::FONT_PROP,
3215 tooltip_width => 0.67, 3736 tooltip_width => 0.67,
3216 fontsize => $item->{fontsize} || $self->{fontsize}, 3737 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3254 $item->{count}++; 3775 $item->{count}++;
3255 } else { 3776 } else {
3256 $item->{count} = 1; 3777 $item->{count} = 1;
3257 $item->{text} = $item->{tooltip} = $text; 3778 $item->{text} = $item->{tooltip} = $text;
3258 } 3779 }
3259 $item->{id} = ++$self->{id}; 3780 $item->{id} += 0.2;#d#
3260 $item->{timeout} = $timeout; 3781 $item->{timeout} = $timeout;
3261 delete $item->{label}; 3782 delete $item->{label};
3262 } else { 3783 } else {
3263 $self->{item}{$group} = { 3784 $self->{item}{$group} = {
3264 id => ++$self->{id}, 3785 id => ++$self->{id},
… …
3270 count => 1, 3791 count => 1,
3271 %arg, 3792 %arg,
3272 }; 3793 };
3273 } 3794 }
3274 3795
3796 $ROOT->on_refresh (reorder => sub {
3275 $self->reorder; 3797 $self->reorder;
3798 });
3276} 3799}
3277 3800
3278sub reconfigure { 3801sub reconfigure {
3279 my ($self) = @_; 3802 my ($self) = @_;
3280 3803
… …
3283 3806
3284 $self->reorder; 3807 $self->reorder;
3285 $self->SUPER::reconfigure; 3808 $self->SUPER::reconfigure;
3286} 3809}
3287 3810
3288sub DESTROY { 3811sub destroy {
3289 my ($self) = @_; 3812 my ($self) = @_;
3290 3813
3291 $self->{timer}->cancel; 3814 $self->{timer}->cancel;
3292 3815
3293 $self->SUPER::DESTROY; 3816 $self->SUPER::destroy;
3294} 3817}
3295 3818
3296############################################################################# 3819#############################################################################
3297 3820
3298package CFClient::UI::Inventory;
3299
3300our @ISA = CFClient::UI::ScrolledWindow::;
3301
3302sub new {
3303 my $class = shift;
3304
3305 my $self = $class->SUPER::new (
3306 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3307 @_,
3308 );
3309
3310 $self
3311}
3312
3313sub set_items {
3314 my ($self, $items) = @_;
3315
3316 $self->{child}->clear;
3317 return unless $items;
3318
3319 my @items = sort {
3320 ($a->{type} <=> $b->{type})
3321 or ($a->{name} cmp $b->{name})
3322 } @$items;
3323
3324 $self->{real_items} = \@items;
3325
3326 my $row = 0;
3327 for my $item (@items) {
3328 CFClient::Item::update_widgets $item;
3329
3330 $self->{child}->add (0, $row, $item->{face_widget});
3331 $self->{child}->add (1, $row, $item->{desc_widget});
3332 $self->{child}->add (2, $row, $item->{weight_widget});
3333
3334 $row++;
3335 }
3336}
3337
3338#############################################################################
3339
3340package CFClient::UI::BindEditor;
3341
3342our @ISA = CFClient::UI::FancyFrame::;
3343
3344sub new {
3345 my $class = shift;
3346
3347 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3348
3349 $self->add (my $vb = new CFClient::UI::VBox);
3350
3351
3352 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3353 text => "start recording",
3354 tooltip => "Start/Stops recording of actions."
3355 ."All subsequent actions after the recording started will be captured."
3356 ."The actions are displayed after the record was stopped."
3357 ."To bind the action you have to click on the 'Bind' button",
3358 on_activate => sub {
3359 unless ($self->{recording}) {
3360 $self->start;
3361 } else {
3362 $self->stop;
3363 }
3364 });
3365
3366 $vb->add (new CFClient::UI::Label text => "Actions:");
3367 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3368
3369 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3370 $vb->add (my $hb = new CFClient::UI::HBox);
3371 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3372 $hb->add (new CFClient::UI::Button
3373 text => "bind",
3374 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3375 on_activate => sub {
3376 $self->ask_for_bind;
3377 });
3378
3379 $vb->add (my $hb = new CFClient::UI::HBox);
3380 $hb->add (new CFClient::UI::Button
3381 text => "ok",
3382 expand => 1,
3383 tooltip => "This closes the binding editor and saves the binding",
3384 on_activate => sub {
3385 $self->hide;
3386 $self->commit;
3387 });
3388
3389 $hb->add (new CFClient::UI::Button
3390 text => "cancel",
3391 expand => 1,
3392 tooltip => "This closes the binding editor without saving",
3393 on_activate => sub {
3394 $self->hide;
3395 $self->{binding_cancel}->()
3396 if $self->{binding_cancel};
3397 });
3398
3399 $self->update_binding_widgets;
3400
3401 $self
3402}
3403
3404sub commit {
3405 my ($self) = @_;
3406 my ($mod, $sym, $cmds) = $self->get_binding;
3407 if ($sym != 0 && @$cmds > 0) {
3408 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3409 ."'. Don't forget 'Save Config'!");
3410 $self->{binding_change}->($mod, $sym, $cmds)
3411 if $self->{binding_change};
3412 } else {
3413 $::STATUSBOX->add ("No action bound, no key or action specified!");
3414 $self->{binding_cancel}->()
3415 if $self->{binding_cancel};
3416 }
3417}
3418
3419sub start {
3420 my ($self) = @_;
3421
3422 $self->{rec_btn}->set_text ("stop recording");
3423 $self->{recording} = 1;
3424 $self->clear_command_list;
3425 $::CONN->start_record if $::CONN;
3426}
3427
3428sub stop {
3429 my ($self) = @_;
3430
3431 $self->{rec_btn}->set_text ("start recording");
3432 $self->{recording} = 0;
3433
3434 my $rec;
3435 $rec = $::CONN->stop_record if $::CONN;
3436 return unless ref $rec eq 'ARRAY';
3437 $self->set_command_list ($rec);
3438}
3439
3440
3441sub ask_for_bind_and_commit {
3442 my ($self) = @_;
3443 $self->ask_for_bind (1);
3444}
3445
3446sub ask_for_bind {
3447 my ($self, $commit) = @_;
3448
3449 CFClient::Binder::open_binding_dialog (sub {
3450 my ($mod, $sym) = @_;
3451 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3452 $self->update_binding_widgets;
3453 $self->commit if $commit;
3454 });
3455}
3456
3457# $mod and $sym are the modifiers and key symbol
3458# $cmds is a array ref of strings (the commands)
3459# $cb is the callback that is executed on OK
3460# $ccb is the callback that is executed on CANCEL and
3461# when the binding was unsuccessful on OK
3462sub set_binding {
3463 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3464
3465 $self->clear_command_list;
3466 $self->{recording} = 0;
3467 $self->{rec_btn}->set_text ("start recording");
3468
3469 $self->{binding} = [$mod, $sym];
3470 $self->{commands} = $cmds;
3471
3472 $self->{binding_change} = $cb;
3473 $self->{binding_cancel} = $ccb;
3474
3475 $self->update_binding_widgets;
3476}
3477
3478# this is a shortcut method that asks for a binding
3479# and then just binds it.
3480sub do_quick_binding {
3481 my ($self, $cmds) = @_;
3482 $self->set_binding (undef, undef, $cmds, sub {
3483 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3484 });
3485 $self->ask_for_bind (1);
3486}
3487
3488sub update_binding_widgets {
3489 my ($self) = @_;
3490 my ($mod, $sym, $cmds) = $self->get_binding;
3491 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3492 $self->set_command_list ($cmds);
3493}
3494
3495sub get_binding {
3496 my ($self) = @_;
3497 return (
3498 $self->{binding}->[0],
3499 $self->{binding}->[1],
3500 [ grep { defined $_ } @{$self->{commands}} ]
3501 );
3502}
3503
3504sub clear_command_list {
3505 my ($self) = @_;
3506 $self->{cmdbox}->clear ();
3507}
3508
3509sub set_command_list {
3510 my ($self, $cmds) = @_;
3511
3512 $self->{cmdbox}->clear ();
3513 $self->{commands} = $cmds;
3514
3515 my $idx = 0;
3516
3517 for (@$cmds) {
3518 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3519
3520 my $i = $idx;
3521 $hb->add (new CFClient::UI::Label text => $_);
3522 $hb->add (new CFClient::UI::Button
3523 text => "delete",
3524 tooltip => "Deletes the action from the record",
3525 on_activate => sub {
3526 $self->{cmdbox}->remove ($hb);
3527 $cmds->[$i] = undef;
3528 });
3529
3530
3531 $idx++
3532 }
3533}
3534
3535#############################################################################
3536
3537package CFClient::UI::SpellList;
3538
3539our @ISA = CFClient::UI::Table::;
3540
3541sub new {
3542 my $class = shift;
3543
3544 my $self = $class->SUPER::new (
3545 binding => [],
3546 commands => [],
3547 @_,
3548 )
3549}
3550
3551my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3552 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3553my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3554 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3555my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3556 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3557
3558sub rebuild_spell_list {
3559 my ($self) = @_;
3560
3561 $CFClient::UI::ROOT->on_refresh ($self => sub {
3562 $self->clear;
3563
3564 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3565 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3566 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3567 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3568
3569 my $row = 0;
3570
3571 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3572 my $spell = $self->{spell}{$_};
3573
3574 $row++;
3575
3576 $self->add (0, $row, new CFClient::UI::Face
3577 face => $spell->{face},
3578 can_hover => 1,
3579 can_events => 1,
3580 tooltip => $spell->{message},
3581 );
3582
3583 $self->add (1, $row, new CFClient::UI::Label
3584 expand => 1,
3585 text => $spell->{name},
3586 can_hover => 1,
3587 can_events => 1,
3588 tooltip => $spell->{message},
3589 );
3590
3591 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3592 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3593 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3594
3595 # TODO: should be done via popup
3596 $self->add (5, $row, new CFClient::UI::Button
3597 text => "bind",
3598 tooltip => "bind spell readying (cast command) to key",
3599 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3600 );
3601 }
3602 });
3603}
3604
3605sub add_spell {
3606 my ($self, $spell) = @_;
3607
3608 $self->{spell}->{$spell->{name}} = $spell;
3609 $self->rebuild_spell_list;
3610}
3611
3612sub remove_spell {
3613 my ($self, $spell) = @_;
3614
3615 delete $self->{spell}->{$spell->{name}};
3616 $self->rebuild_spell_list;
3617}
3618
3619#############################################################################
3620
3621package CFClient::UI::Root; 3821package CFPlus::UI::Root;
3622 3822
3623our @ISA = CFClient::UI::Container::; 3823our @ISA = CFPlus::UI::Container::;
3624 3824
3625use List::Util qw(min max); 3825use List::Util qw(min max);
3626 3826
3627use CFClient::OpenGL; 3827use CFPlus::OpenGL;
3628 3828
3629sub new { 3829sub new {
3630 my $class = shift; 3830 my $class = shift;
3631 3831
3632 my $self = $class->SUPER::new ( 3832 my $self = $class->SUPER::new (
3633 visible => 1, 3833 visible => 1,
3634 @_, 3834 @_,
3635 ); 3835 );
3636 3836
3637 Scalar::Util::weaken ($self->{root} = $self); 3837 CFPlus::weaken ($self->{root} = $self);
3638 3838
3639 $self 3839 $self
3640} 3840}
3641 3841
3642sub size_request { 3842sub size_request {
… …
3657 $coord = $max - $size if $coord > $max - $size; 3857 $coord = $max - $size if $coord > $max - $size;
3658 3858
3659 int $coord + 0.5 3859 int $coord + 0.5
3660} 3860}
3661 3861
3662sub size_allocate { 3862sub invoke_size_allocate {
3663 my ($self, $w, $h) = @_; 3863 my ($self, $w, $h) = @_;
3664 3864
3665 for my $child ($self->children) { 3865 for my $child ($self->children) {
3666 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3866 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3667 3867
… …
3671 $X = _to_pixel $X, $W, $self->{w}; 3871 $X = _to_pixel $X, $W, $self->{w};
3672 $Y = _to_pixel $Y, $H, $self->{h}; 3872 $Y = _to_pixel $Y, $H, $self->{h};
3673 3873
3674 $child->configure ($X, $Y, $W, $H); 3874 $child->configure ($X, $Y, $W, $H);
3675 } 3875 }
3876
3877 1
3676} 3878}
3677 3879
3678sub coord2local { 3880sub coord2local {
3679 my ($self, $x, $y) = @_; 3881 my ($self, $x, $y) = @_;
3680 3882
… …
3806 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4008 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3807 4009
3808 $w = 0 if $w < 0; 4010 $w = 0 if $w < 0;
3809 $h = 0 if $h < 0; 4011 $h = 0 if $h < 0;
3810 4012
4013 $w = max $widget->{min_w}, $w;
4014 $h = max $widget->{min_h}, $h;
4015
4016# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4017# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4018
4019 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4020 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4021
3811 $w = int $w + 0.5; 4022 $w = int $w + 0.5;
3812 $h = int $h + 0.5; 4023 $h = int $h + 0.5;
3813 4024
3814 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4025 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3815 $widget->{old_w} = $widget->{w}; 4026 $widget->{old_w} = $widget->{w};
… …
3838 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4049 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3839 glMatrixMode GL_MODELVIEW; 4050 glMatrixMode GL_MODELVIEW;
3840 glLoadIdentity; 4051 glLoadIdentity;
3841 4052
3842 { 4053 {
3843 package CFClient::UI::Base; 4054 package CFPlus::UI::Base;
3844 4055
3845 ($draw_x, $draw_y, $draw_w, $draw_h) = 4056 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3846 (0, 0, $self->{w}, $self->{h}); 4057 (0, 0, $self->{w}, $self->{h});
3847 }
3848 4058
3849 $self->_draw; 4059 $self->_draw;
4060 }
3850} 4061}
3851 4062
3852############################################################################# 4063#############################################################################
3853 4064
3854package CFClient::UI; 4065package CFPlus::UI;
3855 4066
3856$ROOT = new CFClient::UI::Root; 4067$ROOT = new CFPlus::UI::Root;
3857$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4068$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3858 4069
38591 40701
3860 4071

Diff Legend

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