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.262 by elmex, Wed May 31 13:44:26 2006 UTC vs.
Revision 1.477 by root, Sun Jan 11 23:50:27 2009 UTC

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

Diff Legend

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