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

Diff Legend

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