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.276 by root, Sun Jun 4 00:16:01 2006 UTC vs.
Revision 1.435 by root, Wed Aug 22 21:40:43 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 {
… …
1681 $self->{last_activity} = $::NOW; 2090 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 2091 $self->{text} = $text;
1683 2092
1684 $text =~ s/./*/g if $self->{hidden}; 2093 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 2094 $self->{layout}->set_text ("$text ");
2095 delete $self->{size_req};
1686 2096
1687 $self->_emit (changed => $self->{text}); 2097 $self->emit (changed => $self->{text});
2098
2099 $self->realloc;
1688 $self->update; 2100 $self->update;
1689} 2101}
1690 2102
1691sub set_text { 2103sub set_text {
1692 my ($self, $text) = @_; 2104 my ($self, $text) = @_;
1693 2105
1694 $self->{cursor} = length $text; 2106 $self->{cursor} = length $text;
1695 $self->_set_text ($text); 2107 $self->_set_text ($text);
1696
1697 $self->realloc;
1698} 2108}
1699 2109
1700sub get_text { 2110sub get_text {
1701 $_[0]{text} 2111 $_[0]{text}
1702} 2112}
… …
1707 my ($w, $h) = $self->SUPER::size_request; 2117 my ($w, $h) = $self->SUPER::size_request;
1708 2118
1709 ($w + 1, $h) # add 1 for cursor 2119 ($w + 1, $h) # add 1 for cursor
1710} 2120}
1711 2121
1712sub key_down { 2122sub invoke_key_down {
1713 my ($self, $ev) = @_; 2123 my ($self, $ev) = @_;
1714 2124
1715 my $mod = $ev->{mod}; 2125 my $mod = $ev->{mod};
1716 my $sym = $ev->{sym}; 2126 my $sym = $ev->{sym};
1717 my $uni = $ev->{unicode}; 2127 my $uni = $ev->{unicode};
1718 2128
1719 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;
1720 2132
1721 if ($uni == 8) { 2133 if ($uni == 8) {
1722 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2134 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1723 } elsif ($uni == 127) { 2135 } elsif ($uni == 127) {
1724 substr $text, $self->{cursor}, 1, ""; 2136 substr $text, $self->{cursor}, 1, "";
1725 } elsif ($sym == CFClient::SDLK_LEFT) { 2137 } elsif ($sym == CFPlus::SDLK_LEFT) {
1726 --$self->{cursor} if $self->{cursor}; 2138 --$self->{cursor} if $self->{cursor};
1727 } elsif ($sym == CFClient::SDLK_RIGHT) { 2139 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1728 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2140 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1729 } 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 = "";
1730 $self->{cursor} = 0; 2155 $self->{cursor} = 0;
1731 } elsif ($sym == CFClient::SDLK_END) {
1732 $self->{cursor} = length $text;
1733 } elsif ($uni == 27) { 2156 } elsif ($uni == 27) {
1734 $self->_emit ('escape'); 2157 $self->emit ('escape');
1735 } elsif ($uni) { 2158 } elsif ($uni == 0x0d) {
2159 substr $text, $self->{cursor}++, 0, "\012";
2160 } elsif ($uni >= 0x20) {
1736 substr $text, $self->{cursor}++, 0, chr $uni; 2161 substr $text, $self->{cursor}++, 0, chr $uni;
1737 } else { 2162 } else {
1738 return 0; 2163 return 0;
1739 } 2164 }
1740 2165
1741 $self->_set_text ($text); 2166 $self->_set_text ($text);
1742 2167
1743 $self->realloc; 2168 $self->realloc;
2169 $self->update;
1744 2170
1745 1 2171 1
1746} 2172}
1747 2173
1748sub focus_in { 2174sub invoke_focus_in {
1749 my ($self) = @_; 2175 my ($self) = @_;
1750 2176
1751 $self->{last_activity} = $::NOW; 2177 $self->{last_activity} = $::NOW;
1752 2178
1753 $self->SUPER::focus_in; 2179 $self->SUPER::invoke_focus_in
1754} 2180}
1755 2181
1756sub button_down { 2182sub invoke_button_down {
1757 my ($self, $ev, $x, $y) = @_; 2183 my ($self, $ev, $x, $y) = @_;
1758 2184
1759 $self->SUPER::button_down ($ev, $x, $y); 2185 $self->SUPER::invoke_button_down ($ev, $x, $y);
1760 2186
1761 my $idx = $self->{layout}->xy_to_index ($x, $y); 2187 my $idx = $self->{layout}->xy_to_index ($x, $y);
1762 2188
1763 # byte-index to char-index 2189 # byte-index to char-index
1764 my $text = $self->{text}; 2190 my $text = $self->{text};
1765 utf8::encode $text; 2191 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1766 $self->{cursor} = length substr $text, 0, $idx; 2192 $self->{cursor} = length $text;
1767 2193
1768 $self->_set_text ($self->{text}); 2194 $self->_set_text ($self->{text});
1769 $self->update; 2195 $self->update;
1770 2196
1771 1 2197 1
1772} 2198}
1773 2199
1774sub mouse_motion { 2200sub invoke_mouse_motion {
1775 my ($self, $ev, $x, $y) = @_; 2201 my ($self, $ev, $x, $y) = @_;
1776# 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#
1777 2203
1778 0 2204 1
1779} 2205}
1780 2206
1781sub _draw { 2207sub _draw {
1782 my ($self) = @_; 2208 my ($self) = @_;
1783 2209
1784 local $self->{fg} = $self->{fg}; 2210 local $self->{fg} = $self->{fg};
1785 2211
1786 if ($FOCUS == $self) { 2212 if ($FOCUS == $self) {
1787 glColor @{$self->{active_bg}}; 2213 glColor_premultiply @{$self->{active_bg}};
1788 $self->{fg} = $self->{active_fg}; 2214 $self->{fg} = $self->{active_fg};
1789 } else { 2215 } else {
1790 glColor @{$self->{bg}}; 2216 glColor_premultiply @{$self->{bg}};
1791 } 2217 }
1792 2218
1793 glEnable GL_BLEND; 2219 glEnable GL_BLEND;
1794 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1795 glBegin GL_QUADS;
1796 glVertex 0 , 0;
1797 glVertex 0 , $self->{h};
1798 glVertex $self->{w}, $self->{h}; 2221 glRect 0, 0, $self->{w}, $self->{h};
1799 glVertex $self->{w}, 0;
1800 glEnd;
1801 glDisable GL_BLEND; 2222 glDisable GL_BLEND;
1802 2223
1803 $self->SUPER::_draw; 2224 $self->SUPER::_draw;
1804 2225
1805 #TODO: force update every cursor change :( 2226 #TODO: force update every cursor change :(
… …
1807 2228
1808 unless (exists $self->{cur_h}) { 2229 unless (exists $self->{cur_h}) {
1809 my $text = substr $self->{text}, 0, $self->{cursor}; 2230 my $text = substr $self->{text}, 0, $self->{cursor};
1810 utf8::encode $text; 2231 utf8::encode $text;
1811 2232
1812 @$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);
1813 } 2234 }
1814 2235
1815 glColor @{$self->{fg}}; 2236 glColor_premultiply @{$self->{active_fg}};
1816 glBegin GL_LINES; 2237 glBegin GL_LINES;
1817 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};
1818 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};
1819 glEnd; 2240 glEnd;
1820 }
1821}
1822 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
1823package CFClient::UI::Entry; 2261package CFPlus::UI::Entry;
1824 2262
1825our @ISA = CFClient::UI::EntryBase::; 2263our @ISA = CFPlus::UI::EntryBase::;
1826 2264
1827use CFClient::OpenGL; 2265use CFPlus::OpenGL;
1828 2266
1829sub key_down { 2267sub invoke_key_down {
1830 my ($self, $ev) = @_; 2268 my ($self, $ev) = @_;
1831 2269
1832 my $sym = $ev->{sym}; 2270 my $sym = $ev->{sym};
1833 2271
1834 if ($sym == 13) { 2272 if ($ev->{uni} == 0x0d || $sym == 13) {
1835 unshift @{$self->{history}}, 2273 unshift @{$self->{history}},
1836 my $txt = $self->get_text; 2274 my $txt = $self->get_text;
2275
1837 $self->{history_pointer} = -1; 2276 $self->{history_pointer} = -1;
1838 $self->{history_saveback} = ''; 2277 $self->{history_saveback} = '';
1839 $self->_emit (activate => $txt); 2278 $self->emit (activate => $txt);
1840 $self->update; 2279 $self->update;
1841 2280
1842 } elsif ($sym == CFClient::SDLK_UP) { 2281 } elsif ($sym == CFPlus::SDLK_UP) {
1843 if ($self->{history_pointer} < 0) { 2282 if ($self->{history_pointer} < 0) {
1844 $self->{history_saveback} = $self->get_text; 2283 $self->{history_saveback} = $self->get_text;
1845 } 2284 }
1846 if (@{$self->{history} || []} > 0) { 2285 if (@{$self->{history} || []} > 0) {
1847 $self->{history_pointer}++; 2286 $self->{history_pointer}++;
… …
1849 $self->{history_pointer} = @{$self->{history} || []} - 1; 2288 $self->{history_pointer} = @{$self->{history} || []} - 1;
1850 } 2289 }
1851 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2290 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1852 } 2291 }
1853 2292
1854 } elsif ($sym == CFClient::SDLK_DOWN) { 2293 } elsif ($sym == CFPlus::SDLK_DOWN) {
1855 $self->{history_pointer}--; 2294 $self->{history_pointer}--;
1856 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2295 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1857 2296
1858 if ($self->{history_pointer} >= 0) { 2297 if ($self->{history_pointer} >= 0) {
1859 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2298 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1860 } else { 2299 } else {
1861 $self->set_text ($self->{history_saveback}); 2300 $self->set_text ($self->{history_saveback});
1862 } 2301 }
1863 2302
1864 } else { 2303 } else {
1865 return $self->SUPER::key_down ($ev) 2304 return $self->SUPER::invoke_key_down ($ev)
1866 } 2305 }
1867 2306
1868 1 2307 1
1869} 2308}
1870 2309
1871############################################################################# 2310#############################################################################
1872 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
1873package CFClient::UI::Button; 2351package CFPlus::UI::ButtonBin;
1874 2352
1875our @ISA = CFClient::UI::Label::; 2353our @ISA = CFPlus::UI::Bin::;
1876 2354
1877use CFClient::OpenGL; 2355use CFPlus::OpenGL;
1878 2356
1879my @tex = 2357my @tex =
1880 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1881 qw(b1_button_active.png); 2359 qw(b1_button_inactive.png b1_button_active.png);
1882 2360
1883sub new { 2361sub new {
1884 my $class = shift; 2362 my $class = shift;
1885 2363
1886 $class->SUPER::new ( 2364 $class->SUPER::new (
1887 padding_x => 4,
1888 padding_y => 4,
1889 fg => [1, 1, 1],
1890 active_fg => [0, 0, 1],
1891 can_hover => 1, 2365 can_hover => 1,
1892 align => 0, 2366 align => 0,
1893 valign => 0, 2367 valign => 0,
1894 can_events => 1, 2368 can_events => 1,
1895 @_ 2369 @_
1896 ) 2370 )
1897} 2371}
1898 2372
1899sub activate { }
1900
1901sub button_up { 2373sub invoke_button_up {
1902 my ($self, $ev, $x, $y) = @_; 2374 my ($self, $ev, $x, $y) = @_;
1903 2375
1904 $self->emit ("activate") 2376 $self->emit ("activate")
1905 if $x >= 0 && $x < $self->{w} 2377 if $x >= 0 && $x < $self->{w}
1906 && $y >= 0 && $y < $self->{h}; 2378 && $y >= 0 && $y < $self->{h};
… …
1909} 2381}
1910 2382
1911sub _draw { 2383sub _draw {
1912 my ($self) = @_; 2384 my ($self) = @_;
1913 2385
1914 local $self->{fg} = $self->{fg};
1915
1916 if ($GRAB == $self) {
1917 $self->{fg} = $self->{active_fg};
1918 }
1919
1920 glEnable GL_TEXTURE_2D; 2386 glEnable GL_TEXTURE_2D;
1921 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2387 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1922 glColor 0, 0, 0, 1; 2388 glColor 0, 0, 0, 1;
1923 2389
2390 my $tex = $tex[$GRAB == $self];
1924 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2391 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1925 2392
1926 glDisable GL_TEXTURE_2D; 2393 glDisable GL_TEXTURE_2D;
1927 2394
1928 $self->SUPER::_draw; 2395 $self->SUPER::_draw;
1929} 2396}
1930 2397
1931############################################################################# 2398#############################################################################
1932 2399
1933package CFClient::UI::CheckBox; 2400package CFPlus::UI::Button;
1934 2401
1935our @ISA = CFClient::UI::DrawBG::; 2402our @ISA = CFPlus::UI::Label::;
2403
2404use CFPlus::OpenGL;
1936 2405
1937my @tex = 2406my @tex =
1938 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 }
1939 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2461 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1940 2462
1941use CFClient::OpenGL; 2463use CFPlus::OpenGL;
1942 2464
1943sub new { 2465sub new {
1944 my $class = shift; 2466 my $class = shift;
1945 2467
1946 $class->SUPER::new ( 2468 $class->SUPER::new (
… …
1960 my ($self) = @_; 2482 my ($self) = @_;
1961 2483
1962 (6) x 2 2484 (6) x 2
1963} 2485}
1964 2486
2487sub toggle {
2488 my ($self) = @_;
2489
2490 $self->{state} = !$self->{state};
2491 $self->emit (changed => $self->{state});
2492 $self->update;
2493}
2494
1965sub button_down { 2495sub invoke_button_down {
1966 my ($self, $ev, $x, $y) = @_; 2496 my ($self, $ev, $x, $y) = @_;
1967 2497
1968 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2498 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1969 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2499 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1970 $self->{state} = !$self->{state}; 2500 $self->toggle;
1971 $self->_emit (changed => $self->{state});
1972 } else { 2501 } else {
1973 return 0 2502 return 0
1974 } 2503 }
1975 2504
1976 1 2505 1
… …
1996 glDisable GL_TEXTURE_2D; 2525 glDisable GL_TEXTURE_2D;
1997} 2526}
1998 2527
1999############################################################################# 2528#############################################################################
2000 2529
2001package CFClient::UI::Image; 2530package CFPlus::UI::Image;
2002 2531
2003our @ISA = CFClient::UI::Base::; 2532our @ISA = CFPlus::UI::Base::;
2004 2533
2005use CFClient::OpenGL; 2534use CFPlus::OpenGL;
2006use Carp qw/confess/;
2007 2535
2008our %loaded_images; 2536our %texture_cache;
2009 2537
2010sub new { 2538sub new {
2011 my $class = shift; 2539 my $class = shift;
2012 2540
2013 my $self = $class->SUPER::new (can_events => 0, @_); 2541 my $self = $class->SUPER::new (
2542 can_events => 0,
2543 scale => 1,
2544 @_,
2545 );
2014 2546
2015 $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";
2016 2549
2017 $loaded_images{$self->{image}} ||= 2550 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2018 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;
2019 2552
2020 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2553 CFPlus::weaken $texture_cache{$self->{path}};
2021 2554
2022 Scalar::Util::weaken $loaded_images{$self->{image}}; 2555 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2023
2024 $self->{aspect} = $tex->{w} / $tex->{h};
2025 2556
2026 $self 2557 $self
2027} 2558}
2028 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
2029sub size_request { 2575sub size_request {
2030 my ($self) = @_; 2576 my ($self) = @_;
2031 2577
2032 ($self->{tex}->{w}, $self->{tex}->{h}) 2578 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2033} 2579}
2034 2580
2035sub _draw { 2581sub _draw {
2036 my ($self) = @_; 2582 my ($self) = @_;
2037 2583
… …
2054 glDisable GL_TEXTURE_2D; 2600 glDisable GL_TEXTURE_2D;
2055} 2601}
2056 2602
2057############################################################################# 2603#############################################################################
2058 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
2059package CFClient::UI::VGauge; 2647package CFPlus::UI::VGauge;
2060 2648
2061our @ISA = CFClient::UI::Base::; 2649our @ISA = CFPlus::UI::Base::;
2062 2650
2063use List::Util qw(min max); 2651use List::Util qw(min max);
2064 2652
2065use CFClient::OpenGL; 2653use CFPlus::OpenGL;
2066 2654
2067my %tex = ( 2655my %tex = (
2068 food => [ 2656 food => [
2069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2657 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2070 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2658 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2071 ], 2659 ],
2072 grace => [ 2660 grace => [
2073 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2661 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2074 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/
2075 ], 2663 ],
2076 hp => [ 2664 hp => [
2077 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2665 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2078 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2666 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2079 ], 2667 ],
2080 mana => [ 2668 mana => [
2081 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2669 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2082 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/
2083 ], 2671 ],
2084); 2672);
2085 2673
2086# eg. VGauge->new (gauge => 'food'), default gauge: food 2674# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2146 my $ycut1 = max 0, min 1, $ycut; 2734 my $ycut1 = max 0, min 1, $ycut;
2147 my $ycut2 = max 0, min 1, $ycut - 1; 2735 my $ycut2 = max 0, min 1, $ycut - 1;
2148 2736
2149 my $h1 = $self->{h} * (1 - $ycut1); 2737 my $h1 = $self->{h} * (1 - $ycut1);
2150 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);
2151 2742
2152 glEnable GL_BLEND; 2743 glEnable GL_BLEND;
2153 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;
2154 glEnable GL_TEXTURE_2D; 2746 glEnable GL_TEXTURE_2D;
2155 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2747 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2156 2748
2157 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2749 glBindTexture GL_TEXTURE_2D, $t1->{name};
2158 glBegin GL_QUADS; 2750 glBegin GL_QUADS;
… …
2173 2765
2174 if ($t3) { 2766 if ($t3) {
2175 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2767 glBindTexture GL_TEXTURE_2D, $t3->{name};
2176 glBegin GL_QUADS; 2768 glBegin GL_QUADS;
2177 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2769 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2178 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2770 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2179 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2771 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2180 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2772 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2181 glEnd; 2773 glEnd;
2182 } 2774 }
2183 2775
2184 glDisable GL_BLEND; 2776 glDisable GL_BLEND;
2185 glDisable GL_TEXTURE_2D; 2777 glDisable GL_TEXTURE_2D;
2186} 2778}
2187 2779
2188############################################################################# 2780#############################################################################
2189 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<<<<<<< UI.pm
2902 $self->{lvl} = $lvl;
2903 $self->{exp} = $exp;
2904
2905=======
2906 $self->{lvl} = $exp;
2907 $self->{exp} = $exp;
2908
2909>>>>>>> 1.434
2910 my $v = -1;
2911
2912 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2913 my $l0 = $table->[$lvl - 1];
2914 my $l1 = $table->[$lvl];
2915
2916 $self->{nxt} = $l1;
2917
2918 $v = ($exp - $l0) / ($l1 - $l0);
2919 }
2920
2921 $self->SUPER::set_value ($v);
2922}
2923
2924#############################################################################
2925
2190package CFClient::UI::Gauge; 2926package CFPlus::UI::Gauge;
2191 2927
2192our @ISA = CFClient::UI::VBox::; 2928our @ISA = CFPlus::UI::VBox::;
2193 2929
2194sub new { 2930sub new {
2195 my ($class, %arg) = @_; 2931 my ($class, %arg) = @_;
2196 2932
2197 my $self = $class->SUPER::new ( 2933 my $self = $class->SUPER::new (
… …
2199 can_hover => 1, 2935 can_hover => 1,
2200 can_events => 1, 2936 can_events => 1,
2201 %arg, 2937 %arg,
2202 ); 2938 );
2203 2939
2204 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2940 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2205 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2941 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2206 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2942 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2207 2943
2208 $self 2944 $self
2209} 2945}
2210 2946
2211sub set_fontsize { 2947sub set_fontsize {
… …
2232 $self->{value}->set_text ($val); 2968 $self->{value}->set_text ($val);
2233} 2969}
2234 2970
2235############################################################################# 2971#############################################################################
2236 2972
2237package CFClient::UI::Slider; 2973package CFPlus::UI::Slider;
2238 2974
2239use strict; 2975use strict;
2240 2976
2241use CFClient::OpenGL; 2977use CFPlus::OpenGL;
2242 2978
2243our @ISA = CFClient::UI::DrawBG::; 2979our @ISA = CFPlus::UI::DrawBG::;
2244 2980
2245my @tex = 2981my @tex =
2246 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2982 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2247 qw(s1_slider.png s1_slider_bg.png); 2983 qw(s1_slider.png s1_slider_bg.png);
2248 2984
2249sub new { 2985sub new {
2250 my $class = shift; 2986 my $class = shift;
2251 2987
… …
2272 $self->update; 3008 $self->update;
2273 3009
2274 $self 3010 $self
2275} 3011}
2276 3012
2277sub changed { }
2278
2279sub set_range { 3013sub set_range {
2280 my ($self, $range) = @_; 3014 my ($self, $range) = @_;
2281 3015
2282 ($range, $self->{range}) = ($self->{range}, $range); 3016 ($range, $self->{range}) = ($self->{range}, $range);
2283 3017
2284 $self->update
2285 if "@$range" ne "@{$self->{range}}"; 3018 if ("@$range" ne "@{$self->{range}}") {
3019 $self->update;
3020 $self->set_value ($self->{range}[0]);
3021 }
2286} 3022}
2287 3023
2288sub set_value { 3024sub set_value {
2289 my ($self, $value) = @_; 3025 my ($self, $value) = @_;
2290 3026
… …
2301 if $unit; 3037 if $unit;
2302 3038
2303 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3039 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2304 3040
2305 if ($value != $old_value) { 3041 if ($value != $old_value) {
2306 $self->_emit (changed => $value); 3042 $self->emit (changed => $value);
2307 $self->update; 3043 $self->update;
2308 } 3044 }
2309} 3045}
2310 3046
2311sub size_request { 3047sub size_request {
2312 my ($self) = @_; 3048 my ($self) = @_;
2313 3049
2314 ($self->{req_w}, $self->{req_h}) 3050 ($self->{req_w}, $self->{req_h})
2315} 3051}
2316 3052
2317sub button_down { 3053sub invoke_button_down {
2318 my ($self, $ev, $x, $y) = @_; 3054 my ($self, $ev, $x, $y) = @_;
2319 3055
2320 $self->SUPER::button_down ($ev, $x, $y); 3056 $self->SUPER::invoke_button_down ($ev, $x, $y);
2321 3057
2322 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3058 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2323 3059
2324 $self->mouse_motion ($ev, $x, $y) 3060 $self->invoke_mouse_motion ($ev, $x, $y);
2325}
2326 3061
3062 1
3063}
3064
2327sub mouse_motion { 3065sub invoke_mouse_motion {
2328 my ($self, $ev, $x, $y) = @_; 3066 my ($self, $ev, $x, $y) = @_;
2329 3067
2330 if ($GRAB == $self) { 3068 if ($GRAB == $self) {
2331 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3069 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2332 3070
… …
2336 3074
2337 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3075 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2338 } else { 3076 } else {
2339 return 0; 3077 return 0;
2340 } 3078 }
3079
3080 1
3081}
3082
3083sub invoke_mouse_wheel {
3084 my ($self, $ev) = @_;
3085
3086 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
3087
3088 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
3089
3090 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2341 3091
2342 1 3092 1
2343} 3093}
2344 3094
2345sub update { 3095sub update {
… …
2396 glDisable GL_TEXTURE_2D; 3146 glDisable GL_TEXTURE_2D;
2397} 3147}
2398 3148
2399############################################################################# 3149#############################################################################
2400 3150
2401package CFClient::UI::ValSlider; 3151package CFPlus::UI::ValSlider;
2402 3152
2403our @ISA = CFClient::UI::HBox::; 3153our @ISA = CFPlus::UI::HBox::;
2404 3154
2405sub new { 3155sub new {
2406 my ($class, %arg) = @_; 3156 my ($class, %arg) = @_;
2407 3157
2408 my $range = delete $arg{range}; 3158 my $range = delete $arg{range};
2409 3159
2410 my $self = $class->SUPER::new ( 3160 my $self = $class->SUPER::new (
2411 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3161 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2412 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3162 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2413 to_value => sub { shift }, 3163 to_value => sub { shift },
2414 from_value => sub { shift }, 3164 from_value => sub { shift },
2415 %arg, 3165 %arg,
2416 ); 3166 );
2417 3167
… …
2437sub set_range { shift->{slider}->set_range (@_) } 3187sub set_range { shift->{slider}->set_range (@_) }
2438sub set_value { shift->{slider}->set_value (@_) } 3188sub set_value { shift->{slider}->set_value (@_) }
2439 3189
2440############################################################################# 3190#############################################################################
2441 3191
2442package CFClient::UI::TextView; 3192package CFPlus::UI::TextScroller;
2443 3193
2444our @ISA = CFClient::UI::HBox::; 3194our @ISA = CFPlus::UI::HBox::;
2445 3195
2446use CFClient::OpenGL; 3196use CFPlus::OpenGL;
2447 3197
2448sub new { 3198sub new {
2449 my $class = shift; 3199 my $class = shift;
2450 3200
2451 my $self = $class->SUPER::new ( 3201 my $self = $class->SUPER::new (
2452 fontsize => 1, 3202 fontsize => 1,
2453 can_events => 0, 3203 can_events => 1,
3204 indent => 0,
2454 #font => default_font 3205 #font => default_font
2455 @_, 3206 @_,
2456 3207
2457 layout => (new CFClient::Layout 1), 3208 layout => (new CFPlus::Layout),
2458 par => [], 3209 par => [],
3210 max_par => 0,
2459 height => 0, 3211 height => 0,
2460 children => [ 3212 children => [
2461 (new CFClient::UI::Empty expand => 1), 3213 (new CFPlus::UI::Empty expand => 1),
2462 (new CFClient::UI::Slider vertical => 1), 3214 (new CFPlus::UI::Slider vertical => 1),
2463 ], 3215 ],
2464 ); 3216 );
2465 3217
2466 $self->{children}[1]->connect (changed => sub { $self->update }); 3218 $self->{children}[1]->connect (changed => sub { $self->update });
2467 3219
… …
2473 3225
2474 $self->{fontsize} = $fontsize; 3226 $self->{fontsize} = $fontsize;
2475 $self->reflow; 3227 $self->reflow;
2476} 3228}
2477 3229
3230sub size_request {
3231 my ($self) = @_;
3232
3233 my ($empty, $slider) = $self->visible_children;
3234
3235 local $self->{children} = [$empty, $slider];
3236 $self->SUPER::size_request
3237}
3238
2478sub size_allocate { 3239sub invoke_size_allocate {
2479 my ($self, $w, $h) = @_; 3240 my ($self, $w, $h) = @_;
2480 3241
2481 $self->SUPER::size_allocate ($w, $h); 3242 my ($empty, $slider, @other) = @{ $self->{children} };
3243 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2482 3244
2483 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3245 $self->{layout}->set_font ($self->{font}) if $self->{font};
2484 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3246 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2485 $self->{layout}->set_width ($self->{children}[0]{w}); 3247 $self->{layout}->set_width ($empty->{w});
3248 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2486 3249
2487 $self->reflow; 3250 $self->reflow;
2488}
2489 3251
2490sub text_size { 3252 local $self->{children} = [$empty, $slider];
3253 $self->SUPER::invoke_size_allocate ($w, $h)
3254}
3255
3256sub invoke_mouse_wheel {
2491 my ($self, $text, $indent) = @_; 3257 my ($self, $ev) = @_;
3258
3259 return 0 unless $ev->{dy}; # only vertical movements
3260
3261 $self->{children}[1]->emit (mouse_wheel => $ev);
3262
3263 1
3264}
3265
3266sub get_layout {
3267 my ($self, $para) = @_;
2492 3268
2493 my $layout = $self->{layout}; 3269 my $layout = $self->{layout};
2494 3270
3271 $layout->set_font ($self->{font}) if $self->{font};
3272 $layout->set_foreground (@{$para->{fg}});
2495 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3273 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2496 $layout->set_width ($self->{children}[0]{w} - $indent); 3274 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3275 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2497 $layout->set_markup ($text); 3276 $layout->set_markup ($para->{markup});
3277
3278 $layout->set_shapes (
3279 map
3280 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3281 @{$para->{widget}}
2498 3282 );
3283
2499 $layout->size 3284 $layout
2500} 3285}
2501 3286
2502sub reflow { 3287sub reflow {
2503 my ($self) = @_; 3288 my ($self) = @_;
2504 3289
… …
2511 3296
2512 # todo: base offset on lines or so, not on pixels 3297 # todo: base offset on lines or so, not on pixels
2513 $self->{children}[1]->set_value ($offset); 3298 $self->{children}[1]->set_value ($offset);
2514} 3299}
2515 3300
3301sub current_paragraph {
3302 my ($self) = @_;
3303
3304 $self->{top_paragraph} - 1
3305}
3306
3307sub scroll_to {
3308 my ($self, $para) = @_;
3309
3310 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3311
3312 $self->{scroll_to} = $para;
3313 $self->update;
3314}
3315
2516sub clear { 3316sub clear {
2517 my ($self) = @_; 3317 my ($self) = @_;
3318
3319 my (undef, undef, @other) = @{ $self->{children} };
3320 $self->remove ($_) for @other;
2518 3321
2519 $self->{par} = []; 3322 $self->{par} = [];
2520 $self->{height} = 0; 3323 $self->{height} = 0;
2521 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3324 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2522} 3325}
2523 3326
2524sub add_paragraph { 3327sub add_paragraph {
2525 my ($self, $color, $text, $indent) = @_; 3328 my $self = shift;
2526 3329
2527 for my $line (split /\n/, $text) { 3330 for my $para (@_) {
2528 my ($w, $h) = $self->text_size ($line); 3331 $para = {
3332 fg => [1, 1, 1, 1],
3333 indent => 0,
3334 markup => "",
3335 widget => [],
3336 ref $para ? %$para : (markup => $para),
3337 w => 1e10,
3338 wrapped => 1,
3339 };
3340
3341 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3342 push @{$self->{par}}, $para;
3343 }
3344
3345 if (my $max = $self->{max_par}) {
3346 shift @{$self->{par}} while @{$self->{par}} > $max;
3347 }
3348
3349 $self->{need_reflow}++;
3350 $self->update;
3351}
3352
3353sub scroll_to_bottom {
3354 my ($self) = @_;
3355
3356 $self->{scroll_to} = $#{$self->{par}};
3357 $self->update;
3358}
3359
3360sub force_uptodate {
3361 my ($self) = @_;
3362
3363 if (delete $self->{need_reflow}) {
3364 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3365
3366 my $height = 0;
3367
3368 for my $para (@{$self->{par}}) {
3369 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3370 my $layout = $self->get_layout ($para);
3371 my ($w, $h) = $layout->size;
3372
3373 $para->{w} = $w + $para->{indent};
3374 $para->{h} = $h;
3375 $para->{wrapped} = $layout->has_wrapped;
3376 }
3377
3378 $para->{y} = $height;
3379 $height += $para->{h};
3380 }
3381
2529 $self->{height} += $h; 3382 $self->{height} = $height;
2530 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3383 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2531 }
2532 3384
2533 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3385 delete $self->{texture};
3386 }
3387
3388 if (my $paridx = delete $self->{scroll_to}) {
3389 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3390 }
2534} 3391}
2535 3392
2536sub update { 3393sub update {
2537 my ($self) = @_; 3394 my ($self) = @_;
2538 3395
… …
2540 3397
2541 return unless $self->{h} > 0; 3398 return unless $self->{h} > 0;
2542 3399
2543 delete $self->{texture}; 3400 delete $self->{texture};
2544 3401
2545 $ROOT->on_post_alloc ($self, sub { 3402 $ROOT->on_post_alloc ($self => sub {
3403 $self->force_uptodate;
3404
2546 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3405 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2547 3406
2548 if (delete $self->{need_reflow}) {
2549 my $height = 0;
2550
2551 my $layout = $self->{layout};
2552
2553 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2554
2555 for (@{$self->{par}}) {
2556 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2557 $layout->set_width ($W - $_->[3]);
2558 $layout->set_markup ($_->[4]);
2559 my ($w, $h) = $layout->size;
2560 $_->[0] = $w + $_->[3];
2561 $_->[1] = $h;
2562 }
2563
2564 $height += $_->[1];
2565 }
2566
2567 $self->{height} = $height;
2568
2569 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2570
2571 delete $self->{texture};
2572 }
2573
2574 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3407 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2575 glClearColor 0.5, 0.5, 0.5, 0; 3408 glClearColor 0, 0, 0, 0;
2576 glClear GL_COLOR_BUFFER_BIT; 3409 glClear GL_COLOR_BUFFER_BIT;
2577 3410
3411 package CFPlus::UI::Base;
3412 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3413 (0, 0, $self->{w}, $self->{h});
3414
3415 my $top = int $self->{children}[1]{range}[0];
3416
3417 my $paridx = 0;
3418 my $top_paragraph;
2578 my $top = int $self->{children}[1]{range}[0]; 3419 my $top = int $self->{children}[1]{range}[0];
2579 3420
2580 my $y0 = $top; 3421 my $y0 = $top;
2581 my $y1 = $top + $H; 3422 my $y1 = $top + $H;
2582 3423
2583 my $y = 0;
2584
2585 my $layout = $self->{layout};
2586
2587 $layout->set_font ($self->{font}) if $self->{font};
2588
2589 glEnable GL_BLEND;
2590 #TODO# not correct in windows where rgba is forced off
2591 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2592
2593 for my $par (@{$self->{par}}) { 3424 for my $para (@{$self->{par}}) {
2594 my $h = $par->[1]; 3425 my $h = $para->{h};
3426 my $y = $para->{y};
2595 3427
2596 if ($y0 < $y + $h && $y < $y1) { 3428 if ($y0 < $y + $h && $y < $y1) {
2597 $layout->set_foreground (@{ $par->[2] }); 3429 my $layout = $self->get_layout ($para);
2598 $layout->set_width ($W - $par->[3]);
2599 $layout->set_markup ($par->[4]);
2600 3430
2601 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3431 $layout->render ($para->{indent}, $y - $y0);
3432 $layout->draw;
2602 3433
2603 glRasterPos $par->[3], $y - $y0; 3434 if (my @w = @{ $para->{widget} }) {
2604 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3435 my @s = $layout->get_shapes;
3436
3437 for (@w) {
3438 my ($dx, $dy) = splice @s, 0, 2, ();
3439
3440 $_->{x} = $dx + $para->{indent};
3441 $_->{y} = $dy + $y - $y0;
3442
3443 $_->draw;
3444 }
3445 }
2605 } 3446 }
2606 3447
2607 $y += $h; 3448 $paridx++;
3449 $top_paragraph ||= $paridx if $y >= $top;
2608 } 3450 }
2609 3451
2610 glDisable GL_BLEND; 3452 $self->{top_paragraph} = $top_paragraph;
2611 }; 3453 };
2612 }); 3454 });
2613} 3455}
2614 3456
3457sub reconfigure {
3458 my ($self) = @_;
3459
3460 $self->SUPER::reconfigure;
3461
3462 $_->{w} = 1e10 for @{ $self->{par} };
3463 $self->reflow;
3464}
3465
2615sub _draw { 3466sub _draw {
2616 my ($self) = @_; 3467 my ($self) = @_;
2617 3468
2618 glEnable GL_TEXTURE_2D; 3469 glEnable GL_TEXTURE_2D;
2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2620 glColor 1, 1, 1, 1; 3471 glColor 0, 0, 0, 1;
2621 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3472 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2622 glDisable GL_TEXTURE_2D; 3473 glDisable GL_TEXTURE_2D;
2623 3474
2624 $self->{children}[1]->draw; 3475 $self->{children}[1]->draw;
2625
2626} 3476}
2627 3477
2628############################################################################# 3478#############################################################################
2629 3479
2630package CFClient::UI::Animator; 3480package CFPlus::UI::Animator;
2631 3481
2632use CFClient::OpenGL; 3482use CFPlus::OpenGL;
2633 3483
2634our @ISA = CFClient::UI::Bin::; 3484our @ISA = CFPlus::UI::Bin::;
2635 3485
2636sub moveto { 3486sub moveto {
2637 my ($self, $x, $y) = @_; 3487 my ($self, $x, $y) = @_;
2638 3488
2639 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3489 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2667 glPopMatrix; 3517 glPopMatrix;
2668} 3518}
2669 3519
2670############################################################################# 3520#############################################################################
2671 3521
2672package CFClient::UI::Flopper; 3522package CFPlus::UI::Flopper;
2673 3523
2674our @ISA = CFClient::UI::Button::; 3524our @ISA = CFPlus::UI::Button::;
2675 3525
2676sub new { 3526sub new {
2677 my $class = shift; 3527 my $class = shift;
2678 3528
2679 my $self = $class->SUPER::new ( 3529 my $self = $class->SUPER::new (
… …
2691 $self->{other}->toggle_visibility; 3541 $self->{other}->toggle_visibility;
2692} 3542}
2693 3543
2694############################################################################# 3544#############################################################################
2695 3545
2696package CFClient::UI::Tooltip; 3546package CFPlus::UI::Tooltip;
2697 3547
2698our @ISA = CFClient::UI::Bin::; 3548our @ISA = CFPlus::UI::Bin::;
2699 3549
2700use CFClient::OpenGL; 3550use CFPlus::OpenGL;
2701 3551
2702sub new { 3552sub new {
2703 my $class = shift; 3553 my $class = shift;
2704 3554
2705 $class->SUPER::new ( 3555 $class->SUPER::new (
… …
2709} 3559}
2710 3560
2711sub set_tooltip_from { 3561sub set_tooltip_from {
2712 my ($self, $widget) = @_; 3562 my ($self, $widget) = @_;
2713 3563
2714 my $tooltip = $widget->{tooltip}; 3564 my $tip = $widget->{tooltip};
3565 $tip = $tip->($widget) if "CODE" eq ref $tip;
3566
3567 $tip = CFPlus::Pod::section_label tooltip => $1
3568 if $tip =~ /^#(.*)$/;
2715 3569
2716 if ($ENV{CFPLUS_DEBUG} & 2) { 3570 if ($ENV{CFPLUS_DEBUG} & 2) {
2717 $tooltip .= "\n\n" . (ref $widget) . "\n" 3571 $tip .= "\n\n" . (ref $widget) . "\n"
2718 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3572 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2719 . "req $widget->{req_w} $widget->{req_h}\n" 3573 . "req $widget->{req_w} $widget->{req_h}\n"
2720 . "visible $widget->{visible}"; 3574 . "visible $widget->{visible}";
2721 } 3575 }
2722 3576
3577 $tip =~ s/^\n+//;
3578 $tip =~ s/\n+$//;
3579
2723 $self->add (new CFClient::UI::Label 3580 $self->add (new CFPlus::UI::Label
2724 markup => $tooltip, 3581 markup => $tip,
2725 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3582 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2726 fontsize => 0.8, 3583 fontsize => 0.8,
2727 fg => [0, 0, 0, 1], 3584 style => 1, # FLAG_INVERSE
2728 ellipsise => 0, 3585 ellipsise => 0,
2729 font => ($widget->{tooltip_font} || $::FONT_PROP), 3586 font => ($widget->{tooltip_font} || $::FONT_PROP),
2730 ); 3587 );
2731} 3588}
2732 3589
… …
2736 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3593 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2737 3594
2738 ($w + 4, $h + 4) 3595 ($w + 4, $h + 4)
2739} 3596}
2740 3597
2741sub size_allocate { 3598sub invoke_size_allocate {
2742 my ($self, $w, $h) = @_; 3599 my ($self, $w, $h) = @_;
2743 3600
2744 $self->SUPER::size_allocate ($w - 4, $h - 4); 3601 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2745} 3602}
2746 3603
2747sub visibility_change { 3604sub invoke_visibility_change {
2748 my ($self, $visible) = @_; 3605 my ($self, $visible) = @_;
2749 3606
2750 return unless $visible; 3607 return unless $visible;
2751 3608
2752 $self->{root}->on_post_alloc ("move_$self" => sub { 3609 $self->{root}->on_post_alloc ("move_$self" => sub {
2753 my $widget = $self->{owner} 3610 my $widget = $self->{owner}
2754 or return; 3611 or return;
2755 3612
3613 if ($widget->{visible}) {
2756 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3614 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2757 3615
2758 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3616 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2759 if $x + $self->{w} > $::WIDTH; 3617 if $x + $self->{w} > $self->{root}{w};
2760 3618
2761 $self->move_abs ($x, $y); 3619 $self->move_abs ($x, $y);
3620 } else {
3621 $self->hide;
3622 }
2762 }); 3623 });
2763} 3624}
2764 3625
2765sub _draw { 3626sub _draw {
2766 my ($self) = @_; 3627 my ($self) = @_;
… …
2768 glTranslate 0.375, 0.375; 3629 glTranslate 0.375, 0.375;
2769 3630
2770 my ($w, $h) = @$self{qw(w h)}; 3631 my ($w, $h) = @$self{qw(w h)};
2771 3632
2772 glColor 1, 0.8, 0.4; 3633 glColor 1, 0.8, 0.4;
2773 glBegin GL_QUADS; 3634 glRect 0, 0, $w, $h;
2774 glVertex 0 , 0;
2775 glVertex 0 , $h;
2776 glVertex $w, $h;
2777 glVertex $w, 0;
2778 glEnd;
2779 3635
2780 glColor 0, 0, 0; 3636 glColor 0, 0, 0;
2781 glBegin GL_LINE_LOOP; 3637 glRect_lineloop 0, 0, $w, $h;
2782 glVertex 0 , 0;
2783 glVertex 0 , $h;
2784 glVertex $w, $h;
2785 glVertex $w, 0;
2786 glEnd;
2787 3638
2788 glTranslate 2 - 0.375, 2 - 0.375; 3639 glTranslate 2 - 0.375, 2 - 0.375;
2789 3640
2790 $self->SUPER::_draw; 3641 $self->SUPER::_draw;
2791} 3642}
2792 3643
2793############################################################################# 3644#############################################################################
2794 3645
2795package CFClient::UI::Face; 3646package CFPlus::UI::Face;
2796 3647
2797our @ISA = CFClient::UI::Base::; 3648our @ISA = CFPlus::UI::DrawBG::;
2798 3649
2799use CFClient::OpenGL; 3650use CFPlus::OpenGL;
2800 3651
2801sub new { 3652sub new {
2802 my $class = shift; 3653 my $class = shift;
2803 3654
2804 my $self = $class->SUPER::new ( 3655 my $self = $class->SUPER::new (
3656 size_w => 32,
3657 size_h => 8,
2805 aspect => 1, 3658 aspect => 1,
2806 can_events => 0, 3659 can_events => 0,
2807 @_, 3660 @_,
2808 ); 3661 );
2809 3662
2810 if ($self->{anim} && $self->{animspeed}) { 3663 if ($self->{anim} && $self->{animspeed}) {
2811 Scalar::Util::weaken (my $widget = $self); 3664 CFPlus::weaken (my $widget = $self);
2812 3665
3666 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3667 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2813 $self->{timer} = Event->timer ( 3668 $self->{timer} = Event->timer (
2814 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2815 hard => 1, 3669 parked => 1,
2816 interval => $self->{animspeed},
2817 cb => sub { 3670 cb => sub {
3671 return unless $::CONN;
3672
3673 my $w = $widget
3674 or return;
3675
2818 ++$widget->{frame}; 3676 ++$w->{frame};
3677 $w->update_face;
3678
3679 # somehow, $widget can go away
2819 $widget->update; 3680 $w->update;
3681 $w->update_timer;
2820 }, 3682 },
2821 ); 3683 );
3684
3685 $self->update_face;
3686 $self->update_timer;
2822 } 3687 }
2823 3688
2824 $self 3689 $self
2825} 3690}
2826 3691
3692sub update_timer {
3693 my ($self) = @_;
3694
3695 return unless $self->{timer};
3696
3697 if ($self->{visible}) {
3698 $self->{timer}->at (
3699 $self->{anim_start}
3700 + $self->{animspeed}
3701 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3702 );
3703 $self->{timer}->start;
3704 } else {
3705 $self->{timer}->stop;
3706 }
3707}
3708
3709sub update_face {
3710 my ($self) = @_;
3711
3712 if ($::CONN) {
3713 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3714 if ($anim && @$anim) {
3715 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3716 delete $self->{face_change_cb};
3717
3718 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3719 unless ($tex->{name} || $tex->{loading}) {
3720 $tex->upload (sub { $self->reconfigure });
3721 }
3722 }
3723 }
3724 }
3725 }
3726}
3727
2827sub size_request { 3728sub size_request {
2828 (32, 8) 3729 my ($self) = @_;
3730
3731 if ($::CONN) {
3732 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3733 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3734 if ($tex->{name}) {
3735 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3736 } elsif (!$tex->{loading}) {
3737 $tex->upload (sub { $self->reconfigure });
3738 }
3739 }
3740
3741 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3742 }
3743 }
3744
3745 ($self->{size_w} || 8, $self->{size_h} || 8)
2829} 3746}
2830 3747
2831sub update { 3748sub update {
2832 my ($self) = @_; 3749 my ($self) = @_;
2833 3750
2834 return unless $self->{visible}; 3751 return unless $self->{visible};
2835 3752
2836 $self->SUPER::update; 3753 $self->SUPER::update;
2837} 3754}
2838 3755
3756sub invoke_visibility_change {
3757 my ($self) = @_;
3758
3759 $self->update_timer;
3760
3761 0
3762}
3763
2839sub _draw { 3764sub _draw {
2840 my ($self) = @_; 3765 my ($self) = @_;
2841 3766
2842 return unless $::CONN; 3767 $self->SUPER::_draw;
2843 3768
2844 my $face; 3769 if (my $tex = $self->{tex}) {
2845
2846 if ($self->{frame}) {
2847 my $anim = $::CONN->{anim}[$self->{anim}];
2848
2849 $face = $anim->[ $self->{frame} % @$anim ]
2850 if $anim && @$anim;
2851 }
2852
2853 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2854
2855 if ($tex) {
2856 glEnable GL_TEXTURE_2D; 3770 glEnable GL_TEXTURE_2D;
2857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3771 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2858 glColor 1, 1, 1, 1; 3772 glColor 0, 0, 0, 1;
2859 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3773 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2860 glDisable GL_TEXTURE_2D; 3774 glDisable GL_TEXTURE_2D;
2861 } 3775 }
2862} 3776}
2863 3777
2864sub DESTROY { 3778sub destroy {
2865 my ($self) = @_; 3779 my ($self) = @_;
2866 3780
2867 $self->{timer}->cancel 3781 (delete $self->{timer})->cancel
2868 if $self->{timer}; 3782 if $self->{timer};
2869 3783
2870 $self->SUPER::DESTROY; 3784 $self->SUPER::destroy;
2871} 3785}
2872 3786
2873############################################################################# 3787#############################################################################
2874 3788
2875package CFClient::UI::Buttonbar; 3789package CFPlus::UI::Buttonbar;
2876 3790
2877our @ISA = CFClient::UI::HBox::; 3791our @ISA = CFPlus::UI::HBox::;
2878 3792
2879# TODO: should actualyl wrap buttons and other goodies. 3793# TODO: should actually wrap buttons and other goodies.
2880 3794
2881############################################################################# 3795#############################################################################
2882 3796
2883package CFClient::UI::Menu; 3797package CFPlus::UI::Menu;
2884 3798
2885our @ISA = CFClient::UI::FancyFrame::; 3799our @ISA = CFPlus::UI::Toplevel::;
2886 3800
2887use CFClient::OpenGL; 3801use CFPlus::OpenGL;
2888 3802
2889sub new { 3803sub new {
2890 my $class = shift; 3804 my $class = shift;
2891 3805
2892 my $self = $class->SUPER::new ( 3806 my $self = $class->SUPER::new (
2893 items => [], 3807 items => [],
2894 z => 100, 3808 z => 100,
2895 @_, 3809 @_,
2896 ); 3810 );
2897 3811
2898 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3812 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2899 3813
2900 for my $item (@{ $self->{items} }) { 3814 for my $item (@{ $self->{items} }) {
2901 my ($widget, $cb) = @$item; 3815 my ($widget, $cb, $tooltip) = @$item;
2902 3816
2903 # handle various types of items, only text for now 3817 # handle various types of items, only text for now
2904 if (!ref $widget) { 3818 if (!ref $widget) {
3819 if ($widget =~ /\t/) {
3820 my ($left, $right) = split /\t/, $widget, 2;
3821
2905 $widget = new CFClient::UI::Label 3822 $widget = new CFPlus::UI::HBox
2906 can_hover => 1, 3823 can_hover => 1,
2907 can_events => 1, 3824 can_events => 1,
3825 tooltip => $tooltip,
3826 children => [
3827 (new CFPlus::UI::Label markup => $left, expand => 1),
3828 (new CFPlus::UI::Label markup => $right, align => +1),
3829 ],
3830 ;
3831
3832 } else {
3833 $widget = new CFPlus::UI::Label
3834 can_hover => 1,
3835 can_events => 1,
2908 text => $widget; 3836 markup => $widget,
3837 tooltip => $tooltip;
3838 }
2909 } 3839 }
2910 3840
2911 $self->{item}{$widget} = $item; 3841 $self->{item}{$widget} = $item;
2912 3842
2913 $self->{vbox}->add ($widget); 3843 $self->{vbox}->add ($widget);
… …
2918 3848
2919# popup given the event (must be a mouse button down event currently) 3849# popup given the event (must be a mouse button down event currently)
2920sub popup { 3850sub popup {
2921 my ($self, $ev) = @_; 3851 my ($self, $ev) = @_;
2922 3852
2923 $self->_emit ("popdown"); 3853 $self->emit ("popdown");
2924 3854
2925 # maybe save $GRAB? must be careful about events... 3855 # maybe save $GRAB? must be careful about events...
2926 $GRAB = $self; 3856 $GRAB = $self;
2927 $self->{button} = $ev->{button}; 3857 $self->{button} = $ev->{button};
2928 3858
2929 $self->show; 3859 $self->show;
2930 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3860 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2931} 3861}
2932 3862
2933sub mouse_motion { 3863sub invoke_mouse_motion {
2934 my ($self, $ev, $x, $y) = @_; 3864 my ($self, $ev, $x, $y) = @_;
2935 3865
2936 # TODO: should use vbox->find_widget or so 3866 # TODO: should use vbox->find_widget or so
2937 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3867 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2938 $self->{hover} = $self->{item}{$HOVER}; 3868 $self->{hover} = $self->{item}{$HOVER};
2939 3869
2940 0 3870 0
2941} 3871}
2942 3872
2943sub button_up { 3873sub invoke_button_up {
2944 my ($self, $ev, $x, $y) = @_; 3874 my ($self, $ev, $x, $y) = @_;
2945 3875
2946 if ($ev->{button} == $self->{button}) { 3876 if ($ev->{button} == $self->{button}) {
2947 undef $GRAB; 3877 undef $GRAB;
2948 $self->hide; 3878 $self->hide;
2949 3879
2950 $self->_emit ("popdown"); 3880 $self->emit ("popdown");
2951 $self->{hover}[1]->() if $self->{hover}; 3881 $self->{hover}[1]->() if $self->{hover};
2952 } else { 3882 } else {
2953 return 0 3883 return 0
2954 } 3884 }
2955 3885
2956 1 3886 1
2957} 3887}
2958 3888
2959############################################################################# 3889#############################################################################
2960 3890
2961package CFClient::UI::Multiplexer; 3891package CFPlus::UI::Multiplexer;
2962 3892
2963our @ISA = CFClient::UI::Container::; 3893our @ISA = CFPlus::UI::Container::;
2964 3894
2965sub new { 3895sub new {
2966 my $class = shift; 3896 my $class = shift;
2967 3897
2968 my $self = $class->SUPER::new ( 3898 my $self = $class->SUPER::new (
… …
2982 3912
2983 $self->{current} = $self->{children}[0] 3913 $self->{current} = $self->{children}[0]
2984 if @{ $self->{children} }; 3914 if @{ $self->{children} };
2985} 3915}
2986 3916
3917sub get_current_page {
3918 my ($self) = @_;
3919
3920 $self->{current}
3921}
3922
2987sub set_current_page { 3923sub set_current_page {
2988 my ($self, $page_or_widget) = @_; 3924 my ($self, $page_or_widget) = @_;
2989 3925
2990 my $widget = ref $page_or_widget 3926 my $widget = ref $page_or_widget
2991 ? $page_or_widget 3927 ? $page_or_widget
2992 : $self->{children}[$page_or_widget]; 3928 : $self->{children}[$page_or_widget];
2993 3929
2994 $self->{current} = $widget; 3930 $self->{current} = $widget;
2995 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3931 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2996 3932
2997 $self->_emit (page_changed => $self->{current}); 3933 $self->emit (page_changed => $self->{current});
2998 3934
2999 $self->realloc; 3935 $self->realloc;
3000} 3936}
3001 3937
3002sub visible_children { 3938sub visible_children {
… …
3007 my ($self) = @_; 3943 my ($self) = @_;
3008 3944
3009 $self->{current}->size_request 3945 $self->{current}->size_request
3010} 3946}
3011 3947
3012sub size_allocate { 3948sub invoke_size_allocate {
3013 my ($self, $w, $h) = @_; 3949 my ($self, $w, $h) = @_;
3014 3950
3015 $self->{current}->configure (0, 0, $w, $h); 3951 $self->{current}->configure (0, 0, $w, $h);
3952
3953 1
3016} 3954}
3017 3955
3018sub _draw { 3956sub _draw {
3019 my ($self) = @_; 3957 my ($self) = @_;
3020 3958
3021 $self->{current}->draw; 3959 $self->{current}->draw;
3022} 3960}
3023 3961
3024############################################################################# 3962#############################################################################
3025 3963
3026package CFClient::UI::Notebook; 3964package CFPlus::UI::Notebook;
3027 3965
3966use CFPlus::OpenGL;
3967
3028our @ISA = CFClient::UI::VBox::; 3968our @ISA = CFPlus::UI::VBox::;
3029 3969
3030sub new { 3970sub new {
3031 my $class = shift; 3971 my $class = shift;
3032 3972
3033 my $self = $class->SUPER::new ( 3973 my $self = $class->SUPER::new (
3034 buttonbar => (new CFClient::UI::Buttonbar), 3974 buttonbar => (new CFPlus::UI::Buttonbar),
3035 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3975 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3976 active_outline => [1, 1, 0],
3036 # filter => # will be put between multiplexer and $self 3977 # filter => # will be put between multiplexer and $self
3037 @_, 3978 @_,
3038 ); 3979 );
3039 3980
3040 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3981 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3041 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3982 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3042 3983
3984 {
3985 Scalar::Util::weaken (my $wself = $self);
3986
3987 $self->{multiplexer}->connect (c_add => sub {
3988 my ($mplex, $widgets) = @_;
3989
3990 for my $child (@$widgets) {
3991 Scalar::Util::weaken $child;
3992 $child->{c_tab_} ||= do {
3993 my $tab =
3994 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3995 ? $child->{c_tab}
3996 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3997
3998 $tab->connect (activate => sub {
3999 $wself->set_current_page ($child);
4000 });
4001
4002 $tab
4003 };
4004
4005 $self->{buttonbar}->add ($child->{c_tab_});
4006 }
4007 });
4008
4009 $self->{multiplexer}->connect (c_remove => sub {
4010 my ($mplex, $widgets) = @_;
4011
4012 for my $child (@$widgets) {
4013 $wself->{buttonbar}->remove ($child->{c_tab_});
4014 }
4015 });
4016 }
4017
3043 $self 4018 $self
3044} 4019}
3045 4020
3046sub add { 4021sub add {
4022 my ($self, @widgets) = @_;
4023
4024 $self->{multiplexer}->add (@widgets)
4025}
4026
4027sub remove {
4028 my ($self, @widgets) = @_;
4029
4030 $self->{multiplexer}->remove (@widgets)
4031}
4032
4033sub pages {
4034 my ($self) = @_;
4035 $self->{multiplexer}->children
4036}
4037
4038sub add_tab {
3047 my ($self, $title, $widget, $tooltip) = @_; 4039 my ($self, $title, $widget, $tooltip) = @_;
3048 4040
3049 Scalar::Util::weaken $self; 4041 $title = [$title, $tooltip] unless ref $title;
4042 $widget->{c_tab} = $title;
3050 4043
3051 $self->{buttonbar}->add (new CFClient::UI::Button
3052 markup => $title,
3053 tooltip => $tooltip,
3054 on_activate => sub { $self->set_current_page ($widget) },
3055 );
3056
3057 $self->{multiplexer}->add ($widget); 4044 $self->add ($widget);
4045}
4046
4047sub get_current_page {
4048 my ($self) = @_;
4049
4050 $self->{multiplexer}->get_current_page
3058} 4051}
3059 4052
3060sub set_current_page { 4053sub set_current_page {
3061 my ($self, $page) = @_; 4054 my ($self, $page) = @_;
3062 4055
3063 $self->{multiplexer}->set_current_page ($page); 4056 $self->{multiplexer}->set_current_page ($page);
3064 $self->_emit (page_changed => $self->{multiplexer}{current}); 4057 $self->emit (page_changed => $self->{multiplexer}{current});
4058}
4059
4060sub _draw {
4061 my ($self) = @_;
4062
4063 $self->SUPER::_draw ();
4064
4065 if (my $cur = $self->{multiplexer}{current}) {
4066 if ($cur = $cur->{c_tab_}) {
4067 glTranslate $cur->{x}, $cur->{y};
4068 glLineWidth 3;
4069 glColor @{$self->{active_outline}};
4070 glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
4071 glLineWidth 1;
4072 }
4073 }
3065} 4074}
3066 4075
3067############################################################################# 4076#############################################################################
3068 4077
3069package CFClient::UI::Statusbox; 4078package CFPlus::UI::Selector;
3070 4079
4080use utf8;
4081
3071our @ISA = CFClient::UI::VBox::; 4082our @ISA = CFPlus::UI::Button::;
3072 4083
3073sub new { 4084sub new {
3074 my $class = shift; 4085 my $class = shift;
3075 4086
3076 $class->SUPER::new ( 4087 my $self = $class->SUPER::new (
4088 options => [], # [value, title, longdesc], ...
4089 value => undef,
4090 @_,
4091 );
4092
4093 $self->_set_value ($self->{value});
4094
4095 $self
4096}
4097
4098sub invoke_button_down {
4099 my ($self, $ev) = @_;
4100
4101 my @menu_items;
4102
4103 for (@{ $self->{options} }) {
4104 my ($value, $title, $tooltip) = @$_;
4105
4106 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
4107 }
4108
4109 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
4110}
4111
4112sub _set_value {
4113 my ($self, $value) = @_;
4114
4115 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
4116 or return;
4117
4118 $self->{value} = $item->[0];
4119 $self->set_markup ("$item->[1] ⇓");
4120 $self->set_tooltip ($item->[2]);
4121}
4122
4123sub set_value {
4124 my ($self, $value) = @_;
4125
4126 return unless $self->{value} ne $value;
4127
4128 $self->_set_value ($value);
4129 $self->emit (changed => $value);
4130}
4131
4132#############################################################################
4133
4134package CFPlus::UI::Statusbox;
4135
4136our @ISA = CFPlus::UI::VBox::;
4137
4138sub new {
4139 my $class = shift;
4140
4141 my $self = $class->SUPER::new (
3077 fontsize => 0.8, 4142 fontsize => 0.8,
3078 @_, 4143 @_,
3079 ) 4144 );
4145
4146 CFPlus::weaken (my $this = $self);
4147
4148 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
4149
4150 $self
3080} 4151}
3081 4152
3082sub reorder { 4153sub reorder {
3083 my ($self) = @_; 4154 my ($self) = @_;
3084 my $NOW = time; 4155 my $NOW = Time::HiRes::time;
4156
4157 # freeze display when hovering over any label
4158 return if $CFPlus::UI::TOOLTIP->{owner}
4159 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
4160 values %{ $self->{item} };
3085 4161
3086 while (my ($k, $v) = each %{ $self->{item} }) { 4162 while (my ($k, $v) = each %{ $self->{item} }) {
3087 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4163 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3088 } 4164 }
3089 4165
… …
3092 my @items = sort { 4168 my @items = sort {
3093 $a->{pri} <=> $b->{pri} 4169 $a->{pri} <=> $b->{pri}
3094 or $b->{id} <=> $a->{id} 4170 or $b->{id} <=> $a->{id}
3095 } values %{ $self->{item} }; 4171 } values %{ $self->{item} };
3096 4172
4173 $self->{timer}->interval (1);
4174
3097 my $count = 10 + 1; 4175 my $count = 10 + 1;
3098 for my $item (@items) { 4176 for my $item (@items) {
3099 last unless --$count; 4177 last unless --$count;
3100 4178
3101 push @widgets, $item->{label} ||= do { 4179 my $label = $item->{label} ||= do {
3102 # TODO: doesn't handle markup well (read as: at all) 4180 # TODO: doesn't handle markup well (read as: at all)
3103 my $short = $item->{count} > 1 4181 my $short = $item->{count} > 1
3104 ? "<b>$item->{count} ×</b> $item->{text}" 4182 ? "<b>$item->{count} ×</b> $item->{text}"
3105 : $item->{text}; 4183 : $item->{text};
3106 4184
3107 for ($short) { 4185 for ($short) {
3108 s/^\s+//; 4186 s/^\s+//;
3109 s/\s+/ /g; 4187 s/\s+/ /g;
3110 } 4188 }
3111 4189
3112 new CFClient::UI::Label 4190 new CFPlus::UI::Label
3113 markup => $short, 4191 markup => $short,
3114 tooltip => $item->{tooltip}, 4192 tooltip => $item->{tooltip},
3115 tooltip_font => $::FONT_PROP, 4193 tooltip_font => $::FONT_PROP,
3116 tooltip_width => 0.67, 4194 tooltip_width => 0.67,
3117 fontsize => $item->{fontsize} || $self->{fontsize}, 4195 fontsize => $item->{fontsize} || $self->{fontsize},
3118 max_w => $::WIDTH * 0.44, 4196 max_w => $::WIDTH * 0.44,
3119 fg => $item->{fg}, 4197 fg => [@{ $item->{fg} }],
3120 can_events => 1, 4198 can_events => 1,
3121 can_hover => 1 4199 can_hover => 1
3122 }; 4200 };
4201
4202 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4203 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4204 $label->update;
4205 $label->set_max_size (undef, $label->{req_h} * $diff)
4206 if $diff < 1;
4207 $self->{timer}->interval (1/30);
4208 } else {
4209 $label->{fg}[3] = $item->{fg}[3] || 1;
4210 }
4211
4212 push @widgets, $label;
3123 } 4213 }
3124 4214
3125 $self->clear; 4215 $self->clear;
3126 $self->SUPER::add (reverse @widgets); 4216 $self->SUPER::add (reverse @widgets);
3127} 4217}
… …
3132 $text =~ s/^\s+//; 4222 $text =~ s/^\s+//;
3133 $text =~ s/\s+$//; 4223 $text =~ s/\s+$//;
3134 4224
3135 return unless $text; 4225 return unless $text;
3136 4226
3137 my $timeout = time + ((delete $arg{timeout}) || 60); 4227 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3138 4228
3139 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 4229 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3140 4230
3141 if (my $item = $self->{item}{$group}) { 4231 if (my $item = $self->{item}{$group}) {
3142 if ($item->{text} eq $text) { 4232 if ($item->{text} eq $text) {
3143 $item->{count}++; 4233 $item->{count}++;
3144 } else { 4234 } else {
3145 $item->{count} = 1; 4235 $item->{count} = 1;
3146 $item->{text} = $item->{tooltip} = $text; 4236 $item->{text} = $item->{tooltip} = $text;
3147 } 4237 }
3148 $item->{id} = ++$self->{id}; 4238 $item->{id} += 0.2;#d#
3149 $item->{timeout} = $timeout; 4239 $item->{timeout} = $timeout;
3150 delete $item->{label}; 4240 delete $item->{label};
3151 } else { 4241 } else {
3152 $self->{item}{$group} = { 4242 $self->{item}{$group} = {
3153 id => ++$self->{id}, 4243 id => ++$self->{id},
… …
3159 count => 1, 4249 count => 1,
3160 %arg, 4250 %arg,
3161 }; 4251 };
3162 } 4252 }
3163 4253
4254 $ROOT->on_refresh (reorder => sub {
3164 $self->reorder; 4255 $self->reorder;
4256 });
3165} 4257}
3166 4258
3167sub reconfigure { 4259sub reconfigure {
3168 my ($self) = @_; 4260 my ($self) = @_;
3169 4261
… …
3172 4264
3173 $self->reorder; 4265 $self->reorder;
3174 $self->SUPER::reconfigure; 4266 $self->SUPER::reconfigure;
3175} 4267}
3176 4268
4269sub destroy {
4270 my ($self) = @_;
4271
4272 $self->{timer}->cancel;
4273
4274 $self->SUPER::destroy;
4275}
4276
3177############################################################################# 4277#############################################################################
3178 4278
3179package CFClient::UI::Inventory;
3180
3181our @ISA = CFClient::UI::ScrolledWindow::;
3182
3183sub new {
3184 my $class = shift;
3185
3186 my $self = $class->SUPER::new (
3187 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3188 @_,
3189 );
3190
3191 $self
3192}
3193
3194sub set_items {
3195 my ($self, $items) = @_;
3196
3197 $self->{child}->clear;
3198 return unless $items;
3199
3200 my @items = sort {
3201 ($a->{type} <=> $b->{type})
3202 or ($a->{name} cmp $b->{name})
3203 } @$items;
3204
3205 $self->{real_items} = \@items;
3206
3207 my $row = 0;
3208 for my $item (@items) {
3209 CFClient::Item::update_widgets $item;
3210
3211 $self->{child}->add (0, $row, $item->{face_widget});
3212 $self->{child}->add (1, $row, $item->{desc_widget});
3213 $self->{child}->add (2, $row, $item->{weight_widget});
3214
3215 $row++;
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::BindEditor;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (my $vb = new CFClient::UI::VBox);
3231
3232
3233 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3234 text => "start recording",
3235 tooltip => "Start/Stops recording of actions."
3236 ."All subsequent actions after the recording started will be captured."
3237 ."The actions are displayed after the record was stopped."
3238 ."To bind the action you have to click on the 'Bind' button",
3239 on_activate => sub {
3240 unless ($self->{recording}) {
3241 $self->start;
3242 } else {
3243 $self->stop;
3244 }
3245 });
3246
3247 $vb->add (new CFClient::UI::Label text => "Actions:");
3248 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3249
3250 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3251 $vb->add (my $hb = new CFClient::UI::HBox);
3252 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3253 $hb->add (new CFClient::UI::Button
3254 text => "bind",
3255 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3256 on_activate => sub {
3257 $self->ask_for_bind;
3258 });
3259
3260 $vb->add (my $hb = new CFClient::UI::HBox);
3261 $hb->add (new CFClient::UI::Button
3262 text => "ok",
3263 expand => 1,
3264 tooltip => "This closes the binding editor and saves the binding",
3265 on_activate => sub {
3266 $self->hide;
3267 $self->commit;
3268 });
3269
3270 $hb->add (new CFClient::UI::Button
3271 text => "cancel",
3272 expand => 1,
3273 tooltip => "This closes the binding editor without saving",
3274 on_activate => sub {
3275 $self->hide;
3276 $self->{binding_cancel}->()
3277 if $self->{binding_cancel};
3278 });
3279
3280 $self->update_binding_widgets;
3281
3282 $self
3283}
3284
3285sub commit {
3286 my ($self) = @_;
3287 my ($mod, $sym, $cmds) = $self->get_binding;
3288 if ($sym != 0 && @$cmds > 0) {
3289 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3290 ."'. Don't forget 'Save Config'!");
3291 $self->{binding_change}->($mod, $sym, $cmds)
3292 if $self->{binding_change};
3293 } else {
3294 $::STATUSBOX->add ("No action bound, no key or action specified!");
3295 $self->{binding_cancel}->()
3296 if $self->{binding_cancel};
3297 }
3298}
3299
3300sub start {
3301 my ($self) = @_;
3302
3303 $self->{rec_btn}->set_text ("stop recording");
3304 $self->{recording} = 1;
3305 $self->clear_command_list;
3306 $::CONN->start_record if $::CONN;
3307}
3308
3309sub stop {
3310 my ($self) = @_;
3311
3312 $self->{rec_btn}->set_text ("start recording");
3313 $self->{recording} = 0;
3314
3315 my $rec;
3316 $rec = $::CONN->stop_record if $::CONN;
3317 return unless ref $rec eq 'ARRAY';
3318 $self->set_command_list ($rec);
3319}
3320
3321
3322sub ask_for_bind_and_commit {
3323 my ($self) = @_;
3324 $self->ask_for_bind (1);
3325}
3326
3327sub ask_for_bind {
3328 my ($self, $commit) = @_;
3329
3330 CFClient::Binder::open_binding_dialog (sub {
3331 my ($mod, $sym) = @_;
3332 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3333 $self->update_binding_widgets;
3334 $self->commit if $commit;
3335 });
3336}
3337
3338# $mod and $sym are the modifiers and key symbol
3339# $cmds is a array ref of strings (the commands)
3340# $cb is the callback that is executed on OK
3341# $ccb is the callback that is executed on CANCEL and
3342# when the binding was unsuccessful on OK
3343sub set_binding {
3344 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3345
3346 $self->clear_command_list;
3347 $self->{recording} = 0;
3348 $self->{rec_btn}->set_text ("start recording");
3349
3350 $self->{binding} = [$mod, $sym];
3351 $self->{commands} = $cmds;
3352
3353 $self->{binding_change} = $cb;
3354 $self->{binding_cancel} = $ccb;
3355
3356 $self->update_binding_widgets;
3357}
3358
3359# this is a shortcut method that asks for a binding
3360# and then just binds it.
3361sub do_quick_binding {
3362 my ($self, $cmds) = @_;
3363 $self->set_binding (undef, undef, $cmds, sub {
3364 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3365 });
3366 $self->ask_for_bind (1);
3367}
3368
3369sub update_binding_widgets {
3370 my ($self) = @_;
3371 my ($mod, $sym, $cmds) = $self->get_binding;
3372 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3373 $self->set_command_list ($cmds);
3374}
3375
3376sub get_binding {
3377 my ($self) = @_;
3378 return (
3379 $self->{binding}->[0],
3380 $self->{binding}->[1],
3381 [ grep { defined $_ } @{$self->{commands}} ]
3382 );
3383}
3384
3385sub clear_command_list {
3386 my ($self) = @_;
3387 $self->{cmdbox}->clear ();
3388}
3389
3390sub set_command_list {
3391 my ($self, $cmds) = @_;
3392
3393 $self->{cmdbox}->clear ();
3394 $self->{commands} = $cmds;
3395
3396 my $idx = 0;
3397
3398 for (@$cmds) {
3399 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3400
3401 my $i = $idx;
3402 $hb->add (new CFClient::UI::Label text => $_);
3403 $hb->add (new CFClient::UI::Button
3404 text => "delete",
3405 tooltip => "Deletes the action from the record",
3406 on_activate => sub {
3407 $self->{cmdbox}->remove ($hb);
3408 $cmds->[$i] = undef;
3409 });
3410
3411
3412 $idx++
3413 }
3414}
3415
3416#############################################################################
3417
3418package CFClient::UI::SpellList;
3419
3420our @ISA = CFClient::UI::Table::;
3421
3422sub new {
3423 my $class = shift;
3424
3425 my $self = $class->SUPER::new (
3426 binding => [],
3427 commands => [],
3428 @_,
3429 )
3430}
3431
3432# XXX: Do sorting? Argl...
3433sub add_spell {
3434 my ($self, $spell) = @_;
3435 $self->{spells}->{$spell->{name}} = $spell;
3436
3437 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3438 face => $spell->{face},
3439 can_hover => 1,
3440 can_events => 1,
3441 tooltip => $spell->{message});
3442
3443 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3444 text => $spell->{name},
3445 can_hover => 1,
3446 can_events => 1,
3447 tooltip => $spell->{message},
3448 expand => 1);
3449
3450 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3451 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3452 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3453 expand => 1);
3454
3455 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3456 text => "bind to key",
3457 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3458}
3459
3460sub rebuild_spell_list {
3461 my ($self) = @_;
3462 $self->{tbl_idx} = 0;
3463 $self->add_spell ($_) for values %{$self->{spells}};
3464}
3465
3466sub remove_spell {
3467 my ($self, $spell) = @_;
3468 delete $self->{spells}->{$spell->{name}};
3469 $self->rebuild_spell_list;
3470}
3471
3472#############################################################################
3473
3474package CFClient::UI::Root; 4279package CFPlus::UI::Root;
3475 4280
3476our @ISA = CFClient::UI::Container::; 4281our @ISA = CFPlus::UI::Container::;
3477 4282
4283use List::Util qw(min max);
4284
3478use CFClient::OpenGL; 4285use CFPlus::OpenGL;
3479 4286
3480sub new { 4287sub new {
3481 my $class = shift; 4288 my $class = shift;
3482 4289
3483 my $self = $class->SUPER::new ( 4290 my $self = $class->SUPER::new (
3484 visible => 1, 4291 visible => 1,
3485 @_, 4292 @_,
3486 ); 4293 );
3487 4294
3488 Scalar::Util::weaken ($self->{root} = $self); 4295 CFPlus::weaken ($self->{root} = $self);
3489 4296
3490 $self 4297 $self
3491} 4298}
3492 4299
3493sub size_request { 4300sub size_request {
… …
3508 $coord = $max - $size if $coord > $max - $size; 4315 $coord = $max - $size if $coord > $max - $size;
3509 4316
3510 int $coord + 0.5 4317 int $coord + 0.5
3511} 4318}
3512 4319
3513sub size_allocate { 4320sub invoke_size_allocate {
3514 my ($self, $w, $h) = @_; 4321 my ($self, $w, $h) = @_;
3515 4322
3516 for my $child ($self->children) { 4323 for my $child ($self->children) {
3517 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4324 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3518 4325
… …
3522 $X = _to_pixel $X, $W, $self->{w}; 4329 $X = _to_pixel $X, $W, $self->{w};
3523 $Y = _to_pixel $Y, $H, $self->{h}; 4330 $Y = _to_pixel $Y, $H, $self->{h};
3524 4331
3525 $child->configure ($X, $Y, $W, $H); 4332 $child->configure ($X, $Y, $W, $H);
3526 } 4333 }
4334
4335 1
3527} 4336}
3528 4337
3529sub coord2local { 4338sub coord2local {
3530 my ($self, $x, $y) = @_; 4339 my ($self, $x, $y) = @_;
3531 4340
… …
3539} 4348}
3540 4349
3541sub update { 4350sub update {
3542 my ($self) = @_; 4351 my ($self) = @_;
3543 4352
3544 $::WANT_REFRESH++; 4353 $::WANT_REFRESH->start;
3545} 4354}
3546 4355
3547sub add { 4356sub add {
3548 my ($self, @children) = @_; 4357 my ($self, @children) = @_;
3549 4358
… …
3586 while ($self->{refresh_hook}) { 4395 while ($self->{refresh_hook}) {
3587 $_->() 4396 $_->()
3588 for values %{delete $self->{refresh_hook}}; 4397 for values %{delete $self->{refresh_hook}};
3589 } 4398 }
3590 4399
3591 if ($self->{realloc}) { 4400 while ($self->{realloc}) {
3592 my %queue; 4401 my %queue;
3593 my @queue; 4402 my @queue;
3594 my $widget; 4403 my $widget;
3595 4404
3596 outer: 4405 outer:
… …
3616 4425
3617 delete $queue{$widget+0}; 4426 delete $queue{$widget+0};
3618 4427
3619 my ($w, $h) = $widget->size_request; 4428 my ($w, $h) = $widget->size_request;
3620 4429
3621 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4430 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3622 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4431 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4432
4433 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4434 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3623 4435
3624 $w = $widget->{force_w} if exists $widget->{force_w}; 4436 $w = $widget->{force_w} if exists $widget->{force_w};
3625 $h = $widget->{force_h} if exists $widget->{force_h}; 4437 $h = $widget->{force_h} if exists $widget->{force_h};
3626 4438
3627 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4439 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3640 } 4452 }
3641 } 4453 }
3642 4454
3643 delete $self->{realloc}{$widget+0}; 4455 delete $self->{realloc}{$widget+0};
3644 } 4456 }
3645 }
3646 4457
3647 while (my $size_alloc = delete $self->{size_alloc}) { 4458 while (my $size_alloc = delete $self->{size_alloc}) {
3648 my @queue = sort { $b->{visible} <=> $a->{visible} } 4459 my @queue = sort { $a->{visible} <=> $b->{visible} }
3649 values %$size_alloc; 4460 values %$size_alloc;
3650 4461
3651 while () { 4462 while () {
3652 my $widget = pop @queue || last; 4463 my $widget = pop @queue || last;
3653 4464
3654 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4465 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3655 4466
3656 $w = 0 if $w < 0; 4467 $w = max $widget->{min_w}, $w;
3657 $h = 0 if $h < 0; 4468 $h = max $widget->{min_h}, $h;
3658 4469
4470# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4471# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4472
4473 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4474 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4475
3659 $w = int $w + 0.5; 4476 $w = int $w + 0.5;
3660 $h = int $h + 0.5; 4477 $h = int $h + 0.5;
3661 4478
3662 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4479 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3663 $widget->{old_w} = $widget->{w}; 4480 $widget->{old_w} = $widget->{w};
3664 $widget->{old_h} = $widget->{h}; 4481 $widget->{old_h} = $widget->{h};
3665 4482
3666 $widget->{w} = $w; 4483 $widget->{w} = $w;
3667 $widget->{h} = $h; 4484 $widget->{h} = $h;
3668 4485
3669 $widget->emit (size_allocate => $w, $h); 4486 $widget->emit (size_allocate => $w, $h);
4487 }
3670 } 4488 }
3671 } 4489 }
3672 } 4490 }
3673 4491
3674 while ($self->{post_alloc_hook}) { 4492 while ($self->{post_alloc_hook}) {
3675 $_->() 4493 $_->()
3676 for values %{delete $self->{post_alloc_hook}}; 4494 for values %{delete $self->{post_alloc_hook}};
3677 } 4495 }
3678
3679 4496
3680 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4497 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3681 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4498 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3682 glClear GL_COLOR_BUFFER_BIT; 4499 glClear GL_COLOR_BUFFER_BIT;
3683 4500
… …
3686 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4503 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3687 glMatrixMode GL_MODELVIEW; 4504 glMatrixMode GL_MODELVIEW;
3688 glLoadIdentity; 4505 glLoadIdentity;
3689 4506
3690 { 4507 {
3691 package CFClient::UI::Base; 4508 package CFPlus::UI::Base;
3692 4509
3693 ($draw_x, $draw_y, $draw_w, $draw_h) = 4510 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3694 (0, 0, $self->{w}, $self->{h}); 4511 (0, 0, $self->{w}, $self->{h});
3695 }
3696 4512
3697 $self->_draw; 4513 $self->_draw;
4514 }
3698} 4515}
3699 4516
3700############################################################################# 4517#############################################################################
3701 4518
3702package CFClient::UI; 4519package CFPlus::UI;
3703 4520
3704$ROOT = new CFClient::UI::Root; 4521$ROOT = new CFPlus::UI::Root;
3705$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4522$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3706 4523
37071 45241
3708 4525

Diff Legend

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