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

Diff Legend

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