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

Diff Legend

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