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

Diff Legend

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