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

Diff Legend

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