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.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.473 by root, Sun Jan 11 03:19:47 2009 UTC

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

Diff Legend

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