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

Diff Legend

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