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

Diff Legend

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