ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.277 by root, Sun Jun 4 00:21:52 2006 UTC vs.
Revision 1.372 by root, Sun Jul 15 22:13:43 2007 UTC

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

Diff Legend

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