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.241 by root, Fri May 26 20:50:35 2006 UTC vs.
Revision 1.487 by root, Fri Nov 23 12:14:02 2012 UTC

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

Diff Legend

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