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.249 by root, Sun May 28 01:40:02 2006 UTC vs.
Revision 1.477 by root, Sun Jan 11 23:50:27 2009 UTC

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

Diff Legend

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