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.250 by root, Sun May 28 02:31:03 2006 UTC vs.
Revision 1.484 by root, Sun Jan 8 07:58:39 2012 UTC

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

Diff Legend

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