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

Diff Legend

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