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.268 by root, Thu Jun 1 05:04:41 2006 UTC vs.
Revision 1.481 by root, Tue Oct 12 05:11:38 2010 UTC

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

Diff Legend

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