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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.276 by root, Sun Jun 4 00:16:01 2006 UTC vs.
Revision 1.373 by root, Sun Jul 15 22:39:30 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
… …
1160 my $dy = $ev->{y} - $oy; 1405 my $dy = $ev->{y} - $oy;
1161 1406
1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1407 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1408 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164 1409
1410 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 $self->realloc; 1411 $self->realloc;
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 }; 1412 };
1168 1413
1169 } elsif ($lr ^ $td) { 1414 } elsif ($lr ^ $td) {
1170 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1415 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1171 my ($bx, $by) = ($self->{x}, $self->{y}); 1416 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1174 my ($ev, $x, $y) = @_; 1419 my ($ev, $x, $y) = @_;
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);
1424 # HACK: the next line is required to enforce placement
1425 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1179 }; 1426 };
1180 } else { 1427 } else {
1181 return 0; 1428 return 0;
1182 } 1429 }
1183 1430
1184 1 1431 1
1185} 1432}
1186 1433
1187sub button_up { 1434sub invoke_button_up {
1188 my ($self, $ev, $x, $y) = @_; 1435 my ($self, $ev, $x, $y) = @_;
1189 1436
1190 !!delete $self->{motion} 1437 ! ! delete $self->{motion}
1191} 1438}
1192 1439
1193sub mouse_motion { 1440sub invoke_mouse_motion {
1194 my ($self, $ev, $x, $y) = @_; 1441 my ($self, $ev, $x, $y) = @_;
1195 1442
1196 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1443 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197 1444
1198 !!$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
1199} 1454}
1200 1455
1201sub _draw { 1456sub _draw {
1202 my ($self) = @_; 1457 my ($self) = @_;
1203 1458
… …
1229 1484
1230 glDisable GL_TEXTURE_2D; 1485 glDisable GL_TEXTURE_2D;
1231 1486
1232 $child->draw; 1487 $child->draw;
1233 1488
1234 if ($self->{title}) { 1489 if ($self->{title_widget}) {
1235 glTranslate 0, $border - $self->{h}; 1490 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw; 1491 $self->{title_widget}->_draw;
1492
1493 glTranslate 0, - ($border - $self->{h});
1237 } 1494 }
1495
1496 $self->{close_button}->draw
1497 if $self->{close_button};
1238} 1498}
1239 1499
1240############################################################################# 1500#############################################################################
1241 1501
1242package CFClient::UI::Table; 1502package CFPlus::UI::Table;
1243 1503
1244our @ISA = CFClient::UI::Base::; 1504our @ISA = CFPlus::UI::Base::;
1245 1505
1246use List::Util qw(max sum); 1506use List::Util qw(max sum);
1247 1507
1248use CFClient::OpenGL; 1508use CFPlus::OpenGL;
1249 1509
1250sub new { 1510sub new {
1251 my $class = shift; 1511 my $class = shift;
1252 1512
1253 $class->SUPER::new ( 1513 $class->SUPER::new (
1254 col_expand => [], 1514 col_expand => [],
1515 row_expand => [],
1255 @_, 1516 @_,
1256 ) 1517 )
1257} 1518}
1258 1519
1259sub children { 1520sub children {
1260 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1521 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1261} 1522}
1262 1523
1263sub add { 1524sub add {
1264 my ($self, $x, $y, $child) = @_; 1525 my ($self) = shift;
1265 1526
1527 while (@_) {
1528 my ($x, $y, $child) = splice @_, 0, 3, ();
1266 $child->set_parent ($self); 1529 $child->set_parent ($self);
1267 $self->{children}[$y][$x] = $child; 1530 $self->{children}[$y][$x] = $child;
1531 }
1268 1532
1533 $self->{force_realloc} = 1;
1534 $self->{force_size_alloc} = 1;
1269 $self->realloc; 1535 $self->realloc;
1536}
1537
1538sub remove {
1539 my ($self, $child) = @_;
1540
1541 # TODO: not yet implemented
1270} 1542}
1271 1543
1272# 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?
1273sub clear { 1545sub clear {
1274 my ($self) = @_; 1546 my ($self) = @_;
… …
1315 (sum @$ws), 1587 (sum @$ws),
1316 (sum @$hs), 1588 (sum @$hs),
1317 ) 1589 )
1318} 1590}
1319 1591
1320sub size_allocate { 1592sub invoke_size_allocate {
1321 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1322 1594
1323 my ($ws, $hs) = $self->get_wh; 1595 my ($ws, $hs) = $self->get_wh;
1324 1596
1325 my $req_w = (sum @$ws) || 1; 1597 my $req_w = (sum @$ws) || 1;
1326 my $req_h = (sum @$hs) || 1; 1598 my $req_h = (sum @$hs) || 1;
1327 1599
1328 # TODO: nicer code && do row_expand 1600 # TODO: nicer code
1329 my @col_expand = @{$self->{col_expand}}; 1601 my @col_expand = @{$self->{col_expand}};
1330 @col_expand = (1) x @$ws unless @col_expand; 1602 @col_expand = (1) x @$ws unless @col_expand;
1331 my $col_expand = (sum @col_expand) || 1; 1603 my $col_expand = (sum @col_expand) || 1;
1332 1604
1333 # linearly scale sizes
1334 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1605 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1335 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1336 1606
1337 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
1338 CFClient::UI::harmonize $hs; 1615 CFPlus::UI::harmonize $hs;
1339 1616
1340 my $y; 1617 my $y;
1341 1618
1342 for my $r (0 .. $#{$self->{children}}) { 1619 for my $r (0 .. $#{$self->{children}}) {
1343 my $row = $self->{children}[$r] 1620 my $row = $self->{children}[$r]
… …
1357 } 1634 }
1358 1635
1359 $y += $row_h; 1636 $y += $row_h;
1360 } 1637 }
1361 1638
1639 1
1362} 1640}
1363 1641
1364sub find_widget { 1642sub find_widget {
1365 my ($self, $x, $y) = @_; 1643 my ($self, $x, $y) = @_;
1366 1644
… …
1385 } 1663 }
1386} 1664}
1387 1665
1388############################################################################# 1666#############################################################################
1389 1667
1390package CFClient::UI::Box; 1668package CFPlus::UI::Box;
1391 1669
1392our @ISA = CFClient::UI::Container::; 1670our @ISA = CFPlus::UI::Container::;
1393 1671
1394sub size_request { 1672sub size_request {
1395 my ($self) = @_; 1673 my ($self) = @_;
1396 1674
1397 $self->{vertical} 1675 $self->{vertical}
… …
1403 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1681 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1404 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1682 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1405 ) 1683 )
1406} 1684}
1407 1685
1408sub size_allocate { 1686sub invoke_size_allocate {
1409 my ($self, $w, $h) = @_; 1687 my ($self, $w, $h) = @_;
1410 1688
1411 my $space = $self->{vertical} ? $h : $w; 1689 my $space = $self->{vertical} ? $h : $w;
1412 my $children = $self->{children}; 1690 my @children = $self->visible_children;
1413 1691
1414 my @req; 1692 my @req;
1415 1693
1416 if ($self->{homogeneous}) { 1694 if ($self->{homogeneous}) {
1417 @req = ($space / (@$children || 1)) x @$children; 1695 @req = ($space / (@children || 1)) x @children;
1418 } else { 1696 } else {
1419 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1697 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1420 my $req = List::Util::sum @req; 1698 my $req = List::Util::sum @req;
1421 1699
1422 if ($req > $space) { 1700 if ($req > $space) {
1423 # ah well, not enough space 1701 # ah well, not enough space
1424 $_ *= $space / $req for @req; 1702 $_ *= $space / $req for @req;
1425 } else { 1703 } else {
1426 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1704 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1427 1705
1428 $space = ($space - $req) / $expand; # remaining space to give away 1706 $space = ($space - $req) / $expand; # remaining space to give away
1429 1707
1430 $req[$_] += $space * $children->[$_]{expand} 1708 $req[$_] += $space * $children[$_]{expand}
1431 for 0 .. $#$children; 1709 for 0 .. $#children;
1432 } 1710 }
1433 } 1711 }
1434 1712
1435 CFClient::UI::harmonize \@req; 1713 CFPlus::UI::harmonize \@req;
1436 1714
1437 my $pos = 0; 1715 my $pos = 0;
1438 for (0 .. $#$children) { 1716 for (0 .. $#children) {
1439 my $alloc = $req[$_]; 1717 my $alloc = $req[$_];
1440 $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));
1441 1719
1442 $pos += $alloc; 1720 $pos += $alloc;
1443 } 1721 }
1444 1722
1445 1 1723 1
1446} 1724}
1447 1725
1448############################################################################# 1726#############################################################################
1449 1727
1450package CFClient::UI::HBox; 1728package CFPlus::UI::HBox;
1451 1729
1452our @ISA = CFClient::UI::Box::; 1730our @ISA = CFPlus::UI::Box::;
1453 1731
1454sub new { 1732sub new {
1455 my $class = shift; 1733 my $class = shift;
1456 1734
1457 $class->SUPER::new ( 1735 $class->SUPER::new (
… …
1460 ) 1738 )
1461} 1739}
1462 1740
1463############################################################################# 1741#############################################################################
1464 1742
1465package CFClient::UI::VBox; 1743package CFPlus::UI::VBox;
1466 1744
1467our @ISA = CFClient::UI::Box::; 1745our @ISA = CFPlus::UI::Box::;
1468 1746
1469sub new { 1747sub new {
1470 my $class = shift; 1748 my $class = shift;
1471 1749
1472 $class->SUPER::new ( 1750 $class->SUPER::new (
… …
1475 ) 1753 )
1476} 1754}
1477 1755
1478############################################################################# 1756#############################################################################
1479 1757
1480package CFClient::UI::Label; 1758package CFPlus::UI::Label;
1481 1759
1482our @ISA = CFClient::UI::DrawBG::; 1760our @ISA = CFPlus::UI::DrawBG::;
1483 1761
1484use CFClient::OpenGL; 1762use CFPlus::OpenGL;
1485 1763
1486sub new { 1764sub new {
1487 my ($class, %arg) = @_; 1765 my ($class, %arg) = @_;
1488 1766
1489 my $self = $class->SUPER::new ( 1767 my $self = $class->SUPER::new (
… …
1492 #active_bg => none 1770 #active_bg => none
1493 #font => default_font 1771 #font => default_font
1494 #text => initial text 1772 #text => initial text
1495 #markup => initial narkup 1773 #markup => initial narkup
1496 #max_w => maximum pixel width 1774 #max_w => maximum pixel width
1775 #style => 0, # render flags
1497 ellipsise => 3, # end 1776 ellipsise => 3, # end
1498 layout => (new CFClient::Layout), 1777 layout => (new CFPlus::Layout),
1499 fontsize => 1, 1778 fontsize => 1,
1500 align => -1, 1779 align => -1,
1501 valign => -1, 1780 valign => -1,
1502 padding_x => 2, 1781 padding_x => 2,
1503 padding_y => 2, 1782 padding_y => 2,
1504 can_events => 0, 1783 can_events => 0,
1505 %arg 1784 %arg
1506 ); 1785 );
1507 1786
1508 if (exists $self->{template}) { 1787 if (exists $self->{template}) {
1509 my $layout = new CFClient::Layout; 1788 my $layout = new CFPlus::Layout;
1510 $layout->set_text (delete $self->{template}); 1789 $layout->set_text (delete $self->{template});
1511 $self->{template} = $layout; 1790 $self->{template} = $layout;
1512 } 1791 }
1513 1792
1514 if (exists $self->{markup}) { 1793 if (exists $self->{markup}) {
… …
1518 } 1797 }
1519 1798
1520 $self 1799 $self
1521} 1800}
1522 1801
1523sub escape($) {
1524 local $_ = $_[0];
1525
1526 s/&/&amp;/g;
1527 s/>/&gt;/g;
1528 s/</&lt;/g;
1529
1530 $_
1531}
1532
1533sub update { 1802sub update {
1534 my ($self) = @_; 1803 my ($self) = @_;
1535 1804
1536 delete $self->{texture}; 1805 delete $self->{texture};
1537 $self->SUPER::update; 1806 $self->SUPER::update;
1538} 1807}
1539 1808
1809sub realloc {
1810 my ($self) = @_;
1811
1812 delete $self->{ox};
1813 $self->SUPER::realloc;
1814}
1815
1540sub set_text { 1816sub set_text {
1541 my ($self, $text) = @_; 1817 my ($self, $text) = @_;
1542 1818
1543 return if $self->{text} eq "T$text"; 1819 return if $self->{text} eq "T$text";
1544 $self->{text} = "T$text"; 1820 $self->{text} = "T$text";
1545 1821
1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1547 $self->{layout}->set_text ($text); 1822 $self->{layout}->set_text ($text);
1548 1823
1824 delete $self->{size_req};
1549 $self->realloc; 1825 $self->realloc;
1550 $self->update; 1826 $self->update;
1551} 1827}
1552 1828
1553sub set_markup { 1829sub set_markup {
… …
1556 return if $self->{text} eq "M$markup"; 1832 return if $self->{text} eq "M$markup";
1557 $self->{text} = "M$markup"; 1833 $self->{text} = "M$markup";
1558 1834
1559 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1835 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1560 1836
1561 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1562 $self->{layout}->set_markup ($markup); 1837 $self->{layout}->set_markup ($markup);
1563 1838
1839 delete $self->{size_req};
1564 $self->realloc; 1840 $self->realloc;
1565 $self->update; 1841 $self->update;
1566} 1842}
1567 1843
1568sub size_request { 1844sub size_request {
1569 my ($self) = @_; 1845 my ($self) = @_;
1570 1846
1847 $self->{size_req} ||= do {
1571 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1848 $self->{layout}->set_font ($self->{font}) if $self->{font};
1572 $self->{layout}->set_width ($self->{max_w} || -1); 1849 $self->{layout}->set_width ($self->{max_w} || -1);
1573 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1850 $self->{layout}->set_ellipsise ($self->{ellipsise});
1574 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1851 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1852 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1576 1853
1577 my ($w, $h) = $self->{layout}->size; 1854 my ($w, $h) = $self->{layout}->size;
1578 1855
1579 if (exists $self->{template}) { 1856 if (exists $self->{template}) {
1580 $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);
1581 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1859 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1582 1860
1583 my ($w2, $h2) = $self->{template}->size; 1861 my ($w2, $h2) = $self->{template}->size;
1584 1862
1585 $w = List::Util::max $w, $w2; 1863 $w = List::Util::max $w, $w2;
1586 $h = List::Util::max $h, $h2; 1864 $h = List::Util::max $h, $h2;
1865 }
1866
1867 [$w, $h]
1587 } 1868 };
1588 1869
1589 ($w, $h) 1870 @{ $self->{size_req} }
1590} 1871}
1591 1872
1873sub baseline_shift {
1874 $_[0]{layout}->descent
1875}
1876
1592sub size_allocate { 1877sub invoke_size_allocate {
1593 my ($self, $w, $h) = @_; 1878 my ($self, $w, $h) = @_;
1594 1879
1595 delete $self->{ox}; 1880 delete $self->{ox};
1596 1881
1597 delete $self->{texture} 1882 delete $self->{texture}
1598 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
1599} 1886}
1600 1887
1601sub set_fontsize { 1888sub set_fontsize {
1602 my ($self, $fontsize) = @_; 1889 my ($self, $fontsize) = @_;
1603 1890
1604 $self->{fontsize} = $fontsize; 1891 $self->{fontsize} = $fontsize;
1892 delete $self->{size_req};
1605 delete $self->{texture}; 1893 delete $self->{texture};
1606 1894
1607 $self->realloc; 1895 $self->realloc;
1608} 1896}
1609 1897
1898sub reconfigure {
1899 my ($self) = @_;
1900
1901 delete $self->{size_req};
1902 delete $self->{texture};
1903
1904 $self->SUPER::reconfigure;
1905}
1906
1610sub _draw { 1907sub _draw {
1611 my ($self) = @_; 1908 my ($self) = @_;
1612 1909
1613 $self->SUPER::_draw; # draw background, if applicable 1910 $self->SUPER::_draw; # draw background, if applicable
1614 1911
1615 my $tex = $self->{texture} ||= do { 1912 my $size = $self->{texture} ||= do {
1616 $self->{layout}->set_foreground (@{$self->{fg}}); 1913 $self->{layout}->set_foreground (@{$self->{fg}});
1617 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1914 $self->{layout}->set_font ($self->{font}) if $self->{font};
1618 $self->{layout}->set_width ($self->{w}); 1915 $self->{layout}->set_width ($self->{w});
1619 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1916 $self->{layout}->set_ellipsise ($self->{ellipsise});
1620 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1917 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1918 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1622 1919
1623 new_from_layout CFClient::Texture $self->{layout} 1920 [$self->{layout}->size]
1624 }; 1921 };
1625 1922
1626 unless (exists $self->{ox}) { 1923 unless (exists $self->{ox}) {
1627 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1924 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1628 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1925 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1629 : ($self->{w} - $tex->{w}) * 0.5); 1926 : ($self->{w} - $size->[0]) * 0.5);
1630 1927
1631 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1928 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1929 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1633 : ($self->{h} - $tex->{h}) * 0.5); 1930 : ($self->{h} - $size->[1]) * 0.5);
1634 }; 1931 };
1635 1932
1636 glEnable GL_TEXTURE_2D; 1933 my $w = List::Util::min $self->{w} + 4, $size->[0];
1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1934 my $h = List::Util::min $self->{h} + 2, $size->[1];
1638 1935
1639 if ($tex->{format} == GL_ALPHA) { 1936 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1640 glColor @{$self->{fg}};
1641 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1642 } else {
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644 }
1645
1646 glDisable GL_TEXTURE_2D;
1647} 1937}
1648 1938
1649############################################################################# 1939#############################################################################
1650 1940
1651package CFClient::UI::EntryBase; 1941package CFPlus::UI::EntryBase;
1652 1942
1653our @ISA = CFClient::UI::Label::; 1943our @ISA = CFPlus::UI::Label::;
1654 1944
1655use CFClient::OpenGL; 1945use CFPlus::OpenGL;
1656 1946
1657sub new { 1947sub new {
1658 my $class = shift; 1948 my $class = shift;
1659 1949
1660 $class->SUPER::new ( 1950 $class->SUPER::new (
… …
1664 active_fg => [0, 0, 0], 1954 active_fg => [0, 0, 0],
1665 can_hover => 1, 1955 can_hover => 1,
1666 can_focus => 1, 1956 can_focus => 1,
1667 valign => 0, 1957 valign => 0,
1668 can_events => 1, 1958 can_events => 1,
1959 ellipsise => 0,
1669 #text => ... 1960 #text => ...
1961 #hidden => "*",
1670 @_ 1962 @_
1671 ) 1963 )
1672} 1964}
1673 1965
1674sub _set_text { 1966sub _set_text {
… …
1681 $self->{last_activity} = $::NOW; 1973 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 1974 $self->{text} = $text;
1683 1975
1684 $text =~ s/./*/g if $self->{hidden}; 1976 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 1977 $self->{layout}->set_text ("$text ");
1978 delete $self->{size_req};
1686 1979
1687 $self->_emit (changed => $self->{text}); 1980 $self->emit (changed => $self->{text});
1981
1982 $self->realloc;
1688 $self->update; 1983 $self->update;
1689} 1984}
1690 1985
1691sub set_text { 1986sub set_text {
1692 my ($self, $text) = @_; 1987 my ($self, $text) = @_;
1693 1988
1694 $self->{cursor} = length $text; 1989 $self->{cursor} = length $text;
1695 $self->_set_text ($text); 1990 $self->_set_text ($text);
1696
1697 $self->realloc;
1698} 1991}
1699 1992
1700sub get_text { 1993sub get_text {
1701 $_[0]{text} 1994 $_[0]{text}
1702} 1995}
… …
1707 my ($w, $h) = $self->SUPER::size_request; 2000 my ($w, $h) = $self->SUPER::size_request;
1708 2001
1709 ($w + 1, $h) # add 1 for cursor 2002 ($w + 1, $h) # add 1 for cursor
1710} 2003}
1711 2004
1712sub key_down { 2005sub invoke_key_down {
1713 my ($self, $ev) = @_; 2006 my ($self, $ev) = @_;
1714 2007
1715 my $mod = $ev->{mod}; 2008 my $mod = $ev->{mod};
1716 my $sym = $ev->{sym}; 2009 my $sym = $ev->{sym};
1717 my $uni = $ev->{unicode}; 2010 my $uni = $ev->{unicode};
1718 2011
1719 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;
1720 2015
1721 if ($uni == 8) { 2016 if ($uni == 8) {
1722 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2017 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1723 } elsif ($uni == 127) { 2018 } elsif ($uni == 127) {
1724 substr $text, $self->{cursor}, 1, ""; 2019 substr $text, $self->{cursor}, 1, "";
1725 } elsif ($sym == CFClient::SDLK_LEFT) { 2020 } elsif ($sym == CFPlus::SDLK_LEFT) {
1726 --$self->{cursor} if $self->{cursor}; 2021 --$self->{cursor} if $self->{cursor};
1727 } elsif ($sym == CFClient::SDLK_RIGHT) { 2022 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1728 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2023 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1729 } 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 = "";
1730 $self->{cursor} = 0; 2038 $self->{cursor} = 0;
1731 } elsif ($sym == CFClient::SDLK_END) {
1732 $self->{cursor} = length $text;
1733 } elsif ($uni == 27) { 2039 } elsif ($uni == 27) {
1734 $self->_emit ('escape'); 2040 $self->emit ('escape');
1735 } elsif ($uni) { 2041 } elsif ($uni == 0x0d) {
2042 substr $text, $self->{cursor}++, 0, "\012";
2043 } elsif ($uni >= 0x20) {
1736 substr $text, $self->{cursor}++, 0, chr $uni; 2044 substr $text, $self->{cursor}++, 0, chr $uni;
1737 } else { 2045 } else {
1738 return 0; 2046 return 0;
1739 } 2047 }
1740 2048
1741 $self->_set_text ($text); 2049 $self->_set_text ($text);
1742 2050
1743 $self->realloc; 2051 $self->realloc;
2052 $self->update;
1744 2053
1745 1 2054 1
1746} 2055}
1747 2056
1748sub focus_in { 2057sub invoke_focus_in {
1749 my ($self) = @_; 2058 my ($self) = @_;
1750 2059
1751 $self->{last_activity} = $::NOW; 2060 $self->{last_activity} = $::NOW;
1752 2061
1753 $self->SUPER::focus_in; 2062 $self->SUPER::invoke_focus_in
1754} 2063}
1755 2064
1756sub button_down { 2065sub invoke_button_down {
1757 my ($self, $ev, $x, $y) = @_; 2066 my ($self, $ev, $x, $y) = @_;
1758 2067
1759 $self->SUPER::button_down ($ev, $x, $y); 2068 $self->SUPER::invoke_button_down ($ev, $x, $y);
1760 2069
1761 my $idx = $self->{layout}->xy_to_index ($x, $y); 2070 my $idx = $self->{layout}->xy_to_index ($x, $y);
1762 2071
1763 # byte-index to char-index 2072 # byte-index to char-index
1764 my $text = $self->{text}; 2073 my $text = $self->{text};
1765 utf8::encode $text; 2074 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1766 $self->{cursor} = length substr $text, 0, $idx; 2075 $self->{cursor} = length $text;
1767 2076
1768 $self->_set_text ($self->{text}); 2077 $self->_set_text ($self->{text});
1769 $self->update; 2078 $self->update;
1770 2079
1771 1 2080 1
1772} 2081}
1773 2082
1774sub mouse_motion { 2083sub invoke_mouse_motion {
1775 my ($self, $ev, $x, $y) = @_; 2084 my ($self, $ev, $x, $y) = @_;
1776# 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#
1777 2086
1778 0 2087 1
1779} 2088}
1780 2089
1781sub _draw { 2090sub _draw {
1782 my ($self) = @_; 2091 my ($self) = @_;
1783 2092
1784 local $self->{fg} = $self->{fg}; 2093 local $self->{fg} = $self->{fg};
1785 2094
1786 if ($FOCUS == $self) { 2095 if ($FOCUS == $self) {
1787 glColor @{$self->{active_bg}}; 2096 glColor_premultiply @{$self->{active_bg}};
1788 $self->{fg} = $self->{active_fg}; 2097 $self->{fg} = $self->{active_fg};
1789 } else { 2098 } else {
1790 glColor @{$self->{bg}}; 2099 glColor_premultiply @{$self->{bg}};
1791 } 2100 }
1792 2101
1793 glEnable GL_BLEND; 2102 glEnable GL_BLEND;
1794 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2103 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1795 glBegin GL_QUADS; 2104 glBegin GL_QUADS;
1796 glVertex 0 , 0; 2105 glVertex 0 , 0;
1797 glVertex 0 , $self->{h}; 2106 glVertex 0 , $self->{h};
1798 glVertex $self->{w}, $self->{h}; 2107 glVertex $self->{w}, $self->{h};
1799 glVertex $self->{w}, 0; 2108 glVertex $self->{w}, 0;
… …
1810 utf8::encode $text; 2119 utf8::encode $text;
1811 2120
1812 @$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)
1813 } 2122 }
1814 2123
1815 glColor @{$self->{fg}};
1816 glBegin GL_LINES; 2124 glBegin GL_LINES;
1817 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};
1818 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};
1819 glEnd; 2127 glEnd;
1820 } 2128 }
1821} 2129}
1822 2130
2131#############################################################################
2132
1823package CFClient::UI::Entry; 2133package CFPlus::UI::Entry;
1824 2134
1825our @ISA = CFClient::UI::EntryBase::; 2135our @ISA = CFPlus::UI::EntryBase::;
1826 2136
1827use CFClient::OpenGL; 2137use CFPlus::OpenGL;
1828 2138
1829sub key_down { 2139sub invoke_key_down {
1830 my ($self, $ev) = @_; 2140 my ($self, $ev) = @_;
1831 2141
1832 my $sym = $ev->{sym}; 2142 my $sym = $ev->{sym};
1833 2143
1834 if ($sym == 13) { 2144 if ($ev->{uni} == 0x0d || $sym == 13) {
1835 unshift @{$self->{history}}, 2145 unshift @{$self->{history}},
1836 my $txt = $self->get_text; 2146 my $txt = $self->get_text;
2147
1837 $self->{history_pointer} = -1; 2148 $self->{history_pointer} = -1;
1838 $self->{history_saveback} = ''; 2149 $self->{history_saveback} = '';
1839 $self->_emit (activate => $txt); 2150 $self->emit (activate => $txt);
1840 $self->update; 2151 $self->update;
1841 2152
1842 } elsif ($sym == CFClient::SDLK_UP) { 2153 } elsif ($sym == CFPlus::SDLK_UP) {
1843 if ($self->{history_pointer} < 0) { 2154 if ($self->{history_pointer} < 0) {
1844 $self->{history_saveback} = $self->get_text; 2155 $self->{history_saveback} = $self->get_text;
1845 } 2156 }
1846 if (@{$self->{history} || []} > 0) { 2157 if (@{$self->{history} || []} > 0) {
1847 $self->{history_pointer}++; 2158 $self->{history_pointer}++;
… …
1849 $self->{history_pointer} = @{$self->{history} || []} - 1; 2160 $self->{history_pointer} = @{$self->{history} || []} - 1;
1850 } 2161 }
1851 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2162 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1852 } 2163 }
1853 2164
1854 } elsif ($sym == CFClient::SDLK_DOWN) { 2165 } elsif ($sym == CFPlus::SDLK_DOWN) {
1855 $self->{history_pointer}--; 2166 $self->{history_pointer}--;
1856 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2167 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1857 2168
1858 if ($self->{history_pointer} >= 0) { 2169 if ($self->{history_pointer} >= 0) {
1859 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2170 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1860 } else { 2171 } else {
1861 $self->set_text ($self->{history_saveback}); 2172 $self->set_text ($self->{history_saveback});
1862 } 2173 }
1863 2174
1864 } else { 2175 } else {
1865 return $self->SUPER::key_down ($ev) 2176 return $self->SUPER::invoke_key_down ($ev)
1866 } 2177 }
1867 2178
1868 1 2179 1
1869} 2180}
1870 2181
1871############################################################################# 2182#############################################################################
1872 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
1873package CFClient::UI::Button; 2223package CFPlus::UI::Button;
1874 2224
1875our @ISA = CFClient::UI::Label::; 2225our @ISA = CFPlus::UI::Label::;
1876 2226
1877use CFClient::OpenGL; 2227use CFPlus::OpenGL;
1878 2228
1879my @tex = 2229my @tex =
1880 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2230 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1881 qw(b1_button_active.png); 2231 qw(b1_button_active.png);
1882 2232
1883sub new { 2233sub new {
1884 my $class = shift; 2234 my $class = shift;
1885 2235
… …
1894 can_events => 1, 2244 can_events => 1,
1895 @_ 2245 @_
1896 ) 2246 )
1897} 2247}
1898 2248
1899sub activate { }
1900
1901sub button_up { 2249sub invoke_button_up {
1902 my ($self, $ev, $x, $y) = @_; 2250 my ($self, $ev, $x, $y) = @_;
1903 2251
1904 $self->emit ("activate") 2252 $self->emit ("activate")
1905 if $x >= 0 && $x < $self->{w} 2253 if $x >= 0 && $x < $self->{w}
1906 && $y >= 0 && $y < $self->{h}; 2254 && $y >= 0 && $y < $self->{h};
… …
1909} 2257}
1910 2258
1911sub _draw { 2259sub _draw {
1912 my ($self) = @_; 2260 my ($self) = @_;
1913 2261
1914 local $self->{fg} = $self->{fg}; 2262 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1915
1916 if ($GRAB == $self) {
1917 $self->{fg} = $self->{active_fg};
1918 }
1919 2263
1920 glEnable GL_TEXTURE_2D; 2264 glEnable GL_TEXTURE_2D;
1921 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2265 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1922 glColor 0, 0, 0, 1; 2266 glColor 0, 0, 0, 1;
1923 2267
… …
1928 $self->SUPER::_draw; 2272 $self->SUPER::_draw;
1929} 2273}
1930 2274
1931############################################################################# 2275#############################################################################
1932 2276
1933package CFClient::UI::CheckBox; 2277package CFPlus::UI::CheckBox;
1934 2278
1935our @ISA = CFClient::UI::DrawBG::; 2279our @ISA = CFPlus::UI::DrawBG::;
1936 2280
1937my @tex = 2281my @tex =
1938 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2282 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1939 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2283 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1940 2284
1941use CFClient::OpenGL; 2285use CFPlus::OpenGL;
1942 2286
1943sub new { 2287sub new {
1944 my $class = shift; 2288 my $class = shift;
1945 2289
1946 $class->SUPER::new ( 2290 $class->SUPER::new (
… …
1960 my ($self) = @_; 2304 my ($self) = @_;
1961 2305
1962 (6) x 2 2306 (6) x 2
1963} 2307}
1964 2308
2309sub toggle {
2310 my ($self) = @_;
2311
2312 $self->{state} = !$self->{state};
2313 $self->emit (changed => $self->{state});
2314 $self->update;
2315}
2316
1965sub button_down { 2317sub invoke_button_down {
1966 my ($self, $ev, $x, $y) = @_; 2318 my ($self, $ev, $x, $y) = @_;
1967 2319
1968 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2320 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1969 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2321 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1970 $self->{state} = !$self->{state}; 2322 $self->toggle;
1971 $self->_emit (changed => $self->{state});
1972 } else { 2323 } else {
1973 return 0 2324 return 0
1974 } 2325 }
1975 2326
1976 1 2327 1
… …
1996 glDisable GL_TEXTURE_2D; 2347 glDisable GL_TEXTURE_2D;
1997} 2348}
1998 2349
1999############################################################################# 2350#############################################################################
2000 2351
2001package CFClient::UI::Image; 2352package CFPlus::UI::Image;
2002 2353
2003our @ISA = CFClient::UI::Base::; 2354our @ISA = CFPlus::UI::Base::;
2004 2355
2005use CFClient::OpenGL; 2356use CFPlus::OpenGL;
2006use Carp qw/confess/;
2007 2357
2008our %loaded_images; 2358our %texture_cache;
2009 2359
2010sub new { 2360sub new {
2011 my $class = shift; 2361 my $class = shift;
2012 2362
2013 my $self = $class->SUPER::new (can_events => 0, @_); 2363 my $self = $class->SUPER::new (
2364 can_events => 0,
2365 @_,
2366 );
2014 2367
2015 $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";
2016 2370
2017 $loaded_images{$self->{image}} ||= 2371 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2018 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;
2019 2373
2020 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2374 CFPlus::weaken $texture_cache{$self->{path}};
2021 2375
2022 Scalar::Util::weaken $loaded_images{$self->{image}}; 2376 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2023
2024 $self->{aspect} = $tex->{w} / $tex->{h};
2025 2377
2026 $self 2378 $self
2027} 2379}
2028 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
2029sub size_request { 2396sub size_request {
2030 my ($self) = @_; 2397 my ($self) = @_;
2031 2398
2032 ($self->{tex}->{w}, $self->{tex}->{h}) 2399 ($self->{tex}{w}, $self->{tex}{h})
2033} 2400}
2034 2401
2035sub _draw { 2402sub _draw {
2036 my ($self) = @_; 2403 my ($self) = @_;
2037 2404
… …
2047 } 2414 }
2048 2415
2049 glEnable GL_TEXTURE_2D; 2416 glEnable GL_TEXTURE_2D;
2050 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2051 2418
2052 $tex->draw_quad_alpha (0, 0, $w, $h); 2419 $tex->draw_quad (0, 0, $w, $h);
2053 2420
2054 glDisable GL_TEXTURE_2D; 2421 glDisable GL_TEXTURE_2D;
2055} 2422}
2056 2423
2057############################################################################# 2424#############################################################################
2058 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
2059package CFClient::UI::VGauge; 2462package CFPlus::UI::VGauge;
2060 2463
2061our @ISA = CFClient::UI::Base::; 2464our @ISA = CFPlus::UI::Base::;
2062 2465
2063use List::Util qw(min max); 2466use List::Util qw(min max);
2064 2467
2065use CFClient::OpenGL; 2468use CFPlus::OpenGL;
2066 2469
2067my %tex = ( 2470my %tex = (
2068 food => [ 2471 food => [
2069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2472 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2070 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2473 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2071 ], 2474 ],
2072 grace => [ 2475 grace => [
2073 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2476 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2074 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2477 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2075 ], 2478 ],
2076 hp => [ 2479 hp => [
2077 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2480 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2078 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2481 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2079 ], 2482 ],
2080 mana => [ 2483 mana => [
2081 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2484 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2082 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2485 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2083 ], 2486 ],
2084); 2487);
2085 2488
2086# eg. VGauge->new (gauge => 'food'), default gauge: food 2489# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2146 my $ycut1 = max 0, min 1, $ycut; 2549 my $ycut1 = max 0, min 1, $ycut;
2147 my $ycut2 = max 0, min 1, $ycut - 1; 2550 my $ycut2 = max 0, min 1, $ycut - 1;
2148 2551
2149 my $h1 = $self->{h} * (1 - $ycut1); 2552 my $h1 = $self->{h} * (1 - $ycut1);
2150 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);
2151 2557
2152 glEnable GL_BLEND; 2558 glEnable GL_BLEND;
2153 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;
2154 glEnable GL_TEXTURE_2D; 2561 glEnable GL_TEXTURE_2D;
2155 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2562 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2156 2563
2157 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2564 glBindTexture GL_TEXTURE_2D, $t1->{name};
2158 glBegin GL_QUADS; 2565 glBegin GL_QUADS;
… …
2173 2580
2174 if ($t3) { 2581 if ($t3) {
2175 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2582 glBindTexture GL_TEXTURE_2D, $t3->{name};
2176 glBegin GL_QUADS; 2583 glBegin GL_QUADS;
2177 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2584 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2178 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2585 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2179 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2586 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2180 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2587 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2181 glEnd; 2588 glEnd;
2182 } 2589 }
2183 2590
2184 glDisable GL_BLEND; 2591 glDisable GL_BLEND;
2185 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2186} 2593}
2187 2594
2188############################################################################# 2595#############################################################################
2189 2596
2190package CFClient::UI::Gauge; 2597package CFPlus::UI::Gauge;
2191 2598
2192our @ISA = CFClient::UI::VBox::; 2599our @ISA = CFPlus::UI::VBox::;
2193 2600
2194sub new { 2601sub new {
2195 my ($class, %arg) = @_; 2602 my ($class, %arg) = @_;
2196 2603
2197 my $self = $class->SUPER::new ( 2604 my $self = $class->SUPER::new (
… …
2199 can_hover => 1, 2606 can_hover => 1,
2200 can_events => 1, 2607 can_events => 1,
2201 %arg, 2608 %arg,
2202 ); 2609 );
2203 2610
2204 $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");
2205 $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);
2206 $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");
2207 2614
2208 $self 2615 $self
2209} 2616}
2210 2617
2211sub set_fontsize { 2618sub set_fontsize {
… …
2232 $self->{value}->set_text ($val); 2639 $self->{value}->set_text ($val);
2233} 2640}
2234 2641
2235############################################################################# 2642#############################################################################
2236 2643
2237package CFClient::UI::Slider; 2644package CFPlus::UI::Slider;
2238 2645
2239use strict; 2646use strict;
2240 2647
2241use CFClient::OpenGL; 2648use CFPlus::OpenGL;
2242 2649
2243our @ISA = CFClient::UI::DrawBG::; 2650our @ISA = CFPlus::UI::DrawBG::;
2244 2651
2245my @tex = 2652my @tex =
2246 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2247 qw(s1_slider.png s1_slider_bg.png); 2654 qw(s1_slider.png s1_slider_bg.png);
2248 2655
2249sub new { 2656sub new {
2250 my $class = shift; 2657 my $class = shift;
2251 2658
… …
2272 $self->update; 2679 $self->update;
2273 2680
2274 $self 2681 $self
2275} 2682}
2276 2683
2277sub changed { }
2278
2279sub set_range { 2684sub set_range {
2280 my ($self, $range) = @_; 2685 my ($self, $range) = @_;
2281 2686
2282 ($range, $self->{range}) = ($self->{range}, $range); 2687 ($range, $self->{range}) = ($self->{range}, $range);
2283 2688
2284 $self->update
2285 if "@$range" ne "@{$self->{range}}"; 2689 if ("@$range" ne "@{$self->{range}}") {
2690 $self->update;
2691 $self->set_value ($self->{range}[0]);
2692 }
2286} 2693}
2287 2694
2288sub set_value { 2695sub set_value {
2289 my ($self, $value) = @_; 2696 my ($self, $value) = @_;
2290 2697
… …
2301 if $unit; 2708 if $unit;
2302 2709
2303 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2710 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2304 2711
2305 if ($value != $old_value) { 2712 if ($value != $old_value) {
2306 $self->_emit (changed => $value); 2713 $self->emit (changed => $value);
2307 $self->update; 2714 $self->update;
2308 } 2715 }
2309} 2716}
2310 2717
2311sub size_request { 2718sub size_request {
2312 my ($self) = @_; 2719 my ($self) = @_;
2313 2720
2314 ($self->{req_w}, $self->{req_h}) 2721 ($self->{req_w}, $self->{req_h})
2315} 2722}
2316 2723
2317sub button_down { 2724sub invoke_button_down {
2318 my ($self, $ev, $x, $y) = @_; 2725 my ($self, $ev, $x, $y) = @_;
2319 2726
2320 $self->SUPER::button_down ($ev, $x, $y); 2727 $self->SUPER::invoke_button_down ($ev, $x, $y);
2321 2728
2322 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2729 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2323 2730
2324 $self->mouse_motion ($ev, $x, $y) 2731 $self->invoke_mouse_motion ($ev, $x, $y)
2325} 2732}
2326 2733
2327sub mouse_motion { 2734sub invoke_mouse_motion {
2328 my ($self, $ev, $x, $y) = @_; 2735 my ($self, $ev, $x, $y) = @_;
2329 2736
2330 if ($GRAB == $self) { 2737 if ($GRAB == $self) {
2331 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2738 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2332 2739
… …
2338 } else { 2745 } else {
2339 return 0; 2746 return 0;
2340 } 2747 }
2341 2748
2342 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
2343} 2762}
2344 2763
2345sub update { 2764sub update {
2346 my ($self) = @_; 2765 my ($self) = @_;
2347 2766
… …
2396 glDisable GL_TEXTURE_2D; 2815 glDisable GL_TEXTURE_2D;
2397} 2816}
2398 2817
2399############################################################################# 2818#############################################################################
2400 2819
2401package CFClient::UI::ValSlider; 2820package CFPlus::UI::ValSlider;
2402 2821
2403our @ISA = CFClient::UI::HBox::; 2822our @ISA = CFPlus::UI::HBox::;
2404 2823
2405sub new { 2824sub new {
2406 my ($class, %arg) = @_; 2825 my ($class, %arg) = @_;
2407 2826
2408 my $range = delete $arg{range}; 2827 my $range = delete $arg{range};
2409 2828
2410 my $self = $class->SUPER::new ( 2829 my $self = $class->SUPER::new (
2411 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2830 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2412 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2831 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2413 to_value => sub { shift }, 2832 to_value => sub { shift },
2414 from_value => sub { shift }, 2833 from_value => sub { shift },
2415 %arg, 2834 %arg,
2416 ); 2835 );
2417 2836
… …
2437sub set_range { shift->{slider}->set_range (@_) } 2856sub set_range { shift->{slider}->set_range (@_) }
2438sub set_value { shift->{slider}->set_value (@_) } 2857sub set_value { shift->{slider}->set_value (@_) }
2439 2858
2440############################################################################# 2859#############################################################################
2441 2860
2442package CFClient::UI::TextView; 2861package CFPlus::UI::TextScroller;
2443 2862
2444our @ISA = CFClient::UI::HBox::; 2863our @ISA = CFPlus::UI::HBox::;
2445 2864
2446use CFClient::OpenGL; 2865use CFPlus::OpenGL;
2447 2866
2448sub new { 2867sub new {
2449 my $class = shift; 2868 my $class = shift;
2450 2869
2451 my $self = $class->SUPER::new ( 2870 my $self = $class->SUPER::new (
2452 fontsize => 1, 2871 fontsize => 1,
2453 can_events => 0, 2872 can_events => 1,
2873 indent => 0,
2454 #font => default_font 2874 #font => default_font
2455 @_, 2875 @_,
2456 2876
2457 layout => (new CFClient::Layout 1), 2877 layout => (new CFPlus::Layout),
2458 par => [], 2878 par => [],
2879 max_par => 0,
2459 height => 0, 2880 height => 0,
2460 children => [ 2881 children => [
2461 (new CFClient::UI::Empty expand => 1), 2882 (new CFPlus::UI::Empty expand => 1),
2462 (new CFClient::UI::Slider vertical => 1), 2883 (new CFPlus::UI::Slider vertical => 1),
2463 ], 2884 ],
2464 ); 2885 );
2465 2886
2466 $self->{children}[1]->connect (changed => sub { $self->update }); 2887 $self->{children}[1]->connect (changed => sub { $self->update });
2467 2888
… …
2473 2894
2474 $self->{fontsize} = $fontsize; 2895 $self->{fontsize} = $fontsize;
2475 $self->reflow; 2896 $self->reflow;
2476} 2897}
2477 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
2478sub size_allocate { 2908sub invoke_size_allocate {
2479 my ($self, $w, $h) = @_; 2909 my ($self, $w, $h) = @_;
2480 2910
2481 $self->SUPER::size_allocate ($w, $h); 2911 my ($empty, $slider, @other) = @{ $self->{children} };
2912 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2482 2913
2483 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2914 $self->{layout}->set_font ($self->{font}) if $self->{font};
2484 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2915 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2485 $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});
2486 2918
2487 $self->reflow; 2919 $self->reflow;
2488}
2489 2920
2490sub text_size { 2921 local $self->{children} = [$empty, $slider];
2922 $self->SUPER::invoke_size_allocate ($w, $h)
2923}
2924
2925sub invoke_mouse_wheel {
2491 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) = @_;
2492 2937
2493 my $layout = $self->{layout}; 2938 my $layout = $self->{layout};
2494 2939
2940 $layout->set_font ($self->{font}) if $self->{font};
2941 $layout->set_foreground (@{$para->{fg}});
2495 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2942 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2496 $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});
2497 $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}}
2498 2951 );
2952
2499 $layout->size 2953 $layout
2500} 2954}
2501 2955
2502sub reflow { 2956sub reflow {
2503 my ($self) = @_; 2957 my ($self) = @_;
2504 2958
… …
2511 2965
2512 # todo: base offset on lines or so, not on pixels 2966 # todo: base offset on lines or so, not on pixels
2513 $self->{children}[1]->set_value ($offset); 2967 $self->{children}[1]->set_value ($offset);
2514} 2968}
2515 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
2516sub clear { 2985sub clear {
2517 my ($self) = @_; 2986 my ($self) = @_;
2987
2988 my (undef, undef, @other) = @{ $self->{children} };
2989 $self->remove ($_) for @other;
2518 2990
2519 $self->{par} = []; 2991 $self->{par} = [];
2520 $self->{height} = 0; 2992 $self->{height} = 0;
2521 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2993 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2522} 2994}
2523 2995
2524sub add_paragraph { 2996sub add_paragraph {
2525 my ($self, $color, $text, $indent) = @_; 2997 my $self = shift;
2526 2998
2527 for my $line (split /\n/, $text) { 2999 for my $para (@_) {
2528 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
2529 $self->{height} += $h; 3051 $self->{height} = $height;
2530 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3052 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2531 }
2532 3053
2533 $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 }
2534} 3060}
2535 3061
2536sub update { 3062sub update {
2537 my ($self) = @_; 3063 my ($self) = @_;
2538 3064
… …
2540 3066
2541 return unless $self->{h} > 0; 3067 return unless $self->{h} > 0;
2542 3068
2543 delete $self->{texture}; 3069 delete $self->{texture};
2544 3070
2545 $ROOT->on_post_alloc ($self, sub { 3071 $ROOT->on_post_alloc ($self => sub {
3072 $self->force_uptodate;
3073
2546 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3074 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2547 3075
2548 if (delete $self->{need_reflow}) {
2549 my $height = 0;
2550
2551 my $layout = $self->{layout};
2552
2553 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2554
2555 for (@{$self->{par}}) {
2556 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2557 $layout->set_width ($W - $_->[3]);
2558 $layout->set_markup ($_->[4]);
2559 my ($w, $h) = $layout->size;
2560 $_->[0] = $w + $_->[3];
2561 $_->[1] = $h;
2562 }
2563
2564 $height += $_->[1];
2565 }
2566
2567 $self->{height} = $height;
2568
2569 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2570
2571 delete $self->{texture};
2572 }
2573
2574 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3076 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2575 glClearColor 0.5, 0.5, 0.5, 0; 3077 glClearColor 0, 0, 0, 0;
2576 glClear GL_COLOR_BUFFER_BIT; 3078 glClear GL_COLOR_BUFFER_BIT;
2577 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;
2578 my $top = int $self->{children}[1]{range}[0]; 3088 my $top = int $self->{children}[1]{range}[0];
2579 3089
2580 my $y0 = $top; 3090 my $y0 = $top;
2581 my $y1 = $top + $H; 3091 my $y1 = $top + $H;
2582 3092
2583 my $y = 0;
2584
2585 my $layout = $self->{layout};
2586
2587 $layout->set_font ($self->{font}) if $self->{font};
2588
2589 glEnable GL_BLEND;
2590 #TODO# not correct in windows where rgba is forced off
2591 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2592
2593 for my $par (@{$self->{par}}) { 3093 for my $para (@{$self->{par}}) {
2594 my $h = $par->[1]; 3094 my $h = $para->{h};
3095 my $y = $para->{y};
2595 3096
2596 if ($y0 < $y + $h && $y < $y1) { 3097 if ($y0 < $y + $h && $y < $y1) {
2597 $layout->set_foreground (@{ $par->[2] }); 3098 my $layout = $self->get_layout ($para);
2598 $layout->set_width ($W - $par->[3]);
2599 $layout->set_markup ($par->[4]);
2600 3099
2601 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3100 $layout->render ($para->{indent}, $y - $y0);
2602 3101
2603 glRasterPos $par->[3], $y - $y0; 3102 if (my @w = @{ $para->{widget} }) {
2604 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 }
2605 } 3114 }
2606 3115
2607 $y += $h; 3116 $paridx++;
3117 $top_paragraph ||= $paridx if $y >= $top;
2608 } 3118 }
2609 3119
2610 glDisable GL_BLEND; 3120 $self->{top_paragraph} = $top_paragraph;
2611 }; 3121 };
2612 }); 3122 });
2613} 3123}
2614 3124
3125sub reconfigure {
3126 my ($self) = @_;
3127
3128 $self->SUPER::reconfigure;
3129
3130 $_->{w} = 1e10 for @{ $self->{par} };
3131 $self->reflow;
3132}
3133
2615sub _draw { 3134sub _draw {
2616 my ($self) = @_; 3135 my ($self) = @_;
2617 3136
2618 glEnable GL_TEXTURE_2D; 3137 glEnable GL_TEXTURE_2D;
2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3138 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2620 glColor 1, 1, 1, 1; 3139 glColor 0, 0, 0, 1;
2621 $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});
2622 glDisable GL_TEXTURE_2D; 3141 glDisable GL_TEXTURE_2D;
2623 3142
2624 $self->{children}[1]->draw; 3143 $self->{children}[1]->draw;
2625
2626} 3144}
2627 3145
2628############################################################################# 3146#############################################################################
2629 3147
2630package CFClient::UI::Animator; 3148package CFPlus::UI::Animator;
2631 3149
2632use CFClient::OpenGL; 3150use CFPlus::OpenGL;
2633 3151
2634our @ISA = CFClient::UI::Bin::; 3152our @ISA = CFPlus::UI::Bin::;
2635 3153
2636sub moveto { 3154sub moveto {
2637 my ($self, $x, $y) = @_; 3155 my ($self, $x, $y) = @_;
2638 3156
2639 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3157 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2667 glPopMatrix; 3185 glPopMatrix;
2668} 3186}
2669 3187
2670############################################################################# 3188#############################################################################
2671 3189
2672package CFClient::UI::Flopper; 3190package CFPlus::UI::Flopper;
2673 3191
2674our @ISA = CFClient::UI::Button::; 3192our @ISA = CFPlus::UI::Button::;
2675 3193
2676sub new { 3194sub new {
2677 my $class = shift; 3195 my $class = shift;
2678 3196
2679 my $self = $class->SUPER::new ( 3197 my $self = $class->SUPER::new (
… …
2691 $self->{other}->toggle_visibility; 3209 $self->{other}->toggle_visibility;
2692} 3210}
2693 3211
2694############################################################################# 3212#############################################################################
2695 3213
2696package CFClient::UI::Tooltip; 3214package CFPlus::UI::Tooltip;
2697 3215
2698our @ISA = CFClient::UI::Bin::; 3216our @ISA = CFPlus::UI::Bin::;
2699 3217
2700use CFClient::OpenGL; 3218use CFPlus::OpenGL;
2701 3219
2702sub new { 3220sub new {
2703 my $class = shift; 3221 my $class = shift;
2704 3222
2705 $class->SUPER::new ( 3223 $class->SUPER::new (
… …
2708 ) 3226 )
2709} 3227}
2710 3228
2711sub set_tooltip_from { 3229sub set_tooltip_from {
2712 my ($self, $widget) = @_; 3230 my ($self, $widget) = @_;
3231
3232 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3233 if $widget->{tooltip} =~ /^#(.*)$/;
2713 3234
2714 my $tooltip = $widget->{tooltip}; 3235 my $tooltip = $widget->{tooltip};
2715 3236
2716 if ($ENV{CFPLUS_DEBUG} & 2) { 3237 if ($ENV{CFPLUS_DEBUG} & 2) {
2717 $tooltip .= "\n\n" . (ref $widget) . "\n" 3238 $tooltip .= "\n\n" . (ref $widget) . "\n"
2718 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3239 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2719 . "req $widget->{req_w} $widget->{req_h}\n" 3240 . "req $widget->{req_w} $widget->{req_h}\n"
2720 . "visible $widget->{visible}"; 3241 . "visible $widget->{visible}";
2721 } 3242 }
2722 3243
3244 $tooltip =~ s/^\n+//;
3245 $tooltip =~ s/\n+$//;
3246
2723 $self->add (new CFClient::UI::Label 3247 $self->add (new CFPlus::UI::Label
2724 markup => $tooltip, 3248 markup => $tooltip,
2725 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3249 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2726 fontsize => 0.8, 3250 fontsize => 0.8,
2727 fg => [0, 0, 0, 1], 3251 style => 1, # FLAG_INVERSE
2728 ellipsise => 0, 3252 ellipsise => 0,
2729 font => ($widget->{tooltip_font} || $::FONT_PROP), 3253 font => ($widget->{tooltip_font} || $::FONT_PROP),
2730 ); 3254 );
2731} 3255}
2732 3256
… …
2736 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3260 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2737 3261
2738 ($w + 4, $h + 4) 3262 ($w + 4, $h + 4)
2739} 3263}
2740 3264
2741sub size_allocate { 3265sub invoke_size_allocate {
2742 my ($self, $w, $h) = @_; 3266 my ($self, $w, $h) = @_;
2743 3267
2744 $self->SUPER::size_allocate ($w - 4, $h - 4); 3268 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2745} 3269}
2746 3270
2747sub visibility_change { 3271sub invoke_visibility_change {
2748 my ($self, $visible) = @_; 3272 my ($self, $visible) = @_;
2749 3273
2750 return unless $visible; 3274 return unless $visible;
2751 3275
2752 $self->{root}->on_post_alloc ("move_$self" => sub { 3276 $self->{root}->on_post_alloc ("move_$self" => sub {
2753 my $widget = $self->{owner} 3277 my $widget = $self->{owner}
2754 or return; 3278 or return;
2755 3279
3280 if ($widget->{visible}) {
2756 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3281 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2757 3282
2758 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3283 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2759 if $x + $self->{w} > $::WIDTH; 3284 if $x + $self->{w} > $self->{root}{w};
2760 3285
2761 $self->move_abs ($x, $y); 3286 $self->move_abs ($x, $y);
3287 } else {
3288 $self->hide;
3289 }
2762 }); 3290 });
2763} 3291}
2764 3292
2765sub _draw { 3293sub _draw {
2766 my ($self) = @_; 3294 my ($self) = @_;
… …
2790 $self->SUPER::_draw; 3318 $self->SUPER::_draw;
2791} 3319}
2792 3320
2793############################################################################# 3321#############################################################################
2794 3322
2795package CFClient::UI::Face; 3323package CFPlus::UI::Face;
2796 3324
2797our @ISA = CFClient::UI::Base::; 3325our @ISA = CFPlus::UI::DrawBG::;
2798 3326
2799use CFClient::OpenGL; 3327use CFPlus::OpenGL;
2800 3328
2801sub new { 3329sub new {
2802 my $class = shift; 3330 my $class = shift;
2803 3331
2804 my $self = $class->SUPER::new ( 3332 my $self = $class->SUPER::new (
3333 size_w => 32,
3334 size_h => 8,
2805 aspect => 1, 3335 aspect => 1,
2806 can_events => 0, 3336 can_events => 0,
2807 @_, 3337 @_,
2808 ); 3338 );
2809 3339
2810 if ($self->{anim} && $self->{animspeed}) { 3340 if ($self->{anim} && $self->{animspeed}) {
2811 Scalar::Util::weaken (my $widget = $self); 3341 CFPlus::weaken (my $widget = $self);
2812 3342
2813 $self->{timer} = Event->timer ( 3343 $self->{timer} = Event->timer (
2814 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3344 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2815 hard => 1, 3345 hard => 1,
2816 interval => $self->{animspeed}, 3346 interval => $self->{animspeed},
2817 cb => sub { 3347 cb => sub {
3348 return unless $::CONN;
3349
2818 ++$widget->{frame}; 3350 ++$widget->{frame};
3351 $self->update_face;
2819 $widget->update; 3352 $self->update;
2820 }, 3353 },
2821 ); 3354 );
3355
3356 $self->update_face;
2822 } 3357 }
2823 3358
2824 $self 3359 $self
2825} 3360}
2826 3361
3362sub update_face {
3363 my ($self) = @_;
3364
3365 return unless $::CONN;
3366
3367 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3368 if ($anim && @$anim) {
3369 delete $self->{wait_face};
3370 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3371 }
3372 }
3373}
3374
2827sub size_request { 3375sub size_request {
2828 (32, 8) 3376 my ($self) = @_;
3377
3378 if ($::CONN) {
3379 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3380 if (my $tex = $::CONN->{texture}[$faceid]) {
3381 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3382 } else {
3383 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3384 $self->realloc;
3385 });
3386 }
3387 }
3388 }
3389
3390 ($self->{size_w} || 8, $self->{size_h} || 8)
2829} 3391}
2830 3392
2831sub update { 3393sub update {
2832 my ($self) = @_; 3394 my ($self) = @_;
2833 3395
… …
2839sub _draw { 3401sub _draw {
2840 my ($self) = @_; 3402 my ($self) = @_;
2841 3403
2842 return unless $::CONN; 3404 return unless $::CONN;
2843 3405
2844 my $face; 3406 $self->SUPER::_draw;
2845 3407
2846 if ($self->{frame}) {
2847 my $anim = $::CONN->{anim}[$self->{anim}]; 3408 my $faceid = $::CONN->{faceid}[$self->{face}]
2848 3409 or return;
2849 $face = $anim->[ $self->{frame} % @$anim ]
2850 if $anim && @$anim;
2851 }
2852 3410
2853 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3411 my $tex = $::CONN->{texture}[$faceid];
2854 3412
2855 if ($tex) { 3413 if ($tex) {
2856 glEnable GL_TEXTURE_2D; 3414 glEnable GL_TEXTURE_2D;
2857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2858 glColor 1, 1, 1, 1; 3416 glColor 0, 0, 0, 1;
2859 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2860 glDisable GL_TEXTURE_2D; 3418 glDisable GL_TEXTURE_2D;
2861 } 3419 }
2862} 3420}
2863 3421
2864sub DESTROY { 3422sub destroy {
2865 my ($self) = @_; 3423 my ($self) = @_;
2866 3424
2867 $self->{timer}->cancel 3425 $self->{timer}->cancel
2868 if $self->{timer}; 3426 if $self->{timer};
2869 3427
2870 $self->SUPER::DESTROY; 3428 $self->SUPER::destroy;
2871} 3429}
2872 3430
2873############################################################################# 3431#############################################################################
2874 3432
2875package CFClient::UI::Buttonbar; 3433package CFPlus::UI::Buttonbar;
2876 3434
2877our @ISA = CFClient::UI::HBox::; 3435our @ISA = CFPlus::UI::HBox::;
2878 3436
2879# TODO: should actualyl wrap buttons and other goodies. 3437# TODO: should actually wrap buttons and other goodies.
2880 3438
2881############################################################################# 3439#############################################################################
2882 3440
2883package CFClient::UI::Menu; 3441package CFPlus::UI::Menu;
2884 3442
2885our @ISA = CFClient::UI::FancyFrame::; 3443our @ISA = CFPlus::UI::Toplevel::;
2886 3444
2887use CFClient::OpenGL; 3445use CFPlus::OpenGL;
2888 3446
2889sub new { 3447sub new {
2890 my $class = shift; 3448 my $class = shift;
2891 3449
2892 my $self = $class->SUPER::new ( 3450 my $self = $class->SUPER::new (
2893 items => [], 3451 items => [],
2894 z => 100, 3452 z => 100,
2895 @_, 3453 @_,
2896 ); 3454 );
2897 3455
2898 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3456 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2899 3457
2900 for my $item (@{ $self->{items} }) { 3458 for my $item (@{ $self->{items} }) {
2901 my ($widget, $cb) = @$item; 3459 my ($widget, $cb, $tooltip) = @$item;
2902 3460
2903 # handle various types of items, only text for now 3461 # handle various types of items, only text for now
2904 if (!ref $widget) { 3462 if (!ref $widget) {
3463 if ($widget =~ /\t/) {
3464 my ($left, $right) = split /\t/, $widget, 2;
3465
2905 $widget = new CFClient::UI::Label 3466 $widget = new CFPlus::UI::HBox
2906 can_hover => 1, 3467 can_hover => 1,
2907 can_events => 1, 3468 can_events => 1,
3469 tooltip => $tooltip,
3470 children => [
3471 (new CFPlus::UI::Label markup => $left, expand => 1),
3472 (new CFPlus::UI::Label markup => $right, align => +1),
3473 ],
3474 ;
3475
3476 } else {
3477 $widget = new CFPlus::UI::Label
3478 can_hover => 1,
3479 can_events => 1,
2908 text => $widget; 3480 markup => $widget,
3481 tooltip => $tooltip;
3482 }
2909 } 3483 }
2910 3484
2911 $self->{item}{$widget} = $item; 3485 $self->{item}{$widget} = $item;
2912 3486
2913 $self->{vbox}->add ($widget); 3487 $self->{vbox}->add ($widget);
… …
2918 3492
2919# popup given the event (must be a mouse button down event currently) 3493# popup given the event (must be a mouse button down event currently)
2920sub popup { 3494sub popup {
2921 my ($self, $ev) = @_; 3495 my ($self, $ev) = @_;
2922 3496
2923 $self->_emit ("popdown"); 3497 $self->emit ("popdown");
2924 3498
2925 # maybe save $GRAB? must be careful about events... 3499 # maybe save $GRAB? must be careful about events...
2926 $GRAB = $self; 3500 $GRAB = $self;
2927 $self->{button} = $ev->{button}; 3501 $self->{button} = $ev->{button};
2928 3502
2929 $self->show; 3503 $self->show;
2930 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3504 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2931} 3505}
2932 3506
2933sub mouse_motion { 3507sub invoke_mouse_motion {
2934 my ($self, $ev, $x, $y) = @_; 3508 my ($self, $ev, $x, $y) = @_;
2935 3509
2936 # TODO: should use vbox->find_widget or so 3510 # TODO: should use vbox->find_widget or so
2937 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3511 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2938 $self->{hover} = $self->{item}{$HOVER}; 3512 $self->{hover} = $self->{item}{$HOVER};
2939 3513
2940 0 3514 0
2941} 3515}
2942 3516
2943sub button_up { 3517sub invoke_button_up {
2944 my ($self, $ev, $x, $y) = @_; 3518 my ($self, $ev, $x, $y) = @_;
2945 3519
2946 if ($ev->{button} == $self->{button}) { 3520 if ($ev->{button} == $self->{button}) {
2947 undef $GRAB; 3521 undef $GRAB;
2948 $self->hide; 3522 $self->hide;
2949 3523
2950 $self->_emit ("popdown"); 3524 $self->emit ("popdown");
2951 $self->{hover}[1]->() if $self->{hover}; 3525 $self->{hover}[1]->() if $self->{hover};
2952 } else { 3526 } else {
2953 return 0 3527 return 0
2954 } 3528 }
2955 3529
2956 1 3530 1
2957} 3531}
2958 3532
2959############################################################################# 3533#############################################################################
2960 3534
2961package CFClient::UI::Multiplexer; 3535package CFPlus::UI::Multiplexer;
2962 3536
2963our @ISA = CFClient::UI::Container::; 3537our @ISA = CFPlus::UI::Container::;
2964 3538
2965sub new { 3539sub new {
2966 my $class = shift; 3540 my $class = shift;
2967 3541
2968 my $self = $class->SUPER::new ( 3542 my $self = $class->SUPER::new (
… …
2982 3556
2983 $self->{current} = $self->{children}[0] 3557 $self->{current} = $self->{children}[0]
2984 if @{ $self->{children} }; 3558 if @{ $self->{children} };
2985} 3559}
2986 3560
3561sub get_current_page {
3562 my ($self) = @_;
3563
3564 $self->{current}
3565}
3566
2987sub set_current_page { 3567sub set_current_page {
2988 my ($self, $page_or_widget) = @_; 3568 my ($self, $page_or_widget) = @_;
2989 3569
2990 my $widget = ref $page_or_widget 3570 my $widget = ref $page_or_widget
2991 ? $page_or_widget 3571 ? $page_or_widget
2992 : $self->{children}[$page_or_widget]; 3572 : $self->{children}[$page_or_widget];
2993 3573
2994 $self->{current} = $widget; 3574 $self->{current} = $widget;
2995 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3575 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2996 3576
2997 $self->_emit (page_changed => $self->{current}); 3577 $self->emit (page_changed => $self->{current});
2998 3578
2999 $self->realloc; 3579 $self->realloc;
3000} 3580}
3001 3581
3002sub visible_children { 3582sub visible_children {
… …
3007 my ($self) = @_; 3587 my ($self) = @_;
3008 3588
3009 $self->{current}->size_request 3589 $self->{current}->size_request
3010} 3590}
3011 3591
3012sub size_allocate { 3592sub invoke_size_allocate {
3013 my ($self, $w, $h) = @_; 3593 my ($self, $w, $h) = @_;
3014 3594
3015 $self->{current}->configure (0, 0, $w, $h); 3595 $self->{current}->configure (0, 0, $w, $h);
3596
3597 1
3016} 3598}
3017 3599
3018sub _draw { 3600sub _draw {
3019 my ($self) = @_; 3601 my ($self) = @_;
3020 3602
3021 $self->{current}->draw; 3603 $self->{current}->draw;
3022} 3604}
3023 3605
3024############################################################################# 3606#############################################################################
3025 3607
3026package CFClient::UI::Notebook; 3608package CFPlus::UI::Notebook;
3027 3609
3028our @ISA = CFClient::UI::VBox::; 3610our @ISA = CFPlus::UI::VBox::;
3029 3611
3030sub new { 3612sub new {
3031 my $class = shift; 3613 my $class = shift;
3032 3614
3033 my $self = $class->SUPER::new ( 3615 my $self = $class->SUPER::new (
3034 buttonbar => (new CFClient::UI::Buttonbar), 3616 buttonbar => (new CFPlus::UI::Buttonbar),
3035 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3617 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3036 # filter => # will be put between multiplexer and $self 3618 # filter => # will be put between multiplexer and $self
3037 @_, 3619 @_,
3038 ); 3620 );
3039 3621
3040 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3622 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3044} 3626}
3045 3627
3046sub add { 3628sub add {
3047 my ($self, $title, $widget, $tooltip) = @_; 3629 my ($self, $title, $widget, $tooltip) = @_;
3048 3630
3049 Scalar::Util::weaken $self; 3631 CFPlus::weaken $self;
3050 3632
3051 $self->{buttonbar}->add (new CFClient::UI::Button 3633 $self->{buttonbar}->add (new CFPlus::UI::Button
3052 markup => $title, 3634 markup => $title,
3053 tooltip => $tooltip, 3635 tooltip => $tooltip,
3054 on_activate => sub { $self->set_current_page ($widget) }, 3636 on_activate => sub { $self->set_current_page ($widget) },
3055 ); 3637 );
3056 3638
3057 $self->{multiplexer}->add ($widget); 3639 $self->{multiplexer}->add ($widget);
3058} 3640}
3059 3641
3642sub get_current_page {
3643 my ($self) = @_;
3644
3645 $self->{multiplexer}->get_current_page
3646}
3647
3060sub set_current_page { 3648sub set_current_page {
3061 my ($self, $page) = @_; 3649 my ($self, $page) = @_;
3062 3650
3063 $self->{multiplexer}->set_current_page ($page); 3651 $self->{multiplexer}->set_current_page ($page);
3064 $self->_emit (page_changed => $self->{multiplexer}{current}); 3652 $self->emit (page_changed => $self->{multiplexer}{current});
3065} 3653}
3066 3654
3067############################################################################# 3655#############################################################################
3068 3656
3069package CFClient::UI::Statusbox; 3657package CFPlus::UI::Selector;
3070 3658
3659use utf8;
3660
3071our @ISA = CFClient::UI::VBox::; 3661our @ISA = CFPlus::UI::Button::;
3072 3662
3073sub new { 3663sub new {
3074 my $class = shift; 3664 my $class = shift;
3075 3665
3076 $class->SUPER::new ( 3666 my $self = $class->SUPER::new (
3667 options => [], # [value, title, longdesc], ...
3668 value => undef,
3669 @_,
3670 );
3671
3672 $self->_set_value ($self->{value});
3673
3674 $self
3675}
3676
3677sub invoke_button_down {
3678 my ($self, $ev) = @_;
3679
3680 my @menu_items;
3681
3682 for (@{ $self->{options} }) {
3683 my ($value, $title, $tooltip) = @$_;
3684
3685 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3686 }
3687
3688 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3689}
3690
3691sub _set_value {
3692 my ($self, $value) = @_;
3693
3694 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3695 or return;
3696
3697 $self->{value} = $item->[0];
3698 $self->set_markup ("$item->[1] ⇓");
3699 $self->set_tooltip ($item->[2]);
3700}
3701
3702sub set_value {
3703 my ($self, $value) = @_;
3704
3705 return unless $self->{value} ne $value;
3706
3707 $self->_set_value ($value);
3708 $self->emit (changed => $value);
3709}
3710
3711#############################################################################
3712
3713package CFPlus::UI::Statusbox;
3714
3715our @ISA = CFPlus::UI::VBox::;
3716
3717sub new {
3718 my $class = shift;
3719
3720 my $self = $class->SUPER::new (
3077 fontsize => 0.8, 3721 fontsize => 0.8,
3078 @_, 3722 @_,
3079 ) 3723 );
3724
3725 CFPlus::weaken (my $this = $self);
3726
3727 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3728
3729 $self
3080} 3730}
3081 3731
3082sub reorder { 3732sub reorder {
3083 my ($self) = @_; 3733 my ($self) = @_;
3084 my $NOW = time; 3734 my $NOW = Time::HiRes::time;
3735
3736 # freeze display when hovering over any label
3737 return if $CFPlus::UI::TOOLTIP->{owner}
3738 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3739 values %{ $self->{item} };
3085 3740
3086 while (my ($k, $v) = each %{ $self->{item} }) { 3741 while (my ($k, $v) = each %{ $self->{item} }) {
3087 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3742 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3088 } 3743 }
3089 3744
… …
3092 my @items = sort { 3747 my @items = sort {
3093 $a->{pri} <=> $b->{pri} 3748 $a->{pri} <=> $b->{pri}
3094 or $b->{id} <=> $a->{id} 3749 or $b->{id} <=> $a->{id}
3095 } values %{ $self->{item} }; 3750 } values %{ $self->{item} };
3096 3751
3752 $self->{timer}->interval (1);
3753
3097 my $count = 10 + 1; 3754 my $count = 10 + 1;
3098 for my $item (@items) { 3755 for my $item (@items) {
3099 last unless --$count; 3756 last unless --$count;
3100 3757
3101 push @widgets, $item->{label} ||= do { 3758 my $label = $item->{label} ||= do {
3102 # TODO: doesn't handle markup well (read as: at all) 3759 # TODO: doesn't handle markup well (read as: at all)
3103 my $short = $item->{count} > 1 3760 my $short = $item->{count} > 1
3104 ? "<b>$item->{count} ×</b> $item->{text}" 3761 ? "<b>$item->{count} ×</b> $item->{text}"
3105 : $item->{text}; 3762 : $item->{text};
3106 3763
3107 for ($short) { 3764 for ($short) {
3108 s/^\s+//; 3765 s/^\s+//;
3109 s/\s+/ /g; 3766 s/\s+/ /g;
3110 } 3767 }
3111 3768
3112 new CFClient::UI::Label 3769 new CFPlus::UI::Label
3113 markup => $short, 3770 markup => $short,
3114 tooltip => $item->{tooltip}, 3771 tooltip => $item->{tooltip},
3115 tooltip_font => $::FONT_PROP, 3772 tooltip_font => $::FONT_PROP,
3116 tooltip_width => 0.67, 3773 tooltip_width => 0.67,
3117 fontsize => $item->{fontsize} || $self->{fontsize}, 3774 fontsize => $item->{fontsize} || $self->{fontsize},
3118 max_w => $::WIDTH * 0.44, 3775 max_w => $::WIDTH * 0.44,
3119 fg => $item->{fg}, 3776 fg => [@{ $item->{fg} }],
3120 can_events => 1, 3777 can_events => 1,
3121 can_hover => 1 3778 can_hover => 1
3122 }; 3779 };
3780
3781 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3782 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3783 $label->update;
3784 $label->set_max_size (undef, $label->{req_h} * $diff)
3785 if $diff < 1;
3786 $self->{timer}->interval (1/30);
3787 } else {
3788 $label->{fg}[3] = $item->{fg}[3] || 1;
3789 }
3790
3791 push @widgets, $label;
3123 } 3792 }
3124 3793
3125 $self->clear; 3794 $self->clear;
3126 $self->SUPER::add (reverse @widgets); 3795 $self->SUPER::add (reverse @widgets);
3127} 3796}
… …
3132 $text =~ s/^\s+//; 3801 $text =~ s/^\s+//;
3133 $text =~ s/\s+$//; 3802 $text =~ s/\s+$//;
3134 3803
3135 return unless $text; 3804 return unless $text;
3136 3805
3137 my $timeout = time + ((delete $arg{timeout}) || 60); 3806 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3138 3807
3139 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3808 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3140 3809
3141 if (my $item = $self->{item}{$group}) { 3810 if (my $item = $self->{item}{$group}) {
3142 if ($item->{text} eq $text) { 3811 if ($item->{text} eq $text) {
3143 $item->{count}++; 3812 $item->{count}++;
3144 } else { 3813 } else {
3145 $item->{count} = 1; 3814 $item->{count} = 1;
3146 $item->{text} = $item->{tooltip} = $text; 3815 $item->{text} = $item->{tooltip} = $text;
3147 } 3816 }
3148 $item->{id} = ++$self->{id}; 3817 $item->{id} += 0.2;#d#
3149 $item->{timeout} = $timeout; 3818 $item->{timeout} = $timeout;
3150 delete $item->{label}; 3819 delete $item->{label};
3151 } else { 3820 } else {
3152 $self->{item}{$group} = { 3821 $self->{item}{$group} = {
3153 id => ++$self->{id}, 3822 id => ++$self->{id},
… …
3159 count => 1, 3828 count => 1,
3160 %arg, 3829 %arg,
3161 }; 3830 };
3162 } 3831 }
3163 3832
3833 $ROOT->on_refresh (reorder => sub {
3164 $self->reorder; 3834 $self->reorder;
3835 });
3165} 3836}
3166 3837
3167sub reconfigure { 3838sub reconfigure {
3168 my ($self) = @_; 3839 my ($self) = @_;
3169 3840
… …
3172 3843
3173 $self->reorder; 3844 $self->reorder;
3174 $self->SUPER::reconfigure; 3845 $self->SUPER::reconfigure;
3175} 3846}
3176 3847
3848sub destroy {
3849 my ($self) = @_;
3850
3851 $self->{timer}->cancel;
3852
3853 $self->SUPER::destroy;
3854}
3855
3177############################################################################# 3856#############################################################################
3178 3857
3179package CFClient::UI::Inventory;
3180
3181our @ISA = CFClient::UI::ScrolledWindow::;
3182
3183sub new {
3184 my $class = shift;
3185
3186 my $self = $class->SUPER::new (
3187 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3188 @_,
3189 );
3190
3191 $self
3192}
3193
3194sub set_items {
3195 my ($self, $items) = @_;
3196
3197 $self->{child}->clear;
3198 return unless $items;
3199
3200 my @items = sort {
3201 ($a->{type} <=> $b->{type})
3202 or ($a->{name} cmp $b->{name})
3203 } @$items;
3204
3205 $self->{real_items} = \@items;
3206
3207 my $row = 0;
3208 for my $item (@items) {
3209 CFClient::Item::update_widgets $item;
3210
3211 $self->{child}->add (0, $row, $item->{face_widget});
3212 $self->{child}->add (1, $row, $item->{desc_widget});
3213 $self->{child}->add (2, $row, $item->{weight_widget});
3214
3215 $row++;
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::BindEditor;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (my $vb = new CFClient::UI::VBox);
3231
3232
3233 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3234 text => "start recording",
3235 tooltip => "Start/Stops recording of actions."
3236 ."All subsequent actions after the recording started will be captured."
3237 ."The actions are displayed after the record was stopped."
3238 ."To bind the action you have to click on the 'Bind' button",
3239 on_activate => sub {
3240 unless ($self->{recording}) {
3241 $self->start;
3242 } else {
3243 $self->stop;
3244 }
3245 });
3246
3247 $vb->add (new CFClient::UI::Label text => "Actions:");
3248 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3249
3250 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3251 $vb->add (my $hb = new CFClient::UI::HBox);
3252 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3253 $hb->add (new CFClient::UI::Button
3254 text => "bind",
3255 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3256 on_activate => sub {
3257 $self->ask_for_bind;
3258 });
3259
3260 $vb->add (my $hb = new CFClient::UI::HBox);
3261 $hb->add (new CFClient::UI::Button
3262 text => "ok",
3263 expand => 1,
3264 tooltip => "This closes the binding editor and saves the binding",
3265 on_activate => sub {
3266 $self->hide;
3267 $self->commit;
3268 });
3269
3270 $hb->add (new CFClient::UI::Button
3271 text => "cancel",
3272 expand => 1,
3273 tooltip => "This closes the binding editor without saving",
3274 on_activate => sub {
3275 $self->hide;
3276 $self->{binding_cancel}->()
3277 if $self->{binding_cancel};
3278 });
3279
3280 $self->update_binding_widgets;
3281
3282 $self
3283}
3284
3285sub commit {
3286 my ($self) = @_;
3287 my ($mod, $sym, $cmds) = $self->get_binding;
3288 if ($sym != 0 && @$cmds > 0) {
3289 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3290 ."'. Don't forget 'Save Config'!");
3291 $self->{binding_change}->($mod, $sym, $cmds)
3292 if $self->{binding_change};
3293 } else {
3294 $::STATUSBOX->add ("No action bound, no key or action specified!");
3295 $self->{binding_cancel}->()
3296 if $self->{binding_cancel};
3297 }
3298}
3299
3300sub start {
3301 my ($self) = @_;
3302
3303 $self->{rec_btn}->set_text ("stop recording");
3304 $self->{recording} = 1;
3305 $self->clear_command_list;
3306 $::CONN->start_record if $::CONN;
3307}
3308
3309sub stop {
3310 my ($self) = @_;
3311
3312 $self->{rec_btn}->set_text ("start recording");
3313 $self->{recording} = 0;
3314
3315 my $rec;
3316 $rec = $::CONN->stop_record if $::CONN;
3317 return unless ref $rec eq 'ARRAY';
3318 $self->set_command_list ($rec);
3319}
3320
3321
3322sub ask_for_bind_and_commit {
3323 my ($self) = @_;
3324 $self->ask_for_bind (1);
3325}
3326
3327sub ask_for_bind {
3328 my ($self, $commit) = @_;
3329
3330 CFClient::Binder::open_binding_dialog (sub {
3331 my ($mod, $sym) = @_;
3332 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3333 $self->update_binding_widgets;
3334 $self->commit if $commit;
3335 });
3336}
3337
3338# $mod and $sym are the modifiers and key symbol
3339# $cmds is a array ref of strings (the commands)
3340# $cb is the callback that is executed on OK
3341# $ccb is the callback that is executed on CANCEL and
3342# when the binding was unsuccessful on OK
3343sub set_binding {
3344 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3345
3346 $self->clear_command_list;
3347 $self->{recording} = 0;
3348 $self->{rec_btn}->set_text ("start recording");
3349
3350 $self->{binding} = [$mod, $sym];
3351 $self->{commands} = $cmds;
3352
3353 $self->{binding_change} = $cb;
3354 $self->{binding_cancel} = $ccb;
3355
3356 $self->update_binding_widgets;
3357}
3358
3359# this is a shortcut method that asks for a binding
3360# and then just binds it.
3361sub do_quick_binding {
3362 my ($self, $cmds) = @_;
3363 $self->set_binding (undef, undef, $cmds, sub {
3364 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3365 });
3366 $self->ask_for_bind (1);
3367}
3368
3369sub update_binding_widgets {
3370 my ($self) = @_;
3371 my ($mod, $sym, $cmds) = $self->get_binding;
3372 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3373 $self->set_command_list ($cmds);
3374}
3375
3376sub get_binding {
3377 my ($self) = @_;
3378 return (
3379 $self->{binding}->[0],
3380 $self->{binding}->[1],
3381 [ grep { defined $_ } @{$self->{commands}} ]
3382 );
3383}
3384
3385sub clear_command_list {
3386 my ($self) = @_;
3387 $self->{cmdbox}->clear ();
3388}
3389
3390sub set_command_list {
3391 my ($self, $cmds) = @_;
3392
3393 $self->{cmdbox}->clear ();
3394 $self->{commands} = $cmds;
3395
3396 my $idx = 0;
3397
3398 for (@$cmds) {
3399 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3400
3401 my $i = $idx;
3402 $hb->add (new CFClient::UI::Label text => $_);
3403 $hb->add (new CFClient::UI::Button
3404 text => "delete",
3405 tooltip => "Deletes the action from the record",
3406 on_activate => sub {
3407 $self->{cmdbox}->remove ($hb);
3408 $cmds->[$i] = undef;
3409 });
3410
3411
3412 $idx++
3413 }
3414}
3415
3416#############################################################################
3417
3418package CFClient::UI::SpellList;
3419
3420our @ISA = CFClient::UI::Table::;
3421
3422sub new {
3423 my $class = shift;
3424
3425 my $self = $class->SUPER::new (
3426 binding => [],
3427 commands => [],
3428 @_,
3429 )
3430}
3431
3432# XXX: Do sorting? Argl...
3433sub add_spell {
3434 my ($self, $spell) = @_;
3435 $self->{spells}->{$spell->{name}} = $spell;
3436
3437 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3438 face => $spell->{face},
3439 can_hover => 1,
3440 can_events => 1,
3441 tooltip => $spell->{message});
3442
3443 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3444 text => $spell->{name},
3445 can_hover => 1,
3446 can_events => 1,
3447 tooltip => $spell->{message},
3448 expand => 1);
3449
3450 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3451 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3452 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3453 expand => 1);
3454
3455 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3456 text => "bind to key",
3457 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3458}
3459
3460sub rebuild_spell_list {
3461 my ($self) = @_;
3462 $self->{tbl_idx} = 0;
3463 $self->add_spell ($_) for values %{$self->{spells}};
3464}
3465
3466sub remove_spell {
3467 my ($self, $spell) = @_;
3468 delete $self->{spells}->{$spell->{name}};
3469 $self->rebuild_spell_list;
3470}
3471
3472#############################################################################
3473
3474package CFClient::UI::Root; 3858package CFPlus::UI::Root;
3475 3859
3476our @ISA = CFClient::UI::Container::; 3860our @ISA = CFPlus::UI::Container::;
3477 3861
3862use List::Util qw(min max);
3863
3478use CFClient::OpenGL; 3864use CFPlus::OpenGL;
3479 3865
3480sub new { 3866sub new {
3481 my $class = shift; 3867 my $class = shift;
3482 3868
3483 my $self = $class->SUPER::new ( 3869 my $self = $class->SUPER::new (
3484 visible => 1, 3870 visible => 1,
3485 @_, 3871 @_,
3486 ); 3872 );
3487 3873
3488 Scalar::Util::weaken ($self->{root} = $self); 3874 CFPlus::weaken ($self->{root} = $self);
3489 3875
3490 $self 3876 $self
3491} 3877}
3492 3878
3493sub size_request { 3879sub size_request {
… …
3508 $coord = $max - $size if $coord > $max - $size; 3894 $coord = $max - $size if $coord > $max - $size;
3509 3895
3510 int $coord + 0.5 3896 int $coord + 0.5
3511} 3897}
3512 3898
3513sub size_allocate { 3899sub invoke_size_allocate {
3514 my ($self, $w, $h) = @_; 3900 my ($self, $w, $h) = @_;
3515 3901
3516 for my $child ($self->children) { 3902 for my $child ($self->children) {
3517 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3903 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3518 3904
… …
3522 $X = _to_pixel $X, $W, $self->{w}; 3908 $X = _to_pixel $X, $W, $self->{w};
3523 $Y = _to_pixel $Y, $H, $self->{h}; 3909 $Y = _to_pixel $Y, $H, $self->{h};
3524 3910
3525 $child->configure ($X, $Y, $W, $H); 3911 $child->configure ($X, $Y, $W, $H);
3526 } 3912 }
3913
3914 1
3527} 3915}
3528 3916
3529sub coord2local { 3917sub coord2local {
3530 my ($self, $x, $y) = @_; 3918 my ($self, $x, $y) = @_;
3531 3919
… …
3616 4004
3617 delete $queue{$widget+0}; 4005 delete $queue{$widget+0};
3618 4006
3619 my ($w, $h) = $widget->size_request; 4007 my ($w, $h) = $widget->size_request;
3620 4008
3621 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4009 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3622 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4010 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4011
4012 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4013 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3623 4014
3624 $w = $widget->{force_w} if exists $widget->{force_w}; 4015 $w = $widget->{force_w} if exists $widget->{force_w};
3625 $h = $widget->{force_h} if exists $widget->{force_h}; 4016 $h = $widget->{force_h} if exists $widget->{force_h};
3626 4017
3627 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4018 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3653 4044
3654 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4045 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3655 4046
3656 $w = 0 if $w < 0; 4047 $w = 0 if $w < 0;
3657 $h = 0 if $h < 0; 4048 $h = 0 if $h < 0;
4049
4050 $w = max $widget->{min_w}, $w;
4051 $h = max $widget->{min_h}, $h;
4052
4053# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4054# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4055
4056 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4057 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3658 4058
3659 $w = int $w + 0.5; 4059 $w = int $w + 0.5;
3660 $h = int $h + 0.5; 4060 $h = int $h + 0.5;
3661 4061
3662 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4062 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
… …
3686 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4086 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3687 glMatrixMode GL_MODELVIEW; 4087 glMatrixMode GL_MODELVIEW;
3688 glLoadIdentity; 4088 glLoadIdentity;
3689 4089
3690 { 4090 {
3691 package CFClient::UI::Base; 4091 package CFPlus::UI::Base;
3692 4092
3693 ($draw_x, $draw_y, $draw_w, $draw_h) = 4093 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3694 (0, 0, $self->{w}, $self->{h}); 4094 (0, 0, $self->{w}, $self->{h});
3695 }
3696 4095
3697 $self->_draw; 4096 $self->_draw;
4097 }
3698} 4098}
3699 4099
3700############################################################################# 4100#############################################################################
3701 4101
3702package CFClient::UI; 4102package CFPlus::UI;
3703 4103
3704$ROOT = new CFClient::UI::Root; 4104$ROOT = new CFPlus::UI::Root;
3705$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4105$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3706 4106
37071 41071
3708 4108

Diff Legend

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