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.254 by root, Mon May 29 01:53:23 2006 UTC vs.
Revision 1.476 by root, Sun Jan 11 23:45:52 2009 UTC

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

Diff Legend

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