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.296 by root, Wed Jun 7 05:48:53 2006 UTC vs.
Revision 1.480 by root, Sat Apr 3 02:58:25 2010 UTC

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

Diff Legend

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