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

Diff Legend

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