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

Diff Legend

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