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

Diff Legend

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