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.482 by root, Sat Aug 13 23:18:19 2011 UTC

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

Diff Legend

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