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.285 by root, Mon Jun 5 03:07:01 2006 UTC vs.
Revision 1.399 by root, Sat Jul 21 16:07:53 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) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel
118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
98 120
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 121 $ev->{dx} = $shift ? $delta : 0;
100 if $GRAB; 122 $ev->{dy} = $shift ? 0 : $delta;
123
124 $GRAB->emit (mouse_wheel => $ev);
125 } else {
126 $GRAB->emit (button_down => $ev)
127 }
128 }
101} 129}
102 130
103sub feed_sdl_button_up_event { 131sub feed_sdl_button_up_event {
104 my ($ev) = @_; 132 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 133
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 134 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 135
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 136 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 137
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 138 $GRAB->emit (button_up => $ev)
112 if $GRAB; 139 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 140
114 if (!$BUTTON_STATE) { 141 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 142 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 143 $grab->update if $grab;
117 $GRAB->update if $GRAB; 144 $GRAB->update if $GRAB;
118 145
146 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 147 $TOOLTIP_WATCHER->cb->();
120 } 148 }
121} 149}
122 150
123sub feed_sdl_motion_event { 151sub feed_sdl_motion_event {
124 my ($ev) = @_; 152 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 153 my ($x, $y) = ($ev->{x}, $ev->{y});
126 154
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 155 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 156
129 if ($widget != $HOVER) { 157 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 158
132 $hover->update if $hover && $hover->{can_hover}; 159 $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; 160 if $HOVER;
140} 161}
141 162
142# convert position array to integers 163# convert position array to integers
143sub harmonize { 164sub harmonize {
… …
193 reconfigure_widgets; 214 reconfigure_widgets;
194} 215}
195 216
196############################################################################# 217#############################################################################
197 218
219package CFPlus::UI::Event;
220
221sub xy {
222 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
223}
224
225#############################################################################
226
198package CFClient::UI::Base; 227package CFPlus::UI::Base;
199 228
200use strict; 229use strict;
201 230
202use CFClient::OpenGL; 231use CFPlus::OpenGL;
203 232
204sub new { 233sub new {
205 my $class = shift; 234 my $class = shift;
206 235
207 my $self = bless { 236 my $self = bless {
… …
212 h => undef, 241 h => undef,
213 can_events => 1, 242 can_events => 1,
214 @_ 243 @_
215 }, $class; 244 }, $class;
216 245
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
218 247
219 for (keys %$self) { 248 for (keys %$self) {
220 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
221 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
222 } 251 }
223 } 252 }
224 253
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 254 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 255 $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}; 256 $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}; 257 $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}; 258 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
230 259
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 260 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 261 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233 262
234 $self->show if $layout->{show}; 263 $self->show if $layout->{show};
… …
239 268
240sub destroy { 269sub destroy {
241 my ($self) = @_; 270 my ($self) = @_;
242 271
243 $self->hide; 272 $self->hide;
273 $self->emit ("destroy");
244 %$self = (); 274 %$self = ();
245} 275}
246 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
247sub show { 281sub show {
248 my ($self) = @_; 282 my ($self) = @_;
249 283
250 return if $self->{parent}; 284 return if $self->{parent};
251 285
252 $CFClient::UI::ROOT->add ($self); 286 $CFPlus::UI::ROOT->add ($self);
253} 287}
254 288
255sub set_visible { 289sub set_visible {
256 my ($self) = @_; 290 my ($self) = @_;
257 291
… …
272 306
273 return unless $self->{visible}; 307 return unless $self->{visible};
274 308
275 $_->set_invisible for $self->children; 309 $_->set_invisible for $self->children;
276 310
311 delete $self->{visible};
277 delete $self->{root}; 312 delete $self->{root};
278 delete $self->{visible};
279 313
280 undef $GRAB if $GRAB == $self; 314 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 315 undef $HOVER if $HOVER == $self;
282 316
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 317 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 318 if $TOOLTIP->{owner} == $self;
285 319
286 $self->focus_out; 320 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 321 $self->emit (visibility_change => 0);
289} 322}
290 323
291sub set_visibility { 324sub set_visibility {
292 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
293 326
294 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
295 328
296 $visible ? $self->hide 329 $visible ? $self->show
297 : $self->show; 330 : $self->hide;
298} 331}
299 332
300sub toggle_visibility { 333sub toggle_visibility {
301 my ($self) = @_; 334 my ($self) = @_;
302 335
… …
315} 348}
316 349
317sub move_abs { 350sub move_abs {
318 my ($self, $x, $y, $z) = @_; 351 my ($self, $x, $y, $z) = @_;
319 352
320 $self->{x} = List::Util::max 0, int $x; 353 $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; 354 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322 $self->{z} = $z if defined $z; 355 $self->{z} = $z if defined $z;
323 356
324 $self->update; 357 $self->update;
325} 358}
326 359
… …
336sub size_request { 369sub size_request {
337 require Carp; 370 require Carp;
338 Carp::confess "size_request is abstract"; 371 Carp::confess "size_request is abstract";
339} 372}
340 373
374sub baseline_shift {
375 0
376}
377
341sub configure { 378sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 379 my ($self, $x, $y, $w, $h) = @_;
343 380
344 if ($self->{aspect}) { 381 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h); 382 my ($ow, $oh) = ($w, $h);
346 383
347 $w = List::Util::min $w, int $h * $self->{aspect}; 384 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
348 $h = List::Util::min $h, int $w / $self->{aspect}; 385 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
349 386
350 # use alignment to adjust x, y 387 # use alignment to adjust x, y
351 388
352 $x += int 0.5 * ($ow - $w); 389 $x += int 0.5 * ($ow - $w);
353 $y += int 0.5 * ($oh - $h); 390 $y += int 0.5 * ($oh - $h);
… …
367 404
368 $self->{root}{size_alloc}{$self+0} = $self; 405 $self->{root}{size_alloc}{$self+0} = $self;
369 } 406 }
370} 407}
371 408
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 409sub children {
377 # nop 410 # nop
378} 411}
379 412
380sub visible_children { 413sub visible_children {
… …
398 431
399 return if $self->{tooltip} eq $tooltip; 432 return if $self->{tooltip} eq $tooltip;
400 433
401 $self->{tooltip} = $tooltip; 434 $self->{tooltip} = $tooltip;
402 435
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 436 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner}; 437 delete $CFPlus::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 438 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
406 } 439 }
407} 440}
408 441
409# translate global coordinates to local coordinate system 442# translate global coordinates to local coordinate system
410sub coord2local { 443sub coord2local {
411 my ($self, $x, $y) = @_; 444 my ($self, $x, $y) = @_;
412 445
446 Carp::confess unless $self->{parent};#d#
447
413 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 448 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
414} 449}
415 450
416# translate local coordinates to global coordinate system 451# translate local coordinates to global coordinate system
417sub coord2global { 452sub coord2global {
418 my ($self, $x, $y) = @_; 453 my ($self, $x, $y) = @_;
419 454
455 Carp::confess unless $self->{parent};#d#
456
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 457 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 458}
422 459
423sub focus_in { 460sub invoke_focus_in {
424 my ($self) = @_; 461 my ($self) = @_;
425 462
426 return if $FOCUS == $self; 463 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 464 return unless $self->{can_focus};
428 465
429 my $focus = $FOCUS; $FOCUS = $self; 466 $FOCUS = $self;
430 467
431 $self->_emit (focus_in => $focus); 468 $self->update;
432 469
433 $focus->update if $focus; 470 0
434 $FOCUS->update;
435} 471}
436 472
437sub focus_out { 473sub invoke_focus_out {
438 my ($self) = @_; 474 my ($self) = @_;
439 475
440 return unless $FOCUS == $self; 476 return unless $FOCUS == $self;
441 477
442 my $focus = $FOCUS; undef $FOCUS; 478 undef $FOCUS;
443 479
444 $self->_emit (focus_out => $focus); 480 $self->update;
445 481
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 482 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 483 unless $FOCUS;
450}
451 484
485 0
486}
487
488sub grab_focus {
489 my ($self) = @_;
490
491 $FOCUS->emit ("focus_out") if $FOCUS;
492 $self->emit ("focus_in");
493}
494
452sub mouse_motion { 0 } 495sub invoke_mouse_motion { 0 }
453sub button_up { 0 } 496sub invoke_button_up { 0 }
454sub key_down { 0 } 497sub invoke_key_down { 0 }
455sub key_up { 0 } 498sub invoke_key_up { 0 }
499sub invoke_mouse_wheel { 0 }
456 500
457sub button_down { 501sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 502 my ($self, $ev, $x, $y) = @_;
459 503
460 $self->focus_in; 504 $self->grab_focus;
461 505
462 0 506 0
463} 507}
464 508
509sub connect {
510 my ($self, $signal, $cb) = @_;
511
512 push @{ $self->{signal_cb}{$signal} }, $cb;
513
514 defined wantarray and CFPlus::guard {
515 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516 @{ $self->{signal_cb}{$signal} };
517 }
518}
519
520sub disconnect_all {
521 my ($self, $signal) = @_;
522
523 delete $self->{signal_cb}{$signal};
524}
525
526my %has_coords = (
527 button_down => 1,
528 button_up => 1,
529 mouse_motion => 1,
530 mouse_wheel => 1,
531);
532
533sub emit {
534 my ($self, $signal, @args) = @_;
535
536 # I do not really like this solution, but I do not like duplication
537 # and needlessly verbose code, either.
538 my @append
539 = $has_coords{$signal}
540 ? $args[0]->xy ($self)
541 : ();
542
543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
544
545 for my $cb (
546 @{$self->{signal_cb}{$signal} || []}, # before
547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
553 $self->{parent} && $self->{parent}->emit ($signal, @args)
554}
555
465sub find_widget { 556#sub find_widget {
466 my ($self, $x, $y) = @_; 557# in .xs
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476 558
477sub set_parent { 559sub set_parent {
478 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
479 561
480 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 563 $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} 564}
506 565
507sub realloc { 566sub realloc {
508 my ($self) = @_; 567 my ($self) = @_;
509 568
… …
542 return unless $self->{h} && $self->{w}; 601 return unless $self->{h} && $self->{w};
543 602
544 # update screen rectangle 603 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 604 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 605 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 606
550 # skip widgets that are entirely outside the drawing area 607 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 610
… …
576 glVertex $self->{w} - 1, 0; 633 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1; 634 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1; 635 glVertex 0 , $self->{h} - 1;
579 glEnd; 636 glEnd;
580 glPopMatrix; 637 glPopMatrix;
581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
582 } 639 }
583 640
584 $self->_draw; 641 $self->_draw;
585 glPopMatrix; 642 glPopMatrix;
586} 643}
… …
589 my ($self) = @_; 646 my ($self) = @_;
590 647
591 warn "no draw defined for $self\n"; 648 warn "no draw defined for $self\n";
592} 649}
593 650
651my $cntx;#d#
594sub DESTROY { 652sub DESTROY {
595 my ($self) = @_; 653 my ($self) = @_;
596 654
655 return if CFPlus::in_destruct;
656
657 eval { $self->destroy };
658 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659
597 delete $WIDGET{$self+0}; 660 delete $WIDGET{$self+0};
598 #$self->deactivate;
599} 661}
600 662
601############################################################################# 663#############################################################################
602 664
603package CFClient::UI::DrawBG; 665package CFPlus::UI::DrawBG;
604 666
605our @ISA = CFClient::UI::Base::; 667our @ISA = CFPlus::UI::Base::;
606 668
607use strict; 669use strict;
608use CFClient::OpenGL; 670use CFPlus::OpenGL;
609 671
610sub new { 672sub new {
611 my $class = shift; 673 my $class = shift;
612 674
613 # range [value, low, high, page] 675 # range [value, low, high, page]
… …
644 } 706 }
645} 707}
646 708
647############################################################################# 709#############################################################################
648 710
649package CFClient::UI::Empty; 711package CFPlus::UI::Empty;
650 712
651our @ISA = CFClient::UI::Base::; 713our @ISA = CFPlus::UI::Base::;
652 714
653sub new { 715sub new {
654 my ($class, %arg) = @_; 716 my ($class, %arg) = @_;
655 $class->SUPER::new (can_events => 0, %arg); 717 $class->SUPER::new (can_events => 0, %arg);
656} 718}
… …
663 725
664sub draw { } 726sub draw { }
665 727
666############################################################################# 728#############################################################################
667 729
668package CFClient::UI::Container; 730package CFPlus::UI::Container;
669 731
670our @ISA = CFClient::UI::Base::; 732our @ISA = CFPlus::UI::Base::;
671 733
672sub new { 734sub new {
673 my ($class, %arg) = @_; 735 my ($class, %arg) = @_;
674 736
675 my $children = delete $arg{children}; 737 my $children = delete $arg{children};
… …
679 can_events => 0, 741 can_events => 0,
680 %arg, 742 %arg,
681 ); 743 );
682 744
683 $self->add (@$children) 745 $self->add (@$children)
684 if $children; 746 if $children && @$children;
685 747
686 $self 748 $self
749}
750
751sub realloc {
752 my ($self) = @_;
753
754 $self->{force_realloc} = 1;
755 $self->{force_size_alloc} = 1;
756 $self->SUPER::realloc;
687} 757}
688 758
689sub add { 759sub add {
690 my ($self, @widgets) = @_; 760 my ($self, @widgets) = @_;
691 761
692 $_->set_parent ($self) 762 $_->set_parent ($self)
693 for @widgets; 763 for @widgets;
694 764
765 # TODO: only do this in widgets that need it, e.g. root, fixed
695 use sort 'stable'; 766 use sort 'stable';
696 767
697 $self->{children} = [ 768 $self->{children} = [
698 sort { $a->{z} <=> $b->{z} } 769 sort { $a->{z} <=> $b->{z} }
699 @{$self->{children}}, @widgets 770 @{$self->{children}}, @widgets
700 ]; 771 ];
701 772
702 $self->realloc; 773 $self->realloc;
774
775 map $_+0, @widgets
703} 776}
704 777
705sub children { 778sub children {
706 @{ $_[0]{children} } 779 @{ $_[0]{children} }
707} 780}
… …
718} 791}
719 792
720sub clear { 793sub clear {
721 my ($self) = @_; 794 my ($self) = @_;
722 795
723 my $children = delete $self->{children}; 796 my $children = $self->{children};
724 $self->{children} = []; 797 $self->{children} = [];
725 798
726 for (@$children) { 799 for (@$children) {
727 delete $_->{parent}; 800 delete $_->{parent};
728 $_->hide; 801 $_->hide;
… …
753 $_->draw for @{$self->{children}}; 826 $_->draw for @{$self->{children}};
754} 827}
755 828
756############################################################################# 829#############################################################################
757 830
758package CFClient::UI::Bin; 831package CFPlus::UI::Bin;
759 832
760our @ISA = CFClient::UI::Container::; 833our @ISA = CFPlus::UI::Container::;
761 834
762sub new { 835sub new {
763 my ($class, %arg) = @_; 836 my ($class, %arg) = @_;
764 837
765 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 838 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
766 839
767 $class->SUPER::new (children => [$child], %arg) 840 $class->SUPER::new (children => [$child], %arg)
768} 841}
769 842
770sub add { 843sub add {
771 my ($self, $child) = @_; 844 my ($self, $child) = @_;
772 845
773 $self->{children} = []; 846 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 847 $self->SUPER::add ($child);
776} 848}
777 849
778sub remove { 850sub remove {
779 my ($self, $widget) = @_; 851 my ($self, $widget) = @_;
780 852
781 $self->SUPER::remove ($widget); 853 $self->SUPER::remove ($widget);
782 854
783 $self->{children} = [new CFClient::UI::Empty] 855 $self->{children} = [new CFPlus::UI::Empty]
784 unless @{$self->{children}}; 856 unless @{$self->{children}};
785} 857}
786 858
787sub child { $_[0]->{children}[0] } 859sub child { $_[0]->{children}[0] }
788 860
789sub size_request { 861sub size_request {
790 $_[0]{children}[0]->size_request 862 $_[0]{children}[0]->size_request
791} 863}
792 864
793sub size_allocate { 865sub invoke_size_allocate {
794 my ($self, $w, $h) = @_; 866 my ($self, $w, $h) = @_;
795 867
796 $self->{children}[0]->configure (0, 0, $w, $h); 868 $self->{children}[0]->configure (0, 0, $w, $h);
869
870 1
797} 871}
798 872
799############################################################################# 873#############################################################################
800 874
801# back-buffered drawing area 875# back-buffered drawing area
802 876
803package CFClient::UI::Window; 877package CFPlus::UI::Window;
804 878
805our @ISA = CFClient::UI::Bin::; 879our @ISA = CFPlus::UI::Bin::;
806 880
807use CFClient::OpenGL; 881use CFPlus::OpenGL;
808 882
809sub new { 883sub new {
810 my ($class, %arg) = @_; 884 my ($class, %arg) = @_;
811 885
812 my $self = $class->SUPER::new (%arg); 886 my $self = $class->SUPER::new (%arg);
… …
817 891
818 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 892 $ROOT->on_post_alloc ($self => sub { $self->render_child });
819 $self->SUPER::update; 893 $self->SUPER::update;
820} 894}
821 895
822sub size_allocate { 896sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
824 898
825 $self->SUPER::size_allocate ($w, $h);
826 $self->update; 899 $self->update;
900
901 $self->SUPER::invoke_size_allocate ($w, $h)
827} 902}
828 903
829sub _render { 904sub _render {
830 my ($self) = @_; 905 my ($self) = @_;
831 906
… …
833} 908}
834 909
835sub render_child { 910sub render_child {
836 my ($self) = @_; 911 my ($self) = @_;
837 912
838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 913 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
839 glClearColor 0, 0, 0, 0; 914 glClearColor 0, 0, 0, 0;
840 glClear GL_COLOR_BUFFER_BIT; 915 glClear GL_COLOR_BUFFER_BIT;
841 916
842 { 917 {
843 package CFClient::UI::Base; 918 package CFPlus::UI::Base;
844 919
845 ($draw_x, $draw_y, $draw_w, $draw_h) = 920 local ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h}); 921 (0, 0, $self->{w}, $self->{h});
922
923 $self->_render;
847 } 924 }
848
849 $self->_render;
850 }; 925 };
851} 926}
852 927
853sub _draw { 928sub _draw {
854 my ($self) = @_; 929 my ($self) = @_;
855
856 my ($w, $h) = @$self{qw(w h)};
857 930
858 my $tex = $self->{texture} 931 my $tex = $self->{texture}
859 or return; 932 or return;
860 933
861 glEnable GL_TEXTURE_2D; 934 glEnable GL_TEXTURE_2D;
862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 935 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
863 glColor 0, 0, 0, 1; 936 glColor 0, 0, 0, 1;
864 937
865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 938 $tex->draw_quad_alpha_premultiplied (0, 0);
866 939
867 glDisable GL_TEXTURE_2D; 940 glDisable GL_TEXTURE_2D;
868} 941}
869 942
870############################################################################# 943#############################################################################
871 944
872package CFClient::UI::ViewPort; 945package CFPlus::UI::ViewPort;
873 946
947use List::Util qw(min max);
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 (
… …
886sub size_request { 961sub size_request {
887 my ($self) = @_; 962 my ($self) = @_;
888 963
889 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 964 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
890 965
891 $w = 10 if $self->{scroll_x}; 966 $w = 1 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y}; 967 $h = 1 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
989 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
990 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
991
992 if ($x != $self->{view_x} or $y != $self->{view_y}) {
912 $self->{view_x} = int $x; 993 $self->{view_x} = $x;
913 $self->{view_y} = int $y; 994 $self->{view_y} = $y;
914 995
996 $self->emit (changed => $x, $y);
915 $self->update; 997 $self->update;
998 }
916} 999}
917 1000
918# hmm, this does not work for topleft of $self... but we should not ask for that 1001# hmm, this does not work for topleft of $self... but we should not ask for that
919sub coord2local { 1002sub coord2local {
920 my ($self, $x, $y) = @_; 1003 my ($self, $x, $y) = @_;
… …
935 my ($self, $x, $y) = @_; 1018 my ($self, $x, $y) = @_;
936 1019
937 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1020 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
938 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1021 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
939 ) { 1022 ) {
940 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1023 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
941 } else { 1024 } else {
942 $self->CFClient::UI::Base::find_widget ($x, $y) 1025 $self->CFPlus::UI::Base::find_widget ($x, $y)
943 } 1026 }
944} 1027}
945 1028
946sub _render { 1029sub _render {
947 my ($self) = @_; 1030 my ($self) = @_;
948 1031
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1032 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}; 1033 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
951 1034
952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1035 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
953 1036
954 $self->SUPER::_render; 1037 $self->SUPER::_render;
955} 1038}
956 1039
957############################################################################# 1040#############################################################################
958 1041
959package CFClient::UI::ScrolledWindow; 1042package CFPlus::UI::ScrolledWindow;
960 1043
961our @ISA = CFClient::UI::HBox::; 1044our @ISA = CFPlus::UI::Table::;
962 1045
963sub new { 1046sub new {
964 my ($class, %arg) = @_; 1047 my ($class, %arg) = @_;
965 1048
966 my $child = delete $arg{child}; 1049 my $child = delete $arg{child};
967 1050
968 my $self; 1051 my $self;
969 1052
970 my $slider = new CFClient::UI::Slider 1053 my $hslider = new CFPlus::UI::Slider
1054 col => 0,
1055 row => 1,
1056 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub {
1059 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 },
1062 ;
1063
1064 my $vslider = new CFPlus::UI::Slider
1065 col => 1,
1066 row => 0,
971 vertical => 1, 1067 vertical => 1,
972 range => [0, 0, 1, 0.01], # HACK fix 1068 range => [0, 0, 1, 0.01], # HACK fix
973 on_changed => sub { 1069 on_changed => sub {
974 $self->{vp}->set_offset (0, $_[1]); 1070 $self->{vpos} = $_[1];
1071 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
975 }, 1072 },
976 ; 1073 ;
977 1074
978 $self = $class->SUPER::new ( 1075 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1), 1076 scroll_x => 0,
1077 scroll_y => 1,
1078 can_events => 1,
980 slider => $slider, 1079 hslider => $hslider,
1080 vslider => $vslider,
1081 col_expand => [1, 0],
1082 row_expand => [1, 0],
981 %arg, 1083 %arg,
982 ); 1084 );
983 1085
1086 $self->{vp} = new CFPlus::UI::ViewPort
1087 col => 0,
1088 row => 0,
1089 expand => 1,
1090 scroll_x => $self->{scroll_x},
1091 scroll_y => $self->{scroll_y},
1092 on_changed => sub {
1093 my ($vp, $x, $y) = @_;
1094
1095 $vp->{parent}{hslider}->set_value ($x);
1096 $vp->{parent}{vslider}->set_value ($y);
1097
1098 0
1099 },
1100 ;
1101
984 $self->SUPER::add ($self->{vp}, $self->{slider}); 1102 $self->SUPER::add ($self->{vp});
1103
985 $self->add ($child) if $child; 1104 $self->add ($child) if $child;
986 1105
987 $self 1106 $self
988} 1107}
989 1108
… …
991 my ($self, $widget) = @_; 1110 my ($self, $widget) = @_;
992 1111
993 $self->{vp}->add ($self->{child} = $widget); 1112 $self->{vp}->add ($self->{child} = $widget);
994} 1113}
995 1114
996sub update { 1115sub update_slider {
1116 my ($self) = @_;
1117
1118 my $child = ($self->{vp} or return)->child;
1119
1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1122
1123 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider_visible}) {
1125 $self->{hslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{hslider})
1127 : $self->SUPER::remove ($self->{hslider});
1128 }
1129
1130 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1131 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1132
1133 my $visible = $h1 > $h2;
1134 if ($visible != $self->{vslider_visible}) {
1135 $self->{vslider_visible} = $visible;
1136 $visible ? $self->SUPER::add ($self->{vslider})
1137 : $self->SUPER::remove ($self->{vslider});
1138 }
1139}
1140
1141sub start_dragging {
997 my ($self) = @_; 1142 my ($self, $ev) = @_;
998 1143
999 $self->SUPER::update; 1144 $self->grab_focus;
1000 1145
1001 # todo: overwrite size_allocate of child 1146 my $ox = $self->{vp}{view_x};
1002 my $child = $self->{vp}->child; 1147 my $oy = $self->{vp}{view_y};
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1148
1004} 1149 $self->{motion} = sub {
1150 my ($ev, $x, $y) = @_;
1005 1151
1152 $ox -= $ev->{xrel};
1153 $oy -= $ev->{yrel};
1154
1155 $self->{vp}->set_offset ($ox, $oy);
1156 };
1157}
1158
1159sub invoke_mouse_wheel {
1160 my ($self, $ev) = @_;
1161
1162 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1163 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1164
1165 1
1166}
1167
1168sub invoke_button_down {
1169 my ($self, $ev, $x, $y) = @_;
1170
1171 if ($ev->{button} == 2) {
1172 $self->start_dragging ($ev);
1173 return 1;
1174 }
1175
1176 0
1177}
1178
1179sub invoke_button_up {
1180 my ($self, $ev, $x, $y) = @_;
1181
1182 if (delete $self->{motion}) {
1183 return 1;
1184 }
1185
1186 0
1187}
1188
1189sub invoke_mouse_motion {
1190 my ($self, $ev, $x, $y) = @_;
1191
1192 if ($self->{motion}) {
1193 $self->{motion}->($ev, $x, $y);
1194 return 1;
1195 }
1196
1197 0
1198}
1199
1006sub size_allocate { 1200sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1201 my ($self, $w, $h) = @_;
1008 1202
1203 $self->update_slider;
1009 $self->SUPER::size_allocate ($w, $h); 1204 $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} 1205}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017 1206
1018############################################################################# 1207#############################################################################
1019 1208
1020package CFClient::UI::Frame; 1209package CFPlus::UI::Frame;
1021 1210
1022our @ISA = CFClient::UI::Bin::; 1211our @ISA = CFPlus::UI::Bin::;
1023 1212
1024use CFClient::OpenGL; 1213use CFPlus::OpenGL;
1025 1214
1026sub new { 1215sub new {
1027 my $class = shift; 1216 my $class = shift;
1028 1217
1029 $class->SUPER::new ( 1218 $class->SUPER::new (
… …
1055 $self->SUPER::_draw; 1244 $self->SUPER::_draw;
1056} 1245}
1057 1246
1058############################################################################# 1247#############################################################################
1059 1248
1060package CFClient::UI::FancyFrame; 1249package CFPlus::UI::FancyFrame;
1061 1250
1062our @ISA = CFClient::UI::Bin::; 1251our @ISA = CFPlus::UI::Bin::;
1063 1252
1064use CFClient::OpenGL; 1253use 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 1254
1074sub new { 1255sub new {
1075 my ($class, %arg) = @_; 1256 my ($class, %arg) = @_;
1076 1257
1077 my $title = delete $arg{title}; 1258 if ((exists $arg{label}) && !ref $arg{label}) {
1259 $arg{label} = new CFPlus::UI::Label
1260 align => 1,
1261 valign => 0,
1262 text => $arg{label},
1263 fontsize => ($arg{border} || 0.8) * 0.75;
1264 }
1265
1266 my $self = $class->SUPER::new (
1267 # label => "",
1268 fg => [0.6, 0.3, 0.1],
1269 border => 0.8,
1270 style => 'single',
1271 %arg,
1272 );
1273
1274 $self
1275}
1276
1277sub add {
1278 my ($self, @widgets) = @_;
1279
1280 $self->SUPER::add (@widgets);
1281 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1282}
1283
1284sub border {
1285 int $_[0]{border} * $::FONTSIZE
1286}
1287
1288sub size_request {
1289 my ($self) = @_;
1290
1291 ($self->{label_w}, undef) = $self->{label}->size_request
1292 if $self->{label};
1293
1294 my ($w, $h) = $self->SUPER::size_request;
1295
1296 (
1297 $w + $self->border * 2,
1298 $h + $self->border * 2,
1299 )
1300}
1301
1302sub invoke_size_allocate {
1303 my ($self, $w, $h) = @_;
1304
1305 my $border = $self->border;
1306
1307 $w -= List::Util::max 0, $border * 2;
1308 $h -= List::Util::max 0, $border * 2;
1309
1310 if (my $label = $self->{label}) {
1311 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1312 $label->{h} = List::Util::min $h, $border;
1313 $label->invoke_size_allocate ($label->{w}, $label->{h});
1314 }
1315
1316 $self->child->configure ($border, $border, $w, $h);
1317
1318 1
1319}
1320
1321sub _draw {
1322 my ($self) = @_;
1323
1324 my $child = $self->{children}[0];
1325
1326 my $border = $self->border;
1327 my ($w, $h) = ($self->{w}, $self->{h});
1328
1329 $child->draw;
1330
1331 glColor @{$self->{fg}};
1332 glBegin GL_LINE_STRIP;
1333 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1334 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1335 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1336 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1337 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1338 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1339 glEnd;
1340
1341 if ($self->{label}) {
1342 glTranslate $border * 2, 0;
1343 $self->{label}->_draw;
1344 }
1345}
1346
1347#############################################################################
1348
1349package CFPlus::UI::Toplevel;
1350
1351our @ISA = CFPlus::UI::Bin::;
1352
1353use CFPlus::OpenGL;
1354
1355my $bg =
1356 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1357 mipmap => 1, wrap => 1;
1358
1359my @border =
1360 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1361 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1362
1363my @icon =
1364 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1365 qw(x1_move.png x1_resize.png);
1366
1367sub new {
1368 my ($class, %arg) = @_;
1078 1369
1079 my $self = $class->SUPER::new ( 1370 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1371 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1372 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1373 border => 0.6,
1083 can_events => 1, 1374 can_events => 1,
1084 min_w => 16, 1375 min_w => 64,
1085 min_h => 16, 1376 min_h => 32,
1086 %arg, 1377 %arg,
1087 ); 1378 );
1088 1379
1089 $self->{title} = new CFClient::UI::Label 1380 $self->{title_widget} = new CFPlus::UI::Label
1090 align => 0, 1381 align => 0,
1091 valign => 1, 1382 valign => 1,
1092 text => $title, 1383 text => $self->{title},
1093 fontsize => $self->{border} 1384 fontsize => $self->{border},
1094 if defined $title; 1385 if exists $self->{title};
1386
1387 if ($self->{has_close_button}) {
1388 $self->{close_button} =
1389 new CFPlus::UI::ImageButton
1390 path => 'x1_close.png',
1391 on_activate => sub { $self->emit ("delete") };
1392
1393 $self->CFPlus::UI::Container::add ($self->{close_button});
1394 }
1095 1395
1096 $self 1396 $self
1097} 1397}
1098 1398
1099sub add { 1399sub add {
1100 my ($self, @widgets) = @_; 1400 my ($self, @widgets) = @_;
1101 1401
1102 $self->SUPER::add (@widgets); 1402 $self->SUPER::add (@widgets);
1403 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1404 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1405}
1105 1406
1106sub border { 1407sub border {
1107 int $_[0]{border} * $::FONTSIZE 1408 int $_[0]{border} * $::FONTSIZE
1108} 1409}
1109 1410
1110sub size_request { 1411sub size_request {
1111 my ($self) = @_; 1412 my ($self) = @_;
1112 1413
1113 $self->{title}->size_request 1414 $self->{title_widget}->size_request
1114 if $self->{title}; 1415 if $self->{title_widget};
1416
1417 $self->{close_button}->size_request
1418 if $self->{close_button};
1115 1419
1116 my ($w, $h) = $self->SUPER::size_request; 1420 my ($w, $h) = $self->SUPER::size_request;
1117 1421
1118 ( 1422 (
1119 $w + $self->border * 2, 1423 $w + $self->border * 2,
1120 $h + $self->border * 2, 1424 $h + $self->border * 2,
1121 ) 1425 )
1122} 1426}
1123 1427
1124sub size_allocate { 1428sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1429 my ($self, $w, $h) = @_;
1126 1430
1127 if ($self->{title}) { 1431 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1432 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1433 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1434 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1435 }
1132 1436
1133 my $border = $self->border; 1437 my $border = $self->border;
1134 1438
1135 $h -= List::Util::max 0, $border * 2; 1439 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1440 $w -= List::Util::max 0, $border * 2;
1441
1442 $self->child->configure ($border, $border, $w, $h);
1443
1444 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1445 if $self->{close_button};
1446
1447 1
1448}
1449
1450sub invoke_delete {
1451 my ($self) = @_;
1452
1453 $self->hide;
1137 1454
1138 $self->child->configure ($border, $border, $w, $h); 1455 1
1139} 1456}
1140 1457
1141sub button_down { 1458sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1459 my ($self, $ev, $x, $y) = @_;
1143 1460
1144 my ($w, $h) = @$self{qw(w h)}; 1461 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1462 my $border = $self->border;
1146 1463
… …
1177 1494
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1495 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1496
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1497 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1498 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1499 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1500 };
1184 } else { 1501 } else {
1185 return 0; 1502 return 0;
1186 } 1503 }
1187 1504
1188 1 1505 1
1189} 1506}
1190 1507
1191sub button_up { 1508sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1509 my ($self, $ev, $x, $y) = @_;
1193 1510
1194 !!delete $self->{motion} 1511 ! ! delete $self->{motion}
1195} 1512}
1196 1513
1197sub mouse_motion { 1514sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1515 my ($self, $ev, $x, $y) = @_;
1199 1516
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1517 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1518
1202 !!$self->{motion} 1519 ! ! $self->{motion}
1520}
1521
1522sub invoke_visibility_change {
1523 my ($self, $visible) = @_;
1524
1525 delete $self->{motion} unless $visible;
1526
1527 0
1203} 1528}
1204 1529
1205sub _draw { 1530sub _draw {
1206 my ($self) = @_; 1531 my ($self) = @_;
1207 1532
… …
1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1539 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1215 1540
1216 my $border = $self->border; 1541 my $border = $self->border;
1217 1542
1218 glColor @{ $self->{border_bg} }; 1543 glColor @{ $self->{border_bg} };
1219 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1544 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1545 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1546 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1547 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1548
1549 # move
1550 my $w2 = ($w - $border) * .5;
1551 my $h2 = ($h - $border) * .5;
1552 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1553 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1554 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1555
1556 # resize
1557 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1558 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1559 unless $self->{has_close_button};
1560 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1561 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1223 1562
1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1563 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1225 glColor @{ $self->{bg} }; 1564 glColor @{ $self->{bg} };
1226 1565
1227 # TODO: repeat texture not scale 1566 # TODO: repeat texture not scale
… …
1233 1572
1234 glDisable GL_TEXTURE_2D; 1573 glDisable GL_TEXTURE_2D;
1235 1574
1236 $child->draw; 1575 $child->draw;
1237 1576
1238 if ($self->{title}) { 1577 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1578 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1579 $self->{title_widget}->_draw;
1580
1581 glTranslate 0, - ($border - $self->{h});
1241 } 1582 }
1583
1584 $self->{close_button}->draw
1585 if $self->{close_button};
1242} 1586}
1243 1587
1244############################################################################# 1588#############################################################################
1245 1589
1246package CFClient::UI::Table; 1590package CFPlus::UI::Table;
1247 1591
1248our @ISA = CFClient::UI::Base::; 1592our @ISA = CFPlus::UI::Container::;
1249 1593
1250use List::Util qw(max sum); 1594use List::Util qw(max sum);
1251 1595
1252use CFClient::OpenGL; 1596use CFPlus::OpenGL;
1253 1597
1254sub new { 1598sub new {
1255 my $class = shift; 1599 my $class = shift;
1256 1600
1257 $class->SUPER::new ( 1601 $class->SUPER::new (
1258 col_expand => [], 1602 col_expand => [],
1603 row_expand => [],
1259 @_, 1604 @_,
1260 ) 1605 )
1261} 1606}
1262 1607
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265}
1266
1267sub add { 1608sub add {
1268 my ($self, $x, $y, $child) = @_;
1269
1270 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child;
1272
1273 $self->realloc;
1274}
1275
1276# TODO: move to container class maybe? send children a signal on removal?
1277sub clear {
1278 my ($self) = @_; 1609 my ($self, @widgets) = @_;
1610
1611 for my $child (@widgets) {
1612 $child->{rowspan} ||= 1;
1613 $child->{colspan} ||= 1;
1614 }
1615
1616 $self->SUPER::add (@widgets);
1617}
1618
1619sub add_at {
1620 my $self = shift;
1621
1622 my @widgets;
1623
1624 while (@_) {
1625 my ($col, $row, $child) = splice @_, 0, 3, ();
1626
1627 $child->{row} = $row;
1628 $child->{col} = $col;
1629
1630 push @widgets, $child;
1631 }
1632
1633 $self->add (@widgets);
1634}
1635
1636sub get_wh {
1637 my ($self) = @_;
1638
1639 my (@w, @h);
1279 1640
1280 my @children = $self->children; 1641 my @children = $self->children;
1281 delete $self->{children}; 1642
1643 # first pass, columns
1644 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1645 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1646
1647 my $sw = sum @w[$c .. $c + $cs - 1];
1648
1649 if ($w > $sw) {
1650 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1651 }
1282 1652 }
1283 for (@children) {
1284 delete $_->{parent};
1285 $_->hide;
1286 }
1287 1653
1288 $self->realloc; 1654 # second pass, rows
1289} 1655 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1290
1291sub get_wh {
1292 my ($self) = @_;
1293
1294 my (@w, @h);
1295
1296 for my $y (0 .. $#{$self->{children}}) {
1297 my $row = $self->{children}[$y]
1298 or next;
1299
1300 for my $x (0 .. $#$row) {
1301 my $widget = $row->[$x]
1302 or next;
1303 my ($w, $h) = @$widget{qw(req_w req_h)}; 1656 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1304 1657
1305 $w[$x] = max $w[$x], $w; 1658 my $sh = sum @h[$r .. $r + $rs - 1];
1306 $h[$y] = max $h[$y], $h; 1659
1660 if ($h > $sh) {
1661 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1307 } 1662 }
1308 } 1663 }
1309 1664
1310 (\@w, \@h) 1665 (\@w, \@h)
1311} 1666}
… …
1319 (sum @$ws), 1674 (sum @$ws),
1320 (sum @$hs), 1675 (sum @$hs),
1321 ) 1676 )
1322} 1677}
1323 1678
1324sub size_allocate { 1679sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1680 my ($self, $w, $h) = @_;
1326 1681
1327 my ($ws, $hs) = $self->get_wh; 1682 my ($ws, $hs) = $self->get_wh;
1328 1683
1329 my $req_w = (sum @$ws) || 1; 1684 my $req_w = (sum @$ws) || 1;
1330 my $req_h = (sum @$hs) || 1; 1685 my $req_h = (sum @$hs) || 1;
1331 1686
1332 # TODO: nicer code && do row_expand 1687 # now linearly scale the rows/columns to the allocated size
1333 my @col_expand = @{$self->{col_expand}}; 1688 my @col_expand = @{$self->{col_expand}};
1334 @col_expand = (1) x @$ws unless @col_expand; 1689 @col_expand = (1) x @$ws unless @col_expand;
1335 my $col_expand = (sum @col_expand) || 1; 1690 my $col_expand = (sum @col_expand) || 1;
1336 1691
1337 # linearly scale sizes
1338 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1692 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1339 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1340 1693
1341 CFClient::UI::harmonize $ws; 1694 CFPlus::UI::harmonize $ws;
1695
1696 my @row_expand = @{$self->{row_expand}};
1697 @row_expand = (1) x @$ws unless @row_expand;
1698 my $row_expand = (sum @row_expand) || 1;
1699
1700 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1701
1342 CFClient::UI::harmonize $hs; 1702 CFPlus::UI::harmonize $hs;
1343 1703
1344 my $y; 1704 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1705 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1345 1706
1346 for my $r (0 .. $#{$self->{children}}) { 1707 for my $widget ($self->children) {
1347 my $row = $self->{children}[$r] 1708 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1348 or next;
1349 1709
1350 my $x = 0; 1710 $widget->configure (
1351 my $row_h = $hs->[$r]; 1711 $x[$c], $y[$r],
1712 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1352 1713 );
1353 for my $c (0 .. $#$row) { 1714 }
1354 my $col_w = $ws->[$c];
1355 1715
1356 if (my $widget = $row->[$c]) { 1716 1
1357 $widget->configure ($x, $y, $col_w, $row_h); 1717}
1358 }
1359 1718
1360 $x += $col_w; 1719#############################################################################
1720
1721package CFPlus::UI::Fixed;
1722
1723use List::Util qw(min max);
1724
1725our @ISA = CFPlus::UI::Container::;
1726
1727sub add {
1728 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1729
1730 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1731 $self->SUPER::add ($child);
1732}
1733
1734sub _scale($$$) {
1735 my ($mode, $val, $max) = @_;
1736
1737 $mode eq "abs" ? $val
1738 : $mode eq "rel" ? $val * $max
1739 : 0
1740}
1741
1742sub size_request {
1743 my ($self) = @_;
1744
1745 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1746
1747 # determine overall size by querying abs widgets
1748 for my $child ($self->visible_children) {
1749 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1750
1751 if ($pos eq "abs") {
1752 $w = _scale $size, $w, $child->{req_w};
1753 $h = _scale $size, $h, $child->{req_h};
1754
1755 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1756 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1361 } 1757 }
1362
1363 $y += $row_h;
1364 } 1758 }
1365 1759
1366} 1760 my $W = $x2 - $x1;
1761 my $H = $y2 - $y1;
1367 1762
1368sub find_widget { 1763 # now layout remaining widgets
1764 for my $child ($self->visible_children) {
1765 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1766
1767 if ($pos ne "abs") {
1768 $x = _scale $pos, $x, $W;
1769 $y = _scale $pos, $x, $H;
1770 $w = _scale $size, $w, $child->{req_w};
1771 $h = _scale $size, $h, $child->{req_h};
1772
1773 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1774 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1775 }
1776 }
1777
1778 my $W = $x2 - $x1;
1779 my $H = $y2 - $y1;
1780
1781 ($W, $H)
1782}
1783
1784sub invoke_size_allocate {
1369 my ($self, $x, $y) = @_; 1785 my ($self, $W, $H) = @_;
1370 1786
1371 $x -= $self->{x}; 1787 for my $child ($self->visible_children) {
1372 $y -= $self->{y}; 1788 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1373 1789
1374 my $res; 1790 $x = _scale $pos, $x, $W;
1791 $y = _scale $pos, $x, $H;
1792 $w = _scale $size, $w, $child->{req_w};
1793 $h = _scale $size, $h, $child->{req_h};
1375 1794
1376 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1795 $child->configure ($x, $y, $w, $h);
1377 $res = $_->find_widget ($x, $y) 1796 }
1378 and return $res; 1797
1379 } 1798 1
1380
1381 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1382}
1383
1384sub _draw {
1385 my ($self) = @_;
1386
1387 for (grep $_, @{$self->{children}}) {
1388 $_->draw for grep $_, @$_;
1389 }
1390} 1799}
1391 1800
1392############################################################################# 1801#############################################################################
1393 1802
1394package CFClient::UI::Box; 1803package CFPlus::UI::Box;
1395 1804
1396our @ISA = CFClient::UI::Container::; 1805our @ISA = CFPlus::UI::Container::;
1397 1806
1398sub size_request { 1807sub size_request {
1399 my ($self) = @_; 1808 my ($self) = @_;
1400 1809
1401 $self->{vertical} 1810 $self->{vertical}
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1816 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1817 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1818 )
1410} 1819}
1411 1820
1412sub size_allocate { 1821sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1822 my ($self, $w, $h) = @_;
1414 1823
1415 my $space = $self->{vertical} ? $h : $w; 1824 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1825 my @children = $self->visible_children;
1417 1826
1418 my @req; 1827 my @req;
1419 1828
1420 if ($self->{homogeneous}) { 1829 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1830 @req = ($space / (@children || 1)) x @children;
1422 } else { 1831 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1832 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1833 my $req = List::Util::sum @req;
1425 1834
1426 if ($req > $space) { 1835 if ($req > $space) {
1427 # ah well, not enough space 1836 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1837 $_ *= $space / $req for @req;
1429 } else { 1838 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1839 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1840
1432 $space = ($space - $req) / $expand; # remaining space to give away 1841 $space = ($space - $req) / $expand; # remaining space to give away
1433 1842
1434 $req[$_] += $space * $children->[$_]{expand} 1843 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1844 for 0 .. $#children;
1436 } 1845 }
1437 } 1846 }
1438 1847
1439 CFClient::UI::harmonize \@req; 1848 CFPlus::UI::harmonize \@req;
1440 1849
1441 my $pos = 0; 1850 my $pos = 0;
1442 for (0 .. $#$children) { 1851 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1852 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1853 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1854
1446 $pos += $alloc; 1855 $pos += $alloc;
1447 } 1856 }
1448 1857
1449 1 1858 1
1450} 1859}
1451 1860
1452############################################################################# 1861#############################################################################
1453 1862
1454package CFClient::UI::HBox; 1863package CFPlus::UI::HBox;
1455 1864
1456our @ISA = CFClient::UI::Box::; 1865our @ISA = CFPlus::UI::Box::;
1457 1866
1458sub new { 1867sub new {
1459 my $class = shift; 1868 my $class = shift;
1460 1869
1461 $class->SUPER::new ( 1870 $class->SUPER::new (
… …
1464 ) 1873 )
1465} 1874}
1466 1875
1467############################################################################# 1876#############################################################################
1468 1877
1469package CFClient::UI::VBox; 1878package CFPlus::UI::VBox;
1470 1879
1471our @ISA = CFClient::UI::Box::; 1880our @ISA = CFPlus::UI::Box::;
1472 1881
1473sub new { 1882sub new {
1474 my $class = shift; 1883 my $class = shift;
1475 1884
1476 $class->SUPER::new ( 1885 $class->SUPER::new (
… …
1479 ) 1888 )
1480} 1889}
1481 1890
1482############################################################################# 1891#############################################################################
1483 1892
1484package CFClient::UI::Label; 1893package CFPlus::UI::Label;
1485 1894
1486our @ISA = CFClient::UI::DrawBG::; 1895our @ISA = CFPlus::UI::DrawBG::;
1487 1896
1488use CFClient::OpenGL; 1897use CFPlus::OpenGL;
1489 1898
1490sub new { 1899sub new {
1491 my ($class, %arg) = @_; 1900 my ($class, %arg) = @_;
1492 1901
1493 my $self = $class->SUPER::new ( 1902 my $self = $class->SUPER::new (
… …
1496 #active_bg => none 1905 #active_bg => none
1497 #font => default_font 1906 #font => default_font
1498 #text => initial text 1907 #text => initial text
1499 #markup => initial narkup 1908 #markup => initial narkup
1500 #max_w => maximum pixel width 1909 #max_w => maximum pixel width
1910 #style => 0, # render flags
1501 ellipsise => 3, # end 1911 ellipsise => 3, # end
1502 layout => (new CFClient::Layout), 1912 layout => (new CFPlus::Layout),
1503 fontsize => 1, 1913 fontsize => 1,
1504 align => -1, 1914 align => -1,
1505 valign => -1, 1915 valign => -1,
1506 padding_x => 2, 1916 padding_x => 2,
1507 padding_y => 2, 1917 padding_y => 2,
1508 can_events => 0, 1918 can_events => 0,
1509 %arg 1919 %arg
1510 ); 1920 );
1511 1921
1512 if (exists $self->{template}) { 1922 if (exists $self->{template}) {
1513 my $layout = new CFClient::Layout; 1923 my $layout = new CFPlus::Layout;
1514 $layout->set_text (delete $self->{template}); 1924 $layout->set_text (delete $self->{template});
1515 $self->{template} = $layout; 1925 $self->{template} = $layout;
1516 } 1926 }
1517 1927
1518 if (exists $self->{markup}) { 1928 if (exists $self->{markup}) {
… …
1522 } 1932 }
1523 1933
1524 $self 1934 $self
1525} 1935}
1526 1936
1527sub escape($) {
1528 local $_ = $_[0];
1529
1530 s/&/&amp;/g;
1531 s/>/&gt;/g;
1532 s/</&lt;/g;
1533
1534 $_
1535}
1536
1537sub update { 1937sub update {
1538 my ($self) = @_; 1938 my ($self) = @_;
1539 1939
1540 delete $self->{texture}; 1940 delete $self->{texture};
1541 $self->SUPER::update; 1941 $self->SUPER::update;
… …
1552 my ($self, $text) = @_; 1952 my ($self, $text) = @_;
1553 1953
1554 return if $self->{text} eq "T$text"; 1954 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1955 $self->{text} = "T$text";
1556 1956
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1957 $self->{layout}->set_text ($text);
1958
1559 delete $self->{req_h}; 1959 delete $self->{size_req};
1560
1561 $self->realloc; 1960 $self->realloc;
1562 $self->update; 1961 $self->update;
1563} 1962}
1564 1963
1565sub set_markup { 1964sub set_markup {
… …
1568 return if $self->{text} eq "M$markup"; 1967 return if $self->{text} eq "M$markup";
1569 $self->{text} = "M$markup"; 1968 $self->{text} = "M$markup";
1570 1969
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1970 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1971
1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574 $self->{layout}->set_markup ($markup); 1972 $self->{layout}->set_markup ($markup);
1973
1575 delete $self->{req_h}; 1974 delete $self->{size_req};
1576
1577 $self->realloc; 1975 $self->realloc;
1578 $self->update; 1976 $self->update;
1579} 1977}
1580 1978
1581sub size_request { 1979sub size_request {
1582 my ($self) = @_; 1980 my ($self) = @_;
1583 1981
1584 if (exists $self->{req_h}) { 1982 $self->{size_req} ||= do {
1585 @$self{qw(req_w req_h)}
1586 } else {
1587 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1983 $self->{layout}->set_font ($self->{font}) if $self->{font};
1588 $self->{layout}->set_width ($self->{max_w} || -1); 1984 $self->{layout}->set_width ($self->{max_w} || -1);
1589 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1985 $self->{layout}->set_ellipsise ($self->{ellipsise});
1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1986 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1987 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592 1988
1593 my ($w, $h) = $self->{layout}->size; 1989 my ($w, $h) = $self->{layout}->size;
1594 1990
1595 if (exists $self->{template}) { 1991 if (exists $self->{template}) {
1596 $self->{template}->set_font ($self->{font}) if $self->{font}; 1992 $self->{template}->set_font ($self->{font}) if $self->{font};
1993 $self->{template}->set_width ($self->{max_w} || -1);
1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1994 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1598 1995
1599 my ($w2, $h2) = $self->{template}->size; 1996 my ($w2, $h2) = $self->{template}->size;
1600 1997
1601 $w = List::Util::max $w, $w2; 1998 $w = List::Util::max $w, $w2;
1602 $h = List::Util::max $h, $h2; 1999 $h = List::Util::max $h, $h2;
1603 } 2000 }
1604 2001
1605 ($w, $h) 2002 [$w, $h]
1606 } 2003 };
1607}
1608 2004
2005 @{ $self->{size_req} }
2006}
2007
2008sub baseline_shift {
2009 $_[0]{layout}->descent
2010}
2011
1609sub size_allocate { 2012sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 2013 my ($self, $w, $h) = @_;
1611 2014
1612 delete $self->{ox}; 2015 delete $self->{ox};
1613 2016
1614 delete $self->{texture} 2017 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 2018 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2019
2020 1
1616} 2021}
1617 2022
1618sub set_fontsize { 2023sub set_fontsize {
1619 my ($self, $fontsize) = @_; 2024 my ($self, $fontsize) = @_;
1620 2025
1621 $self->{fontsize} = $fontsize; 2026 $self->{fontsize} = $fontsize;
2027 delete $self->{size_req};
1622 delete $self->{texture}; 2028 delete $self->{texture};
1623 2029
1624 $self->realloc; 2030 $self->realloc;
1625} 2031}
1626 2032
2033sub reconfigure {
2034 my ($self) = @_;
2035
2036 delete $self->{size_req};
2037 delete $self->{texture};
2038
2039 $self->SUPER::reconfigure;
2040}
2041
1627sub _draw { 2042sub _draw {
1628 my ($self) = @_; 2043 my ($self) = @_;
1629 2044
1630 $self->SUPER::_draw; # draw background, if applicable 2045 $self->SUPER::_draw; # draw background, if applicable
1631 2046
1632 my $tex = $self->{texture} ||= do { 2047 my $size = $self->{texture} ||= do {
1633 $self->{layout}->set_foreground (@{$self->{fg}}); 2048 $self->{layout}->set_foreground (@{$self->{fg}});
1634 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2049 $self->{layout}->set_font ($self->{font}) if $self->{font};
1635 $self->{layout}->set_width ($self->{w}); 2050 $self->{layout}->set_width ($self->{w});
1636 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2051 $self->{layout}->set_ellipsise ($self->{ellipsise});
1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2052 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2053 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639 2054
1640 new_from_layout CFClient::Texture $self->{layout} 2055 [$self->{layout}->size]
1641 }; 2056 };
1642 2057
1643 unless (exists $self->{ox}) { 2058 unless (exists $self->{ox}) {
1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2059 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2060 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1646 : ($self->{w} - $tex->{w}) * 0.5); 2061 : ($self->{w} - $size->[0]) * 0.5);
1647 2062
1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2063 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2064 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1650 : ($self->{h} - $tex->{h}) * 0.5); 2065 : ($self->{h} - $size->[1]) * 0.5);
1651 }; 2066 };
1652 2067
1653 glEnable GL_TEXTURE_2D; 2068 my $w = List::Util::min $self->{w} + 4, $size->[0];
1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2069 my $h = List::Util::min $self->{h} + 2, $size->[1];
1655 2070
1656 glColor_premultiply @{$self->{fg}} 2071 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1657 if $tex->{format} == GL_ALPHA;
1658
1659 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1660
1661 glDisable GL_TEXTURE_2D;
1662} 2072}
1663 2073
1664############################################################################# 2074#############################################################################
1665 2075
1666package CFClient::UI::EntryBase; 2076package CFPlus::UI::EntryBase;
1667 2077
1668our @ISA = CFClient::UI::Label::; 2078our @ISA = CFPlus::UI::Label::;
1669 2079
1670use CFClient::OpenGL; 2080use CFPlus::OpenGL;
1671 2081
1672sub new { 2082sub new {
1673 my $class = shift; 2083 my $class = shift;
1674 2084
1675 $class->SUPER::new ( 2085 $class->SUPER::new (
… …
1679 active_fg => [0, 0, 0], 2089 active_fg => [0, 0, 0],
1680 can_hover => 1, 2090 can_hover => 1,
1681 can_focus => 1, 2091 can_focus => 1,
1682 valign => 0, 2092 valign => 0,
1683 can_events => 1, 2093 can_events => 1,
2094 ellipsise => 0,
1684 #text => ... 2095 #text => ...
2096 #hidden => "*",
1685 @_ 2097 @_
1686 ) 2098 )
1687} 2099}
1688 2100
1689sub _set_text { 2101sub _set_text {
… …
1696 $self->{last_activity} = $::NOW; 2108 $self->{last_activity} = $::NOW;
1697 $self->{text} = $text; 2109 $self->{text} = $text;
1698 2110
1699 $text =~ s/./*/g if $self->{hidden}; 2111 $text =~ s/./*/g if $self->{hidden};
1700 $self->{layout}->set_text ("$text "); 2112 $self->{layout}->set_text ("$text ");
1701 delete $self->{req_h}; 2113 delete $self->{size_req};
1702 2114
1703 $self->_emit (changed => $self->{text}); 2115 $self->emit (changed => $self->{text});
1704 2116
1705 $self->realloc; 2117 $self->realloc;
1706 $self->update; 2118 $self->update;
1707} 2119}
1708 2120
… …
1723 my ($w, $h) = $self->SUPER::size_request; 2135 my ($w, $h) = $self->SUPER::size_request;
1724 2136
1725 ($w + 1, $h) # add 1 for cursor 2137 ($w + 1, $h) # add 1 for cursor
1726} 2138}
1727 2139
1728sub key_down { 2140sub invoke_key_down {
1729 my ($self, $ev) = @_; 2141 my ($self, $ev) = @_;
1730 2142
1731 my $mod = $ev->{mod}; 2143 my $mod = $ev->{mod};
1732 my $sym = $ev->{sym}; 2144 my $sym = $ev->{sym};
1733 my $uni = $ev->{unicode}; 2145 my $uni = $ev->{unicode};
1734 2146
1735 my $text = $self->get_text; 2147 my $text = $self->get_text;
2148
2149 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1736 2150
1737 if ($uni == 8) { 2151 if ($uni == 8) {
1738 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2152 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1739 } elsif ($uni == 127) { 2153 } elsif ($uni == 127) {
1740 substr $text, $self->{cursor}, 1, ""; 2154 substr $text, $self->{cursor}, 1, "";
1741 } elsif ($sym == CFClient::SDLK_LEFT) { 2155 } elsif ($sym == CFPlus::SDLK_LEFT) {
1742 --$self->{cursor} if $self->{cursor}; 2156 --$self->{cursor} if $self->{cursor};
1743 } elsif ($sym == CFClient::SDLK_RIGHT) { 2157 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1744 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2158 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1745 } elsif ($sym == CFClient::SDLK_HOME) { 2159 } elsif ($sym == CFPlus::SDLK_HOME) {
2160 # what a hack
2161 $self->{cursor} =
2162 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2163 ? length $1
2164 : 0;
2165 } elsif ($sym == CFPlus::SDLK_END) {
2166 # uh, again
2167 $self->{cursor} =
2168 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2169 ? $self->{cursor} + length $1
2170 : length $self->{text};
2171 } elsif ($uni == 21) { # ctrl-u
2172 $text = "";
1746 $self->{cursor} = 0; 2173 $self->{cursor} = 0;
1747 } elsif ($sym == CFClient::SDLK_END) {
1748 $self->{cursor} = length $text;
1749 } elsif ($uni == 27) { 2174 } elsif ($uni == 27) {
1750 $self->_emit ('escape'); 2175 $self->emit ('escape');
1751 } elsif ($uni) { 2176 } elsif ($uni == 0x0d) {
2177 substr $text, $self->{cursor}++, 0, "\012";
2178 } elsif ($uni >= 0x20) {
1752 substr $text, $self->{cursor}++, 0, chr $uni; 2179 substr $text, $self->{cursor}++, 0, chr $uni;
1753 } else { 2180 } else {
1754 return 0; 2181 return 0;
1755 } 2182 }
1756 2183
1757 $self->_set_text ($text); 2184 $self->_set_text ($text);
1758 2185
1759 $self->realloc; 2186 $self->realloc;
2187 $self->update;
1760 2188
1761 1 2189 1
1762} 2190}
1763 2191
1764sub focus_in { 2192sub invoke_focus_in {
1765 my ($self) = @_; 2193 my ($self) = @_;
1766 2194
1767 $self->{last_activity} = $::NOW; 2195 $self->{last_activity} = $::NOW;
1768 2196
1769 $self->SUPER::focus_in; 2197 $self->SUPER::invoke_focus_in
1770} 2198}
1771 2199
1772sub button_down { 2200sub invoke_button_down {
1773 my ($self, $ev, $x, $y) = @_; 2201 my ($self, $ev, $x, $y) = @_;
1774 2202
1775 $self->SUPER::button_down ($ev, $x, $y); 2203 $self->SUPER::invoke_button_down ($ev, $x, $y);
1776 2204
1777 my $idx = $self->{layout}->xy_to_index ($x, $y); 2205 my $idx = $self->{layout}->xy_to_index ($x, $y);
1778 2206
1779 # byte-index to char-index 2207 # byte-index to char-index
1780 my $text = $self->{text}; 2208 my $text = $self->{text};
1781 utf8::encode $text; 2209 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1782 $self->{cursor} = length substr $text, 0, $idx; 2210 $self->{cursor} = length $text;
1783 2211
1784 $self->_set_text ($self->{text}); 2212 $self->_set_text ($self->{text});
1785 $self->update; 2213 $self->update;
1786 2214
1787 1 2215 1
1788} 2216}
1789 2217
1790sub mouse_motion { 2218sub invoke_mouse_motion {
1791 my ($self, $ev, $x, $y) = @_; 2219 my ($self, $ev, $x, $y) = @_;
1792# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2220# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1793 2221
1794 0 2222 1
1795} 2223}
1796 2224
1797sub _draw { 2225sub _draw {
1798 my ($self) = @_; 2226 my ($self) = @_;
1799 2227
… …
1826 utf8::encode $text; 2254 utf8::encode $text;
1827 2255
1828 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2256 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1829 } 2257 }
1830 2258
1831 glColor @{$self->{fg}};
1832 glBegin GL_LINES; 2259 glBegin GL_LINES;
1833 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2260 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1834 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2261 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1835 glEnd; 2262 glEnd;
1836 } 2263 }
1837} 2264}
1838 2265
2266#############################################################################
2267
1839package CFClient::UI::Entry; 2268package CFPlus::UI::Entry;
1840 2269
1841our @ISA = CFClient::UI::EntryBase::; 2270our @ISA = CFPlus::UI::EntryBase::;
1842 2271
1843use CFClient::OpenGL; 2272use CFPlus::OpenGL;
1844 2273
1845sub key_down { 2274sub invoke_key_down {
1846 my ($self, $ev) = @_; 2275 my ($self, $ev) = @_;
1847 2276
1848 my $sym = $ev->{sym}; 2277 my $sym = $ev->{sym};
1849 2278
1850 if ($sym == 13) { 2279 if ($ev->{uni} == 0x0d || $sym == 13) {
1851 unshift @{$self->{history}}, 2280 unshift @{$self->{history}},
1852 my $txt = $self->get_text; 2281 my $txt = $self->get_text;
2282
1853 $self->{history_pointer} = -1; 2283 $self->{history_pointer} = -1;
1854 $self->{history_saveback} = ''; 2284 $self->{history_saveback} = '';
1855 $self->_emit (activate => $txt); 2285 $self->emit (activate => $txt);
1856 $self->update; 2286 $self->update;
1857 2287
1858 } elsif ($sym == CFClient::SDLK_UP) { 2288 } elsif ($sym == CFPlus::SDLK_UP) {
1859 if ($self->{history_pointer} < 0) { 2289 if ($self->{history_pointer} < 0) {
1860 $self->{history_saveback} = $self->get_text; 2290 $self->{history_saveback} = $self->get_text;
1861 } 2291 }
1862 if (@{$self->{history} || []} > 0) { 2292 if (@{$self->{history} || []} > 0) {
1863 $self->{history_pointer}++; 2293 $self->{history_pointer}++;
… …
1865 $self->{history_pointer} = @{$self->{history} || []} - 1; 2295 $self->{history_pointer} = @{$self->{history} || []} - 1;
1866 } 2296 }
1867 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2297 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1868 } 2298 }
1869 2299
1870 } elsif ($sym == CFClient::SDLK_DOWN) { 2300 } elsif ($sym == CFPlus::SDLK_DOWN) {
1871 $self->{history_pointer}--; 2301 $self->{history_pointer}--;
1872 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2302 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1873 2303
1874 if ($self->{history_pointer} >= 0) { 2304 if ($self->{history_pointer} >= 0) {
1875 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2305 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1876 } else { 2306 } else {
1877 $self->set_text ($self->{history_saveback}); 2307 $self->set_text ($self->{history_saveback});
1878 } 2308 }
1879 2309
1880 } else { 2310 } else {
1881 return $self->SUPER::key_down ($ev) 2311 return $self->SUPER::invoke_key_down ($ev)
1882 } 2312 }
1883 2313
1884 1 2314 1
1885} 2315}
1886 2316
1887############################################################################# 2317#############################################################################
1888 2318
2319package CFPlus::UI::TextEdit;
2320
2321our @ISA = CFPlus::UI::EntryBase::;
2322
2323use CFPlus::OpenGL;
2324
2325sub move_cursor_ver {
2326 my ($self, $dy) = @_;
2327
2328 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2329
2330 $y += $dy;
2331
2332 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2333 $self->{cursor} = $index;
2334 delete $self->{cur_h};
2335 $self->update;
2336 return;
2337 }
2338}
2339
2340sub invoke_key_down {
2341 my ($self, $ev) = @_;
2342
2343 my $sym = $ev->{sym};
2344
2345 if ($sym == CFPlus::SDLK_UP) {
2346 $self->move_cursor_ver (-1);
2347 } elsif ($sym == CFPlus::SDLK_DOWN) {
2348 $self->move_cursor_ver (+1);
2349 } else {
2350 return $self->SUPER::invoke_key_down ($ev)
2351 }
2352
2353 1
2354}
2355
2356#############################################################################
2357
1889package CFClient::UI::Button; 2358package CFPlus::UI::Button;
1890 2359
1891our @ISA = CFClient::UI::Label::; 2360our @ISA = CFPlus::UI::Label::;
1892 2361
1893use CFClient::OpenGL; 2362use CFPlus::OpenGL;
1894 2363
1895my @tex = 2364my @tex =
1896 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2365 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1897 qw(b1_button_active.png); 2366 qw(b1_button_inactive.png b1_button_active.png);
1898 2367
1899sub new { 2368sub new {
1900 my $class = shift; 2369 my $class = shift;
1901 2370
1902 $class->SUPER::new ( 2371 $class->SUPER::new (
1903 padding_x => 4, 2372 padding_x => 4,
1904 padding_y => 4, 2373 padding_y => 4,
1905 fg => [1, 1, 1], 2374 fg => [1.0, 1.0, 1.0],
1906 active_fg => [0, 0, 1], 2375 active_fg => [0.8, 0.8, 0.8],
1907 can_hover => 1, 2376 can_hover => 1,
1908 align => 0, 2377 align => 0,
1909 valign => 0, 2378 valign => 0,
1910 can_events => 1, 2379 can_events => 1,
1911 @_ 2380 @_
1912 ) 2381 )
1913} 2382}
1914 2383
1915sub activate { }
1916
1917sub button_up { 2384sub invoke_button_up {
1918 my ($self, $ev, $x, $y) = @_; 2385 my ($self, $ev, $x, $y) = @_;
1919 2386
1920 $self->emit ("activate") 2387 $self->emit ("activate")
1921 if $x >= 0 && $x < $self->{w} 2388 if $x >= 0 && $x < $self->{w}
1922 && $y >= 0 && $y < $self->{h}; 2389 && $y >= 0 && $y < $self->{h};
… …
1931 2398
1932 glEnable GL_TEXTURE_2D; 2399 glEnable GL_TEXTURE_2D;
1933 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1934 glColor 0, 0, 0, 1; 2401 glColor 0, 0, 0, 1;
1935 2402
2403 my $tex = $tex[$GRAB == $self];
1936 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2404 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1937 2405
1938 glDisable GL_TEXTURE_2D; 2406 glDisable GL_TEXTURE_2D;
1939 2407
1940 $self->SUPER::_draw; 2408 $self->SUPER::_draw;
1941} 2409}
1942 2410
1943############################################################################# 2411#############################################################################
1944 2412
1945package CFClient::UI::CheckBox; 2413package CFPlus::UI::CheckBox;
1946 2414
1947our @ISA = CFClient::UI::DrawBG::; 2415our @ISA = CFPlus::UI::DrawBG::;
1948 2416
1949my @tex = 2417my @tex =
1950 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2418 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1951 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2419 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1952 2420
1953use CFClient::OpenGL; 2421use CFPlus::OpenGL;
1954 2422
1955sub new { 2423sub new {
1956 my $class = shift; 2424 my $class = shift;
1957 2425
1958 $class->SUPER::new ( 2426 $class->SUPER::new (
… …
1972 my ($self) = @_; 2440 my ($self) = @_;
1973 2441
1974 (6) x 2 2442 (6) x 2
1975} 2443}
1976 2444
2445sub toggle {
2446 my ($self) = @_;
2447
2448 $self->{state} = !$self->{state};
2449 $self->emit (changed => $self->{state});
2450 $self->update;
2451}
2452
1977sub button_down { 2453sub invoke_button_down {
1978 my ($self, $ev, $x, $y) = @_; 2454 my ($self, $ev, $x, $y) = @_;
1979 2455
1980 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2456 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1981 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2457 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1982 $self->{state} = !$self->{state}; 2458 $self->toggle;
1983 $self->_emit (changed => $self->{state});
1984 } else { 2459 } else {
1985 return 0 2460 return 0
1986 } 2461 }
1987 2462
1988 1 2463 1
… …
2008 glDisable GL_TEXTURE_2D; 2483 glDisable GL_TEXTURE_2D;
2009} 2484}
2010 2485
2011############################################################################# 2486#############################################################################
2012 2487
2013package CFClient::UI::Image; 2488package CFPlus::UI::Image;
2014 2489
2015our @ISA = CFClient::UI::Base::; 2490our @ISA = CFPlus::UI::Base::;
2016 2491
2017use CFClient::OpenGL; 2492use CFPlus::OpenGL;
2018use Carp qw/confess/;
2019 2493
2020our %loaded_images; 2494our %texture_cache;
2021 2495
2022sub new { 2496sub new {
2023 my $class = shift; 2497 my $class = shift;
2024 2498
2025 my $self = $class->SUPER::new (can_events => 0, @_); 2499 my $self = $class->SUPER::new (
2500 can_events => 0,
2501 @_,
2502 );
2026 2503
2027 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2504 $self->{path} || $self->{tex}
2505 or Carp::croak "'path' or 'tex' attributes required";
2028 2506
2029 $loaded_images{$self->{image}} ||= 2507 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2030 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2508 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2031 2509
2032 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2510 CFPlus::weaken $texture_cache{$self->{path}};
2033 2511
2034 Scalar::Util::weaken $loaded_images{$self->{image}}; 2512 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2035
2036 $self->{aspect} = $tex->{w} / $tex->{h};
2037 2513
2038 $self 2514 $self
2039} 2515}
2040 2516
2517sub STORABLE_freeze {
2518 my ($self, $cloning) = @_;
2519
2520 $self->{path}
2521 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2522
2523 $self->{path}
2524}
2525
2526sub STORABLE_attach {
2527 my ($self, $cloning, $path) = @_;
2528
2529 $self->new (path => $path)
2530}
2531
2041sub size_request { 2532sub size_request {
2042 my ($self) = @_; 2533 my ($self) = @_;
2043 2534
2044 ($self->{tex}->{w}, $self->{tex}->{h}) 2535 ($self->{tex}{w}, $self->{tex}{h})
2045} 2536}
2046 2537
2047sub _draw { 2538sub _draw {
2048 my ($self) = @_; 2539 my ($self) = @_;
2049 2540
… …
2059 } 2550 }
2060 2551
2061 glEnable GL_TEXTURE_2D; 2552 glEnable GL_TEXTURE_2D;
2062 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2063 2554
2064 $tex->draw_quad_alpha (0, 0, $w, $h); 2555 $tex->draw_quad (0, 0, $w, $h);
2065 2556
2066 glDisable GL_TEXTURE_2D; 2557 glDisable GL_TEXTURE_2D;
2067} 2558}
2068 2559
2069############################################################################# 2560#############################################################################
2070 2561
2562package CFPlus::UI::ImageButton;
2563
2564our @ISA = CFPlus::UI::Image::;
2565
2566use CFPlus::OpenGL;
2567
2568my %textures;
2569
2570sub new {
2571 my $class = shift;
2572
2573 my $self = $class->SUPER::new (
2574 padding_x => 4,
2575 padding_y => 4,
2576 fg => [1, 1, 1],
2577 active_fg => [0, 0, 1],
2578 can_hover => 1,
2579 align => 0,
2580 valign => 0,
2581 can_events => 1,
2582 @_
2583 );
2584}
2585
2586sub invoke_button_up {
2587 my ($self, $ev, $x, $y) = @_;
2588
2589 $self->emit ("activate")
2590 if $x >= 0 && $x < $self->{w}
2591 && $y >= 0 && $y < $self->{h};
2592
2593 1
2594}
2595
2596#############################################################################
2597
2071package CFClient::UI::VGauge; 2598package CFPlus::UI::VGauge;
2072 2599
2073our @ISA = CFClient::UI::Base::; 2600our @ISA = CFPlus::UI::Base::;
2074 2601
2075use List::Util qw(min max); 2602use List::Util qw(min max);
2076 2603
2077use CFClient::OpenGL; 2604use CFPlus::OpenGL;
2078 2605
2079my %tex = ( 2606my %tex = (
2080 food => [ 2607 food => [
2081 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2608 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2082 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2609 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2083 ], 2610 ],
2084 grace => [ 2611 grace => [
2085 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2612 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2086 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2613 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2087 ], 2614 ],
2088 hp => [ 2615 hp => [
2089 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2616 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2090 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2617 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2091 ], 2618 ],
2092 mana => [ 2619 mana => [
2093 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2620 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2094 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2621 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2095 ], 2622 ],
2096); 2623);
2097 2624
2098# eg. VGauge->new (gauge => 'food'), default gauge: food 2625# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2158 my $ycut1 = max 0, min 1, $ycut; 2685 my $ycut1 = max 0, min 1, $ycut;
2159 my $ycut2 = max 0, min 1, $ycut - 1; 2686 my $ycut2 = max 0, min 1, $ycut - 1;
2160 2687
2161 my $h1 = $self->{h} * (1 - $ycut1); 2688 my $h1 = $self->{h} * (1 - $ycut1);
2162 my $h2 = $self->{h} * (1 - $ycut2); 2689 my $h2 = $self->{h} * (1 - $ycut2);
2690 my $h3 = $self->{h};
2691
2692 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2163 2693
2164 glEnable GL_BLEND; 2694 glEnable GL_BLEND;
2165 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2695 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2166 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2696 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2167 glEnable GL_TEXTURE_2D; 2697 glEnable GL_TEXTURE_2D;
… …
2186 2716
2187 if ($t3) { 2717 if ($t3) {
2188 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2718 glBindTexture GL_TEXTURE_2D, $t3->{name};
2189 glBegin GL_QUADS; 2719 glBegin GL_QUADS;
2190 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2720 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2191 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2721 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2192 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2722 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2193 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2723 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2194 glEnd; 2724 glEnd;
2195 } 2725 }
2196 2726
2197 glDisable GL_BLEND; 2727 glDisable GL_BLEND;
2198 glDisable GL_TEXTURE_2D; 2728 glDisable GL_TEXTURE_2D;
2199} 2729}
2200 2730
2201############################################################################# 2731#############################################################################
2202 2732
2203package CFClient::UI::Gauge; 2733package CFPlus::UI::Gauge;
2204 2734
2205our @ISA = CFClient::UI::VBox::; 2735our @ISA = CFPlus::UI::VBox::;
2206 2736
2207sub new { 2737sub new {
2208 my ($class, %arg) = @_; 2738 my ($class, %arg) = @_;
2209 2739
2210 my $self = $class->SUPER::new ( 2740 my $self = $class->SUPER::new (
… …
2212 can_hover => 1, 2742 can_hover => 1,
2213 can_events => 1, 2743 can_events => 1,
2214 %arg, 2744 %arg,
2215 ); 2745 );
2216 2746
2217 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2747 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2218 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2748 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2219 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2749 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2220 2750
2221 $self 2751 $self
2222} 2752}
2223 2753
2224sub set_fontsize { 2754sub set_fontsize {
… …
2245 $self->{value}->set_text ($val); 2775 $self->{value}->set_text ($val);
2246} 2776}
2247 2777
2248############################################################################# 2778#############################################################################
2249 2779
2250package CFClient::UI::Slider; 2780package CFPlus::UI::Slider;
2251 2781
2252use strict; 2782use strict;
2253 2783
2254use CFClient::OpenGL; 2784use CFPlus::OpenGL;
2255 2785
2256our @ISA = CFClient::UI::DrawBG::; 2786our @ISA = CFPlus::UI::DrawBG::;
2257 2787
2258my @tex = 2788my @tex =
2259 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2789 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2260 qw(s1_slider.png s1_slider_bg.png); 2790 qw(s1_slider.png s1_slider_bg.png);
2261 2791
2262sub new { 2792sub new {
2263 my $class = shift; 2793 my $class = shift;
2264 2794
… …
2285 $self->update; 2815 $self->update;
2286 2816
2287 $self 2817 $self
2288} 2818}
2289 2819
2290sub changed { }
2291
2292sub set_range { 2820sub set_range {
2293 my ($self, $range) = @_; 2821 my ($self, $range) = @_;
2294 2822
2295 ($range, $self->{range}) = ($self->{range}, $range); 2823 ($range, $self->{range}) = ($self->{range}, $range);
2296 2824
2297 $self->update
2298 if "@$range" ne "@{$self->{range}}"; 2825 if ("@$range" ne "@{$self->{range}}") {
2826 $self->update;
2827 $self->set_value ($self->{range}[0]);
2828 }
2299} 2829}
2300 2830
2301sub set_value { 2831sub set_value {
2302 my ($self, $value) = @_; 2832 my ($self, $value) = @_;
2303 2833
… …
2314 if $unit; 2844 if $unit;
2315 2845
2316 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2846 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2317 2847
2318 if ($value != $old_value) { 2848 if ($value != $old_value) {
2319 $self->_emit (changed => $value); 2849 $self->emit (changed => $value);
2320 $self->update; 2850 $self->update;
2321 } 2851 }
2322} 2852}
2323 2853
2324sub size_request { 2854sub size_request {
2325 my ($self) = @_; 2855 my ($self) = @_;
2326 2856
2327 ($self->{req_w}, $self->{req_h}) 2857 ($self->{req_w}, $self->{req_h})
2328} 2858}
2329 2859
2330sub button_down { 2860sub invoke_button_down {
2331 my ($self, $ev, $x, $y) = @_; 2861 my ($self, $ev, $x, $y) = @_;
2332 2862
2333 $self->SUPER::button_down ($ev, $x, $y); 2863 $self->SUPER::invoke_button_down ($ev, $x, $y);
2334 2864
2335 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2865 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2336 2866
2337 $self->mouse_motion ($ev, $x, $y) 2867 $self->invoke_mouse_motion ($ev, $x, $y)
2338} 2868}
2339 2869
2340sub mouse_motion { 2870sub invoke_mouse_motion {
2341 my ($self, $ev, $x, $y) = @_; 2871 my ($self, $ev, $x, $y) = @_;
2342 2872
2343 if ($GRAB == $self) { 2873 if ($GRAB == $self) {
2344 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2874 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2345 2875
… …
2351 } else { 2881 } else {
2352 return 0; 2882 return 0;
2353 } 2883 }
2354 2884
2355 1 2885 1
2886}
2887
2888sub invoke_mouse_wheel {
2889 my ($self, $ev) = @_;
2890
2891 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2892
2893 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2894
2895 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2896
2897 ! ! $delta
2356} 2898}
2357 2899
2358sub update { 2900sub update {
2359 my ($self) = @_; 2901 my ($self) = @_;
2360 2902
… …
2409 glDisable GL_TEXTURE_2D; 2951 glDisable GL_TEXTURE_2D;
2410} 2952}
2411 2953
2412############################################################################# 2954#############################################################################
2413 2955
2414package CFClient::UI::ValSlider; 2956package CFPlus::UI::ValSlider;
2415 2957
2416our @ISA = CFClient::UI::HBox::; 2958our @ISA = CFPlus::UI::HBox::;
2417 2959
2418sub new { 2960sub new {
2419 my ($class, %arg) = @_; 2961 my ($class, %arg) = @_;
2420 2962
2421 my $range = delete $arg{range}; 2963 my $range = delete $arg{range};
2422 2964
2423 my $self = $class->SUPER::new ( 2965 my $self = $class->SUPER::new (
2424 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2966 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2425 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2967 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2426 to_value => sub { shift }, 2968 to_value => sub { shift },
2427 from_value => sub { shift }, 2969 from_value => sub { shift },
2428 %arg, 2970 %arg,
2429 ); 2971 );
2430 2972
… …
2450sub set_range { shift->{slider}->set_range (@_) } 2992sub set_range { shift->{slider}->set_range (@_) }
2451sub set_value { shift->{slider}->set_value (@_) } 2993sub set_value { shift->{slider}->set_value (@_) }
2452 2994
2453############################################################################# 2995#############################################################################
2454 2996
2455package CFClient::UI::TextView; 2997package CFPlus::UI::TextScroller;
2456 2998
2457our @ISA = CFClient::UI::HBox::; 2999our @ISA = CFPlus::UI::HBox::;
2458 3000
2459use CFClient::OpenGL; 3001use CFPlus::OpenGL;
2460 3002
2461sub new { 3003sub new {
2462 my $class = shift; 3004 my $class = shift;
2463 3005
2464 my $self = $class->SUPER::new ( 3006 my $self = $class->SUPER::new (
2465 fontsize => 1, 3007 fontsize => 1,
2466 can_events => 0, 3008 can_events => 1,
3009 indent => 0,
2467 #font => default_font 3010 #font => default_font
2468 @_, 3011 @_,
2469 3012
2470 layout => (new CFClient::Layout 1), 3013 layout => (new CFPlus::Layout),
2471 par => [], 3014 par => [],
3015 max_par => 0,
2472 height => 0, 3016 height => 0,
2473 children => [ 3017 children => [
2474 (new CFClient::UI::Empty expand => 1), 3018 (new CFPlus::UI::Empty expand => 1),
2475 (new CFClient::UI::Slider vertical => 1), 3019 (new CFPlus::UI::Slider vertical => 1),
2476 ], 3020 ],
2477 ); 3021 );
2478 3022
2479 $self->{children}[1]->connect (changed => sub { $self->update }); 3023 $self->{children}[1]->connect (changed => sub { $self->update });
2480 3024
… …
2486 3030
2487 $self->{fontsize} = $fontsize; 3031 $self->{fontsize} = $fontsize;
2488 $self->reflow; 3032 $self->reflow;
2489} 3033}
2490 3034
3035sub size_request {
3036 my ($self) = @_;
3037
3038 my ($empty, $slider) = @{ $self->{children} };
3039
3040 local $self->{children} = [$empty, $slider];
3041 $self->SUPER::size_request
3042}
3043
2491sub size_allocate { 3044sub invoke_size_allocate {
2492 my ($self, $w, $h) = @_; 3045 my ($self, $w, $h) = @_;
2493 3046
2494 $self->SUPER::size_allocate ($w, $h); 3047 my ($empty, $slider, @other) = @{ $self->{children} };
3048 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2495 3049
2496 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3050 $self->{layout}->set_font ($self->{font}) if $self->{font};
2497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3051 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2498 $self->{layout}->set_width ($self->{children}[0]{w}); 3052 $self->{layout}->set_width ($empty->{w});
3053 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2499 3054
2500 $self->reflow; 3055 $self->reflow;
2501}
2502 3056
2503sub text_size { 3057 local $self->{children} = [$empty, $slider];
3058 $self->SUPER::invoke_size_allocate ($w, $h)
3059}
3060
3061sub invoke_mouse_wheel {
2504 my ($self, $text, $indent) = @_; 3062 my ($self, $ev) = @_;
3063
3064 return 0 unless $ev->{dy}; # only vertical movements
3065
3066 $self->{children}[1]->emit (mouse_wheel => $ev);
3067
3068 1
3069}
3070
3071sub get_layout {
3072 my ($self, $para) = @_;
2505 3073
2506 my $layout = $self->{layout}; 3074 my $layout = $self->{layout};
2507 3075
3076 $layout->set_font ($self->{font}) if $self->{font};
3077 $layout->set_foreground (@{$para->{fg}});
2508 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3078 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2509 $layout->set_width ($self->{children}[0]{w} - $indent); 3079 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3080 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2510 $layout->set_markup ($text); 3081 $layout->set_markup ($para->{markup});
3082
3083 $layout->set_shapes (
3084 map
3085 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3086 @{$para->{widget}}
2511 3087 );
3088
2512 $layout->size 3089 $layout
2513} 3090}
2514 3091
2515sub reflow { 3092sub reflow {
2516 my ($self) = @_; 3093 my ($self) = @_;
2517 3094
… …
2524 3101
2525 # todo: base offset on lines or so, not on pixels 3102 # todo: base offset on lines or so, not on pixels
2526 $self->{children}[1]->set_value ($offset); 3103 $self->{children}[1]->set_value ($offset);
2527} 3104}
2528 3105
3106sub current_paragraph {
3107 my ($self) = @_;
3108
3109 $self->{top_paragraph} - 1
3110}
3111
3112sub scroll_to {
3113 my ($self, $para) = @_;
3114
3115 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3116
3117 $self->{scroll_to} = $para;
3118 $self->update;
3119}
3120
2529sub clear { 3121sub clear {
2530 my ($self) = @_; 3122 my ($self) = @_;
3123
3124 my (undef, undef, @other) = @{ $self->{children} };
3125 $self->remove ($_) for @other;
2531 3126
2532 $self->{par} = []; 3127 $self->{par} = [];
2533 $self->{height} = 0; 3128 $self->{height} = 0;
2534 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3129 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2535} 3130}
2536 3131
2537sub add_paragraph { 3132sub add_paragraph {
2538 my ($self, $color, $text, $indent) = @_; 3133 my $self = shift;
2539 3134
2540 for my $line (split /\n/, $text) { 3135 for my $para (@_) {
2541 my ($w, $h) = $self->text_size ($line); 3136 $para = {
3137 fg => [1, 1, 1, 1],
3138 indent => 0,
3139 markup => "",
3140 widget => [],
3141 ref $para ? %$para : (markup => $para),
3142 w => 1e10,
3143 wrapped => 1,
3144 };
3145
3146 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3147 push @{$self->{par}}, $para;
3148 }
3149
3150 if (my $max = $self->{max_par}) {
3151 shift @{$self->{par}} while @{$self->{par}} > $max;
3152 }
3153
3154 $self->{need_reflow}++;
3155 $self->update;
3156}
3157
3158sub scroll_to_bottom {
3159 my ($self) = @_;
3160
3161 $self->{scroll_to} = $#{$self->{par}};
3162 $self->update;
3163}
3164
3165sub force_uptodate {
3166 my ($self) = @_;
3167
3168 if (delete $self->{need_reflow}) {
3169 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3170
3171 my $height = 0;
3172
3173 for my $para (@{$self->{par}}) {
3174 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3175 my $layout = $self->get_layout ($para);
3176 my ($w, $h) = $layout->size;
3177
3178 $para->{w} = $w + $para->{indent};
3179 $para->{h} = $h;
3180 $para->{wrapped} = $layout->has_wrapped;
3181 }
3182
3183 $para->{y} = $height;
3184 $height += $para->{h};
3185 }
3186
2542 $self->{height} += $h; 3187 $self->{height} = $height;
2543 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3188 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2544 }
2545 3189
2546 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3190 delete $self->{texture};
3191 }
3192
3193 if (my $paridx = delete $self->{scroll_to}) {
3194 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3195 }
2547} 3196}
2548 3197
2549sub update { 3198sub update {
2550 my ($self) = @_; 3199 my ($self) = @_;
2551 3200
… …
2553 3202
2554 return unless $self->{h} > 0; 3203 return unless $self->{h} > 0;
2555 3204
2556 delete $self->{texture}; 3205 delete $self->{texture};
2557 3206
2558 $ROOT->on_post_alloc ($self, sub { 3207 $ROOT->on_post_alloc ($self => sub {
3208 $self->force_uptodate;
3209
2559 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3210 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2560 3211
2561 if (delete $self->{need_reflow}) {
2562 my $height = 0;
2563
2564 my $layout = $self->{layout};
2565
2566 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2567
2568 for (@{$self->{par}}) {
2569 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2570 $layout->set_width ($W - $_->[3]);
2571 $layout->set_markup ($_->[4]);
2572 my ($w, $h) = $layout->size;
2573 $_->[0] = $w + $_->[3];
2574 $_->[1] = $h;
2575 }
2576
2577 $height += $_->[1];
2578 }
2579
2580 $self->{height} = $height;
2581
2582 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2583
2584 delete $self->{texture};
2585 }
2586
2587 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3212 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2588 glClearColor 0, 0, 0, 0; 3213 glClearColor 0, 0, 0, 0;
2589 glClear GL_COLOR_BUFFER_BIT; 3214 glClear GL_COLOR_BUFFER_BIT;
2590 3215
3216 package CFPlus::UI::Base;
3217 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3218 (0, 0, $self->{w}, $self->{h});
3219
3220 my $top = int $self->{children}[1]{range}[0];
3221
3222 my $paridx = 0;
3223 my $top_paragraph;
2591 my $top = int $self->{children}[1]{range}[0]; 3224 my $top = int $self->{children}[1]{range}[0];
2592 3225
2593 my $y0 = $top; 3226 my $y0 = $top;
2594 my $y1 = $top + $H; 3227 my $y1 = $top + $H;
2595 3228
2596 my $y = 0;
2597
2598 my $layout = $self->{layout};
2599
2600 $layout->set_font ($self->{font}) if $self->{font};
2601
2602 glEnable GL_BLEND;
2603 #TODO# not correct in windows where rgba is forced off
2604 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2605
2606 for my $par (@{$self->{par}}) { 3229 for my $para (@{$self->{par}}) {
2607 my $h = $par->[1]; 3230 my $h = $para->{h};
3231 my $y = $para->{y};
2608 3232
2609 if ($y0 < $y + $h && $y < $y1) { 3233 if ($y0 < $y + $h && $y < $y1) {
2610 $layout->set_foreground (@{ $par->[2] }); 3234 my $layout = $self->get_layout ($para);
2611 $layout->set_width ($W - $par->[3]);
2612 $layout->set_markup ($par->[4]);
2613 3235
2614 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3236 $layout->render ($para->{indent}, $y - $y0);
2615 3237
2616 glRasterPos $par->[3], $y - $y0; 3238 if (my @w = @{ $para->{widget} }) {
2617 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3239 my @s = $layout->get_shapes;
3240
3241 for (@w) {
3242 my ($dx, $dy) = splice @s, 0, 2, ();
3243
3244 $_->{x} = $dx + $para->{indent};
3245 $_->{y} = $dy + $y - $y0;
3246
3247 $_->draw;
3248 }
3249 }
2618 } 3250 }
2619 3251
2620 $y += $h; 3252 $paridx++;
3253 $top_paragraph ||= $paridx if $y >= $top;
2621 } 3254 }
2622 3255
2623 glDisable GL_BLEND; 3256 $self->{top_paragraph} = $top_paragraph;
2624 }; 3257 };
2625 }); 3258 });
3259}
3260
3261sub reconfigure {
3262 my ($self) = @_;
3263
3264 $self->SUPER::reconfigure;
3265
3266 $_->{w} = 1e10 for @{ $self->{par} };
3267 $self->reflow;
2626} 3268}
2627 3269
2628sub _draw { 3270sub _draw {
2629 my ($self) = @_; 3271 my ($self) = @_;
2630 3272
… …
2633 glColor 0, 0, 0, 1; 3275 glColor 0, 0, 0, 1;
2634 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3276 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2635 glDisable GL_TEXTURE_2D; 3277 glDisable GL_TEXTURE_2D;
2636 3278
2637 $self->{children}[1]->draw; 3279 $self->{children}[1]->draw;
2638
2639} 3280}
2640 3281
2641############################################################################# 3282#############################################################################
2642 3283
2643package CFClient::UI::Animator; 3284package CFPlus::UI::Animator;
2644 3285
2645use CFClient::OpenGL; 3286use CFPlus::OpenGL;
2646 3287
2647our @ISA = CFClient::UI::Bin::; 3288our @ISA = CFPlus::UI::Bin::;
2648 3289
2649sub moveto { 3290sub moveto {
2650 my ($self, $x, $y) = @_; 3291 my ($self, $x, $y) = @_;
2651 3292
2652 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3293 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2680 glPopMatrix; 3321 glPopMatrix;
2681} 3322}
2682 3323
2683############################################################################# 3324#############################################################################
2684 3325
2685package CFClient::UI::Flopper; 3326package CFPlus::UI::Flopper;
2686 3327
2687our @ISA = CFClient::UI::Button::; 3328our @ISA = CFPlus::UI::Button::;
2688 3329
2689sub new { 3330sub new {
2690 my $class = shift; 3331 my $class = shift;
2691 3332
2692 my $self = $class->SUPER::new ( 3333 my $self = $class->SUPER::new (
… …
2704 $self->{other}->toggle_visibility; 3345 $self->{other}->toggle_visibility;
2705} 3346}
2706 3347
2707############################################################################# 3348#############################################################################
2708 3349
2709package CFClient::UI::Tooltip; 3350package CFPlus::UI::Tooltip;
2710 3351
2711our @ISA = CFClient::UI::Bin::; 3352our @ISA = CFPlus::UI::Bin::;
2712 3353
2713use CFClient::OpenGL; 3354use CFPlus::OpenGL;
2714 3355
2715sub new { 3356sub new {
2716 my $class = shift; 3357 my $class = shift;
2717 3358
2718 $class->SUPER::new ( 3359 $class->SUPER::new (
… …
2721 ) 3362 )
2722} 3363}
2723 3364
2724sub set_tooltip_from { 3365sub set_tooltip_from {
2725 my ($self, $widget) = @_; 3366 my ($self, $widget) = @_;
3367
3368 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3369 if $widget->{tooltip} =~ /^#(.*)$/;
2726 3370
2727 my $tooltip = $widget->{tooltip}; 3371 my $tooltip = $widget->{tooltip};
2728 3372
2729 if ($ENV{CFPLUS_DEBUG} & 2) { 3373 if ($ENV{CFPLUS_DEBUG} & 2) {
2730 $tooltip .= "\n\n" . (ref $widget) . "\n" 3374 $tooltip .= "\n\n" . (ref $widget) . "\n"
2731 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3375 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2732 . "req $widget->{req_w} $widget->{req_h}\n" 3376 . "req $widget->{req_w} $widget->{req_h}\n"
2733 . "visible $widget->{visible}"; 3377 . "visible $widget->{visible}";
2734 } 3378 }
2735 3379
3380 $tooltip =~ s/^\n+//;
3381 $tooltip =~ s/\n+$//;
3382
2736 $self->add (new CFClient::UI::Label 3383 $self->add (new CFPlus::UI::Label
2737 markup => $tooltip, 3384 markup => $tooltip,
2738 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3385 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2739 fontsize => 0.8, 3386 fontsize => 0.8,
2740 fg => [0, 0, 0, 1], 3387 style => 1, # FLAG_INVERSE
2741 ellipsise => 0, 3388 ellipsise => 0,
2742 font => ($widget->{tooltip_font} || $::FONT_PROP), 3389 font => ($widget->{tooltip_font} || $::FONT_PROP),
2743 ); 3390 );
2744} 3391}
2745 3392
… …
2749 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3396 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2750 3397
2751 ($w + 4, $h + 4) 3398 ($w + 4, $h + 4)
2752} 3399}
2753 3400
2754sub size_allocate { 3401sub invoke_size_allocate {
2755 my ($self, $w, $h) = @_; 3402 my ($self, $w, $h) = @_;
2756 3403
2757 $self->SUPER::size_allocate ($w - 4, $h - 4); 3404 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2758} 3405}
2759 3406
2760sub visibility_change { 3407sub invoke_visibility_change {
2761 my ($self, $visible) = @_; 3408 my ($self, $visible) = @_;
2762 3409
2763 return unless $visible; 3410 return unless $visible;
2764 3411
2765 $self->{root}->on_post_alloc ("move_$self" => sub { 3412 $self->{root}->on_post_alloc ("move_$self" => sub {
2766 my $widget = $self->{owner} 3413 my $widget = $self->{owner}
2767 or return; 3414 or return;
2768 3415
3416 if ($widget->{visible}) {
2769 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3417 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2770 3418
2771 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3419 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2772 if $x + $self->{w} > $::WIDTH; 3420 if $x + $self->{w} > $self->{root}{w};
2773 3421
2774 $self->move_abs ($x, $y); 3422 $self->move_abs ($x, $y);
3423 } else {
3424 $self->hide;
3425 }
2775 }); 3426 });
2776} 3427}
2777 3428
2778sub _draw { 3429sub _draw {
2779 my ($self) = @_; 3430 my ($self) = @_;
… …
2803 $self->SUPER::_draw; 3454 $self->SUPER::_draw;
2804} 3455}
2805 3456
2806############################################################################# 3457#############################################################################
2807 3458
2808package CFClient::UI::Face; 3459package CFPlus::UI::Face;
2809 3460
2810our @ISA = CFClient::UI::Base::; 3461our @ISA = CFPlus::UI::DrawBG::;
2811 3462
2812use CFClient::OpenGL; 3463use CFPlus::OpenGL;
2813 3464
2814sub new { 3465sub new {
2815 my $class = shift; 3466 my $class = shift;
2816 3467
2817 my $self = $class->SUPER::new ( 3468 my $self = $class->SUPER::new (
3469 size_w => 32,
3470 size_h => 8,
2818 aspect => 1, 3471 aspect => 1,
2819 can_events => 0, 3472 can_events => 0,
2820 @_, 3473 @_,
2821 ); 3474 );
2822 3475
2823 if ($self->{anim} && $self->{animspeed}) { 3476 if ($self->{anim} && $self->{animspeed}) {
2824 Scalar::Util::weaken (my $widget = $self); 3477 CFPlus::weaken (my $widget = $self);
2825 3478
3479 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3480 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2826 $self->{timer} = Event->timer ( 3481 $self->{timer} = Event->timer (
2827 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2828 hard => 1, 3482 parked => 1,
2829 interval => $self->{animspeed},
2830 cb => sub { 3483 cb => sub {
3484 return unless $::CONN && $widget;
3485
2831 ++$widget->{frame}; 3486 ++$widget->{frame};
3487 $widget->update_face;
2832 $widget->update; 3488 $widget->update;
3489
3490 $widget->update_timer;
2833 }, 3491 },
2834 ); 3492 );
3493
3494 $self->update_face;
3495 $self->update_timer;
2835 } 3496 }
2836 3497
2837 $self 3498 $self
2838} 3499}
2839 3500
3501sub update_timer {
3502 my ($self) = @_;
3503
3504 return unless $self->{timer};
3505
3506 if ($self->{visible}) {
3507 $self->{timer}->at (
3508 $self->{anim_start}
3509 + $self->{animspeed}
3510 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3511 );
3512 $self->{timer}->start;
3513 } else {
3514 $self->{timer}->stop;
3515 }
3516}
3517
3518sub update_face {
3519 my ($self) = @_;
3520
3521 return unless $::CONN;
3522
3523 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3524 if ($anim && @$anim) {
3525 delete $self->{wait_face};
3526 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3527 }
3528 }
3529}
3530
2840sub size_request { 3531sub size_request {
2841 (32, 8) 3532 my ($self) = @_;
3533
3534 if ($::CONN) {
3535 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3536 if (my $tex = $::CONN->{texture}[$faceid]) {
3537 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3538 } else {
3539 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3540 $self->realloc;
3541 });
3542 }
3543 }
3544 }
3545
3546 ($self->{size_w} || 8, $self->{size_h} || 8)
2842} 3547}
2843 3548
2844sub update { 3549sub update {
2845 my ($self) = @_; 3550 my ($self) = @_;
2846 3551
2847 return unless $self->{visible}; 3552 return unless $self->{visible};
2848 3553
2849 $self->SUPER::update; 3554 $self->SUPER::update;
2850} 3555}
2851 3556
3557sub invoke_visibility_change {
3558 my ($self) = @_;
3559
3560 $self->update_timer;
3561
3562 0
3563}
3564
2852sub _draw { 3565sub _draw {
2853 my ($self) = @_; 3566 my ($self) = @_;
2854 3567
2855 return unless $::CONN; 3568 return unless $::CONN;
2856 3569
2857 my $face; 3570 $self->SUPER::_draw;
2858 3571
2859 if ($self->{frame}) {
2860 my $anim = $::CONN->{anim}[$self->{anim}]; 3572 my $faceid = $::CONN->{faceid}[$self->{face}]
2861 3573 or return;
2862 $face = $anim->[ $self->{frame} % @$anim ]
2863 if $anim && @$anim;
2864 }
2865 3574
2866 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3575 my $tex = $::CONN->{texture}[$faceid];
2867 3576
2868 if ($tex) { 3577 if ($tex) {
2869 glEnable GL_TEXTURE_2D; 3578 glEnable GL_TEXTURE_2D;
2870 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3579 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2871 glColor 0, 0, 0, 1; 3580 glColor 0, 0, 0, 1;
2872 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3581 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2873 glDisable GL_TEXTURE_2D; 3582 glDisable GL_TEXTURE_2D;
2874 } 3583 }
2875} 3584}
2876 3585
2877sub DESTROY { 3586sub destroy {
2878 my ($self) = @_; 3587 my ($self) = @_;
2879 3588
2880 $self->{timer}->cancel 3589 (delete $self->{timer})->cancel
2881 if $self->{timer}; 3590 if $self->{timer};
2882 3591
2883 $self->SUPER::DESTROY; 3592 $self->SUPER::destroy;
2884} 3593}
2885 3594
2886############################################################################# 3595#############################################################################
2887 3596
2888package CFClient::UI::Buttonbar; 3597package CFPlus::UI::Buttonbar;
2889 3598
2890our @ISA = CFClient::UI::HBox::; 3599our @ISA = CFPlus::UI::HBox::;
2891 3600
2892# TODO: should actualyl wrap buttons and other goodies. 3601# TODO: should actually wrap buttons and other goodies.
2893 3602
2894############################################################################# 3603#############################################################################
2895 3604
2896package CFClient::UI::Menu; 3605package CFPlus::UI::Menu;
2897 3606
2898our @ISA = CFClient::UI::FancyFrame::; 3607our @ISA = CFPlus::UI::Toplevel::;
2899 3608
2900use CFClient::OpenGL; 3609use CFPlus::OpenGL;
2901 3610
2902sub new { 3611sub new {
2903 my $class = shift; 3612 my $class = shift;
2904 3613
2905 my $self = $class->SUPER::new ( 3614 my $self = $class->SUPER::new (
2906 items => [], 3615 items => [],
2907 z => 100, 3616 z => 100,
2908 @_, 3617 @_,
2909 ); 3618 );
2910 3619
2911 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3620 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2912 3621
2913 for my $item (@{ $self->{items} }) { 3622 for my $item (@{ $self->{items} }) {
2914 my ($widget, $cb) = @$item; 3623 my ($widget, $cb, $tooltip) = @$item;
2915 3624
2916 # handle various types of items, only text for now 3625 # handle various types of items, only text for now
2917 if (!ref $widget) { 3626 if (!ref $widget) {
3627 if ($widget =~ /\t/) {
3628 my ($left, $right) = split /\t/, $widget, 2;
3629
2918 $widget = new CFClient::UI::Label 3630 $widget = new CFPlus::UI::HBox
2919 can_hover => 1, 3631 can_hover => 1,
2920 can_events => 1, 3632 can_events => 1,
3633 tooltip => $tooltip,
3634 children => [
3635 (new CFPlus::UI::Label markup => $left, expand => 1),
3636 (new CFPlus::UI::Label markup => $right, align => +1),
3637 ],
3638 ;
3639
3640 } else {
3641 $widget = new CFPlus::UI::Label
3642 can_hover => 1,
3643 can_events => 1,
2921 text => $widget; 3644 markup => $widget,
3645 tooltip => $tooltip;
3646 }
2922 } 3647 }
2923 3648
2924 $self->{item}{$widget} = $item; 3649 $self->{item}{$widget} = $item;
2925 3650
2926 $self->{vbox}->add ($widget); 3651 $self->{vbox}->add ($widget);
… …
2931 3656
2932# popup given the event (must be a mouse button down event currently) 3657# popup given the event (must be a mouse button down event currently)
2933sub popup { 3658sub popup {
2934 my ($self, $ev) = @_; 3659 my ($self, $ev) = @_;
2935 3660
2936 $self->_emit ("popdown"); 3661 $self->emit ("popdown");
2937 3662
2938 # maybe save $GRAB? must be careful about events... 3663 # maybe save $GRAB? must be careful about events...
2939 $GRAB = $self; 3664 $GRAB = $self;
2940 $self->{button} = $ev->{button}; 3665 $self->{button} = $ev->{button};
2941 3666
2942 $self->show; 3667 $self->show;
2943 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3668 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2944} 3669}
2945 3670
2946sub mouse_motion { 3671sub invoke_mouse_motion {
2947 my ($self, $ev, $x, $y) = @_; 3672 my ($self, $ev, $x, $y) = @_;
2948 3673
2949 # TODO: should use vbox->find_widget or so 3674 # TODO: should use vbox->find_widget or so
2950 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3675 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2951 $self->{hover} = $self->{item}{$HOVER}; 3676 $self->{hover} = $self->{item}{$HOVER};
2952 3677
2953 0 3678 0
2954} 3679}
2955 3680
2956sub button_up { 3681sub invoke_button_up {
2957 my ($self, $ev, $x, $y) = @_; 3682 my ($self, $ev, $x, $y) = @_;
2958 3683
2959 if ($ev->{button} == $self->{button}) { 3684 if ($ev->{button} == $self->{button}) {
2960 undef $GRAB; 3685 undef $GRAB;
2961 $self->hide; 3686 $self->hide;
2962 3687
2963 $self->_emit ("popdown"); 3688 $self->emit ("popdown");
2964 $self->{hover}[1]->() if $self->{hover}; 3689 $self->{hover}[1]->() if $self->{hover};
2965 } else { 3690 } else {
2966 return 0 3691 return 0
2967 } 3692 }
2968 3693
2969 1 3694 1
2970} 3695}
2971 3696
2972############################################################################# 3697#############################################################################
2973 3698
2974package CFClient::UI::Multiplexer; 3699package CFPlus::UI::Multiplexer;
2975 3700
2976our @ISA = CFClient::UI::Container::; 3701our @ISA = CFPlus::UI::Container::;
2977 3702
2978sub new { 3703sub new {
2979 my $class = shift; 3704 my $class = shift;
2980 3705
2981 my $self = $class->SUPER::new ( 3706 my $self = $class->SUPER::new (
… …
2995 3720
2996 $self->{current} = $self->{children}[0] 3721 $self->{current} = $self->{children}[0]
2997 if @{ $self->{children} }; 3722 if @{ $self->{children} };
2998} 3723}
2999 3724
3725sub get_current_page {
3726 my ($self) = @_;
3727
3728 $self->{current}
3729}
3730
3000sub set_current_page { 3731sub set_current_page {
3001 my ($self, $page_or_widget) = @_; 3732 my ($self, $page_or_widget) = @_;
3002 3733
3003 my $widget = ref $page_or_widget 3734 my $widget = ref $page_or_widget
3004 ? $page_or_widget 3735 ? $page_or_widget
3005 : $self->{children}[$page_or_widget]; 3736 : $self->{children}[$page_or_widget];
3006 3737
3007 $self->{current} = $widget; 3738 $self->{current} = $widget;
3008 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3739 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3009 3740
3010 $self->_emit (page_changed => $self->{current}); 3741 $self->emit (page_changed => $self->{current});
3011 3742
3012 $self->realloc; 3743 $self->realloc;
3013} 3744}
3014 3745
3015sub visible_children { 3746sub visible_children {
… …
3020 my ($self) = @_; 3751 my ($self) = @_;
3021 3752
3022 $self->{current}->size_request 3753 $self->{current}->size_request
3023} 3754}
3024 3755
3025sub size_allocate { 3756sub invoke_size_allocate {
3026 my ($self, $w, $h) = @_; 3757 my ($self, $w, $h) = @_;
3027 3758
3028 $self->{current}->configure (0, 0, $w, $h); 3759 $self->{current}->configure (0, 0, $w, $h);
3760
3761 1
3029} 3762}
3030 3763
3031sub _draw { 3764sub _draw {
3032 my ($self) = @_; 3765 my ($self) = @_;
3033 3766
3034 $self->{current}->draw; 3767 $self->{current}->draw;
3035} 3768}
3036 3769
3037############################################################################# 3770#############################################################################
3038 3771
3039package CFClient::UI::Notebook; 3772package CFPlus::UI::Notebook;
3040 3773
3041our @ISA = CFClient::UI::VBox::; 3774our @ISA = CFPlus::UI::VBox::;
3042 3775
3043sub new { 3776sub new {
3044 my $class = shift; 3777 my $class = shift;
3045 3778
3046 my $self = $class->SUPER::new ( 3779 my $self = $class->SUPER::new (
3047 buttonbar => (new CFClient::UI::Buttonbar), 3780 buttonbar => (new CFPlus::UI::Buttonbar),
3048 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3781 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3049 # filter => # will be put between multiplexer and $self 3782 # filter => # will be put between multiplexer and $self
3050 @_, 3783 @_,
3051 ); 3784 );
3052 3785
3053 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3786 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3057} 3790}
3058 3791
3059sub add { 3792sub add {
3060 my ($self, $title, $widget, $tooltip) = @_; 3793 my ($self, $title, $widget, $tooltip) = @_;
3061 3794
3062 Scalar::Util::weaken $self; 3795 CFPlus::weaken $self;
3063 3796
3064 $self->{buttonbar}->add (new CFClient::UI::Button 3797 $self->{buttonbar}->add (new CFPlus::UI::Button
3065 markup => $title, 3798 markup => $title,
3066 tooltip => $tooltip, 3799 tooltip => $tooltip,
3067 on_activate => sub { $self->set_current_page ($widget) }, 3800 on_activate => sub { $self->set_current_page ($widget) },
3068 ); 3801 );
3069 3802
3070 $self->{multiplexer}->add ($widget); 3803 $self->{multiplexer}->add ($widget);
3071} 3804}
3072 3805
3806sub get_current_page {
3807 my ($self) = @_;
3808
3809 $self->{multiplexer}->get_current_page
3810}
3811
3073sub set_current_page { 3812sub set_current_page {
3074 my ($self, $page) = @_; 3813 my ($self, $page) = @_;
3075 3814
3076 $self->{multiplexer}->set_current_page ($page); 3815 $self->{multiplexer}->set_current_page ($page);
3077 $self->_emit (page_changed => $self->{multiplexer}{current}); 3816 $self->emit (page_changed => $self->{multiplexer}{current});
3078} 3817}
3079 3818
3080############################################################################# 3819#############################################################################
3081 3820
3821package CFPlus::UI::Selector;
3822
3823use utf8;
3824
3825our @ISA = CFPlus::UI::Button::;
3826
3827sub new {
3828 my $class = shift;
3829
3830 my $self = $class->SUPER::new (
3831 options => [], # [value, title, longdesc], ...
3832 value => undef,
3833 @_,
3834 );
3835
3836 $self->_set_value ($self->{value});
3837
3838 $self
3839}
3840
3841sub invoke_button_down {
3842 my ($self, $ev) = @_;
3843
3844 my @menu_items;
3845
3846 for (@{ $self->{options} }) {
3847 my ($value, $title, $tooltip) = @$_;
3848
3849 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3850 }
3851
3852 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3853}
3854
3855sub _set_value {
3856 my ($self, $value) = @_;
3857
3858 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3859 or return;
3860
3861 $self->{value} = $item->[0];
3862 $self->set_markup ("$item->[1] ⇓");
3863 $self->set_tooltip ($item->[2]);
3864}
3865
3866sub set_value {
3867 my ($self, $value) = @_;
3868
3869 return unless $self->{value} ne $value;
3870
3871 $self->_set_value ($value);
3872 $self->emit (changed => $value);
3873}
3874
3875#############################################################################
3876
3082package CFClient::UI::Statusbox; 3877package CFPlus::UI::Statusbox;
3083 3878
3084our @ISA = CFClient::UI::VBox::; 3879our @ISA = CFPlus::UI::VBox::;
3085 3880
3086sub new { 3881sub new {
3087 my $class = shift; 3882 my $class = shift;
3088 3883
3089 my $self = $class->SUPER::new ( 3884 my $self = $class->SUPER::new (
3090 fontsize => 0.8, 3885 fontsize => 0.8,
3091 @_, 3886 @_,
3092 ); 3887 );
3093 3888
3094 Scalar::Util::weaken (my $this = $self); 3889 CFPlus::weaken (my $this = $self);
3095 3890
3096 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3891 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3097 3892
3098 $self 3893 $self
3099} 3894}
… …
3101sub reorder { 3896sub reorder {
3102 my ($self) = @_; 3897 my ($self) = @_;
3103 my $NOW = Time::HiRes::time; 3898 my $NOW = Time::HiRes::time;
3104 3899
3105 # freeze display when hovering over any label 3900 # freeze display when hovering over any label
3106 return if $CFClient::UI::TOOLTIP->{owner} 3901 return if $CFPlus::UI::TOOLTIP->{owner}
3107 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3902 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3108 values %{ $self->{item} }; 3903 values %{ $self->{item} };
3109 3904
3110 while (my ($k, $v) = each %{ $self->{item} }) { 3905 while (my ($k, $v) = each %{ $self->{item} }) {
3111 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3906 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3112 } 3907 }
… …
3133 for ($short) { 3928 for ($short) {
3134 s/^\s+//; 3929 s/^\s+//;
3135 s/\s+/ /g; 3930 s/\s+/ /g;
3136 } 3931 }
3137 3932
3138 new CFClient::UI::Label 3933 new CFPlus::UI::Label
3139 markup => $short, 3934 markup => $short,
3140 tooltip => $item->{tooltip}, 3935 tooltip => $item->{tooltip},
3141 tooltip_font => $::FONT_PROP, 3936 tooltip_font => $::FONT_PROP,
3142 tooltip_width => 0.67, 3937 tooltip_width => 0.67,
3143 fontsize => $item->{fontsize} || $self->{fontsize}, 3938 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3181 $item->{count}++; 3976 $item->{count}++;
3182 } else { 3977 } else {
3183 $item->{count} = 1; 3978 $item->{count} = 1;
3184 $item->{text} = $item->{tooltip} = $text; 3979 $item->{text} = $item->{tooltip} = $text;
3185 } 3980 }
3186 $item->{id} = ++$self->{id}; 3981 $item->{id} += 0.2;#d#
3187 $item->{timeout} = $timeout; 3982 $item->{timeout} = $timeout;
3188 delete $item->{label}; 3983 delete $item->{label};
3189 } else { 3984 } else {
3190 $self->{item}{$group} = { 3985 $self->{item}{$group} = {
3191 id => ++$self->{id}, 3986 id => ++$self->{id},
… …
3197 count => 1, 3992 count => 1,
3198 %arg, 3993 %arg,
3199 }; 3994 };
3200 } 3995 }
3201 3996
3997 $ROOT->on_refresh (reorder => sub {
3202 $self->reorder; 3998 $self->reorder;
3999 });
3203} 4000}
3204 4001
3205sub reconfigure { 4002sub reconfigure {
3206 my ($self) = @_; 4003 my ($self) = @_;
3207 4004
… …
3210 4007
3211 $self->reorder; 4008 $self->reorder;
3212 $self->SUPER::reconfigure; 4009 $self->SUPER::reconfigure;
3213} 4010}
3214 4011
3215sub DESTROY { 4012sub destroy {
3216 my ($self) = @_; 4013 my ($self) = @_;
3217 4014
3218 $self->{timer}->cancel; 4015 $self->{timer}->cancel;
3219 4016
3220 $self->SUPER::DESTROY; 4017 $self->SUPER::destroy;
3221} 4018}
3222 4019
3223############################################################################# 4020#############################################################################
3224 4021
3225package CFClient::UI::Inventory;
3226
3227our @ISA = CFClient::UI::ScrolledWindow::;
3228
3229sub new {
3230 my $class = shift;
3231
3232 my $self = $class->SUPER::new (
3233 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3234 @_,
3235 );
3236
3237 $self
3238}
3239
3240sub set_items {
3241 my ($self, $items) = @_;
3242
3243 $self->{child}->clear;
3244 return unless $items;
3245
3246 my @items = sort {
3247 ($a->{type} <=> $b->{type})
3248 or ($a->{name} cmp $b->{name})
3249 } @$items;
3250
3251 $self->{real_items} = \@items;
3252
3253 my $row = 0;
3254 for my $item (@items) {
3255 CFClient::Item::update_widgets $item;
3256
3257 $self->{child}->add (0, $row, $item->{face_widget});
3258 $self->{child}->add (1, $row, $item->{desc_widget});
3259 $self->{child}->add (2, $row, $item->{weight_widget});
3260
3261 $row++;
3262 }
3263}
3264
3265#############################################################################
3266
3267package CFClient::UI::BindEditor;
3268
3269our @ISA = CFClient::UI::FancyFrame::;
3270
3271sub new {
3272 my $class = shift;
3273
3274 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3275
3276 $self->add (my $vb = new CFClient::UI::VBox);
3277
3278
3279 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3280 text => "start recording",
3281 tooltip => "Start/Stops recording of actions."
3282 ."All subsequent actions after the recording started will be captured."
3283 ."The actions are displayed after the record was stopped."
3284 ."To bind the action you have to click on the 'Bind' button",
3285 on_activate => sub {
3286 unless ($self->{recording}) {
3287 $self->start;
3288 } else {
3289 $self->stop;
3290 }
3291 });
3292
3293 $vb->add (new CFClient::UI::Label text => "Actions:");
3294 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3295
3296 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3297 $vb->add (my $hb = new CFClient::UI::HBox);
3298 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3299 $hb->add (new CFClient::UI::Button
3300 text => "bind",
3301 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3302 on_activate => sub {
3303 $self->ask_for_bind;
3304 });
3305
3306 $vb->add (my $hb = new CFClient::UI::HBox);
3307 $hb->add (new CFClient::UI::Button
3308 text => "ok",
3309 expand => 1,
3310 tooltip => "This closes the binding editor and saves the binding",
3311 on_activate => sub {
3312 $self->hide;
3313 $self->commit;
3314 });
3315
3316 $hb->add (new CFClient::UI::Button
3317 text => "cancel",
3318 expand => 1,
3319 tooltip => "This closes the binding editor without saving",
3320 on_activate => sub {
3321 $self->hide;
3322 $self->{binding_cancel}->()
3323 if $self->{binding_cancel};
3324 });
3325
3326 $self->update_binding_widgets;
3327
3328 $self
3329}
3330
3331sub commit {
3332 my ($self) = @_;
3333 my ($mod, $sym, $cmds) = $self->get_binding;
3334 if ($sym != 0 && @$cmds > 0) {
3335 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3336 ."'. Don't forget 'Save Config'!");
3337 $self->{binding_change}->($mod, $sym, $cmds)
3338 if $self->{binding_change};
3339 } else {
3340 $::STATUSBOX->add ("No action bound, no key or action specified!");
3341 $self->{binding_cancel}->()
3342 if $self->{binding_cancel};
3343 }
3344}
3345
3346sub start {
3347 my ($self) = @_;
3348
3349 $self->{rec_btn}->set_text ("stop recording");
3350 $self->{recording} = 1;
3351 $self->clear_command_list;
3352 $::CONN->start_record if $::CONN;
3353}
3354
3355sub stop {
3356 my ($self) = @_;
3357
3358 $self->{rec_btn}->set_text ("start recording");
3359 $self->{recording} = 0;
3360
3361 my $rec;
3362 $rec = $::CONN->stop_record if $::CONN;
3363 return unless ref $rec eq 'ARRAY';
3364 $self->set_command_list ($rec);
3365}
3366
3367
3368sub ask_for_bind_and_commit {
3369 my ($self) = @_;
3370 $self->ask_for_bind (1);
3371}
3372
3373sub ask_for_bind {
3374 my ($self, $commit) = @_;
3375
3376 CFClient::Binder::open_binding_dialog (sub {
3377 my ($mod, $sym) = @_;
3378 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3379 $self->update_binding_widgets;
3380 $self->commit if $commit;
3381 });
3382}
3383
3384# $mod and $sym are the modifiers and key symbol
3385# $cmds is a array ref of strings (the commands)
3386# $cb is the callback that is executed on OK
3387# $ccb is the callback that is executed on CANCEL and
3388# when the binding was unsuccessful on OK
3389sub set_binding {
3390 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3391
3392 $self->clear_command_list;
3393 $self->{recording} = 0;
3394 $self->{rec_btn}->set_text ("start recording");
3395
3396 $self->{binding} = [$mod, $sym];
3397 $self->{commands} = $cmds;
3398
3399 $self->{binding_change} = $cb;
3400 $self->{binding_cancel} = $ccb;
3401
3402 $self->update_binding_widgets;
3403}
3404
3405# this is a shortcut method that asks for a binding
3406# and then just binds it.
3407sub do_quick_binding {
3408 my ($self, $cmds) = @_;
3409 $self->set_binding (undef, undef, $cmds, sub {
3410 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3411 });
3412 $self->ask_for_bind (1);
3413}
3414
3415sub update_binding_widgets {
3416 my ($self) = @_;
3417 my ($mod, $sym, $cmds) = $self->get_binding;
3418 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3419 $self->set_command_list ($cmds);
3420}
3421
3422sub get_binding {
3423 my ($self) = @_;
3424 return (
3425 $self->{binding}->[0],
3426 $self->{binding}->[1],
3427 [ grep { defined $_ } @{$self->{commands}} ]
3428 );
3429}
3430
3431sub clear_command_list {
3432 my ($self) = @_;
3433 $self->{cmdbox}->clear ();
3434}
3435
3436sub set_command_list {
3437 my ($self, $cmds) = @_;
3438
3439 $self->{cmdbox}->clear ();
3440 $self->{commands} = $cmds;
3441
3442 my $idx = 0;
3443
3444 for (@$cmds) {
3445 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3446
3447 my $i = $idx;
3448 $hb->add (new CFClient::UI::Label text => $_);
3449 $hb->add (new CFClient::UI::Button
3450 text => "delete",
3451 tooltip => "Deletes the action from the record",
3452 on_activate => sub {
3453 $self->{cmdbox}->remove ($hb);
3454 $cmds->[$i] = undef;
3455 });
3456
3457
3458 $idx++
3459 }
3460}
3461
3462#############################################################################
3463
3464package CFClient::UI::SpellList;
3465
3466our @ISA = CFClient::UI::Table::;
3467
3468sub new {
3469 my $class = shift;
3470
3471 my $self = $class->SUPER::new (
3472 binding => [],
3473 commands => [],
3474 @_,
3475 )
3476}
3477
3478# XXX: Do sorting? Argl...
3479sub add_spell {
3480 my ($self, $spell) = @_;
3481 $self->{spells}->{$spell->{name}} = $spell;
3482
3483 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3484 face => $spell->{face},
3485 can_hover => 1,
3486 can_events => 1,
3487 tooltip => $spell->{message});
3488
3489 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3490 text => $spell->{name},
3491 can_hover => 1,
3492 can_events => 1,
3493 tooltip => $spell->{message},
3494 expand => 1);
3495
3496 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3498 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3499 expand => 1);
3500
3501 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3502 text => "bind to key",
3503 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3504}
3505
3506sub rebuild_spell_list {
3507 my ($self) = @_;
3508 $self->{tbl_idx} = 0;
3509 $self->add_spell ($_) for values %{$self->{spells}};
3510}
3511
3512sub remove_spell {
3513 my ($self, $spell) = @_;
3514 delete $self->{spells}->{$spell->{name}};
3515 $self->rebuild_spell_list;
3516}
3517
3518#############################################################################
3519
3520package CFClient::UI::Root; 4022package CFPlus::UI::Root;
3521 4023
3522our @ISA = CFClient::UI::Container::; 4024our @ISA = CFPlus::UI::Container::;
3523 4025
3524use List::Util qw(min max); 4026use List::Util qw(min max);
3525 4027
3526use CFClient::OpenGL; 4028use CFPlus::OpenGL;
3527 4029
3528sub new { 4030sub new {
3529 my $class = shift; 4031 my $class = shift;
3530 4032
3531 my $self = $class->SUPER::new ( 4033 my $self = $class->SUPER::new (
3532 visible => 1, 4034 visible => 1,
3533 @_, 4035 @_,
3534 ); 4036 );
3535 4037
3536 Scalar::Util::weaken ($self->{root} = $self); 4038 CFPlus::weaken ($self->{root} = $self);
3537 4039
3538 $self 4040 $self
3539} 4041}
3540 4042
3541sub size_request { 4043sub size_request {
… …
3556 $coord = $max - $size if $coord > $max - $size; 4058 $coord = $max - $size if $coord > $max - $size;
3557 4059
3558 int $coord + 0.5 4060 int $coord + 0.5
3559} 4061}
3560 4062
3561sub size_allocate { 4063sub invoke_size_allocate {
3562 my ($self, $w, $h) = @_; 4064 my ($self, $w, $h) = @_;
3563 4065
3564 for my $child ($self->children) { 4066 for my $child ($self->children) {
3565 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4067 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3566 4068
… …
3570 $X = _to_pixel $X, $W, $self->{w}; 4072 $X = _to_pixel $X, $W, $self->{w};
3571 $Y = _to_pixel $Y, $H, $self->{h}; 4073 $Y = _to_pixel $Y, $H, $self->{h};
3572 4074
3573 $child->configure ($X, $Y, $W, $H); 4075 $child->configure ($X, $Y, $W, $H);
3574 } 4076 }
4077
4078 1
3575} 4079}
3576 4080
3577sub coord2local { 4081sub coord2local {
3578 my ($self, $x, $y) = @_; 4082 my ($self, $x, $y) = @_;
3579 4083
… …
3705 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4209 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3706 4210
3707 $w = 0 if $w < 0; 4211 $w = 0 if $w < 0;
3708 $h = 0 if $h < 0; 4212 $h = 0 if $h < 0;
3709 4213
4214 $w = max $widget->{min_w}, $w;
4215 $h = max $widget->{min_h}, $h;
4216
4217# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4218# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4219
4220 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4221 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4222
3710 $w = int $w + 0.5; 4223 $w = int $w + 0.5;
3711 $h = int $h + 0.5; 4224 $h = int $h + 0.5;
3712 4225
3713 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4226 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3714 $widget->{old_w} = $widget->{w}; 4227 $widget->{old_w} = $widget->{w};
… …
3724 4237
3725 while ($self->{post_alloc_hook}) { 4238 while ($self->{post_alloc_hook}) {
3726 $_->() 4239 $_->()
3727 for values %{delete $self->{post_alloc_hook}}; 4240 for values %{delete $self->{post_alloc_hook}};
3728 } 4241 }
3729
3730 4242
3731 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4243 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3732 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4244 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3733 glClear GL_COLOR_BUFFER_BIT; 4245 glClear GL_COLOR_BUFFER_BIT;
3734 4246
… …
3737 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4249 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3738 glMatrixMode GL_MODELVIEW; 4250 glMatrixMode GL_MODELVIEW;
3739 glLoadIdentity; 4251 glLoadIdentity;
3740 4252
3741 { 4253 {
3742 package CFClient::UI::Base; 4254 package CFPlus::UI::Base;
3743 4255
3744 ($draw_x, $draw_y, $draw_w, $draw_h) = 4256 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3745 (0, 0, $self->{w}, $self->{h}); 4257 (0, 0, $self->{w}, $self->{h});
3746 }
3747 4258
3748 $self->_draw; 4259 $self->_draw;
4260 }
3749} 4261}
3750 4262
3751############################################################################# 4263#############################################################################
3752 4264
3753package CFClient::UI; 4265package CFPlus::UI;
3754 4266
3755$ROOT = new CFClient::UI::Root; 4267$ROOT = new CFPlus::UI::Root;
3756$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4268$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3757 4269
37581 42701
3759 4271

Diff Legend

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