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.295 by root, Tue Jun 6 09:19:28 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;
1662
1663 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1924 my $w = List::Util::min $self->{w} + 4, $size->[0];
1664 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1925 my $h = List::Util::min $self->{h} + 2, $size->[1];
1665 1926
1666 if ($tex->{format} == GL_ALPHA) { 1927 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1668 glColor @{$self->{fg}};
1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1670 } else {
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1673 }
1674
1675 glDisable GL_TEXTURE_2D;
1676} 1928}
1677 1929
1678############################################################################# 1930#############################################################################
1679 1931
1680package CFClient::UI::EntryBase; 1932package CFPlus::UI::EntryBase;
1681 1933
1682our @ISA = CFClient::UI::Label::; 1934our @ISA = CFPlus::UI::Label::;
1683 1935
1684use CFClient::OpenGL; 1936use CFPlus::OpenGL;
1685 1937
1686sub new { 1938sub new {
1687 my $class = shift; 1939 my $class = shift;
1688 1940
1689 $class->SUPER::new ( 1941 $class->SUPER::new (
… …
1693 active_fg => [0, 0, 0], 1945 active_fg => [0, 0, 0],
1694 can_hover => 1, 1946 can_hover => 1,
1695 can_focus => 1, 1947 can_focus => 1,
1696 valign => 0, 1948 valign => 0,
1697 can_events => 1, 1949 can_events => 1,
1950 ellipsise => 0,
1698 #text => ... 1951 #text => ...
1699 #hidden => "*", 1952 #hidden => "*",
1700 @_ 1953 @_
1701 ) 1954 )
1702} 1955}
… …
1713 1966
1714 $text =~ s/./*/g if $self->{hidden}; 1967 $text =~ s/./*/g if $self->{hidden};
1715 $self->{layout}->set_text ("$text "); 1968 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req}; 1969 delete $self->{size_req};
1717 1970
1718 $self->_emit (changed => $self->{text}); 1971 $self->emit (changed => $self->{text});
1719 1972
1720 $self->realloc; 1973 $self->realloc;
1721 $self->update; 1974 $self->update;
1722} 1975}
1723 1976
… …
1738 my ($w, $h) = $self->SUPER::size_request; 1991 my ($w, $h) = $self->SUPER::size_request;
1739 1992
1740 ($w + 1, $h) # add 1 for cursor 1993 ($w + 1, $h) # add 1 for cursor
1741} 1994}
1742 1995
1743sub key_down { 1996sub invoke_key_down {
1744 my ($self, $ev) = @_; 1997 my ($self, $ev) = @_;
1745 1998
1746 my $mod = $ev->{mod}; 1999 my $mod = $ev->{mod};
1747 my $sym = $ev->{sym}; 2000 my $sym = $ev->{sym};
1748 my $uni = $ev->{unicode}; 2001 my $uni = $ev->{unicode};
1749 2002
1750 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;
1751 2006
1752 if ($uni == 8) { 2007 if ($uni == 8) {
1753 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2008 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1754 } elsif ($uni == 127) { 2009 } elsif ($uni == 127) {
1755 substr $text, $self->{cursor}, 1, ""; 2010 substr $text, $self->{cursor}, 1, "";
1756 } elsif ($sym == CFClient::SDLK_LEFT) { 2011 } elsif ($sym == CFPlus::SDLK_LEFT) {
1757 --$self->{cursor} if $self->{cursor}; 2012 --$self->{cursor} if $self->{cursor};
1758 } elsif ($sym == CFClient::SDLK_RIGHT) { 2013 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1759 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2014 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1760 } 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 = "";
1761 $self->{cursor} = 0; 2029 $self->{cursor} = 0;
1762 } elsif ($sym == CFClient::SDLK_END) {
1763 $self->{cursor} = length $text;
1764 } elsif ($uni == 27) { 2030 } elsif ($uni == 27) {
1765 $self->_emit ('escape'); 2031 $self->emit ('escape');
1766 } elsif ($uni) { 2032 } elsif ($uni == 0x0d) {
2033 substr $text, $self->{cursor}++, 0, "\012";
2034 } elsif ($uni >= 0x20) {
1767 substr $text, $self->{cursor}++, 0, chr $uni; 2035 substr $text, $self->{cursor}++, 0, chr $uni;
1768 } else { 2036 } else {
1769 return 0; 2037 return 0;
1770 } 2038 }
1771 2039
1772 $self->_set_text ($text); 2040 $self->_set_text ($text);
1773 2041
1774 $self->realloc; 2042 $self->realloc;
2043 $self->update;
1775 2044
1776 1 2045 1
1777} 2046}
1778 2047
1779sub focus_in { 2048sub invoke_focus_in {
1780 my ($self) = @_; 2049 my ($self) = @_;
1781 2050
1782 $self->{last_activity} = $::NOW; 2051 $self->{last_activity} = $::NOW;
1783 2052
1784 $self->SUPER::focus_in; 2053 $self->SUPER::invoke_focus_in
1785} 2054}
1786 2055
1787sub button_down { 2056sub invoke_button_down {
1788 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1789 2058
1790 $self->SUPER::button_down ($ev, $x, $y); 2059 $self->SUPER::invoke_button_down ($ev, $x, $y);
1791 2060
1792 my $idx = $self->{layout}->xy_to_index ($x, $y); 2061 my $idx = $self->{layout}->xy_to_index ($x, $y);
1793 2062
1794 # byte-index to char-index 2063 # byte-index to char-index
1795 my $text = $self->{text}; 2064 my $text = $self->{text};
1796 utf8::encode $text; 2065 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1797 $self->{cursor} = length substr $text, 0, $idx; 2066 $self->{cursor} = length $text;
1798 2067
1799 $self->_set_text ($self->{text}); 2068 $self->_set_text ($self->{text});
1800 $self->update; 2069 $self->update;
1801 2070
1802 1 2071 1
1803} 2072}
1804 2073
1805sub mouse_motion { 2074sub invoke_mouse_motion {
1806 my ($self, $ev, $x, $y) = @_; 2075 my ($self, $ev, $x, $y) = @_;
1807# 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#
1808 2077
1809 0 2078 1
1810} 2079}
1811 2080
1812sub _draw { 2081sub _draw {
1813 my ($self) = @_; 2082 my ($self) = @_;
1814 2083
… …
1841 utf8::encode $text; 2110 utf8::encode $text;
1842 2111
1843 @$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)
1844 } 2113 }
1845 2114
1846 glColor @{$self->{fg}};
1847 glBegin GL_LINES; 2115 glBegin GL_LINES;
1848 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};
1849 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};
1850 glEnd; 2118 glEnd;
1851 } 2119 }
1852} 2120}
1853 2121
2122#############################################################################
2123
1854package CFClient::UI::Entry; 2124package CFPlus::UI::Entry;
1855 2125
1856our @ISA = CFClient::UI::EntryBase::; 2126our @ISA = CFPlus::UI::EntryBase::;
1857 2127
1858use CFClient::OpenGL; 2128use CFPlus::OpenGL;
1859 2129
1860sub key_down { 2130sub invoke_key_down {
1861 my ($self, $ev) = @_; 2131 my ($self, $ev) = @_;
1862 2132
1863 my $sym = $ev->{sym}; 2133 my $sym = $ev->{sym};
1864 2134
1865 if ($sym == 13) { 2135 if ($ev->{uni} == 0x0d || $sym == 13) {
1866 unshift @{$self->{history}}, 2136 unshift @{$self->{history}},
1867 my $txt = $self->get_text; 2137 my $txt = $self->get_text;
2138
1868 $self->{history_pointer} = -1; 2139 $self->{history_pointer} = -1;
1869 $self->{history_saveback} = ''; 2140 $self->{history_saveback} = '';
1870 $self->_emit (activate => $txt); 2141 $self->emit (activate => $txt);
1871 $self->update; 2142 $self->update;
1872 2143
1873 } elsif ($sym == CFClient::SDLK_UP) { 2144 } elsif ($sym == CFPlus::SDLK_UP) {
1874 if ($self->{history_pointer} < 0) { 2145 if ($self->{history_pointer} < 0) {
1875 $self->{history_saveback} = $self->get_text; 2146 $self->{history_saveback} = $self->get_text;
1876 } 2147 }
1877 if (@{$self->{history} || []} > 0) { 2148 if (@{$self->{history} || []} > 0) {
1878 $self->{history_pointer}++; 2149 $self->{history_pointer}++;
… …
1880 $self->{history_pointer} = @{$self->{history} || []} - 1; 2151 $self->{history_pointer} = @{$self->{history} || []} - 1;
1881 } 2152 }
1882 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2153 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1883 } 2154 }
1884 2155
1885 } elsif ($sym == CFClient::SDLK_DOWN) { 2156 } elsif ($sym == CFPlus::SDLK_DOWN) {
1886 $self->{history_pointer}--; 2157 $self->{history_pointer}--;
1887 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2158 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1888 2159
1889 if ($self->{history_pointer} >= 0) { 2160 if ($self->{history_pointer} >= 0) {
1890 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2161 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1891 } else { 2162 } else {
1892 $self->set_text ($self->{history_saveback}); 2163 $self->set_text ($self->{history_saveback});
1893 } 2164 }
1894 2165
1895 } else { 2166 } else {
1896 return $self->SUPER::key_down ($ev) 2167 return $self->SUPER::invoke_key_down ($ev)
1897 } 2168 }
1898 2169
1899 1 2170 1
1900} 2171}
1901 2172
1902############################################################################# 2173#############################################################################
1903 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
1904package CFClient::UI::Button; 2214package CFPlus::UI::Button;
1905 2215
1906our @ISA = CFClient::UI::Label::; 2216our @ISA = CFPlus::UI::Label::;
1907 2217
1908use CFClient::OpenGL; 2218use CFPlus::OpenGL;
1909 2219
1910my @tex = 2220my @tex =
1911 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2221 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1912 qw(b1_button_active.png); 2222 qw(b1_button_active.png);
1913 2223
1914sub new { 2224sub new {
1915 my $class = shift; 2225 my $class = shift;
1916 2226
… …
1925 can_events => 1, 2235 can_events => 1,
1926 @_ 2236 @_
1927 ) 2237 )
1928} 2238}
1929 2239
1930sub activate { }
1931
1932sub button_up { 2240sub invoke_button_up {
1933 my ($self, $ev, $x, $y) = @_; 2241 my ($self, $ev, $x, $y) = @_;
1934 2242
1935 $self->emit ("activate") 2243 $self->emit ("activate")
1936 if $x >= 0 && $x < $self->{w} 2244 if $x >= 0 && $x < $self->{w}
1937 && $y >= 0 && $y < $self->{h}; 2245 && $y >= 0 && $y < $self->{h};
… …
1955 $self->SUPER::_draw; 2263 $self->SUPER::_draw;
1956} 2264}
1957 2265
1958############################################################################# 2266#############################################################################
1959 2267
1960package CFClient::UI::CheckBox; 2268package CFPlus::UI::CheckBox;
1961 2269
1962our @ISA = CFClient::UI::DrawBG::; 2270our @ISA = CFPlus::UI::DrawBG::;
1963 2271
1964my @tex = 2272my @tex =
1965 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2273 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1966 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2274 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1967 2275
1968use CFClient::OpenGL; 2276use CFPlus::OpenGL;
1969 2277
1970sub new { 2278sub new {
1971 my $class = shift; 2279 my $class = shift;
1972 2280
1973 $class->SUPER::new ( 2281 $class->SUPER::new (
… …
1987 my ($self) = @_; 2295 my ($self) = @_;
1988 2296
1989 (6) x 2 2297 (6) x 2
1990} 2298}
1991 2299
2300sub toggle {
2301 my ($self) = @_;
2302
2303 $self->{state} = !$self->{state};
2304 $self->emit (changed => $self->{state});
2305 $self->update;
2306}
2307
1992sub button_down { 2308sub invoke_button_down {
1993 my ($self, $ev, $x, $y) = @_; 2309 my ($self, $ev, $x, $y) = @_;
1994 2310
1995 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2311 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1996 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2312 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1997 $self->{state} = !$self->{state}; 2313 $self->toggle;
1998 $self->_emit (changed => $self->{state});
1999 } else { 2314 } else {
2000 return 0 2315 return 0
2001 } 2316 }
2002 2317
2003 1 2318 1
… …
2023 glDisable GL_TEXTURE_2D; 2338 glDisable GL_TEXTURE_2D;
2024} 2339}
2025 2340
2026############################################################################# 2341#############################################################################
2027 2342
2028package CFClient::UI::Image; 2343package CFPlus::UI::Image;
2029 2344
2030our @ISA = CFClient::UI::Base::; 2345our @ISA = CFPlus::UI::Base::;
2031 2346
2032use CFClient::OpenGL; 2347use CFPlus::OpenGL;
2033use Carp qw/confess/;
2034 2348
2035our %loaded_images; 2349our %texture_cache;
2036 2350
2037sub new { 2351sub new {
2038 my $class = shift; 2352 my $class = shift;
2039 2353
2040 my $self = $class->SUPER::new (can_events => 0, @_); 2354 my $self = $class->SUPER::new (
2355 can_events => 0,
2356 @_,
2357 );
2041 2358
2042 $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";
2043 2361
2044 $loaded_images{$self->{image}} ||= 2362 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2045 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;
2046 2364
2047 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2365 CFPlus::weaken $texture_cache{$self->{path}};
2048 2366
2049 Scalar::Util::weaken $loaded_images{$self->{image}}; 2367 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2050
2051 $self->{aspect} = $tex->{w} / $tex->{h};
2052 2368
2053 $self 2369 $self
2054} 2370}
2055 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
2056sub size_request { 2387sub size_request {
2057 my ($self) = @_; 2388 my ($self) = @_;
2058 2389
2059 ($self->{tex}->{w}, $self->{tex}->{h}) 2390 ($self->{tex}{w}, $self->{tex}{h})
2060} 2391}
2061 2392
2062sub _draw { 2393sub _draw {
2063 my ($self) = @_; 2394 my ($self) = @_;
2064 2395
… …
2074 } 2405 }
2075 2406
2076 glEnable GL_TEXTURE_2D; 2407 glEnable GL_TEXTURE_2D;
2077 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2078 2409
2079 $tex->draw_quad_alpha (0, 0, $w, $h); 2410 $tex->draw_quad (0, 0, $w, $h);
2080 2411
2081 glDisable GL_TEXTURE_2D; 2412 glDisable GL_TEXTURE_2D;
2082} 2413}
2083 2414
2084############################################################################# 2415#############################################################################
2085 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
2086package CFClient::UI::VGauge; 2453package CFPlus::UI::VGauge;
2087 2454
2088our @ISA = CFClient::UI::Base::; 2455our @ISA = CFPlus::UI::Base::;
2089 2456
2090use List::Util qw(min max); 2457use List::Util qw(min max);
2091 2458
2092use CFClient::OpenGL; 2459use CFPlus::OpenGL;
2093 2460
2094my %tex = ( 2461my %tex = (
2095 food => [ 2462 food => [
2096 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2463 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2097 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2464 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2098 ], 2465 ],
2099 grace => [ 2466 grace => [
2100 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2467 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2101 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/
2102 ], 2469 ],
2103 hp => [ 2470 hp => [
2104 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2471 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2105 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2472 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2106 ], 2473 ],
2107 mana => [ 2474 mana => [
2108 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2475 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2109 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/
2110 ], 2477 ],
2111); 2478);
2112 2479
2113# eg. VGauge->new (gauge => 'food'), default gauge: food 2480# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2173 my $ycut1 = max 0, min 1, $ycut; 2540 my $ycut1 = max 0, min 1, $ycut;
2174 my $ycut2 = max 0, min 1, $ycut - 1; 2541 my $ycut2 = max 0, min 1, $ycut - 1;
2175 2542
2176 my $h1 = $self->{h} * (1 - $ycut1); 2543 my $h1 = $self->{h} * (1 - $ycut1);
2177 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);
2178 2548
2179 glEnable GL_BLEND; 2549 glEnable GL_BLEND;
2180 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2550 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2181 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2551 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2182 glEnable GL_TEXTURE_2D; 2552 glEnable GL_TEXTURE_2D;
… …
2201 2571
2202 if ($t3) { 2572 if ($t3) {
2203 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2573 glBindTexture GL_TEXTURE_2D, $t3->{name};
2204 glBegin GL_QUADS; 2574 glBegin GL_QUADS;
2205 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2575 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2206 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2576 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2207 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2577 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2208 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2578 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2209 glEnd; 2579 glEnd;
2210 } 2580 }
2211 2581
2212 glDisable GL_BLEND; 2582 glDisable GL_BLEND;
2213 glDisable GL_TEXTURE_2D; 2583 glDisable GL_TEXTURE_2D;
2214} 2584}
2215 2585
2216############################################################################# 2586#############################################################################
2217 2587
2218package CFClient::UI::Gauge; 2588package CFPlus::UI::Gauge;
2219 2589
2220our @ISA = CFClient::UI::VBox::; 2590our @ISA = CFPlus::UI::VBox::;
2221 2591
2222sub new { 2592sub new {
2223 my ($class, %arg) = @_; 2593 my ($class, %arg) = @_;
2224 2594
2225 my $self = $class->SUPER::new ( 2595 my $self = $class->SUPER::new (
… …
2227 can_hover => 1, 2597 can_hover => 1,
2228 can_events => 1, 2598 can_events => 1,
2229 %arg, 2599 %arg,
2230 ); 2600 );
2231 2601
2232 $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");
2233 $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);
2234 $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");
2235 2605
2236 $self 2606 $self
2237} 2607}
2238 2608
2239sub set_fontsize { 2609sub set_fontsize {
… …
2260 $self->{value}->set_text ($val); 2630 $self->{value}->set_text ($val);
2261} 2631}
2262 2632
2263############################################################################# 2633#############################################################################
2264 2634
2265package CFClient::UI::Slider; 2635package CFPlus::UI::Slider;
2266 2636
2267use strict; 2637use strict;
2268 2638
2269use CFClient::OpenGL; 2639use CFPlus::OpenGL;
2270 2640
2271our @ISA = CFClient::UI::DrawBG::; 2641our @ISA = CFPlus::UI::DrawBG::;
2272 2642
2273my @tex = 2643my @tex =
2274 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2644 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2275 qw(s1_slider.png s1_slider_bg.png); 2645 qw(s1_slider.png s1_slider_bg.png);
2276 2646
2277sub new { 2647sub new {
2278 my $class = shift; 2648 my $class = shift;
2279 2649
… …
2300 $self->update; 2670 $self->update;
2301 2671
2302 $self 2672 $self
2303} 2673}
2304 2674
2305sub changed { }
2306
2307sub set_range { 2675sub set_range {
2308 my ($self, $range) = @_; 2676 my ($self, $range) = @_;
2309 2677
2310 ($range, $self->{range}) = ($self->{range}, $range); 2678 ($range, $self->{range}) = ($self->{range}, $range);
2311 2679
… …
2331 if $unit; 2699 if $unit;
2332 2700
2333 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2701 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2334 2702
2335 if ($value != $old_value) { 2703 if ($value != $old_value) {
2336 $self->_emit (changed => $value); 2704 $self->emit (changed => $value);
2337 $self->update; 2705 $self->update;
2338 } 2706 }
2339} 2707}
2340 2708
2341sub size_request { 2709sub size_request {
2342 my ($self) = @_; 2710 my ($self) = @_;
2343 2711
2344 ($self->{req_w}, $self->{req_h}) 2712 ($self->{req_w}, $self->{req_h})
2345} 2713}
2346 2714
2347sub button_down { 2715sub invoke_button_down {
2348 my ($self, $ev, $x, $y) = @_; 2716 my ($self, $ev, $x, $y) = @_;
2349 2717
2350 $self->SUPER::button_down ($ev, $x, $y); 2718 $self->SUPER::invoke_button_down ($ev, $x, $y);
2351 2719
2352 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2720 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2353 2721
2354 $self->mouse_motion ($ev, $x, $y) 2722 $self->invoke_mouse_motion ($ev, $x, $y)
2355} 2723}
2356 2724
2357sub mouse_motion { 2725sub invoke_mouse_motion {
2358 my ($self, $ev, $x, $y) = @_; 2726 my ($self, $ev, $x, $y) = @_;
2359 2727
2360 if ($GRAB == $self) { 2728 if ($GRAB == $self) {
2361 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2729 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2362 2730
… …
2368 } else { 2736 } else {
2369 return 0; 2737 return 0;
2370 } 2738 }
2371 2739
2372 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
2373} 2753}
2374 2754
2375sub update { 2755sub update {
2376 my ($self) = @_; 2756 my ($self) = @_;
2377 2757
… …
2426 glDisable GL_TEXTURE_2D; 2806 glDisable GL_TEXTURE_2D;
2427} 2807}
2428 2808
2429############################################################################# 2809#############################################################################
2430 2810
2431package CFClient::UI::ValSlider; 2811package CFPlus::UI::ValSlider;
2432 2812
2433our @ISA = CFClient::UI::HBox::; 2813our @ISA = CFPlus::UI::HBox::;
2434 2814
2435sub new { 2815sub new {
2436 my ($class, %arg) = @_; 2816 my ($class, %arg) = @_;
2437 2817
2438 my $range = delete $arg{range}; 2818 my $range = delete $arg{range};
2439 2819
2440 my $self = $class->SUPER::new ( 2820 my $self = $class->SUPER::new (
2441 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2821 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2442 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2822 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2443 to_value => sub { shift }, 2823 to_value => sub { shift },
2444 from_value => sub { shift }, 2824 from_value => sub { shift },
2445 %arg, 2825 %arg,
2446 ); 2826 );
2447 2827
… …
2467sub set_range { shift->{slider}->set_range (@_) } 2847sub set_range { shift->{slider}->set_range (@_) }
2468sub set_value { shift->{slider}->set_value (@_) } 2848sub set_value { shift->{slider}->set_value (@_) }
2469 2849
2470############################################################################# 2850#############################################################################
2471 2851
2472package CFClient::UI::TextView; 2852package CFPlus::UI::TextScroller;
2473 2853
2474our @ISA = CFClient::UI::HBox::; 2854our @ISA = CFPlus::UI::HBox::;
2475 2855
2476use CFClient::OpenGL; 2856use CFPlus::OpenGL;
2477 2857
2478sub new { 2858sub new {
2479 my $class = shift; 2859 my $class = shift;
2480 2860
2481 my $self = $class->SUPER::new ( 2861 my $self = $class->SUPER::new (
2482 fontsize => 1, 2862 fontsize => 1,
2483 can_events => 0, 2863 can_events => 1,
2484 indent => 0, 2864 indent => 0,
2485 #font => default_font 2865 #font => default_font
2486 @_, 2866 @_,
2487 2867
2488 layout => (new CFClient::Layout 1), 2868 layout => (new CFPlus::Layout),
2489 par => [], 2869 par => [],
2870 max_par => 0,
2490 height => 0, 2871 height => 0,
2491 children => [ 2872 children => [
2492 (new CFClient::UI::Empty expand => 1), 2873 (new CFPlus::UI::Empty expand => 1),
2493 (new CFClient::UI::Slider vertical => 1), 2874 (new CFPlus::UI::Slider vertical => 1),
2494 ], 2875 ],
2495 ); 2876 );
2496 2877
2497 $self->{children}[1]->connect (changed => sub { $self->update }); 2878 $self->{children}[1]->connect (changed => sub { $self->update });
2498 2879
… …
2504 2885
2505 $self->{fontsize} = $fontsize; 2886 $self->{fontsize} = $fontsize;
2506 $self->reflow; 2887 $self->reflow;
2507} 2888}
2508 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
2509sub size_allocate { 2899sub invoke_size_allocate {
2510 my ($self, $w, $h) = @_; 2900 my ($self, $w, $h) = @_;
2511 2901
2512 $self->SUPER::size_allocate ($w, $h); 2902 my ($empty, $slider, @other) = @{ $self->{children} };
2903 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2513 2904
2514 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2905 $self->{layout}->set_font ($self->{font}) if $self->{font};
2515 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2906 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2516 $self->{layout}->set_width ($self->{children}[0]{w}); 2907 $self->{layout}->set_width ($empty->{w});
2517 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2908 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2518 2909
2519 $self->reflow; 2910 $self->reflow;
2520}
2521 2911
2522sub text_size { 2912 local $self->{children} = [$empty, $slider];
2913 $self->SUPER::invoke_size_allocate ($w, $h)
2914}
2915
2916sub invoke_mouse_wheel {
2523 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) = @_;
2524 2928
2525 my $layout = $self->{layout}; 2929 my $layout = $self->{layout};
2526 2930
2931 $layout->set_font ($self->{font}) if $self->{font};
2932 $layout->set_foreground (@{$para->{fg}});
2527 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2933 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2528 $layout->set_width ($self->{children}[0]{w} - $indent); 2934 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2529 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2935 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2530 $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}}
2531 2942 );
2943
2532 $layout->size 2944 $layout
2533} 2945}
2534 2946
2535sub reflow { 2947sub reflow {
2536 my ($self) = @_; 2948 my ($self) = @_;
2537 2949
… …
2544 2956
2545 # todo: base offset on lines or so, not on pixels 2957 # todo: base offset on lines or so, not on pixels
2546 $self->{children}[1]->set_value ($offset); 2958 $self->{children}[1]->set_value ($offset);
2547} 2959}
2548 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
2549sub clear { 2976sub clear {
2550 my ($self) = @_; 2977 my ($self) = @_;
2978
2979 my (undef, undef, @other) = @{ $self->{children} };
2980 $self->remove ($_) for @other;
2551 2981
2552 $self->{par} = []; 2982 $self->{par} = [];
2553 $self->{height} = 0; 2983 $self->{height} = 0;
2554 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2984 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2555} 2985}
2556 2986
2557sub add_paragraph { 2987sub add_paragraph {
2558 my ($self, $color, $text, $indent) = @_; 2988 my $self = shift;
2559 2989
2560 for my $line (split /\n/, $text) { 2990 for my $para (@_) {
2561 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
2562 $self->{height} += $h; 3042 $self->{height} = $height;
2563 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3043 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2564 }
2565 3044
2566 $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 }
2567} 3051}
2568 3052
2569sub update { 3053sub update {
2570 my ($self) = @_; 3054 my ($self) = @_;
2571 3055
… …
2574 return unless $self->{h} > 0; 3058 return unless $self->{h} > 0;
2575 3059
2576 delete $self->{texture}; 3060 delete $self->{texture};
2577 3061
2578 $ROOT->on_post_alloc ($self => sub { 3062 $ROOT->on_post_alloc ($self => sub {
3063 $self->force_uptodate;
3064
2579 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3065 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2580 3066
2581 if (delete $self->{need_reflow}) {
2582 my $height = 0;
2583
2584 my $layout = $self->{layout};
2585
2586 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2587
2588 for (@{$self->{par}}) {
2589 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2590 $layout->set_width ($W - $_->[3]);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592 $layout->set_markup ($_->[4]);
2593 my ($w, $h) = $layout->size;
2594 $_->[0] = $w + $_->[3];
2595 $_->[1] = $h;
2596 }
2597
2598 $height += $_->[1];
2599 }
2600
2601 $self->{height} = $height;
2602
2603 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2604
2605 delete $self->{texture};
2606 }
2607
2608 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3067 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2609 glClearColor 0, 0, 0, 0; 3068 glClearColor 0, 0, 0, 0;
2610 glClear GL_COLOR_BUFFER_BIT; 3069 glClear GL_COLOR_BUFFER_BIT;
2611 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;
2612 my $top = int $self->{children}[1]{range}[0]; 3079 my $top = int $self->{children}[1]{range}[0];
2613 3080
2614 my $y0 = $top; 3081 my $y0 = $top;
2615 my $y1 = $top + $H; 3082 my $y1 = $top + $H;
2616 3083
2617 my $y = 0;
2618
2619 my $layout = $self->{layout};
2620
2621 $layout->set_font ($self->{font}) if $self->{font};
2622
2623 glEnable GL_BLEND;
2624 #TODO# not correct in windows where rgba is forced off
2625 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2626
2627 for my $par (@{$self->{par}}) { 3084 for my $para (@{$self->{par}}) {
2628 my $h = $par->[1]; 3085 my $h = $para->{h};
3086 my $y = $para->{y};
2629 3087
2630 if ($y0 < $y + $h && $y < $y1) { 3088 if ($y0 < $y + $h && $y < $y1) {
2631 $layout->set_foreground (@{ $par->[2] }); 3089 my $layout = $self->get_layout ($para);
2632 $layout->set_width ($W - $par->[3]);
2633 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2634 $layout->set_markup ($par->[4]);
2635 3090
2636 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3091 $layout->render ($para->{indent}, $y - $y0);
2637 3092
2638 glRasterPos $par->[3], $y - $y0; 3093 if (my @w = @{ $para->{widget} }) {
2639 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 }
2640 } 3105 }
2641 3106
2642 $y += $h; 3107 $paridx++;
3108 $top_paragraph ||= $paridx if $y >= $top;
2643 } 3109 }
2644 3110
2645 glDisable GL_BLEND; 3111 $self->{top_paragraph} = $top_paragraph;
2646 }; 3112 };
2647 }); 3113 });
3114}
3115
3116sub reconfigure {
3117 my ($self) = @_;
3118
3119 $self->SUPER::reconfigure;
3120
3121 $_->{w} = 1e10 for @{ $self->{par} };
3122 $self->reflow;
2648} 3123}
2649 3124
2650sub _draw { 3125sub _draw {
2651 my ($self) = @_; 3126 my ($self) = @_;
2652 3127
… …
2655 glColor 0, 0, 0, 1; 3130 glColor 0, 0, 0, 1;
2656 $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});
2657 glDisable GL_TEXTURE_2D; 3132 glDisable GL_TEXTURE_2D;
2658 3133
2659 $self->{children}[1]->draw; 3134 $self->{children}[1]->draw;
2660
2661} 3135}
2662 3136
2663############################################################################# 3137#############################################################################
2664 3138
2665package CFClient::UI::Animator; 3139package CFPlus::UI::Animator;
2666 3140
2667use CFClient::OpenGL; 3141use CFPlus::OpenGL;
2668 3142
2669our @ISA = CFClient::UI::Bin::; 3143our @ISA = CFPlus::UI::Bin::;
2670 3144
2671sub moveto { 3145sub moveto {
2672 my ($self, $x, $y) = @_; 3146 my ($self, $x, $y) = @_;
2673 3147
2674 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3148 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2702 glPopMatrix; 3176 glPopMatrix;
2703} 3177}
2704 3178
2705############################################################################# 3179#############################################################################
2706 3180
2707package CFClient::UI::Flopper; 3181package CFPlus::UI::Flopper;
2708 3182
2709our @ISA = CFClient::UI::Button::; 3183our @ISA = CFPlus::UI::Button::;
2710 3184
2711sub new { 3185sub new {
2712 my $class = shift; 3186 my $class = shift;
2713 3187
2714 my $self = $class->SUPER::new ( 3188 my $self = $class->SUPER::new (
… …
2726 $self->{other}->toggle_visibility; 3200 $self->{other}->toggle_visibility;
2727} 3201}
2728 3202
2729############################################################################# 3203#############################################################################
2730 3204
2731package CFClient::UI::Tooltip; 3205package CFPlus::UI::Tooltip;
2732 3206
2733our @ISA = CFClient::UI::Bin::; 3207our @ISA = CFPlus::UI::Bin::;
2734 3208
2735use CFClient::OpenGL; 3209use CFPlus::OpenGL;
2736 3210
2737sub new { 3211sub new {
2738 my $class = shift; 3212 my $class = shift;
2739 3213
2740 $class->SUPER::new ( 3214 $class->SUPER::new (
… …
2743 ) 3217 )
2744} 3218}
2745 3219
2746sub set_tooltip_from { 3220sub set_tooltip_from {
2747 my ($self, $widget) = @_; 3221 my ($self, $widget) = @_;
3222
3223 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3224 if $widget->{tooltip} =~ /^#(.*)$/;
2748 3225
2749 my $tooltip = $widget->{tooltip}; 3226 my $tooltip = $widget->{tooltip};
2750 3227
2751 if ($ENV{CFPLUS_DEBUG} & 2) { 3228 if ($ENV{CFPLUS_DEBUG} & 2) {
2752 $tooltip .= "\n\n" . (ref $widget) . "\n" 3229 $tooltip .= "\n\n" . (ref $widget) . "\n"
2753 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3230 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2754 . "req $widget->{req_w} $widget->{req_h}\n" 3231 . "req $widget->{req_w} $widget->{req_h}\n"
2755 . "visible $widget->{visible}"; 3232 . "visible $widget->{visible}";
2756 } 3233 }
2757 3234
3235 $tooltip =~ s/^\n+//;
3236 $tooltip =~ s/\n+$//;
3237
2758 $self->add (new CFClient::UI::Label 3238 $self->add (new CFPlus::UI::Label
2759 markup => $tooltip, 3239 markup => $tooltip,
2760 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3240 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2761 fontsize => 0.8, 3241 fontsize => 0.8,
2762 fg => [0, 0, 0, 1], 3242 style => 1, # FLAG_INVERSE
2763 ellipsise => 0, 3243 ellipsise => 0,
2764 font => ($widget->{tooltip_font} || $::FONT_PROP), 3244 font => ($widget->{tooltip_font} || $::FONT_PROP),
2765 ); 3245 );
2766} 3246}
2767 3247
… …
2771 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3251 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2772 3252
2773 ($w + 4, $h + 4) 3253 ($w + 4, $h + 4)
2774} 3254}
2775 3255
2776sub size_allocate { 3256sub invoke_size_allocate {
2777 my ($self, $w, $h) = @_; 3257 my ($self, $w, $h) = @_;
2778 3258
2779 $self->SUPER::size_allocate ($w - 4, $h - 4); 3259 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2780} 3260}
2781 3261
2782sub visibility_change { 3262sub invoke_visibility_change {
2783 my ($self, $visible) = @_; 3263 my ($self, $visible) = @_;
2784 3264
2785 return unless $visible; 3265 return unless $visible;
2786 3266
2787 $self->{root}->on_post_alloc ("move_$self" => sub { 3267 $self->{root}->on_post_alloc ("move_$self" => sub {
2788 my $widget = $self->{owner} 3268 my $widget = $self->{owner}
2789 or return; 3269 or return;
2790 3270
3271 if ($widget->{visible}) {
2791 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3272 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2792 3273
2793 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3274 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2794 if $x + $self->{w} > $::WIDTH; 3275 if $x + $self->{w} > $self->{root}{w};
2795 3276
2796 $self->move_abs ($x, $y); 3277 $self->move_abs ($x, $y);
3278 } else {
3279 $self->hide;
3280 }
2797 }); 3281 });
2798} 3282}
2799 3283
2800sub _draw { 3284sub _draw {
2801 my ($self) = @_; 3285 my ($self) = @_;
… …
2825 $self->SUPER::_draw; 3309 $self->SUPER::_draw;
2826} 3310}
2827 3311
2828############################################################################# 3312#############################################################################
2829 3313
2830package CFClient::UI::Face; 3314package CFPlus::UI::Face;
2831 3315
2832our @ISA = CFClient::UI::Base::; 3316our @ISA = CFPlus::UI::DrawBG::;
2833 3317
2834use CFClient::OpenGL; 3318use CFPlus::OpenGL;
2835 3319
2836sub new { 3320sub new {
2837 my $class = shift; 3321 my $class = shift;
2838 3322
2839 my $self = $class->SUPER::new ( 3323 my $self = $class->SUPER::new (
… …
2841 can_events => 0, 3325 can_events => 0,
2842 @_, 3326 @_,
2843 ); 3327 );
2844 3328
2845 if ($self->{anim} && $self->{animspeed}) { 3329 if ($self->{anim} && $self->{animspeed}) {
2846 Scalar::Util::weaken (my $widget = $self); 3330 CFPlus::weaken (my $widget = $self);
2847 3331
2848 $self->{timer} = Event->timer ( 3332 $self->{timer} = Event->timer (
2849 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3333 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2850 hard => 1, 3334 hard => 1,
2851 interval => $self->{animspeed}, 3335 interval => $self->{animspeed},
… …
2874sub _draw { 3358sub _draw {
2875 my ($self) = @_; 3359 my ($self) = @_;
2876 3360
2877 return unless $::CONN; 3361 return unless $::CONN;
2878 3362
3363 $self->SUPER::_draw;
3364
2879 my $face; 3365 my $face;
2880 3366
2881 if ($self->{frame}) { 3367 if ($self->{frame}) {
2882 my $anim = $::CONN->{anim}[$self->{anim}]; 3368 my $anim = $::CONN->{anim}[$self->{anim}];
2883 3369
… …
2894 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3380 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2895 glDisable GL_TEXTURE_2D; 3381 glDisable GL_TEXTURE_2D;
2896 } 3382 }
2897} 3383}
2898 3384
2899sub DESTROY { 3385sub destroy {
2900 my ($self) = @_; 3386 my ($self) = @_;
2901 3387
2902 $self->{timer}->cancel 3388 $self->{timer}->cancel
2903 if $self->{timer}; 3389 if $self->{timer};
2904 3390
2905 $self->SUPER::DESTROY; 3391 $self->SUPER::destroy;
2906} 3392}
2907 3393
2908############################################################################# 3394#############################################################################
2909 3395
2910package CFClient::UI::Buttonbar; 3396package CFPlus::UI::Buttonbar;
2911 3397
2912our @ISA = CFClient::UI::HBox::; 3398our @ISA = CFPlus::UI::HBox::;
2913 3399
2914# TODO: should actualyl wrap buttons and other goodies. 3400# TODO: should actually wrap buttons and other goodies.
2915 3401
2916############################################################################# 3402#############################################################################
2917 3403
2918package CFClient::UI::Menu; 3404package CFPlus::UI::Menu;
2919 3405
2920our @ISA = CFClient::UI::FancyFrame::; 3406our @ISA = CFPlus::UI::Toplevel::;
2921 3407
2922use CFClient::OpenGL; 3408use CFPlus::OpenGL;
2923 3409
2924sub new { 3410sub new {
2925 my $class = shift; 3411 my $class = shift;
2926 3412
2927 my $self = $class->SUPER::new ( 3413 my $self = $class->SUPER::new (
2928 items => [], 3414 items => [],
2929 z => 100, 3415 z => 100,
2930 @_, 3416 @_,
2931 ); 3417 );
2932 3418
2933 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3419 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2934 3420
2935 for my $item (@{ $self->{items} }) { 3421 for my $item (@{ $self->{items} }) {
2936 my ($widget, $cb, $tooltip) = @$item; 3422 my ($widget, $cb, $tooltip) = @$item;
2937 3423
2938 # handle various types of items, only text for now 3424 # handle various types of items, only text for now
2939 if (!ref $widget) { 3425 if (!ref $widget) {
3426 if ($widget =~ /\t/) {
3427 my ($left, $right) = split /\t/, $widget, 2;
3428
2940 $widget = new CFClient::UI::Label 3429 $widget = new CFPlus::UI::HBox
2941 can_hover => 1, 3430 can_hover => 1,
2942 can_events => 1, 3431 can_events => 1,
2943 text => $widget,
2944 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 }
2945 } 3446 }
2946 3447
2947 $self->{item}{$widget} = $item; 3448 $self->{item}{$widget} = $item;
2948 3449
2949 $self->{vbox}->add ($widget); 3450 $self->{vbox}->add ($widget);
… …
2954 3455
2955# 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)
2956sub popup { 3457sub popup {
2957 my ($self, $ev) = @_; 3458 my ($self, $ev) = @_;
2958 3459
2959 $self->_emit ("popdown"); 3460 $self->emit ("popdown");
2960 3461
2961 # maybe save $GRAB? must be careful about events... 3462 # maybe save $GRAB? must be careful about events...
2962 $GRAB = $self; 3463 $GRAB = $self;
2963 $self->{button} = $ev->{button}; 3464 $self->{button} = $ev->{button};
2964 3465
2965 $self->show; 3466 $self->show;
2966 $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);
2967} 3468}
2968 3469
2969sub mouse_motion { 3470sub invoke_mouse_motion {
2970 my ($self, $ev, $x, $y) = @_; 3471 my ($self, $ev, $x, $y) = @_;
2971 3472
2972 # TODO: should use vbox->find_widget or so 3473 # TODO: should use vbox->find_widget or so
2973 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3474 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2974 $self->{hover} = $self->{item}{$HOVER}; 3475 $self->{hover} = $self->{item}{$HOVER};
2975 3476
2976 0 3477 0
2977} 3478}
2978 3479
2979sub button_up { 3480sub invoke_button_up {
2980 my ($self, $ev, $x, $y) = @_; 3481 my ($self, $ev, $x, $y) = @_;
2981 3482
2982 if ($ev->{button} == $self->{button}) { 3483 if ($ev->{button} == $self->{button}) {
2983 undef $GRAB; 3484 undef $GRAB;
2984 $self->hide; 3485 $self->hide;
2985 3486
2986 $self->_emit ("popdown"); 3487 $self->emit ("popdown");
2987 $self->{hover}[1]->() if $self->{hover}; 3488 $self->{hover}[1]->() if $self->{hover};
2988 } else { 3489 } else {
2989 return 0 3490 return 0
2990 } 3491 }
2991 3492
2992 1 3493 1
2993} 3494}
2994 3495
2995############################################################################# 3496#############################################################################
2996 3497
2997package CFClient::UI::Multiplexer; 3498package CFPlus::UI::Multiplexer;
2998 3499
2999our @ISA = CFClient::UI::Container::; 3500our @ISA = CFPlus::UI::Container::;
3000 3501
3001sub new { 3502sub new {
3002 my $class = shift; 3503 my $class = shift;
3003 3504
3004 my $self = $class->SUPER::new ( 3505 my $self = $class->SUPER::new (
… …
3018 3519
3019 $self->{current} = $self->{children}[0] 3520 $self->{current} = $self->{children}[0]
3020 if @{ $self->{children} }; 3521 if @{ $self->{children} };
3021} 3522}
3022 3523
3524sub get_current_page {
3525 my ($self) = @_;
3526
3527 $self->{current}
3528}
3529
3023sub set_current_page { 3530sub set_current_page {
3024 my ($self, $page_or_widget) = @_; 3531 my ($self, $page_or_widget) = @_;
3025 3532
3026 my $widget = ref $page_or_widget 3533 my $widget = ref $page_or_widget
3027 ? $page_or_widget 3534 ? $page_or_widget
3028 : $self->{children}[$page_or_widget]; 3535 : $self->{children}[$page_or_widget];
3029 3536
3030 $self->{current} = $widget; 3537 $self->{current} = $widget;
3031 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3538 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3032 3539
3033 $self->_emit (page_changed => $self->{current}); 3540 $self->emit (page_changed => $self->{current});
3034 3541
3035 $self->realloc; 3542 $self->realloc;
3036} 3543}
3037 3544
3038sub visible_children { 3545sub visible_children {
… …
3043 my ($self) = @_; 3550 my ($self) = @_;
3044 3551
3045 $self->{current}->size_request 3552 $self->{current}->size_request
3046} 3553}
3047 3554
3048sub size_allocate { 3555sub invoke_size_allocate {
3049 my ($self, $w, $h) = @_; 3556 my ($self, $w, $h) = @_;
3050 3557
3051 $self->{current}->configure (0, 0, $w, $h); 3558 $self->{current}->configure (0, 0, $w, $h);
3559
3560 1
3052} 3561}
3053 3562
3054sub _draw { 3563sub _draw {
3055 my ($self) = @_; 3564 my ($self) = @_;
3056 3565
3057 $self->{current}->draw; 3566 $self->{current}->draw;
3058} 3567}
3059 3568
3060############################################################################# 3569#############################################################################
3061 3570
3062package CFClient::UI::Notebook; 3571package CFPlus::UI::Notebook;
3063 3572
3064our @ISA = CFClient::UI::VBox::; 3573our @ISA = CFPlus::UI::VBox::;
3065 3574
3066sub new { 3575sub new {
3067 my $class = shift; 3576 my $class = shift;
3068 3577
3069 my $self = $class->SUPER::new ( 3578 my $self = $class->SUPER::new (
3070 buttonbar => (new CFClient::UI::Buttonbar), 3579 buttonbar => (new CFPlus::UI::Buttonbar),
3071 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3580 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3072 # filter => # will be put between multiplexer and $self 3581 # filter => # will be put between multiplexer and $self
3073 @_, 3582 @_,
3074 ); 3583 );
3075 3584
3076 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3585 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3080} 3589}
3081 3590
3082sub add { 3591sub add {
3083 my ($self, $title, $widget, $tooltip) = @_; 3592 my ($self, $title, $widget, $tooltip) = @_;
3084 3593
3085 Scalar::Util::weaken $self; 3594 CFPlus::weaken $self;
3086 3595
3087 $self->{buttonbar}->add (new CFClient::UI::Button 3596 $self->{buttonbar}->add (new CFPlus::UI::Button
3088 markup => $title, 3597 markup => $title,
3089 tooltip => $tooltip, 3598 tooltip => $tooltip,
3090 on_activate => sub { $self->set_current_page ($widget) }, 3599 on_activate => sub { $self->set_current_page ($widget) },
3091 ); 3600 );
3092 3601
3093 $self->{multiplexer}->add ($widget); 3602 $self->{multiplexer}->add ($widget);
3094} 3603}
3095 3604
3605sub get_current_page {
3606 my ($self) = @_;
3607
3608 $self->{multiplexer}->get_current_page
3609}
3610
3096sub set_current_page { 3611sub set_current_page {
3097 my ($self, $page) = @_; 3612 my ($self, $page) = @_;
3098 3613
3099 $self->{multiplexer}->set_current_page ($page); 3614 $self->{multiplexer}->set_current_page ($page);
3100 $self->_emit (page_changed => $self->{multiplexer}{current}); 3615 $self->emit (page_changed => $self->{multiplexer}{current});
3101} 3616}
3102 3617
3103############################################################################# 3618#############################################################################
3104 3619
3105package CFClient::UI::Combobox; 3620package CFPlus::UI::Selector;
3106 3621
3107use utf8; 3622use utf8;
3108 3623
3109our @ISA = CFClient::UI::Button::; 3624our @ISA = CFPlus::UI::Button::;
3110 3625
3111sub new { 3626sub new {
3112 my $class = shift; 3627 my $class = shift;
3113 3628
3114 my $self = $class->SUPER::new ( 3629 my $self = $class->SUPER::new (
3115 options => [], # [title, value, tooltip], ... 3630 options => [], # [value, title, longdesc], ...
3116 value => undef, 3631 value => undef,
3117 @_, 3632 @_,
3118 ); 3633 );
3119 3634
3120 $self->_set_value ($self->{value}); 3635 $self->_set_value ($self->{value});
3121 3636
3122 $self 3637 $self
3123} 3638}
3124 3639
3125sub button_down { 3640sub invoke_button_down {
3126 my ($self, $ev) = @_; 3641 my ($self, $ev) = @_;
3127 3642
3128 my @menu_items; 3643 my @menu_items;
3129 3644
3130 for (@{ $self->{options} }) { 3645 for (@{ $self->{options} }) {
3131 my ($title, $value, $tooltip) = @$_; 3646 my ($value, $title, $tooltip) = @$_;
3132 3647
3133 push @menu_items, [$tooltip, sub { $self->set_value ($value) }]; 3648 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3134 } 3649 }
3135 3650
3136 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3651 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3137} 3652}
3138 3653
3139sub _set_value { 3654sub _set_value {
3140 my ($self, $value) = @_; 3655 my ($self, $value) = @_;
3141 3656
3142 my ($item) = grep $_->[1] eq $value, @{ $self->{options} } 3657 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3143 or return; 3658 or return;
3144 3659
3145 $self->{value} = $item->[1]; 3660 $self->{value} = $item->[0];
3146 $self->set_markup ("$item->[0] ⇓"); 3661 $self->set_markup ("$item->[1] ⇓");
3147 $self->set_tooltip ($item->[2]); 3662 $self->set_tooltip ($item->[2]);
3148} 3663}
3149 3664
3150sub set_value { 3665sub set_value {
3151 my ($self, $value) = @_; 3666 my ($self, $value) = @_;
3152 3667
3153 return unless $self->{value} ne $value; 3668 return unless $self->{value} ne $value;
3154 3669
3155 $self->_set_value ($value); 3670 $self->_set_value ($value);
3156 $self->_emit (changed => $value); 3671 $self->emit (changed => $value);
3157} 3672}
3158 3673
3159############################################################################# 3674#############################################################################
3160 3675
3161package CFClient::UI::Statusbox; 3676package CFPlus::UI::Statusbox;
3162 3677
3163our @ISA = CFClient::UI::VBox::; 3678our @ISA = CFPlus::UI::VBox::;
3164 3679
3165sub new { 3680sub new {
3166 my $class = shift; 3681 my $class = shift;
3167 3682
3168 my $self = $class->SUPER::new ( 3683 my $self = $class->SUPER::new (
3169 fontsize => 0.8, 3684 fontsize => 0.8,
3170 @_, 3685 @_,
3171 ); 3686 );
3172 3687
3173 Scalar::Util::weaken (my $this = $self); 3688 CFPlus::weaken (my $this = $self);
3174 3689
3175 $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 });
3176 3691
3177 $self 3692 $self
3178} 3693}
… …
3180sub reorder { 3695sub reorder {
3181 my ($self) = @_; 3696 my ($self) = @_;
3182 my $NOW = Time::HiRes::time; 3697 my $NOW = Time::HiRes::time;
3183 3698
3184 # freeze display when hovering over any label 3699 # freeze display when hovering over any label
3185 return if $CFClient::UI::TOOLTIP->{owner} 3700 return if $CFPlus::UI::TOOLTIP->{owner}
3186 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3701 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3187 values %{ $self->{item} }; 3702 values %{ $self->{item} };
3188 3703
3189 while (my ($k, $v) = each %{ $self->{item} }) { 3704 while (my ($k, $v) = each %{ $self->{item} }) {
3190 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3705 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3191 } 3706 }
… …
3212 for ($short) { 3727 for ($short) {
3213 s/^\s+//; 3728 s/^\s+//;
3214 s/\s+/ /g; 3729 s/\s+/ /g;
3215 } 3730 }
3216 3731
3217 new CFClient::UI::Label 3732 new CFPlus::UI::Label
3218 markup => $short, 3733 markup => $short,
3219 tooltip => $item->{tooltip}, 3734 tooltip => $item->{tooltip},
3220 tooltip_font => $::FONT_PROP, 3735 tooltip_font => $::FONT_PROP,
3221 tooltip_width => 0.67, 3736 tooltip_width => 0.67,
3222 fontsize => $item->{fontsize} || $self->{fontsize}, 3737 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3260 $item->{count}++; 3775 $item->{count}++;
3261 } else { 3776 } else {
3262 $item->{count} = 1; 3777 $item->{count} = 1;
3263 $item->{text} = $item->{tooltip} = $text; 3778 $item->{text} = $item->{tooltip} = $text;
3264 } 3779 }
3265 $item->{id} = ++$self->{id}; 3780 $item->{id} += 0.2;#d#
3266 $item->{timeout} = $timeout; 3781 $item->{timeout} = $timeout;
3267 delete $item->{label}; 3782 delete $item->{label};
3268 } else { 3783 } else {
3269 $self->{item}{$group} = { 3784 $self->{item}{$group} = {
3270 id => ++$self->{id}, 3785 id => ++$self->{id},
… …
3276 count => 1, 3791 count => 1,
3277 %arg, 3792 %arg,
3278 }; 3793 };
3279 } 3794 }
3280 3795
3796 $ROOT->on_refresh (reorder => sub {
3281 $self->reorder; 3797 $self->reorder;
3798 });
3282} 3799}
3283 3800
3284sub reconfigure { 3801sub reconfigure {
3285 my ($self) = @_; 3802 my ($self) = @_;
3286 3803
… …
3289 3806
3290 $self->reorder; 3807 $self->reorder;
3291 $self->SUPER::reconfigure; 3808 $self->SUPER::reconfigure;
3292} 3809}
3293 3810
3294sub DESTROY { 3811sub destroy {
3295 my ($self) = @_; 3812 my ($self) = @_;
3296 3813
3297 $self->{timer}->cancel; 3814 $self->{timer}->cancel;
3298 3815
3299 $self->SUPER::DESTROY; 3816 $self->SUPER::destroy;
3300} 3817}
3301 3818
3302############################################################################# 3819#############################################################################
3303 3820
3304package CFClient::UI::Inventory;
3305
3306our @ISA = CFClient::UI::ScrolledWindow::;
3307
3308sub new {
3309 my $class = shift;
3310
3311 my $self = $class->SUPER::new (
3312 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3313 @_,
3314 );
3315
3316 $self
3317}
3318
3319sub set_items {
3320 my ($self, $items) = @_;
3321
3322 $self->{child}->clear;
3323 return unless $items;
3324
3325 my @items = sort {
3326 ($a->{type} <=> $b->{type})
3327 or ($a->{name} cmp $b->{name})
3328 } @$items;
3329
3330 $self->{real_items} = \@items;
3331
3332 my $row = 0;
3333 for my $item (@items) {
3334 CFClient::Item::update_widgets $item;
3335
3336 $self->{child}->add (0, $row, $item->{face_widget});
3337 $self->{child}->add (1, $row, $item->{desc_widget});
3338 $self->{child}->add (2, $row, $item->{weight_widget});
3339
3340 $row++;
3341 }
3342}
3343
3344#############################################################################
3345
3346package CFClient::UI::BindEditor;
3347
3348our @ISA = CFClient::UI::FancyFrame::;
3349
3350sub new {
3351 my $class = shift;
3352
3353 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3354
3355 $self->add (my $vb = new CFClient::UI::VBox);
3356
3357
3358 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3359 text => "start recording",
3360 tooltip => "Start/Stops recording of actions."
3361 ."All subsequent actions after the recording started will be captured."
3362 ."The actions are displayed after the record was stopped."
3363 ."To bind the action you have to click on the 'Bind' button",
3364 on_activate => sub {
3365 unless ($self->{recording}) {
3366 $self->start;
3367 } else {
3368 $self->stop;
3369 }
3370 });
3371
3372 $vb->add (new CFClient::UI::Label text => "Actions:");
3373 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3374
3375 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3376 $vb->add (my $hb = new CFClient::UI::HBox);
3377 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3378 $hb->add (new CFClient::UI::Button
3379 text => "bind",
3380 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3381 on_activate => sub {
3382 $self->ask_for_bind;
3383 });
3384
3385 $vb->add (my $hb = new CFClient::UI::HBox);
3386 $hb->add (new CFClient::UI::Button
3387 text => "ok",
3388 expand => 1,
3389 tooltip => "This closes the binding editor and saves the binding",
3390 on_activate => sub {
3391 $self->hide;
3392 $self->commit;
3393 });
3394
3395 $hb->add (new CFClient::UI::Button
3396 text => "cancel",
3397 expand => 1,
3398 tooltip => "This closes the binding editor without saving",
3399 on_activate => sub {
3400 $self->hide;
3401 $self->{binding_cancel}->()
3402 if $self->{binding_cancel};
3403 });
3404
3405 $self->update_binding_widgets;
3406
3407 $self
3408}
3409
3410sub commit {
3411 my ($self) = @_;
3412 my ($mod, $sym, $cmds) = $self->get_binding;
3413 if ($sym != 0 && @$cmds > 0) {
3414 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3415 ."'. Don't forget 'Save Config'!");
3416 $self->{binding_change}->($mod, $sym, $cmds)
3417 if $self->{binding_change};
3418 } else {
3419 $::STATUSBOX->add ("No action bound, no key or action specified!");
3420 $self->{binding_cancel}->()
3421 if $self->{binding_cancel};
3422 }
3423}
3424
3425sub start {
3426 my ($self) = @_;
3427
3428 $self->{rec_btn}->set_text ("stop recording");
3429 $self->{recording} = 1;
3430 $self->clear_command_list;
3431 $::CONN->start_record if $::CONN;
3432}
3433
3434sub stop {
3435 my ($self) = @_;
3436
3437 $self->{rec_btn}->set_text ("start recording");
3438 $self->{recording} = 0;
3439
3440 my $rec;
3441 $rec = $::CONN->stop_record if $::CONN;
3442 return unless ref $rec eq 'ARRAY';
3443 $self->set_command_list ($rec);
3444}
3445
3446
3447sub ask_for_bind_and_commit {
3448 my ($self) = @_;
3449 $self->ask_for_bind (1);
3450}
3451
3452sub ask_for_bind {
3453 my ($self, $commit) = @_;
3454
3455 CFClient::Binder::open_binding_dialog (sub {
3456 my ($mod, $sym) = @_;
3457 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3458 $self->update_binding_widgets;
3459 $self->commit if $commit;
3460 });
3461}
3462
3463# $mod and $sym are the modifiers and key symbol
3464# $cmds is a array ref of strings (the commands)
3465# $cb is the callback that is executed on OK
3466# $ccb is the callback that is executed on CANCEL and
3467# when the binding was unsuccessful on OK
3468sub set_binding {
3469 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3470
3471 $self->clear_command_list;
3472 $self->{recording} = 0;
3473 $self->{rec_btn}->set_text ("start recording");
3474
3475 $self->{binding} = [$mod, $sym];
3476 $self->{commands} = $cmds;
3477
3478 $self->{binding_change} = $cb;
3479 $self->{binding_cancel} = $ccb;
3480
3481 $self->update_binding_widgets;
3482}
3483
3484# this is a shortcut method that asks for a binding
3485# and then just binds it.
3486sub do_quick_binding {
3487 my ($self, $cmds) = @_;
3488 $self->set_binding (undef, undef, $cmds, sub {
3489 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3490 });
3491 $self->ask_for_bind (1);
3492}
3493
3494sub update_binding_widgets {
3495 my ($self) = @_;
3496 my ($mod, $sym, $cmds) = $self->get_binding;
3497 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3498 $self->set_command_list ($cmds);
3499}
3500
3501sub get_binding {
3502 my ($self) = @_;
3503 return (
3504 $self->{binding}->[0],
3505 $self->{binding}->[1],
3506 [ grep { defined $_ } @{$self->{commands}} ]
3507 );
3508}
3509
3510sub clear_command_list {
3511 my ($self) = @_;
3512 $self->{cmdbox}->clear ();
3513}
3514
3515sub set_command_list {
3516 my ($self, $cmds) = @_;
3517
3518 $self->{cmdbox}->clear ();
3519 $self->{commands} = $cmds;
3520
3521 my $idx = 0;
3522
3523 for (@$cmds) {
3524 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3525
3526 my $i = $idx;
3527 $hb->add (new CFClient::UI::Label text => $_);
3528 $hb->add (new CFClient::UI::Button
3529 text => "delete",
3530 tooltip => "Deletes the action from the record",
3531 on_activate => sub {
3532 $self->{cmdbox}->remove ($hb);
3533 $cmds->[$i] = undef;
3534 });
3535
3536
3537 $idx++
3538 }
3539}
3540
3541#############################################################################
3542
3543package CFClient::UI::SpellList;
3544
3545our @ISA = CFClient::UI::Table::;
3546
3547sub new {
3548 my $class = shift;
3549
3550 my $self = $class->SUPER::new (
3551 binding => [],
3552 commands => [],
3553 @_,
3554 )
3555}
3556
3557my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3558 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3559my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3561my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3562 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3563
3564sub rebuild_spell_list {
3565 my ($self) = @_;
3566
3567 $CFClient::UI::ROOT->on_refresh ($self => sub {
3568 $self->clear;
3569
3570 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3571 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3572 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3573 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3574
3575 my $row = 0;
3576
3577 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3578 my $spell = $self->{spell}{$_};
3579
3580 $row++;
3581
3582 $self->add (0, $row, new CFClient::UI::Face
3583 face => $spell->{face},
3584 can_hover => 1,
3585 can_events => 1,
3586 tooltip => $spell->{message},
3587 );
3588
3589 $self->add (1, $row, new CFClient::UI::Label
3590 expand => 1,
3591 text => $spell->{name},
3592 can_hover => 1,
3593 can_events => 1,
3594 tooltip => $spell->{message},
3595 );
3596
3597 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600
3601 # TODO: should be done via popup
3602 $self->add (5, $row, new CFClient::UI::Button
3603 text => "bind",
3604 tooltip => "bind spell readying (cast command) to key",
3605 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3606 );
3607 }
3608 });
3609}
3610
3611sub add_spell {
3612 my ($self, $spell) = @_;
3613
3614 $self->{spell}->{$spell->{name}} = $spell;
3615 $self->rebuild_spell_list;
3616}
3617
3618sub remove_spell {
3619 my ($self, $spell) = @_;
3620
3621 delete $self->{spell}->{$spell->{name}};
3622 $self->rebuild_spell_list;
3623}
3624
3625#############################################################################
3626
3627package CFClient::UI::Root; 3821package CFPlus::UI::Root;
3628 3822
3629our @ISA = CFClient::UI::Container::; 3823our @ISA = CFPlus::UI::Container::;
3630 3824
3631use List::Util qw(min max); 3825use List::Util qw(min max);
3632 3826
3633use CFClient::OpenGL; 3827use CFPlus::OpenGL;
3634 3828
3635sub new { 3829sub new {
3636 my $class = shift; 3830 my $class = shift;
3637 3831
3638 my $self = $class->SUPER::new ( 3832 my $self = $class->SUPER::new (
3639 visible => 1, 3833 visible => 1,
3640 @_, 3834 @_,
3641 ); 3835 );
3642 3836
3643 Scalar::Util::weaken ($self->{root} = $self); 3837 CFPlus::weaken ($self->{root} = $self);
3644 3838
3645 $self 3839 $self
3646} 3840}
3647 3841
3648sub size_request { 3842sub size_request {
… …
3663 $coord = $max - $size if $coord > $max - $size; 3857 $coord = $max - $size if $coord > $max - $size;
3664 3858
3665 int $coord + 0.5 3859 int $coord + 0.5
3666} 3860}
3667 3861
3668sub size_allocate { 3862sub invoke_size_allocate {
3669 my ($self, $w, $h) = @_; 3863 my ($self, $w, $h) = @_;
3670 3864
3671 for my $child ($self->children) { 3865 for my $child ($self->children) {
3672 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)};
3673 3867
… …
3677 $X = _to_pixel $X, $W, $self->{w}; 3871 $X = _to_pixel $X, $W, $self->{w};
3678 $Y = _to_pixel $Y, $H, $self->{h}; 3872 $Y = _to_pixel $Y, $H, $self->{h};
3679 3873
3680 $child->configure ($X, $Y, $W, $H); 3874 $child->configure ($X, $Y, $W, $H);
3681 } 3875 }
3876
3877 1
3682} 3878}
3683 3879
3684sub coord2local { 3880sub coord2local {
3685 my ($self, $x, $y) = @_; 3881 my ($self, $x, $y) = @_;
3686 3882
… …
3812 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4008 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3813 4009
3814 $w = 0 if $w < 0; 4010 $w = 0 if $w < 0;
3815 $h = 0 if $h < 0; 4011 $h = 0 if $h < 0;
3816 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
3817 $w = int $w + 0.5; 4022 $w = int $w + 0.5;
3818 $h = int $h + 0.5; 4023 $h = int $h + 0.5;
3819 4024
3820 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}) {
3821 $widget->{old_w} = $widget->{w}; 4026 $widget->{old_w} = $widget->{w};
… …
3844 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4049 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3845 glMatrixMode GL_MODELVIEW; 4050 glMatrixMode GL_MODELVIEW;
3846 glLoadIdentity; 4051 glLoadIdentity;
3847 4052
3848 { 4053 {
3849 package CFClient::UI::Base; 4054 package CFPlus::UI::Base;
3850 4055
3851 ($draw_x, $draw_y, $draw_w, $draw_h) = 4056 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3852 (0, 0, $self->{w}, $self->{h}); 4057 (0, 0, $self->{w}, $self->{h});
3853 }
3854 4058
3855 $self->_draw; 4059 $self->_draw;
4060 }
3856} 4061}
3857 4062
3858############################################################################# 4063#############################################################################
3859 4064
3860package CFClient::UI; 4065package CFPlus::UI;
3861 4066
3862$ROOT = new CFClient::UI::Root; 4067$ROOT = new CFPlus::UI::Root;
3863$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4068$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3864 4069
38651 40701
3866 4071

Diff Legend

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