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.316 by root, Sun Jul 2 13:57:58 2006 UTC vs.
Revision 1.481 by root, Tue Oct 12 05:11:38 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
… …
278 delete $self->{root}; 313 delete $self->{root};
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->emit ("focus_out"); 321 $self->emit ("focus_out");
287 $self->emit (visibility_change => 0); 322 $self->emit (visibility_change => 0);
288} 323}
… …
290sub set_visibility { 325sub set_visibility {
291 my ($self, $visible) = @_; 326 my ($self, $visible) = @_;
292 327
293 return if $self->{visible} == $visible; 328 return if $self->{visible} == $visible;
294 329
295 $visible ? $self->hide 330 $visible ? $self->show
296 : $self->show; 331 : $self->hide;
297} 332}
298 333
299sub toggle_visibility { 334sub toggle_visibility {
300 my ($self) = @_; 335 my ($self) = @_;
301 336
… …
307sub hide { 342sub hide {
308 my ($self) = @_; 343 my ($self) = @_;
309 344
310 $self->set_invisible; 345 $self->set_invisible;
311 346
347 # extra $parent copy for 5.8.8+ bug workaround
348 # (otherwise $_[0] in remove gets freed
349 if (my $parent = $self->{parent}) {
312 $self->{parent}->remove ($self) 350 $parent->remove ($self);
313 if $self->{parent}; 351 }
314} 352}
315 353
316sub move_abs { 354sub move_abs {
317 my ($self, $x, $y, $z) = @_; 355 my ($self, $x, $y, $z) = @_;
318 356
… …
330 $self->{force_h} = $h; 368 $self->{force_h} = $h;
331 369
332 $self->realloc; 370 $self->realloc;
333} 371}
334 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
335sub size_request { 391sub size_request {
336 require Carp; 392 require Carp;
337 Carp::confess "size_request is abstract"; 393 Carp::confess "size_request is abstract";
338} 394}
339 395
… …
345 my ($self, $x, $y, $w, $h) = @_; 401 my ($self, $x, $y, $w, $h) = @_;
346 402
347 if ($self->{aspect}) { 403 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h); 404 my ($ow, $oh) = ($w, $h);
349 405
350 $w = List::Util::min $w, int $h * $self->{aspect}; 406 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
351 $h = List::Util::min $h, int $w / $self->{aspect}; 407 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
352 408
353 # use alignment to adjust x, y 409 # use alignment to adjust x, y
354 410
355 $x += int 0.5 * ($ow - $w); 411 $x += int 0.5 * ($ow - $w);
356 $y += int 0.5 * ($oh - $h); 412 $y += int 0.5 * ($oh - $h);
… …
397 453
398 return if $self->{tooltip} eq $tooltip; 454 return if $self->{tooltip} eq $tooltip;
399 455
400 $self->{tooltip} = $tooltip; 456 $self->{tooltip} = $tooltip;
401 457
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 458 if ($DC::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner}; 459 delete $DC::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->(); 460 $DC::UI::TOOLTIP_WATCHER->invoke;
405 } 461 }
406} 462}
407 463
408# translate global coordinates to local coordinate system 464# translate global coordinates to local coordinate system
409sub coord2local { 465sub coord2local {
410 my ($self, $x, $y) = @_; 466 my ($self, $x, $y) = @_;
411 467
468 return (undef, undef) unless $self->{parent};
469
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 470 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 471}
414 472
415# translate local coordinates to global coordinate system 473# translate local coordinates to global coordinate system
416sub coord2global { 474sub coord2global {
417 my ($self, $x, $y) = @_; 475 my ($self, $x, $y) = @_;
418 476
477 return (undef, undef) unless $self->{parent};
478
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 479 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 480}
421 481
422sub invoke_focus_in { 482sub invoke_focus_in {
423 my ($self) = @_; 483 my ($self) = @_;
424 484
425 return if $FOCUS == $self; 485 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 486 return unless $self->{can_focus};
427 487
428 my $focus = $FOCUS; $FOCUS = $self; 488 $FOCUS = $self;
429 489
430 $focus->update if $focus; 490 $self->update;
431 $FOCUS->update;
432 491
433 0 492 0
434} 493}
435 494
436sub invoke_focus_out { 495sub invoke_focus_out {
437 my ($self) = @_; 496 my ($self) = @_;
438 497
439 return unless $FOCUS == $self; 498 return unless $FOCUS == $self;
440 499
441 my $focus = $FOCUS; undef $FOCUS; 500 undef $FOCUS;
442 501
443 $focus->update if $focus; #? 502 $self->update;
444 503
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 504 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 505 unless $FOCUS;
447 506
448 0 507 0
449} 508}
450 509
451sub grab_focus { 510sub grab_focus {
452 my ($self) = @_; 511 my ($self) = @_;
453 512
513 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 514 $self->emit ("focus_in");
455} 515}
456 516
457sub invoke_mouse_motion { 1 } 517sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 518sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 519sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 520sub invoke_key_up { 0 }
521sub invoke_mouse_wheel { 0 }
461 522
462sub invoke_button_down { 523sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 524 my ($self, $ev, $x, $y) = @_;
464 525
465 $self->grab_focus; 526 $self->grab_focus;
466 527
467 1 528 0
468} 529}
469 530
470sub connect { 531sub connect {
471 my ($self, $signal, $cb) = @_; 532 my ($self, $signal, $cb) = @_;
472 533
473 push @{ $self->{signal_cb}{$signal} }, $cb; 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 }
474} 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);
475 554
476sub emit { 555sub emit {
477 my ($self, $signal, @args) = @_; 556 my ($self, $signal, @args) = @_;
478 557
479 #d##TODO# stop propagating at first true, do not use sum 558 # I do not really like this solution, but I do not like duplication
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 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
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 569 ($self->can ("invoke_$signal") || sub { 1 }), # closure
570 ) {
571 return $cb->($self, @args, @append) || next;
572 }
573
574 # parent
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 575 $self->{parent} && $self->{parent}->emit ($signal, @args)
483} 576}
484 577
485sub find_widget { 578#sub find_widget {
486 my ($self, $x, $y) = @_; 579# in .xs
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496 580
497sub set_parent { 581sub set_parent {
498 my ($self, $parent) = @_; 582 my ($self, $parent) = @_;
499 583
500 Scalar::Util::weaken ($self->{parent} = $parent); 584 DC::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible}; 585 $self->set_visible if $parent->{visible};
502} 586}
503 587
504sub realloc { 588sub realloc {
505 my ($self) = @_; 589 my ($self) = @_;
… …
531 615
532# 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
533# functions seems pointless. 617# functions seems pointless.
534our ($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
535 619
536sub draw { 620#sub draw {
537 my ($self) = @_; 621#CFPlus.xs
538
539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
548
549 glPushMatrix;
550 glTranslate $self->{x}, $self->{y}, 0;
551
552 if ($self == $HOVER && $self->{can_hover}) {
553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
554 glEnable GL_BLEND;
555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
556 glBegin GL_QUADS;
557 glVertex 0 , 0;
558 glVertex $self->{w}, 0;
559 glVertex $self->{w}, $self->{h};
560 glVertex 0 , $self->{h};
561 glEnd;
562 glDisable GL_BLEND;
563 }
564
565 if ($ENV{CFPLUS_DEBUG} & 1) {
566 glPushMatrix;
567 glColor 1, 1, 0, 1;
568 glTranslate 0.375, 0.375;
569 glBegin GL_LINE_LOOP;
570 glVertex 0 , 0;
571 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1;
574 glEnd;
575 glPopMatrix;
576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
577 }
578
579 $self->_draw;
580 glPopMatrix;
581}
582 622
583sub _draw { 623sub _draw {
584 my ($self) = @_; 624 my ($self) = @_;
585 625
586 warn "no draw defined for $self\n"; 626 warn "no draw defined for $self\n";
587} 627}
588 628
589sub DESTROY { 629sub DESTROY {
590 my ($self) = @_; 630 my ($self) = @_;
591 631
592 delete $WIDGET{$self+0}; 632 return if DC::in_destruct;
593 633
634 local $@;
594 eval { $self->destroy }; 635 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 636 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
637
638 delete $WIDGET{$self+0};
596} 639}
597 640
598############################################################################# 641#############################################################################
599 642
600package CFClient::UI::DrawBG; 643package DC::UI::DrawBG;
601 644
602our @ISA = CFClient::UI::Base::; 645our @ISA = DC::UI::Base::;
603 646
604use strict; 647use common::sense;
648
605use CFClient::OpenGL; 649use DC::OpenGL;
606 650
607sub new { 651sub new {
608 my $class = shift; 652 my $class = shift;
609
610 # range [value, low, high, page]
611 653
612 $class->SUPER::new ( 654 $class->SUPER::new (
613 #bg => [0, 0, 0, 0.2], 655 #bg => [0, 0, 0, 0.2],
614 #active_bg => [1, 1, 1, 0.5], 656 #active_bg => [1, 1, 1, 0.5],
615 @_ 657 @_
616 ) 658 )
617} 659}
618 660
661sub set_bg {
662 my ($self, $bg) = @_;
663
664 $self->{bg} = $bg;
665 $self->update;
666}
667
619sub _draw { 668sub _draw {
620 my ($self) = @_; 669 my ($self) = @_;
621 670
622 my $color = $FOCUS == $self && $self->{active_bg} 671 my $color = $FOCUS == $self
623 ? $self->{active_bg} 672 ? $self->{active_bg} || $self->{bg}
624 : $self->{bg}; 673 : $self->{bg};
625 674
626 if ($color && (@$color < 4 || $color->[3])) { 675 if ($color && (@$color < 4 || $color->[3])) {
627 my ($w, $h) = @$self{qw(w h)}; 676 my ($w, $h) = @$self{qw(w h)};
628 677
629 glEnable GL_BLEND; 678 glEnable GL_BLEND;
630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 679 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
631 glColor_premultiply @$color; 680 glColor_premultiply @$color;
632
633 glBegin GL_QUADS;
634 glVertex 0 , 0;
635 glVertex 0 , $h;
636 glVertex $w, $h; 681 glRect 0, 0, $w, $h;
637 glVertex $w, 0;
638 glEnd;
639
640 glDisable GL_BLEND; 682 glDisable GL_BLEND;
641 } 683 }
642} 684}
643 685
644############################################################################# 686#############################################################################
645 687
646package CFClient::UI::Empty; 688package DC::UI::Empty;
647 689
648our @ISA = CFClient::UI::Base::; 690our @ISA = DC::UI::Base::;
649 691
650sub new { 692sub new {
651 my ($class, %arg) = @_; 693 my ($class, %arg) = @_;
652 $class->SUPER::new (can_events => 0, %arg); 694 $class->SUPER::new (can_events => 0, %arg);
653} 695}
… …
660 702
661sub draw { } 703sub draw { }
662 704
663############################################################################# 705#############################################################################
664 706
665package CFClient::UI::Container; 707package DC::UI::Container;
666 708
667our @ISA = CFClient::UI::Base::; 709our @ISA = DC::UI::Base::;
668 710
669sub new { 711sub new {
670 my ($class, %arg) = @_; 712 my ($class, %arg) = @_;
671 713
672 my $children = delete $arg{children}; 714 my $children = delete $arg{children};
… …
676 can_events => 0, 718 can_events => 0,
677 %arg, 719 %arg,
678 ); 720 );
679 721
680 $self->add (@$children) 722 $self->add (@$children)
681 if $children; 723 if $children && @$children;
682 724
683 $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;
684} 734}
685 735
686sub add { 736sub add {
687 my ($self, @widgets) = @_; 737 my ($self, @widgets) = @_;
688 738
689 $_->set_parent ($self) 739 $_->set_parent ($self)
690 for @widgets; 740 for @widgets;
691 741
742 # TODO: only do this in widgets that need it, e.g. root, fixed
692 use sort 'stable'; 743 use sort 'stable';
693 744
694 $self->{children} = [ 745 $self->{children} = [
695 sort { $a->{z} <=> $b->{z} } 746 sort { $a->{z} <=> $b->{z} }
696 @{$self->{children}}, @widgets 747 @{$self->{children}}, @widgets
697 ]; 748 ];
698 749
699 $self->realloc; 750 $self->realloc;
751
752 $self->emit (c_add => \@widgets);
753
754 map $_+0, @widgets
700} 755}
701 756
702sub children { 757sub children {
703 @{ $_[0]{children} } 758 @{ $_[0]{children} }
704} 759}
705 760
706sub remove { 761sub remove {
707 my ($self, $child) = @_; 762 my ($self, @widgets) = @_;
708 763
764 $self->emit (c_remove => \@widgets);
765
766 for my $child (@widgets) {
709 delete $child->{parent}; 767 delete $child->{parent};
710 $child->hide; 768 $child->hide;
711
712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 769 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
770 }
713 771
714 $self->realloc; 772 $self->realloc;
715} 773}
716 774
717sub clear { 775sub clear {
718 my ($self) = @_; 776 my ($self) = @_;
719 777
720 my $children = delete $self->{children}; 778 my $children = $self->{children};
721 $self->{children} = []; 779 $self->{children} = [];
722 780
723 for (@$children) { 781 for (@$children) {
724 delete $_->{parent}; 782 delete $_->{parent};
725 $_->hide; 783 $_->hide;
… …
745} 803}
746 804
747sub _draw { 805sub _draw {
748 my ($self) = @_; 806 my ($self) = @_;
749 807
750 $_->draw for @{$self->{children}}; 808 $_->draw for $self->visible_children;
751} 809}
752 810
753############################################################################# 811#############################################################################
754 812
755package CFClient::UI::Bin; 813package DC::UI::Bin;
756 814
757our @ISA = CFClient::UI::Container::; 815our @ISA = DC::UI::Container::;
758 816
759sub new { 817sub new {
760 my ($class, %arg) = @_; 818 my ($class, %arg) = @_;
761 819
762 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 820 my $child = (delete $arg{child}) || new DC::UI::Empty::;
763 821
764 $class->SUPER::new (children => [$child], %arg) 822 $class->SUPER::new (children => [$child], %arg)
765} 823}
766 824
767sub add { 825sub add {
768 my ($self, $child) = @_; 826 my ($self, $child) = @_;
769 827
770 $self->SUPER::remove ($_) for @{ $self->{children} }; 828 $self->clear;
771 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
772} 830}
773 831
774sub remove { 832sub remove {
775 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
776 834
777 $self->SUPER::remove ($widget); 835 $self->SUPER::remove ($widget);
778 836
779 $self->{children} = [new CFClient::UI::Empty] 837 $self->{children} = [new DC::UI::Empty]
780 unless @{$self->{children}}; 838 unless @{$self->{children}};
781} 839}
782 840
783sub child { $_[0]->{children}[0] } 841sub child { $_[0]->{children}[0] }
784 842
… …
793 851
794 1 852 1
795} 853}
796 854
797############################################################################# 855#############################################################################
798
799# back-buffered drawing area 856# back-buffered drawing area
800 857
801package CFClient::UI::Window; 858package DC::UI::Window;
802 859
803our @ISA = CFClient::UI::Bin::; 860our @ISA = DC::UI::Bin::;
804 861
805use CFClient::OpenGL; 862use DC::OpenGL;
806 863
807sub new { 864sub new {
808 my ($class, %arg) = @_; 865 my ($class, %arg) = @_;
809 866
810 my $self = $class->SUPER::new (%arg); 867 my $self = $class->SUPER::new (%arg);
… …
832} 889}
833 890
834sub render_child { 891sub render_child {
835 my ($self) = @_; 892 my ($self) = @_;
836 893
837 $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 {
838 glClearColor 0, 0, 0, 0; 895 glClearColor 0, 0, 0, 0;
839 glClear GL_COLOR_BUFFER_BIT; 896 glClear GL_COLOR_BUFFER_BIT;
840 897
841 { 898 {
842 package CFClient::UI::Base; 899 package DC::UI::Base;
843 900
844 ($draw_x, $draw_y, $draw_w, $draw_h) = 901 local ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h}); 902 (0, 0, $self->{w}, $self->{h});
903
904 $self->_render;
846 } 905 }
847
848 $self->_render;
849 }; 906 };
850} 907}
851 908
852sub _draw { 909sub _draw {
853 my ($self) = @_; 910 my ($self) = @_;
854
855 my ($w, $h) = @$self{qw(w h)};
856 911
857 my $tex = $self->{texture} 912 my $tex = $self->{texture}
858 or return; 913 or return;
859 914
860 glEnable GL_TEXTURE_2D; 915 glEnable GL_TEXTURE_2D;
861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
862 glColor 0, 0, 0, 1; 917 glColor 0, 0, 0, 1;
863 918
864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 919 $tex->draw_quad_alpha_premultiplied (0, 0);
865 920
866 glDisable GL_TEXTURE_2D; 921 glDisable GL_TEXTURE_2D;
867} 922}
868 923
869############################################################################# 924#############################################################################
870 925
871package CFClient::UI::ViewPort; 926package DC::UI::ViewPort;
872 927
928use List::Util qw(min max);
929
873our @ISA = CFClient::UI::Window::; 930our @ISA = DC::UI::Window::;
874 931
875sub new { 932sub new {
876 my $class = shift; 933 my $class = shift;
877 934
878 $class->SUPER::new ( 935 $class->SUPER::new (
… …
885sub size_request { 942sub size_request {
886 my ($self) = @_; 943 my ($self) = @_;
887 944
888 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 945 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
889 946
890 $w = 10 if $self->{scroll_x}; 947 $w = 1 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y}; 948 $h = 1 if $self->{scroll_y};
892 949
893 ($w, $h) 950 ($w, $h)
894} 951}
895 952
896sub invoke_size_allocate { 953sub invoke_size_allocate {
… …
908} 965}
909 966
910sub set_offset { 967sub set_offset {
911 my ($self, $x, $y) = @_; 968 my ($self, $x, $y) = @_;
912 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}) {
913 $self->{view_x} = int $x; 974 $self->{view_x} = $x;
914 $self->{view_y} = int $y; 975 $self->{view_y} = $y;
915 976
977 $self->emit (changed => $x, $y);
916 $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 }
917} 998}
918 999
919# 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
920sub coord2local { 1001sub coord2local {
921 my ($self, $x, $y) = @_; 1002 my ($self, $x, $y) = @_;
… …
936 my ($self, $x, $y) = @_; 1017 my ($self, $x, $y) = @_;
937 1018
938 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
939 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
940 ) { 1021 ) {
941 $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})
942 } else { 1023 } else {
943 $self->CFClient::UI::Base::find_widget ($x, $y) 1024 $self->DC::UI::Base::find_widget ($x, $y)
944 } 1025 }
945} 1026}
946 1027
947sub _render { 1028sub _render {
948 my ($self) = @_; 1029 my ($self) = @_;
949 1030
950 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};
951 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};
952 1033
953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1034 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
954 1035
955 $self->SUPER::_render; 1036 $self->SUPER::_render;
956} 1037}
957 1038
958############################################################################# 1039#############################################################################
959 1040
960package CFClient::UI::ScrolledWindow; 1041package DC::UI::ScrolledWindow;
961 1042
962our @ISA = CFClient::UI::HBox::; 1043our @ISA = DC::UI::Table::;
963 1044
964sub new { 1045sub new {
965 my ($class, %arg) = @_; 1046 my ($class, %arg) = @_;
966 1047
967 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
968 1049
969 my $self; 1050 my $self;
970 1051
971 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,
972 vertical => 1, 1066 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub { 1068 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]); 1069 $self->{vpos} = $_[1];
1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
976 }, 1071 },
977 ; 1072 ;
978 1073
979 $self = $class->SUPER::new ( 1074 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1075 scroll_x => 0,
1076 scroll_y => 1,
1077 can_events => 1,
981 slider => $slider, 1078 hslider => $hslider,
1079 vslider => $vslider,
1080 col_expand => [1, 0],
1081 row_expand => [1, 0],
982 %arg, 1082 %arg,
983 ); 1083 );
984 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
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1106 $self->SUPER::add ($self->{vp});
1107
986 $self->add ($child) if $child; 1108 $self->add ($child) if $child;
987 1109
988 $self 1110 $self
989} 1111}
990
991#TODO# update range on size_allocate depending on child
992 1112
993sub add { 1113sub add {
994 my ($self, $widget) = @_; 1114 my ($self, $widget) = @_;
995 1115
996 $self->{vp}->add ($self->{child} = $widget); 1116 $self->{vp}->add ($self->{child} = $widget);
997} 1117}
998 1118
1119sub set_offset { shift->{vp}->set_offset (@_) }
1120sub set_center { shift->{vp}->set_center (@_) }
1121sub make_visible { shift->{vp}->make_visible (@_) }
1122
999sub update_slider { 1123sub update_slider {
1000 my ($self) = @_; 1124 my ($self) = @_;
1001 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});
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1130 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1003}
1004 1131
1005sub update { 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 {
1006 my ($self) = @_; 1154 my ($self, $ev) = @_;
1007 1155
1008 $self->SUPER::update; 1156 $self->grab_focus;
1009 1157
1010 $self->update_slider; 1158 my $ox = $self->{vp}{view_x};
1159 my $oy = $self->{vp}{view_y};
1160
1161 $self->{motion} = sub {
1162 my ($ev, $x, $y) = @_;
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
1011} 1210}
1012 1211
1013sub invoke_size_allocate { 1212sub invoke_size_allocate {
1014 my ($self, $w, $h) = @_; 1213 my ($self, $w, $h) = @_;
1015 1214
1016 $self->update_slider; 1215 $self->update_slider;
1017
1018 $self->SUPER::invoke_size_allocate ($w, $h) 1216 $self->SUPER::invoke_size_allocate ($w, $h)
1019} 1217}
1020 1218
1021############################################################################# 1219#############################################################################
1022 1220
1023package CFClient::UI::Frame; 1221package DC::UI::Frame;
1024 1222
1025our @ISA = CFClient::UI::Bin::; 1223our @ISA = DC::UI::Bin::;
1026 1224
1027use CFClient::OpenGL; 1225use DC::OpenGL;
1028 1226
1029sub new { 1227sub new {
1030 my $class = shift; 1228 my $class = shift;
1031 1229
1032 $class->SUPER::new ( 1230 $class->SUPER::new (
… …
1042 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1043 1241
1044 glEnable GL_BLEND; 1242 glEnable GL_BLEND;
1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1243 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1046 glColor_premultiply @{ $self->{bg} }; 1244 glColor_premultiply @{ $self->{bg} };
1047
1048 glBegin GL_QUADS;
1049 glVertex 0 , 0;
1050 glVertex 0 , $h;
1051 glVertex $w, $h; 1245 glRect 0, 0, $w, $h;
1052 glVertex $w, 0;
1053 glEnd;
1054
1055 glDisable GL_BLEND; 1246 glDisable GL_BLEND;
1056 } 1247 }
1057 1248
1058 $self->SUPER::_draw; 1249 $self->SUPER::_draw;
1059} 1250}
1060 1251
1061############################################################################# 1252#############################################################################
1062 1253
1063package CFClient::UI::FancyFrame; 1254package DC::UI::FancyFrame;
1064 1255
1065our @ISA = CFClient::UI::Bin::; 1256our @ISA = DC::UI::Bin::;
1066 1257
1067use CFClient::OpenGL; 1258use DC::OpenGL;
1259
1260sub new {
1261 my ($class, %arg) = @_;
1262
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 }
1270
1271 my $self = $class->SUPER::new (
1272 # label => "",
1273 fg => undef,
1274 border => 0.8,
1275 style => 'single',
1276 %arg,
1277 );
1278
1279 $self
1280}
1281
1282sub add {
1283 my ($self, @widgets) = @_;
1284
1285 $self->SUPER::add (@widgets);
1286 $self->DC::UI::Container::add ($self->{label}) if $self->{label};
1287}
1288
1289sub border {
1290 int $_[0]{border} * $::FONTSIZE
1291}
1292
1293sub size_request {
1294 my ($self) = @_;
1295
1296 ($self->{label_w}, undef) = $self->{label}->size_request
1297 if $self->{label};
1298
1299 my ($w, $h) = $self->SUPER::size_request;
1300
1301 (
1302 $w + $self->border * 2,
1303 $h + $self->border * 2,
1304 )
1305}
1306
1307sub invoke_size_allocate {
1308 my ($self, $w, $h) = @_;
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
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;
1068 1359
1069my $bg = 1360my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1361 new_from_resource DC::Texture "d1_bg.png",
1071 mipmap => 1, wrap => 1; 1362 mipmap => 1, wrap => 1;
1072 1363
1073my @border = 1364my @border =
1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1365 map { new_from_resource DC::Texture $_, mipmap => 1 }
1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 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);
1076 1371
1077sub new { 1372sub new {
1078 my ($class, %arg) = @_; 1373 my ($class, %arg) = @_;
1079 1374
1080 my $self = $class->SUPER::new ( 1375 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1376 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1377 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1378 border => 0.8,
1084 can_events => 1, 1379 can_events => 1,
1085 min_w => 16, 1380 min_w => 64,
1086 min_h => 16, 1381 min_h => 32,
1087 %arg, 1382 %arg,
1088 ); 1383 );
1089 1384
1090 $self->{title_widget} = new CFClient::UI::Label 1385 $self->{title_widget} = new DC::UI::Label
1091 align => 0, 1386 align => 0.5,
1092 valign => 1, 1387 valign => 1,
1093 text => $self->{title}, 1388 text => $self->{title},
1094 fontsize => $self->{border}, 1389 fontsize => $self->{border},
1095 if exists $self->{title}; 1390 if exists $self->{title};
1096 1391
1097 if ($self->{has_close_button}) { 1392 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1393 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1394 new DC::UI::ImageButton
1100 path => 'x1_close.png', 1395 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1396 on_activate => sub { $self->emit ("delete") };
1102 1397
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1398 $self->DC::UI::Container::add ($self->{close_button});
1104 } 1399 }
1105 1400
1106 $self 1401 $self
1107} 1402}
1108 1403
1109sub add { 1404sub add {
1110 my ($self, @widgets) = @_; 1405 my ($self, @widgets) = @_;
1111 1406
1112 $self->SUPER::add (@widgets); 1407 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button}; 1408 $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1409 $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1115} 1410}
1116 1411
1117sub border { 1412sub border {
1118 int $_[0]{border} * $::FONTSIZE 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
1119} 1423}
1120 1424
1121sub size_request { 1425sub size_request {
1122 my ($self) = @_; 1426 my ($self) = @_;
1123 1427
… …
1152 $self->child->configure ($border, $border, $w, $h); 1456 $self->child->configure ($border, $border, $w, $h);
1153 1457
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1458 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1459 if $self->{close_button};
1156 1460
1461 1
1462}
1463
1464sub invoke_delete {
1465 my ($self) = @_;
1466
1467 $self->hide;
1468
1157 1 1469 1
1158} 1470}
1159 1471
1160sub invoke_button_down { 1472sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1473 my ($self, $ev, $x, $y) = @_;
… …
1219 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1531 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220 1532
1221 ! ! $self->{motion} 1533 ! ! $self->{motion}
1222} 1534}
1223 1535
1536sub invoke_visibility_change {
1537 my ($self, $visible) = @_;
1538
1539 delete $self->{motion} unless $visible;
1540
1541 0
1542}
1543
1224sub _draw { 1544sub _draw {
1225 my ($self) = @_; 1545 my ($self) = @_;
1226 1546
1227 my $child = $self->{children}[0]; 1547 my $child = $self->{children}[0];
1228 1548
… …
1232 glEnable GL_TEXTURE_2D; 1552 glEnable GL_TEXTURE_2D;
1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1234 1554
1235 my $border = $self->border; 1555 my $border = $self->border;
1236 1556
1557 if ($border) {
1237 glColor @{ $self->{border_bg} }; 1558 glColor @{ $self->{border_bg} };
1238 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1559 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1239 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1560 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1240 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1561 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1241 $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 }
1242 1578
1243 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1579 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1244 glColor @{ $self->{bg} }; 1580 glColor @{ $self->{bg} };
1245 1581
1246 # TODO: repeat texture not scale 1582 # TODO: repeat texture not scale
… …
1265 if $self->{close_button}; 1601 if $self->{close_button};
1266} 1602}
1267 1603
1268############################################################################# 1604#############################################################################
1269 1605
1270package CFClient::UI::Table; 1606package DC::UI::Table;
1271 1607
1272our @ISA = CFClient::UI::Base::; 1608our @ISA = DC::UI::Container::;
1273 1609
1274use List::Util qw(max sum); 1610use List::Util qw(max sum);
1275 1611
1276use CFClient::OpenGL; 1612use DC::OpenGL;
1277 1613
1278sub new { 1614sub new {
1279 my $class = shift; 1615 my $class = shift;
1280 1616
1281 $class->SUPER::new ( 1617 $class->SUPER::new (
1282 col_expand => [], 1618 col_expand => [],
1619 row_expand => [],
1283 @_, 1620 @_,
1284 ) 1621 )
1285} 1622}
1286 1623
1287sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1289}
1290
1291sub add { 1624sub add {
1292 my ($self, $x, $y, $child) = @_; 1625 my ($self, @widgets) = @_;
1293 1626
1294 $child->set_parent ($self); 1627 for my $child (@widgets) {
1295 $self->{children}[$y][$x] = $child; 1628 $child->{c_rowspan} ||= 1;
1629 $child->{c_colspan} ||= 1;
1630 }
1296 1631
1297 $self->realloc; 1632 $self->SUPER::add (@widgets);
1298} 1633}
1299 1634
1300sub remove { 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 {
1301 my ($self, $child) = @_; 1653 my ($self) = @_;
1302 1654
1303 # TODO: not yet implemented 1655 my (@w, @h);
1304}
1305
1306# TODO: move to container class maybe? send children a signal on removal?
1307sub clear {
1308 my ($self) = @_;
1309 1656
1310 my @children = $self->children; 1657 my @children = $self->children;
1311 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 }
1312 1668 }
1313 for (@children) {
1314 delete $_->{parent};
1315 $_->hide;
1316 }
1317 1669
1318 $self->realloc; 1670 # second pass, rows
1319} 1671 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1320
1321sub get_wh {
1322 my ($self) = @_;
1323
1324 my (@w, @h);
1325
1326 for my $y (0 .. $#{$self->{children}}) {
1327 my $row = $self->{children}[$y]
1328 or next;
1329
1330 for my $x (0 .. $#$row) {
1331 my $widget = $row->[$x]
1332 or next;
1333 my ($w, $h) = @$widget{qw(req_w req_h)}; 1672 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1334 1673
1335 $w[$x] = max $w[$x], $w; 1674 my $sh = sum @h[$r .. $r + $rs - 1];
1336 $h[$y] = max $h[$y], $h; 1675
1676 if ($h > $sh) {
1677 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1337 } 1678 }
1338 } 1679 }
1339 1680
1340 (\@w, \@h) 1681 (\@w, \@h)
1341} 1682}
… …
1357 my ($ws, $hs) = $self->get_wh; 1698 my ($ws, $hs) = $self->get_wh;
1358 1699
1359 my $req_w = (sum @$ws) || 1; 1700 my $req_w = (sum @$ws) || 1;
1360 my $req_h = (sum @$hs) || 1; 1701 my $req_h = (sum @$hs) || 1;
1361 1702
1362 # TODO: nicer code && do row_expand 1703 # now linearly scale the rows/columns to the allocated size
1363 my @col_expand = @{$self->{col_expand}}; 1704 my @col_expand = @{$self->{col_expand}};
1364 @col_expand = (1) x @$ws unless @col_expand; 1705 @col_expand = (1) x @$ws unless @col_expand;
1365 my $col_expand = (sum @col_expand) || 1; 1706 my $col_expand = (sum @col_expand) || 1;
1366 1707
1367 # linearly scale sizes
1368 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1708 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1369 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1370 1709
1371 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
1372 CFClient::UI::harmonize $hs; 1718 DC::UI::harmonize $hs;
1373 1719
1374 my $y; 1720 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1721 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1375 1722
1376 for my $r (0 .. $#{$self->{children}}) { 1723 for my $widget ($self->children) {
1377 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)};
1378 or next;
1379 1725
1380 my $x = 0; 1726 $widget->configure (
1381 my $row_h = $hs->[$r]; 1727 $x[$c], $y[$r],
1728 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1382 1729 );
1383 for my $c (0 .. $#$row) { 1730 }
1384 my $col_w = $ws->[$c];
1385 1731
1386 if (my $widget = $row->[$c]) { 1732 1
1387 $widget->configure ($x, $y, $col_w, $row_h); 1733}
1388 }
1389 1734
1390 $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};
1391 } 1762 }
1763 }
1392 1764
1393 $y += $row_h; 1765 my $W = $x2 - $x1;
1766 my $H = $y2 - $y1;
1767
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 {
1786 my ($self, $W, $H) = @_;
1787
1788 for my $child ($self->visible_children) {
1789 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1790 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1791
1792 $x += $child->{c_halign} * $child->{req_w};
1793 $y += $child->{c_valign} * $child->{req_h};
1794
1795 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1394 } 1796 }
1395 1797
1396 1 1798 1
1397} 1799}
1398 1800
1399sub find_widget {
1400 my ($self, $x, $y) = @_;
1401
1402 $x -= $self->{x};
1403 $y -= $self->{y};
1404
1405 my $res;
1406
1407 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1408 $res = $_->find_widget ($x, $y)
1409 and return $res;
1410 }
1411
1412 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1413}
1414
1415sub _draw {
1416 my ($self) = @_;
1417
1418 for (grep $_, @{$self->{children}}) {
1419 $_->draw for grep $_, @$_;
1420 }
1421}
1422
1423############################################################################# 1801#############################################################################
1424 1802
1425package CFClient::UI::Box; 1803package DC::UI::Box;
1426 1804
1427our @ISA = CFClient::UI::Container::; 1805our @ISA = DC::UI::Container::;
1428 1806
1429sub size_request { 1807sub size_request {
1430 my ($self) = @_; 1808 my ($self) = @_;
1809
1810 my @children = $self->visible_children;
1431 1811
1432 $self->{vertical} 1812 $self->{vertical}
1433 ? ( 1813 ? (
1434 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1814 (List::Util::max map $_->{req_w}, @children),
1435 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1815 (List::Util::sum map $_->{req_h}, @children),
1436 ) 1816 )
1437 : ( 1817 : (
1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1818 (List::Util::sum map $_->{req_w}, @children),
1439 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1819 (List::Util::max map $_->{req_h}, @children),
1440 ) 1820 )
1441} 1821}
1442 1822
1443sub invoke_size_allocate { 1823sub invoke_size_allocate {
1444 my ($self, $w, $h) = @_; 1824 my ($self, $w, $h) = @_;
… …
1465 $req[$_] += $space * $children[$_]{expand} 1845 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children; 1846 for 0 .. $#children;
1467 } 1847 }
1468 } 1848 }
1469 1849
1470 CFClient::UI::harmonize \@req; 1850 DC::UI::harmonize \@req;
1471 1851
1472 my $pos = 0; 1852 my $pos = 0;
1473 for (0 .. $#children) { 1853 for (0 .. $#children) {
1474 my $alloc = $req[$_]; 1854 my $alloc = $req[$_];
1475 $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));
… …
1480 1 1860 1
1481} 1861}
1482 1862
1483############################################################################# 1863#############################################################################
1484 1864
1485package CFClient::UI::HBox; 1865package DC::UI::HBox;
1486 1866
1487our @ISA = CFClient::UI::Box::; 1867our @ISA = DC::UI::Box::;
1488 1868
1489sub new { 1869sub new {
1490 my $class = shift; 1870 my $class = shift;
1491 1871
1492 $class->SUPER::new ( 1872 $class->SUPER::new (
… …
1495 ) 1875 )
1496} 1876}
1497 1877
1498############################################################################# 1878#############################################################################
1499 1879
1500package CFClient::UI::VBox; 1880package DC::UI::VBox;
1501 1881
1502our @ISA = CFClient::UI::Box::; 1882our @ISA = DC::UI::Box::;
1503 1883
1504sub new { 1884sub new {
1505 my $class = shift; 1885 my $class = shift;
1506 1886
1507 $class->SUPER::new ( 1887 $class->SUPER::new (
… …
1510 ) 1890 )
1511} 1891}
1512 1892
1513############################################################################# 1893#############################################################################
1514 1894
1515package CFClient::UI::Label; 1895package DC::UI::Label;
1516 1896
1517our @ISA = CFClient::UI::DrawBG::; 1897our @ISA = DC::UI::DrawBG::;
1518 1898
1519use CFClient::OpenGL; 1899use DC::OpenGL;
1520 1900
1521sub new { 1901sub new {
1522 my ($class, %arg) = @_; 1902 my ($class, %arg) = @_;
1523 1903
1524 my $self = $class->SUPER::new ( 1904 my $self = $class->SUPER::new (
… …
1527 #active_bg => none 1907 #active_bg => none
1528 #font => default_font 1908 #font => default_font
1529 #text => initial text 1909 #text => initial text
1530 #markup => initial narkup 1910 #markup => initial narkup
1531 #max_w => maximum pixel width 1911 #max_w => maximum pixel width
1912 #style => 0, # render flags
1532 ellipsise => 3, # end 1913 ellipsise => 3, # end
1533 layout => (new CFClient::Layout), 1914 layout => (new DC::Layout),
1534 fontsize => 1, 1915 fontsize => 1,
1535 align => -1, 1916 align => 0.5,
1536 valign => -1, 1917 valign => 0.5,
1537 padding_x => 2, 1918 padding_x => 4,
1538 padding_y => 2, 1919 padding_y => 2,
1539 can_events => 0, 1920 can_events => 0,
1540 %arg 1921 %arg
1541 ); 1922 );
1542 1923
1543 if (exists $self->{template}) { 1924 if (exists $self->{template}) {
1544 my $layout = new CFClient::Layout; 1925 my $layout = new DC::Layout;
1545 $layout->set_text (delete $self->{template}); 1926 $layout->set_text (delete $self->{template});
1546 $self->{template} = $layout; 1927 $self->{template} = $layout;
1547 } 1928 }
1548 1929
1549 if (exists $self->{markup}) { 1930 if (exists $self->{markup}) {
… …
1553 } 1934 }
1554 1935
1555 $self 1936 $self
1556} 1937}
1557 1938
1558sub escape($) {
1559 local $_ = $_[0];
1560
1561 s/&/&amp;/g;
1562 s/>/&gt;/g;
1563 s/</&lt;/g;
1564
1565 $_
1566}
1567
1568sub update { 1939sub update {
1569 my ($self) = @_; 1940 my ($self) = @_;
1570 1941
1571 delete $self->{texture}; 1942 delete $self->{texture};
1572 $self->SUPER::update; 1943 $self->SUPER::update;
… …
1577 1948
1578 delete $self->{ox}; 1949 delete $self->{ox};
1579 $self->SUPER::realloc; 1950 $self->SUPER::realloc;
1580} 1951}
1581 1952
1953sub clear {
1954 my ($self) = @_;
1955
1956 $self->set_text ("");
1957}
1958
1582sub set_text { 1959sub set_text {
1583 my ($self, $text) = @_; 1960 my ($self, $text) = @_;
1584 1961
1585 return if $self->{text} eq "T$text"; 1962 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1963 $self->{text} = "T$text";
1587 1964
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1965 $self->{layout}->set_text ($text);
1590 1966
1591 delete $self->{size_req}; 1967 delete $self->{size_req};
1592 $self->realloc; 1968 $self->realloc;
1593 $self->update; 1969 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1975 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1976 $self->{text} = "M$markup";
1601 1977
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1978 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1979
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1980 $self->{layout}->set_markup ($markup);
1606 1981
1607 delete $self->{size_req}; 1982 delete $self->{size_req};
1608 $self->realloc; 1983 $self->realloc;
1609 $self->update; 1984 $self->update;
… …
1611 1986
1612sub size_request { 1987sub size_request {
1613 my ($self) = @_; 1988 my ($self) = @_;
1614 1989
1615 $self->{size_req} ||= do { 1990 $self->{size_req} ||= do {
1991 my ($max_w, $max_h) = $self->get_max_wh;
1992
1616 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1993 $self->{layout}->set_font ($self->{font}) if $self->{font};
1617 $self->{layout}->set_width ($self->{max_w} || -1); 1994 $self->{layout}->set_width ($max_w);
1618 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1995 $self->{layout}->set_ellipsise ($self->{ellipsise});
1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1996 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1621 1998
1622 my ($w, $h) = $self->{layout}->size; 1999 my ($w, $h) = $self->{layout}->size;
1623 2000
1624 if (exists $self->{template}) { 2001 if (exists $self->{template}) {
1625 $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);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2004 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 2005
1628 my ($w2, $h2) = $self->{template}->size; 2006 my ($w2, $h2) = $self->{template}->size;
1629 2007
1630 $w = List::Util::max $w, $w2; 2008 $w = List::Util::max $w, $w2;
… …
1664 2042
1665sub reconfigure { 2043sub reconfigure {
1666 my ($self) = @_; 2044 my ($self) = @_;
1667 2045
1668 delete $self->{size_req}; 2046 delete $self->{size_req};
2047 delete $self->{texture};
1669 2048
1670 $self->SUPER::reconfigure; 2049 $self->SUPER::reconfigure;
1671} 2050}
1672 2051
1673sub _draw { 2052sub _draw {
1674 my ($self) = @_; 2053 my ($self) = @_;
1675 2054
1676 $self->SUPER::_draw; # draw background, if applicable 2055 $self->SUPER::_draw; # draw background, if applicable
1677 2056
1678 my $tex = $self->{texture} ||= do { 2057 my $size = $self->{texture} ||= do {
1679 $self->{layout}->set_foreground (@{$self->{fg}}); 2058 $self->{layout}->set_foreground (@{$self->{fg}});
1680 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2059 $self->{layout}->set_font ($self->{font}) if $self->{font};
1681 $self->{layout}->set_width ($self->{w}); 2060 $self->{layout}->set_width ($self->{w});
1682 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2061 $self->{layout}->set_ellipsise ($self->{ellipsise});
1683 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2062 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1684 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2063 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1685 2064
1686 new_from_layout CFClient::Texture $self->{layout} 2065 [$self->{layout}->size]
1687 }; 2066 };
1688 2067
1689 unless (exists $self->{ox}) { 2068 unless (exists $self->{ox}) {
1690 $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);
1691 : $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);
1692 : ($self->{w} - $tex->{w}) * 0.5);
1693 2071
1694 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2072 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1695 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1696 : ($self->{h} - $tex->{h}) * 0.5);
1697 }; 2073 };
1698 2074
1699 glEnable GL_TEXTURE_2D; 2075# unless ($self->{list}) {
1700 2076# $self->{list} = DC::OpenGL::glGenList;
1701 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 2077# DC::OpenGL::glNewList $self->{list};
1702 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 2078# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1703 2079# DC::OpenGL::glEndList;
1704 if ($tex->{format} == GL_ALPHA) {
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1706 glColor @{$self->{fg}};
1707 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1708 } else {
1709 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1710 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1711 } 2080# }
2081#
2082# DC::OpenGL::glCallList $self->{list};
1712 2083
1713 glDisable GL_TEXTURE_2D; 2084 $self->{layout}->draw;
1714} 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#}
1715 2094
1716############################################################################# 2095#############################################################################
1717 2096
1718package CFClient::UI::EntryBase; 2097package DC::UI::EntryBase;
1719 2098
1720our @ISA = CFClient::UI::Label::; 2099our @ISA = DC::UI::Label::;
1721 2100
1722use CFClient::OpenGL; 2101use DC::OpenGL;
1723 2102
1724sub new { 2103sub new {
1725 my $class = shift; 2104 my $class = shift;
1726 2105
1727 $class->SUPER::new ( 2106 $class->SUPER::new (
1728 fg => [1, 1, 1], 2107 fg => [1, 1, 1],
1729 bg => [0, 0, 0, 0.2], 2108 bg => [0, 0, 0, 0.2],
2109 outline => undef,
1730 active_bg => [1, 1, 1, 0.5], 2110 active_bg => [0, 0, 1, .2],
1731 active_fg => [0, 0, 0], 2111 active_fg => [1, 1, 1],
2112 active_outline => [1, 1, 0],
1732 can_hover => 1, 2113 can_hover => 1,
1733 can_focus => 1, 2114 can_focus => 1,
2115 align => 0,
1734 valign => 0, 2116 valign => 0.5,
1735 can_events => 1, 2117 can_events => 1,
2118 ellipsise => 0,
2119 padding_x => 4,
2120 padding_y => 2,
1736 #text => ... 2121 #text => ...
1737 #hidden => "*", 2122 #hidden => "*",
1738 @_ 2123 @_
1739 ) 2124 )
1740} 2125}
… …
1785 my $sym = $ev->{sym}; 2170 my $sym = $ev->{sym};
1786 my $uni = $ev->{unicode}; 2171 my $uni = $ev->{unicode};
1787 2172
1788 my $text = $self->get_text; 2173 my $text = $self->get_text;
1789 2174
1790 if ($uni == 8) { 2175 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2176
2177 if ($sym == DC::SDLK_BACKSPACE) {
1791 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2178 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1792 } elsif ($uni == 127) { 2179 } elsif ($sym == DC::SDLK_DELETE) {
1793 substr $text, $self->{cursor}, 1, ""; 2180 substr $text, $self->{cursor}, 1, "";
1794 } elsif ($sym == CFClient::SDLK_LEFT) { 2181 } elsif ($sym == DC::SDLK_LEFT) {
1795 --$self->{cursor} if $self->{cursor}; 2182 --$self->{cursor} if $self->{cursor};
1796 } elsif ($sym == CFClient::SDLK_RIGHT) { 2183 } elsif ($sym == DC::SDLK_RIGHT) {
1797 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2184 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1798 } 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 = "";
1799 $self->{cursor} = 0; 2199 $self->{cursor} = 0;
1800 } elsif ($sym == CFClient::SDLK_END) {
1801 $self->{cursor} = length $text;
1802 } elsif ($uni == 27) { 2200 } elsif ($uni == 27) {
1803 $self->emit ('escape'); 2201 $self->emit ('escape');
1804 } elsif ($uni) { 2202 } elsif ($uni == 0x0d) {
2203 substr $text, $self->{cursor}++, 0, "\012";
2204 } elsif ($uni >= 0x20) {
1805 substr $text, $self->{cursor}++, 0, chr $uni; 2205 substr $text, $self->{cursor}++, 0, chr $uni;
1806 } else { 2206 } else {
1807 return 0; 2207 return 0;
1808 } 2208 }
1809 2209
1810 $self->_set_text ($text); 2210 $self->_set_text ($text);
1811 2211
1812 $self->realloc; 2212 $self->realloc;
2213 $self->update;
1813 2214
1814 1 2215 1
1815} 2216}
1816 2217
1817sub invoke_focus_in { 2218sub invoke_focus_in {
… …
1829 2230
1830 my $idx = $self->{layout}->xy_to_index ($x, $y); 2231 my $idx = $self->{layout}->xy_to_index ($x, $y);
1831 2232
1832 # byte-index to char-index 2233 # byte-index to char-index
1833 my $text = $self->{text}; 2234 my $text = $self->{text};
1834 utf8::encode $text; 2235 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1835 $self->{cursor} = length substr $text, 0, $idx; 2236 $self->{cursor} = length $text;
1836 2237
1837 $self->_set_text ($self->{text}); 2238 $self->_set_text ($self->{text});
1838 $self->update; 2239 $self->update;
1839 2240
1840 1 2241 1
… …
1859 glColor_premultiply @{$self->{bg}}; 2260 glColor_premultiply @{$self->{bg}};
1860 } 2261 }
1861 2262
1862 glEnable GL_BLEND; 2263 glEnable GL_BLEND;
1863 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2264 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1864 glBegin GL_QUADS;
1865 glVertex 0 , 0;
1866 glVertex 0 , $self->{h};
1867 glVertex $self->{w}, $self->{h}; 2265 glRect 0, 0, $self->{w}, $self->{h};
1868 glVertex $self->{w}, 0;
1869 glEnd;
1870 glDisable GL_BLEND; 2266 glDisable GL_BLEND;
1871 2267
1872 $self->SUPER::_draw; 2268 $self->SUPER::_draw;
1873 2269
1874 #TODO: force update every cursor change :( 2270 #TODO: force update every cursor change :(
… …
1876 2272
1877 unless (exists $self->{cur_h}) { 2273 unless (exists $self->{cur_h}) {
1878 my $text = substr $self->{text}, 0, $self->{cursor}; 2274 my $text = substr $self->{text}, 0, $self->{cursor};
1879 utf8::encode $text; 2275 utf8::encode $text;
1880 2276
1881 @$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);
1882 } 2278 }
1883 2279
1884 glColor @{$self->{fg}}; 2280 glColor_premultiply @{$self->{active_fg}};
1885 glBegin GL_LINES; 2281 glBegin GL_LINES;
1886 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2282 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1887 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};
1888 glEnd; 2284 glEnd;
1889 }
1890}
1891 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
1892package CFClient::UI::Entry; 2304package DC::UI::Entry;
1893 2305
1894our @ISA = CFClient::UI::EntryBase::; 2306our @ISA = DC::UI::EntryBase::;
1895 2307
1896use CFClient::OpenGL; 2308use DC::OpenGL;
2309
2310sub new {
2311 my $class = shift;
2312
2313 $class->SUPER::new (
2314 history_pointer => -1,
2315 @_
2316 )
2317}
2318
1897 2319
1898sub invoke_key_down { 2320sub invoke_key_down {
1899 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
1900 2322
1901 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
1902 2324
1903 if ($sym == 13) { 2325 if ($ev->{uni} == 0x0d || $sym == 13) {
1904 unshift @{$self->{history}}, 2326 unshift @{$self->{history}},
1905 my $txt = $self->get_text; 2327 my $txt = $self->get_text;
1906 2328
1907 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
1908 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
1909 $self->emit (activate => $txt); 2331 $self->emit (activate => $txt);
1910 $self->update; 2332 $self->update;
1911 2333
1912 } elsif ($sym == CFClient::SDLK_UP) { 2334 } elsif ($sym == DC::SDLK_UP) {
1913 if ($self->{history_pointer} < 0) { 2335 if ($self->{history_pointer} < 0) {
1914 $self->{history_saveback} = $self->get_text; 2336 $self->{history_saveback} = $self->get_text;
1915 } 2337 }
1916 if (@{$self->{history} || []} > 0) { 2338 if (@{$self->{history} || []} > 0) {
1917 $self->{history_pointer}++; 2339 $self->{history_pointer}++;
… …
1919 $self->{history_pointer} = @{$self->{history} || []} - 1; 2341 $self->{history_pointer} = @{$self->{history} || []} - 1;
1920 } 2342 }
1921 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1922 } 2344 }
1923 2345
1924 } elsif ($sym == CFClient::SDLK_DOWN) { 2346 } elsif ($sym == DC::SDLK_DOWN) {
1925 $self->{history_pointer}--; 2347 $self->{history_pointer}--;
1926 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2348 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1927 2349
1928 if ($self->{history_pointer} >= 0) { 2350 if ($self->{history_pointer} >= 0) {
1929 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2351 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1930 } else { 2352 } else {
2353 if (defined $self->{history_saveback}) {
1931 $self->set_text ($self->{history_saveback}); 2354 $self->set_text ($self->{history_saveback});
2355 $self->{history_saveback} = undef;
2356 }
1932 } 2357 }
1933 2358
1934 } else { 2359 } else {
1935 return $self->SUPER::invoke_key_down ($ev) 2360 return $self->SUPER::invoke_key_down ($ev)
1936 } 2361 }
… …
1938 1 2363 1
1939} 2364}
1940 2365
1941############################################################################# 2366#############################################################################
1942 2367
1943package CFClient::UI::Button; 2368package DC::UI::TextEdit;
1944 2369
1945our @ISA = CFClient::UI::Label::; 2370our @ISA = DC::UI::EntryBase::;
1946 2371
1947use CFClient::OpenGL; 2372use DC::OpenGL;
1948
1949my @tex =
1950 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1951 qw(b1_button_active.png);
1952 2373
1953sub new { 2374sub new {
1954 my $class = shift; 2375 my $class = shift;
1955 2376
1956 $class->SUPER::new ( 2377 $class->SUPER::new (
1957 padding_x => 4,
1958 padding_y => 4, 2378 padding_y => 4,
1959 fg => [1, 1, 1], 2379
1960 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 (
1961 can_hover => 1, 2431 can_hover => 1,
1962 align => 0, 2432 align => 0.5,
1963 valign => 0, 2433 valign => 0.5,
1964 can_events => 1, 2434 can_events => 1,
1965 @_ 2435 @_
1966 ) 2436 )
1967} 2437}
1968 2438
… …
1977} 2447}
1978 2448
1979sub _draw { 2449sub _draw {
1980 my ($self) = @_; 2450 my ($self) = @_;
1981 2451
1982 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1983
1984 glEnable GL_TEXTURE_2D; 2452 glEnable GL_TEXTURE_2D;
1985 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1986 glColor 0, 0, 0, 1; 2454 glColor 0, 0, 0, 1;
1987 2455
2456 my $tex = $tex[$GRAB == $self];
1988 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2457 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1989 2458
1990 glDisable GL_TEXTURE_2D; 2459 glDisable GL_TEXTURE_2D;
1991 2460
1992 $self->SUPER::_draw; 2461 $self->SUPER::_draw;
1993} 2462}
1994 2463
1995############################################################################# 2464#############################################################################
1996 2465
1997package CFClient::UI::ImageButton; 2466package DC::UI::Button;
1998 2467
1999our @ISA = CFClient::UI::Image::; 2468our @ISA = DC::UI::Label::;
2000 2469
2001use CFClient::OpenGL; 2470use DC::OpenGL;
2002 2471
2003my %textures; 2472my @tex =
2473 map { new_from_resource DC::Texture $_, mipmap => 1 }
2474 qw(b1_button_inactive.png b1_button_active.png);
2004 2475
2005sub new { 2476sub new {
2006 my $class = shift; 2477 my $class = shift;
2007 2478
2008 my $self = $class->SUPER::new ( 2479 $class->SUPER::new (
2009 padding_x => 4, 2480 padding_x => 8,
2010 padding_y => 4, 2481 padding_y => 4,
2011 fg => [1, 1, 1], 2482 fg => [1.0, 1.0, 1.0],
2012 active_fg => [0, 0, 1], 2483 active_fg => [0.8, 0.8, 0.8],
2013 can_hover => 1, 2484 can_hover => 1,
2014 align => 0, 2485 align => 0.5,
2015 valign => 0, 2486 valign => 0.5,
2016 can_events => 1, 2487 can_events => 1,
2017 @_ 2488 @_
2018 ); 2489 )
2019} 2490}
2020 2491
2021sub invoke_button_up { 2492sub invoke_button_up {
2022 my ($self, $ev, $x, $y) = @_; 2493 my ($self, $ev, $x, $y) = @_;
2023 2494
… …
2026 && $y >= 0 && $y < $self->{h}; 2497 && $y >= 0 && $y < $self->{h};
2027 2498
2028 1 2499 1
2029} 2500}
2030 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
2031############################################################################# 2519#############################################################################
2032 2520
2033package CFClient::UI::CheckBox; 2521package DC::UI::CheckBox;
2034 2522
2035our @ISA = CFClient::UI::DrawBG::; 2523our @ISA = DC::UI::DrawBG::;
2036 2524
2037my @tex = 2525my @tex =
2038 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2526 map { new_from_resource DC::Texture $_, mipmap => 1 }
2039 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2527 qw(c1_checkbox_bg.png c1_checkbox_active.png);
2040 2528
2041use CFClient::OpenGL; 2529use DC::OpenGL;
2042 2530
2043sub new { 2531sub new {
2044 my $class = shift; 2532 my $class = shift;
2045 2533
2046 $class->SUPER::new ( 2534 $class->SUPER::new (
2535 fontsize => 1,
2047 padding_x => 2, 2536 padding_x => 2,
2048 padding_y => 2, 2537 padding_y => 2,
2049 fg => [1, 1, 1], 2538 fg => [1, 1, 1],
2050 active_fg => [1, 1, 0], 2539 active_fg => [1, 1, 0],
2051 bg => [0, 0, 0, 0.2], 2540 bg => [0, 0, 0, 0.2],
… …
2057} 2546}
2058 2547
2059sub size_request { 2548sub size_request {
2060 my ($self) = @_; 2549 my ($self) = @_;
2061 2550
2062 (6) x 2 2551 ($self->{fontsize} * $::FONTSIZE) x 2
2552}
2553
2554sub toggle {
2555 my ($self) = @_;
2556
2557 $self->{state} = !$self->{state};
2558 $self->emit (changed => $self->{state});
2559 $self->update;
2063} 2560}
2064 2561
2065sub invoke_button_down { 2562sub invoke_button_down {
2066 my ($self, $ev, $x, $y) = @_; 2563 my ($self, $ev, $x, $y) = @_;
2067 2564
2068 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2565 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2069 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2566 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2070 $self->{state} = !$self->{state}; 2567 $self->toggle;
2071 $self->emit (changed => $self->{state});
2072 } else { 2568 } else {
2073 return 0 2569 return 0
2074 } 2570 }
2075 2571
2076 1 2572 1
… …
2079sub _draw { 2575sub _draw {
2080 my ($self) = @_; 2576 my ($self) = @_;
2081 2577
2082 $self->SUPER::_draw; 2578 $self->SUPER::_draw;
2083 2579
2084 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2580 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2085 2581
2086 my ($w, $h) = @$self{qw(w h)}; 2582 my ($w, $h) = @$self{qw(w h)};
2087 2583
2088 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;
2089 2585
… …
2096 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2097} 2593}
2098 2594
2099############################################################################# 2595#############################################################################
2100 2596
2101package CFClient::UI::Image; 2597package DC::UI::Image;
2102 2598
2103our @ISA = CFClient::UI::Base::; 2599our @ISA = DC::UI::DrawBG::;
2104 2600
2105use CFClient::OpenGL; 2601use DC::OpenGL;
2106 2602
2107our %texture_cache; 2603our %texture_cache;
2108 2604
2109sub new { 2605sub new {
2110 my $class = shift; 2606 my $class = shift;
2111 2607
2112 my $self = $class->SUPER::new ( 2608 my $self = $class->SUPER::new (
2113 can_events => 0, 2609 can_events => 0,
2610 scale => 1,
2114 @_, 2611 @_,
2115 ); 2612 );
2116 2613
2614 $self->{path} || $self->{tex}
2615 or Carp::croak "'path' or 'tex' attributes required";
2616
2617 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2618 new_from_resource DC::Texture $self->{path}, mipmap => 1;
2619
2620 DC::weaken $texture_cache{$self->{path}};
2621
2622 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2623
2624 $self
2625}
2626
2627sub STORABLE_freeze {
2628 my ($self, $cloning) = @_;
2629
2117 $self->{path} 2630 $self->{path}
2118 or Carp::croak "required attribute 'path' not set"; 2631 or die "cannot serialise DC::UI::Image on non-loadable images\n";
2119 2632
2120 $self->{tex} = $texture_cache{$self->{path}} ||= 2633 $self->{path}
2121 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2634}
2122 2635
2123 Scalar::Util::weaken $texture_cache{$self->{path}}; 2636sub STORABLE_attach {
2637 my ($self, $cloning, $path) = @_;
2124 2638
2125 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2639 $self->new (path => $path)
2640}
2126 2641
2127 $self 2642sub set_texture {
2643 my ($self, $tex) = @_;
2644
2645 $self->{tex} = $tex;
2646 $self->update;
2128} 2647}
2129 2648
2130sub size_request { 2649sub size_request {
2131 my ($self) = @_; 2650 my ($self) = @_;
2132 2651
2133 ($self->{tex}{w}, $self->{tex}{h}) 2652 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2134} 2653}
2135 2654
2136sub _draw { 2655sub _draw {
2137 my ($self) = @_; 2656 my ($self) = @_;
2657
2658 $self->SUPER::_draw;
2138 2659
2139 my $tex = $self->{tex}; 2660 my $tex = $self->{tex};
2140 2661
2141 my ($w, $h) = ($self->{w}, $self->{h}); 2662 my ($w, $h) = ($self->{w}, $self->{h});
2142 2663
… …
2155 glDisable GL_TEXTURE_2D; 2676 glDisable GL_TEXTURE_2D;
2156} 2677}
2157 2678
2158############################################################################# 2679#############################################################################
2159 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
2160package CFClient::UI::VGauge; 2721package DC::UI::VGauge;
2161 2722
2162our @ISA = CFClient::UI::Base::; 2723our @ISA = DC::UI::Base::;
2163 2724
2164use List::Util qw(min max); 2725use List::Util qw(min max);
2165 2726
2166use CFClient::OpenGL; 2727use DC::OpenGL;
2167 2728
2168my %tex = ( 2729my %tex = (
2169 food => [ 2730 food => [
2170 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2731 map { new_from_resource DC::Texture $_, mipmap => 1 }
2171 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2732 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2172 ], 2733 ],
2173 grace => [ 2734 grace => [
2174 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2735 map { new_from_resource DC::Texture $_, mipmap => 1 }
2175 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/
2176 ], 2737 ],
2177 hp => [ 2738 hp => [
2178 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2739 map { new_from_resource DC::Texture $_, mipmap => 1 }
2179 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2740 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2180 ], 2741 ],
2181 mana => [ 2742 mana => [
2182 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2743 map { new_from_resource DC::Texture $_, mipmap => 1 }
2183 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/
2184 ], 2745 ],
2185); 2746);
2186 2747
2187# eg. VGauge->new (gauge => 'food'), default gauge: food 2748# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2247 my $ycut1 = max 0, min 1, $ycut; 2808 my $ycut1 = max 0, min 1, $ycut;
2248 my $ycut2 = max 0, min 1, $ycut - 1; 2809 my $ycut2 = max 0, min 1, $ycut - 1;
2249 2810
2250 my $h1 = $self->{h} * (1 - $ycut1); 2811 my $h1 = $self->{h} * (1 - $ycut1);
2251 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);
2252 2816
2253 glEnable GL_BLEND; 2817 glEnable GL_BLEND;
2254 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2818 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2255 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2819 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2256 glEnable GL_TEXTURE_2D; 2820 glEnable GL_TEXTURE_2D;
… …
2275 2839
2276 if ($t3) { 2840 if ($t3) {
2277 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2841 glBindTexture GL_TEXTURE_2D, $t3->{name};
2278 glBegin GL_QUADS; 2842 glBegin GL_QUADS;
2279 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2843 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2280 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2844 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2281 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2845 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2282 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2846 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2283 glEnd; 2847 glEnd;
2284 } 2848 }
2285 2849
2286 glDisable GL_BLEND; 2850 glDisable GL_BLEND;
2287 glDisable GL_TEXTURE_2D; 2851 glDisable GL_TEXTURE_2D;
2288} 2852}
2289 2853
2290############################################################################# 2854#############################################################################
2291 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
2292package CFClient::UI::Gauge; 3010package DC::UI::Gauge;
2293 3011
2294our @ISA = CFClient::UI::VBox::; 3012our @ISA = DC::UI::VBox::;
2295 3013
2296sub new { 3014sub new {
2297 my ($class, %arg) = @_; 3015 my ($class, %arg) = @_;
2298 3016
2299 my $self = $class->SUPER::new ( 3017 my $self = $class->SUPER::new (
… …
2301 can_hover => 1, 3019 can_hover => 1,
2302 can_events => 1, 3020 can_events => 1,
2303 %arg, 3021 %arg,
2304 ); 3022 );
2305 3023
2306 $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");
2307 $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);
2308 $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");
2309 3027
2310 $self 3028 $self
2311} 3029}
2312 3030
2313sub set_fontsize { 3031sub set_fontsize {
… …
2334 $self->{value}->set_text ($val); 3052 $self->{value}->set_text ($val);
2335} 3053}
2336 3054
2337############################################################################# 3055#############################################################################
2338 3056
2339package CFClient::UI::Slider; 3057package DC::UI::Slider;
2340 3058
2341use strict; 3059use common::sense;
2342 3060
2343use CFClient::OpenGL; 3061use DC::OpenGL;
2344 3062
2345our @ISA = CFClient::UI::DrawBG::; 3063our @ISA = DC::UI::DrawBG::;
2346 3064
2347my @tex = 3065my @tex =
2348 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 3066 map { new_from_resource DC::Texture $_ }
2349 qw(s1_slider.png s1_slider_bg.png); 3067 qw(s1_slider.png s1_slider_bg.png);
2350 3068
2351sub new { 3069sub new {
2352 my $class = shift; 3070 my $class = shift;
2353 3071
… …
2390sub set_value { 3108sub set_value {
2391 my ($self, $value) = @_; 3109 my ($self, $value) = @_;
2392 3110
2393 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3111 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2394 3112
2395 $hi = $lo + 1 if $hi <= $lo; 3113 $hi = $lo if $hi < $lo;
2396 3114
2397 $page = $hi - $lo if $page > $hi - $lo; 3115 $value = $hi - $page if $value > $hi - $page;
2398
2399 $value = $lo if $value < $lo; 3116 $value = $lo if $value < $lo;
2400 $value = $hi - $page if $value > $hi - $page;
2401 3117
2402 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3118 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2403 if $unit; 3119 if $unit;
2404 3120
2405 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3121 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
… …
2421 3137
2422 $self->SUPER::invoke_button_down ($ev, $x, $y); 3138 $self->SUPER::invoke_button_down ($ev, $x, $y);
2423 3139
2424 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3140 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2425 3141
2426 $self->invoke_mouse_motion ($ev, $x, $y) 3142 $self->invoke_mouse_motion ($ev, $x, $y);
3143
3144 1
2427} 3145}
2428 3146
2429sub invoke_mouse_motion { 3147sub invoke_mouse_motion {
2430 my ($self, $ev, $x, $y) = @_; 3148 my ($self, $ev, $x, $y) = @_;
2431 3149
2432 if ($GRAB == $self) { 3150 if ($GRAB == $self) {
2433 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3151 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2434 3152
2435 my (undef, $lo, $hi, $page) = @{$self->{range}}; 3153 my (undef, $lo, $hi, $page) = @{$self->{range}};
2436 3154
2437 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 3155 $x = ($x - $self->{click}[1]) / ($w * $self->{scale} || 1e999);
2438 3156
2439 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3157 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2440 } else { 3158 } else {
2441 return 0; 3159 return 0;
2442 } 3160 }
2443 3161
2444 1 3162 1
2445} 3163}
2446 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
2447sub update { 3177sub update {
2448 my ($self) = @_; 3178 my ($self) = @_;
2449 3179
2450 delete $self->{knob_w}; 3180 delete $self->{knob_w};
2451 $self->SUPER::update; 3181 $self->SUPER::update;
… …
2455 my ($self) = @_; 3185 my ($self) = @_;
2456 3186
2457 unless ($self->{knob_w}) { 3187 unless ($self->{knob_w}) {
2458 $self->set_value ($self->{range}[0]); 3188 $self->set_value ($self->{range}[0]);
2459 3189
2460 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3190 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2461 my $range = ($hi - $page - $lo) || 1e-100; 3191 my $range = ($hi - $page - $lo) || 1e-10;
2462 3192
2463 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};
2464 3194
2465 $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;
2466 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3196 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2467 3197
2468 $value = ($value - $lo) / $range; 3198 $value = ($value - $lo) / $range;
… …
2498 glDisable GL_TEXTURE_2D; 3228 glDisable GL_TEXTURE_2D;
2499} 3229}
2500 3230
2501############################################################################# 3231#############################################################################
2502 3232
2503package CFClient::UI::ValSlider; 3233package DC::UI::ValSlider;
2504 3234
2505our @ISA = CFClient::UI::HBox::; 3235our @ISA = DC::UI::HBox::;
2506 3236
2507sub new { 3237sub new {
2508 my ($class, %arg) = @_; 3238 my ($class, %arg) = @_;
2509 3239
2510 my $range = delete $arg{range}; 3240 my $range = delete $arg{range};
2511 3241
2512 my $self = $class->SUPER::new ( 3242 my $self = $class->SUPER::new (
2513 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3243 slider => (new DC::UI::Slider expand => 1, range => $range),
2514 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3244 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2515 to_value => sub { shift }, 3245 to_value => sub { shift },
2516 from_value => sub { shift }, 3246 from_value => sub { shift },
2517 %arg, 3247 %arg,
2518 ); 3248 );
2519 3249
… …
2539sub set_range { shift->{slider}->set_range (@_) } 3269sub set_range { shift->{slider}->set_range (@_) }
2540sub set_value { shift->{slider}->set_value (@_) } 3270sub set_value { shift->{slider}->set_value (@_) }
2541 3271
2542############################################################################# 3272#############################################################################
2543 3273
2544package CFClient::UI::TextScroller; 3274package DC::UI::TextScroller;
2545 3275
2546our @ISA = CFClient::UI::HBox::; 3276our @ISA = DC::UI::HBox::;
2547 3277
2548use CFClient::OpenGL; 3278use DC::OpenGL;
2549 3279
2550sub new { 3280sub new {
2551 my $class = shift; 3281 my $class = shift;
2552 3282
2553 my $self = $class->SUPER::new ( 3283 my $self = $class->SUPER::new (
2554 fontsize => 1, 3284 fontsize => 1,
2555 can_events => 0, 3285 can_events => 1,
2556 indent => 0, 3286 indent => 0,
2557 #font => default_font 3287 #font => default_font
2558 @_, 3288 @_,
2559 3289
2560 layout => (new CFClient::Layout 1), 3290 layout => (new DC::Layout),
2561 par => [], 3291 par => [],
3292 max_par => 0,
2562 height => 0, 3293 height => 0,
2563 children => [ 3294 children => [
2564 (new CFClient::UI::Empty expand => 1), 3295 (new DC::UI::Empty expand => 1),
2565 (new CFClient::UI::Slider vertical => 1), 3296 (new DC::UI::Slider vertical => 1),
2566 ], 3297 ],
2567 ); 3298 );
2568 3299
2569 $self->{children}[1]->connect (changed => sub { $self->update }); 3300 $self->{children}[1]->connect (changed => sub { $self->update });
2570 3301
… …
2579} 3310}
2580 3311
2581sub size_request { 3312sub size_request {
2582 my ($self) = @_; 3313 my ($self) = @_;
2583 3314
2584 my ($empty, $slider) = @{ $self->{children} }; 3315 my ($empty, $slider) = $self->visible_children;
2585 3316
2586 local $self->{children} = [$empty, $slider]; 3317 local $self->{children} = [$empty, $slider];
2587 $self->SUPER::size_request 3318 $self->SUPER::size_request
2588} 3319}
2589 3320
… …
2600 3331
2601 $self->reflow; 3332 $self->reflow;
2602 3333
2603 local $self->{children} = [$empty, $slider]; 3334 local $self->{children} = [$empty, $slider];
2604 $self->SUPER::invoke_size_allocate ($w, $h) 3335 $self->SUPER::invoke_size_allocate ($w, $h)
3336}
3337
3338sub invoke_mouse_wheel {
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
2605} 3346}
2606 3347
2607sub get_layout { 3348sub get_layout {
2608 my ($self, $para) = @_; 3349 my ($self, $para) = @_;
2609 3350
… …
2616 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 3357 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2617 $layout->set_markup ($para->{markup}); 3358 $layout->set_markup ($para->{markup});
2618 3359
2619 $layout->set_shapes ( 3360 $layout->set_shapes (
2620 map 3361 map
2621 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}), 3362 +(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2622 @{$para->{widget}} 3363 @{$para->{widget}}
2623 ); 3364 );
2624 3365
2625 $layout 3366 $layout
2626} 3367}
… …
2635sub set_offset { 3376sub set_offset {
2636 my ($self, $offset) = @_; 3377 my ($self, $offset) = @_;
2637 3378
2638 # todo: base offset on lines or so, not on pixels 3379 # todo: base offset on lines or so, not on pixels
2639 $self->{children}[1]->set_value ($offset); 3380 $self->{children}[1]->set_value ($offset);
3381}
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;
2640} 3396}
2641 3397
2642sub clear { 3398sub clear {
2643 my ($self) = @_; 3399 my ($self) = @_;
2644 3400
… …
2649 $self->{height} = 0; 3405 $self->{height} = 0;
2650 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3406 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2651} 3407}
2652 3408
2653sub add_paragraph { 3409sub add_paragraph {
2654 my ($self, $color, $para, $indent) = @_; 3410 my $self = shift;
2655 3411
2656 my ($text, @w) = ref $para ? @$para : $para; 3412 for my $para (@_) {
2657
2658 $para = { 3413 $para = {
3414 fg => [1, 1, 1, 1],
3415 indent => 0,
3416 markup => "",
3417 widget => [],
3418 ref $para ? %$para : (markup => $para),
2659 w => 1e10, 3419 w => 1e10,
2660 wrapped => 1, 3420 wrapped => 1,
2661 fg => $color,
2662 indent => $indent,
2663 markup => $text,
2664 widget => \@w,
2665 }; 3421 };
2666 3422
2667 $self->add (@w) if @w; 3423 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2668 push @{$self->{par}}, $para; 3424 push @{$self->{par}}, $para;
3425 }
3426
3427 if (my $max = $self->{max_par}) {
3428 shift @{$self->{par}} while @{$self->{par}} > $max;
3429 }
2669 3430
2670 $self->{need_reflow}++; 3431 $self->{need_reflow}++;
2671 $self->update; 3432 $self->update;
2672} 3433}
2673 3434
2674sub scroll_to_bottom { 3435sub scroll_to_bottom {
2675 my ($self) = @_; 3436 my ($self) = @_;
2676 3437
2677 $self->{scroll_to_bottom} = 1; 3438 $self->{scroll_to} = $#{$self->{par}};
2678 $self->update; 3439 $self->update;
2679} 3440}
2680 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
3464 $self->{height} = $height;
3465 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
3466
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 }
3473}
3474
2681sub update { 3475sub update {
2682 my ($self) = @_; 3476 my ($self) = @_;
2683 3477
2684 $self->SUPER::update; 3478 $self->SUPER::update;
2685 3479
2686 return unless $self->{h} > 0; 3480 return unless $self->{h} > 0;
2687 3481
2688 delete $self->{texture}; 3482 delete $self->{texture};
2689 3483
2690 $ROOT->on_post_alloc ($self => sub { 3484 $ROOT->on_post_alloc ($self => sub {
3485 $self->force_uptodate;
3486
2691 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3487 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2692 3488
2693 if (delete $self->{need_reflow}) {
2694 my $height = 0;
2695
2696 for my $para (@{$self->{par}}) {
2697 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2698 my $layout = $self->get_layout ($para);
2699 my ($w, $h) = $layout->size;
2700
2701 $para->{w} = $w + $para->{indent};
2702 $para->{h} = $h;
2703 $para->{wrapped} = $layout->has_wrapped;
2704 }
2705
2706 $height += $para->{h};
2707 }
2708
2709 $self->{height} = $height;
2710
2711 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2712
2713 delete $self->{texture};
2714 }
2715
2716 if (delete $self->{scroll_to_bottom}) {
2717 $self->{children}[1]->set_value (1e10);
2718 }
2719
2720 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3489 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2721 glClearColor 0, 0, 0, 0; 3490 glClearColor 0, 0, 0, 0;
2722 glClear GL_COLOR_BUFFER_BIT; 3491 glClear GL_COLOR_BUFFER_BIT;
2723 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;
2724 my $top = int $self->{children}[1]{range}[0]; 3501 my $top = int $self->{children}[1]{range}[0];
2725 3502
2726 my $y0 = $top; 3503 my $y0 = $top;
2727 my $y1 = $top + $H; 3504 my $y1 = $top + $H;
2728 3505
2729 my $y = 0;
2730
2731 glEnable GL_BLEND;
2732 #TODO# not correct in windows where rgba is forced off
2733 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2734
2735 for my $para (@{$self->{par}}) { 3506 for my $para (@{$self->{par}}) {
2736 my $h = $para->{h}; 3507 my $h = $para->{h};
3508 my $y = $para->{y};
2737 3509
2738 if ($y0 < $y + $h && $y < $y1) { 3510 if ($y0 < $y + $h && $y < $y1) {
2739
2740 my $layout = $self->get_layout ($para); 3511 my $layout = $self->get_layout ($para);
2741 3512
2742 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2743
2744 glRasterPos $para->{indent}, $y - $y0; 3513 $layout->render ($para->{indent}, $y - $y0);
2745 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3514 $layout->draw;
2746 3515
2747 if (my @w = @{ $para->{widget} }) { 3516 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes; 3517 my @s = $layout->get_shapes;
2749 3518
2750 glDisable GL_BLEND;
2751 for (@w) { 3519 for (@w) {
2752 my ($dx, $dy) = splice @s, 0, 2, (); 3520 my ($dx, $dy) = splice @s, 0, 2, ();
2753 3521
2754 $_->{x} = $dx + $para->{indent}; 3522 $_->{x} = $dx + $para->{indent};
2755 $_->{y} = $dy + $y - $y0; 3523 $_->{y} = $dy + $y - $y0;
2756 3524
2757 $_->draw; 3525 $_->draw;
2758 } 3526 }
2759 glEnable GL_BLEND;
2760 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761 } 3527 }
2762 } 3528 }
2763 3529
2764 $y += $h; 3530 $paridx++;
3531 $top_paragraph ||= $paridx if $y >= $top;
2765 } 3532 }
2766 3533
2767 glDisable GL_BLEND; 3534 $self->{top_paragraph} = $top_paragraph;
2768 }; 3535 };
2769 }); 3536 });
2770} 3537}
2771 3538
2772sub reconfigure { 3539sub reconfigure {
… …
2790 $self->{children}[1]->draw; 3557 $self->{children}[1]->draw;
2791} 3558}
2792 3559
2793############################################################################# 3560#############################################################################
2794 3561
2795package CFClient::UI::Animator; 3562package DC::UI::Animator;
2796 3563
2797use CFClient::OpenGL; 3564use DC::OpenGL;
2798 3565
2799our @ISA = CFClient::UI::Bin::; 3566our @ISA = DC::UI::Bin::;
2800 3567
2801sub moveto { 3568sub moveto {
2802 my ($self, $x, $y) = @_; 3569 my ($self, $x, $y) = @_;
2803 3570
2804 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3571 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2832 glPopMatrix; 3599 glPopMatrix;
2833} 3600}
2834 3601
2835############################################################################# 3602#############################################################################
2836 3603
2837package CFClient::UI::Flopper; 3604package DC::UI::Flopper;
2838 3605
2839our @ISA = CFClient::UI::Button::; 3606our @ISA = DC::UI::Button::;
2840 3607
2841sub new { 3608sub new {
2842 my $class = shift; 3609 my $class = shift;
2843 3610
2844 my $self = $class->SUPER::new ( 3611 my $self = $class->SUPER::new (
… …
2856 $self->{other}->toggle_visibility; 3623 $self->{other}->toggle_visibility;
2857} 3624}
2858 3625
2859############################################################################# 3626#############################################################################
2860 3627
2861package CFClient::UI::Tooltip; 3628package DC::UI::Tooltip;
2862 3629
2863our @ISA = CFClient::UI::Bin::; 3630our @ISA = DC::UI::Bin::;
2864 3631
2865use CFClient::OpenGL; 3632use DC::OpenGL;
2866 3633
2867sub new { 3634sub new {
2868 my $class = shift; 3635 my $class = shift;
2869 3636
2870 $class->SUPER::new ( 3637 $class->SUPER::new (
… …
2874} 3641}
2875 3642
2876sub set_tooltip_from { 3643sub set_tooltip_from {
2877 my ($self, $widget) = @_; 3644 my ($self, $widget) = @_;
2878 3645
2879 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 =~ /^#(.*)$/;
2880 3651
2881 if ($ENV{CFPLUS_DEBUG} & 2) { 3652 if ($ENV{CFPLUS_DEBUG} & 2) {
2882 $tooltip .= "\n\n" . (ref $widget) . "\n" 3653 $tip .= "\n\n" . (ref $widget) . "\n"
2883 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3654 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2884 . "req $widget->{req_w} $widget->{req_h}\n" 3655 . "req $widget->{req_w} $widget->{req_h}\n"
2885 . "visible $widget->{visible}"; 3656 . "visible $widget->{visible}";
2886 } 3657 }
2887 3658
2888 $tooltip =~ s/^\n+//; 3659 $tip =~ s/^\n+//;
2889 $tooltip =~ s/\n+$//; 3660 $tip =~ s/\n+$//;
2890 3661
2891 $self->add (new CFClient::UI::Label 3662 $self->add (new DC::UI::Label
3663 fg => $DC::THEME{tooltip_fg},
2892 markup => $tooltip, 3664 markup => $tip,
2893 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3665 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3666 align => 0,
2894 fontsize => 0.8, 3667 fontsize => 0.8,
2895 fg => [0, 0, 0, 1], 3668 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
2896 ellipsise => 0, 3669 ellipsise => 0,
2897 font => ($widget->{tooltip_font} || $::FONT_PROP), 3670 font => ($widget->{tooltip_font} || $::FONT_PROP),
2898 ); 3671 );
2899} 3672}
2900 3673
… …
2919 3692
2920 $self->{root}->on_post_alloc ("move_$self" => sub { 3693 $self->{root}->on_post_alloc ("move_$self" => sub {
2921 my $widget = $self->{owner} 3694 my $widget = $self->{owner}
2922 or return; 3695 or return;
2923 3696
3697 if ($widget->{visible}) {
2924 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3698 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2925 3699
2926 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3700 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2927 if $x + $self->{w} > $self->{root}{w}; 3701 if $x + $self->{w} > $self->{root}{w};
2928 3702
2929 $self->move_abs ($x, $y); 3703 $self->move_abs ($x, $y);
3704 } else {
3705 $self->hide;
3706 }
2930 }); 3707 });
2931} 3708}
2932 3709
2933sub _draw { 3710sub _draw {
2934 my ($self) = @_; 3711 my ($self) = @_;
2935 3712
2936 glTranslate 0.375, 0.375;
2937
2938 my ($w, $h) = @$self{qw(w h)}; 3713 my ($w, $h) = @$self{qw(w h)};
2939 3714
2940 glColor 1, 0.8, 0.4; 3715 glColor @{ $DC::THEME{tooltip_bg} };
2941 glBegin GL_QUADS; 3716 glRect 0, 0, $w, $h;
2942 glVertex 0 , 0;
2943 glVertex 0 , $h;
2944 glVertex $w, $h;
2945 glVertex $w, 0;
2946 glEnd;
2947 3717
2948 glColor 0, 0, 0; 3718 glColor @{ $DC::THEME{tooltip_border} };
2949 glBegin GL_LINE_LOOP; 3719 glRect_lineloop .5, .5, $w + .5, $h + .5;
2950 glVertex 0 , 0;
2951 glVertex 0 , $h;
2952 glVertex $w, $h;
2953 glVertex $w, 0;
2954 glEnd;
2955 3720
2956 glTranslate 2 - 0.375, 2 - 0.375; 3721 glTranslate 2, 2;
2957 3722
2958 $self->SUPER::_draw; 3723 $self->SUPER::_draw;
2959} 3724}
2960 3725
2961############################################################################# 3726#############################################################################
2962 3727
2963package CFClient::UI::Face; 3728package DC::UI::Face;
2964 3729
2965our @ISA = CFClient::UI::Base::; 3730our @ISA = DC::UI::DrawBG::;
2966 3731
2967use CFClient::OpenGL; 3732use DC::OpenGL;
2968 3733
2969sub new { 3734sub new {
2970 my $class = shift; 3735 my $class = shift;
2971 3736
2972 my $self = $class->SUPER::new ( 3737 my $self = $class->SUPER::new (
3738 size_w => 32,
3739 size_h => 8,
2973 aspect => 1, 3740 aspect => 1,
2974 can_events => 0, 3741 can_events => 0,
2975 @_, 3742 @_,
2976 ); 3743 );
2977 3744
2978 if ($self->{anim} && $self->{animspeed}) { 3745 $self->update_anim;
2979 Scalar::Util::weaken (my $widget = $self);
2980
2981 $self->{timer} = Event->timer (
2982 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2983 hard => 1,
2984 interval => $self->{animspeed},
2985 cb => sub {
2986 ++$widget->{frame};
2987 $widget->update;
2988 },
2989 );
2990 }
2991 3746
2992 $self 3747 $self
2993} 3748}
2994 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
2995sub size_request { 3809sub size_request {
2996 (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)
2997} 3827}
2998 3828
2999sub update { 3829sub update {
3000 my ($self) = @_; 3830 my ($self) = @_;
3001 3831
3002 return unless $self->{visible}; 3832 return unless $self->{visible};
3003 3833
3004 $self->SUPER::update; 3834 $self->SUPER::update;
3005} 3835}
3006 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
3007sub _draw { 3866sub _draw {
3008 my ($self) = @_; 3867 my ($self) = @_;
3009 3868
3010 return unless $::CONN; 3869 $self->SUPER::_draw;
3011 3870
3012 my $face; 3871 if (my $tex = $self->{tex}) {
3013
3014 if ($self->{frame}) {
3015 my $anim = $::CONN->{anim}[$self->{anim}];
3016
3017 $face = $anim->[ $self->{frame} % @$anim ]
3018 if $anim && @$anim;
3019 }
3020
3021 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3022
3023 if ($tex) {
3024 glEnable GL_TEXTURE_2D; 3872 glEnable GL_TEXTURE_2D;
3025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3873 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3026 glColor 0, 0, 0, 1; 3874 glColor 0, 0, 0, 1;
3027 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3875 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3028 glDisable GL_TEXTURE_2D; 3876 glDisable GL_TEXTURE_2D;
… …
3030} 3878}
3031 3879
3032sub destroy { 3880sub destroy {
3033 my ($self) = @_; 3881 my ($self) = @_;
3034 3882
3035 $self->{timer}->cancel 3883 (delete $self->{timer})->cancel
3036 if $self->{timer}; 3884 if $self->{timer};
3037 3885
3038 $self->SUPER::destroy; 3886 $self->SUPER::destroy;
3039} 3887}
3040 3888
3041############################################################################# 3889#############################################################################
3042 3890
3043package CFClient::UI::Buttonbar; 3891package DC::UI::Buttonbar;
3044 3892
3045our @ISA = CFClient::UI::HBox::; 3893our @ISA = DC::UI::HBox::;
3046 3894
3047# TODO: should actualyl wrap buttons and other goodies. 3895# TODO: should actually wrap buttons and other goodies.
3048 3896
3049############################################################################# 3897#############################################################################
3050 3898
3051package CFClient::UI::Menu; 3899package DC::UI::Menu;
3052 3900
3053our @ISA = CFClient::UI::FancyFrame::; 3901our @ISA = DC::UI::Toplevel::;
3054 3902
3055use CFClient::OpenGL; 3903use DC::OpenGL;
3056 3904
3057sub new { 3905sub new {
3058 my $class = shift; 3906 my $class = shift;
3059 3907
3060 my $self = $class->SUPER::new ( 3908 my $self = $class->SUPER::new (
3061 items => [], 3909 items => [],
3062 z => 100, 3910 z => 100,
3063 @_, 3911 @_,
3064 ); 3912 );
3065 3913
3066 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3914 $self->add ($self->{vbox} = new DC::UI::VBox);
3067 3915
3068 for my $item (@{ $self->{items} }) { 3916 for my $item (@{ $self->{items} }) {
3069 my ($widget, $cb, $tooltip) = @$item; 3917 my ($widget, $cb, $tooltip) = @$item;
3070 3918
3071 # handle various types of items, only text for now 3919 # handle various types of items, only text for now
3072 if (!ref $widget) { 3920 if (!ref $widget) {
3921 if ($widget =~ /\t/) {
3922 my ($left, $right) = split /\t/, $widget, 2;
3923
3073 $widget = new CFClient::UI::Label 3924 $widget = new DC::UI::HBox
3074 can_hover => 1, 3925 can_hover => 1,
3075 can_events => 1, 3926 can_events => 1,
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,
3076 markup => $widget, 3939 markup => $widget,
3077 tooltip => $tooltip 3940 tooltip => $tooltip;
3941 }
3078 } 3942 }
3079 3943
3080 $self->{item}{$widget} = $item; 3944 $self->{item}{$widget} = $item;
3081 3945
3082 $self->{vbox}->add ($widget); 3946 $self->{vbox}->add ($widget);
… …
3094 # maybe save $GRAB? must be careful about events... 3958 # maybe save $GRAB? must be careful about events...
3095 $GRAB = $self; 3959 $GRAB = $self;
3096 $self->{button} = $ev->{button}; 3960 $self->{button} = $ev->{button};
3097 3961
3098 $self->show; 3962 $self->show;
3099 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 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
3100} 3972}
3101 3973
3102sub invoke_mouse_motion { 3974sub invoke_mouse_motion {
3103 my ($self, $ev, $x, $y) = @_; 3975 my ($self, $ev, $x, $y) = @_;
3104 3976
… …
3125 1 3997 1
3126} 3998}
3127 3999
3128############################################################################# 4000#############################################################################
3129 4001
3130package CFClient::UI::Multiplexer; 4002package DC::UI::Multiplexer;
3131 4003
3132our @ISA = CFClient::UI::Container::; 4004our @ISA = DC::UI::Container::;
3133 4005
3134sub new { 4006sub new {
3135 my $class = shift; 4007 my $class = shift;
3136 4008
3137 my $self = $class->SUPER::new ( 4009 my $self = $class->SUPER::new (
3138 @_, 4010 @_,
3139 ); 4011 );
3140 4012
3141 $self->{current} = $self->{children}[0] 4013 $self->set_current_page (0);
3142 if @{ $self->{children} };
3143 4014
3144 $self 4015 $self
3145} 4016}
3146 4017
3147sub add { 4018sub add {
3148 my ($self, @widgets) = @_; 4019 my ($self, @widgets) = @_;
3149 4020
3150 $self->SUPER::add (@widgets); 4021 $self->SUPER::add (@widgets);
3151 4022
3152 $self->{current} = $self->{children}[0] 4023 $self->set_current_page (0)
3153 if @{ $self->{children} }; 4024 if @widgets == @{ $self->{children} };
4025}
4026
4027sub get_current_page {
4028 my ($self) = @_;
4029
4030 $self->{current}
3154} 4031}
3155 4032
3156sub set_current_page { 4033sub set_current_page {
3157 my ($self, $page_or_widget) = @_; 4034 my ($self, $page_or_widget) = @_;
3158 4035
3159 my $widget = ref $page_or_widget 4036 my $widget = ref $page_or_widget
3160 ? $page_or_widget 4037 ? $page_or_widget
3161 : $self->{children}[$page_or_widget]; 4038 : $self->{children}[$page_or_widget];
3162 4039
4040 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4041
3163 $self->{current} = $widget; 4042 if (($self->{current} = $widget)) {
4043 $self->{current}->set_visible if $self->{current} && $self->{visible};
3164 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4044 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3165 4045
3166 $self->emit (page_changed => $self->{current}); 4046 $self->emit (page_changed => $self->{current});
4047 }
3167 4048
3168 $self->realloc; 4049 $self->realloc;
3169} 4050}
3170 4051
3171sub visible_children { 4052sub visible_children {
3172 $_[0]{current} 4053 $_[0]{current} || ()
3173} 4054}
3174 4055
3175sub size_request { 4056sub size_request {
3176 my ($self) = @_; 4057 my ($self) = @_;
3177 4058
4059 $self->{current}
3178 $self->{current}->size_request 4060 ? $self->{current}->size_request
4061 : (0, 0)
3179} 4062}
3180 4063
3181sub invoke_size_allocate { 4064sub invoke_size_allocate {
3182 my ($self, $w, $h) = @_; 4065 my ($self, $w, $h) = @_;
3183 4066
3184 $self->{current}->configure (0, 0, $w, $h); 4067 $self->{current}->configure (0, 0, $w, $h)
4068 if $self->{current};
3185 4069
3186 1 4070 1
3187} 4071}
3188 4072
3189sub _draw { 4073sub _draw {
3190 my ($self) = @_; 4074 my ($self) = @_;
3191 4075
3192 $self->{current}->draw; 4076 $self->{current}->draw
4077 if $self->{current};
3193} 4078}
3194 4079
3195############################################################################# 4080#############################################################################
3196 4081
3197package CFClient::UI::Notebook; 4082package DC::UI::Notebook;
3198 4083
4084use DC::OpenGL;
4085
3199our @ISA = CFClient::UI::VBox::; 4086our @ISA = DC::UI::VBox::;
3200 4087
3201sub new { 4088sub new {
3202 my $class = shift; 4089 my $class = shift;
3203 4090
3204 my $self = $class->SUPER::new ( 4091 my $self = $class->SUPER::new (
3205 buttonbar => (new CFClient::UI::Buttonbar), 4092 buttonbar => (new DC::UI::Buttonbar),
3206 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 4093 multiplexer => (new DC::UI::Multiplexer expand => 1),
4094 active_outline => [.7, .7, 0.2],
3207 # filter => # will be put between multiplexer and $self 4095 # filter => # will be put between multiplexer and $self
3208 @_, 4096 @_,
3209 ); 4097 );
3210 4098
3211 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 4099 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3212 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 4100 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3213 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
3214 $self 4136 $self
3215} 4137}
3216 4138
3217sub 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 {
3218 my ($self, $title, $widget, $tooltip) = @_; 4169 my ($self, $title, $widget, $tooltip) = @_;
3219 4170
3220 Scalar::Util::weaken $self; 4171 $title = [$title, $tooltip] unless ref $title;
4172 $widget->{c_tab} = $title;
3221 4173
3222 $self->{buttonbar}->add (new CFClient::UI::Button
3223 markup => $title,
3224 tooltip => $tooltip,
3225 on_activate => sub { $self->set_current_page ($widget) },
3226 );
3227
3228 $self->{multiplexer}->add ($widget); 4174 $self->add ($widget);
4175}
4176
4177sub get_current_page {
4178 my ($self) = @_;
4179
4180 $self->{multiplexer}->get_current_page
3229} 4181}
3230 4182
3231sub set_current_page { 4183sub set_current_page {
3232 my ($self, $page) = @_; 4184 my ($self, $page) = @_;
3233 4185
3234 $self->{multiplexer}->set_current_page ($page); 4186 $self->{multiplexer}->set_current_page ($page);
3235 $self->emit (page_changed => $self->{multiplexer}{current}); 4187 $self->emit (page_changed => $self->{multiplexer}{current});
3236} 4188}
3237 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 }
4208}
4209
3238############################################################################# 4210#############################################################################
3239 4211
3240package CFClient::UI::Combobox; 4212package DC::UI::Selector;
3241 4213
3242use utf8; 4214use utf8;
3243 4215
3244our @ISA = CFClient::UI::Button::; 4216our @ISA = DC::UI::Button::;
3245 4217
3246sub new { 4218sub new {
3247 my $class = shift; 4219 my $class = shift;
3248 4220
3249 my $self = $class->SUPER::new ( 4221 my $self = $class->SUPER::new (
… …
3266 my ($value, $title, $tooltip) = @$_; 4238 my ($value, $title, $tooltip) = @$_;
3267 4239
3268 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }]; 4240 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3269 } 4241 }
3270 4242
3271 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 4243 DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3272} 4244}
3273 4245
3274sub _set_value { 4246sub _set_value {
3275 my ($self, $value) = @_; 4247 my ($self, $value) = @_;
3276 4248
3277 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4249 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4250 $item ||= $self->{options}[0]
3278 or return; 4251 or return;
3279 4252
3280 $self->{value} = $item->[0]; 4253 $self->{value} = $item->[0];
3281 $self->set_markup ("$item->[1] ⇓"); 4254 $self->set_markup ("$item->[1] ⇓");
3282 $self->set_tooltip ($item->[2]); 4255# $self->set_tooltip ($item->[2]);
3283} 4256}
3284 4257
3285sub set_value { 4258sub set_value {
3286 my ($self, $value) = @_; 4259 my ($self, $value) = @_;
3287 4260
… …
3289 4262
3290 $self->_set_value ($value); 4263 $self->_set_value ($value);
3291 $self->emit (changed => $value); 4264 $self->emit (changed => $value);
3292} 4265}
3293 4266
4267sub set_options {
4268 my ($self, $options) = @_;
4269
4270 $self->{options} = $options;
4271 $self->_set_value ($self->{value});
4272}
4273
3294############################################################################# 4274#############################################################################
3295 4275
3296package CFClient::UI::Statusbox; 4276package DC::UI::Statusbox;
3297 4277
3298our @ISA = CFClient::UI::VBox::; 4278our @ISA = DC::UI::VBox::;
3299 4279
3300sub new { 4280sub new {
3301 my $class = shift; 4281 my $class = shift;
3302 4282
3303 my $self = $class->SUPER::new ( 4283 my $self = $class->SUPER::new (
3304 fontsize => 0.8, 4284 fontsize => 0.8,
3305 @_, 4285 @_,
3306 ); 4286 );
3307 4287
3308 Scalar::Util::weaken (my $this = $self); 4288 DC::weaken (my $this = $self);
3309 4289
3310 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 4290 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3311 4291
3312 $self 4292 $self
3313} 4293}
3314 4294
3315sub reorder { 4295sub reorder {
3316 my ($self) = @_; 4296 my ($self) = @_;
3317 my $NOW = Time::HiRes::time; 4297 my $NOW = EV::time;
3318 4298
3319 # freeze display when hovering over any label 4299 # freeze display when hovering over any label
3320 return if $CFClient::UI::TOOLTIP->{owner} 4300 return if $DC::UI::TOOLTIP->{owner}
3321 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 4301 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3322 values %{ $self->{item} }; 4302 values %{ $self->{item} };
3323 4303
3324 while (my ($k, $v) = each %{ $self->{item} }) { 4304 while (my ($k, $v) = each %{ $self->{item} }) {
3325 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4305 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3326 } 4306 }
4307
4308 $self->{timer}->set (1, 1);
3327 4309
3328 my @widgets; 4310 my @widgets;
3329 4311
3330 my @items = sort { 4312 my @items = sort {
3331 $a->{pri} <=> $b->{pri} 4313 $a->{pri} <=> $b->{pri}
3332 or $b->{id} <=> $a->{id} 4314 or $b->{id} <=> $a->{id}
3333 } values %{ $self->{item} }; 4315 } values %{ $self->{item} };
3334
3335 $self->{timer}->interval (1);
3336 4316
3337 my $count = 10 + 1; 4317 my $count = 10 + 1;
3338 for my $item (@items) { 4318 for my $item (@items) {
3339 last unless --$count; 4319 last unless --$count;
3340 4320
… …
3347 for ($short) { 4327 for ($short) {
3348 s/^\s+//; 4328 s/^\s+//;
3349 s/\s+/ /g; 4329 s/\s+/ /g;
3350 } 4330 }
3351 4331
3352 new CFClient::UI::Label 4332 new DC::UI::Label
3353 markup => $short, 4333 markup => $short,
3354 tooltip => $item->{tooltip}, 4334 tooltip => $item->{tooltip},
3355 tooltip_font => $::FONT_PROP, 4335 tooltip_font => $::FONT_PROP,
3356 tooltip_width => 0.67, 4336 tooltip_width => 0.67,
3357 fontsize => $item->{fontsize} || $self->{fontsize}, 4337 fontsize => $item->{fontsize} || $self->{fontsize},
3358 max_w => $::WIDTH * 0.44, 4338 max_w => $::WIDTH * 0.44,
4339 align => 0,
3359 fg => [@{ $item->{fg} }], 4340 fg => [@{ $item->{fg} }],
3360 can_events => 1, 4341 can_events => 1,
3361 can_hover => 1 4342 can_hover => 1
3362 }; 4343 };
3363 4344
3364 if ((my $diff = $item->{timeout} - $NOW) < 2) { 4345 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3365 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2; 4346 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3366 $label->update; 4347 $label->update;
3367 $label->set_max_size (undef, $label->{req_h} * $diff) 4348 $label->set_max_size (undef, $label->{req_h} * $diff)
3368 if $diff < 1; 4349 if $diff < 1;
3369 $self->{timer}->interval (1/30); 4350 $self->{timer}->set (1/30, 1/30);
3370 } else { 4351 } else {
3371 $label->{fg}[3] = $item->{fg}[3] || 1; 4352 $label->{fg}[3] = $item->{fg}[3] || 1;
3372 } 4353 }
3373 4354
3374 push @widgets, $label; 4355 push @widgets, $label;
3375 } 4356 }
4357
4358 my $hash = join ",", @widgets;
4359 return if $hash eq $self->{last_widget_hash};
4360 $self->{last_widget_hash} = $hash;
3376 4361
3377 $self->clear; 4362 $self->clear;
3378 $self->SUPER::add (reverse @widgets); 4363 $self->SUPER::add (reverse @widgets);
3379} 4364}
3380 4365
… …
3436 $self->SUPER::destroy; 4421 $self->SUPER::destroy;
3437} 4422}
3438 4423
3439############################################################################# 4424#############################################################################
3440 4425
3441package CFClient::UI::Inventory;
3442
3443our @ISA = CFClient::UI::ScrolledWindow::;
3444
3445sub new {
3446 my $class = shift;
3447
3448 my $self = $class->SUPER::new (
3449 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3450 @_,
3451 );
3452
3453 $self
3454}
3455
3456sub set_items {
3457 my ($self, $items) = @_;
3458
3459 $self->{child}->clear;
3460 return unless $items;
3461
3462 my @items = sort {
3463 ($a->{type} <=> $b->{type})
3464 or ($a->{name} cmp $b->{name})
3465 } values %$items;
3466
3467 $self->{real_items} = \@items;
3468
3469 my $row = 0;
3470 for my $item (@items) {
3471 CFClient::Item::update_widgets $item;
3472
3473 $self->{child}->add (0, $row, $item->{face_widget});
3474 $self->{child}->add (1, $row, $item->{desc_widget});
3475 $self->{child}->add (2, $row, $item->{weight_widget});
3476
3477 $row++;
3478 }
3479}
3480
3481#############################################################################
3482
3483package CFClient::UI::SpellList;
3484
3485our @ISA = CFClient::UI::Table::;
3486
3487sub new {
3488 my $class = shift;
3489
3490 my $self = $class->SUPER::new (
3491 binding => [],
3492 commands => [],
3493 @_,
3494 )
3495}
3496
3497my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3498
3499my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3500 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3501my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3502 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3503my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3504 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3505my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3506 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3507my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3508 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3509
3510sub rebuild_spell_list {
3511 my ($self) = @_;
3512
3513 $CFClient::UI::ROOT->on_refresh ($self => sub {
3514 $self->clear;
3515
3516 return unless $::CONN;
3517
3518 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3519 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3520 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3521 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3522 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3523
3524 my $row = 0;
3525
3526 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3527 my $spell = $self->{spell}{$_};
3528
3529 $row++;
3530
3531 my $spell_cb = sub {
3532 my ($widget, $ev) = @_;
3533
3534 if ($ev->{button} == 1) {
3535 $::CONN->user_send ("cast $spell->{name}");
3536 } elsif ($ev->{button} == 2) {
3537 $::CONN->user_send ("invoke $spell->{name}");
3538 } elsif ($ev->{button} == 3) {
3539 (new CFClient::UI::Menu
3540 items => [
3541 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3542 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3543 ],
3544 )->popup ($ev);
3545 } else {
3546 return 0;
3547 }
3548
3549 1
3550 };
3551
3552 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3553
3554 #TODO: add path info to tooltip
3555 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3556
3557 $self->add (0, $row, new CFClient::UI::Face
3558 face => $spell->{face},
3559 can_hover => 1,
3560 can_events => 1,
3561 tooltip => $tooltip,
3562 on_button_down => $spell_cb,
3563 );
3564
3565 $self->add (1, $row, new CFClient::UI::Label
3566 expand => 1,
3567 text => $spell->{name},
3568 can_hover => 1,
3569 can_events => 1,
3570 tooltip => $tooltip,
3571 on_button_down => $spell_cb,
3572 );
3573
3574 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3575 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3576 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3577 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3578 }
3579 });
3580}
3581
3582sub add_spell {
3583 my ($self, $spell) = @_;
3584
3585 $self->{spell}->{$spell->{name}} = $spell;
3586 $self->rebuild_spell_list;
3587}
3588
3589sub remove_spell {
3590 my ($self, $spell) = @_;
3591
3592 delete $self->{spell}->{$spell->{name}};
3593 $self->rebuild_spell_list;
3594}
3595
3596sub clear_spells {
3597 my ($self) = @_;
3598
3599 $self->{spell} = {};
3600 $self->rebuild_spell_list;
3601}
3602
3603#############################################################################
3604
3605package CFClient::UI::Root; 4426package DC::UI::Root;
3606 4427
3607our @ISA = CFClient::UI::Container::; 4428our @ISA = DC::UI::Container::;
3608 4429
3609use List::Util qw(min max); 4430use List::Util qw(min max);
3610 4431
3611use CFClient::OpenGL; 4432use DC::OpenGL;
3612 4433
3613sub new { 4434sub new {
3614 my $class = shift; 4435 my $class = shift;
3615 4436
3616 my $self = $class->SUPER::new ( 4437 my $self = $class->SUPER::new (
3617 visible => 1, 4438 visible => 1,
3618 @_, 4439 @_,
3619 ); 4440 );
3620 4441
3621 Scalar::Util::weaken ($self->{root} = $self); 4442 DC::weaken ($self->{root} = $self);
3622 4443
3623 $self 4444 $self
3624} 4445}
3625 4446
3626sub size_request { 4447sub size_request {
… …
3674} 4495}
3675 4496
3676sub update { 4497sub update {
3677 my ($self) = @_; 4498 my ($self) = @_;
3678 4499
3679 $::WANT_REFRESH++; 4500 $::WANT_REFRESH = 1;
3680} 4501}
3681 4502
3682sub add { 4503sub add {
3683 my ($self, @children) = @_; 4504 my ($self, @children) = @_;
3684 4505
… …
3721 while ($self->{refresh_hook}) { 4542 while ($self->{refresh_hook}) {
3722 $_->() 4543 $_->()
3723 for values %{delete $self->{refresh_hook}}; 4544 for values %{delete $self->{refresh_hook}};
3724 } 4545 }
3725 4546
3726 if ($self->{realloc}) { 4547 while ($self->{realloc}) {
3727 my %queue; 4548 my %queue;
3728 my @queue; 4549 my @queue;
3729 my $widget; 4550 my $widget;
3730 4551
3731 outer: 4552 outer:
… …
3751 4572
3752 delete $queue{$widget+0}; 4573 delete $queue{$widget+0};
3753 4574
3754 my ($w, $h) = $widget->size_request; 4575 my ($w, $h) = $widget->size_request;
3755 4576
3756 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4577 $w += $widget->{padding_x} * 2;
3757 $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;
3758 4582
3759 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4583 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3760 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4584 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3761 4585
3762 $w = $widget->{force_w} if exists $widget->{force_w}; 4586 $w = $widget->{force_w} if exists $widget->{force_w};
… …
3778 } 4602 }
3779 } 4603 }
3780 4604
3781 delete $self->{realloc}{$widget+0}; 4605 delete $self->{realloc}{$widget+0};
3782 } 4606 }
3783 }
3784 4607
3785 while (my $size_alloc = delete $self->{size_alloc}) { 4608 while (my $size_alloc = delete $self->{size_alloc}) {
3786 my @queue = sort { $b->{visible} <=> $a->{visible} } 4609 my @queue = sort { $a->{visible} <=> $b->{visible} }
3787 values %$size_alloc; 4610 values %$size_alloc;
3788 4611
3789 while () { 4612 while () {
3790 my $widget = pop @queue || last; 4613 my $widget = pop @queue || last;
3791 4614
3792 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4615 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3793 4616
3794 $w = 0 if $w < 0; 4617 $w = max $widget->{min_w}, $w;
3795 $h = 0 if $h < 0; 4618 $h = max $widget->{min_h}, $h;
3796 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
3797 $w = int $w + 0.5; 4626 $w = int $w + 0.5;
3798 $h = int $h + 0.5; 4627 $h = int $h + 0.5;
3799 4628
3800 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}) {
3801 $widget->{old_w} = $widget->{w}; 4630 $widget->{old_w} = $widget->{w};
3802 $widget->{old_h} = $widget->{h}; 4631 $widget->{old_h} = $widget->{h};
3803 4632
3804 $widget->{w} = $w; 4633 $widget->{w} = $w;
3805 $widget->{h} = $h; 4634 $widget->{h} = $h;
3806 4635
3807 $widget->emit (size_allocate => $w, $h); 4636 $widget->emit (size_allocate => $w, $h);
4637 }
3808 } 4638 }
3809 } 4639 }
3810 } 4640 }
3811 4641
3812 while ($self->{post_alloc_hook}) { 4642 while ($self->{post_alloc_hook}) {
3813 $_->() 4643 $_->()
3814 for values %{delete $self->{post_alloc_hook}}; 4644 for values %{delete $self->{post_alloc_hook}};
3815 } 4645 }
3816
3817 4646
3818 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4647 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3819 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4648 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3820 glClear GL_COLOR_BUFFER_BIT; 4649 glClear GL_COLOR_BUFFER_BIT;
3821 4650
… …
3824 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4653 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3825 glMatrixMode GL_MODELVIEW; 4654 glMatrixMode GL_MODELVIEW;
3826 glLoadIdentity; 4655 glLoadIdentity;
3827 4656
3828 { 4657 {
3829 package CFClient::UI::Base; 4658 package DC::UI::Base;
3830 4659
3831 ($draw_x, $draw_y, $draw_w, $draw_h) = 4660 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3832 (0, 0, $self->{w}, $self->{h}); 4661 (0, 0, $self->{w}, $self->{h});
3833 }
3834 4662
3835 $self->_draw; 4663 $self->_draw;
4664 }
3836} 4665}
3837 4666
3838############################################################################# 4667#############################################################################
3839 4668
3840package CFClient::UI; 4669package DC::UI;
3841 4670
3842$ROOT = new CFClient::UI::Root; 4671$ROOT = new DC::UI::Root;
3843$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4672$TOOLTIP = new DC::UI::Tooltip z => 900;
3844 4673
38451 46741
3846

Diff Legend

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