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.253 by root, Sun May 28 23:28:12 2006 UTC vs.
Revision 1.467 by root, Wed Sep 3 06:07:39 2008 UTC

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

Diff Legend

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