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

Diff Legend

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