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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.268 by root, Thu Jun 1 05:04:41 2006 UTC vs.
Revision 1.369 by root, Sun Jul 15 20:25:26 2007 UTC

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

Diff Legend

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