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.308 by root, Mon Jun 19 05:18:14 2006 UTC vs.
Revision 1.472 by root, Wed Dec 24 04:09:27 2008 UTC

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

Diff Legend

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