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.272 by root, Sat Jun 3 01:47:14 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
823# back-buffered drawing area
824
799package CFClient::UI::Window; 825package CFPlus::UI::Window;
800 826
801our @ISA = CFClient::UI::Bin::; 827our @ISA = CFPlus::UI::Bin::;
802 828
803use CFClient::OpenGL; 829use CFPlus::OpenGL;
804 830
805sub new { 831sub new {
806 my ($class, %arg) = @_; 832 my ($class, %arg) = @_;
807 833
808 my $self = $class->SUPER::new (%arg); 834 my $self = $class->SUPER::new (%arg);
… …
813 839
814 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 840 $ROOT->on_post_alloc ($self => sub { $self->render_child });
815 $self->SUPER::update; 841 $self->SUPER::update;
816} 842}
817 843
818sub size_allocate { 844sub invoke_size_allocate {
819 my ($self, $w, $h) = @_; 845 my ($self, $w, $h) = @_;
820 846
821 $self->SUPER::size_allocate ($w, $h);
822 $self->update; 847 $self->update;
848
849 $self->SUPER::invoke_size_allocate ($w, $h)
823} 850}
824 851
825sub _render { 852sub _render {
826 my ($self) = @_; 853 my ($self) = @_;
827 854
… …
829} 856}
830 857
831sub render_child { 858sub render_child {
832 my ($self) = @_; 859 my ($self) = @_;
833 860
834 $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 {
835 glClearColor 0, 0, 0, 0; 862 glClearColor 0, 0, 0, 0;
836 glClear GL_COLOR_BUFFER_BIT; 863 glClear GL_COLOR_BUFFER_BIT;
837 864
838 { 865 {
839 package CFClient::UI::Base; 866 package CFPlus::UI::Base;
840 867
841 ($draw_x, $draw_y, $draw_w, $draw_h) = 868 local ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h}); 869 (0, 0, $self->{w}, $self->{h});
870
871 $self->_render;
843 } 872 }
844
845 $self->_render;
846 }; 873 };
847} 874}
848 875
849sub _draw { 876sub _draw {
850 my ($self) = @_; 877 my ($self) = @_;
851
852 my ($w, $h) = @$self{qw(w h)};
853 878
854 my $tex = $self->{texture} 879 my $tex = $self->{texture}
855 or return; 880 or return;
856 881
857 glEnable GL_TEXTURE_2D; 882 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 883 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 884 glColor 0, 0, 0, 1;
860 885
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 886 $tex->draw_quad_alpha_premultiplied (0, 0);
862 887
863 glDisable GL_TEXTURE_2D; 888 glDisable GL_TEXTURE_2D;
864} 889}
865 890
866############################################################################# 891#############################################################################
867 892
868package CFClient::UI::ViewPort; 893package CFPlus::UI::ViewPort;
869 894
895use List::Util qw(min max);
896
870our @ISA = CFClient::UI::Window::; 897our @ISA = CFPlus::UI::Window::;
871 898
872sub new { 899sub new {
873 my $class = shift; 900 my $class = shift;
874 901
875 $class->SUPER::new ( 902 $class->SUPER::new (
… …
882sub size_request { 909sub size_request {
883 my ($self) = @_; 910 my ($self) = @_;
884 911
885 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 912 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
886 913
887 $w = 10 if $self->{scroll_x}; 914 $w = 1 if $self->{scroll_x};
888 $h = 10 if $self->{scroll_y}; 915 $h = 1 if $self->{scroll_y};
889 916
890 ($w, $h) 917 ($w, $h)
891} 918}
892 919
893sub size_allocate { 920sub invoke_size_allocate {
894 my ($self, $w, $h) = @_; 921 my ($self, $w, $h) = @_;
895 922
896 my $child = $self->child; 923 my $child = $self->child;
897 924
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 925 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 926 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900 927
901 $self->child->configure (0, 0, $w, $h); 928 $self->child->configure (0, 0, $w, $h);
902 $self->update; 929 $self->update;
930
931 1
903} 932}
904 933
905sub set_offset { 934sub set_offset {
906 my ($self, $x, $y) = @_; 935 my ($self, $x, $y) = @_;
907 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}) {
908 $self->{view_x} = int $x; 941 $self->{view_x} = $x;
909 $self->{view_y} = int $y; 942 $self->{view_y} = $y;
910 943
944 $self->emit (changed => $x, $y);
911 $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 }
912} 965}
913 966
914# 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
915sub coord2local { 968sub coord2local {
916 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
… …
931 my ($self, $x, $y) = @_; 984 my ($self, $x, $y) = @_;
932 985
933 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 986 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
934 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 987 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
935 ) { 988 ) {
936 $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})
937 } else { 990 } else {
938 $self->CFClient::UI::Base::find_widget ($x, $y) 991 $self->CFPlus::UI::Base::find_widget ($x, $y)
939 } 992 }
940} 993}
941 994
942sub _render { 995sub _render {
943 my ($self) = @_; 996 my ($self) = @_;
944 997
945 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};
946 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};
947 1000
948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1001 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
949 1002
950 $self->SUPER::_render; 1003 $self->SUPER::_render;
951} 1004}
952 1005
953############################################################################# 1006#############################################################################
954 1007
955package CFClient::UI::ScrolledWindow; 1008package CFPlus::UI::ScrolledWindow;
956 1009
957our @ISA = CFClient::UI::HBox::; 1010our @ISA = CFPlus::UI::Table::;
958 1011
959sub new { 1012sub new {
960 my $class = shift; 1013 my ($class, %arg) = @_;
1014
1015 my $child = delete $arg{child};
961 1016
962 my $self; 1017 my $self;
963 1018
964 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,
965 vertical => 1, 1033 vertical => 1,
966 range => [0, 0, 1, 0.01], # HACK fix 1034 range => [0, 0, 1, 0.01], # HACK fix
967 on_changed => sub { 1035 on_changed => sub {
968 $self->{vp}->set_offset (0, $_[1]); 1036 $self->{vpos} = $_[1];
1037 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
969 }, 1038 },
970 ; 1039 ;
971 1040
972 $self = $class->SUPER::new ( 1041 $self = $class->SUPER::new (
973 vp => (new CFClient::UI::ViewPort expand => 1), 1042 scroll_x => 0,
1043 scroll_y => 1,
1044 can_events => 1,
974 slider => $slider, 1045 hslider => $hslider,
975 @_, 1046 vslider => $vslider,
1047 col_expand => [1, 0],
1048 row_expand => [1, 0],
1049 %arg,
976 ); 1050 );
977 1051
978 $self->{vp}->add ($self->{scrolled}); 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
979 $self->add ($self->{vp}); 1073 $self->SUPER::add ($self->{vp});
980 $self->add ($self->{slider}); 1074
1075 $self->add ($child) if $child;
981 1076
982 $self 1077 $self
983} 1078}
984 1079
1080sub add {
1081 my ($self, $widget) = @_;
1082
1083 $self->{vp}->add ($self->{child} = $widget);
1084}
1085
1086sub set_offset { shift->{vp}->set_offset (@_) }
1087sub set_center { shift->{vp}->set_center (@_) }
1088sub make_visible { shift->{vp}->make_visible (@_) }
1089
985sub 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 {
986 my ($self) = @_; 1121 my ($self, $ev) = @_;
987 1122
988 $self->SUPER::update; 1123 $self->grab_focus;
989 1124
990 # todo: overwrite size_allocate of child 1125 my $ox = $self->{vp}{view_x};
991 my $child = $self->{vp}->child; 1126 my $oy = $self->{vp}{view_y};
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1127
993} 1128 $self->{motion} = sub {
1129 my ($ev, $x, $y) = @_;
994 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
995sub size_allocate { 1179sub invoke_size_allocate {
996 my ($self, $w, $h) = @_; 1180 my ($self, $w, $h) = @_;
997 1181
1182 $self->update_slider;
998 $self->SUPER::size_allocate ($w, $h); 1183 $self->SUPER::invoke_size_allocate ($w, $h)
999
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002} 1184}
1003
1004#TODO# update range on size_allocate depending on child
1005# update viewport offset on scroll
1006 1185
1007############################################################################# 1186#############################################################################
1008 1187
1009package CFClient::UI::Frame; 1188package CFPlus::UI::Frame;
1010 1189
1011our @ISA = CFClient::UI::Bin::; 1190our @ISA = CFPlus::UI::Bin::;
1012 1191
1013use CFClient::OpenGL; 1192use CFPlus::OpenGL;
1014 1193
1015sub new { 1194sub new {
1016 my $class = shift; 1195 my $class = shift;
1017 1196
1018 $class->SUPER::new ( 1197 $class->SUPER::new (
… …
1026 1205
1027 if ($self->{bg}) { 1206 if ($self->{bg}) {
1028 my ($w, $h) = @$self{qw(w h)}; 1207 my ($w, $h) = @$self{qw(w h)};
1029 1208
1030 glEnable GL_BLEND; 1209 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1210 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1032 glColor @{ $self->{bg} }; 1211 glColor_premultiply @{ $self->{bg} };
1033
1034 glBegin GL_QUADS;
1035 glVertex 0 , 0;
1036 glVertex 0 , $h;
1037 glVertex $w, $h; 1212 glRect 0, 0, $w, $h;
1038 glVertex $w, 0;
1039 glEnd;
1040
1041 glDisable GL_BLEND; 1213 glDisable GL_BLEND;
1042 } 1214 }
1043 1215
1044 $self->SUPER::_draw; 1216 $self->SUPER::_draw;
1045} 1217}
1046 1218
1047############################################################################# 1219#############################################################################
1048 1220
1049package CFClient::UI::FancyFrame; 1221package CFPlus::UI::FancyFrame;
1050 1222
1051our @ISA = CFClient::UI::Bin::; 1223our @ISA = CFPlus::UI::Bin::;
1052 1224
1053use CFClient::OpenGL; 1225use CFPlus::OpenGL;
1054
1055my $bg =
1056 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1057 mipmap => 1, wrap => 1;
1058
1059my @border =
1060 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1061 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1062 1226
1063sub new { 1227sub new {
1064 my ($class, %arg) = @_; 1228 my ($class, %arg) = @_;
1065 1229
1066 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) = @_;
1067 1341
1068 my $self = $class->SUPER::new ( 1342 my $self = $class->SUPER::new (
1069 bg => [1, 1, 1, 1], 1343 bg => [1, 1, 1, 1],
1070 border_bg => [1, 1, 1, 1], 1344 border_bg => [1, 1, 1, 1],
1071 border => 0.6, 1345 border => 0.6,
1072 can_events => 1, 1346 can_events => 1,
1073 min_w => 16, 1347 min_w => 64,
1074 min_h => 16, 1348 min_h => 32,
1075 %arg, 1349 %arg,
1076 ); 1350 );
1077 1351
1078 $self->{title} = new CFClient::UI::Label 1352 $self->{title_widget} = new CFPlus::UI::Label
1079 align => 0, 1353 align => 0,
1080 valign => 1, 1354 valign => 1,
1081 text => $title, 1355 text => $self->{title},
1082 fontsize => $self->{border} 1356 fontsize => $self->{border},
1083 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 }
1084 1367
1085 $self 1368 $self
1086} 1369}
1087 1370
1088sub add { 1371sub add {
1089 my ($self, @widgets) = @_; 1372 my ($self, @widgets) = @_;
1090 1373
1091 $self->SUPER::add (@widgets); 1374 $self->SUPER::add (@widgets);
1375 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1092 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1376 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1093} 1377}
1094 1378
1095sub border { 1379sub border {
1096 int $_[0]{border} * $::FONTSIZE 1380 int $_[0]{border} * $::FONTSIZE
1097} 1381}
1098 1382
1099sub size_request { 1383sub size_request {
1100 my ($self) = @_; 1384 my ($self) = @_;
1101 1385
1102 $self->{title}->size_request 1386 $self->{title_widget}->size_request
1103 if $self->{title}; 1387 if $self->{title_widget};
1388
1389 $self->{close_button}->size_request
1390 if $self->{close_button};
1104 1391
1105 my ($w, $h) = $self->SUPER::size_request; 1392 my ($w, $h) = $self->SUPER::size_request;
1106 1393
1107 ( 1394 (
1108 $w + $self->border * 2, 1395 $w + $self->border * 2,
1109 $h + $self->border * 2, 1396 $h + $self->border * 2,
1110 ) 1397 )
1111} 1398}
1112 1399
1113sub size_allocate { 1400sub invoke_size_allocate {
1114 my ($self, $w, $h) = @_; 1401 my ($self, $w, $h) = @_;
1115 1402
1116 if ($self->{title}) { 1403 if ($self->{title_widget}) {
1117 $self->{title}{w} = $w; 1404 $self->{title_widget}{w} = $w;
1118 $self->{title}{h} = $h; 1405 $self->{title_widget}{h} = $h;
1119 $self->{title}->size_allocate ($w, $h); 1406 $self->{title_widget}->invoke_size_allocate ($w, $h);
1120 } 1407 }
1121 1408
1122 my $border = $self->border; 1409 my $border = $self->border;
1123 1410
1124 $h -= List::Util::max 0, $border * 2; 1411 $h -= List::Util::max 0, $border * 2;
1125 $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;
1126 1426
1127 $self->child->configure ($border, $border, $w, $h); 1427 1
1128} 1428}
1129 1429
1130sub button_down { 1430sub invoke_button_down {
1131 my ($self, $ev, $x, $y) = @_; 1431 my ($self, $ev, $x, $y) = @_;
1132 1432
1133 my ($w, $h) = @$self{qw(w h)}; 1433 my ($w, $h) = @$self{qw(w h)};
1134 my $border = $self->border; 1434 my $border = $self->border;
1135 1435
… …
1151 my $dy = $ev->{y} - $oy; 1451 my $dy = $ev->{y} - $oy;
1152 1452
1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1453 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1454 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155 1455
1456 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1156 $self->realloc; 1457 $self->realloc;
1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1158 }; 1458 };
1159 1459
1160 } elsif ($lr ^ $td) { 1460 } elsif ($lr ^ $td) {
1161 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1461 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1162 my ($bx, $by) = ($self->{x}, $self->{y}); 1462 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1165 my ($ev, $x, $y) = @_; 1465 my ($ev, $x, $y) = @_;
1166 1466
1167 ($x, $y) = ($ev->{x}, $ev->{y}); 1467 ($x, $y) = ($ev->{x}, $ev->{y});
1168 1468
1169 $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});
1170 }; 1472 };
1171 } else { 1473 } else {
1172 return 0; 1474 return 0;
1173 } 1475 }
1174 1476
1175 1 1477 1
1176} 1478}
1177 1479
1178sub button_up { 1480sub invoke_button_up {
1179 my ($self, $ev, $x, $y) = @_; 1481 my ($self, $ev, $x, $y) = @_;
1180 1482
1181 !!delete $self->{motion} 1483 ! ! delete $self->{motion}
1182} 1484}
1183 1485
1184sub mouse_motion { 1486sub invoke_mouse_motion {
1185 my ($self, $ev, $x, $y) = @_; 1487 my ($self, $ev, $x, $y) = @_;
1186 1488
1187 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1489 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188 1490
1189 !!$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
1190} 1500}
1191 1501
1192sub _draw { 1502sub _draw {
1193 my ($self) = @_; 1503 my ($self) = @_;
1194 1504
… …
1201 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1202 1512
1203 my $border = $self->border; 1513 my $border = $self->border;
1204 1514
1205 glColor @{ $self->{border_bg} }; 1515 glColor @{ $self->{border_bg} };
1206 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1516 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1207 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1517 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1208 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1518 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1209 $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);
1210 1534
1211 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1535 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1212 glColor @{ $self->{bg} }; 1536 glColor @{ $self->{bg} };
1213 1537
1214 # TODO: repeat texture not scale 1538 # TODO: repeat texture not scale
… …
1220 1544
1221 glDisable GL_TEXTURE_2D; 1545 glDisable GL_TEXTURE_2D;
1222 1546
1223 $child->draw; 1547 $child->draw;
1224 1548
1225 if ($self->{title}) { 1549 if ($self->{title_widget}) {
1226 glTranslate 0, $border - $self->{h}; 1550 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw; 1551 $self->{title_widget}->_draw;
1552
1553 glTranslate 0, - ($border - $self->{h});
1228 } 1554 }
1555
1556 $self->{close_button}->draw
1557 if $self->{close_button};
1229} 1558}
1230 1559
1231############################################################################# 1560#############################################################################
1232 1561
1233package CFClient::UI::Table; 1562package CFPlus::UI::Table;
1234 1563
1235our @ISA = CFClient::UI::Base::; 1564our @ISA = CFPlus::UI::Container::;
1236 1565
1237use List::Util qw(max sum); 1566use List::Util qw(max sum);
1238 1567
1239use CFClient::OpenGL; 1568use CFPlus::OpenGL;
1240 1569
1241sub new { 1570sub new {
1242 my $class = shift; 1571 my $class = shift;
1243 1572
1244 $class->SUPER::new ( 1573 $class->SUPER::new (
1245 col_expand => [], 1574 col_expand => [],
1575 row_expand => [],
1246 @_, 1576 @_,
1247 ) 1577 )
1248} 1578}
1249 1579
1250sub children {
1251 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1252}
1253
1254sub add { 1580sub add {
1255 my ($self, $x, $y, $child) = @_;
1256
1257 $child->set_parent ($self);
1258 $self->{children}[$y][$x] = $child;
1259
1260 $self->realloc;
1261}
1262
1263# TODO: move to container class maybe? send children a signal on removal?
1264sub clear {
1265 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);
1266 1612
1267 my @children = $self->children; 1613 my @children = $self->children;
1268 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 }
1269 1624 }
1270 for (@children) {
1271 delete $_->{parent};
1272 $_->hide;
1273 }
1274 1625
1275 $self->realloc; 1626 # second pass, rows
1276} 1627 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1277
1278sub get_wh {
1279 my ($self) = @_;
1280
1281 my (@w, @h);
1282
1283 for my $y (0 .. $#{$self->{children}}) {
1284 my $row = $self->{children}[$y]
1285 or next;
1286
1287 for my $x (0 .. $#$row) {
1288 my $widget = $row->[$x]
1289 or next;
1290 my ($w, $h) = @$widget{qw(req_w req_h)}; 1628 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1291 1629
1292 $w[$x] = max $w[$x], $w; 1630 my $sh = sum @h[$r .. $r + $rs - 1];
1293 $h[$y] = max $h[$y], $h; 1631
1632 if ($h > $sh) {
1633 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1294 } 1634 }
1295 } 1635 }
1296 1636
1297 (\@w, \@h) 1637 (\@w, \@h)
1298} 1638}
… …
1306 (sum @$ws), 1646 (sum @$ws),
1307 (sum @$hs), 1647 (sum @$hs),
1308 ) 1648 )
1309} 1649}
1310 1650
1311sub size_allocate { 1651sub invoke_size_allocate {
1312 my ($self, $w, $h) = @_; 1652 my ($self, $w, $h) = @_;
1313 1653
1314 my ($ws, $hs) = $self->get_wh; 1654 my ($ws, $hs) = $self->get_wh;
1315 1655
1316 my $req_w = (sum @$ws) || 1; 1656 my $req_w = (sum @$ws) || 1;
1317 my $req_h = (sum @$hs) || 1; 1657 my $req_h = (sum @$hs) || 1;
1318 1658
1319 # TODO: nicer code && do row_expand 1659 # now linearly scale the rows/columns to the allocated size
1320 my @col_expand = @{$self->{col_expand}}; 1660 my @col_expand = @{$self->{col_expand}};
1321 @col_expand = (1) x @$ws unless @col_expand; 1661 @col_expand = (1) x @$ws unless @col_expand;
1322 my $col_expand = (sum @col_expand) || 1; 1662 my $col_expand = (sum @col_expand) || 1;
1323 1663
1324 # linearly scale sizes
1325 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1664 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1326 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1327 1665
1328 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
1329 CFClient::UI::harmonize $hs; 1674 CFPlus::UI::harmonize $hs;
1330 1675
1331 my $y; 1676 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1677 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1332 1678
1333 for my $r (0 .. $#{$self->{children}}) { 1679 for my $widget ($self->children) {
1334 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)};
1335 or next;
1336 1681
1337 my $x = 0; 1682 $widget->configure (
1338 my $row_h = $hs->[$r]; 1683 $x[$c], $y[$r],
1684 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1339 1685 );
1340 for my $c (0 .. $#$row) { 1686 }
1341 my $col_w = $ws->[$c];
1342 1687
1343 if (my $widget = $row->[$c]) { 1688 1
1344 $widget->configure ($x, $y, $col_w, $row_h); 1689}
1345 }
1346 1690
1347 $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};
1348 } 1718 }
1349
1350 $y += $row_h;
1351 } 1719 }
1352 1720
1353} 1721 my $W = $x2 - $x1;
1722 my $H = $y2 - $y1;
1354 1723
1355sub 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 {
1356 my ($self, $x, $y) = @_; 1742 my ($self, $W, $H) = @_;
1357 1743
1358 $x -= $self->{x}; 1744 for my $child ($self->visible_children) {
1359 $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;
1360 1747
1361 my $res; 1748 $x += $child->{c_halign} * $child->{req_w};
1749 $y += $child->{c_valign} * $child->{req_h};
1362 1750
1363 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1751 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1364 $res = $_->find_widget ($x, $y) 1752 }
1365 and return $res; 1753
1366 } 1754 1
1367
1368 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1369}
1370
1371sub _draw {
1372 my ($self) = @_;
1373
1374 for (grep $_, @{$self->{children}}) {
1375 $_->draw for grep $_, @$_;
1376 }
1377} 1755}
1378 1756
1379############################################################################# 1757#############################################################################
1380 1758
1381package CFClient::UI::Box; 1759package CFPlus::UI::Box;
1382 1760
1383our @ISA = CFClient::UI::Container::; 1761our @ISA = CFPlus::UI::Container::;
1384 1762
1385sub size_request { 1763sub size_request {
1386 my ($self) = @_; 1764 my ($self) = @_;
1765
1766 my @children = $self->visible_children;
1387 1767
1388 $self->{vertical} 1768 $self->{vertical}
1389 ? ( 1769 ? (
1390 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1770 (List::Util::max map $_->{req_w}, @children),
1391 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1771 (List::Util::sum map $_->{req_h}, @children),
1392 ) 1772 )
1393 : ( 1773 : (
1394 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1774 (List::Util::sum map $_->{req_w}, @children),
1395 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1775 (List::Util::max map $_->{req_h}, @children),
1396 ) 1776 )
1397} 1777}
1398 1778
1399sub size_allocate { 1779sub invoke_size_allocate {
1400 my ($self, $w, $h) = @_; 1780 my ($self, $w, $h) = @_;
1401 1781
1402 my $space = $self->{vertical} ? $h : $w; 1782 my $space = $self->{vertical} ? $h : $w;
1403 my $children = $self->{children}; 1783 my @children = $self->visible_children;
1404 1784
1405 my @req; 1785 my @req;
1406 1786
1407 if ($self->{homogeneous}) { 1787 if ($self->{homogeneous}) {
1408 @req = ($space / (@$children || 1)) x @$children; 1788 @req = ($space / (@children || 1)) x @children;
1409 } else { 1789 } else {
1410 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1790 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1411 my $req = List::Util::sum @req; 1791 my $req = List::Util::sum @req;
1412 1792
1413 if ($req > $space) { 1793 if ($req > $space) {
1414 # ah well, not enough space 1794 # ah well, not enough space
1415 $_ *= $space / $req for @req; 1795 $_ *= $space / $req for @req;
1416 } else { 1796 } else {
1417 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1797 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1418 1798
1419 $space = ($space - $req) / $expand; # remaining space to give away 1799 $space = ($space - $req) / $expand; # remaining space to give away
1420 1800
1421 $req[$_] += $space * $children->[$_]{expand} 1801 $req[$_] += $space * $children[$_]{expand}
1422 for 0 .. $#$children; 1802 for 0 .. $#children;
1423 } 1803 }
1424 } 1804 }
1425 1805
1426 CFClient::UI::harmonize \@req; 1806 CFPlus::UI::harmonize \@req;
1427 1807
1428 my $pos = 0; 1808 my $pos = 0;
1429 for (0 .. $#$children) { 1809 for (0 .. $#children) {
1430 my $alloc = $req[$_]; 1810 my $alloc = $req[$_];
1431 $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));
1432 1812
1433 $pos += $alloc; 1813 $pos += $alloc;
1434 } 1814 }
1435 1815
1436 1 1816 1
1437} 1817}
1438 1818
1439############################################################################# 1819#############################################################################
1440 1820
1441package CFClient::UI::HBox; 1821package CFPlus::UI::HBox;
1442 1822
1443our @ISA = CFClient::UI::Box::; 1823our @ISA = CFPlus::UI::Box::;
1444 1824
1445sub new { 1825sub new {
1446 my $class = shift; 1826 my $class = shift;
1447 1827
1448 $class->SUPER::new ( 1828 $class->SUPER::new (
… …
1451 ) 1831 )
1452} 1832}
1453 1833
1454############################################################################# 1834#############################################################################
1455 1835
1456package CFClient::UI::VBox; 1836package CFPlus::UI::VBox;
1457 1837
1458our @ISA = CFClient::UI::Box::; 1838our @ISA = CFPlus::UI::Box::;
1459 1839
1460sub new { 1840sub new {
1461 my $class = shift; 1841 my $class = shift;
1462 1842
1463 $class->SUPER::new ( 1843 $class->SUPER::new (
… …
1466 ) 1846 )
1467} 1847}
1468 1848
1469############################################################################# 1849#############################################################################
1470 1850
1471package CFClient::UI::Label; 1851package CFPlus::UI::Label;
1472 1852
1473our @ISA = CFClient::UI::DrawBG::; 1853our @ISA = CFPlus::UI::DrawBG::;
1474 1854
1475use CFClient::OpenGL; 1855use CFPlus::OpenGL;
1476 1856
1477sub new { 1857sub new {
1478 my ($class, %arg) = @_; 1858 my ($class, %arg) = @_;
1479 1859
1480 my $self = $class->SUPER::new ( 1860 my $self = $class->SUPER::new (
… …
1483 #active_bg => none 1863 #active_bg => none
1484 #font => default_font 1864 #font => default_font
1485 #text => initial text 1865 #text => initial text
1486 #markup => initial narkup 1866 #markup => initial narkup
1487 #max_w => maximum pixel width 1867 #max_w => maximum pixel width
1868 #style => 0, # render flags
1488 ellipsise => 3, # end 1869 ellipsise => 3, # end
1489 layout => (new CFClient::Layout), 1870 layout => (new CFPlus::Layout),
1490 fontsize => 1, 1871 fontsize => 1,
1491 align => -1, 1872 align => -1,
1492 valign => -1, 1873 valign => -1,
1493 padding_x => 2, 1874 padding_x => 2,
1494 padding_y => 2, 1875 padding_y => 2,
1495 can_events => 0, 1876 can_events => 0,
1496 %arg 1877 %arg
1497 ); 1878 );
1498 1879
1499 if (exists $self->{template}) { 1880 if (exists $self->{template}) {
1500 my $layout = new CFClient::Layout; 1881 my $layout = new CFPlus::Layout;
1501 $layout->set_text (delete $self->{template}); 1882 $layout->set_text (delete $self->{template});
1502 $self->{template} = $layout; 1883 $self->{template} = $layout;
1503 } 1884 }
1504 1885
1505 if (exists $self->{markup}) { 1886 if (exists $self->{markup}) {
… …
1509 } 1890 }
1510 1891
1511 $self 1892 $self
1512} 1893}
1513 1894
1514sub escape($) {
1515 local $_ = $_[0];
1516
1517 s/&/&amp;/g;
1518 s/>/&gt;/g;
1519 s/</&lt;/g;
1520
1521 $_
1522}
1523
1524sub update { 1895sub update {
1525 my ($self) = @_; 1896 my ($self) = @_;
1526 1897
1527 delete $self->{texture}; 1898 delete $self->{texture};
1528 $self->SUPER::update; 1899 $self->SUPER::update;
1529} 1900}
1530 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
1531sub set_text { 1915sub set_text {
1532 my ($self, $text) = @_; 1916 my ($self, $text) = @_;
1533 1917
1534 return if $self->{text} eq "T$text"; 1918 return if $self->{text} eq "T$text";
1535 $self->{text} = "T$text"; 1919 $self->{text} = "T$text";
1536 1920
1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1538 $self->{layout}->set_text ($text); 1921 $self->{layout}->set_text ($text);
1539 1922
1923 delete $self->{size_req};
1540 $self->realloc; 1924 $self->realloc;
1541 $self->update; 1925 $self->update;
1542} 1926}
1543 1927
1544sub set_markup { 1928sub set_markup {
… …
1547 return if $self->{text} eq "M$markup"; 1931 return if $self->{text} eq "M$markup";
1548 $self->{text} = "M$markup"; 1932 $self->{text} = "M$markup";
1549 1933
1550 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1934 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1551 1935
1552 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1553 $self->{layout}->set_markup ($markup); 1936 $self->{layout}->set_markup ($markup);
1554 1937
1938 delete $self->{size_req};
1555 $self->realloc; 1939 $self->realloc;
1556 $self->update; 1940 $self->update;
1557} 1941}
1558 1942
1559sub size_request { 1943sub size_request {
1560 my ($self) = @_; 1944 my ($self) = @_;
1561 1945
1946 $self->{size_req} ||= do {
1562 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1947 $self->{layout}->set_font ($self->{font}) if $self->{font};
1563 $self->{layout}->set_width ($self->{max_w} || -1); 1948 $self->{layout}->set_width ($self->{max_w} || -1);
1564 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1949 $self->{layout}->set_ellipsise ($self->{ellipsise});
1565 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1950 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1566 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1951 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1567 1952
1568 my ($w, $h) = $self->{layout}->size; 1953 my ($w, $h) = $self->{layout}->size;
1569 1954
1570 if (exists $self->{template}) { 1955 if (exists $self->{template}) {
1571 $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);
1572 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1958 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 1959
1574 my ($w2, $h2) = $self->{template}->size; 1960 my ($w2, $h2) = $self->{template}->size;
1575 1961
1576 $w = List::Util::max $w, $w2; 1962 $w = List::Util::max $w, $w2;
1577 $h = List::Util::max $h, $h2; 1963 $h = List::Util::max $h, $h2;
1964 }
1965
1966 [$w, $h]
1578 } 1967 };
1579 1968
1580 ($w, $h) 1969 @{ $self->{size_req} }
1581} 1970}
1582 1971
1972sub baseline_shift {
1973 $_[0]{layout}->descent
1974}
1975
1583sub size_allocate { 1976sub invoke_size_allocate {
1584 my ($self, $w, $h) = @_; 1977 my ($self, $w, $h) = @_;
1585 1978
1586 delete $self->{ox}; 1979 delete $self->{ox};
1587 1980
1588 delete $self->{texture} 1981 delete $self->{texture}
1589 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
1590} 1985}
1591 1986
1592sub set_fontsize { 1987sub set_fontsize {
1593 my ($self, $fontsize) = @_; 1988 my ($self, $fontsize) = @_;
1594 1989
1595 $self->{fontsize} = $fontsize; 1990 $self->{fontsize} = $fontsize;
1991 delete $self->{size_req};
1596 delete $self->{texture}; 1992 delete $self->{texture};
1597 1993
1598 $self->realloc; 1994 $self->realloc;
1599} 1995}
1600 1996
1997sub reconfigure {
1998 my ($self) = @_;
1999
2000 delete $self->{size_req};
2001 delete $self->{texture};
2002
2003 $self->SUPER::reconfigure;
2004}
2005
1601sub _draw { 2006sub _draw {
1602 my ($self) = @_; 2007 my ($self) = @_;
1603 2008
1604 $self->SUPER::_draw; # draw background, if applicable 2009 $self->SUPER::_draw; # draw background, if applicable
1605 2010
1606 my $tex = $self->{texture} ||= do { 2011 my $size = $self->{texture} ||= do {
1607 $self->{layout}->set_foreground (@{$self->{fg}}); 2012 $self->{layout}->set_foreground (@{$self->{fg}});
1608 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2013 $self->{layout}->set_font ($self->{font}) if $self->{font};
1609 $self->{layout}->set_width ($self->{w}); 2014 $self->{layout}->set_width ($self->{w});
1610 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2015 $self->{layout}->set_ellipsise ($self->{ellipsise});
1611 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2016 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1612 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2017 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1613 2018
1614 new_from_layout CFClient::Texture $self->{layout} 2019 [$self->{layout}->size]
1615 }; 2020 };
1616 2021
1617 unless (exists $self->{ox}) { 2022 unless (exists $self->{ox}) {
1618 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2023 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1619 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2024 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1620 : ($self->{w} - $tex->{w}) * 0.5); 2025 : ($self->{w} - $size->[0]) * 0.5);
1621 2026
1622 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1624 : ($self->{h} - $tex->{h}) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
2030
2031 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1625 }; 2032 };
1626 2033
1627 glEnable GL_TEXTURE_2D; 2034# unless ($self->{list}) {
1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2035# $self->{list} = CFPlus::OpenGL::glGenList;
1629 2036# CFPlus::OpenGL::glNewList $self->{list};
1630 if ($tex->{format} == GL_ALPHA) { 2037# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1631 glColor @{$self->{fg}}; 2038# CFPlus::OpenGL::glEndList;
1632 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1633 } else {
1634 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1635 } 2039# }
2040#
2041# CFPlus::OpenGL::glCallList $self->{list};
1636 2042
1637 glDisable GL_TEXTURE_2D; 2043 $self->{layout}->draw;
1638} 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#}
1639 2053
1640############################################################################# 2054#############################################################################
1641 2055
1642package CFClient::UI::EntryBase; 2056package CFPlus::UI::EntryBase;
1643 2057
1644our @ISA = CFClient::UI::Label::; 2058our @ISA = CFPlus::UI::Label::;
1645 2059
1646use CFClient::OpenGL; 2060use CFPlus::OpenGL;
1647 2061
1648sub new { 2062sub new {
1649 my $class = shift; 2063 my $class = shift;
1650 2064
1651 $class->SUPER::new ( 2065 $class->SUPER::new (
1652 fg => [1, 1, 1], 2066 fg => [1, 1, 1],
1653 bg => [0, 0, 0, 0.2], 2067 bg => [0, 0, 0, 0.2],
2068 outline => [0.6, 0.3, 0.1],
1654 active_bg => [1, 1, 1, 0.5], 2069 active_bg => [0, 0, 1, .2],
1655 active_fg => [0, 0, 0], 2070 active_fg => [1, 1, 1],
2071 active_outline => [1, 1, 0],
1656 can_hover => 1, 2072 can_hover => 1,
1657 can_focus => 1, 2073 can_focus => 1,
1658 valign => 0, 2074 valign => 0,
1659 can_events => 1, 2075 can_events => 1,
2076 ellipsise => 0,
1660 #text => ... 2077 #text => ...
2078 #hidden => "*",
1661 @_ 2079 @_
1662 ) 2080 )
1663} 2081}
1664 2082
1665sub _set_text { 2083sub _set_text {
… …
1667 2085
1668 delete $self->{cur_h}; 2086 delete $self->{cur_h};
1669 2087
1670 return if $self->{text} eq $text; 2088 return if $self->{text} eq $text;
1671 2089
1672 delete $self->{texture};
1673
1674 $self->{last_activity} = $::NOW; 2090 $self->{last_activity} = $::NOW;
1675 $self->{text} = $text; 2091 $self->{text} = $text;
1676 2092
1677 $text =~ s/./*/g if $self->{hidden}; 2093 $text =~ s/./*/g if $self->{hidden};
1678 $self->{layout}->set_text ("$text "); 2094 $self->{layout}->set_text ("$text ");
2095 delete $self->{size_req};
1679 2096
1680 $self->_emit (changed => $self->{text}); 2097 $self->emit (changed => $self->{text});
2098
2099 $self->realloc;
2100 $self->update;
1681} 2101}
1682 2102
1683sub set_text { 2103sub set_text {
1684 my ($self, $text) = @_; 2104 my ($self, $text) = @_;
1685 2105
1686 $self->{cursor} = length $text; 2106 $self->{cursor} = length $text;
1687 $self->_set_text ($text); 2107 $self->_set_text ($text);
1688
1689 $self->realloc;
1690} 2108}
1691 2109
1692sub get_text { 2110sub get_text {
1693 $_[0]{text} 2111 $_[0]{text}
1694} 2112}
… …
1699 my ($w, $h) = $self->SUPER::size_request; 2117 my ($w, $h) = $self->SUPER::size_request;
1700 2118
1701 ($w + 1, $h) # add 1 for cursor 2119 ($w + 1, $h) # add 1 for cursor
1702} 2120}
1703 2121
1704sub key_down { 2122sub invoke_key_down {
1705 my ($self, $ev) = @_; 2123 my ($self, $ev) = @_;
1706 2124
1707 my $mod = $ev->{mod}; 2125 my $mod = $ev->{mod};
1708 my $sym = $ev->{sym}; 2126 my $sym = $ev->{sym};
1709 my $uni = $ev->{unicode}; 2127 my $uni = $ev->{unicode};
1710 2128
1711 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;
1712 2132
1713 if ($uni == 8) { 2133 if ($uni == 8) {
1714 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2134 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1715 } elsif ($uni == 127) { 2135 } elsif ($uni == 127) {
1716 substr $text, $self->{cursor}, 1, ""; 2136 substr $text, $self->{cursor}, 1, "";
1717 } elsif ($sym == CFClient::SDLK_LEFT) { 2137 } elsif ($sym == CFPlus::SDLK_LEFT) {
1718 --$self->{cursor} if $self->{cursor}; 2138 --$self->{cursor} if $self->{cursor};
1719 } elsif ($sym == CFClient::SDLK_RIGHT) { 2139 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1720 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2140 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1721 } 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 = "";
1722 $self->{cursor} = 0; 2155 $self->{cursor} = 0;
1723 } elsif ($sym == CFClient::SDLK_END) {
1724 $self->{cursor} = length $text;
1725 } elsif ($uni == 27) { 2156 } elsif ($uni == 27) {
1726 $self->_emit ('escape'); 2157 $self->emit ('escape');
1727 } elsif ($uni) { 2158 } elsif ($uni == 0x0d) {
2159 substr $text, $self->{cursor}++, 0, "\012";
2160 } elsif ($uni >= 0x20) {
1728 substr $text, $self->{cursor}++, 0, chr $uni; 2161 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else { 2162 } else {
1730 return 0; 2163 return 0;
1731 } 2164 }
1732 2165
1733 $self->_set_text ($text); 2166 $self->_set_text ($text);
1734 2167
1735 $self->realloc; 2168 $self->realloc;
2169 $self->update;
1736 2170
1737 1 2171 1
1738} 2172}
1739 2173
1740sub focus_in { 2174sub invoke_focus_in {
1741 my ($self) = @_; 2175 my ($self) = @_;
1742 2176
1743 $self->{last_activity} = $::NOW; 2177 $self->{last_activity} = $::NOW;
1744 2178
1745 $self->SUPER::focus_in; 2179 $self->SUPER::invoke_focus_in
1746} 2180}
1747 2181
1748sub button_down { 2182sub invoke_button_down {
1749 my ($self, $ev, $x, $y) = @_; 2183 my ($self, $ev, $x, $y) = @_;
1750 2184
1751 $self->SUPER::button_down ($ev, $x, $y); 2185 $self->SUPER::invoke_button_down ($ev, $x, $y);
1752 2186
1753 my $idx = $self->{layout}->xy_to_index ($x, $y); 2187 my $idx = $self->{layout}->xy_to_index ($x, $y);
1754 2188
1755 # byte-index to char-index 2189 # byte-index to char-index
1756 my $text = $self->{text}; 2190 my $text = $self->{text};
1757 utf8::encode $text; 2191 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1758 $self->{cursor} = length substr $text, 0, $idx; 2192 $self->{cursor} = length $text;
1759 2193
1760 $self->_set_text ($self->{text}); 2194 $self->_set_text ($self->{text});
1761 $self->update; 2195 $self->update;
1762 2196
1763 1 2197 1
1764} 2198}
1765 2199
1766sub mouse_motion { 2200sub invoke_mouse_motion {
1767 my ($self, $ev, $x, $y) = @_; 2201 my ($self, $ev, $x, $y) = @_;
1768# 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#
1769 2203
1770 0 2204 1
1771} 2205}
1772 2206
1773sub _draw { 2207sub _draw {
1774 my ($self) = @_; 2208 my ($self) = @_;
1775 2209
1776 local $self->{fg} = $self->{fg}; 2210 local $self->{fg} = $self->{fg};
1777 2211
1778 if ($FOCUS == $self) { 2212 if ($FOCUS == $self) {
1779 glColor @{$self->{active_bg}}; 2213 glColor_premultiply @{$self->{active_bg}};
1780 $self->{fg} = $self->{active_fg}; 2214 $self->{fg} = $self->{active_fg};
1781 } else { 2215 } else {
1782 glColor @{$self->{bg}}; 2216 glColor_premultiply @{$self->{bg}};
1783 } 2217 }
1784 2218
1785 glEnable GL_BLEND; 2219 glEnable GL_BLEND;
1786 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1787 glBegin GL_QUADS;
1788 glVertex 0 , 0;
1789 glVertex 0 , $self->{h};
1790 glVertex $self->{w}, $self->{h}; 2221 glRect 0, 0, $self->{w}, $self->{h};
1791 glVertex $self->{w}, 0;
1792 glEnd;
1793 glDisable GL_BLEND; 2222 glDisable GL_BLEND;
1794 2223
1795 $self->SUPER::_draw; 2224 $self->SUPER::_draw;
1796 2225
1797 #TODO: force update every cursor change :( 2226 #TODO: force update every cursor change :(
… …
1799 2228
1800 unless (exists $self->{cur_h}) { 2229 unless (exists $self->{cur_h}) {
1801 my $text = substr $self->{text}, 0, $self->{cursor}; 2230 my $text = substr $self->{text}, 0, $self->{cursor};
1802 utf8::encode $text; 2231 utf8::encode $text;
1803 2232
1804 @$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);
1805 } 2234 }
1806 2235
1807 glColor @{$self->{fg}}; 2236 glColor_premultiply @{$self->{active_fg}};
1808 glBegin GL_LINES; 2237 glBegin GL_LINES;
1809 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};
1810 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};
1811 glEnd; 2240 glEnd;
1812 }
1813}
1814 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
1815package CFClient::UI::Entry; 2261package CFPlus::UI::Entry;
1816 2262
1817our @ISA = CFClient::UI::EntryBase::; 2263our @ISA = CFPlus::UI::EntryBase::;
1818 2264
1819use CFClient::OpenGL; 2265use CFPlus::OpenGL;
1820 2266
1821sub key_down { 2267sub invoke_key_down {
1822 my ($self, $ev) = @_; 2268 my ($self, $ev) = @_;
1823 2269
1824 my $sym = $ev->{sym}; 2270 my $sym = $ev->{sym};
1825 2271
1826 if ($sym == 13) { 2272 if ($ev->{uni} == 0x0d || $sym == 13) {
1827 unshift @{$self->{history}}, 2273 unshift @{$self->{history}},
1828 my $txt = $self->get_text; 2274 my $txt = $self->get_text;
2275
1829 $self->{history_pointer} = -1; 2276 $self->{history_pointer} = -1;
1830 $self->{history_saveback} = ''; 2277 $self->{history_saveback} = '';
1831 $self->_emit (activate => $txt); 2278 $self->emit (activate => $txt);
1832 $self->update; 2279 $self->update;
1833 2280
1834 } elsif ($sym == CFClient::SDLK_UP) { 2281 } elsif ($sym == CFPlus::SDLK_UP) {
1835 if ($self->{history_pointer} < 0) { 2282 if ($self->{history_pointer} < 0) {
1836 $self->{history_saveback} = $self->get_text; 2283 $self->{history_saveback} = $self->get_text;
1837 } 2284 }
1838 if (@{$self->{history} || []} > 0) { 2285 if (@{$self->{history} || []} > 0) {
1839 $self->{history_pointer}++; 2286 $self->{history_pointer}++;
… …
1841 $self->{history_pointer} = @{$self->{history} || []} - 1; 2288 $self->{history_pointer} = @{$self->{history} || []} - 1;
1842 } 2289 }
1843 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2290 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1844 } 2291 }
1845 2292
1846 } elsif ($sym == CFClient::SDLK_DOWN) { 2293 } elsif ($sym == CFPlus::SDLK_DOWN) {
1847 $self->{history_pointer}--; 2294 $self->{history_pointer}--;
1848 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2295 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1849 2296
1850 if ($self->{history_pointer} >= 0) { 2297 if ($self->{history_pointer} >= 0) {
1851 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2298 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1852 } else { 2299 } else {
1853 $self->set_text ($self->{history_saveback}); 2300 $self->set_text ($self->{history_saveback});
1854 } 2301 }
1855 2302
1856 } else { 2303 } else {
1857 return $self->SUPER::key_down ($ev) 2304 return $self->SUPER::invoke_key_down ($ev)
1858 } 2305 }
1859 2306
1860 1 2307 1
1861} 2308}
1862 2309
1863############################################################################# 2310#############################################################################
1864 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
1865package CFClient::UI::Button; 2351package CFPlus::UI::ButtonBin;
1866 2352
1867our @ISA = CFClient::UI::Label::; 2353our @ISA = CFPlus::UI::Bin::;
1868 2354
1869use CFClient::OpenGL; 2355use CFPlus::OpenGL;
1870 2356
1871my @tex = 2357my @tex =
1872 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1873 qw(b1_button_active.png); 2359 qw(b1_button_inactive.png b1_button_active.png);
1874 2360
1875sub new { 2361sub new {
1876 my $class = shift; 2362 my $class = shift;
1877 2363
1878 $class->SUPER::new ( 2364 $class->SUPER::new (
1879 padding_x => 4,
1880 padding_y => 4,
1881 fg => [1, 1, 1],
1882 active_fg => [0, 0, 1],
1883 can_hover => 1, 2365 can_hover => 1,
1884 align => 0, 2366 align => 0,
1885 valign => 0, 2367 valign => 0,
1886 can_events => 1, 2368 can_events => 1,
1887 @_ 2369 @_
1888 ) 2370 )
1889} 2371}
1890 2372
1891sub activate { }
1892
1893sub button_up { 2373sub invoke_button_up {
1894 my ($self, $ev, $x, $y) = @_; 2374 my ($self, $ev, $x, $y) = @_;
1895 2375
1896 $self->emit ("activate") 2376 $self->emit ("activate")
1897 if $x >= 0 && $x < $self->{w} 2377 if $x >= 0 && $x < $self->{w}
1898 && $y >= 0 && $y < $self->{h}; 2378 && $y >= 0 && $y < $self->{h};
… …
1901} 2381}
1902 2382
1903sub _draw { 2383sub _draw {
1904 my ($self) = @_; 2384 my ($self) = @_;
1905 2385
1906 local $self->{fg} = $self->{fg};
1907
1908 if ($GRAB == $self) {
1909 $self->{fg} = $self->{active_fg};
1910 }
1911
1912 glEnable GL_TEXTURE_2D; 2386 glEnable GL_TEXTURE_2D;
1913 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2387 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1914 glColor 0, 0, 0, 1; 2388 glColor 0, 0, 0, 1;
1915 2389
2390 my $tex = $tex[$GRAB == $self];
1916 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2391 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1917 2392
1918 glDisable GL_TEXTURE_2D; 2393 glDisable GL_TEXTURE_2D;
1919 2394
1920 $self->SUPER::_draw; 2395 $self->SUPER::_draw;
1921} 2396}
1922 2397
1923############################################################################# 2398#############################################################################
1924 2399
1925package CFClient::UI::CheckBox; 2400package CFPlus::UI::Button;
1926 2401
1927our @ISA = CFClient::UI::DrawBG::; 2402our @ISA = CFPlus::UI::Label::;
2403
2404use CFPlus::OpenGL;
1928 2405
1929my @tex = 2406my @tex =
1930 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 }
1931 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2461 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1932 2462
1933use CFClient::OpenGL; 2463use CFPlus::OpenGL;
1934 2464
1935sub new { 2465sub new {
1936 my $class = shift; 2466 my $class = shift;
1937 2467
1938 $class->SUPER::new ( 2468 $class->SUPER::new (
… …
1952 my ($self) = @_; 2482 my ($self) = @_;
1953 2483
1954 (6) x 2 2484 (6) x 2
1955} 2485}
1956 2486
2487sub toggle {
2488 my ($self) = @_;
2489
2490 $self->{state} = !$self->{state};
2491 $self->emit (changed => $self->{state});
2492 $self->update;
2493}
2494
1957sub button_down { 2495sub invoke_button_down {
1958 my ($self, $ev, $x, $y) = @_; 2496 my ($self, $ev, $x, $y) = @_;
1959 2497
1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2498 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2499 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1962 $self->{state} = !$self->{state}; 2500 $self->toggle;
1963 $self->_emit (changed => $self->{state});
1964 } else { 2501 } else {
1965 return 0 2502 return 0
1966 } 2503 }
1967 2504
1968 1 2505 1
… …
1988 glDisable GL_TEXTURE_2D; 2525 glDisable GL_TEXTURE_2D;
1989} 2526}
1990 2527
1991############################################################################# 2528#############################################################################
1992 2529
1993package CFClient::UI::Image; 2530package CFPlus::UI::Image;
1994 2531
1995our @ISA = CFClient::UI::Base::; 2532our @ISA = CFPlus::UI::Base::;
1996 2533
1997use CFClient::OpenGL; 2534use CFPlus::OpenGL;
1998use Carp qw/confess/;
1999 2535
2000our %loaded_images; 2536our %texture_cache;
2001 2537
2002sub new { 2538sub new {
2003 my $class = shift; 2539 my $class = shift;
2004 2540
2005 my $self = $class->SUPER::new (can_events => 0, @_); 2541 my $self = $class->SUPER::new (
2542 can_events => 0,
2543 scale => 1,
2544 @_,
2545 );
2006 2546
2007 $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";
2008 2549
2009 $loaded_images{$self->{image}} ||= 2550 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2010 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;
2011 2552
2012 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2553 CFPlus::weaken $texture_cache{$self->{path}};
2013 2554
2014 Scalar::Util::weaken $loaded_images{$self->{image}}; 2555 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2015
2016 $self->{aspect} = $tex->{w} / $tex->{h};
2017 2556
2018 $self 2557 $self
2019} 2558}
2020 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
2021sub size_request { 2575sub size_request {
2022 my ($self) = @_; 2576 my ($self) = @_;
2023 2577
2024 ($self->{tex}->{w}, $self->{tex}->{h}) 2578 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2025} 2579}
2026 2580
2027sub _draw { 2581sub _draw {
2028 my ($self) = @_; 2582 my ($self) = @_;
2029 2583
… …
2046 glDisable GL_TEXTURE_2D; 2600 glDisable GL_TEXTURE_2D;
2047} 2601}
2048 2602
2049############################################################################# 2603#############################################################################
2050 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
2051package CFClient::UI::VGauge; 2647package CFPlus::UI::VGauge;
2052 2648
2053our @ISA = CFClient::UI::Base::; 2649our @ISA = CFPlus::UI::Base::;
2054 2650
2055use List::Util qw(min max); 2651use List::Util qw(min max);
2056 2652
2057use CFClient::OpenGL; 2653use CFPlus::OpenGL;
2058 2654
2059my %tex = ( 2655my %tex = (
2060 food => [ 2656 food => [
2061 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2657 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2062 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2658 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2063 ], 2659 ],
2064 grace => [ 2660 grace => [
2065 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2661 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2066 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/
2067 ], 2663 ],
2068 hp => [ 2664 hp => [
2069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2665 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2070 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2666 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2071 ], 2667 ],
2072 mana => [ 2668 mana => [
2073 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2669 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2074 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/
2075 ], 2671 ],
2076); 2672);
2077 2673
2078# eg. VGauge->new (gauge => 'food'), default gauge: food 2674# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2138 my $ycut1 = max 0, min 1, $ycut; 2734 my $ycut1 = max 0, min 1, $ycut;
2139 my $ycut2 = max 0, min 1, $ycut - 1; 2735 my $ycut2 = max 0, min 1, $ycut - 1;
2140 2736
2141 my $h1 = $self->{h} * (1 - $ycut1); 2737 my $h1 = $self->{h} * (1 - $ycut1);
2142 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);
2143 2742
2144 glEnable GL_BLEND; 2743 glEnable GL_BLEND;
2145 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;
2146 glEnable GL_TEXTURE_2D; 2746 glEnable GL_TEXTURE_2D;
2147 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2747 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2148 2748
2149 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2749 glBindTexture GL_TEXTURE_2D, $t1->{name};
2150 glBegin GL_QUADS; 2750 glBegin GL_QUADS;
… …
2165 2765
2166 if ($t3) { 2766 if ($t3) {
2167 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2767 glBindTexture GL_TEXTURE_2D, $t3->{name};
2168 glBegin GL_QUADS; 2768 glBegin GL_QUADS;
2169 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2769 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2170 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2770 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2171 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2771 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2172 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2772 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2173 glEnd; 2773 glEnd;
2174 } 2774 }
2175 2775
2176 glDisable GL_BLEND; 2776 glDisable GL_BLEND;
2177 glDisable GL_TEXTURE_2D; 2777 glDisable GL_TEXTURE_2D;
2178} 2778}
2179 2779
2180############################################################################# 2780#############################################################################
2181 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
2182package CFClient::UI::Gauge; 2926package CFPlus::UI::Gauge;
2183 2927
2184our @ISA = CFClient::UI::VBox::; 2928our @ISA = CFPlus::UI::VBox::;
2185 2929
2186sub new { 2930sub new {
2187 my ($class, %arg) = @_; 2931 my ($class, %arg) = @_;
2188 2932
2189 my $self = $class->SUPER::new ( 2933 my $self = $class->SUPER::new (
… …
2191 can_hover => 1, 2935 can_hover => 1,
2192 can_events => 1, 2936 can_events => 1,
2193 %arg, 2937 %arg,
2194 ); 2938 );
2195 2939
2196 $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");
2197 $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);
2198 $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");
2199 2943
2200 $self 2944 $self
2201} 2945}
2202 2946
2203sub set_fontsize { 2947sub set_fontsize {
… …
2224 $self->{value}->set_text ($val); 2968 $self->{value}->set_text ($val);
2225} 2969}
2226 2970
2227############################################################################# 2971#############################################################################
2228 2972
2229package CFClient::UI::Slider; 2973package CFPlus::UI::Slider;
2230 2974
2231use strict; 2975use strict;
2232 2976
2233use CFClient::OpenGL; 2977use CFPlus::OpenGL;
2234 2978
2235our @ISA = CFClient::UI::DrawBG::; 2979our @ISA = CFPlus::UI::DrawBG::;
2236 2980
2237my @tex = 2981my @tex =
2238 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2982 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2239 qw(s1_slider.png s1_slider_bg.png); 2983 qw(s1_slider.png s1_slider_bg.png);
2240 2984
2241sub new { 2985sub new {
2242 my $class = shift; 2986 my $class = shift;
2243 2987
… …
2264 $self->update; 3008 $self->update;
2265 3009
2266 $self 3010 $self
2267} 3011}
2268 3012
2269sub changed { }
2270
2271sub set_range { 3013sub set_range {
2272 my ($self, $range) = @_; 3014 my ($self, $range) = @_;
2273 3015
2274 ($range, $self->{range}) = ($self->{range}, $range); 3016 ($range, $self->{range}) = ($self->{range}, $range);
2275 3017
2276 $self->update
2277 if "@$range" ne "@{$self->{range}}"; 3018 if ("@$range" ne "@{$self->{range}}") {
3019 $self->update;
3020 $self->set_value ($self->{range}[0]);
3021 }
2278} 3022}
2279 3023
2280sub set_value { 3024sub set_value {
2281 my ($self, $value) = @_; 3025 my ($self, $value) = @_;
2282 3026
… …
2293 if $unit; 3037 if $unit;
2294 3038
2295 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3039 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2296 3040
2297 if ($value != $old_value) { 3041 if ($value != $old_value) {
2298 $self->_emit (changed => $value); 3042 $self->emit (changed => $value);
2299 $self->update; 3043 $self->update;
2300 } 3044 }
2301} 3045}
2302 3046
2303sub size_request { 3047sub size_request {
2304 my ($self) = @_; 3048 my ($self) = @_;
2305 3049
2306 ($self->{req_w}, $self->{req_h}) 3050 ($self->{req_w}, $self->{req_h})
2307} 3051}
2308 3052
2309sub button_down { 3053sub invoke_button_down {
2310 my ($self, $ev, $x, $y) = @_; 3054 my ($self, $ev, $x, $y) = @_;
2311 3055
2312 $self->SUPER::button_down ($ev, $x, $y); 3056 $self->SUPER::invoke_button_down ($ev, $x, $y);
2313 3057
2314 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3058 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2315 3059
2316 $self->mouse_motion ($ev, $x, $y) 3060 $self->invoke_mouse_motion ($ev, $x, $y);
2317}
2318 3061
3062 1
3063}
3064
2319sub mouse_motion { 3065sub invoke_mouse_motion {
2320 my ($self, $ev, $x, $y) = @_; 3066 my ($self, $ev, $x, $y) = @_;
2321 3067
2322 if ($GRAB == $self) { 3068 if ($GRAB == $self) {
2323 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3069 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2324 3070
… …
2332 } 3078 }
2333 3079
2334 1 3080 1
2335} 3081}
2336 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);
3091
3092 1
3093}
3094
2337sub update { 3095sub update {
2338 my ($self) = @_; 3096 my ($self) = @_;
2339 3097
2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 3098 delete $self->{knob_w};
3099 $self->SUPER::update;
3100}
3101
3102sub _draw {
3103 my ($self) = @_;
3104
3105 unless ($self->{knob_w}) {
2341 $self->set_value ($self->{range}[0]); 3106 $self->set_value ($self->{range}[0]);
2342 3107
2343 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3108 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100; 3109 my $range = ($hi - $page - $lo) || 1e-100;
2345 3110
… …
2351 $value = ($value - $lo) / $range; 3116 $value = ($value - $lo) / $range;
2352 $value = $value * $self->{scale} + $self->{offset}; 3117 $value = $value * $self->{scale} + $self->{offset};
2353 3118
2354 $self->{knob_x} = $value - $knob_w * 0.5; 3119 $self->{knob_x} = $value - $knob_w * 0.5;
2355 $self->{knob_w} = $knob_w; 3120 $self->{knob_w} = $knob_w;
2356 }); 3121 }
2357
2358 $self->SUPER::update;
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363 3122
2364 $self->SUPER::_draw (); 3123 $self->SUPER::_draw ();
2365 3124
2366 glScale $self->{w}, $self->{h}; 3125 glScale $self->{w}, $self->{h};
2367 3126
… …
2387 glDisable GL_TEXTURE_2D; 3146 glDisable GL_TEXTURE_2D;
2388} 3147}
2389 3148
2390############################################################################# 3149#############################################################################
2391 3150
2392package CFClient::UI::ValSlider; 3151package CFPlus::UI::ValSlider;
2393 3152
2394our @ISA = CFClient::UI::HBox::; 3153our @ISA = CFPlus::UI::HBox::;
2395 3154
2396sub new { 3155sub new {
2397 my ($class, %arg) = @_; 3156 my ($class, %arg) = @_;
2398 3157
2399 my $range = delete $arg{range}; 3158 my $range = delete $arg{range};
2400 3159
2401 my $self = $class->SUPER::new ( 3160 my $self = $class->SUPER::new (
2402 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3161 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2403 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3162 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2404 to_value => sub { shift }, 3163 to_value => sub { shift },
2405 from_value => sub { shift }, 3164 from_value => sub { shift },
2406 %arg, 3165 %arg,
2407 ); 3166 );
2408 3167
… …
2428sub set_range { shift->{slider}->set_range (@_) } 3187sub set_range { shift->{slider}->set_range (@_) }
2429sub set_value { shift->{slider}->set_value (@_) } 3188sub set_value { shift->{slider}->set_value (@_) }
2430 3189
2431############################################################################# 3190#############################################################################
2432 3191
2433package CFClient::UI::TextView; 3192package CFPlus::UI::TextScroller;
2434 3193
2435our @ISA = CFClient::UI::HBox::; 3194our @ISA = CFPlus::UI::HBox::;
2436 3195
2437use CFClient::OpenGL; 3196use CFPlus::OpenGL;
2438 3197
2439sub new { 3198sub new {
2440 my $class = shift; 3199 my $class = shift;
2441 3200
2442 my $self = $class->SUPER::new ( 3201 my $self = $class->SUPER::new (
2443 fontsize => 1, 3202 fontsize => 1,
2444 can_events => 0, 3203 can_events => 1,
3204 indent => 0,
2445 #font => default_font 3205 #font => default_font
2446 @_, 3206 @_,
2447 3207
2448 layout => (new CFClient::Layout 1), 3208 layout => (new CFPlus::Layout),
2449 par => [], 3209 par => [],
3210 max_par => 0,
2450 height => 0, 3211 height => 0,
2451 children => [ 3212 children => [
2452 (new CFClient::UI::Empty expand => 1), 3213 (new CFPlus::UI::Empty expand => 1),
2453 (new CFClient::UI::Slider vertical => 1), 3214 (new CFPlus::UI::Slider vertical => 1),
2454 ], 3215 ],
2455 ); 3216 );
2456 3217
2457 $self->{children}[1]->connect (changed => sub { $self->update }); 3218 $self->{children}[1]->connect (changed => sub { $self->update });
2458 3219
… …
2464 3225
2465 $self->{fontsize} = $fontsize; 3226 $self->{fontsize} = $fontsize;
2466 $self->reflow; 3227 $self->reflow;
2467} 3228}
2468 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
2469sub size_allocate { 3239sub invoke_size_allocate {
2470 my ($self, $w, $h) = @_; 3240 my ($self, $w, $h) = @_;
2471 3241
2472 $self->SUPER::size_allocate ($w, $h); 3242 my ($empty, $slider, @other) = @{ $self->{children} };
3243 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2473 3244
2474 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3245 $self->{layout}->set_font ($self->{font}) if $self->{font};
2475 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3246 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2476 $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});
2477 3249
2478 $self->reflow; 3250 $self->reflow;
2479}
2480 3251
2481sub text_size { 3252 local $self->{children} = [$empty, $slider];
3253 $self->SUPER::invoke_size_allocate ($w, $h)
3254}
3255
3256sub invoke_mouse_wheel {
2482 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) = @_;
2483 3268
2484 my $layout = $self->{layout}; 3269 my $layout = $self->{layout};
2485 3270
3271 $layout->set_font ($self->{font}) if $self->{font};
3272 $layout->set_foreground (@{$para->{fg}});
2486 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3273 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $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});
2488 $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}}
2489 3282 );
3283
2490 $layout->size 3284 $layout
2491} 3285}
2492 3286
2493sub reflow { 3287sub reflow {
2494 my ($self) = @_; 3288 my ($self) = @_;
2495 3289
… …
2502 3296
2503 # todo: base offset on lines or so, not on pixels 3297 # todo: base offset on lines or so, not on pixels
2504 $self->{children}[1]->set_value ($offset); 3298 $self->{children}[1]->set_value ($offset);
2505} 3299}
2506 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
2507sub clear { 3316sub clear {
2508 my ($self) = @_; 3317 my ($self) = @_;
3318
3319 my (undef, undef, @other) = @{ $self->{children} };
3320 $self->remove ($_) for @other;
2509 3321
2510 $self->{par} = []; 3322 $self->{par} = [];
2511 $self->{height} = 0; 3323 $self->{height} = 0;
2512 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3324 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2513} 3325}
2514 3326
2515sub add_paragraph { 3327sub add_paragraph {
2516 my ($self, $color, $text, $indent) = @_; 3328 my $self = shift;
2517 3329
2518 for my $line (split /\n/, $text) { 3330 for my $para (@_) {
2519 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
2520 $self->{height} += $h; 3382 $self->{height} = $height;
2521 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3383 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2522 }
2523 3384
2524 $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 }
2525} 3391}
2526 3392
2527sub update { 3393sub update {
2528 my ($self) = @_; 3394 my ($self) = @_;
2529 3395
… …
2531 3397
2532 return unless $self->{h} > 0; 3398 return unless $self->{h} > 0;
2533 3399
2534 delete $self->{texture}; 3400 delete $self->{texture};
2535 3401
2536 $ROOT->on_post_alloc ($self, sub { 3402 $ROOT->on_post_alloc ($self => sub {
3403 $self->force_uptodate;
3404
2537 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3405 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2538 3406
2539 if (delete $self->{need_reflow}) {
2540 my $height = 0;
2541
2542 my $layout = $self->{layout};
2543
2544 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545
2546 for (@{$self->{par}}) {
2547 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2548 $layout->set_width ($W - $_->[3]);
2549 $layout->set_markup ($_->[4]);
2550 my ($w, $h) = $layout->size;
2551 $_->[0] = $w + $_->[3];
2552 $_->[1] = $h;
2553 }
2554
2555 $height += $_->[1];
2556 }
2557
2558 $self->{height} = $height;
2559
2560 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2561
2562 delete $self->{texture};
2563 }
2564
2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3407 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2566 glClearColor 0.5, 0.5, 0.5, 0; 3408 glClearColor 0, 0, 0, 0;
2567 glClear GL_COLOR_BUFFER_BIT; 3409 glClear GL_COLOR_BUFFER_BIT;
2568 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;
2569 my $top = int $self->{children}[1]{range}[0]; 3419 my $top = int $self->{children}[1]{range}[0];
2570 3420
2571 my $y0 = $top; 3421 my $y0 = $top;
2572 my $y1 = $top + $H; 3422 my $y1 = $top + $H;
2573 3423
2574 my $y = 0;
2575
2576 my $layout = $self->{layout};
2577
2578 $layout->set_font ($self->{font}) if $self->{font};
2579
2580 glEnable GL_BLEND;
2581 #TODO# not correct in windows where rgba is forced off
2582 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2583
2584 for my $par (@{$self->{par}}) { 3424 for my $para (@{$self->{par}}) {
2585 my $h = $par->[1]; 3425 my $h = $para->{h};
3426 my $y = $para->{y};
2586 3427
2587 if ($y0 < $y + $h && $y < $y1) { 3428 if ($y0 < $y + $h && $y < $y1) {
2588 $layout->set_foreground (@{ $par->[2] }); 3429 my $layout = $self->get_layout ($para);
2589 $layout->set_width ($W - $par->[3]);
2590 $layout->set_markup ($par->[4]);
2591 3430
2592 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3431 $layout->render ($para->{indent}, $y - $y0);
3432 $layout->draw;
2593 3433
2594 glRasterPos $par->[3], $y - $y0; 3434 if (my @w = @{ $para->{widget} }) {
2595 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 }
2596 } 3446 }
2597 3447
2598 $y += $h; 3448 $paridx++;
3449 $top_paragraph ||= $paridx if $y >= $top;
2599 } 3450 }
2600 3451
2601 glDisable GL_BLEND; 3452 $self->{top_paragraph} = $top_paragraph;
2602 }; 3453 };
2603 }); 3454 });
2604} 3455}
2605 3456
3457sub reconfigure {
3458 my ($self) = @_;
3459
3460 $self->SUPER::reconfigure;
3461
3462 $_->{w} = 1e10 for @{ $self->{par} };
3463 $self->reflow;
3464}
3465
2606sub _draw { 3466sub _draw {
2607 my ($self) = @_; 3467 my ($self) = @_;
2608 3468
2609 glEnable GL_TEXTURE_2D; 3469 glEnable GL_TEXTURE_2D;
2610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2611 glColor 1, 1, 1, 1; 3471 glColor 0, 0, 0, 1;
2612 $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});
2613 glDisable GL_TEXTURE_2D; 3473 glDisable GL_TEXTURE_2D;
2614 3474
2615 $self->{children}[1]->draw; 3475 $self->{children}[1]->draw;
2616
2617} 3476}
2618 3477
2619############################################################################# 3478#############################################################################
2620 3479
2621package CFClient::UI::Animator; 3480package CFPlus::UI::Animator;
2622 3481
2623use CFClient::OpenGL; 3482use CFPlus::OpenGL;
2624 3483
2625our @ISA = CFClient::UI::Bin::; 3484our @ISA = CFPlus::UI::Bin::;
2626 3485
2627sub moveto { 3486sub moveto {
2628 my ($self, $x, $y) = @_; 3487 my ($self, $x, $y) = @_;
2629 3488
2630 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3489 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2658 glPopMatrix; 3517 glPopMatrix;
2659} 3518}
2660 3519
2661############################################################################# 3520#############################################################################
2662 3521
2663package CFClient::UI::Flopper; 3522package CFPlus::UI::Flopper;
2664 3523
2665our @ISA = CFClient::UI::Button::; 3524our @ISA = CFPlus::UI::Button::;
2666 3525
2667sub new { 3526sub new {
2668 my $class = shift; 3527 my $class = shift;
2669 3528
2670 my $self = $class->SUPER::new ( 3529 my $self = $class->SUPER::new (
… …
2682 $self->{other}->toggle_visibility; 3541 $self->{other}->toggle_visibility;
2683} 3542}
2684 3543
2685############################################################################# 3544#############################################################################
2686 3545
2687package CFClient::UI::Tooltip; 3546package CFPlus::UI::Tooltip;
2688 3547
2689our @ISA = CFClient::UI::Bin::; 3548our @ISA = CFPlus::UI::Bin::;
2690 3549
2691use CFClient::OpenGL; 3550use CFPlus::OpenGL;
2692 3551
2693sub new { 3552sub new {
2694 my $class = shift; 3553 my $class = shift;
2695 3554
2696 $class->SUPER::new ( 3555 $class->SUPER::new (
… …
2700} 3559}
2701 3560
2702sub set_tooltip_from { 3561sub set_tooltip_from {
2703 my ($self, $widget) = @_; 3562 my ($self, $widget) = @_;
2704 3563
2705 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 =~ /^#(.*)$/;
2706 3569
2707 if ($ENV{CFPLUS_DEBUG} & 2) { 3570 if ($ENV{CFPLUS_DEBUG} & 2) {
2708 $tooltip .= "\n\n" . (ref $widget) . "\n" 3571 $tip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3572 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n" 3573 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}"; 3574 . "visible $widget->{visible}";
2712 } 3575 }
2713 3576
3577 $tip =~ s/^\n+//;
3578 $tip =~ s/\n+$//;
3579
2714 $self->add (new CFClient::UI::Label 3580 $self->add (new CFPlus::UI::Label
2715 markup => $tooltip, 3581 markup => $tip,
2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3582 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2717 fontsize => 0.8, 3583 fontsize => 0.8,
2718 fg => [0, 0, 0, 1], 3584 style => 1, # FLAG_INVERSE
2719 ellipsise => 0, 3585 ellipsise => 0,
2720 font => ($widget->{tooltip_font} || $::FONT_PROP), 3586 font => ($widget->{tooltip_font} || $::FONT_PROP),
2721 ); 3587 );
2722} 3588}
2723 3589
… …
2727 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3593 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2728 3594
2729 ($w + 4, $h + 4) 3595 ($w + 4, $h + 4)
2730} 3596}
2731 3597
2732sub size_allocate { 3598sub invoke_size_allocate {
2733 my ($self, $w, $h) = @_; 3599 my ($self, $w, $h) = @_;
2734 3600
2735 $self->SUPER::size_allocate ($w - 4, $h - 4); 3601 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2736} 3602}
2737 3603
2738sub visibility_change { 3604sub invoke_visibility_change {
2739 my ($self, $visible) = @_; 3605 my ($self, $visible) = @_;
2740 3606
2741 return unless $visible; 3607 return unless $visible;
2742 3608
2743 $self->{root}->on_post_alloc ("move_$self" => sub { 3609 $self->{root}->on_post_alloc ("move_$self" => sub {
2744 my $widget = $self->{owner} 3610 my $widget = $self->{owner}
2745 or return; 3611 or return;
2746 3612
3613 if ($widget->{visible}) {
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3614 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748 3615
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3616 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH; 3617 if $x + $self->{w} > $self->{root}{w};
2751 3618
2752 $self->move_abs ($x, $y); 3619 $self->move_abs ($x, $y);
3620 } else {
3621 $self->hide;
3622 }
2753 }); 3623 });
2754} 3624}
2755 3625
2756sub _draw { 3626sub _draw {
2757 my ($self) = @_; 3627 my ($self) = @_;
… …
2759 glTranslate 0.375, 0.375; 3629 glTranslate 0.375, 0.375;
2760 3630
2761 my ($w, $h) = @$self{qw(w h)}; 3631 my ($w, $h) = @$self{qw(w h)};
2762 3632
2763 glColor 1, 0.8, 0.4; 3633 glColor 1, 0.8, 0.4;
2764 glBegin GL_QUADS; 3634 glRect 0, 0, $w, $h;
2765 glVertex 0 , 0;
2766 glVertex 0 , $h;
2767 glVertex $w, $h;
2768 glVertex $w, 0;
2769 glEnd;
2770 3635
2771 glColor 0, 0, 0; 3636 glColor 0, 0, 0;
2772 glBegin GL_LINE_LOOP; 3637 glRect_lineloop 0, 0, $w, $h;
2773 glVertex 0 , 0;
2774 glVertex 0 , $h;
2775 glVertex $w, $h;
2776 glVertex $w, 0;
2777 glEnd;
2778 3638
2779 glTranslate 2 - 0.375, 2 - 0.375; 3639 glTranslate 2 - 0.375, 2 - 0.375;
2780 3640
2781 $self->SUPER::_draw; 3641 $self->SUPER::_draw;
2782} 3642}
2783 3643
2784############################################################################# 3644#############################################################################
2785 3645
2786package CFClient::UI::Face; 3646package CFPlus::UI::Face;
2787 3647
2788our @ISA = CFClient::UI::Base::; 3648our @ISA = CFPlus::UI::DrawBG::;
2789 3649
2790use CFClient::OpenGL; 3650use CFPlus::OpenGL;
2791 3651
2792sub new { 3652sub new {
2793 my $class = shift; 3653 my $class = shift;
2794 3654
2795 my $self = $class->SUPER::new ( 3655 my $self = $class->SUPER::new (
3656 size_w => 32,
3657 size_h => 8,
2796 aspect => 1, 3658 aspect => 1,
2797 can_events => 0, 3659 can_events => 0,
2798 @_, 3660 @_,
2799 ); 3661 );
2800 3662
2801 if ($self->{anim} && $self->{animspeed}) { 3663 if ($self->{anim} && $self->{animspeed}) {
2802 Scalar::Util::weaken (my $widget = $self); 3664 CFPlus::weaken (my $widget = $self);
2803 3665
3666 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3667 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2804 $self->{timer} = Event->timer ( 3668 $self->{timer} = Event->timer (
2805 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2806 hard => 1, 3669 parked => 1,
2807 interval => $self->{animspeed},
2808 cb => sub { 3670 cb => sub {
3671 return unless $::CONN;
3672
3673 my $w = $widget
3674 or return;
3675
2809 ++$widget->{frame}; 3676 ++$w->{frame};
3677 $w->update_face;
3678
3679 # somehow, $widget can go away
2810 $widget->update; 3680 $w->update;
3681 $w->update_timer;
2811 }, 3682 },
2812 ); 3683 );
3684
3685 $self->update_face;
3686 $self->update_timer;
2813 } 3687 }
2814 3688
2815 $self 3689 $self
2816} 3690}
2817 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
2818sub size_request { 3728sub size_request {
2819 (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)
2820} 3746}
2821 3747
2822sub update { 3748sub update {
2823 my ($self) = @_; 3749 my ($self) = @_;
2824 3750
2825 return unless $self->{visible}; 3751 return unless $self->{visible};
2826 3752
2827 $self->SUPER::update; 3753 $self->SUPER::update;
2828} 3754}
2829 3755
3756sub invoke_visibility_change {
3757 my ($self) = @_;
3758
3759 $self->update_timer;
3760
3761 0
3762}
3763
2830sub _draw { 3764sub _draw {
2831 my ($self) = @_; 3765 my ($self) = @_;
2832 3766
2833 return unless $::CONN; 3767 $self->SUPER::_draw;
2834 3768
2835 my $face; 3769 if (my $tex = $self->{tex}) {
2836
2837 if ($self->{frame}) {
2838 my $anim = $::CONN->{anim}[$self->{anim}];
2839
2840 $face = $anim->[ $self->{frame} % @$anim ]
2841 if $anim && @$anim;
2842 }
2843
2844 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2845
2846 if ($tex) {
2847 glEnable GL_TEXTURE_2D; 3770 glEnable GL_TEXTURE_2D;
2848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3771 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2849 glColor 1, 1, 1, 1; 3772 glColor 0, 0, 0, 1;
2850 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3773 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2851 glDisable GL_TEXTURE_2D; 3774 glDisable GL_TEXTURE_2D;
2852 } 3775 }
2853} 3776}
2854 3777
2855sub DESTROY { 3778sub destroy {
2856 my ($self) = @_; 3779 my ($self) = @_;
2857 3780
2858 $self->{timer}->cancel 3781 (delete $self->{timer})->cancel
2859 if $self->{timer}; 3782 if $self->{timer};
2860 3783
2861 $self->SUPER::DESTROY; 3784 $self->SUPER::destroy;
2862} 3785}
2863 3786
2864############################################################################# 3787#############################################################################
2865 3788
2866package CFClient::UI::Buttonbar; 3789package CFPlus::UI::Buttonbar;
2867 3790
2868our @ISA = CFClient::UI::HBox::; 3791our @ISA = CFPlus::UI::HBox::;
2869 3792
2870# TODO: should actualyl wrap buttons and other goodies. 3793# TODO: should actually wrap buttons and other goodies.
2871 3794
2872############################################################################# 3795#############################################################################
2873 3796
2874package CFClient::UI::Menu; 3797package CFPlus::UI::Menu;
2875 3798
2876our @ISA = CFClient::UI::FancyFrame::; 3799our @ISA = CFPlus::UI::Toplevel::;
2877 3800
2878use CFClient::OpenGL; 3801use CFPlus::OpenGL;
2879 3802
2880sub new { 3803sub new {
2881 my $class = shift; 3804 my $class = shift;
2882 3805
2883 my $self = $class->SUPER::new ( 3806 my $self = $class->SUPER::new (
2884 items => [], 3807 items => [],
2885 z => 100, 3808 z => 100,
2886 @_, 3809 @_,
2887 ); 3810 );
2888 3811
2889 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3812 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2890 3813
2891 for my $item (@{ $self->{items} }) { 3814 for my $item (@{ $self->{items} }) {
2892 my ($widget, $cb) = @$item; 3815 my ($widget, $cb, $tooltip) = @$item;
2893 3816
2894 # handle various types of items, only text for now 3817 # handle various types of items, only text for now
2895 if (!ref $widget) { 3818 if (!ref $widget) {
3819 if ($widget =~ /\t/) {
3820 my ($left, $right) = split /\t/, $widget, 2;
3821
2896 $widget = new CFClient::UI::Label 3822 $widget = new CFPlus::UI::HBox
2897 can_hover => 1, 3823 can_hover => 1,
2898 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,
2899 text => $widget; 3836 markup => $widget,
3837 tooltip => $tooltip;
3838 }
2900 } 3839 }
2901 3840
2902 $self->{item}{$widget} = $item; 3841 $self->{item}{$widget} = $item;
2903 3842
2904 $self->{vbox}->add ($widget); 3843 $self->{vbox}->add ($widget);
… …
2909 3848
2910# 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)
2911sub popup { 3850sub popup {
2912 my ($self, $ev) = @_; 3851 my ($self, $ev) = @_;
2913 3852
2914 $self->_emit ("popdown"); 3853 $self->emit ("popdown");
2915 3854
2916 # maybe save $GRAB? must be careful about events... 3855 # maybe save $GRAB? must be careful about events...
2917 $GRAB = $self; 3856 $GRAB = $self;
2918 $self->{button} = $ev->{button}; 3857 $self->{button} = $ev->{button};
2919 3858
2920 $self->show; 3859 $self->show;
2921 $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);
2922} 3861}
2923 3862
2924sub mouse_motion { 3863sub invoke_mouse_motion {
2925 my ($self, $ev, $x, $y) = @_; 3864 my ($self, $ev, $x, $y) = @_;
2926 3865
2927 # TODO: should use vbox->find_widget or so 3866 # TODO: should use vbox->find_widget or so
2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3867 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2929 $self->{hover} = $self->{item}{$HOVER}; 3868 $self->{hover} = $self->{item}{$HOVER};
2930 3869
2931 0 3870 0
2932} 3871}
2933 3872
2934sub button_up { 3873sub invoke_button_up {
2935 my ($self, $ev, $x, $y) = @_; 3874 my ($self, $ev, $x, $y) = @_;
2936 3875
2937 if ($ev->{button} == $self->{button}) { 3876 if ($ev->{button} == $self->{button}) {
2938 undef $GRAB; 3877 undef $GRAB;
2939 $self->hide; 3878 $self->hide;
2940 3879
2941 $self->_emit ("popdown"); 3880 $self->emit ("popdown");
2942 $self->{hover}[1]->() if $self->{hover}; 3881 $self->{hover}[1]->() if $self->{hover};
2943 } else { 3882 } else {
2944 return 0 3883 return 0
2945 } 3884 }
2946 3885
2947 1 3886 1
2948} 3887}
2949 3888
2950############################################################################# 3889#############################################################################
2951 3890
2952package CFClient::UI::Multiplexer; 3891package CFPlus::UI::Multiplexer;
2953 3892
2954our @ISA = CFClient::UI::Container::; 3893our @ISA = CFPlus::UI::Container::;
2955 3894
2956sub new { 3895sub new {
2957 my $class = shift; 3896 my $class = shift;
2958 3897
2959 my $self = $class->SUPER::new ( 3898 my $self = $class->SUPER::new (
… …
2973 3912
2974 $self->{current} = $self->{children}[0] 3913 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} }; 3914 if @{ $self->{children} };
2976} 3915}
2977 3916
3917sub get_current_page {
3918 my ($self) = @_;
3919
3920 $self->{current}
3921}
3922
2978sub set_current_page { 3923sub set_current_page {
2979 my ($self, $page_or_widget) = @_; 3924 my ($self, $page_or_widget) = @_;
2980 3925
2981 my $widget = ref $page_or_widget 3926 my $widget = ref $page_or_widget
2982 ? $page_or_widget 3927 ? $page_or_widget
2983 : $self->{children}[$page_or_widget]; 3928 : $self->{children}[$page_or_widget];
2984 3929
2985 $self->{current} = $widget; 3930 $self->{current} = $widget;
2986 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3931 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987 3932
2988 $self->_emit (page_changed => $self->{current}); 3933 $self->emit (page_changed => $self->{current});
2989 3934
2990 $self->realloc; 3935 $self->realloc;
2991} 3936}
2992 3937
2993sub visible_children { 3938sub visible_children {
… …
2998 my ($self) = @_; 3943 my ($self) = @_;
2999 3944
3000 $self->{current}->size_request 3945 $self->{current}->size_request
3001} 3946}
3002 3947
3003sub size_allocate { 3948sub invoke_size_allocate {
3004 my ($self, $w, $h) = @_; 3949 my ($self, $w, $h) = @_;
3005 3950
3006 $self->{current}->configure (0, 0, $w, $h); 3951 $self->{current}->configure (0, 0, $w, $h);
3952
3953 1
3007} 3954}
3008 3955
3009sub _draw { 3956sub _draw {
3010 my ($self) = @_; 3957 my ($self) = @_;
3011 3958
3012 $self->{current}->draw; 3959 $self->{current}->draw;
3013} 3960}
3014 3961
3015############################################################################# 3962#############################################################################
3016 3963
3017package CFClient::UI::Notebook; 3964package CFPlus::UI::Notebook;
3018 3965
3966use CFPlus::OpenGL;
3967
3019our @ISA = CFClient::UI::VBox::; 3968our @ISA = CFPlus::UI::VBox::;
3020 3969
3021sub new { 3970sub new {
3022 my $class = shift; 3971 my $class = shift;
3023 3972
3024 my $self = $class->SUPER::new ( 3973 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar), 3974 buttonbar => (new CFPlus::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3975 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3976 active_outline => [1, 1, 0],
3977 # filter => # will be put between multiplexer and $self
3027 @_, 3978 @_,
3028 ); 3979 );
3029 3980
3981 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer}); 3982 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
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 }
3031 4017
3032 $self 4018 $self
3033} 4019}
3034 4020
3035sub 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 {
3036 my ($self, $title, $widget, $tooltip) = @_; 4039 my ($self, $title, $widget, $tooltip) = @_;
3037 4040
3038 Scalar::Util::weaken $self; 4041 $title = [$title, $tooltip] unless ref $title;
4042 $widget->{c_tab} = $title;
3039 4043
3040 $self->{buttonbar}->add (new CFClient::UI::Button
3041 markup => $title,
3042 tooltip => $tooltip,
3043 on_activate => sub { $self->set_current_page ($widget) },
3044 );
3045
3046 $self->{multiplexer}->add ($widget); 4044 $self->add ($widget);
4045}
4046
4047sub get_current_page {
4048 my ($self) = @_;
4049
4050 $self->{multiplexer}->get_current_page
3047} 4051}
3048 4052
3049sub set_current_page { 4053sub set_current_page {
3050 my ($self, $page) = @_; 4054 my ($self, $page) = @_;
3051 4055
3052 $self->{multiplexer}->set_current_page ($page); 4056 $self->{multiplexer}->set_current_page ($page);
3053 $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 }
3054} 4074}
3055 4075
3056############################################################################# 4076#############################################################################
3057 4077
3058package CFClient::UI::Statusbox; 4078package CFPlus::UI::Selector;
3059 4079
4080use utf8;
4081
3060our @ISA = CFClient::UI::VBox::; 4082our @ISA = CFPlus::UI::Button::;
3061 4083
3062sub new { 4084sub new {
3063 my $class = shift; 4085 my $class = shift;
3064 4086
3065 $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 (
3066 fontsize => 0.8, 4142 fontsize => 0.8,
3067 @_, 4143 @_,
3068 ) 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
3069} 4151}
3070 4152
3071sub reorder { 4153sub reorder {
3072 my ($self) = @_; 4154 my ($self) = @_;
3073 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} };
3074 4161
3075 while (my ($k, $v) = each %{ $self->{item} }) { 4162 while (my ($k, $v) = each %{ $self->{item} }) {
3076 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4163 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3077 } 4164 }
3078 4165
… …
3081 my @items = sort { 4168 my @items = sort {
3082 $a->{pri} <=> $b->{pri} 4169 $a->{pri} <=> $b->{pri}
3083 or $b->{id} <=> $a->{id} 4170 or $b->{id} <=> $a->{id}
3084 } values %{ $self->{item} }; 4171 } values %{ $self->{item} };
3085 4172
4173 $self->{timer}->interval (1);
4174
3086 my $count = 10 + 1; 4175 my $count = 10 + 1;
3087 for my $item (@items) { 4176 for my $item (@items) {
3088 last unless --$count; 4177 last unless --$count;
3089 4178
3090 push @widgets, $item->{label} ||= do { 4179 my $label = $item->{label} ||= do {
3091 # TODO: doesn't handle markup well (read as: at all) 4180 # TODO: doesn't handle markup well (read as: at all)
3092 my $short = $item->{count} > 1 4181 my $short = $item->{count} > 1
3093 ? "<b>$item->{count} ×</b> $item->{text}" 4182 ? "<b>$item->{count} ×</b> $item->{text}"
3094 : $item->{text}; 4183 : $item->{text};
3095 4184
3096 for ($short) { 4185 for ($short) {
3097 s/^\s+//; 4186 s/^\s+//;
3098 s/\s+/ /g; 4187 s/\s+/ /g;
3099 } 4188 }
3100 4189
3101 new CFClient::UI::Label 4190 new CFPlus::UI::Label
3102 markup => $short, 4191 markup => $short,
3103 tooltip => $item->{tooltip}, 4192 tooltip => $item->{tooltip},
3104 tooltip_font => $::FONT_PROP, 4193 tooltip_font => $::FONT_PROP,
3105 tooltip_width => 0.67, 4194 tooltip_width => 0.67,
3106 fontsize => $item->{fontsize} || $self->{fontsize}, 4195 fontsize => $item->{fontsize} || $self->{fontsize},
3107 max_w => $::WIDTH * 0.44, 4196 max_w => $::WIDTH * 0.44,
3108 fg => $item->{fg}, 4197 fg => [@{ $item->{fg} }],
3109 can_events => 1, 4198 can_events => 1,
3110 can_hover => 1 4199 can_hover => 1
3111 }; 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;
3112 } 4213 }
3113 4214
3114 $self->clear; 4215 $self->clear;
3115 $self->SUPER::add (reverse @widgets); 4216 $self->SUPER::add (reverse @widgets);
3116} 4217}
… …
3121 $text =~ s/^\s+//; 4222 $text =~ s/^\s+//;
3122 $text =~ s/\s+$//; 4223 $text =~ s/\s+$//;
3123 4224
3124 return unless $text; 4225 return unless $text;
3125 4226
3126 my $timeout = time + ((delete $arg{timeout}) || 60); 4227 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3127 4228
3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 4229 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3129 4230
3130 if (my $item = $self->{item}{$group}) { 4231 if (my $item = $self->{item}{$group}) {
3131 if ($item->{text} eq $text) { 4232 if ($item->{text} eq $text) {
3132 $item->{count}++; 4233 $item->{count}++;
3133 } else { 4234 } else {
3134 $item->{count} = 1; 4235 $item->{count} = 1;
3135 $item->{text} = $item->{tooltip} = $text; 4236 $item->{text} = $item->{tooltip} = $text;
3136 } 4237 }
3137 $item->{id} = ++$self->{id}; 4238 $item->{id} += 0.2;#d#
3138 $item->{timeout} = $timeout; 4239 $item->{timeout} = $timeout;
3139 delete $item->{label}; 4240 delete $item->{label};
3140 } else { 4241 } else {
3141 $self->{item}{$group} = { 4242 $self->{item}{$group} = {
3142 id => ++$self->{id}, 4243 id => ++$self->{id},
… …
3148 count => 1, 4249 count => 1,
3149 %arg, 4250 %arg,
3150 }; 4251 };
3151 } 4252 }
3152 4253
4254 $ROOT->on_refresh (reorder => sub {
3153 $self->reorder; 4255 $self->reorder;
4256 });
3154} 4257}
3155 4258
3156sub reconfigure { 4259sub reconfigure {
3157 my ($self) = @_; 4260 my ($self) = @_;
3158 4261
… …
3161 4264
3162 $self->reorder; 4265 $self->reorder;
3163 $self->SUPER::reconfigure; 4266 $self->SUPER::reconfigure;
3164} 4267}
3165 4268
4269sub destroy {
4270 my ($self) = @_;
4271
4272 $self->{timer}->cancel;
4273
4274 $self->SUPER::destroy;
4275}
4276
3166############################################################################# 4277#############################################################################
3167 4278
3168package CFClient::UI::Inventory;
3169
3170our @ISA = CFClient::UI::ScrolledWindow::;
3171
3172sub new {
3173 my $class = shift;
3174
3175 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3177 @_,
3178 );
3179
3180 $self
3181}
3182
3183sub set_items {
3184 my ($self, $items) = @_;
3185
3186 $self->{scrolled}->clear;
3187 return unless $items;
3188
3189 my @items = sort {
3190 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name})
3192 } @$items;
3193
3194 $self->{real_items} = \@items;
3195
3196 my $row = 0;
3197 for my $item (@items) {
3198 CFClient::Item::update_widgets $item;
3199
3200 $self->{scrolled}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3203
3204 $row++;
3205 }
3206}
3207
3208#############################################################################
3209
3210package CFClient::UI::BindEditor;
3211
3212our @ISA = CFClient::UI::FancyFrame::;
3213
3214sub new {
3215 my $class = shift;
3216
3217 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3218
3219 $self->add (my $vb = new CFClient::UI::VBox);
3220
3221
3222 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3223 text => "start recording",
3224 tooltip => "Start/Stops recording of actions."
3225 ."All subsequent actions after the recording started will be captured."
3226 ."The actions are displayed after the record was stopped."
3227 ."To bind the action you have to click on the 'Bind' button",
3228 on_activate => sub {
3229 unless ($self->{recording}) {
3230 $self->start;
3231 } else {
3232 $self->stop;
3233 }
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3238
3239 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3240 $vb->add (my $hb = new CFClient::UI::HBox);
3241 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3242 $hb->add (new CFClient::UI::Button
3243 text => "bind",
3244 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3245 on_activate => sub {
3246 $self->ask_for_bind;
3247 });
3248
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add (new CFClient::UI::Button
3251 text => "ok",
3252 expand => 1,
3253 tooltip => "This closes the binding editor and saves the binding",
3254 on_activate => sub {
3255 $self->hide;
3256 $self->commit;
3257 });
3258
3259 $hb->add (new CFClient::UI::Button
3260 text => "cancel",
3261 expand => 1,
3262 tooltip => "This closes the binding editor without saving",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->{binding_cancel}->()
3266 if $self->{binding_cancel};
3267 });
3268
3269 $self->update_binding_widgets;
3270
3271 $self
3272}
3273
3274sub commit {
3275 my ($self) = @_;
3276 my ($mod, $sym, $cmds) = $self->get_binding;
3277 if ($sym != 0 && @$cmds > 0) {
3278 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3279 ."'. Don't forget 'Save Config'!");
3280 $self->{binding_change}->($mod, $sym, $cmds)
3281 if $self->{binding_change};
3282 } else {
3283 $::STATUSBOX->add ("No action bound, no key or action specified!");
3284 $self->{binding_cancel}->()
3285 if $self->{binding_cancel};
3286 }
3287}
3288
3289sub start {
3290 my ($self) = @_;
3291
3292 $self->{rec_btn}->set_text ("stop recording");
3293 $self->{recording} = 1;
3294 $self->clear_command_list;
3295 $::CONN->start_record if $::CONN;
3296}
3297
3298sub stop {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("start recording");
3302 $self->{recording} = 0;
3303
3304 my $rec;
3305 $rec = $::CONN->stop_record if $::CONN;
3306 return unless ref $rec eq 'ARRAY';
3307 $self->set_command_list ($rec);
3308}
3309
3310
3311sub ask_for_bind_and_commit {
3312 my ($self) = @_;
3313 $self->ask_for_bind (1);
3314}
3315
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Label text => $_);
3392 $hb->add (new CFClient::UI::Button
3393 text => "delete",
3394 tooltip => "Deletes the action from the record",
3395 on_activate => sub {
3396 $self->{cmdbox}->remove ($hb);
3397 $cmds->[$i] = undef;
3398 });
3399
3400
3401 $idx++
3402 }
3403}
3404
3405#############################################################################
3406
3407package CFClient::UI::SpellList;
3408
3409our @ISA = CFClient::UI::ScrolledWindow::;
3410
3411sub new {
3412 my $class = shift;
3413
3414 my $self = $class->SUPER::new (
3415 binding => [],
3416 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_,
3419 )
3420}
3421
3422# XXX: Do sorting? Argl...
3423sub add_spell {
3424 my ($self, $spell) = @_;
3425 $self->{spells}->{$spell->{name}} = $spell;
3426
3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3428 face => $spell->{face},
3429 can_hover => 1,
3430 can_events => 1,
3431 tooltip => $spell->{message});
3432
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message},
3438 expand => 1);
3439
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1);
3444
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448}
3449
3450sub rebuild_spell_list {
3451 my ($self) = @_;
3452 $self->{tbl_idx} = 0;
3453 $self->add_spell ($_) for values %{$self->{spells}};
3454}
3455
3456sub remove_spell {
3457 my ($self, $spell) = @_;
3458 delete $self->{spells}->{$spell->{name}};
3459 $self->rebuild_spell_list;
3460}
3461
3462#############################################################################
3463
3464package CFClient::UI::Root; 4279package CFPlus::UI::Root;
3465 4280
3466our @ISA = CFClient::UI::Container::; 4281our @ISA = CFPlus::UI::Container::;
3467 4282
4283use List::Util qw(min max);
4284
3468use CFClient::OpenGL; 4285use CFPlus::OpenGL;
3469 4286
3470sub new { 4287sub new {
3471 my $class = shift; 4288 my $class = shift;
3472 4289
3473 my $self = $class->SUPER::new ( 4290 my $self = $class->SUPER::new (
3474 visible => 1, 4291 visible => 1,
3475 @_, 4292 @_,
3476 ); 4293 );
3477 4294
3478 Scalar::Util::weaken ($self->{root} = $self); 4295 CFPlus::weaken ($self->{root} = $self);
3479 4296
3480 $self 4297 $self
3481} 4298}
3482 4299
3483sub size_request { 4300sub size_request {
… …
3498 $coord = $max - $size if $coord > $max - $size; 4315 $coord = $max - $size if $coord > $max - $size;
3499 4316
3500 int $coord + 0.5 4317 int $coord + 0.5
3501} 4318}
3502 4319
3503sub size_allocate { 4320sub invoke_size_allocate {
3504 my ($self, $w, $h) = @_; 4321 my ($self, $w, $h) = @_;
3505 4322
3506 for my $child ($self->children) { 4323 for my $child ($self->children) {
3507 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)};
3508 4325
… …
3512 $X = _to_pixel $X, $W, $self->{w}; 4329 $X = _to_pixel $X, $W, $self->{w};
3513 $Y = _to_pixel $Y, $H, $self->{h}; 4330 $Y = _to_pixel $Y, $H, $self->{h};
3514 4331
3515 $child->configure ($X, $Y, $W, $H); 4332 $child->configure ($X, $Y, $W, $H);
3516 } 4333 }
4334
4335 1
3517} 4336}
3518 4337
3519sub coord2local { 4338sub coord2local {
3520 my ($self, $x, $y) = @_; 4339 my ($self, $x, $y) = @_;
3521 4340
… …
3529} 4348}
3530 4349
3531sub update { 4350sub update {
3532 my ($self) = @_; 4351 my ($self) = @_;
3533 4352
3534 $::WANT_REFRESH++; 4353 $::WANT_REFRESH->start;
3535} 4354}
3536 4355
3537sub add { 4356sub add {
3538 my ($self, @children) = @_; 4357 my ($self, @children) = @_;
3539 4358
… …
3576 while ($self->{refresh_hook}) { 4395 while ($self->{refresh_hook}) {
3577 $_->() 4396 $_->()
3578 for values %{delete $self->{refresh_hook}}; 4397 for values %{delete $self->{refresh_hook}};
3579 } 4398 }
3580 4399
3581 if ($self->{realloc}) { 4400 while ($self->{realloc}) {
3582 my %queue; 4401 my %queue;
3583 my @queue; 4402 my @queue;
3584 my $widget; 4403 my $widget;
3585 4404
3586 outer: 4405 outer:
… …
3606 4425
3607 delete $queue{$widget+0}; 4426 delete $queue{$widget+0};
3608 4427
3609 my ($w, $h) = $widget->size_request; 4428 my ($w, $h) = $widget->size_request;
3610 4429
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4430 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $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};
3613 4435
3614 $w = $widget->{force_w} if exists $widget->{force_w}; 4436 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h}; 4437 $h = $widget->{force_h} if exists $widget->{force_h};
3616 4438
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4439 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3630 } 4452 }
3631 } 4453 }
3632 4454
3633 delete $self->{realloc}{$widget+0}; 4455 delete $self->{realloc}{$widget+0};
3634 } 4456 }
3635 }
3636 4457
3637 while (my $size_alloc = delete $self->{size_alloc}) { 4458 while (my $size_alloc = delete $self->{size_alloc}) {
3638 my @queue = sort { $b->{visible} <=> $a->{visible} } 4459 my @queue = sort { $a->{visible} <=> $b->{visible} }
3639 values %$size_alloc; 4460 values %$size_alloc;
3640 4461
3641 while () { 4462 while () {
3642 my $widget = pop @queue || last; 4463 my $widget = pop @queue || last;
3643 4464
3644 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4465 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3645 4466
3646 $w = 0 if $w < 0; 4467 $w = max $widget->{min_w}, $w;
3647 $h = 0 if $h < 0; 4468 $h = max $widget->{min_h}, $h;
3648 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
3649 $w = int $w + 0.5; 4476 $w = int $w + 0.5;
3650 $h = int $h + 0.5; 4477 $h = int $h + 0.5;
3651 4478
3652 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}) {
3653 $widget->{old_w} = $widget->{w}; 4480 $widget->{old_w} = $widget->{w};
3654 $widget->{old_h} = $widget->{h}; 4481 $widget->{old_h} = $widget->{h};
3655 4482
3656 $widget->{w} = $w; 4483 $widget->{w} = $w;
3657 $widget->{h} = $h; 4484 $widget->{h} = $h;
3658 4485
3659 $widget->emit (size_allocate => $w, $h); 4486 $widget->emit (size_allocate => $w, $h);
4487 }
3660 } 4488 }
3661 } 4489 }
3662 } 4490 }
3663 4491
3664 while ($self->{post_alloc_hook}) { 4492 while ($self->{post_alloc_hook}) {
3665 $_->() 4493 $_->()
3666 for values %{delete $self->{post_alloc_hook}}; 4494 for values %{delete $self->{post_alloc_hook}};
3667 } 4495 }
3668
3669 4496
3670 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4497 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3671 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4498 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3672 glClear GL_COLOR_BUFFER_BIT; 4499 glClear GL_COLOR_BUFFER_BIT;
3673 4500
… …
3676 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4503 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3677 glMatrixMode GL_MODELVIEW; 4504 glMatrixMode GL_MODELVIEW;
3678 glLoadIdentity; 4505 glLoadIdentity;
3679 4506
3680 { 4507 {
3681 package CFClient::UI::Base; 4508 package CFPlus::UI::Base;
3682 4509
3683 ($draw_x, $draw_y, $draw_w, $draw_h) = 4510 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3684 (0, 0, $self->{w}, $self->{h}); 4511 (0, 0, $self->{w}, $self->{h});
3685 }
3686 4512
3687 $self->_draw; 4513 $self->_draw;
4514 }
3688} 4515}
3689 4516
3690############################################################################# 4517#############################################################################
3691 4518
3692package CFClient::UI; 4519package CFPlus::UI;
3693 4520
3694$ROOT = new CFClient::UI::Root; 4521$ROOT = new CFPlus::UI::Root;
3695$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4522$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3696 4523
36971 45241
3698 4525

Diff Legend

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