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

Diff Legend

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