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.245 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.482 by root, Sat Aug 13 23:18:19 2011 UTC

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

Diff Legend

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