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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.368 by root, Mon Jun 25 05:43:37 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) = @_;
… …
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
877# back-buffered drawing area
878
799package CFClient::UI::Window; 879package CFPlus::UI::Window;
800 880
801our @ISA = CFClient::UI::Bin::; 881our @ISA = CFPlus::UI::Bin::;
802 882
803use CFClient::OpenGL; 883use CFPlus::OpenGL;
804 884
805sub new { 885sub new {
806 my ($class, %arg) = @_; 886 my ($class, %arg) = @_;
807 887
808 my $self = $class->SUPER::new (%arg); 888 my $self = $class->SUPER::new (%arg);
… …
813 893
814 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 894 $ROOT->on_post_alloc ($self => sub { $self->render_child });
815 $self->SUPER::update; 895 $self->SUPER::update;
816} 896}
817 897
818sub size_allocate { 898sub invoke_size_allocate {
819 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
820 900
821 $self->SUPER::size_allocate ($w, $h);
822 $self->update; 901 $self->update;
902
903 $self->SUPER::invoke_size_allocate ($w, $h)
823} 904}
824 905
825sub _render { 906sub _render {
826 my ($self) = @_; 907 my ($self) = @_;
827 908
… …
829} 910}
830 911
831sub render_child { 912sub render_child {
832 my ($self) = @_; 913 my ($self) = @_;
833 914
834 $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 {
835 glClearColor 0, 0, 0, 0; 916 glClearColor 0, 0, 0, 0;
836 glClear GL_COLOR_BUFFER_BIT; 917 glClear GL_COLOR_BUFFER_BIT;
837 918
838 { 919 {
839 package CFClient::UI::Base; 920 package CFPlus::UI::Base;
840 921
841 ($draw_x, $draw_y, $draw_w, $draw_h) = 922 local ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h}); 923 (0, 0, $self->{w}, $self->{h});
924
925 $self->_render;
843 } 926 }
844
845 $self->_render;
846 }; 927 };
847} 928}
848 929
849sub _draw { 930sub _draw {
850 my ($self) = @_; 931 my ($self) = @_;
851
852 my ($w, $h) = @$self{qw(w h)};
853 932
854 my $tex = $self->{texture} 933 my $tex = $self->{texture}
855 or return; 934 or return;
856 935
857 glEnable GL_TEXTURE_2D; 936 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 937 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 938 glColor 0, 0, 0, 1;
860 939
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 940 $tex->draw_quad_alpha_premultiplied (0, 0);
862 941
863 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
864} 943}
865 944
866############################################################################# 945#############################################################################
867 946
868package CFClient::UI::ViewPort; 947package CFPlus::UI::ViewPort;
869 948
870our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
871 950
872sub new { 951sub new {
873 my $class = shift; 952 my $class = shift;
874 953
875 $class->SUPER::new ( 954 $class->SUPER::new (
… …
888 $h = 10 if $self->{scroll_y}; 967 $h = 10 if $self->{scroll_y};
889 968
890 ($w, $h) 969 ($w, $h)
891} 970}
892 971
893sub size_allocate { 972sub invoke_size_allocate {
894 my ($self, $w, $h) = @_; 973 my ($self, $w, $h) = @_;
895 974
896 my $child = $self->child; 975 my $child = $self->child;
897 976
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 977 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 978 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900 979
901 $self->child->configure (0, 0, $w, $h); 980 $self->child->configure (0, 0, $w, $h);
902 $self->update; 981 $self->update;
982
983 1
903} 984}
904 985
905sub set_offset { 986sub set_offset {
906 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
907 988
… …
933 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
934 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
935 ) { 1016 ) {
936 $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})
937 } else { 1018 } else {
938 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
939 } 1020 }
940} 1021}
941 1022
942sub _render { 1023sub _render {
943 my ($self) = @_; 1024 my ($self) = @_;
944 1025
945 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};
946 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};
947 1028
948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
949 1030
950 $self->SUPER::_render; 1031 $self->SUPER::_render;
951} 1032}
952 1033
953############################################################################# 1034#############################################################################
954 1035
955package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
956 1037
957our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::HBox::;
958 1039
959sub new { 1040sub new {
960 my $class = shift; 1041 my ($class, %arg) = @_;
1042
1043 my $child = delete $arg{child};
961 1044
962 my $self; 1045 my $self;
963 1046
964 my $slider = new CFClient::UI::Slider 1047 my $slider = new CFPlus::UI::Slider
965 vertical => 1, 1048 vertical => 1,
966 range => [0, 0, 1, 0.01], # HACK fix 1049 range => [0, 0, 1, 0.01], # HACK fix
967 on_changed => sub { 1050 on_changed => sub {
968 $self->{vp}->set_offset (0, $_[1]); 1051 $self->{vp}->set_offset (0, $_[1]);
969 }, 1052 },
970 ; 1053 ;
971 1054
972 $self = $class->SUPER::new ( 1055 $self = $class->SUPER::new (
973 vp => (new CFClient::UI::ViewPort expand => 1), 1056 vp => (new CFPlus::UI::ViewPort expand => 1),
1057 can_events => 1,
974 slider => $slider, 1058 slider => $slider,
975 @_, 1059 %arg,
976 ); 1060 );
977 1061
978 $self->{vp}->add ($self->{scrolled});
979 $self->add ($self->{vp});
980 $self->add ($self->{slider}); 1062 $self->SUPER::add ($self->{vp}, $self->{slider});
1063 $self->add ($child) if $child;
981 1064
982 $self 1065 $self
983} 1066}
984 1067
1068#TODO# update range on size_allocate depending on child
1069
1070sub add {
1071 my ($self, $widget) = @_;
1072
1073 $self->{vp}->add ($self->{child} = $widget);
1074}
1075
1076sub invoke_mouse_wheel {
1077 my ($self, $ev) = @_;
1078
1079 return 0 unless $ev->{dy}; # only vertical movements
1080
1081 $self->{slider}->emit (mouse_wheel => $ev);
1082
1083 1
1084}
1085
1086sub update_slider {
1087 my ($self) = @_;
1088
1089 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1090}
1091
985sub update { 1092sub update {
986 my ($self) = @_; 1093 my ($self) = @_;
987 1094
988 $self->SUPER::update; 1095 $self->SUPER::update;
989 1096
990 # todo: overwrite size_allocate of child 1097 $self->update_slider;
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
993} 1098}
994 1099
995sub size_allocate { 1100sub invoke_size_allocate {
996 my ($self, $w, $h) = @_; 1101 my ($self, $w, $h) = @_;
997 1102
1103 $self->update_slider;
1104
998 $self->SUPER::size_allocate ($w, $h); 1105 $self->SUPER::invoke_size_allocate ($w, $h)
999
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002} 1106}
1003
1004#TODO# update range on size_allocate depending on child
1005# update viewport offset on scroll
1006 1107
1007############################################################################# 1108#############################################################################
1008 1109
1009package CFClient::UI::Frame; 1110package CFPlus::UI::Frame;
1010 1111
1011our @ISA = CFClient::UI::Bin::; 1112our @ISA = CFPlus::UI::Bin::;
1012 1113
1013use CFClient::OpenGL; 1114use CFPlus::OpenGL;
1014 1115
1015sub new { 1116sub new {
1016 my $class = shift; 1117 my $class = shift;
1017 1118
1018 $class->SUPER::new ( 1119 $class->SUPER::new (
… …
1026 1127
1027 if ($self->{bg}) { 1128 if ($self->{bg}) {
1028 my ($w, $h) = @$self{qw(w h)}; 1129 my ($w, $h) = @$self{qw(w h)};
1029 1130
1030 glEnable GL_BLEND; 1131 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1132 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1032 glColor @{ $self->{bg} }; 1133 glColor_premultiply @{ $self->{bg} };
1033 1134
1034 glBegin GL_QUADS; 1135 glBegin GL_QUADS;
1035 glVertex 0 , 0; 1136 glVertex 0 , 0;
1036 glVertex 0 , $h; 1137 glVertex 0 , $h;
1037 glVertex $w, $h; 1138 glVertex $w, $h;
… …
1044 $self->SUPER::_draw; 1145 $self->SUPER::_draw;
1045} 1146}
1046 1147
1047############################################################################# 1148#############################################################################
1048 1149
1049package CFClient::UI::FancyFrame; 1150package CFPlus::UI::FancyFrame;
1050 1151
1051our @ISA = CFClient::UI::Bin::; 1152our @ISA = CFPlus::UI::Bin::;
1052 1153
1053use CFClient::OpenGL; 1154use CFPlus::OpenGL;
1054
1055my $bg =
1056 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1057 mipmap => 1, wrap => 1;
1058
1059my @border =
1060 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1061 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1062 1155
1063sub new { 1156sub new {
1064 my ($class, %arg) = @_; 1157 my ($class, %arg) = @_;
1065 1158
1066 my $title = delete $arg{title}; 1159 if ((exists $arg{label}) && !ref $arg{label}) {
1160 $arg{label} = new CFPlus::UI::Label
1161 align => 1,
1162 valign => 0,
1163 text => $arg{label},
1164 fontsize => ($arg{border} || 0.8) * 0.75;
1165 }
1166
1167 my $self = $class->SUPER::new (
1168 # label => "",
1169 fg => [0.6, 0.3, 0.1],
1170 border => 0.8,
1171 style => 'single',
1172 %arg,
1173 );
1174
1175 $self
1176}
1177
1178sub add {
1179 my ($self, @widgets) = @_;
1180
1181 $self->SUPER::add (@widgets);
1182 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1183}
1184
1185sub border {
1186 int $_[0]{border} * $::FONTSIZE
1187}
1188
1189sub size_request {
1190 my ($self) = @_;
1191
1192 ($self->{label_w}, undef) = $self->{label}->size_request
1193 if $self->{label};
1194
1195 my ($w, $h) = $self->SUPER::size_request;
1196
1197 (
1198 $w + $self->border * 2,
1199 $h + $self->border * 2,
1200 )
1201}
1202
1203sub invoke_size_allocate {
1204 my ($self, $w, $h) = @_;
1205
1206 my $border = $self->border;
1207
1208 $w -= List::Util::max 0, $border * 2;
1209 $h -= List::Util::max 0, $border * 2;
1210
1211 if (my $label = $self->{label}) {
1212 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1213 $label->{h} = List::Util::min $h, $border;
1214 $label->invoke_size_allocate ($label->{w}, $label->{h});
1215 }
1216
1217 $self->child->configure ($border, $border, $w, $h);
1218
1219 1
1220}
1221
1222sub _draw {
1223 my ($self) = @_;
1224
1225 my $child = $self->{children}[0];
1226
1227 my $border = $self->border;
1228 my ($w, $h) = ($self->{w}, $self->{h});
1229
1230 $child->draw;
1231
1232 glColor @{$self->{fg}};
1233 glBegin GL_LINE_STRIP;
1234 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1235 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1236 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1237 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1238 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1239 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1240 glEnd;
1241
1242 if ($self->{label}) {
1243 glTranslate $border * 2, 0;
1244 $self->{label}->_draw;
1245 }
1246}
1247
1248#############################################################################
1249
1250package CFPlus::UI::Toplevel;
1251
1252our @ISA = CFPlus::UI::Bin::;
1253
1254use CFPlus::OpenGL;
1255
1256my $bg =
1257 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1258 mipmap => 1, wrap => 1;
1259
1260my @border =
1261 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1262 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1263
1264sub new {
1265 my ($class, %arg) = @_;
1067 1266
1068 my $self = $class->SUPER::new ( 1267 my $self = $class->SUPER::new (
1069 bg => [1, 1, 1, 1], 1268 bg => [1, 1, 1, 1],
1070 border_bg => [1, 1, 1, 1], 1269 border_bg => [1, 1, 1, 1],
1071 border => 0.6, 1270 border => 0.6,
1072 can_events => 1, 1271 can_events => 1,
1073 min_w => 16, 1272 min_w => 64,
1074 min_h => 16, 1273 min_h => 32,
1075 %arg, 1274 %arg,
1076 ); 1275 );
1077 1276
1078 $self->{title} = new CFClient::UI::Label 1277 $self->{title_widget} = new CFPlus::UI::Label
1079 align => 0, 1278 align => 0,
1080 valign => 1, 1279 valign => 1,
1081 text => $title, 1280 text => $self->{title},
1082 fontsize => $self->{border} 1281 fontsize => $self->{border},
1083 if defined $title; 1282 if exists $self->{title};
1283
1284 if ($self->{has_close_button}) {
1285 $self->{close_button} =
1286 new CFPlus::UI::ImageButton
1287 path => 'x1_close.png',
1288 on_activate => sub { $self->emit ("delete") };
1289
1290 $self->CFPlus::UI::Container::add ($self->{close_button});
1291 }
1084 1292
1085 $self 1293 $self
1086} 1294}
1087 1295
1088sub add { 1296sub add {
1089 my ($self, @widgets) = @_; 1297 my ($self, @widgets) = @_;
1090 1298
1091 $self->SUPER::add (@widgets); 1299 $self->SUPER::add (@widgets);
1300 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1092 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1301 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1093} 1302}
1094 1303
1095sub border { 1304sub border {
1096 int $_[0]{border} * $::FONTSIZE 1305 int $_[0]{border} * $::FONTSIZE
1097} 1306}
1098 1307
1099sub size_request { 1308sub size_request {
1100 my ($self) = @_; 1309 my ($self) = @_;
1101 1310
1102 $self->{title}->size_request 1311 $self->{title_widget}->size_request
1103 if $self->{title}; 1312 if $self->{title_widget};
1313
1314 $self->{close_button}->size_request
1315 if $self->{close_button};
1104 1316
1105 my ($w, $h) = $self->SUPER::size_request; 1317 my ($w, $h) = $self->SUPER::size_request;
1106 1318
1107 ( 1319 (
1108 $w + $self->border * 2, 1320 $w + $self->border * 2,
1109 $h + $self->border * 2, 1321 $h + $self->border * 2,
1110 ) 1322 )
1111} 1323}
1112 1324
1113sub size_allocate { 1325sub invoke_size_allocate {
1114 my ($self, $w, $h) = @_; 1326 my ($self, $w, $h) = @_;
1115 1327
1116 if ($self->{title}) { 1328 if ($self->{title_widget}) {
1117 $self->{title}{w} = $w; 1329 $self->{title_widget}{w} = $w;
1118 $self->{title}{h} = $h; 1330 $self->{title_widget}{h} = $h;
1119 $self->{title}->size_allocate ($w, $h); 1331 $self->{title_widget}->invoke_size_allocate ($w, $h);
1120 } 1332 }
1121 1333
1122 my $border = $self->border; 1334 my $border = $self->border;
1123 1335
1124 $h -= List::Util::max 0, $border * 2; 1336 $h -= List::Util::max 0, $border * 2;
1125 $w -= List::Util::max 0, $border * 2; 1337 $w -= List::Util::max 0, $border * 2;
1338
1339 $self->child->configure ($border, $border, $w, $h);
1340
1341 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1342 if $self->{close_button};
1343
1344 1
1345}
1346
1347sub invoke_delete {
1348 my ($self) = @_;
1349
1350 $self->hide;
1126 1351
1127 $self->child->configure ($border, $border, $w, $h); 1352 1
1128} 1353}
1129 1354
1130sub button_down { 1355sub invoke_button_down {
1131 my ($self, $ev, $x, $y) = @_; 1356 my ($self, $ev, $x, $y) = @_;
1132 1357
1133 my ($w, $h) = @$self{qw(w h)}; 1358 my ($w, $h) = @$self{qw(w h)};
1134 my $border = $self->border; 1359 my $border = $self->border;
1135 1360
… …
1151 my $dy = $ev->{y} - $oy; 1376 my $dy = $ev->{y} - $oy;
1152 1377
1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1378 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1379 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155 1380
1381 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1156 $self->realloc; 1382 $self->realloc;
1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1158 }; 1383 };
1159 1384
1160 } elsif ($lr ^ $td) { 1385 } elsif ($lr ^ $td) {
1161 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1386 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1162 my ($bx, $by) = ($self->{x}, $self->{y}); 1387 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1165 my ($ev, $x, $y) = @_; 1390 my ($ev, $x, $y) = @_;
1166 1391
1167 ($x, $y) = ($ev->{x}, $ev->{y}); 1392 ($x, $y) = ($ev->{x}, $ev->{y});
1168 1393
1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1394 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1395 # HACK: the next line is required to enforce placement
1396 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1170 }; 1397 };
1171 } else { 1398 } else {
1172 return 0; 1399 return 0;
1173 } 1400 }
1174 1401
1175 1 1402 1
1176} 1403}
1177 1404
1178sub button_up { 1405sub invoke_button_up {
1179 my ($self, $ev, $x, $y) = @_; 1406 my ($self, $ev, $x, $y) = @_;
1180 1407
1181 !!delete $self->{motion} 1408 ! ! delete $self->{motion}
1182} 1409}
1183 1410
1184sub mouse_motion { 1411sub invoke_mouse_motion {
1185 my ($self, $ev, $x, $y) = @_; 1412 my ($self, $ev, $x, $y) = @_;
1186 1413
1187 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1414 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188 1415
1189 !!$self->{motion} 1416 ! ! $self->{motion}
1417}
1418
1419sub invoke_visibility_change {
1420 my ($self, $visible) = @_;
1421
1422 delete $self->{motion} unless $visible;
1423
1424 0
1190} 1425}
1191 1426
1192sub _draw { 1427sub _draw {
1193 my ($self) = @_; 1428 my ($self) = @_;
1194 1429
… …
1220 1455
1221 glDisable GL_TEXTURE_2D; 1456 glDisable GL_TEXTURE_2D;
1222 1457
1223 $child->draw; 1458 $child->draw;
1224 1459
1225 if ($self->{title}) { 1460 if ($self->{title_widget}) {
1226 glTranslate 0, $border - $self->{h}; 1461 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw; 1462 $self->{title_widget}->_draw;
1463
1464 glTranslate 0, - ($border - $self->{h});
1228 } 1465 }
1466
1467 $self->{close_button}->draw
1468 if $self->{close_button};
1229} 1469}
1230 1470
1231############################################################################# 1471#############################################################################
1232 1472
1233package CFClient::UI::Table; 1473package CFPlus::UI::Table;
1234 1474
1235our @ISA = CFClient::UI::Base::; 1475our @ISA = CFPlus::UI::Base::;
1236 1476
1237use List::Util qw(max sum); 1477use List::Util qw(max sum);
1238 1478
1239use CFClient::OpenGL; 1479use CFPlus::OpenGL;
1240 1480
1241sub new { 1481sub new {
1242 my $class = shift; 1482 my $class = shift;
1243 1483
1244 $class->SUPER::new ( 1484 $class->SUPER::new (
… …
1250sub children { 1490sub children {
1251 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1491 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1252} 1492}
1253 1493
1254sub add { 1494sub add {
1255 my ($self, $x, $y, $child) = @_; 1495 my ($self) = shift;
1256 1496
1497 while (@_) {
1498 my ($x, $y, $child) = splice @_, 0, 3, ();
1257 $child->set_parent ($self); 1499 $child->set_parent ($self);
1258 $self->{children}[$y][$x] = $child; 1500 $self->{children}[$y][$x] = $child;
1501 }
1259 1502
1503 $self->{force_realloc} = 1;
1504 $self->{force_size_alloc} = 1;
1260 $self->realloc; 1505 $self->realloc;
1506}
1507
1508sub remove {
1509 my ($self, $child) = @_;
1510
1511 # TODO: not yet implemented
1261} 1512}
1262 1513
1263# TODO: move to container class maybe? send children a signal on removal? 1514# TODO: move to container class maybe? send children a signal on removal?
1264sub clear { 1515sub clear {
1265 my ($self) = @_; 1516 my ($self) = @_;
… …
1306 (sum @$ws), 1557 (sum @$ws),
1307 (sum @$hs), 1558 (sum @$hs),
1308 ) 1559 )
1309} 1560}
1310 1561
1311sub size_allocate { 1562sub invoke_size_allocate {
1312 my ($self, $w, $h) = @_; 1563 my ($self, $w, $h) = @_;
1313 1564
1314 my ($ws, $hs) = $self->get_wh; 1565 my ($ws, $hs) = $self->get_wh;
1315 1566
1316 my $req_w = (sum @$ws) || 1; 1567 my $req_w = (sum @$ws) || 1;
… …
1323 1574
1324 # linearly scale sizes 1575 # linearly scale sizes
1325 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1576 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1326 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1577 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1327 1578
1328 CFClient::UI::harmonize $ws; 1579 CFPlus::UI::harmonize $ws;
1329 CFClient::UI::harmonize $hs; 1580 CFPlus::UI::harmonize $hs;
1330 1581
1331 my $y; 1582 my $y;
1332 1583
1333 for my $r (0 .. $#{$self->{children}}) { 1584 for my $r (0 .. $#{$self->{children}}) {
1334 my $row = $self->{children}[$r] 1585 my $row = $self->{children}[$r]
… …
1348 } 1599 }
1349 1600
1350 $y += $row_h; 1601 $y += $row_h;
1351 } 1602 }
1352 1603
1604 1
1353} 1605}
1354 1606
1355sub find_widget { 1607sub find_widget {
1356 my ($self, $x, $y) = @_; 1608 my ($self, $x, $y) = @_;
1357 1609
… …
1376 } 1628 }
1377} 1629}
1378 1630
1379############################################################################# 1631#############################################################################
1380 1632
1381package CFClient::UI::Box; 1633package CFPlus::UI::Box;
1382 1634
1383our @ISA = CFClient::UI::Container::; 1635our @ISA = CFPlus::UI::Container::;
1384 1636
1385sub size_request { 1637sub size_request {
1386 my ($self) = @_; 1638 my ($self) = @_;
1387 1639
1388 $self->{vertical} 1640 $self->{vertical}
… …
1394 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1646 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1395 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1647 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1396 ) 1648 )
1397} 1649}
1398 1650
1399sub size_allocate { 1651sub invoke_size_allocate {
1400 my ($self, $w, $h) = @_; 1652 my ($self, $w, $h) = @_;
1401 1653
1402 my $space = $self->{vertical} ? $h : $w; 1654 my $space = $self->{vertical} ? $h : $w;
1403 my $children = $self->{children}; 1655 my @children = $self->visible_children;
1404 1656
1405 my @req; 1657 my @req;
1406 1658
1407 if ($self->{homogeneous}) { 1659 if ($self->{homogeneous}) {
1408 @req = ($space / (@$children || 1)) x @$children; 1660 @req = ($space / (@children || 1)) x @children;
1409 } else { 1661 } else {
1410 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1662 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1411 my $req = List::Util::sum @req; 1663 my $req = List::Util::sum @req;
1412 1664
1413 if ($req > $space) { 1665 if ($req > $space) {
1414 # ah well, not enough space 1666 # ah well, not enough space
1415 $_ *= $space / $req for @req; 1667 $_ *= $space / $req for @req;
1416 } else { 1668 } else {
1417 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1669 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1418 1670
1419 $space = ($space - $req) / $expand; # remaining space to give away 1671 $space = ($space - $req) / $expand; # remaining space to give away
1420 1672
1421 $req[$_] += $space * $children->[$_]{expand} 1673 $req[$_] += $space * $children[$_]{expand}
1422 for 0 .. $#$children; 1674 for 0 .. $#children;
1423 } 1675 }
1424 } 1676 }
1425 1677
1426 CFClient::UI::harmonize \@req; 1678 CFPlus::UI::harmonize \@req;
1427 1679
1428 my $pos = 0; 1680 my $pos = 0;
1429 for (0 .. $#$children) { 1681 for (0 .. $#children) {
1430 my $alloc = $req[$_]; 1682 my $alloc = $req[$_];
1431 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1683 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1432 1684
1433 $pos += $alloc; 1685 $pos += $alloc;
1434 } 1686 }
1435 1687
1436 1 1688 1
1437} 1689}
1438 1690
1439############################################################################# 1691#############################################################################
1440 1692
1441package CFClient::UI::HBox; 1693package CFPlus::UI::HBox;
1442 1694
1443our @ISA = CFClient::UI::Box::; 1695our @ISA = CFPlus::UI::Box::;
1444 1696
1445sub new { 1697sub new {
1446 my $class = shift; 1698 my $class = shift;
1447 1699
1448 $class->SUPER::new ( 1700 $class->SUPER::new (
… …
1451 ) 1703 )
1452} 1704}
1453 1705
1454############################################################################# 1706#############################################################################
1455 1707
1456package CFClient::UI::VBox; 1708package CFPlus::UI::VBox;
1457 1709
1458our @ISA = CFClient::UI::Box::; 1710our @ISA = CFPlus::UI::Box::;
1459 1711
1460sub new { 1712sub new {
1461 my $class = shift; 1713 my $class = shift;
1462 1714
1463 $class->SUPER::new ( 1715 $class->SUPER::new (
… …
1466 ) 1718 )
1467} 1719}
1468 1720
1469############################################################################# 1721#############################################################################
1470 1722
1471package CFClient::UI::Label; 1723package CFPlus::UI::Label;
1472 1724
1473our @ISA = CFClient::UI::DrawBG::; 1725our @ISA = CFPlus::UI::DrawBG::;
1474 1726
1475use CFClient::OpenGL; 1727use CFPlus::OpenGL;
1476 1728
1477sub new { 1729sub new {
1478 my ($class, %arg) = @_; 1730 my ($class, %arg) = @_;
1479 1731
1480 my $self = $class->SUPER::new ( 1732 my $self = $class->SUPER::new (
… …
1483 #active_bg => none 1735 #active_bg => none
1484 #font => default_font 1736 #font => default_font
1485 #text => initial text 1737 #text => initial text
1486 #markup => initial narkup 1738 #markup => initial narkup
1487 #max_w => maximum pixel width 1739 #max_w => maximum pixel width
1740 #style => 0, # render flags
1488 ellipsise => 3, # end 1741 ellipsise => 3, # end
1489 layout => (new CFClient::Layout), 1742 layout => (new CFPlus::Layout),
1490 fontsize => 1, 1743 fontsize => 1,
1491 align => -1, 1744 align => -1,
1492 valign => -1, 1745 valign => -1,
1493 padding_x => 2, 1746 padding_x => 2,
1494 padding_y => 2, 1747 padding_y => 2,
1495 can_events => 0, 1748 can_events => 0,
1496 %arg 1749 %arg
1497 ); 1750 );
1498 1751
1499 if (exists $self->{template}) { 1752 if (exists $self->{template}) {
1500 my $layout = new CFClient::Layout; 1753 my $layout = new CFPlus::Layout;
1501 $layout->set_text (delete $self->{template}); 1754 $layout->set_text (delete $self->{template});
1502 $self->{template} = $layout; 1755 $self->{template} = $layout;
1503 } 1756 }
1504 1757
1505 if (exists $self->{markup}) { 1758 if (exists $self->{markup}) {
… …
1509 } 1762 }
1510 1763
1511 $self 1764 $self
1512} 1765}
1513 1766
1514sub escape($) {
1515 local $_ = $_[0];
1516
1517 s/&/&amp;/g;
1518 s/>/&gt;/g;
1519 s/</&lt;/g;
1520
1521 $_
1522}
1523
1524sub update { 1767sub update {
1525 my ($self) = @_; 1768 my ($self) = @_;
1526 1769
1527 delete $self->{texture}; 1770 delete $self->{texture};
1528 $self->SUPER::update; 1771 $self->SUPER::update;
1529} 1772}
1530 1773
1774sub realloc {
1775 my ($self) = @_;
1776
1777 delete $self->{ox};
1778 $self->SUPER::realloc;
1779}
1780
1531sub set_text { 1781sub set_text {
1532 my ($self, $text) = @_; 1782 my ($self, $text) = @_;
1533 1783
1534 return if $self->{text} eq "T$text"; 1784 return if $self->{text} eq "T$text";
1535 $self->{text} = "T$text"; 1785 $self->{text} = "T$text";
1536 1786
1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1538 $self->{layout}->set_text ($text); 1787 $self->{layout}->set_text ($text);
1539 1788
1789 delete $self->{size_req};
1540 $self->realloc; 1790 $self->realloc;
1541 $self->update; 1791 $self->update;
1542} 1792}
1543 1793
1544sub set_markup { 1794sub set_markup {
… …
1547 return if $self->{text} eq "M$markup"; 1797 return if $self->{text} eq "M$markup";
1548 $self->{text} = "M$markup"; 1798 $self->{text} = "M$markup";
1549 1799
1550 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1800 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1551 1801
1552 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1553 $self->{layout}->set_markup ($markup); 1802 $self->{layout}->set_markup ($markup);
1554 1803
1804 delete $self->{size_req};
1555 $self->realloc; 1805 $self->realloc;
1556 $self->update; 1806 $self->update;
1557} 1807}
1558 1808
1559sub size_request { 1809sub size_request {
1560 my ($self) = @_; 1810 my ($self) = @_;
1561 1811
1812 $self->{size_req} ||= do {
1562 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1813 $self->{layout}->set_font ($self->{font}) if $self->{font};
1563 $self->{layout}->set_width ($self->{max_w} || -1); 1814 $self->{layout}->set_width ($self->{max_w} || -1);
1564 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1815 $self->{layout}->set_ellipsise ($self->{ellipsise});
1565 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1816 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1566 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1817 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1567 1818
1568 my ($w, $h) = $self->{layout}->size; 1819 my ($w, $h) = $self->{layout}->size;
1569 1820
1570 if (exists $self->{template}) { 1821 if (exists $self->{template}) {
1571 $self->{template}->set_font ($self->{font}) if $self->{font}; 1822 $self->{template}->set_font ($self->{font}) if $self->{font};
1823 $self->{template}->set_width ($self->{max_w} || -1);
1572 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1824 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 1825
1574 my ($w2, $h2) = $self->{template}->size; 1826 my ($w2, $h2) = $self->{template}->size;
1575 1827
1576 $w = List::Util::max $w, $w2; 1828 $w = List::Util::max $w, $w2;
1577 $h = List::Util::max $h, $h2; 1829 $h = List::Util::max $h, $h2;
1830 }
1831
1832 [$w, $h]
1578 } 1833 };
1579 1834
1580 ($w, $h) 1835 @{ $self->{size_req} }
1581} 1836}
1582 1837
1838sub baseline_shift {
1839 $_[0]{layout}->descent
1840}
1841
1583sub size_allocate { 1842sub invoke_size_allocate {
1584 my ($self, $w, $h) = @_; 1843 my ($self, $w, $h) = @_;
1585 1844
1586 delete $self->{ox}; 1845 delete $self->{ox};
1587 1846
1588 delete $self->{texture} 1847 delete $self->{texture}
1589 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1848 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1849
1850 1
1590} 1851}
1591 1852
1592sub set_fontsize { 1853sub set_fontsize {
1593 my ($self, $fontsize) = @_; 1854 my ($self, $fontsize) = @_;
1594 1855
1595 $self->{fontsize} = $fontsize; 1856 $self->{fontsize} = $fontsize;
1857 delete $self->{size_req};
1596 delete $self->{texture}; 1858 delete $self->{texture};
1597 1859
1598 $self->realloc; 1860 $self->realloc;
1599} 1861}
1600 1862
1863sub reconfigure {
1864 my ($self) = @_;
1865
1866 delete $self->{size_req};
1867 delete $self->{texture};
1868
1869 $self->SUPER::reconfigure;
1870}
1871
1601sub _draw { 1872sub _draw {
1602 my ($self) = @_; 1873 my ($self) = @_;
1603 1874
1604 $self->SUPER::_draw; # draw background, if applicable 1875 $self->SUPER::_draw; # draw background, if applicable
1605 1876
1606 my $tex = $self->{texture} ||= do { 1877 my $size = $self->{texture} ||= do {
1607 $self->{layout}->set_foreground (@{$self->{fg}}); 1878 $self->{layout}->set_foreground (@{$self->{fg}});
1608 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1879 $self->{layout}->set_font ($self->{font}) if $self->{font};
1609 $self->{layout}->set_width ($self->{w}); 1880 $self->{layout}->set_width ($self->{w});
1610 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1881 $self->{layout}->set_ellipsise ($self->{ellipsise});
1611 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1882 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1612 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1883 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1613 1884
1614 new_from_layout CFClient::Texture $self->{layout} 1885 [$self->{layout}->size]
1615 }; 1886 };
1616 1887
1617 unless (exists $self->{ox}) { 1888 unless (exists $self->{ox}) {
1618 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1889 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1619 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1890 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1620 : ($self->{w} - $tex->{w}) * 0.5); 1891 : ($self->{w} - $size->[0]) * 0.5);
1621 1892
1622 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1893 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1894 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1624 : ($self->{h} - $tex->{h}) * 0.5); 1895 : ($self->{h} - $size->[1]) * 0.5);
1625 }; 1896 };
1626 1897
1627 glEnable GL_TEXTURE_2D; 1898 my $w = List::Util::min $self->{w} + 4, $size->[0];
1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1899 my $h = List::Util::min $self->{h} + 2, $size->[1];
1629 1900
1630 if ($tex->{format} == GL_ALPHA) { 1901 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1631 glColor @{$self->{fg}};
1632 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1633 } else {
1634 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1635 }
1636
1637 glDisable GL_TEXTURE_2D;
1638} 1902}
1639 1903
1640############################################################################# 1904#############################################################################
1641 1905
1642package CFClient::UI::EntryBase; 1906package CFPlus::UI::EntryBase;
1643 1907
1644our @ISA = CFClient::UI::Label::; 1908our @ISA = CFPlus::UI::Label::;
1645 1909
1646use CFClient::OpenGL; 1910use CFPlus::OpenGL;
1647 1911
1648sub new { 1912sub new {
1649 my $class = shift; 1913 my $class = shift;
1650 1914
1651 $class->SUPER::new ( 1915 $class->SUPER::new (
… …
1655 active_fg => [0, 0, 0], 1919 active_fg => [0, 0, 0],
1656 can_hover => 1, 1920 can_hover => 1,
1657 can_focus => 1, 1921 can_focus => 1,
1658 valign => 0, 1922 valign => 0,
1659 can_events => 1, 1923 can_events => 1,
1924 ellipsise => 0,
1660 #text => ... 1925 #text => ...
1926 #hidden => "*",
1661 @_ 1927 @_
1662 ) 1928 )
1663} 1929}
1664 1930
1665sub _set_text { 1931sub _set_text {
… …
1667 1933
1668 delete $self->{cur_h}; 1934 delete $self->{cur_h};
1669 1935
1670 return if $self->{text} eq $text; 1936 return if $self->{text} eq $text;
1671 1937
1672 delete $self->{texture};
1673
1674 $self->{last_activity} = $::NOW; 1938 $self->{last_activity} = $::NOW;
1675 $self->{text} = $text; 1939 $self->{text} = $text;
1676 1940
1677 $text =~ s/./*/g if $self->{hidden}; 1941 $text =~ s/./*/g if $self->{hidden};
1678 $self->{layout}->set_text ("$text "); 1942 $self->{layout}->set_text ("$text ");
1943 delete $self->{size_req};
1679 1944
1680 $self->_emit (changed => $self->{text}); 1945 $self->emit (changed => $self->{text});
1946
1947 $self->realloc;
1948 $self->update;
1681} 1949}
1682 1950
1683sub set_text { 1951sub set_text {
1684 my ($self, $text) = @_; 1952 my ($self, $text) = @_;
1685 1953
1686 $self->{cursor} = length $text; 1954 $self->{cursor} = length $text;
1687 $self->_set_text ($text); 1955 $self->_set_text ($text);
1688
1689 $self->realloc;
1690} 1956}
1691 1957
1692sub get_text { 1958sub get_text {
1693 $_[0]{text} 1959 $_[0]{text}
1694} 1960}
… …
1699 my ($w, $h) = $self->SUPER::size_request; 1965 my ($w, $h) = $self->SUPER::size_request;
1700 1966
1701 ($w + 1, $h) # add 1 for cursor 1967 ($w + 1, $h) # add 1 for cursor
1702} 1968}
1703 1969
1704sub key_down { 1970sub invoke_key_down {
1705 my ($self, $ev) = @_; 1971 my ($self, $ev) = @_;
1706 1972
1707 my $mod = $ev->{mod}; 1973 my $mod = $ev->{mod};
1708 my $sym = $ev->{sym}; 1974 my $sym = $ev->{sym};
1709 my $uni = $ev->{unicode}; 1975 my $uni = $ev->{unicode};
1710 1976
1711 my $text = $self->get_text; 1977 my $text = $self->get_text;
1978
1979 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1712 1980
1713 if ($uni == 8) { 1981 if ($uni == 8) {
1714 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1982 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1715 } elsif ($uni == 127) { 1983 } elsif ($uni == 127) {
1716 substr $text, $self->{cursor}, 1, ""; 1984 substr $text, $self->{cursor}, 1, "";
1717 } elsif ($sym == CFClient::SDLK_LEFT) { 1985 } elsif ($sym == CFPlus::SDLK_LEFT) {
1718 --$self->{cursor} if $self->{cursor}; 1986 --$self->{cursor} if $self->{cursor};
1719 } elsif ($sym == CFClient::SDLK_RIGHT) { 1987 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1720 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1988 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1721 } elsif ($sym == CFClient::SDLK_HOME) { 1989 } elsif ($sym == CFPlus::SDLK_HOME) {
1990 # what a hack
1991 $self->{cursor} =
1992 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1993 ? length $1
1994 : 0;
1995 } elsif ($sym == CFPlus::SDLK_END) {
1996 # uh, again
1997 $self->{cursor} =
1998 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1999 ? $self->{cursor} + length $1
2000 : length $self->{text};
2001 } elsif ($uni == 21) { # ctrl-u
2002 $text = "";
1722 $self->{cursor} = 0; 2003 $self->{cursor} = 0;
1723 } elsif ($sym == CFClient::SDLK_END) {
1724 $self->{cursor} = length $text;
1725 } elsif ($uni == 27) { 2004 } elsif ($uni == 27) {
1726 $self->_emit ('escape'); 2005 $self->emit ('escape');
1727 } elsif ($uni) { 2006 } elsif ($uni == 0x0d) {
2007 substr $text, $self->{cursor}++, 0, "\012";
2008 } elsif ($uni >= 0x20) {
1728 substr $text, $self->{cursor}++, 0, chr $uni; 2009 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else { 2010 } else {
1730 return 0; 2011 return 0;
1731 } 2012 }
1732 2013
1733 $self->_set_text ($text); 2014 $self->_set_text ($text);
1734 2015
1735 $self->realloc; 2016 $self->realloc;
2017 $self->update;
1736 2018
1737 1 2019 1
1738} 2020}
1739 2021
1740sub focus_in { 2022sub invoke_focus_in {
1741 my ($self) = @_; 2023 my ($self) = @_;
1742 2024
1743 $self->{last_activity} = $::NOW; 2025 $self->{last_activity} = $::NOW;
1744 2026
1745 $self->SUPER::focus_in; 2027 $self->SUPER::invoke_focus_in
1746} 2028}
1747 2029
1748sub button_down { 2030sub invoke_button_down {
1749 my ($self, $ev, $x, $y) = @_; 2031 my ($self, $ev, $x, $y) = @_;
1750 2032
1751 $self->SUPER::button_down ($ev, $x, $y); 2033 $self->SUPER::invoke_button_down ($ev, $x, $y);
1752 2034
1753 my $idx = $self->{layout}->xy_to_index ($x, $y); 2035 my $idx = $self->{layout}->xy_to_index ($x, $y);
1754 2036
1755 # byte-index to char-index 2037 # byte-index to char-index
1756 my $text = $self->{text}; 2038 my $text = $self->{text};
1757 utf8::encode $text; 2039 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1758 $self->{cursor} = length substr $text, 0, $idx; 2040 $self->{cursor} = length $text;
1759 2041
1760 $self->_set_text ($self->{text}); 2042 $self->_set_text ($self->{text});
1761 $self->update; 2043 $self->update;
1762 2044
1763 1 2045 1
1764} 2046}
1765 2047
1766sub mouse_motion { 2048sub invoke_mouse_motion {
1767 my ($self, $ev, $x, $y) = @_; 2049 my ($self, $ev, $x, $y) = @_;
1768# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2050# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1769 2051
1770 0 2052 1
1771} 2053}
1772 2054
1773sub _draw { 2055sub _draw {
1774 my ($self) = @_; 2056 my ($self) = @_;
1775 2057
1776 local $self->{fg} = $self->{fg}; 2058 local $self->{fg} = $self->{fg};
1777 2059
1778 if ($FOCUS == $self) { 2060 if ($FOCUS == $self) {
1779 glColor @{$self->{active_bg}}; 2061 glColor_premultiply @{$self->{active_bg}};
1780 $self->{fg} = $self->{active_fg}; 2062 $self->{fg} = $self->{active_fg};
1781 } else { 2063 } else {
1782 glColor @{$self->{bg}}; 2064 glColor_premultiply @{$self->{bg}};
1783 } 2065 }
1784 2066
1785 glEnable GL_BLEND; 2067 glEnable GL_BLEND;
1786 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2068 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1787 glBegin GL_QUADS; 2069 glBegin GL_QUADS;
1788 glVertex 0 , 0; 2070 glVertex 0 , 0;
1789 glVertex 0 , $self->{h}; 2071 glVertex 0 , $self->{h};
1790 glVertex $self->{w}, $self->{h}; 2072 glVertex $self->{w}, $self->{h};
1791 glVertex $self->{w}, 0; 2073 glVertex $self->{w}, 0;
… …
1802 utf8::encode $text; 2084 utf8::encode $text;
1803 2085
1804 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2086 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1805 } 2087 }
1806 2088
1807 glColor @{$self->{fg}};
1808 glBegin GL_LINES; 2089 glBegin GL_LINES;
1809 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2090 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1810 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2091 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1811 glEnd; 2092 glEnd;
1812 } 2093 }
1813} 2094}
1814 2095
2096#############################################################################
2097
1815package CFClient::UI::Entry; 2098package CFPlus::UI::Entry;
1816 2099
1817our @ISA = CFClient::UI::EntryBase::; 2100our @ISA = CFPlus::UI::EntryBase::;
1818 2101
1819use CFClient::OpenGL; 2102use CFPlus::OpenGL;
1820 2103
1821sub key_down { 2104sub invoke_key_down {
1822 my ($self, $ev) = @_; 2105 my ($self, $ev) = @_;
1823 2106
1824 my $sym = $ev->{sym}; 2107 my $sym = $ev->{sym};
1825 2108
1826 if ($sym == 13) { 2109 if ($ev->{uni} == 0x0d || $sym == 13) {
1827 unshift @{$self->{history}}, 2110 unshift @{$self->{history}},
1828 my $txt = $self->get_text; 2111 my $txt = $self->get_text;
2112
1829 $self->{history_pointer} = -1; 2113 $self->{history_pointer} = -1;
1830 $self->{history_saveback} = ''; 2114 $self->{history_saveback} = '';
1831 $self->_emit (activate => $txt); 2115 $self->emit (activate => $txt);
1832 $self->update; 2116 $self->update;
1833 2117
1834 } elsif ($sym == CFClient::SDLK_UP) { 2118 } elsif ($sym == CFPlus::SDLK_UP) {
1835 if ($self->{history_pointer} < 0) { 2119 if ($self->{history_pointer} < 0) {
1836 $self->{history_saveback} = $self->get_text; 2120 $self->{history_saveback} = $self->get_text;
1837 } 2121 }
1838 if (@{$self->{history} || []} > 0) { 2122 if (@{$self->{history} || []} > 0) {
1839 $self->{history_pointer}++; 2123 $self->{history_pointer}++;
… …
1841 $self->{history_pointer} = @{$self->{history} || []} - 1; 2125 $self->{history_pointer} = @{$self->{history} || []} - 1;
1842 } 2126 }
1843 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2127 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1844 } 2128 }
1845 2129
1846 } elsif ($sym == CFClient::SDLK_DOWN) { 2130 } elsif ($sym == CFPlus::SDLK_DOWN) {
1847 $self->{history_pointer}--; 2131 $self->{history_pointer}--;
1848 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2132 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1849 2133
1850 if ($self->{history_pointer} >= 0) { 2134 if ($self->{history_pointer} >= 0) {
1851 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2135 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1852 } else { 2136 } else {
1853 $self->set_text ($self->{history_saveback}); 2137 $self->set_text ($self->{history_saveback});
1854 } 2138 }
1855 2139
1856 } else { 2140 } else {
1857 return $self->SUPER::key_down ($ev) 2141 return $self->SUPER::invoke_key_down ($ev)
1858 } 2142 }
1859 2143
1860 1 2144 1
1861} 2145}
1862 2146
1863############################################################################# 2147#############################################################################
1864 2148
2149package CFPlus::UI::TextEdit;
2150
2151our @ISA = CFPlus::UI::EntryBase::;
2152
2153use CFPlus::OpenGL;
2154
2155sub move_cursor_ver {
2156 my ($self, $dy) = @_;
2157
2158 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2159
2160 $y += $dy;
2161
2162 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2163 $self->{cursor} = $index;
2164 delete $self->{cur_h};
2165 $self->update;
2166 return;
2167 }
2168}
2169
2170sub invoke_key_down {
2171 my ($self, $ev) = @_;
2172
2173 my $sym = $ev->{sym};
2174
2175 if ($sym == CFPlus::SDLK_UP) {
2176 $self->move_cursor_ver (-1);
2177 } elsif ($sym == CFPlus::SDLK_DOWN) {
2178 $self->move_cursor_ver (+1);
2179 } else {
2180 return $self->SUPER::invoke_key_down ($ev)
2181 }
2182
2183 1
2184}
2185
2186#############################################################################
2187
1865package CFClient::UI::Button; 2188package CFPlus::UI::Button;
1866 2189
1867our @ISA = CFClient::UI::Label::; 2190our @ISA = CFPlus::UI::Label::;
1868 2191
1869use CFClient::OpenGL; 2192use CFPlus::OpenGL;
1870 2193
1871my @tex = 2194my @tex =
1872 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2195 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1873 qw(b1_button_active.png); 2196 qw(b1_button_active.png);
1874 2197
1875sub new { 2198sub new {
1876 my $class = shift; 2199 my $class = shift;
1877 2200
… …
1886 can_events => 1, 2209 can_events => 1,
1887 @_ 2210 @_
1888 ) 2211 )
1889} 2212}
1890 2213
1891sub activate { }
1892
1893sub button_up { 2214sub invoke_button_up {
1894 my ($self, $ev, $x, $y) = @_; 2215 my ($self, $ev, $x, $y) = @_;
1895 2216
1896 $self->emit ("activate") 2217 $self->emit ("activate")
1897 if $x >= 0 && $x < $self->{w} 2218 if $x >= 0 && $x < $self->{w}
1898 && $y >= 0 && $y < $self->{h}; 2219 && $y >= 0 && $y < $self->{h};
… …
1901} 2222}
1902 2223
1903sub _draw { 2224sub _draw {
1904 my ($self) = @_; 2225 my ($self) = @_;
1905 2226
1906 local $self->{fg} = $self->{fg}; 2227 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1907
1908 if ($GRAB == $self) {
1909 $self->{fg} = $self->{active_fg};
1910 }
1911 2228
1912 glEnable GL_TEXTURE_2D; 2229 glEnable GL_TEXTURE_2D;
1913 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2230 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1914 glColor 0, 0, 0, 1; 2231 glColor 0, 0, 0, 1;
1915 2232
… …
1920 $self->SUPER::_draw; 2237 $self->SUPER::_draw;
1921} 2238}
1922 2239
1923############################################################################# 2240#############################################################################
1924 2241
1925package CFClient::UI::CheckBox; 2242package CFPlus::UI::CheckBox;
1926 2243
1927our @ISA = CFClient::UI::DrawBG::; 2244our @ISA = CFPlus::UI::DrawBG::;
1928 2245
1929my @tex = 2246my @tex =
1930 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2247 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1931 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2248 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1932 2249
1933use CFClient::OpenGL; 2250use CFPlus::OpenGL;
1934 2251
1935sub new { 2252sub new {
1936 my $class = shift; 2253 my $class = shift;
1937 2254
1938 $class->SUPER::new ( 2255 $class->SUPER::new (
… …
1952 my ($self) = @_; 2269 my ($self) = @_;
1953 2270
1954 (6) x 2 2271 (6) x 2
1955} 2272}
1956 2273
2274sub toggle {
2275 my ($self) = @_;
2276
2277 $self->{state} = !$self->{state};
2278 $self->emit (changed => $self->{state});
2279 $self->update;
2280}
2281
1957sub button_down { 2282sub invoke_button_down {
1958 my ($self, $ev, $x, $y) = @_; 2283 my ($self, $ev, $x, $y) = @_;
1959 2284
1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2285 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2286 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1962 $self->{state} = !$self->{state}; 2287 $self->toggle;
1963 $self->_emit (changed => $self->{state});
1964 } else { 2288 } else {
1965 return 0 2289 return 0
1966 } 2290 }
1967 2291
1968 1 2292 1
… …
1988 glDisable GL_TEXTURE_2D; 2312 glDisable GL_TEXTURE_2D;
1989} 2313}
1990 2314
1991############################################################################# 2315#############################################################################
1992 2316
1993package CFClient::UI::Image; 2317package CFPlus::UI::Image;
1994 2318
1995our @ISA = CFClient::UI::Base::; 2319our @ISA = CFPlus::UI::Base::;
1996 2320
1997use CFClient::OpenGL; 2321use CFPlus::OpenGL;
1998use Carp qw/confess/;
1999 2322
2000our %loaded_images; 2323our %texture_cache;
2001 2324
2002sub new { 2325sub new {
2003 my $class = shift; 2326 my $class = shift;
2004 2327
2005 my $self = $class->SUPER::new (can_events => 0, @_); 2328 my $self = $class->SUPER::new (
2329 can_events => 0,
2330 @_,
2331 );
2006 2332
2007 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2333 $self->{path} || $self->{tex}
2334 or Carp::croak "'path' or 'tex' attributes required";
2008 2335
2009 $loaded_images{$self->{image}} ||= 2336 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2010 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2337 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2011 2338
2012 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2339 CFPlus::weaken $texture_cache{$self->{path}};
2013 2340
2014 Scalar::Util::weaken $loaded_images{$self->{image}}; 2341 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2015
2016 $self->{aspect} = $tex->{w} / $tex->{h};
2017 2342
2018 $self 2343 $self
2019} 2344}
2020 2345
2346sub STORABLE_freeze {
2347 my ($self, $cloning) = @_;
2348
2349 $self->{path}
2350 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2351
2352 $self->{path}
2353}
2354
2355sub STORABLE_attach {
2356 my ($self, $cloning, $path) = @_;
2357
2358 $self->new (path => $path)
2359}
2360
2021sub size_request { 2361sub size_request {
2022 my ($self) = @_; 2362 my ($self) = @_;
2023 2363
2024 ($self->{tex}->{w}, $self->{tex}->{h}) 2364 ($self->{tex}{w}, $self->{tex}{h})
2025} 2365}
2026 2366
2027sub _draw { 2367sub _draw {
2028 my ($self) = @_; 2368 my ($self) = @_;
2029 2369
… …
2039 } 2379 }
2040 2380
2041 glEnable GL_TEXTURE_2D; 2381 glEnable GL_TEXTURE_2D;
2042 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2382 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2043 2383
2044 $tex->draw_quad_alpha (0, 0, $w, $h); 2384 $tex->draw_quad (0, 0, $w, $h);
2045 2385
2046 glDisable GL_TEXTURE_2D; 2386 glDisable GL_TEXTURE_2D;
2047} 2387}
2048 2388
2049############################################################################# 2389#############################################################################
2050 2390
2391package CFPlus::UI::ImageButton;
2392
2393our @ISA = CFPlus::UI::Image::;
2394
2395use CFPlus::OpenGL;
2396
2397my %textures;
2398
2399sub new {
2400 my $class = shift;
2401
2402 my $self = $class->SUPER::new (
2403 padding_x => 4,
2404 padding_y => 4,
2405 fg => [1, 1, 1],
2406 active_fg => [0, 0, 1],
2407 can_hover => 1,
2408 align => 0,
2409 valign => 0,
2410 can_events => 1,
2411 @_
2412 );
2413}
2414
2415sub invoke_button_up {
2416 my ($self, $ev, $x, $y) = @_;
2417
2418 $self->emit ("activate")
2419 if $x >= 0 && $x < $self->{w}
2420 && $y >= 0 && $y < $self->{h};
2421
2422 1
2423}
2424
2425#############################################################################
2426
2051package CFClient::UI::VGauge; 2427package CFPlus::UI::VGauge;
2052 2428
2053our @ISA = CFClient::UI::Base::; 2429our @ISA = CFPlus::UI::Base::;
2054 2430
2055use List::Util qw(min max); 2431use List::Util qw(min max);
2056 2432
2057use CFClient::OpenGL; 2433use CFPlus::OpenGL;
2058 2434
2059my %tex = ( 2435my %tex = (
2060 food => [ 2436 food => [
2061 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2437 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2062 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2438 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2063 ], 2439 ],
2064 grace => [ 2440 grace => [
2065 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2441 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2066 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2442 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2067 ], 2443 ],
2068 hp => [ 2444 hp => [
2069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2445 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2070 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2446 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2071 ], 2447 ],
2072 mana => [ 2448 mana => [
2073 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2449 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2074 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2450 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2075 ], 2451 ],
2076); 2452);
2077 2453
2078# eg. VGauge->new (gauge => 'food'), default gauge: food 2454# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2138 my $ycut1 = max 0, min 1, $ycut; 2514 my $ycut1 = max 0, min 1, $ycut;
2139 my $ycut2 = max 0, min 1, $ycut - 1; 2515 my $ycut2 = max 0, min 1, $ycut - 1;
2140 2516
2141 my $h1 = $self->{h} * (1 - $ycut1); 2517 my $h1 = $self->{h} * (1 - $ycut1);
2142 my $h2 = $self->{h} * (1 - $ycut2); 2518 my $h2 = $self->{h} * (1 - $ycut2);
2519 my $h3 = $self->{h};
2520
2521 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2143 2522
2144 glEnable GL_BLEND; 2523 glEnable GL_BLEND;
2145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2524 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2525 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2146 glEnable GL_TEXTURE_2D; 2526 glEnable GL_TEXTURE_2D;
2147 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2148 2528
2149 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2529 glBindTexture GL_TEXTURE_2D, $t1->{name};
2150 glBegin GL_QUADS; 2530 glBegin GL_QUADS;
… …
2165 2545
2166 if ($t3) { 2546 if ($t3) {
2167 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2547 glBindTexture GL_TEXTURE_2D, $t3->{name};
2168 glBegin GL_QUADS; 2548 glBegin GL_QUADS;
2169 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2549 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2170 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2550 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2171 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2551 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2172 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2552 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2173 glEnd; 2553 glEnd;
2174 } 2554 }
2175 2555
2176 glDisable GL_BLEND; 2556 glDisable GL_BLEND;
2177 glDisable GL_TEXTURE_2D; 2557 glDisable GL_TEXTURE_2D;
2178} 2558}
2179 2559
2180############################################################################# 2560#############################################################################
2181 2561
2182package CFClient::UI::Gauge; 2562package CFPlus::UI::Gauge;
2183 2563
2184our @ISA = CFClient::UI::VBox::; 2564our @ISA = CFPlus::UI::VBox::;
2185 2565
2186sub new { 2566sub new {
2187 my ($class, %arg) = @_; 2567 my ($class, %arg) = @_;
2188 2568
2189 my $self = $class->SUPER::new ( 2569 my $self = $class->SUPER::new (
… …
2191 can_hover => 1, 2571 can_hover => 1,
2192 can_events => 1, 2572 can_events => 1,
2193 %arg, 2573 %arg,
2194 ); 2574 );
2195 2575
2196 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2576 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2197 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2577 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2198 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2578 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2199 2579
2200 $self 2580 $self
2201} 2581}
2202 2582
2203sub set_fontsize { 2583sub set_fontsize {
… …
2224 $self->{value}->set_text ($val); 2604 $self->{value}->set_text ($val);
2225} 2605}
2226 2606
2227############################################################################# 2607#############################################################################
2228 2608
2229package CFClient::UI::Slider; 2609package CFPlus::UI::Slider;
2230 2610
2231use strict; 2611use strict;
2232 2612
2233use CFClient::OpenGL; 2613use CFPlus::OpenGL;
2234 2614
2235our @ISA = CFClient::UI::DrawBG::; 2615our @ISA = CFPlus::UI::DrawBG::;
2236 2616
2237my @tex = 2617my @tex =
2238 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2618 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2239 qw(s1_slider.png s1_slider_bg.png); 2619 qw(s1_slider.png s1_slider_bg.png);
2240 2620
2241sub new { 2621sub new {
2242 my $class = shift; 2622 my $class = shift;
2243 2623
… …
2264 $self->update; 2644 $self->update;
2265 2645
2266 $self 2646 $self
2267} 2647}
2268 2648
2269sub changed { }
2270
2271sub set_range { 2649sub set_range {
2272 my ($self, $range) = @_; 2650 my ($self, $range) = @_;
2273 2651
2274 ($range, $self->{range}) = ($self->{range}, $range); 2652 ($range, $self->{range}) = ($self->{range}, $range);
2275 2653
2276 $self->update
2277 if "@$range" ne "@{$self->{range}}"; 2654 if ("@$range" ne "@{$self->{range}}") {
2655 $self->update;
2656 $self->set_value ($self->{range}[0]);
2657 }
2278} 2658}
2279 2659
2280sub set_value { 2660sub set_value {
2281 my ($self, $value) = @_; 2661 my ($self, $value) = @_;
2282 2662
… …
2293 if $unit; 2673 if $unit;
2294 2674
2295 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2675 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2296 2676
2297 if ($value != $old_value) { 2677 if ($value != $old_value) {
2298 $self->_emit (changed => $value); 2678 $self->emit (changed => $value);
2299 $self->update; 2679 $self->update;
2300 } 2680 }
2301} 2681}
2302 2682
2303sub size_request { 2683sub size_request {
2304 my ($self) = @_; 2684 my ($self) = @_;
2305 2685
2306 ($self->{req_w}, $self->{req_h}) 2686 ($self->{req_w}, $self->{req_h})
2307} 2687}
2308 2688
2309sub button_down { 2689sub invoke_button_down {
2310 my ($self, $ev, $x, $y) = @_; 2690 my ($self, $ev, $x, $y) = @_;
2311 2691
2312 $self->SUPER::button_down ($ev, $x, $y); 2692 $self->SUPER::invoke_button_down ($ev, $x, $y);
2313 2693
2314 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2694 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2315 2695
2316 $self->mouse_motion ($ev, $x, $y) 2696 $self->invoke_mouse_motion ($ev, $x, $y)
2317} 2697}
2318 2698
2319sub mouse_motion { 2699sub invoke_mouse_motion {
2320 my ($self, $ev, $x, $y) = @_; 2700 my ($self, $ev, $x, $y) = @_;
2321 2701
2322 if ($GRAB == $self) { 2702 if ($GRAB == $self) {
2323 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2703 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2324 2704
… …
2332 } 2712 }
2333 2713
2334 1 2714 1
2335} 2715}
2336 2716
2717sub invoke_mouse_wheel {
2718 my ($self, $ev) = @_;
2719
2720 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2721
2722 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2723
2724 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2725
2726 ! ! $delta
2727}
2728
2337sub update { 2729sub update {
2338 my ($self) = @_; 2730 my ($self) = @_;
2339 2731
2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2732 delete $self->{knob_w};
2733 $self->SUPER::update;
2734}
2735
2736sub _draw {
2737 my ($self) = @_;
2738
2739 unless ($self->{knob_w}) {
2341 $self->set_value ($self->{range}[0]); 2740 $self->set_value ($self->{range}[0]);
2342 2741
2343 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2742 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100; 2743 my $range = ($hi - $page - $lo) || 1e-100;
2345 2744
… …
2351 $value = ($value - $lo) / $range; 2750 $value = ($value - $lo) / $range;
2352 $value = $value * $self->{scale} + $self->{offset}; 2751 $value = $value * $self->{scale} + $self->{offset};
2353 2752
2354 $self->{knob_x} = $value - $knob_w * 0.5; 2753 $self->{knob_x} = $value - $knob_w * 0.5;
2355 $self->{knob_w} = $knob_w; 2754 $self->{knob_w} = $knob_w;
2356 }); 2755 }
2357
2358 $self->SUPER::update;
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363 2756
2364 $self->SUPER::_draw (); 2757 $self->SUPER::_draw ();
2365 2758
2366 glScale $self->{w}, $self->{h}; 2759 glScale $self->{w}, $self->{h};
2367 2760
… …
2387 glDisable GL_TEXTURE_2D; 2780 glDisable GL_TEXTURE_2D;
2388} 2781}
2389 2782
2390############################################################################# 2783#############################################################################
2391 2784
2392package CFClient::UI::ValSlider; 2785package CFPlus::UI::ValSlider;
2393 2786
2394our @ISA = CFClient::UI::HBox::; 2787our @ISA = CFPlus::UI::HBox::;
2395 2788
2396sub new { 2789sub new {
2397 my ($class, %arg) = @_; 2790 my ($class, %arg) = @_;
2398 2791
2399 my $range = delete $arg{range}; 2792 my $range = delete $arg{range};
2400 2793
2401 my $self = $class->SUPER::new ( 2794 my $self = $class->SUPER::new (
2402 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2795 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2403 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2796 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2404 to_value => sub { shift }, 2797 to_value => sub { shift },
2405 from_value => sub { shift }, 2798 from_value => sub { shift },
2406 %arg, 2799 %arg,
2407 ); 2800 );
2408 2801
… …
2428sub set_range { shift->{slider}->set_range (@_) } 2821sub set_range { shift->{slider}->set_range (@_) }
2429sub set_value { shift->{slider}->set_value (@_) } 2822sub set_value { shift->{slider}->set_value (@_) }
2430 2823
2431############################################################################# 2824#############################################################################
2432 2825
2433package CFClient::UI::TextView; 2826package CFPlus::UI::TextScroller;
2434 2827
2435our @ISA = CFClient::UI::HBox::; 2828our @ISA = CFPlus::UI::HBox::;
2436 2829
2437use CFClient::OpenGL; 2830use CFPlus::OpenGL;
2438 2831
2439sub new { 2832sub new {
2440 my $class = shift; 2833 my $class = shift;
2441 2834
2442 my $self = $class->SUPER::new ( 2835 my $self = $class->SUPER::new (
2443 fontsize => 1, 2836 fontsize => 1,
2444 can_events => 0, 2837 can_events => 1,
2838 indent => 0,
2445 #font => default_font 2839 #font => default_font
2446 @_, 2840 @_,
2447 2841
2448 layout => (new CFClient::Layout 1), 2842 layout => (new CFPlus::Layout),
2449 par => [], 2843 par => [],
2844 max_par => 0,
2450 height => 0, 2845 height => 0,
2451 children => [ 2846 children => [
2452 (new CFClient::UI::Empty expand => 1), 2847 (new CFPlus::UI::Empty expand => 1),
2453 (new CFClient::UI::Slider vertical => 1), 2848 (new CFPlus::UI::Slider vertical => 1),
2454 ], 2849 ],
2455 ); 2850 );
2456 2851
2457 $self->{children}[1]->connect (changed => sub { $self->update }); 2852 $self->{children}[1]->connect (changed => sub { $self->update });
2458 2853
… …
2464 2859
2465 $self->{fontsize} = $fontsize; 2860 $self->{fontsize} = $fontsize;
2466 $self->reflow; 2861 $self->reflow;
2467} 2862}
2468 2863
2864sub size_request {
2865 my ($self) = @_;
2866
2867 my ($empty, $slider) = @{ $self->{children} };
2868
2869 local $self->{children} = [$empty, $slider];
2870 $self->SUPER::size_request
2871}
2872
2469sub size_allocate { 2873sub invoke_size_allocate {
2470 my ($self, $w, $h) = @_; 2874 my ($self, $w, $h) = @_;
2471 2875
2472 $self->SUPER::size_allocate ($w, $h); 2876 my ($empty, $slider, @other) = @{ $self->{children} };
2877 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2473 2878
2474 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2879 $self->{layout}->set_font ($self->{font}) if $self->{font};
2475 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2880 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2476 $self->{layout}->set_width ($self->{children}[0]{w}); 2881 $self->{layout}->set_width ($empty->{w});
2882 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2477 2883
2478 $self->reflow; 2884 $self->reflow;
2479}
2480 2885
2481sub text_size { 2886 local $self->{children} = [$empty, $slider];
2887 $self->SUPER::invoke_size_allocate ($w, $h)
2888}
2889
2890sub invoke_mouse_wheel {
2482 my ($self, $text, $indent) = @_; 2891 my ($self, $ev) = @_;
2892
2893 return 0 unless $ev->{dy}; # only vertical movements
2894
2895 $self->{children}[1]->emit (mouse_wheel => $ev);
2896
2897 1
2898}
2899
2900sub get_layout {
2901 my ($self, $para) = @_;
2483 2902
2484 my $layout = $self->{layout}; 2903 my $layout = $self->{layout};
2485 2904
2905 $layout->set_font ($self->{font}) if $self->{font};
2906 $layout->set_foreground (@{$para->{fg}});
2486 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2907 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $layout->set_width ($self->{children}[0]{w} - $indent); 2908 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2909 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2488 $layout->set_markup ($text); 2910 $layout->set_markup ($para->{markup});
2911
2912 $layout->set_shapes (
2913 map
2914 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2915 @{$para->{widget}}
2489 2916 );
2917
2490 $layout->size 2918 $layout
2491} 2919}
2492 2920
2493sub reflow { 2921sub reflow {
2494 my ($self) = @_; 2922 my ($self) = @_;
2495 2923
… …
2502 2930
2503 # todo: base offset on lines or so, not on pixels 2931 # todo: base offset on lines or so, not on pixels
2504 $self->{children}[1]->set_value ($offset); 2932 $self->{children}[1]->set_value ($offset);
2505} 2933}
2506 2934
2935sub current_paragraph {
2936 my ($self) = @_;
2937
2938 $self->{top_paragraph} - 1
2939}
2940
2941sub scroll_to {
2942 my ($self, $para) = @_;
2943
2944 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2945
2946 $self->{scroll_to} = $para;
2947 $self->update;
2948}
2949
2507sub clear { 2950sub clear {
2508 my ($self) = @_; 2951 my ($self) = @_;
2952
2953 my (undef, undef, @other) = @{ $self->{children} };
2954 $self->remove ($_) for @other;
2509 2955
2510 $self->{par} = []; 2956 $self->{par} = [];
2511 $self->{height} = 0; 2957 $self->{height} = 0;
2512 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2958 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2513} 2959}
2514 2960
2515sub add_paragraph { 2961sub add_paragraph {
2516 my ($self, $color, $text, $indent) = @_; 2962 my $self = shift;
2517 2963
2518 for my $line (split /\n/, $text) { 2964 for my $para (@_) {
2519 my ($w, $h) = $self->text_size ($line); 2965 $para = {
2966 fg => [1, 1, 1, 1],
2967 indent => 0,
2968 markup => "",
2969 widget => [],
2970 ref $para ? %$para : (markup => $para),
2971 w => 1e10,
2972 wrapped => 1,
2973 };
2974
2975 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2976 push @{$self->{par}}, $para;
2977 }
2978
2979 if (my $max = $self->{max_par}) {
2980 shift @{$self->{par}} while @{$self->{par}} > $max;
2981 }
2982
2983 $self->{need_reflow}++;
2984 $self->update;
2985}
2986
2987sub scroll_to_bottom {
2988 my ($self) = @_;
2989
2990 $self->{scroll_to} = $#{$self->{par}};
2991 $self->update;
2992}
2993
2994sub force_uptodate {
2995 my ($self) = @_;
2996
2997 if (delete $self->{need_reflow}) {
2998 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2999
3000 my $height = 0;
3001
3002 for my $para (@{$self->{par}}) {
3003 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3004 my $layout = $self->get_layout ($para);
3005 my ($w, $h) = $layout->size;
3006
3007 $para->{w} = $w + $para->{indent};
3008 $para->{h} = $h;
3009 $para->{wrapped} = $layout->has_wrapped;
3010 }
3011
3012 $para->{y} = $height;
3013 $height += $para->{h};
3014 }
3015
2520 $self->{height} += $h; 3016 $self->{height} = $height;
2521 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3017 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2522 }
2523 3018
2524 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3019 delete $self->{texture};
3020 }
3021
3022 if (my $paridx = delete $self->{scroll_to}) {
3023 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3024 }
2525} 3025}
2526 3026
2527sub update { 3027sub update {
2528 my ($self) = @_; 3028 my ($self) = @_;
2529 3029
… …
2531 3031
2532 return unless $self->{h} > 0; 3032 return unless $self->{h} > 0;
2533 3033
2534 delete $self->{texture}; 3034 delete $self->{texture};
2535 3035
2536 $ROOT->on_post_alloc ($self, sub { 3036 $ROOT->on_post_alloc ($self => sub {
3037 $self->force_uptodate;
3038
2537 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3039 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2538 3040
2539 if (delete $self->{need_reflow}) {
2540 my $height = 0;
2541
2542 my $layout = $self->{layout};
2543
2544 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545
2546 for (@{$self->{par}}) {
2547 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2548 $layout->set_width ($W - $_->[3]);
2549 $layout->set_markup ($_->[4]);
2550 my ($w, $h) = $layout->size;
2551 $_->[0] = $w + $_->[3];
2552 $_->[1] = $h;
2553 }
2554
2555 $height += $_->[1];
2556 }
2557
2558 $self->{height} = $height;
2559
2560 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2561
2562 delete $self->{texture};
2563 }
2564
2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3041 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2566 glClearColor 0.5, 0.5, 0.5, 0; 3042 glClearColor 0, 0, 0, 0;
2567 glClear GL_COLOR_BUFFER_BIT; 3043 glClear GL_COLOR_BUFFER_BIT;
2568 3044
3045 package CFPlus::UI::Base;
3046 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3047 (0, 0, $self->{w}, $self->{h});
3048
3049 my $top = int $self->{children}[1]{range}[0];
3050
3051 my $paridx = 0;
3052 my $top_paragraph;
2569 my $top = int $self->{children}[1]{range}[0]; 3053 my $top = int $self->{children}[1]{range}[0];
2570 3054
2571 my $y0 = $top; 3055 my $y0 = $top;
2572 my $y1 = $top + $H; 3056 my $y1 = $top + $H;
2573 3057
2574 my $y = 0;
2575
2576 my $layout = $self->{layout};
2577
2578 $layout->set_font ($self->{font}) if $self->{font};
2579
2580 glEnable GL_BLEND;
2581 #TODO# not correct in windows where rgba is forced off
2582 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2583
2584 for my $par (@{$self->{par}}) { 3058 for my $para (@{$self->{par}}) {
2585 my $h = $par->[1]; 3059 my $h = $para->{h};
3060 my $y = $para->{y};
2586 3061
2587 if ($y0 < $y + $h && $y < $y1) { 3062 if ($y0 < $y + $h && $y < $y1) {
2588 $layout->set_foreground (@{ $par->[2] }); 3063 my $layout = $self->get_layout ($para);
2589 $layout->set_width ($W - $par->[3]);
2590 $layout->set_markup ($par->[4]);
2591 3064
2592 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3065 $layout->render ($para->{indent}, $y - $y0);
2593 3066
2594 glRasterPos $par->[3], $y - $y0; 3067 if (my @w = @{ $para->{widget} }) {
2595 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3068 my @s = $layout->get_shapes;
3069
3070 for (@w) {
3071 my ($dx, $dy) = splice @s, 0, 2, ();
3072
3073 $_->{x} = $dx + $para->{indent};
3074 $_->{y} = $dy + $y - $y0;
3075
3076 $_->draw;
3077 }
3078 }
2596 } 3079 }
2597 3080
2598 $y += $h; 3081 $paridx++;
3082 $top_paragraph ||= $paridx if $y >= $top;
2599 } 3083 }
2600 3084
2601 glDisable GL_BLEND; 3085 $self->{top_paragraph} = $top_paragraph;
2602 }; 3086 };
2603 }); 3087 });
2604} 3088}
2605 3089
3090sub reconfigure {
3091 my ($self) = @_;
3092
3093 $self->SUPER::reconfigure;
3094
3095 $_->{w} = 1e10 for @{ $self->{par} };
3096 $self->reflow;
3097}
3098
2606sub _draw { 3099sub _draw {
2607 my ($self) = @_; 3100 my ($self) = @_;
2608 3101
2609 glEnable GL_TEXTURE_2D; 3102 glEnable GL_TEXTURE_2D;
2610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3103 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2611 glColor 1, 1, 1, 1; 3104 glColor 0, 0, 0, 1;
2612 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3105 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2613 glDisable GL_TEXTURE_2D; 3106 glDisable GL_TEXTURE_2D;
2614 3107
2615 $self->{children}[1]->draw; 3108 $self->{children}[1]->draw;
2616
2617} 3109}
2618 3110
2619############################################################################# 3111#############################################################################
2620 3112
2621package CFClient::UI::Animator; 3113package CFPlus::UI::Animator;
2622 3114
2623use CFClient::OpenGL; 3115use CFPlus::OpenGL;
2624 3116
2625our @ISA = CFClient::UI::Bin::; 3117our @ISA = CFPlus::UI::Bin::;
2626 3118
2627sub moveto { 3119sub moveto {
2628 my ($self, $x, $y) = @_; 3120 my ($self, $x, $y) = @_;
2629 3121
2630 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3122 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2658 glPopMatrix; 3150 glPopMatrix;
2659} 3151}
2660 3152
2661############################################################################# 3153#############################################################################
2662 3154
2663package CFClient::UI::Flopper; 3155package CFPlus::UI::Flopper;
2664 3156
2665our @ISA = CFClient::UI::Button::; 3157our @ISA = CFPlus::UI::Button::;
2666 3158
2667sub new { 3159sub new {
2668 my $class = shift; 3160 my $class = shift;
2669 3161
2670 my $self = $class->SUPER::new ( 3162 my $self = $class->SUPER::new (
… …
2682 $self->{other}->toggle_visibility; 3174 $self->{other}->toggle_visibility;
2683} 3175}
2684 3176
2685############################################################################# 3177#############################################################################
2686 3178
2687package CFClient::UI::Tooltip; 3179package CFPlus::UI::Tooltip;
2688 3180
2689our @ISA = CFClient::UI::Bin::; 3181our @ISA = CFPlus::UI::Bin::;
2690 3182
2691use CFClient::OpenGL; 3183use CFPlus::OpenGL;
2692 3184
2693sub new { 3185sub new {
2694 my $class = shift; 3186 my $class = shift;
2695 3187
2696 $class->SUPER::new ( 3188 $class->SUPER::new (
… …
2699 ) 3191 )
2700} 3192}
2701 3193
2702sub set_tooltip_from { 3194sub set_tooltip_from {
2703 my ($self, $widget) = @_; 3195 my ($self, $widget) = @_;
3196
3197 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3198 if $widget->{tooltip} =~ /^#(.*)$/;
2704 3199
2705 my $tooltip = $widget->{tooltip}; 3200 my $tooltip = $widget->{tooltip};
2706 3201
2707 if ($ENV{CFPLUS_DEBUG} & 2) { 3202 if ($ENV{CFPLUS_DEBUG} & 2) {
2708 $tooltip .= "\n\n" . (ref $widget) . "\n" 3203 $tooltip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3204 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n" 3205 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}"; 3206 . "visible $widget->{visible}";
2712 } 3207 }
2713 3208
3209 $tooltip =~ s/^\n+//;
3210 $tooltip =~ s/\n+$//;
3211
2714 $self->add (new CFClient::UI::Label 3212 $self->add (new CFPlus::UI::Label
2715 markup => $tooltip, 3213 markup => $tooltip,
2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3214 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2717 fontsize => 0.8, 3215 fontsize => 0.8,
2718 fg => [0, 0, 0, 1], 3216 style => 1, # FLAG_INVERSE
2719 ellipsise => 0, 3217 ellipsise => 0,
2720 font => ($widget->{tooltip_font} || $::FONT_PROP), 3218 font => ($widget->{tooltip_font} || $::FONT_PROP),
2721 ); 3219 );
2722} 3220}
2723 3221
… …
2727 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3225 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2728 3226
2729 ($w + 4, $h + 4) 3227 ($w + 4, $h + 4)
2730} 3228}
2731 3229
2732sub size_allocate { 3230sub invoke_size_allocate {
2733 my ($self, $w, $h) = @_; 3231 my ($self, $w, $h) = @_;
2734 3232
2735 $self->SUPER::size_allocate ($w - 4, $h - 4); 3233 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2736} 3234}
2737 3235
2738sub visibility_change { 3236sub invoke_visibility_change {
2739 my ($self, $visible) = @_; 3237 my ($self, $visible) = @_;
2740 3238
2741 return unless $visible; 3239 return unless $visible;
2742 3240
2743 $self->{root}->on_post_alloc ("move_$self" => sub { 3241 $self->{root}->on_post_alloc ("move_$self" => sub {
2744 my $widget = $self->{owner} 3242 my $widget = $self->{owner}
2745 or return; 3243 or return;
2746 3244
3245 if ($widget->{visible}) {
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3246 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748 3247
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3248 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH; 3249 if $x + $self->{w} > $self->{root}{w};
2751 3250
2752 $self->move_abs ($x, $y); 3251 $self->move_abs ($x, $y);
3252 } else {
3253 $self->hide;
3254 }
2753 }); 3255 });
2754} 3256}
2755 3257
2756sub _draw { 3258sub _draw {
2757 my ($self) = @_; 3259 my ($self) = @_;
… …
2781 $self->SUPER::_draw; 3283 $self->SUPER::_draw;
2782} 3284}
2783 3285
2784############################################################################# 3286#############################################################################
2785 3287
2786package CFClient::UI::Face; 3288package CFPlus::UI::Face;
2787 3289
2788our @ISA = CFClient::UI::Base::; 3290our @ISA = CFPlus::UI::DrawBG::;
2789 3291
2790use CFClient::OpenGL; 3292use CFPlus::OpenGL;
2791 3293
2792sub new { 3294sub new {
2793 my $class = shift; 3295 my $class = shift;
2794 3296
2795 my $self = $class->SUPER::new ( 3297 my $self = $class->SUPER::new (
… …
2797 can_events => 0, 3299 can_events => 0,
2798 @_, 3300 @_,
2799 ); 3301 );
2800 3302
2801 if ($self->{anim} && $self->{animspeed}) { 3303 if ($self->{anim} && $self->{animspeed}) {
2802 Scalar::Util::weaken (my $widget = $self); 3304 CFPlus::weaken (my $widget = $self);
2803 3305
2804 $self->{timer} = Event->timer ( 3306 $self->{timer} = Event->timer (
2805 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3307 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2806 hard => 1, 3308 hard => 1,
2807 interval => $self->{animspeed}, 3309 interval => $self->{animspeed},
… …
2830sub _draw { 3332sub _draw {
2831 my ($self) = @_; 3333 my ($self) = @_;
2832 3334
2833 return unless $::CONN; 3335 return unless $::CONN;
2834 3336
3337 $self->SUPER::_draw;
3338
2835 my $face; 3339 my $face;
2836 3340
2837 if ($self->{frame}) { 3341 if ($self->{frame}) {
2838 my $anim = $::CONN->{anim}[$self->{anim}]; 3342 my $anim = $::CONN->{anim}[$self->{anim}];
2839 3343
… …
2844 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3348 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2845 3349
2846 if ($tex) { 3350 if ($tex) {
2847 glEnable GL_TEXTURE_2D; 3351 glEnable GL_TEXTURE_2D;
2848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3352 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2849 glColor 1, 1, 1, 1; 3353 glColor 0, 0, 0, 1;
2850 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3354 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2851 glDisable GL_TEXTURE_2D; 3355 glDisable GL_TEXTURE_2D;
2852 } 3356 }
2853} 3357}
2854 3358
2855sub DESTROY { 3359sub destroy {
2856 my ($self) = @_; 3360 my ($self) = @_;
2857 3361
2858 $self->{timer}->cancel 3362 $self->{timer}->cancel
2859 if $self->{timer}; 3363 if $self->{timer};
2860 3364
2861 $self->SUPER::DESTROY; 3365 $self->SUPER::destroy;
2862} 3366}
2863 3367
2864############################################################################# 3368#############################################################################
2865 3369
2866package CFClient::UI::Buttonbar; 3370package CFPlus::UI::Buttonbar;
2867 3371
2868our @ISA = CFClient::UI::HBox::; 3372our @ISA = CFPlus::UI::HBox::;
2869 3373
2870# TODO: should actualyl wrap buttons and other goodies. 3374# TODO: should actually wrap buttons and other goodies.
2871 3375
2872############################################################################# 3376#############################################################################
2873 3377
2874package CFClient::UI::Menu; 3378package CFPlus::UI::Menu;
2875 3379
2876our @ISA = CFClient::UI::FancyFrame::; 3380our @ISA = CFPlus::UI::Toplevel::;
2877 3381
2878use CFClient::OpenGL; 3382use CFPlus::OpenGL;
2879 3383
2880sub new { 3384sub new {
2881 my $class = shift; 3385 my $class = shift;
2882 3386
2883 my $self = $class->SUPER::new ( 3387 my $self = $class->SUPER::new (
2884 items => [], 3388 items => [],
2885 z => 100, 3389 z => 100,
2886 @_, 3390 @_,
2887 ); 3391 );
2888 3392
2889 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3393 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2890 3394
2891 for my $item (@{ $self->{items} }) { 3395 for my $item (@{ $self->{items} }) {
2892 my ($widget, $cb) = @$item; 3396 my ($widget, $cb, $tooltip) = @$item;
2893 3397
2894 # handle various types of items, only text for now 3398 # handle various types of items, only text for now
2895 if (!ref $widget) { 3399 if (!ref $widget) {
3400 if ($widget =~ /\t/) {
3401 my ($left, $right) = split /\t/, $widget, 2;
3402
2896 $widget = new CFClient::UI::Label 3403 $widget = new CFPlus::UI::HBox
2897 can_hover => 1, 3404 can_hover => 1,
2898 can_events => 1, 3405 can_events => 1,
3406 tooltip => $tooltip,
3407 children => [
3408 (new CFPlus::UI::Label markup => $left, expand => 1),
3409 (new CFPlus::UI::Label markup => $right, align => +1),
3410 ],
3411 ;
3412
3413 } else {
3414 $widget = new CFPlus::UI::Label
3415 can_hover => 1,
3416 can_events => 1,
2899 text => $widget; 3417 markup => $widget,
3418 tooltip => $tooltip;
3419 }
2900 } 3420 }
2901 3421
2902 $self->{item}{$widget} = $item; 3422 $self->{item}{$widget} = $item;
2903 3423
2904 $self->{vbox}->add ($widget); 3424 $self->{vbox}->add ($widget);
… …
2909 3429
2910# popup given the event (must be a mouse button down event currently) 3430# popup given the event (must be a mouse button down event currently)
2911sub popup { 3431sub popup {
2912 my ($self, $ev) = @_; 3432 my ($self, $ev) = @_;
2913 3433
2914 $self->_emit ("popdown"); 3434 $self->emit ("popdown");
2915 3435
2916 # maybe save $GRAB? must be careful about events... 3436 # maybe save $GRAB? must be careful about events...
2917 $GRAB = $self; 3437 $GRAB = $self;
2918 $self->{button} = $ev->{button}; 3438 $self->{button} = $ev->{button};
2919 3439
2920 $self->show; 3440 $self->show;
2921 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3441 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2922} 3442}
2923 3443
2924sub mouse_motion { 3444sub invoke_mouse_motion {
2925 my ($self, $ev, $x, $y) = @_; 3445 my ($self, $ev, $x, $y) = @_;
2926 3446
2927 # TODO: should use vbox->find_widget or so 3447 # TODO: should use vbox->find_widget or so
2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3448 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2929 $self->{hover} = $self->{item}{$HOVER}; 3449 $self->{hover} = $self->{item}{$HOVER};
2930 3450
2931 0 3451 0
2932} 3452}
2933 3453
2934sub button_up { 3454sub invoke_button_up {
2935 my ($self, $ev, $x, $y) = @_; 3455 my ($self, $ev, $x, $y) = @_;
2936 3456
2937 if ($ev->{button} == $self->{button}) { 3457 if ($ev->{button} == $self->{button}) {
2938 undef $GRAB; 3458 undef $GRAB;
2939 $self->hide; 3459 $self->hide;
2940 3460
2941 $self->_emit ("popdown"); 3461 $self->emit ("popdown");
2942 $self->{hover}[1]->() if $self->{hover}; 3462 $self->{hover}[1]->() if $self->{hover};
2943 } else { 3463 } else {
2944 return 0 3464 return 0
2945 } 3465 }
2946 3466
2947 1 3467 1
2948} 3468}
2949 3469
2950############################################################################# 3470#############################################################################
2951 3471
2952package CFClient::UI::Multiplexer; 3472package CFPlus::UI::Multiplexer;
2953 3473
2954our @ISA = CFClient::UI::Container::; 3474our @ISA = CFPlus::UI::Container::;
2955 3475
2956sub new { 3476sub new {
2957 my $class = shift; 3477 my $class = shift;
2958 3478
2959 my $self = $class->SUPER::new ( 3479 my $self = $class->SUPER::new (
… …
2973 3493
2974 $self->{current} = $self->{children}[0] 3494 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} }; 3495 if @{ $self->{children} };
2976} 3496}
2977 3497
3498sub get_current_page {
3499 my ($self) = @_;
3500
3501 $self->{current}
3502}
3503
2978sub set_current_page { 3504sub set_current_page {
2979 my ($self, $page_or_widget) = @_; 3505 my ($self, $page_or_widget) = @_;
2980 3506
2981 my $widget = ref $page_or_widget 3507 my $widget = ref $page_or_widget
2982 ? $page_or_widget 3508 ? $page_or_widget
2983 : $self->{children}[$page_or_widget]; 3509 : $self->{children}[$page_or_widget];
2984 3510
2985 $self->{current} = $widget; 3511 $self->{current} = $widget;
2986 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3512 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987 3513
2988 $self->_emit (page_changed => $self->{current}); 3514 $self->emit (page_changed => $self->{current});
2989 3515
2990 $self->realloc; 3516 $self->realloc;
2991} 3517}
2992 3518
2993sub visible_children { 3519sub visible_children {
… …
2998 my ($self) = @_; 3524 my ($self) = @_;
2999 3525
3000 $self->{current}->size_request 3526 $self->{current}->size_request
3001} 3527}
3002 3528
3003sub size_allocate { 3529sub invoke_size_allocate {
3004 my ($self, $w, $h) = @_; 3530 my ($self, $w, $h) = @_;
3005 3531
3006 $self->{current}->configure (0, 0, $w, $h); 3532 $self->{current}->configure (0, 0, $w, $h);
3533
3534 1
3007} 3535}
3008 3536
3009sub _draw { 3537sub _draw {
3010 my ($self) = @_; 3538 my ($self) = @_;
3011 3539
3012 $self->{current}->draw; 3540 $self->{current}->draw;
3013} 3541}
3014 3542
3015############################################################################# 3543#############################################################################
3016 3544
3017package CFClient::UI::Notebook; 3545package CFPlus::UI::Notebook;
3018 3546
3019our @ISA = CFClient::UI::VBox::; 3547our @ISA = CFPlus::UI::VBox::;
3020 3548
3021sub new { 3549sub new {
3022 my $class = shift; 3550 my $class = shift;
3023 3551
3024 my $self = $class->SUPER::new ( 3552 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar), 3553 buttonbar => (new CFPlus::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3554 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3555 # filter => # will be put between multiplexer and $self
3027 @_, 3556 @_,
3028 ); 3557 );
3029 3558
3559 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer}); 3560 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3031 3561
3032 $self 3562 $self
3033} 3563}
3034 3564
3035sub add { 3565sub add {
3036 my ($self, $title, $widget, $tooltip) = @_; 3566 my ($self, $title, $widget, $tooltip) = @_;
3037 3567
3038 Scalar::Util::weaken $self; 3568 CFPlus::weaken $self;
3039 3569
3040 $self->{buttonbar}->add (new CFClient::UI::Button 3570 $self->{buttonbar}->add (new CFPlus::UI::Button
3041 markup => $title, 3571 markup => $title,
3042 tooltip => $tooltip, 3572 tooltip => $tooltip,
3043 on_activate => sub { $self->set_current_page ($widget) }, 3573 on_activate => sub { $self->set_current_page ($widget) },
3044 ); 3574 );
3045 3575
3046 $self->{multiplexer}->add ($widget); 3576 $self->{multiplexer}->add ($widget);
3047} 3577}
3048 3578
3579sub get_current_page {
3580 my ($self) = @_;
3581
3582 $self->{multiplexer}->get_current_page
3583}
3584
3049sub set_current_page { 3585sub set_current_page {
3050 my ($self, $page) = @_; 3586 my ($self, $page) = @_;
3051 3587
3052 $self->{multiplexer}->set_current_page ($page); 3588 $self->{multiplexer}->set_current_page ($page);
3053 $self->_emit (page_changed => $self->{multiplexer}{current}); 3589 $self->emit (page_changed => $self->{multiplexer}{current});
3054} 3590}
3055 3591
3056############################################################################# 3592#############################################################################
3057 3593
3058package CFClient::UI::Statusbox; 3594package CFPlus::UI::Selector;
3059 3595
3596use utf8;
3597
3060our @ISA = CFClient::UI::VBox::; 3598our @ISA = CFPlus::UI::Button::;
3061 3599
3062sub new { 3600sub new {
3063 my $class = shift; 3601 my $class = shift;
3064 3602
3065 $class->SUPER::new ( 3603 my $self = $class->SUPER::new (
3604 options => [], # [value, title, longdesc], ...
3605 value => undef,
3606 @_,
3607 );
3608
3609 $self->_set_value ($self->{value});
3610
3611 $self
3612}
3613
3614sub invoke_button_down {
3615 my ($self, $ev) = @_;
3616
3617 my @menu_items;
3618
3619 for (@{ $self->{options} }) {
3620 my ($value, $title, $tooltip) = @$_;
3621
3622 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3623 }
3624
3625 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3626}
3627
3628sub _set_value {
3629 my ($self, $value) = @_;
3630
3631 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3632 or return;
3633
3634 $self->{value} = $item->[0];
3635 $self->set_markup ("$item->[1] ⇓");
3636 $self->set_tooltip ($item->[2]);
3637}
3638
3639sub set_value {
3640 my ($self, $value) = @_;
3641
3642 return unless $self->{value} ne $value;
3643
3644 $self->_set_value ($value);
3645 $self->emit (changed => $value);
3646}
3647
3648#############################################################################
3649
3650package CFPlus::UI::Statusbox;
3651
3652our @ISA = CFPlus::UI::VBox::;
3653
3654sub new {
3655 my $class = shift;
3656
3657 my $self = $class->SUPER::new (
3066 fontsize => 0.8, 3658 fontsize => 0.8,
3067 @_, 3659 @_,
3068 ) 3660 );
3661
3662 CFPlus::weaken (my $this = $self);
3663
3664 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3665
3666 $self
3069} 3667}
3070 3668
3071sub reorder { 3669sub reorder {
3072 my ($self) = @_; 3670 my ($self) = @_;
3073 my $NOW = time; 3671 my $NOW = Time::HiRes::time;
3672
3673 # freeze display when hovering over any label
3674 return if $CFPlus::UI::TOOLTIP->{owner}
3675 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3676 values %{ $self->{item} };
3074 3677
3075 while (my ($k, $v) = each %{ $self->{item} }) { 3678 while (my ($k, $v) = each %{ $self->{item} }) {
3076 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3679 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3077 } 3680 }
3078 3681
… …
3081 my @items = sort { 3684 my @items = sort {
3082 $a->{pri} <=> $b->{pri} 3685 $a->{pri} <=> $b->{pri}
3083 or $b->{id} <=> $a->{id} 3686 or $b->{id} <=> $a->{id}
3084 } values %{ $self->{item} }; 3687 } values %{ $self->{item} };
3085 3688
3689 $self->{timer}->interval (1);
3690
3086 my $count = 10 + 1; 3691 my $count = 10 + 1;
3087 for my $item (@items) { 3692 for my $item (@items) {
3088 last unless --$count; 3693 last unless --$count;
3089 3694
3090 push @widgets, $item->{label} ||= do { 3695 my $label = $item->{label} ||= do {
3091 # TODO: doesn't handle markup well (read as: at all) 3696 # TODO: doesn't handle markup well (read as: at all)
3092 my $short = $item->{count} > 1 3697 my $short = $item->{count} > 1
3093 ? "<b>$item->{count} ×</b> $item->{text}" 3698 ? "<b>$item->{count} ×</b> $item->{text}"
3094 : $item->{text}; 3699 : $item->{text};
3095 3700
3096 for ($short) { 3701 for ($short) {
3097 s/^\s+//; 3702 s/^\s+//;
3098 s/\s+/ /g; 3703 s/\s+/ /g;
3099 } 3704 }
3100 3705
3101 new CFClient::UI::Label 3706 new CFPlus::UI::Label
3102 markup => $short, 3707 markup => $short,
3103 tooltip => $item->{tooltip}, 3708 tooltip => $item->{tooltip},
3104 tooltip_font => $::FONT_PROP, 3709 tooltip_font => $::FONT_PROP,
3105 tooltip_width => 0.67, 3710 tooltip_width => 0.67,
3106 fontsize => $item->{fontsize} || $self->{fontsize}, 3711 fontsize => $item->{fontsize} || $self->{fontsize},
3107 max_w => $::WIDTH * 0.44, 3712 max_w => $::WIDTH * 0.44,
3108 fg => $item->{fg}, 3713 fg => [@{ $item->{fg} }],
3109 can_events => 1, 3714 can_events => 1,
3110 can_hover => 1 3715 can_hover => 1
3111 }; 3716 };
3717
3718 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3719 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3720 $label->update;
3721 $label->set_max_size (undef, $label->{req_h} * $diff)
3722 if $diff < 1;
3723 $self->{timer}->interval (1/30);
3724 } else {
3725 $label->{fg}[3] = $item->{fg}[3] || 1;
3726 }
3727
3728 push @widgets, $label;
3112 } 3729 }
3113 3730
3114 $self->clear; 3731 $self->clear;
3115 $self->SUPER::add (reverse @widgets); 3732 $self->SUPER::add (reverse @widgets);
3116} 3733}
… …
3121 $text =~ s/^\s+//; 3738 $text =~ s/^\s+//;
3122 $text =~ s/\s+$//; 3739 $text =~ s/\s+$//;
3123 3740
3124 return unless $text; 3741 return unless $text;
3125 3742
3126 my $timeout = time + ((delete $arg{timeout}) || 60); 3743 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3127 3744
3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3745 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3129 3746
3130 if (my $item = $self->{item}{$group}) { 3747 if (my $item = $self->{item}{$group}) {
3131 if ($item->{text} eq $text) { 3748 if ($item->{text} eq $text) {
3132 $item->{count}++; 3749 $item->{count}++;
3133 } else { 3750 } else {
3134 $item->{count} = 1; 3751 $item->{count} = 1;
3135 $item->{text} = $item->{tooltip} = $text; 3752 $item->{text} = $item->{tooltip} = $text;
3136 } 3753 }
3137 $item->{id} = ++$self->{id}; 3754 $item->{id} += 0.2;#d#
3138 $item->{timeout} = $timeout; 3755 $item->{timeout} = $timeout;
3139 delete $item->{label}; 3756 delete $item->{label};
3140 } else { 3757 } else {
3141 $self->{item}{$group} = { 3758 $self->{item}{$group} = {
3142 id => ++$self->{id}, 3759 id => ++$self->{id},
… …
3148 count => 1, 3765 count => 1,
3149 %arg, 3766 %arg,
3150 }; 3767 };
3151 } 3768 }
3152 3769
3770 $ROOT->on_refresh (reorder => sub {
3153 $self->reorder; 3771 $self->reorder;
3772 });
3154} 3773}
3155 3774
3156sub reconfigure { 3775sub reconfigure {
3157 my ($self) = @_; 3776 my ($self) = @_;
3158 3777
… …
3161 3780
3162 $self->reorder; 3781 $self->reorder;
3163 $self->SUPER::reconfigure; 3782 $self->SUPER::reconfigure;
3164} 3783}
3165 3784
3785sub destroy {
3786 my ($self) = @_;
3787
3788 $self->{timer}->cancel;
3789
3790 $self->SUPER::destroy;
3791}
3792
3166############################################################################# 3793#############################################################################
3167 3794
3168package CFClient::UI::Inventory;
3169
3170our @ISA = CFClient::UI::ScrolledWindow::;
3171
3172sub new {
3173 my $class = shift;
3174
3175 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3177 @_,
3178 );
3179
3180 $self
3181}
3182
3183sub set_items {
3184 my ($self, $items) = @_;
3185
3186 $self->{scrolled}->clear;
3187 return unless $items;
3188
3189 my @items = sort {
3190 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name})
3192 } @$items;
3193
3194 $self->{real_items} = \@items;
3195
3196 my $row = 0;
3197 for my $item (@items) {
3198 CFClient::Item::update_widgets $item;
3199
3200 $self->{scrolled}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3203
3204 $row++;
3205 }
3206}
3207
3208#############################################################################
3209
3210package CFClient::UI::BindEditor;
3211
3212our @ISA = CFClient::UI::FancyFrame::;
3213
3214sub new {
3215 my $class = shift;
3216
3217 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3218
3219 $self->add (my $vb = new CFClient::UI::VBox);
3220
3221
3222 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3223 text => "start recording",
3224 tooltip => "Start/Stops recording of actions."
3225 ."All subsequent actions after the recording started will be captured."
3226 ."The actions are displayed after the record was stopped."
3227 ."To bind the action you have to click on the 'Bind' button",
3228 on_activate => sub {
3229 unless ($self->{recording}) {
3230 $self->start;
3231 } else {
3232 $self->stop;
3233 }
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3238
3239 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3240 $vb->add (my $hb = new CFClient::UI::HBox);
3241 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3242 $hb->add (new CFClient::UI::Button
3243 text => "bind",
3244 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3245 on_activate => sub {
3246 $self->ask_for_bind;
3247 });
3248
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add (new CFClient::UI::Button
3251 text => "ok",
3252 expand => 1,
3253 tooltip => "This closes the binding editor and saves the binding",
3254 on_activate => sub {
3255 $self->hide;
3256 $self->commit;
3257 });
3258
3259 $hb->add (new CFClient::UI::Button
3260 text => "cancel",
3261 expand => 1,
3262 tooltip => "This closes the binding editor without saving",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->{binding_cancel}->()
3266 if $self->{binding_cancel};
3267 });
3268
3269 $self->update_binding_widgets;
3270
3271 $self
3272}
3273
3274sub commit {
3275 my ($self) = @_;
3276 my ($mod, $sym, $cmds) = $self->get_binding;
3277 if ($sym != 0 && @$cmds > 0) {
3278 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3279 ."'. Don't forget 'Save Config'!");
3280 $self->{binding_change}->($mod, $sym, $cmds)
3281 if $self->{binding_change};
3282 } else {
3283 $::STATUSBOX->add ("No action bound, no key or action specified!");
3284 $self->{binding_cancel}->()
3285 if $self->{binding_cancel};
3286 }
3287}
3288
3289sub start {
3290 my ($self) = @_;
3291
3292 $self->{rec_btn}->set_text ("stop recording");
3293 $self->{recording} = 1;
3294 $self->clear_command_list;
3295 $::CONN->start_record if $::CONN;
3296}
3297
3298sub stop {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("start recording");
3302 $self->{recording} = 0;
3303
3304 my $rec;
3305 $rec = $::CONN->stop_record if $::CONN;
3306 return unless ref $rec eq 'ARRAY';
3307 $self->set_command_list ($rec);
3308}
3309
3310
3311sub ask_for_bind_and_commit {
3312 my ($self) = @_;
3313 $self->ask_for_bind (1);
3314}
3315
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Label text => $_);
3392 $hb->add (new CFClient::UI::Button
3393 text => "delete",
3394 tooltip => "Deletes the action from the record",
3395 on_activate => sub {
3396 $self->{cmdbox}->remove ($hb);
3397 $cmds->[$i] = undef;
3398 });
3399
3400
3401 $idx++
3402 }
3403}
3404
3405#############################################################################
3406
3407package CFClient::UI::SpellList;
3408
3409our @ISA = CFClient::UI::ScrolledWindow::;
3410
3411sub new {
3412 my $class = shift;
3413
3414 my $self = $class->SUPER::new (
3415 binding => [],
3416 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_,
3419 )
3420}
3421
3422# XXX: Do sorting? Argl...
3423sub add_spell {
3424 my ($self, $spell) = @_;
3425 $self->{spells}->{$spell->{name}} = $spell;
3426
3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3428 face => $spell->{face},
3429 can_hover => 1,
3430 can_events => 1,
3431 tooltip => $spell->{message});
3432
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message},
3438 expand => 1);
3439
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1);
3444
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448}
3449
3450sub rebuild_spell_list {
3451 my ($self) = @_;
3452 $self->{tbl_idx} = 0;
3453 $self->add_spell ($_) for values %{$self->{spells}};
3454}
3455
3456sub remove_spell {
3457 my ($self, $spell) = @_;
3458 delete $self->{spells}->{$spell->{name}};
3459 $self->rebuild_spell_list;
3460}
3461
3462#############################################################################
3463
3464package CFClient::UI::Root; 3795package CFPlus::UI::Root;
3465 3796
3466our @ISA = CFClient::UI::Container::; 3797our @ISA = CFPlus::UI::Container::;
3467 3798
3799use List::Util qw(min max);
3800
3468use CFClient::OpenGL; 3801use CFPlus::OpenGL;
3469 3802
3470sub new { 3803sub new {
3471 my $class = shift; 3804 my $class = shift;
3472 3805
3473 my $self = $class->SUPER::new ( 3806 my $self = $class->SUPER::new (
3474 visible => 1, 3807 visible => 1,
3475 @_, 3808 @_,
3476 ); 3809 );
3477 3810
3478 Scalar::Util::weaken ($self->{root} = $self); 3811 CFPlus::weaken ($self->{root} = $self);
3479 3812
3480 $self 3813 $self
3481} 3814}
3482 3815
3483sub size_request { 3816sub size_request {
… …
3498 $coord = $max - $size if $coord > $max - $size; 3831 $coord = $max - $size if $coord > $max - $size;
3499 3832
3500 int $coord + 0.5 3833 int $coord + 0.5
3501} 3834}
3502 3835
3503sub size_allocate { 3836sub invoke_size_allocate {
3504 my ($self, $w, $h) = @_; 3837 my ($self, $w, $h) = @_;
3505 3838
3506 for my $child ($self->children) { 3839 for my $child ($self->children) {
3507 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3840 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3508 3841
… …
3512 $X = _to_pixel $X, $W, $self->{w}; 3845 $X = _to_pixel $X, $W, $self->{w};
3513 $Y = _to_pixel $Y, $H, $self->{h}; 3846 $Y = _to_pixel $Y, $H, $self->{h};
3514 3847
3515 $child->configure ($X, $Y, $W, $H); 3848 $child->configure ($X, $Y, $W, $H);
3516 } 3849 }
3850
3851 1
3517} 3852}
3518 3853
3519sub coord2local { 3854sub coord2local {
3520 my ($self, $x, $y) = @_; 3855 my ($self, $x, $y) = @_;
3521 3856
… …
3606 3941
3607 delete $queue{$widget+0}; 3942 delete $queue{$widget+0};
3608 3943
3609 my ($w, $h) = $widget->size_request; 3944 my ($w, $h) = $widget->size_request;
3610 3945
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3946 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3947 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3948
3949 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3950 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3613 3951
3614 $w = $widget->{force_w} if exists $widget->{force_w}; 3952 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h}; 3953 $h = $widget->{force_h} if exists $widget->{force_h};
3616 3954
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3955 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3643 3981
3644 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3982 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3645 3983
3646 $w = 0 if $w < 0; 3984 $w = 0 if $w < 0;
3647 $h = 0 if $h < 0; 3985 $h = 0 if $h < 0;
3986
3987 $w = max $widget->{min_w}, $w;
3988 $h = max $widget->{min_h}, $h;
3989
3990# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3991# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3992
3993 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3994 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3648 3995
3649 $w = int $w + 0.5; 3996 $w = int $w + 0.5;
3650 $h = int $h + 0.5; 3997 $h = int $h + 0.5;
3651 3998
3652 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3999 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
… …
3676 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4023 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3677 glMatrixMode GL_MODELVIEW; 4024 glMatrixMode GL_MODELVIEW;
3678 glLoadIdentity; 4025 glLoadIdentity;
3679 4026
3680 { 4027 {
3681 package CFClient::UI::Base; 4028 package CFPlus::UI::Base;
3682 4029
3683 ($draw_x, $draw_y, $draw_w, $draw_h) = 4030 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3684 (0, 0, $self->{w}, $self->{h}); 4031 (0, 0, $self->{w}, $self->{h});
3685 }
3686 4032
3687 $self->_draw; 4033 $self->_draw;
4034 }
3688} 4035}
3689 4036
3690############################################################################# 4037#############################################################################
3691 4038
3692package CFClient::UI; 4039package CFPlus::UI;
3693 4040
3694$ROOT = new CFClient::UI::Root; 4041$ROOT = new CFPlus::UI::Root;
3695$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4042$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3696 4043
36971 40441
3698 4045

Diff Legend

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