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.286 by root, Mon Jun 5 03:48:49 2006 UTC vs.
Revision 1.374 by root, Mon Jul 16 12:36:48 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 scroll_x => 0,
1067 scroll_y => 1,
1068 can_events => 1,
980 slider => $slider, 1069 hslider => $hslider,
1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
981 %arg, 1073 %arg,
982 ); 1074 );
983 1075
1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1082 $self->SUPER::add (0, 0, $self->{vp});
1083
985 $self->add ($child) if $child; 1084 $self->add ($child) if $child;
986 1085
987 $self 1086 $self
988} 1087}
1088
1089#TODO# update range on size_allocate depending on child
989 1090
990sub add { 1091sub add {
991 my ($self, $widget) = @_; 1092 my ($self, $widget) = @_;
992 1093
993 $self->{vp}->add ($self->{child} = $widget); 1094 $self->{vp}->add ($self->{child} = $widget);
994} 1095}
995 1096
1097sub invoke_mouse_wheel {
1098 my ($self, $ev) = @_;
1099
1100 return 0 unless $ev->{dy}; # only vertical movements for now
1101
1102 $self->{vslider}->emit (mouse_wheel => $ev);
1103
1104 1
1105}
1106
1107sub update_slider {
1108 my ($self) = @_;
1109
1110 my $child = ($self->{vp} or return)->child;
1111
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114
1115 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide;
1119 }
1120
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) {
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1127 : $self->{vslider}->hide;
1128 }
1129}
1130
996sub update { 1131sub update {
997 my ($self) = @_; 1132 my ($self) = @_;
998 1133
999 $self->SUPER::update; 1134 $self->SUPER::update;
1000 1135 $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} 1136}
1005 1137
1006sub size_allocate { 1138sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1008 1140
1141 $self->update_slider;
1009 $self->SUPER::size_allocate ($w, $h); 1142 $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} 1143}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1144
1018############################################################################# 1145#############################################################################
1019 1146
1020package CFClient::UI::Frame; 1147package CFPlus::UI::Frame;
1021 1148
1022our @ISA = CFClient::UI::Bin::; 1149our @ISA = CFPlus::UI::Bin::;
1023 1150
1024use CFClient::OpenGL; 1151use CFPlus::OpenGL;
1025 1152
1026sub new { 1153sub new {
1027 my $class = shift; 1154 my $class = shift;
1028 1155
1029 $class->SUPER::new ( 1156 $class->SUPER::new (
… …
1055 $self->SUPER::_draw; 1182 $self->SUPER::_draw;
1056} 1183}
1057 1184
1058############################################################################# 1185#############################################################################
1059 1186
1060package CFClient::UI::FancyFrame; 1187package CFPlus::UI::FancyFrame;
1061 1188
1062our @ISA = CFClient::UI::Bin::; 1189our @ISA = CFPlus::UI::Bin::;
1063 1190
1064use CFClient::OpenGL; 1191use 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 1192
1074sub new { 1193sub new {
1075 my ($class, %arg) = @_; 1194 my ($class, %arg) = @_;
1076 1195
1077 my $title = delete $arg{title}; 1196 if ((exists $arg{label}) && !ref $arg{label}) {
1197 $arg{label} = new CFPlus::UI::Label
1198 align => 1,
1199 valign => 0,
1200 text => $arg{label},
1201 fontsize => ($arg{border} || 0.8) * 0.75;
1202 }
1203
1204 my $self = $class->SUPER::new (
1205 # label => "",
1206 fg => [0.6, 0.3, 0.1],
1207 border => 0.8,
1208 style => 'single',
1209 %arg,
1210 );
1211
1212 $self
1213}
1214
1215sub add {
1216 my ($self, @widgets) = @_;
1217
1218 $self->SUPER::add (@widgets);
1219 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1220}
1221
1222sub border {
1223 int $_[0]{border} * $::FONTSIZE
1224}
1225
1226sub size_request {
1227 my ($self) = @_;
1228
1229 ($self->{label_w}, undef) = $self->{label}->size_request
1230 if $self->{label};
1231
1232 my ($w, $h) = $self->SUPER::size_request;
1233
1234 (
1235 $w + $self->border * 2,
1236 $h + $self->border * 2,
1237 )
1238}
1239
1240sub invoke_size_allocate {
1241 my ($self, $w, $h) = @_;
1242
1243 my $border = $self->border;
1244
1245 $w -= List::Util::max 0, $border * 2;
1246 $h -= List::Util::max 0, $border * 2;
1247
1248 if (my $label = $self->{label}) {
1249 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1250 $label->{h} = List::Util::min $h, $border;
1251 $label->invoke_size_allocate ($label->{w}, $label->{h});
1252 }
1253
1254 $self->child->configure ($border, $border, $w, $h);
1255
1256 1
1257}
1258
1259sub _draw {
1260 my ($self) = @_;
1261
1262 my $child = $self->{children}[0];
1263
1264 my $border = $self->border;
1265 my ($w, $h) = ($self->{w}, $self->{h});
1266
1267 $child->draw;
1268
1269 glColor @{$self->{fg}};
1270 glBegin GL_LINE_STRIP;
1271 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1272 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1273 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1274 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1275 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1276 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1277 glEnd;
1278
1279 if ($self->{label}) {
1280 glTranslate $border * 2, 0;
1281 $self->{label}->_draw;
1282 }
1283}
1284
1285#############################################################################
1286
1287package CFPlus::UI::Toplevel;
1288
1289our @ISA = CFPlus::UI::Bin::;
1290
1291use CFPlus::OpenGL;
1292
1293my $bg =
1294 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1295 mipmap => 1, wrap => 1;
1296
1297my @border =
1298 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1299 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1300
1301sub new {
1302 my ($class, %arg) = @_;
1078 1303
1079 my $self = $class->SUPER::new ( 1304 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1305 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1306 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1307 border => 0.6,
1083 can_events => 1, 1308 can_events => 1,
1084 min_w => 16, 1309 min_w => 64,
1085 min_h => 16, 1310 min_h => 32,
1086 %arg, 1311 %arg,
1087 ); 1312 );
1088 1313
1089 $self->{title} = new CFClient::UI::Label 1314 $self->{title_widget} = new CFPlus::UI::Label
1090 align => 0, 1315 align => 0,
1091 valign => 1, 1316 valign => 1,
1092 text => $title, 1317 text => $self->{title},
1093 fontsize => $self->{border} 1318 fontsize => $self->{border},
1094 if defined $title; 1319 if exists $self->{title};
1320
1321 if ($self->{has_close_button}) {
1322 $self->{close_button} =
1323 new CFPlus::UI::ImageButton
1324 path => 'x1_close.png',
1325 on_activate => sub { $self->emit ("delete") };
1326
1327 $self->CFPlus::UI::Container::add ($self->{close_button});
1328 }
1095 1329
1096 $self 1330 $self
1097} 1331}
1098 1332
1099sub add { 1333sub add {
1100 my ($self, @widgets) = @_; 1334 my ($self, @widgets) = @_;
1101 1335
1102 $self->SUPER::add (@widgets); 1336 $self->SUPER::add (@widgets);
1337 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1338 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1339}
1105 1340
1106sub border { 1341sub border {
1107 int $_[0]{border} * $::FONTSIZE 1342 int $_[0]{border} * $::FONTSIZE
1108} 1343}
1109 1344
1110sub size_request { 1345sub size_request {
1111 my ($self) = @_; 1346 my ($self) = @_;
1112 1347
1113 $self->{title}->size_request 1348 $self->{title_widget}->size_request
1114 if $self->{title}; 1349 if $self->{title_widget};
1350
1351 $self->{close_button}->size_request
1352 if $self->{close_button};
1115 1353
1116 my ($w, $h) = $self->SUPER::size_request; 1354 my ($w, $h) = $self->SUPER::size_request;
1117 1355
1118 ( 1356 (
1119 $w + $self->border * 2, 1357 $w + $self->border * 2,
1120 $h + $self->border * 2, 1358 $h + $self->border * 2,
1121 ) 1359 )
1122} 1360}
1123 1361
1124sub size_allocate { 1362sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1126 1364
1127 if ($self->{title}) { 1365 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1366 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1367 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1368 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1369 }
1132 1370
1133 my $border = $self->border; 1371 my $border = $self->border;
1134 1372
1135 $h -= List::Util::max 0, $border * 2; 1373 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1374 $w -= List::Util::max 0, $border * 2;
1375
1376 $self->child->configure ($border, $border, $w, $h);
1377
1378 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1379 if $self->{close_button};
1380
1381 1
1382}
1383
1384sub invoke_delete {
1385 my ($self) = @_;
1386
1387 $self->hide;
1137 1388
1138 $self->child->configure ($border, $border, $w, $h); 1389 1
1139} 1390}
1140 1391
1141sub button_down { 1392sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1393 my ($self, $ev, $x, $y) = @_;
1143 1394
1144 my ($w, $h) = @$self{qw(w h)}; 1395 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1396 my $border = $self->border;
1146 1397
… …
1177 1428
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1429 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1430
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1431 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1432 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1433 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1434 };
1184 } else { 1435 } else {
1185 return 0; 1436 return 0;
1186 } 1437 }
1187 1438
1188 1 1439 1
1189} 1440}
1190 1441
1191sub button_up { 1442sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1443 my ($self, $ev, $x, $y) = @_;
1193 1444
1194 !!delete $self->{motion} 1445 ! ! delete $self->{motion}
1195} 1446}
1196 1447
1197sub mouse_motion { 1448sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1449 my ($self, $ev, $x, $y) = @_;
1199 1450
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1451 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1452
1202 !!$self->{motion} 1453 ! ! $self->{motion}
1454}
1455
1456sub invoke_visibility_change {
1457 my ($self, $visible) = @_;
1458
1459 delete $self->{motion} unless $visible;
1460
1461 0
1203} 1462}
1204 1463
1205sub _draw { 1464sub _draw {
1206 my ($self) = @_; 1465 my ($self) = @_;
1207 1466
… …
1233 1492
1234 glDisable GL_TEXTURE_2D; 1493 glDisable GL_TEXTURE_2D;
1235 1494
1236 $child->draw; 1495 $child->draw;
1237 1496
1238 if ($self->{title}) { 1497 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1498 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1499 $self->{title_widget}->_draw;
1500
1501 glTranslate 0, - ($border - $self->{h});
1241 } 1502 }
1503
1504 $self->{close_button}->draw
1505 if $self->{close_button};
1242} 1506}
1243 1507
1244############################################################################# 1508#############################################################################
1245 1509
1246package CFClient::UI::Table; 1510package CFPlus::UI::Table;
1247 1511
1248our @ISA = CFClient::UI::Base::; 1512our @ISA = CFPlus::UI::Base::;
1249 1513
1250use List::Util qw(max sum); 1514use List::Util qw(max sum);
1251 1515
1252use CFClient::OpenGL; 1516use CFPlus::OpenGL;
1253 1517
1254sub new { 1518sub new {
1255 my $class = shift; 1519 my $class = shift;
1256 1520
1257 $class->SUPER::new ( 1521 $class->SUPER::new (
1522 children => [],
1258 col_expand => [], 1523 col_expand => [],
1524 row_expand => [],
1259 @_, 1525 @_,
1260 ) 1526 )
1261} 1527}
1262 1528
1263sub children { 1529sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1530 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265} 1531}
1266 1532
1533# TODO: store row/col info in child widget and use standard add/del
1267sub add { 1534sub add {
1268 my ($self, $x, $y, $child) = @_; 1535 my ($self) = shift;
1269 1536
1537 while (@_) {
1538 my ($x, $y, $child) = splice @_, 0, 3, ();
1270 $child->set_parent ($self); 1539 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1540 $self->{children}[$y][$x] = $child;
1541 }
1272 1542
1543 $self->{force_realloc} = 1;
1544 $self->{force_size_alloc} = 1;
1273 $self->realloc; 1545 $self->realloc;
1546}
1547
1548sub remove {
1549 my ($self, $child) = @_;
1550
1551 for (@{ $self->{children} }) {
1552 for (@{ $_ || [] }) {
1553 $_ = undef if $_ == $child;
1554 }
1555 }
1274} 1556}
1275 1557
1276# TODO: move to container class maybe? send children a signal on removal? 1558# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1559sub clear {
1278 my ($self) = @_; 1560 my ($self) = @_;
… …
1319 (sum @$ws), 1601 (sum @$ws),
1320 (sum @$hs), 1602 (sum @$hs),
1321 ) 1603 )
1322} 1604}
1323 1605
1324sub size_allocate { 1606sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1607 my ($self, $w, $h) = @_;
1326 1608
1327 my ($ws, $hs) = $self->get_wh; 1609 my ($ws, $hs) = $self->get_wh;
1328 1610
1329 my $req_w = (sum @$ws) || 1; 1611 my $req_w = (sum @$ws) || 1;
1330 my $req_h = (sum @$hs) || 1; 1612 my $req_h = (sum @$hs) || 1;
1331 1613
1332 # TODO: nicer code && do row_expand 1614 # TODO: nicer code
1333 my @col_expand = @{$self->{col_expand}}; 1615 my @col_expand = @{$self->{col_expand}};
1334 @col_expand = (1) x @$ws unless @col_expand; 1616 @col_expand = (1) x @$ws unless @col_expand;
1335 my $col_expand = (sum @col_expand) || 1; 1617 my $col_expand = (sum @col_expand) || 1;
1336 1618
1337 # linearly scale sizes
1338 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1619 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340 1620
1341 CFClient::UI::harmonize $ws; 1621 CFPlus::UI::harmonize $ws;
1622
1623 my @row_expand = @{$self->{row_expand}};
1624 @row_expand = (1) x @$ws unless @row_expand;
1625 my $row_expand = (sum @row_expand) || 1;
1626
1627 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1628
1342 CFClient::UI::harmonize $hs; 1629 CFPlus::UI::harmonize $hs;
1343 1630
1344 my $y; 1631 my $y;
1345 1632
1346 for my $r (0 .. $#{$self->{children}}) { 1633 for my $r (0 .. $#{$self->{children}}) {
1347 my $row = $self->{children}[$r] 1634 my $row = $self->{children}[$r]
… …
1361 } 1648 }
1362 1649
1363 $y += $row_h; 1650 $y += $row_h;
1364 } 1651 }
1365 1652
1653 1
1366} 1654}
1367 1655
1368sub find_widget { 1656sub find_widget {
1369 my ($self, $x, $y) = @_; 1657 my ($self, $x, $y) = @_;
1370 1658
… …
1389 } 1677 }
1390} 1678}
1391 1679
1392############################################################################# 1680#############################################################################
1393 1681
1394package CFClient::UI::Box; 1682package CFPlus::UI::Fixed;
1395 1683
1684use List::Util qw(min max);
1685
1396our @ISA = CFClient::UI::Container::; 1686our @ISA = CFPlus::UI::Container::;
1687
1688sub add {
1689 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1690
1691 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1692 $self->SUPER::add ($child);
1693}
1694
1695sub _scale($$$) {
1696 my ($mode, $val, $max) = @_;
1697
1698 $mode eq "abs" ? $val
1699 : $mode eq "rel" ? $val * $max
1700 : 0
1701}
1702
1703sub size_request {
1704 my ($self) = @_;
1705
1706 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1707
1708 # determine overall size by querying abs widgets
1709 for my $child ($self->visible_children) {
1710 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1711
1712 if ($pos eq "abs") {
1713 $w = _scale $size, $w, $child->{req_w};
1714 $h = _scale $size, $h, $child->{req_h};
1715
1716 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1717 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1718 }
1719 }
1720
1721 my $W = $x2 - $x1;
1722 my $H = $y2 - $y1;
1723
1724 # now layout remaining widgets
1725 for my $child ($self->visible_children) {
1726 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1727
1728 if ($pos ne "abs") {
1729 $x = _scale $pos, $x, $W;
1730 $y = _scale $pos, $x, $H;
1731 $w = _scale $size, $w, $child->{req_w};
1732 $h = _scale $size, $h, $child->{req_h};
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1736 }
1737 }
1738
1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1741
1742 ($W, $H)
1743}
1744
1745sub invoke_size_allocate {
1746 my ($self, $W, $H) = @_;
1747
1748 for my $child ($self->visible_children) {
1749 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1750
1751 $x = _scale $pos, $x, $W;
1752 $y = _scale $pos, $x, $H;
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755
1756 $child->configure ($x, $y, $w, $h);
1757 }
1758
1759 1
1760}
1761
1762#############################################################################
1763
1764package CFPlus::UI::Box;
1765
1766our @ISA = CFPlus::UI::Container::;
1397 1767
1398sub size_request { 1768sub size_request {
1399 my ($self) = @_; 1769 my ($self) = @_;
1400 1770
1401 $self->{vertical} 1771 $self->{vertical}
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1777 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1778 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1779 )
1410} 1780}
1411 1781
1412sub size_allocate { 1782sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1783 my ($self, $w, $h) = @_;
1414 1784
1415 my $space = $self->{vertical} ? $h : $w; 1785 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1786 my @children = $self->visible_children;
1417 1787
1418 my @req; 1788 my @req;
1419 1789
1420 if ($self->{homogeneous}) { 1790 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1791 @req = ($space / (@children || 1)) x @children;
1422 } else { 1792 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1793 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1794 my $req = List::Util::sum @req;
1425 1795
1426 if ($req > $space) { 1796 if ($req > $space) {
1427 # ah well, not enough space 1797 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1798 $_ *= $space / $req for @req;
1429 } else { 1799 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1800 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1801
1432 $space = ($space - $req) / $expand; # remaining space to give away 1802 $space = ($space - $req) / $expand; # remaining space to give away
1433 1803
1434 $req[$_] += $space * $children->[$_]{expand} 1804 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1805 for 0 .. $#children;
1436 } 1806 }
1437 } 1807 }
1438 1808
1439 CFClient::UI::harmonize \@req; 1809 CFPlus::UI::harmonize \@req;
1440 1810
1441 my $pos = 0; 1811 my $pos = 0;
1442 for (0 .. $#$children) { 1812 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1813 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1814 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1815
1446 $pos += $alloc; 1816 $pos += $alloc;
1447 } 1817 }
1448 1818
1449 1 1819 1
1450} 1820}
1451 1821
1452############################################################################# 1822#############################################################################
1453 1823
1454package CFClient::UI::HBox; 1824package CFPlus::UI::HBox;
1455 1825
1456our @ISA = CFClient::UI::Box::; 1826our @ISA = CFPlus::UI::Box::;
1457 1827
1458sub new { 1828sub new {
1459 my $class = shift; 1829 my $class = shift;
1460 1830
1461 $class->SUPER::new ( 1831 $class->SUPER::new (
… …
1464 ) 1834 )
1465} 1835}
1466 1836
1467############################################################################# 1837#############################################################################
1468 1838
1469package CFClient::UI::VBox; 1839package CFPlus::UI::VBox;
1470 1840
1471our @ISA = CFClient::UI::Box::; 1841our @ISA = CFPlus::UI::Box::;
1472 1842
1473sub new { 1843sub new {
1474 my $class = shift; 1844 my $class = shift;
1475 1845
1476 $class->SUPER::new ( 1846 $class->SUPER::new (
… …
1479 ) 1849 )
1480} 1850}
1481 1851
1482############################################################################# 1852#############################################################################
1483 1853
1484package CFClient::UI::Label; 1854package CFPlus::UI::Label;
1485 1855
1486our @ISA = CFClient::UI::DrawBG::; 1856our @ISA = CFPlus::UI::DrawBG::;
1487 1857
1488use CFClient::OpenGL; 1858use CFPlus::OpenGL;
1489 1859
1490sub new { 1860sub new {
1491 my ($class, %arg) = @_; 1861 my ($class, %arg) = @_;
1492 1862
1493 my $self = $class->SUPER::new ( 1863 my $self = $class->SUPER::new (
… …
1496 #active_bg => none 1866 #active_bg => none
1497 #font => default_font 1867 #font => default_font
1498 #text => initial text 1868 #text => initial text
1499 #markup => initial narkup 1869 #markup => initial narkup
1500 #max_w => maximum pixel width 1870 #max_w => maximum pixel width
1871 #style => 0, # render flags
1501 ellipsise => 3, # end 1872 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1873 layout => (new CFPlus::Layout),
1503 fontsize => 1, 1874 fontsize => 1,
1504 align => -1, 1875 align => -1,
1505 valign => -1, 1876 valign => -1,
1506 padding_x => 2, 1877 padding_x => 2,
1507 padding_y => 2, 1878 padding_y => 2,
1508 can_events => 0, 1879 can_events => 0,
1509 %arg 1880 %arg
1510 ); 1881 );
1511 1882
1512 if (exists $self->{template}) { 1883 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1884 my $layout = new CFPlus::Layout;
1514 $layout->set_text (delete $self->{template}); 1885 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1886 $self->{template} = $layout;
1516 } 1887 }
1517 1888
1518 if (exists $self->{markup}) { 1889 if (exists $self->{markup}) {
… …
1522 } 1893 }
1523 1894
1524 $self 1895 $self
1525} 1896}
1526 1897
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1898sub update {
1538 my ($self) = @_; 1899 my ($self) = @_;
1539 1900
1540 delete $self->{texture}; 1901 delete $self->{texture};
1541 $self->SUPER::update; 1902 $self->SUPER::update;
… …
1552 my ($self, $text) = @_; 1913 my ($self, $text) = @_;
1553 1914
1554 return if $self->{text} eq "T$text"; 1915 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1916 $self->{text} = "T$text";
1556 1917
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1918 $self->{layout}->set_text ($text);
1919
1559 delete $self->{req_h}; 1920 delete $self->{size_req};
1560
1561 $self->realloc; 1921 $self->realloc;
1562 $self->update; 1922 $self->update;
1563} 1923}
1564 1924
1565sub set_markup { 1925sub set_markup {
… …
1568 return if $self->{text} eq "M$markup"; 1928 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1929 $self->{text} = "M$markup";
1570 1930
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1931 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1932
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1933 $self->{layout}->set_markup ($markup);
1934
1575 delete $self->{req_h}; 1935 delete $self->{size_req};
1576
1577 $self->realloc; 1936 $self->realloc;
1578 $self->update; 1937 $self->update;
1579} 1938}
1580 1939
1581sub size_request { 1940sub size_request {
1582 my ($self) = @_; 1941 my ($self) = @_;
1583 1942
1584 if (exists $self->{req_h}) { 1943 $self->{size_req} ||= do {
1585 @$self{qw(req_w req_h)}
1586 } else {
1587 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1944 $self->{layout}->set_font ($self->{font}) if $self->{font};
1588 $self->{layout}->set_width ($self->{max_w} || -1); 1945 $self->{layout}->set_width ($self->{max_w} || -1);
1589 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1946 $self->{layout}->set_ellipsise ($self->{ellipsise});
1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1947 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1948 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592 1949
1593 my ($w, $h) = $self->{layout}->size; 1950 my ($w, $h) = $self->{layout}->size;
1594 1951
1595 if (exists $self->{template}) { 1952 if (exists $self->{template}) {
1596 $self->{template}->set_font ($self->{font}) if $self->{font}; 1953 $self->{template}->set_font ($self->{font}) if $self->{font};
1954 $self->{template}->set_width ($self->{max_w} || -1);
1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1955 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 1956
1599 my ($w2, $h2) = $self->{template}->size; 1957 my ($w2, $h2) = $self->{template}->size;
1600 1958
1601 $w = List::Util::max $w, $w2; 1959 $w = List::Util::max $w, $w2;
1602 $h = List::Util::max $h, $h2; 1960 $h = List::Util::max $h, $h2;
1603 } 1961 }
1604 1962
1605 ($w, $h) 1963 [$w, $h]
1606 } 1964 };
1607}
1608 1965
1966 @{ $self->{size_req} }
1967}
1968
1969sub baseline_shift {
1970 $_[0]{layout}->descent
1971}
1972
1609sub size_allocate { 1973sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1974 my ($self, $w, $h) = @_;
1611 1975
1612 delete $self->{ox}; 1976 delete $self->{ox};
1613 1977
1614 delete $self->{texture} 1978 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1979 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1980
1981 1
1616} 1982}
1617 1983
1618sub set_fontsize { 1984sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1985 my ($self, $fontsize) = @_;
1620 1986
1621 $self->{fontsize} = $fontsize; 1987 $self->{fontsize} = $fontsize;
1988 delete $self->{size_req};
1622 delete $self->{texture}; 1989 delete $self->{texture};
1623 1990
1624 $self->realloc; 1991 $self->realloc;
1625} 1992}
1626 1993
1994sub reconfigure {
1995 my ($self) = @_;
1996
1997 delete $self->{size_req};
1998 delete $self->{texture};
1999
2000 $self->SUPER::reconfigure;
2001}
2002
1627sub _draw { 2003sub _draw {
1628 my ($self) = @_; 2004 my ($self) = @_;
1629 2005
1630 $self->SUPER::_draw; # draw background, if applicable 2006 $self->SUPER::_draw; # draw background, if applicable
1631 2007
1632 my $tex = $self->{texture} ||= do { 2008 my $size = $self->{texture} ||= do {
1633 $self->{layout}->set_foreground (@{$self->{fg}}); 2009 $self->{layout}->set_foreground (@{$self->{fg}});
1634 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2010 $self->{layout}->set_font ($self->{font}) if $self->{font};
1635 $self->{layout}->set_width ($self->{w}); 2011 $self->{layout}->set_width ($self->{w});
1636 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2012 $self->{layout}->set_ellipsise ($self->{ellipsise});
1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2013 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2014 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639 2015
1640 new_from_layout CFClient::Texture $self->{layout} 2016 [$self->{layout}->size]
1641 }; 2017 };
1642 2018
1643 unless (exists $self->{ox}) { 2019 unless (exists $self->{ox}) {
1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2020 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2021 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1646 : ($self->{w} - $tex->{w}) * 0.5); 2022 : ($self->{w} - $size->[0]) * 0.5);
1647 2023
1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2024 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2025 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1650 : ($self->{h} - $tex->{h}) * 0.5); 2026 : ($self->{h} - $size->[1]) * 0.5);
1651 }; 2027 };
1652 2028
1653 glEnable GL_TEXTURE_2D; 2029 my $w = List::Util::min $self->{w} + 4, $size->[0];
1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2030 my $h = List::Util::min $self->{h} + 2, $size->[1];
1655 2031
1656 if ($tex->{format} == GL_ALPHA) { 2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1657 glColor @{$self->{fg}};
1658 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1659 } else {
1660 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1661 }
1662
1663 glDisable GL_TEXTURE_2D;
1664} 2033}
1665 2034
1666############################################################################# 2035#############################################################################
1667 2036
1668package CFClient::UI::EntryBase; 2037package CFPlus::UI::EntryBase;
1669 2038
1670our @ISA = CFClient::UI::Label::; 2039our @ISA = CFPlus::UI::Label::;
1671 2040
1672use CFClient::OpenGL; 2041use CFPlus::OpenGL;
1673 2042
1674sub new { 2043sub new {
1675 my $class = shift; 2044 my $class = shift;
1676 2045
1677 $class->SUPER::new ( 2046 $class->SUPER::new (
… …
1681 active_fg => [0, 0, 0], 2050 active_fg => [0, 0, 0],
1682 can_hover => 1, 2051 can_hover => 1,
1683 can_focus => 1, 2052 can_focus => 1,
1684 valign => 0, 2053 valign => 0,
1685 can_events => 1, 2054 can_events => 1,
2055 ellipsise => 0,
1686 #text => ... 2056 #text => ...
2057 #hidden => "*",
1687 @_ 2058 @_
1688 ) 2059 )
1689} 2060}
1690 2061
1691sub _set_text { 2062sub _set_text {
… …
1698 $self->{last_activity} = $::NOW; 2069 $self->{last_activity} = $::NOW;
1699 $self->{text} = $text; 2070 $self->{text} = $text;
1700 2071
1701 $text =~ s/./*/g if $self->{hidden}; 2072 $text =~ s/./*/g if $self->{hidden};
1702 $self->{layout}->set_text ("$text "); 2073 $self->{layout}->set_text ("$text ");
1703 delete $self->{req_h}; 2074 delete $self->{size_req};
1704 2075
1705 $self->_emit (changed => $self->{text}); 2076 $self->emit (changed => $self->{text});
1706 2077
1707 $self->realloc; 2078 $self->realloc;
1708 $self->update; 2079 $self->update;
1709} 2080}
1710 2081
… …
1725 my ($w, $h) = $self->SUPER::size_request; 2096 my ($w, $h) = $self->SUPER::size_request;
1726 2097
1727 ($w + 1, $h) # add 1 for cursor 2098 ($w + 1, $h) # add 1 for cursor
1728} 2099}
1729 2100
1730sub key_down { 2101sub invoke_key_down {
1731 my ($self, $ev) = @_; 2102 my ($self, $ev) = @_;
1732 2103
1733 my $mod = $ev->{mod}; 2104 my $mod = $ev->{mod};
1734 my $sym = $ev->{sym}; 2105 my $sym = $ev->{sym};
1735 my $uni = $ev->{unicode}; 2106 my $uni = $ev->{unicode};
1736 2107
1737 my $text = $self->get_text; 2108 my $text = $self->get_text;
2109
2110 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1738 2111
1739 if ($uni == 8) { 2112 if ($uni == 8) {
1740 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2113 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1741 } elsif ($uni == 127) { 2114 } elsif ($uni == 127) {
1742 substr $text, $self->{cursor}, 1, ""; 2115 substr $text, $self->{cursor}, 1, "";
1743 } elsif ($sym == CFClient::SDLK_LEFT) { 2116 } elsif ($sym == CFPlus::SDLK_LEFT) {
1744 --$self->{cursor} if $self->{cursor}; 2117 --$self->{cursor} if $self->{cursor};
1745 } elsif ($sym == CFClient::SDLK_RIGHT) { 2118 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1746 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2119 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1747 } elsif ($sym == CFClient::SDLK_HOME) { 2120 } elsif ($sym == CFPlus::SDLK_HOME) {
2121 # what a hack
2122 $self->{cursor} =
2123 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2124 ? length $1
2125 : 0;
2126 } elsif ($sym == CFPlus::SDLK_END) {
2127 # uh, again
2128 $self->{cursor} =
2129 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2130 ? $self->{cursor} + length $1
2131 : length $self->{text};
2132 } elsif ($uni == 21) { # ctrl-u
2133 $text = "";
1748 $self->{cursor} = 0; 2134 $self->{cursor} = 0;
1749 } elsif ($sym == CFClient::SDLK_END) {
1750 $self->{cursor} = length $text;
1751 } elsif ($uni == 27) { 2135 } elsif ($uni == 27) {
1752 $self->_emit ('escape'); 2136 $self->emit ('escape');
1753 } elsif ($uni) { 2137 } elsif ($uni == 0x0d) {
2138 substr $text, $self->{cursor}++, 0, "\012";
2139 } elsif ($uni >= 0x20) {
1754 substr $text, $self->{cursor}++, 0, chr $uni; 2140 substr $text, $self->{cursor}++, 0, chr $uni;
1755 } else { 2141 } else {
1756 return 0; 2142 return 0;
1757 } 2143 }
1758 2144
1759 $self->_set_text ($text); 2145 $self->_set_text ($text);
1760 2146
1761 $self->realloc; 2147 $self->realloc;
2148 $self->update;
1762 2149
1763 1 2150 1
1764} 2151}
1765 2152
1766sub focus_in { 2153sub invoke_focus_in {
1767 my ($self) = @_; 2154 my ($self) = @_;
1768 2155
1769 $self->{last_activity} = $::NOW; 2156 $self->{last_activity} = $::NOW;
1770 2157
1771 $self->SUPER::focus_in; 2158 $self->SUPER::invoke_focus_in
1772} 2159}
1773 2160
1774sub button_down { 2161sub invoke_button_down {
1775 my ($self, $ev, $x, $y) = @_; 2162 my ($self, $ev, $x, $y) = @_;
1776 2163
1777 $self->SUPER::button_down ($ev, $x, $y); 2164 $self->SUPER::invoke_button_down ($ev, $x, $y);
1778 2165
1779 my $idx = $self->{layout}->xy_to_index ($x, $y); 2166 my $idx = $self->{layout}->xy_to_index ($x, $y);
1780 2167
1781 # byte-index to char-index 2168 # byte-index to char-index
1782 my $text = $self->{text}; 2169 my $text = $self->{text};
1783 utf8::encode $text; 2170 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1784 $self->{cursor} = length substr $text, 0, $idx; 2171 $self->{cursor} = length $text;
1785 2172
1786 $self->_set_text ($self->{text}); 2173 $self->_set_text ($self->{text});
1787 $self->update; 2174 $self->update;
1788 2175
1789 1 2176 1
1790} 2177}
1791 2178
1792sub mouse_motion { 2179sub invoke_mouse_motion {
1793 my ($self, $ev, $x, $y) = @_; 2180 my ($self, $ev, $x, $y) = @_;
1794# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2181# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1795 2182
1796 0 2183 1
1797} 2184}
1798 2185
1799sub _draw { 2186sub _draw {
1800 my ($self) = @_; 2187 my ($self) = @_;
1801 2188
… …
1828 utf8::encode $text; 2215 utf8::encode $text;
1829 2216
1830 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2217 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1831 } 2218 }
1832 2219
1833 glColor @{$self->{fg}};
1834 glBegin GL_LINES; 2220 glBegin GL_LINES;
1835 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2221 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1836 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1837 glEnd; 2223 glEnd;
1838 } 2224 }
1839} 2225}
1840 2226
2227#############################################################################
2228
1841package CFClient::UI::Entry; 2229package CFPlus::UI::Entry;
1842 2230
1843our @ISA = CFClient::UI::EntryBase::; 2231our @ISA = CFPlus::UI::EntryBase::;
1844 2232
1845use CFClient::OpenGL; 2233use CFPlus::OpenGL;
1846 2234
1847sub key_down { 2235sub invoke_key_down {
1848 my ($self, $ev) = @_; 2236 my ($self, $ev) = @_;
1849 2237
1850 my $sym = $ev->{sym}; 2238 my $sym = $ev->{sym};
1851 2239
1852 if ($sym == 13) { 2240 if ($ev->{uni} == 0x0d || $sym == 13) {
1853 unshift @{$self->{history}}, 2241 unshift @{$self->{history}},
1854 my $txt = $self->get_text; 2242 my $txt = $self->get_text;
2243
1855 $self->{history_pointer} = -1; 2244 $self->{history_pointer} = -1;
1856 $self->{history_saveback} = ''; 2245 $self->{history_saveback} = '';
1857 $self->_emit (activate => $txt); 2246 $self->emit (activate => $txt);
1858 $self->update; 2247 $self->update;
1859 2248
1860 } elsif ($sym == CFClient::SDLK_UP) { 2249 } elsif ($sym == CFPlus::SDLK_UP) {
1861 if ($self->{history_pointer} < 0) { 2250 if ($self->{history_pointer} < 0) {
1862 $self->{history_saveback} = $self->get_text; 2251 $self->{history_saveback} = $self->get_text;
1863 } 2252 }
1864 if (@{$self->{history} || []} > 0) { 2253 if (@{$self->{history} || []} > 0) {
1865 $self->{history_pointer}++; 2254 $self->{history_pointer}++;
… …
1867 $self->{history_pointer} = @{$self->{history} || []} - 1; 2256 $self->{history_pointer} = @{$self->{history} || []} - 1;
1868 } 2257 }
1869 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2258 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1870 } 2259 }
1871 2260
1872 } elsif ($sym == CFClient::SDLK_DOWN) { 2261 } elsif ($sym == CFPlus::SDLK_DOWN) {
1873 $self->{history_pointer}--; 2262 $self->{history_pointer}--;
1874 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2263 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1875 2264
1876 if ($self->{history_pointer} >= 0) { 2265 if ($self->{history_pointer} >= 0) {
1877 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2266 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1878 } else { 2267 } else {
1879 $self->set_text ($self->{history_saveback}); 2268 $self->set_text ($self->{history_saveback});
1880 } 2269 }
1881 2270
1882 } else { 2271 } else {
1883 return $self->SUPER::key_down ($ev) 2272 return $self->SUPER::invoke_key_down ($ev)
1884 } 2273 }
1885 2274
1886 1 2275 1
1887} 2276}
1888 2277
1889############################################################################# 2278#############################################################################
1890 2279
2280package CFPlus::UI::TextEdit;
2281
2282our @ISA = CFPlus::UI::EntryBase::;
2283
2284use CFPlus::OpenGL;
2285
2286sub move_cursor_ver {
2287 my ($self, $dy) = @_;
2288
2289 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2290
2291 $y += $dy;
2292
2293 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2294 $self->{cursor} = $index;
2295 delete $self->{cur_h};
2296 $self->update;
2297 return;
2298 }
2299}
2300
2301sub invoke_key_down {
2302 my ($self, $ev) = @_;
2303
2304 my $sym = $ev->{sym};
2305
2306 if ($sym == CFPlus::SDLK_UP) {
2307 $self->move_cursor_ver (-1);
2308 } elsif ($sym == CFPlus::SDLK_DOWN) {
2309 $self->move_cursor_ver (+1);
2310 } else {
2311 return $self->SUPER::invoke_key_down ($ev)
2312 }
2313
2314 1
2315}
2316
2317#############################################################################
2318
1891package CFClient::UI::Button; 2319package CFPlus::UI::Button;
1892 2320
1893our @ISA = CFClient::UI::Label::; 2321our @ISA = CFPlus::UI::Label::;
1894 2322
1895use CFClient::OpenGL; 2323use CFPlus::OpenGL;
1896 2324
1897my @tex = 2325my @tex =
1898 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2326 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1899 qw(b1_button_active.png); 2327 qw(b1_button_active.png);
1900 2328
1901sub new { 2329sub new {
1902 my $class = shift; 2330 my $class = shift;
1903 2331
… …
1912 can_events => 1, 2340 can_events => 1,
1913 @_ 2341 @_
1914 ) 2342 )
1915} 2343}
1916 2344
1917sub activate { }
1918
1919sub button_up { 2345sub invoke_button_up {
1920 my ($self, $ev, $x, $y) = @_; 2346 my ($self, $ev, $x, $y) = @_;
1921 2347
1922 $self->emit ("activate") 2348 $self->emit ("activate")
1923 if $x >= 0 && $x < $self->{w} 2349 if $x >= 0 && $x < $self->{w}
1924 && $y >= 0 && $y < $self->{h}; 2350 && $y >= 0 && $y < $self->{h};
… …
1942 $self->SUPER::_draw; 2368 $self->SUPER::_draw;
1943} 2369}
1944 2370
1945############################################################################# 2371#############################################################################
1946 2372
1947package CFClient::UI::CheckBox; 2373package CFPlus::UI::CheckBox;
1948 2374
1949our @ISA = CFClient::UI::DrawBG::; 2375our @ISA = CFPlus::UI::DrawBG::;
1950 2376
1951my @tex = 2377my @tex =
1952 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1953 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2379 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1954 2380
1955use CFClient::OpenGL; 2381use CFPlus::OpenGL;
1956 2382
1957sub new { 2383sub new {
1958 my $class = shift; 2384 my $class = shift;
1959 2385
1960 $class->SUPER::new ( 2386 $class->SUPER::new (
… …
1974 my ($self) = @_; 2400 my ($self) = @_;
1975 2401
1976 (6) x 2 2402 (6) x 2
1977} 2403}
1978 2404
2405sub toggle {
2406 my ($self) = @_;
2407
2408 $self->{state} = !$self->{state};
2409 $self->emit (changed => $self->{state});
2410 $self->update;
2411}
2412
1979sub button_down { 2413sub invoke_button_down {
1980 my ($self, $ev, $x, $y) = @_; 2414 my ($self, $ev, $x, $y) = @_;
1981 2415
1982 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2416 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1983 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2417 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1984 $self->{state} = !$self->{state}; 2418 $self->toggle;
1985 $self->_emit (changed => $self->{state});
1986 } else { 2419 } else {
1987 return 0 2420 return 0
1988 } 2421 }
1989 2422
1990 1 2423 1
… …
2010 glDisable GL_TEXTURE_2D; 2443 glDisable GL_TEXTURE_2D;
2011} 2444}
2012 2445
2013############################################################################# 2446#############################################################################
2014 2447
2015package CFClient::UI::Image; 2448package CFPlus::UI::Image;
2016 2449
2017our @ISA = CFClient::UI::Base::; 2450our @ISA = CFPlus::UI::Base::;
2018 2451
2019use CFClient::OpenGL; 2452use CFPlus::OpenGL;
2020use Carp qw/confess/;
2021 2453
2022our %loaded_images; 2454our %texture_cache;
2023 2455
2024sub new { 2456sub new {
2025 my $class = shift; 2457 my $class = shift;
2026 2458
2027 my $self = $class->SUPER::new (can_events => 0, @_); 2459 my $self = $class->SUPER::new (
2460 can_events => 0,
2461 @_,
2462 );
2028 2463
2029 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2464 $self->{path} || $self->{tex}
2465 or Carp::croak "'path' or 'tex' attributes required";
2030 2466
2031 $loaded_images{$self->{image}} ||= 2467 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2032 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2468 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2033 2469
2034 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2470 CFPlus::weaken $texture_cache{$self->{path}};
2035 2471
2036 Scalar::Util::weaken $loaded_images{$self->{image}}; 2472 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2037
2038 $self->{aspect} = $tex->{w} / $tex->{h};
2039 2473
2040 $self 2474 $self
2041} 2475}
2042 2476
2477sub STORABLE_freeze {
2478 my ($self, $cloning) = @_;
2479
2480 $self->{path}
2481 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2482
2483 $self->{path}
2484}
2485
2486sub STORABLE_attach {
2487 my ($self, $cloning, $path) = @_;
2488
2489 $self->new (path => $path)
2490}
2491
2043sub size_request { 2492sub size_request {
2044 my ($self) = @_; 2493 my ($self) = @_;
2045 2494
2046 ($self->{tex}->{w}, $self->{tex}->{h}) 2495 ($self->{tex}{w}, $self->{tex}{h})
2047} 2496}
2048 2497
2049sub _draw { 2498sub _draw {
2050 my ($self) = @_; 2499 my ($self) = @_;
2051 2500
… …
2061 } 2510 }
2062 2511
2063 glEnable GL_TEXTURE_2D; 2512 glEnable GL_TEXTURE_2D;
2064 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2065 2514
2066 $tex->draw_quad_alpha (0, 0, $w, $h); 2515 $tex->draw_quad (0, 0, $w, $h);
2067 2516
2068 glDisable GL_TEXTURE_2D; 2517 glDisable GL_TEXTURE_2D;
2069} 2518}
2070 2519
2071############################################################################# 2520#############################################################################
2072 2521
2522package CFPlus::UI::ImageButton;
2523
2524our @ISA = CFPlus::UI::Image::;
2525
2526use CFPlus::OpenGL;
2527
2528my %textures;
2529
2530sub new {
2531 my $class = shift;
2532
2533 my $self = $class->SUPER::new (
2534 padding_x => 4,
2535 padding_y => 4,
2536 fg => [1, 1, 1],
2537 active_fg => [0, 0, 1],
2538 can_hover => 1,
2539 align => 0,
2540 valign => 0,
2541 can_events => 1,
2542 @_
2543 );
2544}
2545
2546sub invoke_button_up {
2547 my ($self, $ev, $x, $y) = @_;
2548
2549 $self->emit ("activate")
2550 if $x >= 0 && $x < $self->{w}
2551 && $y >= 0 && $y < $self->{h};
2552
2553 1
2554}
2555
2556#############################################################################
2557
2073package CFClient::UI::VGauge; 2558package CFPlus::UI::VGauge;
2074 2559
2075our @ISA = CFClient::UI::Base::; 2560our @ISA = CFPlus::UI::Base::;
2076 2561
2077use List::Util qw(min max); 2562use List::Util qw(min max);
2078 2563
2079use CFClient::OpenGL; 2564use CFPlus::OpenGL;
2080 2565
2081my %tex = ( 2566my %tex = (
2082 food => [ 2567 food => [
2083 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2568 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2084 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2569 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2085 ], 2570 ],
2086 grace => [ 2571 grace => [
2087 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2572 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2088 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2573 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2089 ], 2574 ],
2090 hp => [ 2575 hp => [
2091 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2576 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2092 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2577 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2093 ], 2578 ],
2094 mana => [ 2579 mana => [
2095 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2580 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2096 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2581 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2097 ], 2582 ],
2098); 2583);
2099 2584
2100# eg. VGauge->new (gauge => 'food'), default gauge: food 2585# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2160 my $ycut1 = max 0, min 1, $ycut; 2645 my $ycut1 = max 0, min 1, $ycut;
2161 my $ycut2 = max 0, min 1, $ycut - 1; 2646 my $ycut2 = max 0, min 1, $ycut - 1;
2162 2647
2163 my $h1 = $self->{h} * (1 - $ycut1); 2648 my $h1 = $self->{h} * (1 - $ycut1);
2164 my $h2 = $self->{h} * (1 - $ycut2); 2649 my $h2 = $self->{h} * (1 - $ycut2);
2650 my $h3 = $self->{h};
2651
2652 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2165 2653
2166 glEnable GL_BLEND; 2654 glEnable GL_BLEND;
2167 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2655 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2168 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2656 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2169 glEnable GL_TEXTURE_2D; 2657 glEnable GL_TEXTURE_2D;
… …
2188 2676
2189 if ($t3) { 2677 if ($t3) {
2190 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2678 glBindTexture GL_TEXTURE_2D, $t3->{name};
2191 glBegin GL_QUADS; 2679 glBegin GL_QUADS;
2192 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2680 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2193 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2681 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2194 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2682 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2195 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2683 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2196 glEnd; 2684 glEnd;
2197 } 2685 }
2198 2686
2199 glDisable GL_BLEND; 2687 glDisable GL_BLEND;
2200 glDisable GL_TEXTURE_2D; 2688 glDisable GL_TEXTURE_2D;
2201} 2689}
2202 2690
2203############################################################################# 2691#############################################################################
2204 2692
2205package CFClient::UI::Gauge; 2693package CFPlus::UI::Gauge;
2206 2694
2207our @ISA = CFClient::UI::VBox::; 2695our @ISA = CFPlus::UI::VBox::;
2208 2696
2209sub new { 2697sub new {
2210 my ($class, %arg) = @_; 2698 my ($class, %arg) = @_;
2211 2699
2212 my $self = $class->SUPER::new ( 2700 my $self = $class->SUPER::new (
… …
2214 can_hover => 1, 2702 can_hover => 1,
2215 can_events => 1, 2703 can_events => 1,
2216 %arg, 2704 %arg,
2217 ); 2705 );
2218 2706
2219 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2707 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2220 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2708 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2221 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2709 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2222 2710
2223 $self 2711 $self
2224} 2712}
2225 2713
2226sub set_fontsize { 2714sub set_fontsize {
… …
2247 $self->{value}->set_text ($val); 2735 $self->{value}->set_text ($val);
2248} 2736}
2249 2737
2250############################################################################# 2738#############################################################################
2251 2739
2252package CFClient::UI::Slider; 2740package CFPlus::UI::Slider;
2253 2741
2254use strict; 2742use strict;
2255 2743
2256use CFClient::OpenGL; 2744use CFPlus::OpenGL;
2257 2745
2258our @ISA = CFClient::UI::DrawBG::; 2746our @ISA = CFPlus::UI::DrawBG::;
2259 2747
2260my @tex = 2748my @tex =
2261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2749 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2262 qw(s1_slider.png s1_slider_bg.png); 2750 qw(s1_slider.png s1_slider_bg.png);
2263 2751
2264sub new { 2752sub new {
2265 my $class = shift; 2753 my $class = shift;
2266 2754
… …
2287 $self->update; 2775 $self->update;
2288 2776
2289 $self 2777 $self
2290} 2778}
2291 2779
2292sub changed { }
2293
2294sub set_range { 2780sub set_range {
2295 my ($self, $range) = @_; 2781 my ($self, $range) = @_;
2296 2782
2297 ($range, $self->{range}) = ($self->{range}, $range); 2783 ($range, $self->{range}) = ($self->{range}, $range);
2298 2784
2299 $self->update
2300 if "@$range" ne "@{$self->{range}}"; 2785 if ("@$range" ne "@{$self->{range}}") {
2786 $self->update;
2787 $self->set_value ($self->{range}[0]);
2788 }
2301} 2789}
2302 2790
2303sub set_value { 2791sub set_value {
2304 my ($self, $value) = @_; 2792 my ($self, $value) = @_;
2305 2793
… …
2316 if $unit; 2804 if $unit;
2317 2805
2318 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2806 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2319 2807
2320 if ($value != $old_value) { 2808 if ($value != $old_value) {
2321 $self->_emit (changed => $value); 2809 $self->emit (changed => $value);
2322 $self->update; 2810 $self->update;
2323 } 2811 }
2324} 2812}
2325 2813
2326sub size_request { 2814sub size_request {
2327 my ($self) = @_; 2815 my ($self) = @_;
2328 2816
2329 ($self->{req_w}, $self->{req_h}) 2817 ($self->{req_w}, $self->{req_h})
2330} 2818}
2331 2819
2332sub button_down { 2820sub invoke_button_down {
2333 my ($self, $ev, $x, $y) = @_; 2821 my ($self, $ev, $x, $y) = @_;
2334 2822
2335 $self->SUPER::button_down ($ev, $x, $y); 2823 $self->SUPER::invoke_button_down ($ev, $x, $y);
2336 2824
2337 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2825 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2338 2826
2339 $self->mouse_motion ($ev, $x, $y) 2827 $self->invoke_mouse_motion ($ev, $x, $y)
2340} 2828}
2341 2829
2342sub mouse_motion { 2830sub invoke_mouse_motion {
2343 my ($self, $ev, $x, $y) = @_; 2831 my ($self, $ev, $x, $y) = @_;
2344 2832
2345 if ($GRAB == $self) { 2833 if ($GRAB == $self) {
2346 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2834 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2347 2835
… …
2353 } else { 2841 } else {
2354 return 0; 2842 return 0;
2355 } 2843 }
2356 2844
2357 1 2845 1
2846}
2847
2848sub invoke_mouse_wheel {
2849 my ($self, $ev) = @_;
2850
2851 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2852
2853 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2854
2855 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2856
2857 ! ! $delta
2358} 2858}
2359 2859
2360sub update { 2860sub update {
2361 my ($self) = @_; 2861 my ($self) = @_;
2362 2862
… …
2411 glDisable GL_TEXTURE_2D; 2911 glDisable GL_TEXTURE_2D;
2412} 2912}
2413 2913
2414############################################################################# 2914#############################################################################
2415 2915
2416package CFClient::UI::ValSlider; 2916package CFPlus::UI::ValSlider;
2417 2917
2418our @ISA = CFClient::UI::HBox::; 2918our @ISA = CFPlus::UI::HBox::;
2419 2919
2420sub new { 2920sub new {
2421 my ($class, %arg) = @_; 2921 my ($class, %arg) = @_;
2422 2922
2423 my $range = delete $arg{range}; 2923 my $range = delete $arg{range};
2424 2924
2425 my $self = $class->SUPER::new ( 2925 my $self = $class->SUPER::new (
2426 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2926 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2427 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2927 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2428 to_value => sub { shift }, 2928 to_value => sub { shift },
2429 from_value => sub { shift }, 2929 from_value => sub { shift },
2430 %arg, 2930 %arg,
2431 ); 2931 );
2432 2932
… …
2452sub set_range { shift->{slider}->set_range (@_) } 2952sub set_range { shift->{slider}->set_range (@_) }
2453sub set_value { shift->{slider}->set_value (@_) } 2953sub set_value { shift->{slider}->set_value (@_) }
2454 2954
2455############################################################################# 2955#############################################################################
2456 2956
2457package CFClient::UI::TextView; 2957package CFPlus::UI::TextScroller;
2458 2958
2459our @ISA = CFClient::UI::HBox::; 2959our @ISA = CFPlus::UI::HBox::;
2460 2960
2461use CFClient::OpenGL; 2961use CFPlus::OpenGL;
2462 2962
2463sub new { 2963sub new {
2464 my $class = shift; 2964 my $class = shift;
2465 2965
2466 my $self = $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2467 fontsize => 1, 2967 fontsize => 1,
2468 can_events => 0, 2968 can_events => 1,
2969 indent => 0,
2469 #font => default_font 2970 #font => default_font
2470 @_, 2971 @_,
2471 2972
2472 layout => (new CFClient::Layout 1), 2973 layout => (new CFPlus::Layout),
2473 par => [], 2974 par => [],
2975 max_par => 0,
2474 height => 0, 2976 height => 0,
2475 children => [ 2977 children => [
2476 (new CFClient::UI::Empty expand => 1), 2978 (new CFPlus::UI::Empty expand => 1),
2477 (new CFClient::UI::Slider vertical => 1), 2979 (new CFPlus::UI::Slider vertical => 1),
2478 ], 2980 ],
2479 ); 2981 );
2480 2982
2481 $self->{children}[1]->connect (changed => sub { $self->update }); 2983 $self->{children}[1]->connect (changed => sub { $self->update });
2482 2984
… …
2488 2990
2489 $self->{fontsize} = $fontsize; 2991 $self->{fontsize} = $fontsize;
2490 $self->reflow; 2992 $self->reflow;
2491} 2993}
2492 2994
2995sub size_request {
2996 my ($self) = @_;
2997
2998 my ($empty, $slider) = @{ $self->{children} };
2999
3000 local $self->{children} = [$empty, $slider];
3001 $self->SUPER::size_request
3002}
3003
2493sub size_allocate { 3004sub invoke_size_allocate {
2494 my ($self, $w, $h) = @_; 3005 my ($self, $w, $h) = @_;
2495 3006
2496 $self->SUPER::size_allocate ($w, $h); 3007 my ($empty, $slider, @other) = @{ $self->{children} };
3008 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2497 3009
2498 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3010 $self->{layout}->set_font ($self->{font}) if $self->{font};
2499 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3011 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2500 $self->{layout}->set_width ($self->{children}[0]{w}); 3012 $self->{layout}->set_width ($empty->{w});
3013 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2501 3014
2502 $self->reflow; 3015 $self->reflow;
2503}
2504 3016
2505sub text_size { 3017 local $self->{children} = [$empty, $slider];
3018 $self->SUPER::invoke_size_allocate ($w, $h)
3019}
3020
3021sub invoke_mouse_wheel {
2506 my ($self, $text, $indent) = @_; 3022 my ($self, $ev) = @_;
3023
3024 return 0 unless $ev->{dy}; # only vertical movements
3025
3026 $self->{children}[1]->emit (mouse_wheel => $ev);
3027
3028 1
3029}
3030
3031sub get_layout {
3032 my ($self, $para) = @_;
2507 3033
2508 my $layout = $self->{layout}; 3034 my $layout = $self->{layout};
2509 3035
3036 $layout->set_font ($self->{font}) if $self->{font};
3037 $layout->set_foreground (@{$para->{fg}});
2510 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3038 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511 $layout->set_width ($self->{children}[0]{w} - $indent); 3039 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3040 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2512 $layout->set_markup ($text); 3041 $layout->set_markup ($para->{markup});
3042
3043 $layout->set_shapes (
3044 map
3045 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3046 @{$para->{widget}}
2513 3047 );
3048
2514 $layout->size 3049 $layout
2515} 3050}
2516 3051
2517sub reflow { 3052sub reflow {
2518 my ($self) = @_; 3053 my ($self) = @_;
2519 3054
… …
2526 3061
2527 # todo: base offset on lines or so, not on pixels 3062 # todo: base offset on lines or so, not on pixels
2528 $self->{children}[1]->set_value ($offset); 3063 $self->{children}[1]->set_value ($offset);
2529} 3064}
2530 3065
3066sub current_paragraph {
3067 my ($self) = @_;
3068
3069 $self->{top_paragraph} - 1
3070}
3071
3072sub scroll_to {
3073 my ($self, $para) = @_;
3074
3075 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3076
3077 $self->{scroll_to} = $para;
3078 $self->update;
3079}
3080
2531sub clear { 3081sub clear {
2532 my ($self) = @_; 3082 my ($self) = @_;
3083
3084 my (undef, undef, @other) = @{ $self->{children} };
3085 $self->remove ($_) for @other;
2533 3086
2534 $self->{par} = []; 3087 $self->{par} = [];
2535 $self->{height} = 0; 3088 $self->{height} = 0;
2536 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3089 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2537} 3090}
2538 3091
2539sub add_paragraph { 3092sub add_paragraph {
2540 my ($self, $color, $text, $indent) = @_; 3093 my $self = shift;
2541 3094
2542 for my $line (split /\n/, $text) { 3095 for my $para (@_) {
2543 my ($w, $h) = $self->text_size ($line); 3096 $para = {
3097 fg => [1, 1, 1, 1],
3098 indent => 0,
3099 markup => "",
3100 widget => [],
3101 ref $para ? %$para : (markup => $para),
3102 w => 1e10,
3103 wrapped => 1,
3104 };
3105
3106 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3107 push @{$self->{par}}, $para;
3108 }
3109
3110 if (my $max = $self->{max_par}) {
3111 shift @{$self->{par}} while @{$self->{par}} > $max;
3112 }
3113
3114 $self->{need_reflow}++;
3115 $self->update;
3116}
3117
3118sub scroll_to_bottom {
3119 my ($self) = @_;
3120
3121 $self->{scroll_to} = $#{$self->{par}};
3122 $self->update;
3123}
3124
3125sub force_uptodate {
3126 my ($self) = @_;
3127
3128 if (delete $self->{need_reflow}) {
3129 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3130
3131 my $height = 0;
3132
3133 for my $para (@{$self->{par}}) {
3134 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3135 my $layout = $self->get_layout ($para);
3136 my ($w, $h) = $layout->size;
3137
3138 $para->{w} = $w + $para->{indent};
3139 $para->{h} = $h;
3140 $para->{wrapped} = $layout->has_wrapped;
3141 }
3142
3143 $para->{y} = $height;
3144 $height += $para->{h};
3145 }
3146
2544 $self->{height} += $h; 3147 $self->{height} = $height;
2545 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3148 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2546 }
2547 3149
2548 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3150 delete $self->{texture};
3151 }
3152
3153 if (my $paridx = delete $self->{scroll_to}) {
3154 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3155 }
2549} 3156}
2550 3157
2551sub update { 3158sub update {
2552 my ($self) = @_; 3159 my ($self) = @_;
2553 3160
… …
2555 3162
2556 return unless $self->{h} > 0; 3163 return unless $self->{h} > 0;
2557 3164
2558 delete $self->{texture}; 3165 delete $self->{texture};
2559 3166
2560 $ROOT->on_post_alloc ($self, sub { 3167 $ROOT->on_post_alloc ($self => sub {
3168 $self->force_uptodate;
3169
2561 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3170 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2562 3171
2563 if (delete $self->{need_reflow}) {
2564 my $height = 0;
2565
2566 my $layout = $self->{layout};
2567
2568 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2569
2570 for (@{$self->{par}}) {
2571 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2572 $layout->set_width ($W - $_->[3]);
2573 $layout->set_markup ($_->[4]);
2574 my ($w, $h) = $layout->size;
2575 $_->[0] = $w + $_->[3];
2576 $_->[1] = $h;
2577 }
2578
2579 $height += $_->[1];
2580 }
2581
2582 $self->{height} = $height;
2583
2584 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2585
2586 delete $self->{texture};
2587 }
2588
2589 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3172 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2590 glClearColor 0, 0, 0, 0; 3173 glClearColor 0, 0, 0, 0;
2591 glClear GL_COLOR_BUFFER_BIT; 3174 glClear GL_COLOR_BUFFER_BIT;
2592 3175
3176 package CFPlus::UI::Base;
3177 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3178 (0, 0, $self->{w}, $self->{h});
3179
3180 my $top = int $self->{children}[1]{range}[0];
3181
3182 my $paridx = 0;
3183 my $top_paragraph;
2593 my $top = int $self->{children}[1]{range}[0]; 3184 my $top = int $self->{children}[1]{range}[0];
2594 3185
2595 my $y0 = $top; 3186 my $y0 = $top;
2596 my $y1 = $top + $H; 3187 my $y1 = $top + $H;
2597 3188
2598 my $y = 0;
2599
2600 my $layout = $self->{layout};
2601
2602 $layout->set_font ($self->{font}) if $self->{font};
2603
2604 glEnable GL_BLEND;
2605 #TODO# not correct in windows where rgba is forced off
2606 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2607
2608 for my $par (@{$self->{par}}) { 3189 for my $para (@{$self->{par}}) {
2609 my $h = $par->[1]; 3190 my $h = $para->{h};
3191 my $y = $para->{y};
2610 3192
2611 if ($y0 < $y + $h && $y < $y1) { 3193 if ($y0 < $y + $h && $y < $y1) {
2612 $layout->set_foreground (@{ $par->[2] }); 3194 my $layout = $self->get_layout ($para);
2613 $layout->set_width ($W - $par->[3]);
2614 $layout->set_markup ($par->[4]);
2615 3195
2616 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3196 $layout->render ($para->{indent}, $y - $y0);
2617 3197
2618 glRasterPos $par->[3], $y - $y0; 3198 if (my @w = @{ $para->{widget} }) {
2619 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3199 my @s = $layout->get_shapes;
3200
3201 for (@w) {
3202 my ($dx, $dy) = splice @s, 0, 2, ();
3203
3204 $_->{x} = $dx + $para->{indent};
3205 $_->{y} = $dy + $y - $y0;
3206
3207 $_->draw;
3208 }
3209 }
2620 } 3210 }
2621 3211
2622 $y += $h; 3212 $paridx++;
3213 $top_paragraph ||= $paridx if $y >= $top;
2623 } 3214 }
2624 3215
2625 glDisable GL_BLEND; 3216 $self->{top_paragraph} = $top_paragraph;
2626 }; 3217 };
2627 }); 3218 });
3219}
3220
3221sub reconfigure {
3222 my ($self) = @_;
3223
3224 $self->SUPER::reconfigure;
3225
3226 $_->{w} = 1e10 for @{ $self->{par} };
3227 $self->reflow;
2628} 3228}
2629 3229
2630sub _draw { 3230sub _draw {
2631 my ($self) = @_; 3231 my ($self) = @_;
2632 3232
… …
2635 glColor 0, 0, 0, 1; 3235 glColor 0, 0, 0, 1;
2636 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3236 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2637 glDisable GL_TEXTURE_2D; 3237 glDisable GL_TEXTURE_2D;
2638 3238
2639 $self->{children}[1]->draw; 3239 $self->{children}[1]->draw;
2640
2641} 3240}
2642 3241
2643############################################################################# 3242#############################################################################
2644 3243
2645package CFClient::UI::Animator; 3244package CFPlus::UI::Animator;
2646 3245
2647use CFClient::OpenGL; 3246use CFPlus::OpenGL;
2648 3247
2649our @ISA = CFClient::UI::Bin::; 3248our @ISA = CFPlus::UI::Bin::;
2650 3249
2651sub moveto { 3250sub moveto {
2652 my ($self, $x, $y) = @_; 3251 my ($self, $x, $y) = @_;
2653 3252
2654 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3253 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2682 glPopMatrix; 3281 glPopMatrix;
2683} 3282}
2684 3283
2685############################################################################# 3284#############################################################################
2686 3285
2687package CFClient::UI::Flopper; 3286package CFPlus::UI::Flopper;
2688 3287
2689our @ISA = CFClient::UI::Button::; 3288our @ISA = CFPlus::UI::Button::;
2690 3289
2691sub new { 3290sub new {
2692 my $class = shift; 3291 my $class = shift;
2693 3292
2694 my $self = $class->SUPER::new ( 3293 my $self = $class->SUPER::new (
… …
2706 $self->{other}->toggle_visibility; 3305 $self->{other}->toggle_visibility;
2707} 3306}
2708 3307
2709############################################################################# 3308#############################################################################
2710 3309
2711package CFClient::UI::Tooltip; 3310package CFPlus::UI::Tooltip;
2712 3311
2713our @ISA = CFClient::UI::Bin::; 3312our @ISA = CFPlus::UI::Bin::;
2714 3313
2715use CFClient::OpenGL; 3314use CFPlus::OpenGL;
2716 3315
2717sub new { 3316sub new {
2718 my $class = shift; 3317 my $class = shift;
2719 3318
2720 $class->SUPER::new ( 3319 $class->SUPER::new (
… …
2723 ) 3322 )
2724} 3323}
2725 3324
2726sub set_tooltip_from { 3325sub set_tooltip_from {
2727 my ($self, $widget) = @_; 3326 my ($self, $widget) = @_;
3327
3328 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3329 if $widget->{tooltip} =~ /^#(.*)$/;
2728 3330
2729 my $tooltip = $widget->{tooltip}; 3331 my $tooltip = $widget->{tooltip};
2730 3332
2731 if ($ENV{CFPLUS_DEBUG} & 2) { 3333 if ($ENV{CFPLUS_DEBUG} & 2) {
2732 $tooltip .= "\n\n" . (ref $widget) . "\n" 3334 $tooltip .= "\n\n" . (ref $widget) . "\n"
2733 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3335 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2734 . "req $widget->{req_w} $widget->{req_h}\n" 3336 . "req $widget->{req_w} $widget->{req_h}\n"
2735 . "visible $widget->{visible}"; 3337 . "visible $widget->{visible}";
2736 } 3338 }
2737 3339
3340 $tooltip =~ s/^\n+//;
3341 $tooltip =~ s/\n+$//;
3342
2738 $self->add (new CFClient::UI::Label 3343 $self->add (new CFPlus::UI::Label
2739 markup => $tooltip, 3344 markup => $tooltip,
2740 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3345 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2741 fontsize => 0.8, 3346 fontsize => 0.8,
2742 fg => [0, 0, 0, 1], 3347 style => 1, # FLAG_INVERSE
2743 ellipsise => 0, 3348 ellipsise => 0,
2744 font => ($widget->{tooltip_font} || $::FONT_PROP), 3349 font => ($widget->{tooltip_font} || $::FONT_PROP),
2745 ); 3350 );
2746} 3351}
2747 3352
… …
2751 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3356 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2752 3357
2753 ($w + 4, $h + 4) 3358 ($w + 4, $h + 4)
2754} 3359}
2755 3360
2756sub size_allocate { 3361sub invoke_size_allocate {
2757 my ($self, $w, $h) = @_; 3362 my ($self, $w, $h) = @_;
2758 3363
2759 $self->SUPER::size_allocate ($w - 4, $h - 4); 3364 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2760} 3365}
2761 3366
2762sub visibility_change { 3367sub invoke_visibility_change {
2763 my ($self, $visible) = @_; 3368 my ($self, $visible) = @_;
2764 3369
2765 return unless $visible; 3370 return unless $visible;
2766 3371
2767 $self->{root}->on_post_alloc ("move_$self" => sub { 3372 $self->{root}->on_post_alloc ("move_$self" => sub {
2768 my $widget = $self->{owner} 3373 my $widget = $self->{owner}
2769 or return; 3374 or return;
2770 3375
3376 if ($widget->{visible}) {
2771 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3377 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2772 3378
2773 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3379 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2774 if $x + $self->{w} > $::WIDTH; 3380 if $x + $self->{w} > $self->{root}{w};
2775 3381
2776 $self->move_abs ($x, $y); 3382 $self->move_abs ($x, $y);
3383 } else {
3384 $self->hide;
3385 }
2777 }); 3386 });
2778} 3387}
2779 3388
2780sub _draw { 3389sub _draw {
2781 my ($self) = @_; 3390 my ($self) = @_;
… …
2805 $self->SUPER::_draw; 3414 $self->SUPER::_draw;
2806} 3415}
2807 3416
2808############################################################################# 3417#############################################################################
2809 3418
2810package CFClient::UI::Face; 3419package CFPlus::UI::Face;
2811 3420
2812our @ISA = CFClient::UI::Base::; 3421our @ISA = CFPlus::UI::DrawBG::;
2813 3422
2814use CFClient::OpenGL; 3423use CFPlus::OpenGL;
2815 3424
2816sub new { 3425sub new {
2817 my $class = shift; 3426 my $class = shift;
2818 3427
2819 my $self = $class->SUPER::new ( 3428 my $self = $class->SUPER::new (
3429 size_w => 32,
3430 size_h => 8,
2820 aspect => 1, 3431 aspect => 1,
2821 can_events => 0, 3432 can_events => 0,
2822 @_, 3433 @_,
2823 ); 3434 );
2824 3435
2825 if ($self->{anim} && $self->{animspeed}) { 3436 if ($self->{anim} && $self->{animspeed}) {
2826 Scalar::Util::weaken (my $widget = $self); 3437 CFPlus::weaken (my $widget = $self);
2827 3438
2828 $self->{timer} = Event->timer ( 3439 $self->{timer} = Event->timer (
2829 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3440 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2830 hard => 1, 3441 hard => 1,
2831 interval => $self->{animspeed}, 3442 interval => $self->{animspeed},
2832 cb => sub { 3443 cb => sub {
3444 return unless $::CONN;
3445
2833 ++$widget->{frame}; 3446 ++$widget->{frame};
3447 $self->update_face;
2834 $widget->update; 3448 $self->update;
2835 }, 3449 },
2836 ); 3450 );
3451
3452 $self->update_face;
2837 } 3453 }
2838 3454
2839 $self 3455 $self
2840} 3456}
2841 3457
3458sub update_face {
3459 my ($self) = @_;
3460
3461 return unless $::CONN;
3462
3463 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3464 if ($anim && @$anim) {
3465 delete $self->{wait_face};
3466 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3467 }
3468 }
3469}
3470
2842sub size_request { 3471sub size_request {
2843 (32, 8) 3472 my ($self) = @_;
3473
3474 if ($::CONN) {
3475 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3476 if (my $tex = $::CONN->{texture}[$faceid]) {
3477 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3478 } else {
3479 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3480 $self->realloc;
3481 });
3482 }
3483 }
3484 }
3485
3486 ($self->{size_w} || 8, $self->{size_h} || 8)
2844} 3487}
2845 3488
2846sub update { 3489sub update {
2847 my ($self) = @_; 3490 my ($self) = @_;
2848 3491
… …
2854sub _draw { 3497sub _draw {
2855 my ($self) = @_; 3498 my ($self) = @_;
2856 3499
2857 return unless $::CONN; 3500 return unless $::CONN;
2858 3501
2859 my $face; 3502 $self->SUPER::_draw;
2860 3503
2861 if ($self->{frame}) {
2862 my $anim = $::CONN->{anim}[$self->{anim}]; 3504 my $faceid = $::CONN->{faceid}[$self->{face}]
2863 3505 or return;
2864 $face = $anim->[ $self->{frame} % @$anim ]
2865 if $anim && @$anim;
2866 }
2867 3506
2868 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3507 my $tex = $::CONN->{texture}[$faceid];
2869 3508
2870 if ($tex) { 3509 if ($tex) {
2871 glEnable GL_TEXTURE_2D; 3510 glEnable GL_TEXTURE_2D;
2872 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2873 glColor 0, 0, 0, 1; 3512 glColor 0, 0, 0, 1;
2874 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3513 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2875 glDisable GL_TEXTURE_2D; 3514 glDisable GL_TEXTURE_2D;
2876 } 3515 }
2877} 3516}
2878 3517
2879sub DESTROY { 3518sub destroy {
2880 my ($self) = @_; 3519 my ($self) = @_;
2881 3520
2882 $self->{timer}->cancel 3521 $self->{timer}->cancel
2883 if $self->{timer}; 3522 if $self->{timer};
2884 3523
2885 $self->SUPER::DESTROY; 3524 $self->SUPER::destroy;
2886} 3525}
2887 3526
2888############################################################################# 3527#############################################################################
2889 3528
2890package CFClient::UI::Buttonbar; 3529package CFPlus::UI::Buttonbar;
2891 3530
2892our @ISA = CFClient::UI::HBox::; 3531our @ISA = CFPlus::UI::HBox::;
2893 3532
2894# TODO: should actualyl wrap buttons and other goodies. 3533# TODO: should actually wrap buttons and other goodies.
2895 3534
2896############################################################################# 3535#############################################################################
2897 3536
2898package CFClient::UI::Menu; 3537package CFPlus::UI::Menu;
2899 3538
2900our @ISA = CFClient::UI::FancyFrame::; 3539our @ISA = CFPlus::UI::Toplevel::;
2901 3540
2902use CFClient::OpenGL; 3541use CFPlus::OpenGL;
2903 3542
2904sub new { 3543sub new {
2905 my $class = shift; 3544 my $class = shift;
2906 3545
2907 my $self = $class->SUPER::new ( 3546 my $self = $class->SUPER::new (
2908 items => [], 3547 items => [],
2909 z => 100, 3548 z => 100,
2910 @_, 3549 @_,
2911 ); 3550 );
2912 3551
2913 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3552 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2914 3553
2915 for my $item (@{ $self->{items} }) { 3554 for my $item (@{ $self->{items} }) {
2916 my ($widget, $cb) = @$item; 3555 my ($widget, $cb, $tooltip) = @$item;
2917 3556
2918 # handle various types of items, only text for now 3557 # handle various types of items, only text for now
2919 if (!ref $widget) { 3558 if (!ref $widget) {
3559 if ($widget =~ /\t/) {
3560 my ($left, $right) = split /\t/, $widget, 2;
3561
2920 $widget = new CFClient::UI::Label 3562 $widget = new CFPlus::UI::HBox
2921 can_hover => 1, 3563 can_hover => 1,
2922 can_events => 1, 3564 can_events => 1,
3565 tooltip => $tooltip,
3566 children => [
3567 (new CFPlus::UI::Label markup => $left, expand => 1),
3568 (new CFPlus::UI::Label markup => $right, align => +1),
3569 ],
3570 ;
3571
3572 } else {
3573 $widget = new CFPlus::UI::Label
3574 can_hover => 1,
3575 can_events => 1,
2923 text => $widget; 3576 markup => $widget,
3577 tooltip => $tooltip;
3578 }
2924 } 3579 }
2925 3580
2926 $self->{item}{$widget} = $item; 3581 $self->{item}{$widget} = $item;
2927 3582
2928 $self->{vbox}->add ($widget); 3583 $self->{vbox}->add ($widget);
… …
2933 3588
2934# popup given the event (must be a mouse button down event currently) 3589# popup given the event (must be a mouse button down event currently)
2935sub popup { 3590sub popup {
2936 my ($self, $ev) = @_; 3591 my ($self, $ev) = @_;
2937 3592
2938 $self->_emit ("popdown"); 3593 $self->emit ("popdown");
2939 3594
2940 # maybe save $GRAB? must be careful about events... 3595 # maybe save $GRAB? must be careful about events...
2941 $GRAB = $self; 3596 $GRAB = $self;
2942 $self->{button} = $ev->{button}; 3597 $self->{button} = $ev->{button};
2943 3598
2944 $self->show; 3599 $self->show;
2945 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3600 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2946} 3601}
2947 3602
2948sub mouse_motion { 3603sub invoke_mouse_motion {
2949 my ($self, $ev, $x, $y) = @_; 3604 my ($self, $ev, $x, $y) = @_;
2950 3605
2951 # TODO: should use vbox->find_widget or so 3606 # TODO: should use vbox->find_widget or so
2952 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3607 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2953 $self->{hover} = $self->{item}{$HOVER}; 3608 $self->{hover} = $self->{item}{$HOVER};
2954 3609
2955 0 3610 0
2956} 3611}
2957 3612
2958sub button_up { 3613sub invoke_button_up {
2959 my ($self, $ev, $x, $y) = @_; 3614 my ($self, $ev, $x, $y) = @_;
2960 3615
2961 if ($ev->{button} == $self->{button}) { 3616 if ($ev->{button} == $self->{button}) {
2962 undef $GRAB; 3617 undef $GRAB;
2963 $self->hide; 3618 $self->hide;
2964 3619
2965 $self->_emit ("popdown"); 3620 $self->emit ("popdown");
2966 $self->{hover}[1]->() if $self->{hover}; 3621 $self->{hover}[1]->() if $self->{hover};
2967 } else { 3622 } else {
2968 return 0 3623 return 0
2969 } 3624 }
2970 3625
2971 1 3626 1
2972} 3627}
2973 3628
2974############################################################################# 3629#############################################################################
2975 3630
2976package CFClient::UI::Multiplexer; 3631package CFPlus::UI::Multiplexer;
2977 3632
2978our @ISA = CFClient::UI::Container::; 3633our @ISA = CFPlus::UI::Container::;
2979 3634
2980sub new { 3635sub new {
2981 my $class = shift; 3636 my $class = shift;
2982 3637
2983 my $self = $class->SUPER::new ( 3638 my $self = $class->SUPER::new (
… …
2997 3652
2998 $self->{current} = $self->{children}[0] 3653 $self->{current} = $self->{children}[0]
2999 if @{ $self->{children} }; 3654 if @{ $self->{children} };
3000} 3655}
3001 3656
3657sub get_current_page {
3658 my ($self) = @_;
3659
3660 $self->{current}
3661}
3662
3002sub set_current_page { 3663sub set_current_page {
3003 my ($self, $page_or_widget) = @_; 3664 my ($self, $page_or_widget) = @_;
3004 3665
3005 my $widget = ref $page_or_widget 3666 my $widget = ref $page_or_widget
3006 ? $page_or_widget 3667 ? $page_or_widget
3007 : $self->{children}[$page_or_widget]; 3668 : $self->{children}[$page_or_widget];
3008 3669
3009 $self->{current} = $widget; 3670 $self->{current} = $widget;
3010 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3671 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3011 3672
3012 $self->_emit (page_changed => $self->{current}); 3673 $self->emit (page_changed => $self->{current});
3013 3674
3014 $self->realloc; 3675 $self->realloc;
3015} 3676}
3016 3677
3017sub visible_children { 3678sub visible_children {
… …
3022 my ($self) = @_; 3683 my ($self) = @_;
3023 3684
3024 $self->{current}->size_request 3685 $self->{current}->size_request
3025} 3686}
3026 3687
3027sub size_allocate { 3688sub invoke_size_allocate {
3028 my ($self, $w, $h) = @_; 3689 my ($self, $w, $h) = @_;
3029 3690
3030 $self->{current}->configure (0, 0, $w, $h); 3691 $self->{current}->configure (0, 0, $w, $h);
3692
3693 1
3031} 3694}
3032 3695
3033sub _draw { 3696sub _draw {
3034 my ($self) = @_; 3697 my ($self) = @_;
3035 3698
3036 $self->{current}->draw; 3699 $self->{current}->draw;
3037} 3700}
3038 3701
3039############################################################################# 3702#############################################################################
3040 3703
3041package CFClient::UI::Notebook; 3704package CFPlus::UI::Notebook;
3042 3705
3043our @ISA = CFClient::UI::VBox::; 3706our @ISA = CFPlus::UI::VBox::;
3044 3707
3045sub new { 3708sub new {
3046 my $class = shift; 3709 my $class = shift;
3047 3710
3048 my $self = $class->SUPER::new ( 3711 my $self = $class->SUPER::new (
3049 buttonbar => (new CFClient::UI::Buttonbar), 3712 buttonbar => (new CFPlus::UI::Buttonbar),
3050 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3713 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3051 # filter => # will be put between multiplexer and $self 3714 # filter => # will be put between multiplexer and $self
3052 @_, 3715 @_,
3053 ); 3716 );
3054 3717
3055 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3718 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3059} 3722}
3060 3723
3061sub add { 3724sub add {
3062 my ($self, $title, $widget, $tooltip) = @_; 3725 my ($self, $title, $widget, $tooltip) = @_;
3063 3726
3064 Scalar::Util::weaken $self; 3727 CFPlus::weaken $self;
3065 3728
3066 $self->{buttonbar}->add (new CFClient::UI::Button 3729 $self->{buttonbar}->add (new CFPlus::UI::Button
3067 markup => $title, 3730 markup => $title,
3068 tooltip => $tooltip, 3731 tooltip => $tooltip,
3069 on_activate => sub { $self->set_current_page ($widget) }, 3732 on_activate => sub { $self->set_current_page ($widget) },
3070 ); 3733 );
3071 3734
3072 $self->{multiplexer}->add ($widget); 3735 $self->{multiplexer}->add ($widget);
3073} 3736}
3074 3737
3738sub get_current_page {
3739 my ($self) = @_;
3740
3741 $self->{multiplexer}->get_current_page
3742}
3743
3075sub set_current_page { 3744sub set_current_page {
3076 my ($self, $page) = @_; 3745 my ($self, $page) = @_;
3077 3746
3078 $self->{multiplexer}->set_current_page ($page); 3747 $self->{multiplexer}->set_current_page ($page);
3079 $self->_emit (page_changed => $self->{multiplexer}{current}); 3748 $self->emit (page_changed => $self->{multiplexer}{current});
3080} 3749}
3081 3750
3082############################################################################# 3751#############################################################################
3083 3752
3753package CFPlus::UI::Selector;
3754
3755use utf8;
3756
3757our @ISA = CFPlus::UI::Button::;
3758
3759sub new {
3760 my $class = shift;
3761
3762 my $self = $class->SUPER::new (
3763 options => [], # [value, title, longdesc], ...
3764 value => undef,
3765 @_,
3766 );
3767
3768 $self->_set_value ($self->{value});
3769
3770 $self
3771}
3772
3773sub invoke_button_down {
3774 my ($self, $ev) = @_;
3775
3776 my @menu_items;
3777
3778 for (@{ $self->{options} }) {
3779 my ($value, $title, $tooltip) = @$_;
3780
3781 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3782 }
3783
3784 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3785}
3786
3787sub _set_value {
3788 my ($self, $value) = @_;
3789
3790 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3791 or return;
3792
3793 $self->{value} = $item->[0];
3794 $self->set_markup ("$item->[1] ⇓");
3795 $self->set_tooltip ($item->[2]);
3796}
3797
3798sub set_value {
3799 my ($self, $value) = @_;
3800
3801 return unless $self->{value} ne $value;
3802
3803 $self->_set_value ($value);
3804 $self->emit (changed => $value);
3805}
3806
3807#############################################################################
3808
3084package CFClient::UI::Statusbox; 3809package CFPlus::UI::Statusbox;
3085 3810
3086our @ISA = CFClient::UI::VBox::; 3811our @ISA = CFPlus::UI::VBox::;
3087 3812
3088sub new { 3813sub new {
3089 my $class = shift; 3814 my $class = shift;
3090 3815
3091 my $self = $class->SUPER::new ( 3816 my $self = $class->SUPER::new (
3092 fontsize => 0.8, 3817 fontsize => 0.8,
3093 @_, 3818 @_,
3094 ); 3819 );
3095 3820
3096 Scalar::Util::weaken (my $this = $self); 3821 CFPlus::weaken (my $this = $self);
3097 3822
3098 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3823 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3099 3824
3100 $self 3825 $self
3101} 3826}
… …
3103sub reorder { 3828sub reorder {
3104 my ($self) = @_; 3829 my ($self) = @_;
3105 my $NOW = Time::HiRes::time; 3830 my $NOW = Time::HiRes::time;
3106 3831
3107 # freeze display when hovering over any label 3832 # freeze display when hovering over any label
3108 return if $CFClient::UI::TOOLTIP->{owner} 3833 return if $CFPlus::UI::TOOLTIP->{owner}
3109 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3834 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3110 values %{ $self->{item} }; 3835 values %{ $self->{item} };
3111 3836
3112 while (my ($k, $v) = each %{ $self->{item} }) { 3837 while (my ($k, $v) = each %{ $self->{item} }) {
3113 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3838 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3114 } 3839 }
… …
3135 for ($short) { 3860 for ($short) {
3136 s/^\s+//; 3861 s/^\s+//;
3137 s/\s+/ /g; 3862 s/\s+/ /g;
3138 } 3863 }
3139 3864
3140 new CFClient::UI::Label 3865 new CFPlus::UI::Label
3141 markup => $short, 3866 markup => $short,
3142 tooltip => $item->{tooltip}, 3867 tooltip => $item->{tooltip},
3143 tooltip_font => $::FONT_PROP, 3868 tooltip_font => $::FONT_PROP,
3144 tooltip_width => 0.67, 3869 tooltip_width => 0.67,
3145 fontsize => $item->{fontsize} || $self->{fontsize}, 3870 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3183 $item->{count}++; 3908 $item->{count}++;
3184 } else { 3909 } else {
3185 $item->{count} = 1; 3910 $item->{count} = 1;
3186 $item->{text} = $item->{tooltip} = $text; 3911 $item->{text} = $item->{tooltip} = $text;
3187 } 3912 }
3188 $item->{id} = ++$self->{id}; 3913 $item->{id} += 0.2;#d#
3189 $item->{timeout} = $timeout; 3914 $item->{timeout} = $timeout;
3190 delete $item->{label}; 3915 delete $item->{label};
3191 } else { 3916 } else {
3192 $self->{item}{$group} = { 3917 $self->{item}{$group} = {
3193 id => ++$self->{id}, 3918 id => ++$self->{id},
… …
3199 count => 1, 3924 count => 1,
3200 %arg, 3925 %arg,
3201 }; 3926 };
3202 } 3927 }
3203 3928
3929 $ROOT->on_refresh (reorder => sub {
3204 $self->reorder; 3930 $self->reorder;
3931 });
3205} 3932}
3206 3933
3207sub reconfigure { 3934sub reconfigure {
3208 my ($self) = @_; 3935 my ($self) = @_;
3209 3936
… …
3212 3939
3213 $self->reorder; 3940 $self->reorder;
3214 $self->SUPER::reconfigure; 3941 $self->SUPER::reconfigure;
3215} 3942}
3216 3943
3217sub DESTROY { 3944sub destroy {
3218 my ($self) = @_; 3945 my ($self) = @_;
3219 3946
3220 $self->{timer}->cancel; 3947 $self->{timer}->cancel;
3221 3948
3222 $self->SUPER::DESTROY; 3949 $self->SUPER::destroy;
3223} 3950}
3224 3951
3225############################################################################# 3952#############################################################################
3226 3953
3227package CFClient::UI::Inventory;
3228
3229our @ISA = CFClient::UI::ScrolledWindow::;
3230
3231sub new {
3232 my $class = shift;
3233
3234 my $self = $class->SUPER::new (
3235 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3236 @_,
3237 );
3238
3239 $self
3240}
3241
3242sub set_items {
3243 my ($self, $items) = @_;
3244
3245 $self->{child}->clear;
3246 return unless $items;
3247
3248 my @items = sort {
3249 ($a->{type} <=> $b->{type})
3250 or ($a->{name} cmp $b->{name})
3251 } @$items;
3252
3253 $self->{real_items} = \@items;
3254
3255 my $row = 0;
3256 for my $item (@items) {
3257 CFClient::Item::update_widgets $item;
3258
3259 $self->{child}->add (0, $row, $item->{face_widget});
3260 $self->{child}->add (1, $row, $item->{desc_widget});
3261 $self->{child}->add (2, $row, $item->{weight_widget});
3262
3263 $row++;
3264 }
3265}
3266
3267#############################################################################
3268
3269package CFClient::UI::BindEditor;
3270
3271our @ISA = CFClient::UI::FancyFrame::;
3272
3273sub new {
3274 my $class = shift;
3275
3276 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3277
3278 $self->add (my $vb = new CFClient::UI::VBox);
3279
3280
3281 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3282 text => "start recording",
3283 tooltip => "Start/Stops recording of actions."
3284 ."All subsequent actions after the recording started will be captured."
3285 ."The actions are displayed after the record was stopped."
3286 ."To bind the action you have to click on the 'Bind' button",
3287 on_activate => sub {
3288 unless ($self->{recording}) {
3289 $self->start;
3290 } else {
3291 $self->stop;
3292 }
3293 });
3294
3295 $vb->add (new CFClient::UI::Label text => "Actions:");
3296 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3297
3298 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3299 $vb->add (my $hb = new CFClient::UI::HBox);
3300 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3301 $hb->add (new CFClient::UI::Button
3302 text => "bind",
3303 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3304 on_activate => sub {
3305 $self->ask_for_bind;
3306 });
3307
3308 $vb->add (my $hb = new CFClient::UI::HBox);
3309 $hb->add (new CFClient::UI::Button
3310 text => "ok",
3311 expand => 1,
3312 tooltip => "This closes the binding editor and saves the binding",
3313 on_activate => sub {
3314 $self->hide;
3315 $self->commit;
3316 });
3317
3318 $hb->add (new CFClient::UI::Button
3319 text => "cancel",
3320 expand => 1,
3321 tooltip => "This closes the binding editor without saving",
3322 on_activate => sub {
3323 $self->hide;
3324 $self->{binding_cancel}->()
3325 if $self->{binding_cancel};
3326 });
3327
3328 $self->update_binding_widgets;
3329
3330 $self
3331}
3332
3333sub commit {
3334 my ($self) = @_;
3335 my ($mod, $sym, $cmds) = $self->get_binding;
3336 if ($sym != 0 && @$cmds > 0) {
3337 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3338 ."'. Don't forget 'Save Config'!");
3339 $self->{binding_change}->($mod, $sym, $cmds)
3340 if $self->{binding_change};
3341 } else {
3342 $::STATUSBOX->add ("No action bound, no key or action specified!");
3343 $self->{binding_cancel}->()
3344 if $self->{binding_cancel};
3345 }
3346}
3347
3348sub start {
3349 my ($self) = @_;
3350
3351 $self->{rec_btn}->set_text ("stop recording");
3352 $self->{recording} = 1;
3353 $self->clear_command_list;
3354 $::CONN->start_record if $::CONN;
3355}
3356
3357sub stop {
3358 my ($self) = @_;
3359
3360 $self->{rec_btn}->set_text ("start recording");
3361 $self->{recording} = 0;
3362
3363 my $rec;
3364 $rec = $::CONN->stop_record if $::CONN;
3365 return unless ref $rec eq 'ARRAY';
3366 $self->set_command_list ($rec);
3367}
3368
3369
3370sub ask_for_bind_and_commit {
3371 my ($self) = @_;
3372 $self->ask_for_bind (1);
3373}
3374
3375sub ask_for_bind {
3376 my ($self, $commit) = @_;
3377
3378 CFClient::Binder::open_binding_dialog (sub {
3379 my ($mod, $sym) = @_;
3380 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3381 $self->update_binding_widgets;
3382 $self->commit if $commit;
3383 });
3384}
3385
3386# $mod and $sym are the modifiers and key symbol
3387# $cmds is a array ref of strings (the commands)
3388# $cb is the callback that is executed on OK
3389# $ccb is the callback that is executed on CANCEL and
3390# when the binding was unsuccessful on OK
3391sub set_binding {
3392 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3393
3394 $self->clear_command_list;
3395 $self->{recording} = 0;
3396 $self->{rec_btn}->set_text ("start recording");
3397
3398 $self->{binding} = [$mod, $sym];
3399 $self->{commands} = $cmds;
3400
3401 $self->{binding_change} = $cb;
3402 $self->{binding_cancel} = $ccb;
3403
3404 $self->update_binding_widgets;
3405}
3406
3407# this is a shortcut method that asks for a binding
3408# and then just binds it.
3409sub do_quick_binding {
3410 my ($self, $cmds) = @_;
3411 $self->set_binding (undef, undef, $cmds, sub {
3412 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3413 });
3414 $self->ask_for_bind (1);
3415}
3416
3417sub update_binding_widgets {
3418 my ($self) = @_;
3419 my ($mod, $sym, $cmds) = $self->get_binding;
3420 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3421 $self->set_command_list ($cmds);
3422}
3423
3424sub get_binding {
3425 my ($self) = @_;
3426 return (
3427 $self->{binding}->[0],
3428 $self->{binding}->[1],
3429 [ grep { defined $_ } @{$self->{commands}} ]
3430 );
3431}
3432
3433sub clear_command_list {
3434 my ($self) = @_;
3435 $self->{cmdbox}->clear ();
3436}
3437
3438sub set_command_list {
3439 my ($self, $cmds) = @_;
3440
3441 $self->{cmdbox}->clear ();
3442 $self->{commands} = $cmds;
3443
3444 my $idx = 0;
3445
3446 for (@$cmds) {
3447 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3448
3449 my $i = $idx;
3450 $hb->add (new CFClient::UI::Label text => $_);
3451 $hb->add (new CFClient::UI::Button
3452 text => "delete",
3453 tooltip => "Deletes the action from the record",
3454 on_activate => sub {
3455 $self->{cmdbox}->remove ($hb);
3456 $cmds->[$i] = undef;
3457 });
3458
3459
3460 $idx++
3461 }
3462}
3463
3464#############################################################################
3465
3466package CFClient::UI::SpellList;
3467
3468our @ISA = CFClient::UI::Table::;
3469
3470sub new {
3471 my $class = shift;
3472
3473 my $self = $class->SUPER::new (
3474 binding => [],
3475 commands => [],
3476 @_,
3477 )
3478}
3479
3480# XXX: Do sorting? Argl...
3481sub add_spell {
3482 my ($self, $spell) = @_;
3483 $self->{spells}->{$spell->{name}} = $spell;
3484
3485 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3486 face => $spell->{face},
3487 can_hover => 1,
3488 can_events => 1,
3489 tooltip => $spell->{message});
3490
3491 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3492 text => $spell->{name},
3493 can_hover => 1,
3494 can_events => 1,
3495 tooltip => $spell->{message},
3496 expand => 1);
3497
3498 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3499 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3500 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3501 expand => 1);
3502
3503 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3504 text => "bind to key",
3505 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3506}
3507
3508sub rebuild_spell_list {
3509 my ($self) = @_;
3510 $self->{tbl_idx} = 0;
3511 $self->add_spell ($_) for values %{$self->{spells}};
3512}
3513
3514sub remove_spell {
3515 my ($self, $spell) = @_;
3516 delete $self->{spells}->{$spell->{name}};
3517 $self->rebuild_spell_list;
3518}
3519
3520#############################################################################
3521
3522package CFClient::UI::Root; 3954package CFPlus::UI::Root;
3523 3955
3524our @ISA = CFClient::UI::Container::; 3956our @ISA = CFPlus::UI::Container::;
3525 3957
3526use List::Util qw(min max); 3958use List::Util qw(min max);
3527 3959
3528use CFClient::OpenGL; 3960use CFPlus::OpenGL;
3529 3961
3530sub new { 3962sub new {
3531 my $class = shift; 3963 my $class = shift;
3532 3964
3533 my $self = $class->SUPER::new ( 3965 my $self = $class->SUPER::new (
3534 visible => 1, 3966 visible => 1,
3535 @_, 3967 @_,
3536 ); 3968 );
3537 3969
3538 Scalar::Util::weaken ($self->{root} = $self); 3970 CFPlus::weaken ($self->{root} = $self);
3539 3971
3540 $self 3972 $self
3541} 3973}
3542 3974
3543sub size_request { 3975sub size_request {
… …
3558 $coord = $max - $size if $coord > $max - $size; 3990 $coord = $max - $size if $coord > $max - $size;
3559 3991
3560 int $coord + 0.5 3992 int $coord + 0.5
3561} 3993}
3562 3994
3563sub size_allocate { 3995sub invoke_size_allocate {
3564 my ($self, $w, $h) = @_; 3996 my ($self, $w, $h) = @_;
3565 3997
3566 for my $child ($self->children) { 3998 for my $child ($self->children) {
3567 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3999 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3568 4000
… …
3572 $X = _to_pixel $X, $W, $self->{w}; 4004 $X = _to_pixel $X, $W, $self->{w};
3573 $Y = _to_pixel $Y, $H, $self->{h}; 4005 $Y = _to_pixel $Y, $H, $self->{h};
3574 4006
3575 $child->configure ($X, $Y, $W, $H); 4007 $child->configure ($X, $Y, $W, $H);
3576 } 4008 }
4009
4010 1
3577} 4011}
3578 4012
3579sub coord2local { 4013sub coord2local {
3580 my ($self, $x, $y) = @_; 4014 my ($self, $x, $y) = @_;
3581 4015
… …
3707 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4141 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3708 4142
3709 $w = 0 if $w < 0; 4143 $w = 0 if $w < 0;
3710 $h = 0 if $h < 0; 4144 $h = 0 if $h < 0;
3711 4145
4146 $w = max $widget->{min_w}, $w;
4147 $h = max $widget->{min_h}, $h;
4148
4149# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4150# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4151
4152 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4153 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4154
3712 $w = int $w + 0.5; 4155 $w = int $w + 0.5;
3713 $h = int $h + 0.5; 4156 $h = int $h + 0.5;
3714 4157
3715 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4158 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3716 $widget->{old_w} = $widget->{w}; 4159 $widget->{old_w} = $widget->{w};
… …
3739 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4182 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3740 glMatrixMode GL_MODELVIEW; 4183 glMatrixMode GL_MODELVIEW;
3741 glLoadIdentity; 4184 glLoadIdentity;
3742 4185
3743 { 4186 {
3744 package CFClient::UI::Base; 4187 package CFPlus::UI::Base;
3745 4188
3746 ($draw_x, $draw_y, $draw_w, $draw_h) = 4189 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3747 (0, 0, $self->{w}, $self->{h}); 4190 (0, 0, $self->{w}, $self->{h});
3748 }
3749 4191
3750 $self->_draw; 4192 $self->_draw;
4193 }
3751} 4194}
3752 4195
3753############################################################################# 4196#############################################################################
3754 4197
3755package CFClient::UI; 4198package CFPlus::UI;
3756 4199
3757$ROOT = new CFClient::UI::Root; 4200$ROOT = new CFPlus::UI::Root;
3758$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4201$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3759 4202
37601 42031
3761 4204

Diff Legend

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