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.275 by root, Sat Jun 3 22:50:48 2006 UTC vs.
Revision 1.484 by root, Sun Jan 8 07:58:39 2012 UTC

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

Diff Legend

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