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

Diff Legend

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