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.443 by root, Mon Nov 12 23:25:37 2007 UTC

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

Diff Legend

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