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.257 by root, Tue May 30 02:22:02 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 can_events => 1, 1358 can_events => 1,
1032 @_ 1359 min_w => 64,
1360 min_h => 32,
1361 %arg,
1033 ); 1362 );
1034 1363
1035 $self->{title} &&= new CFClient::UI::Label 1364 $self->{title_widget} = new CFPlus::UI::Label
1036 align => 0, 1365 align => 0,
1037 valign => 1, 1366 valign => 1,
1038 text => $self->{title}, 1367 text => $self->{title},
1039 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 }
1040 1379
1041 $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};
1042} 1389}
1043 1390
1044sub border { 1391sub border {
1045 int $_[0]{border} * $::FONTSIZE 1392 int $_[0]{border} * $::FONTSIZE
1046} 1393}
1047 1394
1048sub size_request { 1395sub size_request {
1049 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};
1050 1403
1051 my ($w, $h) = $self->SUPER::size_request; 1404 my ($w, $h) = $self->SUPER::size_request;
1052 1405
1053 ( 1406 (
1054 $w + $self->border * 2, 1407 $w + $self->border * 2,
1055 $h + $self->border * 2, 1408 $h + $self->border * 2,
1056 ) 1409 )
1057} 1410}
1058 1411
1059sub size_allocate { 1412sub invoke_size_allocate {
1060 my ($self, $w, $h, $changed) = @_; 1413 my ($self, $w, $h) = @_;
1061 1414
1062 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 }
1063 1420
1421 my $border = $self->border;
1422
1064 $h -= List::Util::max 0, $self->border * 2; 1423 $h -= List::Util::max 0, $border * 2;
1065 $w -= List::Util::max 0, $self->border * 2; 1424 $w -= List::Util::max 0, $border * 2;
1066 1425
1067 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1068 if $self->{title};
1069
1070 $self->child->configure ($self->border, $self->border, $w, $h); 1426 $self->child->configure ($border, $border, $w, $h);
1071}
1072 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
1073sub button_down { 1442sub invoke_button_down {
1074 my ($self, $ev, $x, $y) = @_; 1443 my ($self, $ev, $x, $y) = @_;
1075 1444
1076 my ($w, $h) = @$self{qw(w h)}; 1445 my ($w, $h) = @$self{qw(w h)};
1077 my $border = $self->border; 1446 my $border = $self->border;
1078 1447
… …
1094 my $dy = $ev->{y} - $oy; 1463 my $dy = $ev->{y} - $oy;
1095 1464
1096 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1465 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1097 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1466 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1098 1467
1468 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1099 $self->realloc; 1469 $self->realloc;
1100 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1101 }; 1470 };
1102 1471
1103 } elsif ($lr ^ $td) { 1472 } elsif ($lr ^ $td) {
1104 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1473 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1105 my ($bx, $by) = ($self->{x}, $self->{y}); 1474 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1108 my ($ev, $x, $y) = @_; 1477 my ($ev, $x, $y) = @_;
1109 1478
1110 ($x, $y) = ($ev->{x}, $ev->{y}); 1479 ($x, $y) = ($ev->{x}, $ev->{y});
1111 1480
1112 $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});
1113 }; 1484 };
1485 } else {
1486 return 0;
1487 }
1488
1114 } 1489 1
1115} 1490}
1116 1491
1117sub button_up { 1492sub invoke_button_up {
1118 my ($self, $ev, $x, $y) = @_; 1493 my ($self, $ev, $x, $y) = @_;
1119 1494
1120 delete $self->{motion}; 1495 ! ! delete $self->{motion}
1121} 1496}
1122 1497
1123sub mouse_motion { 1498sub invoke_mouse_motion {
1124 my ($self, $ev, $x, $y) = @_; 1499 my ($self, $ev, $x, $y) = @_;
1125 1500
1126 $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
1127} 1512}
1128 1513
1129sub _draw { 1514sub _draw {
1130 my ($self) = @_; 1515 my ($self) = @_;
1131 1516
1517 my $child = $self->{children}[0];
1518
1132 my ($w, $h ) = ($self->{w}, $self->{h}); 1519 my ($w, $h ) = ($self->{w}, $self->{h});
1133 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1520 my ($cw, $ch) = ($child->{w}, $child->{h});
1134 1521
1135 glEnable GL_TEXTURE_2D; 1522 glEnable GL_TEXTURE_2D;
1136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1523 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1137 1524
1138 my $border = $self->border; 1525 my $border = $self->border;
1139 1526
1140 glColor @{ $self->{border_bg} }; 1527 glColor @{ $self->{border_bg} };
1141 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1528 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1142 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1529 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1143 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1530 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1144 $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);
1145 1546
1146 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1547 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1147 glColor @{ $self->{bg} }; 1548 glColor @{ $self->{bg} };
1148 1549
1149 # TODO: repeat texture not scale 1550 # TODO: repeat texture not scale
… …
1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1554 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154 } 1555 }
1155 1556
1156 glDisable GL_TEXTURE_2D; 1557 glDisable GL_TEXTURE_2D;
1157 1558
1158 $self->{title}->draw if $self->{title};
1159
1160 $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};
1161} 1570}
1162 1571
1163############################################################################# 1572#############################################################################
1164 1573
1165package CFClient::UI::Table; 1574package CFPlus::UI::Table;
1166 1575
1167our @ISA = CFClient::UI::Base::; 1576our @ISA = CFPlus::UI::Container::;
1168 1577
1169use List::Util qw(max sum); 1578use List::Util qw(max sum);
1170 1579
1171use CFClient::OpenGL; 1580use CFPlus::OpenGL;
1172 1581
1173sub new { 1582sub new {
1174 my $class = shift; 1583 my $class = shift;
1175 1584
1176 $class->SUPER::new ( 1585 $class->SUPER::new (
1177 col_expand => [], 1586 col_expand => [],
1587 row_expand => [],
1178 @_, 1588 @_,
1179 ) 1589 )
1180} 1590}
1181 1591
1182sub children {
1183 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1184}
1185
1186sub add { 1592sub add {
1187 my ($self, $x, $y, $child) = @_;
1188
1189 $child->set_parent ($self);
1190 $self->{children}[$y][$x] = $child;
1191
1192 $self->realloc;
1193}
1194
1195# TODO: move to container class maybe? send children a signal on removal?
1196sub clear {
1197 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);
1198 1624
1199 my @children = $self->children; 1625 my @children = $self->children;
1200 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 }
1201 1636 }
1202 for (@children) {
1203 delete $_->{parent};
1204 $_->hide;
1205 }
1206 1637
1207 $self->realloc; 1638 # second pass, rows
1208} 1639 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1209
1210sub get_wh {
1211 my ($self) = @_;
1212
1213 my (@w, @h);
1214
1215 for my $y (0 .. $#{$self->{children}}) {
1216 my $row = $self->{children}[$y]
1217 or next;
1218
1219 for my $x (0 .. $#$row) {
1220 my $widget = $row->[$x]
1221 or next;
1222 my ($w, $h) = @$widget{qw(req_w req_h)}; 1640 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1223 1641
1224 $w[$x] = max $w[$x], $w; 1642 my $sh = sum @h[$r .. $r + $rs - 1];
1225 $h[$y] = max $h[$y], $h; 1643
1644 if ($h > $sh) {
1645 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1226 } 1646 }
1227 } 1647 }
1228 1648
1229 (\@w, \@h) 1649 (\@w, \@h)
1230} 1650}
… …
1238 (sum @$ws), 1658 (sum @$ws),
1239 (sum @$hs), 1659 (sum @$hs),
1240 ) 1660 )
1241} 1661}
1242 1662
1243sub size_allocate { 1663sub invoke_size_allocate {
1244 my ($self, $w, $h, $changed) = @_; 1664 my ($self, $w, $h) = @_;
1245 1665
1246 my ($ws, $hs) = $self->get_wh; 1666 my ($ws, $hs) = $self->get_wh;
1247 1667
1248 my $req_w = (sum @$ws) || 1; 1668 my $req_w = (sum @$ws) || 1;
1249 my $req_h = (sum @$hs) || 1; 1669 my $req_h = (sum @$hs) || 1;
1250 1670
1251 # TODO: nicer code && do row_expand 1671 # now linearly scale the rows/columns to the allocated size
1252 my @col_expand = @{$self->{col_expand}}; 1672 my @col_expand = @{$self->{col_expand}};
1253 @col_expand = (1) x @$ws unless @col_expand; 1673 @col_expand = (1) x @$ws unless @col_expand;
1254 my $col_expand = (sum @col_expand) || 1; 1674 my $col_expand = (sum @col_expand) || 1;
1255 1675
1256 # linearly scale sizes
1257 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1676 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1258 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1259 1677
1260 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
1261 CFClient::UI::harmonize $hs; 1686 CFPlus::UI::harmonize $hs;
1262 1687
1263 my $y; 1688 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1689 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1264 1690
1265 for my $r (0 .. $#{$self->{children}}) { 1691 for my $widget ($self->children) {
1266 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)};
1267 or next;
1268 1693
1269 my $x = 0; 1694 $widget->configure (
1270 my $row_h = $hs->[$r]; 1695 $x[$c], $y[$r],
1696 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1271 1697 );
1272 for my $c (0 .. $#$row) { 1698 }
1273 my $col_w = $ws->[$c];
1274 1699
1275 if (my $widget = $row->[$c]) { 1700 1
1276 $widget->configure ($x, $y, $col_w, $row_h); 1701}
1277 }
1278 1702
1279 $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};
1280 } 1730 }
1281
1282 $y += $row_h;
1283 } 1731 }
1284 1732
1285} 1733 my $W = $x2 - $x1;
1734 my $H = $y2 - $y1;
1286 1735
1287sub 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 {
1288 my ($self, $x, $y) = @_; 1754 my ($self, $W, $H) = @_;
1289 1755
1290 $x -= $self->{x}; 1756 for my $child ($self->visible_children) {
1291 $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;
1292 1759
1293 my $res; 1760 $x += $child->{c_halign} * $child->{req_w};
1761 $y += $child->{c_valign} * $child->{req_h};
1294 1762
1295 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1763 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1296 $res = $_->find_widget ($x, $y) 1764 }
1297 and return $res; 1765
1298 } 1766 1
1299
1300 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1301}
1302
1303sub _draw {
1304 my ($self) = @_;
1305
1306 for (grep $_, @{$self->{children}}) {
1307 $_->draw for grep $_, @$_;
1308 }
1309} 1767}
1310 1768
1311############################################################################# 1769#############################################################################
1312 1770
1313package CFClient::UI::Box; 1771package CFPlus::UI::Box;
1314 1772
1315our @ISA = CFClient::UI::Container::; 1773our @ISA = CFPlus::UI::Container::;
1316 1774
1317sub size_request { 1775sub size_request {
1318 my ($self) = @_; 1776 my ($self) = @_;
1777
1778 my @children = $self->visible_children;
1319 1779
1320 $self->{vertical} 1780 $self->{vertical}
1321 ? ( 1781 ? (
1322 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1782 (List::Util::max map $_->{req_w}, @children),
1323 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1783 (List::Util::sum map $_->{req_h}, @children),
1324 ) 1784 )
1325 : ( 1785 : (
1326 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1786 (List::Util::sum map $_->{req_w}, @children),
1327 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1787 (List::Util::max map $_->{req_h}, @children),
1328 ) 1788 )
1329} 1789}
1330 1790
1331sub size_allocate { 1791sub invoke_size_allocate {
1332 my ($self, $w, $h, $changed) = @_; 1792 my ($self, $w, $h) = @_;
1333 1793
1334 my $space = $self->{vertical} ? $h : $w; 1794 my $space = $self->{vertical} ? $h : $w;
1335 my $children = $self->{children}; 1795 my @children = $self->visible_children;
1336 1796
1337 my @req; 1797 my @req;
1338 1798
1339 if ($self->{homogeneous}) { 1799 if ($self->{homogeneous}) {
1340 @req = ($space / (@$children || 1)) x @$children; 1800 @req = ($space / (@children || 1)) x @children;
1341 } else { 1801 } else {
1342 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1802 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1343 my $req = List::Util::sum @req; 1803 my $req = List::Util::sum @req;
1344 1804
1345 if ($req > $space) { 1805 if ($req > $space) {
1346 # ah well, not enough space 1806 # ah well, not enough space
1347 $_ *= $space / $req for @req; 1807 $_ *= $space / $req for @req;
1348 } else { 1808 } else {
1349 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1809 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1350 1810
1351 $space = ($space - $req) / $expand; # remaining space to give away 1811 $space = ($space - $req) / $expand; # remaining space to give away
1352 1812
1353 $req[$_] += $space * $children->[$_]{expand} 1813 $req[$_] += $space * $children[$_]{expand}
1354 for 0 .. $#$children; 1814 for 0 .. $#children;
1355 } 1815 }
1356 } 1816 }
1357 1817
1358 CFClient::UI::harmonize \@req; 1818 CFPlus::UI::harmonize \@req;
1359 1819
1360 my $pos = 0; 1820 my $pos = 0;
1361 for (0 .. $#$children) { 1821 for (0 .. $#children) {
1362 my $alloc = $req[$_]; 1822 my $alloc = $req[$_];
1363 $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));
1364 1824
1365 $pos += $alloc; 1825 $pos += $alloc;
1366 } 1826 }
1367 1827
1368 1 1828 1
1369} 1829}
1370 1830
1371############################################################################# 1831#############################################################################
1372 1832
1373package CFClient::UI::HBox; 1833package CFPlus::UI::HBox;
1374 1834
1375our @ISA = CFClient::UI::Box::; 1835our @ISA = CFPlus::UI::Box::;
1376 1836
1377sub new { 1837sub new {
1378 my $class = shift; 1838 my $class = shift;
1379 1839
1380 $class->SUPER::new ( 1840 $class->SUPER::new (
… …
1383 ) 1843 )
1384} 1844}
1385 1845
1386############################################################################# 1846#############################################################################
1387 1847
1388package CFClient::UI::VBox; 1848package CFPlus::UI::VBox;
1389 1849
1390our @ISA = CFClient::UI::Box::; 1850our @ISA = CFPlus::UI::Box::;
1391 1851
1392sub new { 1852sub new {
1393 my $class = shift; 1853 my $class = shift;
1394 1854
1395 $class->SUPER::new ( 1855 $class->SUPER::new (
… …
1398 ) 1858 )
1399} 1859}
1400 1860
1401############################################################################# 1861#############################################################################
1402 1862
1403package CFClient::UI::Label; 1863package CFPlus::UI::Label;
1404 1864
1405our @ISA = CFClient::UI::DrawBG::; 1865our @ISA = CFPlus::UI::DrawBG::;
1406 1866
1407use CFClient::OpenGL; 1867use CFPlus::OpenGL;
1408 1868
1409sub new { 1869sub new {
1410 my ($class, %arg) = @_; 1870 my ($class, %arg) = @_;
1411 1871
1412 my $self = $class->SUPER::new ( 1872 my $self = $class->SUPER::new (
… …
1415 #active_bg => none 1875 #active_bg => none
1416 #font => default_font 1876 #font => default_font
1417 #text => initial text 1877 #text => initial text
1418 #markup => initial narkup 1878 #markup => initial narkup
1419 #max_w => maximum pixel width 1879 #max_w => maximum pixel width
1880 #style => 0, # render flags
1420 ellipsise => 3, # end 1881 ellipsise => 3, # end
1421 layout => (new CFClient::Layout), 1882 layout => (new CFPlus::Layout),
1422 fontsize => 1, 1883 fontsize => 1,
1423 align => -1, 1884 align => -1,
1424 valign => -1, 1885 valign => -1,
1425 padding => 2, 1886 padding_x => 2,
1887 padding_y => 2,
1426 can_events => 0, 1888 can_events => 0,
1427 %arg 1889 %arg
1428 ); 1890 );
1429 1891
1430 if (exists $self->{template}) { 1892 if (exists $self->{template}) {
1431 my $layout = new CFClient::Layout; 1893 my $layout = new CFPlus::Layout;
1432 $layout->set_text (delete $self->{template}); 1894 $layout->set_text (delete $self->{template});
1433 $self->{template} = $layout; 1895 $self->{template} = $layout;
1434 } 1896 }
1435 1897
1436 if (exists $self->{markup}) { 1898 if (exists $self->{markup}) {
… …
1440 } 1902 }
1441 1903
1442 $self 1904 $self
1443} 1905}
1444 1906
1445sub escape($) {
1446 local $_ = $_[0];
1447
1448 s/&/&amp;/g;
1449 s/>/&gt;/g;
1450 s/</&lt;/g;
1451
1452 $_
1453}
1454
1455sub update { 1907sub update {
1456 my ($self) = @_; 1908 my ($self) = @_;
1457 1909
1458 delete $self->{texture}; 1910 delete $self->{texture};
1459 $self->SUPER::update; 1911 $self->SUPER::update;
1460} 1912}
1461 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
1462sub set_text { 1927sub set_text {
1463 my ($self, $text) = @_; 1928 my ($self, $text) = @_;
1464 1929
1465 return if $self->{text} eq "T$text"; 1930 return if $self->{text} eq "T$text";
1466 $self->{text} = "T$text"; 1931 $self->{text} = "T$text";
1467 1932
1468 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1469 $self->{layout}->set_text ($text); 1933 $self->{layout}->set_text ($text);
1470 1934
1935 delete $self->{size_req};
1471 $self->realloc; 1936 $self->realloc;
1472 $self->update; 1937 $self->update;
1473} 1938}
1474 1939
1475sub set_markup { 1940sub set_markup {
… …
1478 return if $self->{text} eq "M$markup"; 1943 return if $self->{text} eq "M$markup";
1479 $self->{text} = "M$markup"; 1944 $self->{text} = "M$markup";
1480 1945
1481 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1946 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1482 1947
1483 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1484 $self->{layout}->set_markup ($markup); 1948 $self->{layout}->set_markup ($markup);
1485 1949
1950 delete $self->{size_req};
1486 $self->realloc; 1951 $self->realloc;
1487 $self->update; 1952 $self->update;
1488} 1953}
1489 1954
1490sub size_request { 1955sub size_request {
1491 my ($self) = @_; 1956 my ($self) = @_;
1492 1957
1958 $self->{size_req} ||= do {
1959 my ($max_w, $max_h) = $self->get_max_wh;
1960
1493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1961 $self->{layout}->set_font ($self->{font}) if $self->{font};
1494 $self->{layout}->set_width ($self->{max_w} || -1); 1962 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1495 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1963 $self->{layout}->set_ellipsise ($self->{ellipsise});
1496 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1964 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1965 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498 1966
1499 my ($w, $h) = $self->{layout}->size; 1967 my ($w, $h) = $self->{layout}->size;
1500 1968
1501 if (exists $self->{template}) { 1969 if (exists $self->{template}) {
1502 $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);
1503 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1972 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1504 1973
1505 my ($w2, $h2) = $self->{template}->size; 1974 my ($w2, $h2) = $self->{template}->size;
1506 1975
1507 $w = List::Util::max $w, $w2; 1976 $w = List::Util::max $w, $w2;
1508 $h = List::Util::max $h, $h2; 1977 $h = List::Util::max $h, $h2;
1978 }
1979
1980 [$w, $h]
1509 } 1981 };
1510 1982
1511 ( 1983 @{ $self->{size_req} }
1512 $w + $self->{padding} * 2,
1513 $h + $self->{padding} * 2,
1514 )
1515} 1984}
1516 1985
1986sub baseline_shift {
1987 $_[0]{layout}->descent
1988}
1989
1517sub size_allocate { 1990sub invoke_size_allocate {
1518 my ($self, $w, $h, $changed) = @_; 1991 my ($self, $w, $h) = @_;
1992
1993 delete $self->{ox};
1519 1994
1520 delete $self->{texture} 1995 delete $self->{texture}
1521 if $changed; 1996 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1997
1998 1
1522} 1999}
1523 2000
1524sub set_fontsize { 2001sub set_fontsize {
1525 my ($self, $fontsize) = @_; 2002 my ($self, $fontsize) = @_;
1526 2003
1527 $self->{fontsize} = $fontsize; 2004 $self->{fontsize} = $fontsize;
2005 delete $self->{size_req};
1528 delete $self->{texture}; 2006 delete $self->{texture};
1529 2007
1530 $self->realloc; 2008 $self->realloc;
1531} 2009}
1532 2010
2011sub reconfigure {
2012 my ($self) = @_;
2013
2014 delete $self->{size_req};
2015 delete $self->{texture};
2016
2017 $self->SUPER::reconfigure;
2018}
2019
1533sub _draw { 2020sub _draw {
1534 my ($self) = @_; 2021 my ($self) = @_;
1535 2022
1536 $self->SUPER::_draw; # draw background, if applicable 2023 $self->SUPER::_draw; # draw background, if applicable
1537 2024
1538 my $tex = $self->{texture} ||= do { 2025 my $size = $self->{texture} ||= do {
1539 $self->{layout}->set_foreground (@{$self->{fg}}); 2026 $self->{layout}->set_foreground (@{$self->{fg}});
1540 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2027 $self->{layout}->set_font ($self->{font}) if $self->{font};
1541 $self->{layout}->set_width ($self->{w}); 2028 $self->{layout}->set_width ($self->{w});
1542 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2029 $self->{layout}->set_ellipsise ($self->{ellipsise});
1543 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2030 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2031 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545 2032
1546 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2033 [$self->{layout}->size]
1547
1548 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1549 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1550 : ($self->{w} - $tex->{w}) * 0.5);
1551
1552 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1553 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1554 : ($self->{h} - $tex->{h}) * 0.5);
1555
1556 $tex
1557 }; 2034 };
1558 2035
1559 glEnable GL_TEXTURE_2D; 2036 unless (exists $self->{ox}) {
1560 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);
1561 2040
1562 if ($tex->{format} == GL_ALPHA) { 2041 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1563 glColor @{$self->{fg}}; 2042 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1564 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 2043 : ($self->{h} - $size->[1]) * 0.5);
1565 } else { 2044
1566 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 2045 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1567 } 2046 };
1568 2047
1569 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;
1570} 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#}
1571 2067
1572############################################################################# 2068#############################################################################
1573 2069
1574package CFClient::UI::EntryBase; 2070package CFPlus::UI::EntryBase;
1575 2071
1576our @ISA = CFClient::UI::Label::; 2072our @ISA = CFPlus::UI::Label::;
1577 2073
1578use CFClient::OpenGL; 2074use CFPlus::OpenGL;
1579 2075
1580sub new { 2076sub new {
1581 my $class = shift; 2077 my $class = shift;
1582 2078
1583 $class->SUPER::new ( 2079 $class->SUPER::new (
1584 fg => [1, 1, 1], 2080 fg => [1, 1, 1],
1585 bg => [0, 0, 0, 0.2], 2081 bg => [0, 0, 0, 0.2],
2082 outline => [0.6, 0.3, 0.1],
1586 active_bg => [1, 1, 1, 0.5], 2083 active_bg => [0, 0, 1, .2],
1587 active_fg => [0, 0, 0], 2084 active_fg => [1, 1, 1],
2085 active_outline => [1, 1, 0],
1588 can_hover => 1, 2086 can_hover => 1,
1589 can_focus => 1, 2087 can_focus => 1,
1590 valign => 0, 2088 valign => 0,
1591 can_events => 1, 2089 can_events => 1,
2090 ellipsise => 0,
1592 #text => ... 2091 #text => ...
2092 #hidden => "*",
1593 @_ 2093 @_
1594 ) 2094 )
1595} 2095}
1596 2096
1597sub _set_text { 2097sub _set_text {
… …
1599 2099
1600 delete $self->{cur_h}; 2100 delete $self->{cur_h};
1601 2101
1602 return if $self->{text} eq $text; 2102 return if $self->{text} eq $text;
1603 2103
1604 delete $self->{texture};
1605
1606 $self->{last_activity} = $::NOW; 2104 $self->{last_activity} = $::NOW;
1607 $self->{text} = $text; 2105 $self->{text} = $text;
1608 2106
1609 $text =~ s/./*/g if $self->{hidden}; 2107 $text =~ s/./*/g if $self->{hidden};
1610 $self->{layout}->set_text ("$text "); 2108 $self->{layout}->set_text ("$text ");
2109 delete $self->{size_req};
1611 2110
1612 $self->_emit (changed => $self->{text}); 2111 $self->emit (changed => $self->{text});
2112
2113 $self->realloc;
2114 $self->update;
1613} 2115}
1614 2116
1615sub set_text { 2117sub set_text {
1616 my ($self, $text) = @_; 2118 my ($self, $text) = @_;
1617 2119
1618 $self->{cursor} = length $text; 2120 $self->{cursor} = length $text;
1619 $self->_set_text ($text); 2121 $self->_set_text ($text);
1620
1621 $self->realloc;
1622} 2122}
1623 2123
1624sub get_text { 2124sub get_text {
1625 $_[0]{text} 2125 $_[0]{text}
1626} 2126}
… …
1631 my ($w, $h) = $self->SUPER::size_request; 2131 my ($w, $h) = $self->SUPER::size_request;
1632 2132
1633 ($w + 1, $h) # add 1 for cursor 2133 ($w + 1, $h) # add 1 for cursor
1634} 2134}
1635 2135
1636sub key_down { 2136sub invoke_key_down {
1637 my ($self, $ev) = @_; 2137 my ($self, $ev) = @_;
1638 2138
1639 my $mod = $ev->{mod}; 2139 my $mod = $ev->{mod};
1640 my $sym = $ev->{sym}; 2140 my $sym = $ev->{sym};
1641 my $uni = $ev->{unicode}; 2141 my $uni = $ev->{unicode};
1642 2142
1643 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;
1644 2146
1645 if ($uni == 8) { 2147 if ($uni == 8) {
1646 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2148 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1647 } elsif ($uni == 127) { 2149 } elsif ($uni == 127) {
1648 substr $text, $self->{cursor}, 1, ""; 2150 substr $text, $self->{cursor}, 1, "";
1649 } elsif ($sym == CFClient::SDLK_LEFT) { 2151 } elsif ($sym == CFPlus::SDLK_LEFT) {
1650 --$self->{cursor} if $self->{cursor}; 2152 --$self->{cursor} if $self->{cursor};
1651 } elsif ($sym == CFClient::SDLK_RIGHT) { 2153 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1652 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2154 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1653 } 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 = "";
1654 $self->{cursor} = 0; 2169 $self->{cursor} = 0;
1655 } elsif ($sym == CFClient::SDLK_END) {
1656 $self->{cursor} = length $text;
1657 } elsif ($uni == 27) { 2170 } elsif ($uni == 27) {
1658 $self->_emit ('escape'); 2171 $self->emit ('escape');
1659 } elsif ($uni) { 2172 } elsif ($uni == 0x0d) {
2173 substr $text, $self->{cursor}++, 0, "\012";
2174 } elsif ($uni >= 0x20) {
1660 substr $text, $self->{cursor}++, 0, chr $uni; 2175 substr $text, $self->{cursor}++, 0, chr $uni;
2176 } else {
2177 return 0;
1661 } 2178 }
1662 2179
1663 $self->_set_text ($text); 2180 $self->_set_text ($text);
1664 2181
1665 $self->realloc; 2182 $self->realloc;
1666} 2183 $self->update;
1667 2184
2185 1
2186}
2187
1668sub focus_in { 2188sub invoke_focus_in {
1669 my ($self) = @_; 2189 my ($self) = @_;
1670 2190
1671 $self->{last_activity} = $::NOW; 2191 $self->{last_activity} = $::NOW;
1672 2192
1673 $self->SUPER::focus_in; 2193 $self->SUPER::invoke_focus_in
1674} 2194}
1675 2195
1676sub button_down { 2196sub invoke_button_down {
1677 my ($self, $ev, $x, $y) = @_; 2197 my ($self, $ev, $x, $y) = @_;
1678 2198
1679 $self->SUPER::button_down ($ev, $x, $y); 2199 $self->SUPER::invoke_button_down ($ev, $x, $y);
1680 2200
1681 my $idx = $self->{layout}->xy_to_index ($x, $y); 2201 my $idx = $self->{layout}->xy_to_index ($x, $y);
1682 2202
1683 # byte-index to char-index 2203 # byte-index to char-index
1684 my $text = $self->{text}; 2204 my $text = $self->{text};
1685 utf8::encode $text; 2205 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1686 $self->{cursor} = length substr $text, 0, $idx; 2206 $self->{cursor} = length $text;
1687 2207
1688 $self->_set_text ($self->{text}); 2208 $self->_set_text ($self->{text});
1689 $self->update; 2209 $self->update;
2210
2211 1
1690} 2212}
1691 2213
1692sub mouse_motion { 2214sub invoke_mouse_motion {
1693 my ($self, $ev, $x, $y) = @_; 2215 my ($self, $ev, $x, $y) = @_;
1694# 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
1695} 2219}
1696 2220
1697sub _draw { 2221sub _draw {
1698 my ($self) = @_; 2222 my ($self) = @_;
1699 2223
1700 local $self->{fg} = $self->{fg}; 2224 local $self->{fg} = $self->{fg};
1701 2225
1702 if ($FOCUS == $self) { 2226 if ($FOCUS == $self) {
1703 glColor @{$self->{active_bg}}; 2227 glColor_premultiply @{$self->{active_bg}};
1704 $self->{fg} = $self->{active_fg}; 2228 $self->{fg} = $self->{active_fg};
1705 } else { 2229 } else {
1706 glColor @{$self->{bg}}; 2230 glColor_premultiply @{$self->{bg}};
1707 } 2231 }
1708 2232
1709 glEnable GL_BLEND; 2233 glEnable GL_BLEND;
1710 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2234 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1711 glBegin GL_QUADS;
1712 glVertex 0 , 0;
1713 glVertex 0 , $self->{h};
1714 glVertex $self->{w}, $self->{h}; 2235 glRect 0, 0, $self->{w}, $self->{h};
1715 glVertex $self->{w}, 0;
1716 glEnd;
1717 glDisable GL_BLEND; 2236 glDisable GL_BLEND;
1718 2237
1719 $self->SUPER::_draw; 2238 $self->SUPER::_draw;
1720 2239
1721 #TODO: force update every cursor change :( 2240 #TODO: force update every cursor change :(
… …
1723 2242
1724 unless (exists $self->{cur_h}) { 2243 unless (exists $self->{cur_h}) {
1725 my $text = substr $self->{text}, 0, $self->{cursor}; 2244 my $text = substr $self->{text}, 0, $self->{cursor};
1726 utf8::encode $text; 2245 utf8::encode $text;
1727 2246
1728 @$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);
1729 } 2248 }
1730 2249
1731 glColor @{$self->{fg}}; 2250 glColor_premultiply @{$self->{active_fg}};
1732 glBegin GL_LINES; 2251 glBegin GL_LINES;
1733 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2252 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1734 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};
1735 glEnd; 2254 glEnd;
1736 }
1737}
1738 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
1739package CFClient::UI::Entry; 2274package CFPlus::UI::Entry;
1740 2275
1741our @ISA = CFClient::UI::EntryBase::; 2276our @ISA = CFPlus::UI::EntryBase::;
1742 2277
1743use CFClient::OpenGL; 2278use CFPlus::OpenGL;
1744 2279
1745sub key_down { 2280sub invoke_key_down {
1746 my ($self, $ev) = @_; 2281 my ($self, $ev) = @_;
1747 2282
1748 my $sym = $ev->{sym}; 2283 my $sym = $ev->{sym};
1749 2284
1750 if ($sym == 13) { 2285 if ($ev->{uni} == 0x0d || $sym == 13) {
1751 unshift @{$self->{history}}, 2286 unshift @{$self->{history}},
1752 my $txt = $self->get_text; 2287 my $txt = $self->get_text;
2288
1753 $self->{history_pointer} = -1; 2289 $self->{history_pointer} = -1;
1754 $self->{history_saveback} = ''; 2290 $self->{history_saveback} = '';
1755 $self->_emit (activate => $txt); 2291 $self->emit (activate => $txt);
1756 $self->update; 2292 $self->update;
1757 2293
1758 } elsif ($sym == CFClient::SDLK_UP) { 2294 } elsif ($sym == CFPlus::SDLK_UP) {
1759 if ($self->{history_pointer} < 0) { 2295 if ($self->{history_pointer} < 0) {
1760 $self->{history_saveback} = $self->get_text; 2296 $self->{history_saveback} = $self->get_text;
1761 } 2297 }
1762 if (@{$self->{history} || []} > 0) { 2298 if (@{$self->{history} || []} > 0) {
1763 $self->{history_pointer}++; 2299 $self->{history_pointer}++;
… …
1765 $self->{history_pointer} = @{$self->{history} || []} - 1; 2301 $self->{history_pointer} = @{$self->{history} || []} - 1;
1766 } 2302 }
1767 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2303 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1768 } 2304 }
1769 2305
1770 } elsif ($sym == CFClient::SDLK_DOWN) { 2306 } elsif ($sym == CFPlus::SDLK_DOWN) {
1771 $self->{history_pointer}--; 2307 $self->{history_pointer}--;
1772 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2308 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1773 2309
1774 if ($self->{history_pointer} >= 0) { 2310 if ($self->{history_pointer} >= 0) {
1775 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2311 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1776 } else { 2312 } else {
1777 $self->set_text ($self->{history_saveback}); 2313 $self->set_text ($self->{history_saveback});
1778 } 2314 }
1779 2315
1780 } else { 2316 } else {
1781 $self->SUPER::key_down ($ev); 2317 return $self->SUPER::invoke_key_down ($ev)
2318 }
2319
1782 } 2320 1
1783
1784} 2321}
1785 2322
1786############################################################################# 2323#############################################################################
1787 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
1788package CFClient::UI::Button; 2364package CFPlus::UI::ButtonBin;
1789 2365
1790our @ISA = CFClient::UI::Label::; 2366our @ISA = CFPlus::UI::Bin::;
1791 2367
1792use CFClient::OpenGL; 2368use CFPlus::OpenGL;
1793 2369
1794my @tex = 2370my @tex =
1795 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2371 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1796 qw(b1_button_active.png); 2372 qw(b1_button_inactive.png b1_button_active.png);
1797 2373
1798sub new { 2374sub new {
1799 my $class = shift; 2375 my $class = shift;
1800 2376
1801 $class->SUPER::new ( 2377 $class->SUPER::new (
1802 padding => 4,
1803 fg => [1, 1, 1],
1804 active_fg => [0, 0, 1],
1805 can_hover => 1, 2378 can_hover => 1,
1806 align => 0, 2379 align => 0,
1807 valign => 0, 2380 valign => 0,
1808 can_events => 1, 2381 can_events => 1,
1809 @_ 2382 @_
1810 ) 2383 )
1811} 2384}
1812 2385
1813sub activate { }
1814
1815sub button_up { 2386sub invoke_button_up {
1816 my ($self, $ev, $x, $y) = @_; 2387 my ($self, $ev, $x, $y) = @_;
1817 2388
1818 $self->emit ("activate") 2389 $self->emit ("activate")
1819 if $x >= 0 && $x < $self->{w} 2390 if $x >= 0 && $x < $self->{w}
1820 && $y >= 0 && $y < $self->{h}; 2391 && $y >= 0 && $y < $self->{h};
2392
2393 1
1821} 2394}
1822 2395
1823sub _draw { 2396sub _draw {
1824 my ($self) = @_; 2397 my ($self) = @_;
1825
1826 local $self->{fg} = $self->{fg};
1827
1828 if ($GRAB == $self) {
1829 $self->{fg} = $self->{active_fg};
1830 }
1831 2398
1832 glEnable GL_TEXTURE_2D; 2399 glEnable GL_TEXTURE_2D;
1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834 glColor 0, 0, 0, 1; 2401 glColor 0, 0, 0, 1;
1835 2402
2403 my $tex = $tex[$GRAB == $self];
1836 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2404 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1837 2405
1838 glDisable GL_TEXTURE_2D; 2406 glDisable GL_TEXTURE_2D;
1839 2407
1840 $self->SUPER::_draw; 2408 $self->SUPER::_draw;
1841} 2409}
1842 2410
1843############################################################################# 2411#############################################################################
1844 2412
1845package CFClient::UI::CheckBox; 2413package CFPlus::UI::Button;
1846 2414
1847our @ISA = CFClient::UI::DrawBG::; 2415our @ISA = CFPlus::UI::Label::;
2416
2417use CFPlus::OpenGL;
1848 2418
1849my @tex = 2419my @tex =
1850 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2420 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1851 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2421 qw(b1_button_inactive.png b1_button_active.png);
1852
1853use CFClient::OpenGL;
1854 2422
1855sub new { 2423sub new {
1856 my $class = shift; 2424 my $class = shift;
1857 2425
1858 $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 (
1859 padding => 2, 2482 padding_x => 2,
2483 padding_y => 2,
1860 fg => [1, 1, 1], 2484 fg => [1, 1, 1],
1861 active_fg => [1, 1, 0], 2485 active_fg => [1, 1, 0],
1862 bg => [0, 0, 0, 0.2], 2486 bg => [0, 0, 0, 0.2],
1863 active_bg => [1, 1, 1, 0.5], 2487 active_bg => [1, 1, 1, 0.5],
1864 state => 0, 2488 state => 0,
… …
1868} 2492}
1869 2493
1870sub size_request { 2494sub size_request {
1871 my ($self) = @_; 2495 my ($self) = @_;
1872 2496
1873 ($self->{padding} * 2 + 6) x 2 2497 (6) x 2
1874} 2498}
1875 2499
2500sub toggle {
2501 my ($self) = @_;
2502
2503 $self->{state} = !$self->{state};
2504 $self->emit (changed => $self->{state});
2505 $self->update;
2506}
2507
1876sub button_down { 2508sub invoke_button_down {
1877 my ($self, $ev, $x, $y) = @_; 2509 my ($self, $ev, $x, $y) = @_;
1878 2510
1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2511 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2512 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881 $self->{state} = !$self->{state}; 2513 $self->toggle;
1882 $self->_emit (changed => $self->{state}); 2514 } else {
2515 return 0
2516 }
2517
1883 } 2518 1
1884} 2519}
1885 2520
1886sub _draw { 2521sub _draw {
1887 my ($self) = @_; 2522 my ($self) = @_;
1888 2523
1889 $self->SUPER::_draw; 2524 $self->SUPER::_draw;
1890 2525
1891 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2526 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
1892 2527
1893 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;
1894 2531
1895 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2532 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896 2533
1897 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2534 my $tex = $self->{state} ? $tex[1] : $tex[0];
1898 2535
… …
1901 glDisable GL_TEXTURE_2D; 2538 glDisable GL_TEXTURE_2D;
1902} 2539}
1903 2540
1904############################################################################# 2541#############################################################################
1905 2542
1906package CFClient::UI::Image; 2543package CFPlus::UI::Image;
1907 2544
1908our @ISA = CFClient::UI::Base::; 2545our @ISA = CFPlus::UI::Base::;
1909 2546
1910use CFClient::OpenGL; 2547use CFPlus::OpenGL;
1911use Carp qw/confess/;
1912 2548
1913our %loaded_images; 2549our %texture_cache;
1914 2550
1915sub new { 2551sub new {
1916 my $class = shift; 2552 my $class = shift;
1917 2553
1918 my $self = $class->SUPER::new (can_events => 0, @_); 2554 my $self = $class->SUPER::new (
2555 can_events => 0,
2556 scale => 1,
2557 @_,
2558 );
1919 2559
1920 $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";
1921 2562
1922 $loaded_images{$self->{image}} ||= 2563 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1923 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;
1924 2565
1925 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2566 CFPlus::weaken $texture_cache{$self->{path}};
1926 2567
1927 Scalar::Util::weaken $loaded_images{$self->{image}}; 2568 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1928
1929 $self->{aspect} = $tex->{w} / $tex->{h};
1930 2569
1931 $self 2570 $self
1932} 2571}
1933 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
1934sub size_request { 2588sub size_request {
1935 my ($self) = @_; 2589 my ($self) = @_;
1936 2590
1937 ($self->{tex}->{w}, $self->{tex}->{h}) 2591 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
1938} 2592}
1939 2593
1940sub _draw { 2594sub _draw {
1941 my ($self) = @_; 2595 my ($self) = @_;
1942 2596
… …
1959 glDisable GL_TEXTURE_2D; 2613 glDisable GL_TEXTURE_2D;
1960} 2614}
1961 2615
1962############################################################################# 2616#############################################################################
1963 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
1964package CFClient::UI::VGauge; 2660package CFPlus::UI::VGauge;
1965 2661
1966our @ISA = CFClient::UI::Base::; 2662our @ISA = CFPlus::UI::Base::;
1967 2663
1968use List::Util qw(min max); 2664use List::Util qw(min max);
1969 2665
1970use CFClient::OpenGL; 2666use CFPlus::OpenGL;
1971 2667
1972my %tex = ( 2668my %tex = (
1973 food => [ 2669 food => [
1974 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2670 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1975 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2671 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1976 ], 2672 ],
1977 grace => [ 2673 grace => [
1978 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2674 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1979 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/
1980 ], 2676 ],
1981 hp => [ 2677 hp => [
1982 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2678 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1983 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2679 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1984 ], 2680 ],
1985 mana => [ 2681 mana => [
1986 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2682 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1987 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/
1988 ], 2684 ],
1989); 2685);
1990 2686
1991# eg. VGauge->new (gauge => 'food'), default gauge: food 2687# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2051 my $ycut1 = max 0, min 1, $ycut; 2747 my $ycut1 = max 0, min 1, $ycut;
2052 my $ycut2 = max 0, min 1, $ycut - 1; 2748 my $ycut2 = max 0, min 1, $ycut - 1;
2053 2749
2054 my $h1 = $self->{h} * (1 - $ycut1); 2750 my $h1 = $self->{h} * (1 - $ycut1);
2055 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);
2056 2755
2057 glEnable GL_BLEND; 2756 glEnable GL_BLEND;
2058 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;
2059 glEnable GL_TEXTURE_2D; 2759 glEnable GL_TEXTURE_2D;
2060 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2061 2761
2062 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2762 glBindTexture GL_TEXTURE_2D, $t1->{name};
2063 glBegin GL_QUADS; 2763 glBegin GL_QUADS;
… …
2078 2778
2079 if ($t3) { 2779 if ($t3) {
2080 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2780 glBindTexture GL_TEXTURE_2D, $t3->{name};
2081 glBegin GL_QUADS; 2781 glBegin GL_QUADS;
2082 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2782 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2083 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2783 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2084 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2784 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2085 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2785 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2086 glEnd; 2786 glEnd;
2087 } 2787 }
2088 2788
2089 glDisable GL_BLEND; 2789 glDisable GL_BLEND;
2090 glDisable GL_TEXTURE_2D; 2790 glDisable GL_TEXTURE_2D;
2091} 2791}
2092 2792
2093############################################################################# 2793#############################################################################
2094 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
2095package CFClient::UI::Gauge; 2933package CFPlus::UI::Gauge;
2096 2934
2097our @ISA = CFClient::UI::VBox::; 2935our @ISA = CFPlus::UI::VBox::;
2098 2936
2099sub new { 2937sub new {
2100 my ($class, %arg) = @_; 2938 my ($class, %arg) = @_;
2101 2939
2102 my $self = $class->SUPER::new ( 2940 my $self = $class->SUPER::new (
… …
2104 can_hover => 1, 2942 can_hover => 1,
2105 can_events => 1, 2943 can_events => 1,
2106 %arg, 2944 %arg,
2107 ); 2945 );
2108 2946
2109 $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");
2110 $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);
2111 $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");
2112 2950
2113 $self 2951 $self
2114} 2952}
2115 2953
2116sub set_fontsize { 2954sub set_fontsize {
… …
2137 $self->{value}->set_text ($val); 2975 $self->{value}->set_text ($val);
2138} 2976}
2139 2977
2140############################################################################# 2978#############################################################################
2141 2979
2142package CFClient::UI::Slider; 2980package CFPlus::UI::Slider;
2143 2981
2144use strict; 2982use strict;
2145 2983
2146use CFClient::OpenGL; 2984use CFPlus::OpenGL;
2147 2985
2148our @ISA = CFClient::UI::DrawBG::; 2986our @ISA = CFPlus::UI::DrawBG::;
2149 2987
2150my @tex = 2988my @tex =
2151 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2989 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2152 qw(s1_slider.png s1_slider_bg.png); 2990 qw(s1_slider.png s1_slider_bg.png);
2153 2991
2154sub new { 2992sub new {
2155 my $class = shift; 2993 my $class = shift;
2156 2994
… …
2177 $self->update; 3015 $self->update;
2178 3016
2179 $self 3017 $self
2180} 3018}
2181 3019
2182sub changed { }
2183
2184sub set_range { 3020sub set_range {
2185 my ($self, $range) = @_; 3021 my ($self, $range) = @_;
2186 3022
2187 ($range, $self->{range}) = ($self->{range}, $range); 3023 ($range, $self->{range}) = ($self->{range}, $range);
2188 3024
2189 $self->update
2190 if "@$range" ne "@{$self->{range}}"; 3025 if ("@$range" ne "@{$self->{range}}") {
3026 $self->update;
3027 $self->set_value ($self->{range}[0]);
3028 }
2191} 3029}
2192 3030
2193sub set_value { 3031sub set_value {
2194 my ($self, $value) = @_; 3032 my ($self, $value) = @_;
2195 3033
… …
2206 if $unit; 3044 if $unit;
2207 3045
2208 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3046 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2209 3047
2210 if ($value != $old_value) { 3048 if ($value != $old_value) {
2211 $self->_emit (changed => $value); 3049 $self->emit (changed => $value);
2212 $self->update; 3050 $self->update;
2213 } 3051 }
2214} 3052}
2215 3053
2216sub size_request { 3054sub size_request {
2217 my ($self) = @_; 3055 my ($self) = @_;
2218 3056
2219 ($self->{req_w}, $self->{req_h}) 3057 ($self->{req_w}, $self->{req_h})
2220} 3058}
2221 3059
2222sub button_down { 3060sub invoke_button_down {
2223 my ($self, $ev, $x, $y) = @_; 3061 my ($self, $ev, $x, $y) = @_;
2224 3062
2225 $self->SUPER::button_down ($ev, $x, $y); 3063 $self->SUPER::invoke_button_down ($ev, $x, $y);
2226 3064
2227 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3065 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2228 3066
2229 $self->mouse_motion ($ev, $x, $y); 3067 $self->invoke_mouse_motion ($ev, $x, $y);
2230}
2231 3068
3069 1
3070}
3071
2232sub mouse_motion { 3072sub invoke_mouse_motion {
2233 my ($self, $ev, $x, $y) = @_; 3073 my ($self, $ev, $x, $y) = @_;
2234 3074
2235 if ($GRAB == $self) { 3075 if ($GRAB == $self) {
2236 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3076 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2237 3077
2238 my (undef, $lo, $hi, $page) = @{$self->{range}}; 3078 my (undef, $lo, $hi, $page) = @{$self->{range}};
2239 3079
2240 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 3080 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2241 3081
2242 $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
2243 } 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
2244} 3100}
2245 3101
2246sub update { 3102sub update {
2247 my ($self) = @_; 3103 my ($self) = @_;
2248 3104
2249 $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}) {
2250 $self->set_value ($self->{range}[0]); 3113 $self->set_value ($self->{range}[0]);
2251 3114
2252 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3115 my ($value, $lo, $hi, $page) = @{$self->{range}};
2253 my $range = ($hi - $page - $lo) || 1e-100; 3116 my $range = ($hi - $page - $lo) || 1e-100;
2254 3117
… …
2260 $value = ($value - $lo) / $range; 3123 $value = ($value - $lo) / $range;
2261 $value = $value * $self->{scale} + $self->{offset}; 3124 $value = $value * $self->{scale} + $self->{offset};
2262 3125
2263 $self->{knob_x} = $value - $knob_w * 0.5; 3126 $self->{knob_x} = $value - $knob_w * 0.5;
2264 $self->{knob_w} = $knob_w; 3127 $self->{knob_w} = $knob_w;
2265 }); 3128 }
2266
2267 $self->SUPER::update;
2268}
2269
2270sub _draw {
2271 my ($self) = @_;
2272 3129
2273 $self->SUPER::_draw (); 3130 $self->SUPER::_draw ();
2274 3131
2275 glScale $self->{w}, $self->{h}; 3132 glScale $self->{w}, $self->{h};
2276 3133
… …
2296 glDisable GL_TEXTURE_2D; 3153 glDisable GL_TEXTURE_2D;
2297} 3154}
2298 3155
2299############################################################################# 3156#############################################################################
2300 3157
2301package CFClient::UI::ValSlider; 3158package CFPlus::UI::ValSlider;
2302 3159
2303our @ISA = CFClient::UI::HBox::; 3160our @ISA = CFPlus::UI::HBox::;
2304 3161
2305sub new { 3162sub new {
2306 my ($class, %arg) = @_; 3163 my ($class, %arg) = @_;
2307 3164
2308 my $range = delete $arg{range}; 3165 my $range = delete $arg{range};
2309 3166
2310 my $self = $class->SUPER::new ( 3167 my $self = $class->SUPER::new (
2311 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3168 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2312 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3169 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2313 to_value => sub { shift }, 3170 to_value => sub { shift },
2314 from_value => sub { shift }, 3171 from_value => sub { shift },
2315 %arg, 3172 %arg,
2316 ); 3173 );
2317 3174
… …
2337sub set_range { shift->{slider}->set_range (@_) } 3194sub set_range { shift->{slider}->set_range (@_) }
2338sub set_value { shift->{slider}->set_value (@_) } 3195sub set_value { shift->{slider}->set_value (@_) }
2339 3196
2340############################################################################# 3197#############################################################################
2341 3198
2342package CFClient::UI::TextView; 3199package CFPlus::UI::TextScroller;
2343 3200
2344our @ISA = CFClient::UI::HBox::; 3201our @ISA = CFPlus::UI::HBox::;
2345 3202
2346use CFClient::OpenGL; 3203use CFPlus::OpenGL;
2347 3204
2348sub new { 3205sub new {
2349 my $class = shift; 3206 my $class = shift;
2350 3207
2351 my $self = $class->SUPER::new ( 3208 my $self = $class->SUPER::new (
2352 fontsize => 1, 3209 fontsize => 1,
2353 can_events => 0, 3210 can_events => 1,
3211 indent => 0,
2354 #font => default_font 3212 #font => default_font
2355 @_, 3213 @_,
2356 3214
2357 layout => (new CFClient::Layout 1), 3215 layout => (new CFPlus::Layout),
2358 par => [], 3216 par => [],
3217 max_par => 0,
2359 height => 0, 3218 height => 0,
2360 children => [ 3219 children => [
2361 (new CFClient::UI::Empty expand => 1), 3220 (new CFPlus::UI::Empty expand => 1),
2362 (new CFClient::UI::Slider vertical => 1), 3221 (new CFPlus::UI::Slider vertical => 1),
2363 ], 3222 ],
2364 ); 3223 );
2365 3224
2366 $self->{children}[1]->connect (changed => sub { $self->update }); 3225 $self->{children}[1]->connect (changed => sub { $self->update });
2367 3226
… …
2373 3232
2374 $self->{fontsize} = $fontsize; 3233 $self->{fontsize} = $fontsize;
2375 $self->reflow; 3234 $self->reflow;
2376} 3235}
2377 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
2378sub size_allocate { 3246sub invoke_size_allocate {
2379 my ($self, $w, $h, $changed) = @_; 3247 my ($self, $w, $h) = @_;
2380 3248
2381 $self->SUPER::size_allocate ($w, $h, $changed); 3249 my ($empty, $slider, @other) = @{ $self->{children} };
2382 3250 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2383 return unless $changed;
2384 3251
2385 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3252 $self->{layout}->set_font ($self->{font}) if $self->{font};
2386 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3253 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2387 $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});
2388 3256
2389 $self->reflow; 3257 $self->reflow;
2390}
2391 3258
2392sub text_size { 3259 local $self->{children} = [$empty, $slider];
3260 $self->SUPER::invoke_size_allocate ($w, $h)
3261}
3262
3263sub invoke_mouse_wheel {
2393 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) = @_;
2394 3275
2395 my $layout = $self->{layout}; 3276 my $layout = $self->{layout};
2396 3277
3278 $layout->set_font ($self->{font}) if $self->{font};
3279 $layout->set_foreground (@{$para->{fg}});
2397 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3280 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2398 $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});
2399 $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}}
2400 3289 );
3290
2401 $layout->size 3291 $layout
2402} 3292}
2403 3293
2404sub reflow { 3294sub reflow {
2405 my ($self) = @_; 3295 my ($self) = @_;
2406 3296
… …
2413 3303
2414 # todo: base offset on lines or so, not on pixels 3304 # todo: base offset on lines or so, not on pixels
2415 $self->{children}[1]->set_value ($offset); 3305 $self->{children}[1]->set_value ($offset);
2416} 3306}
2417 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
2418sub clear { 3323sub clear {
2419 my ($self) = @_; 3324 my ($self) = @_;
3325
3326 my (undef, undef, @other) = @{ $self->{children} };
3327 $self->remove ($_) for @other;
2420 3328
2421 $self->{par} = []; 3329 $self->{par} = [];
2422 $self->{height} = 0; 3330 $self->{height} = 0;
2423 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3331 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2424} 3332}
2425 3333
2426sub add_paragraph { 3334sub add_paragraph {
2427 my ($self, $color, $text, $indent) = @_; 3335 my $self = shift;
2428 3336
2429 for my $line (split /\n/, $text) { 3337 for my $para (@_) {
2430 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
2431 $self->{height} += $h; 3389 $self->{height} = $height;
2432 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3390 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2433 }
2434 3391
2435 $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 }
2436} 3398}
2437 3399
2438sub update { 3400sub update {
2439 my ($self) = @_; 3401 my ($self) = @_;
2440 3402
… …
2442 3404
2443 return unless $self->{h} > 0; 3405 return unless $self->{h} > 0;
2444 3406
2445 delete $self->{texture}; 3407 delete $self->{texture};
2446 3408
2447 $ROOT->on_post_alloc ($self, sub { 3409 $ROOT->on_post_alloc ($self => sub {
3410 $self->force_uptodate;
3411
2448 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3412 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2449 3413
2450 if (delete $self->{need_reflow}) {
2451 my $height = 0;
2452
2453 my $layout = $self->{layout};
2454
2455 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2456
2457 for (@{$self->{par}}) {
2458 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2459 $layout->set_width ($W - $_->[3]);
2460 $layout->set_markup ($_->[4]);
2461 my ($w, $h) = $layout->size;
2462 $_->[0] = $w + $_->[3];
2463 $_->[1] = $h;
2464 }
2465
2466 $height += $_->[1];
2467 }
2468
2469 $self->{height} = $height;
2470
2471 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2472
2473 delete $self->{texture};
2474 }
2475
2476 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3414 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2477 glClearColor 0.5, 0.5, 0.5, 0; 3415 glClearColor 0, 0, 0, 0;
2478 glClear GL_COLOR_BUFFER_BIT; 3416 glClear GL_COLOR_BUFFER_BIT;
2479 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;
2480 my $top = int $self->{children}[1]{range}[0]; 3426 my $top = int $self->{children}[1]{range}[0];
2481 3427
2482 my $y0 = $top; 3428 my $y0 = $top;
2483 my $y1 = $top + $H; 3429 my $y1 = $top + $H;
2484 3430
2485 my $y = 0;
2486
2487 my $layout = $self->{layout};
2488
2489 $layout->set_font ($self->{font}) if $self->{font};
2490
2491 glEnable GL_BLEND;
2492 #TODO# not correct in windows where rgba is forced off
2493 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2494
2495 for my $par (@{$self->{par}}) { 3431 for my $para (@{$self->{par}}) {
2496 my $h = $par->[1]; 3432 my $h = $para->{h};
3433 my $y = $para->{y};
2497 3434
2498 if ($y0 < $y + $h && $y < $y1) { 3435 if ($y0 < $y + $h && $y < $y1) {
2499 $layout->set_foreground (@{ $par->[2] }); 3436 my $layout = $self->get_layout ($para);
2500 $layout->set_width ($W - $par->[3]);
2501 $layout->set_markup ($par->[4]);
2502 3437
2503 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3438 $layout->render ($para->{indent}, $y - $y0);
3439 $layout->draw;
2504 3440
2505 glRasterPos $par->[3], $y - $y0; 3441 if (my @w = @{ $para->{widget} }) {
2506 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 }
2507 } 3453 }
2508 3454
2509 $y += $h; 3455 $paridx++;
3456 $top_paragraph ||= $paridx if $y >= $top;
2510 } 3457 }
2511 3458
2512 glDisable GL_BLEND; 3459 $self->{top_paragraph} = $top_paragraph;
2513 }; 3460 };
2514 }); 3461 });
2515} 3462}
2516 3463
3464sub reconfigure {
3465 my ($self) = @_;
3466
3467 $self->SUPER::reconfigure;
3468
3469 $_->{w} = 1e10 for @{ $self->{par} };
3470 $self->reflow;
3471}
3472
2517sub _draw { 3473sub _draw {
2518 my ($self) = @_; 3474 my ($self) = @_;
2519 3475
2520 glEnable GL_TEXTURE_2D; 3476 glEnable GL_TEXTURE_2D;
2521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3477 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2522 glColor 1, 1, 1, 1; 3478 glColor 0, 0, 0, 1;
2523 $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});
2524 glDisable GL_TEXTURE_2D; 3480 glDisable GL_TEXTURE_2D;
2525 3481
2526 $self->{children}[1]->draw; 3482 $self->{children}[1]->draw;
2527
2528} 3483}
2529 3484
2530############################################################################# 3485#############################################################################
2531 3486
2532package CFClient::UI::Animator; 3487package CFPlus::UI::Animator;
2533 3488
2534use CFClient::OpenGL; 3489use CFPlus::OpenGL;
2535 3490
2536our @ISA = CFClient::UI::Bin::; 3491our @ISA = CFPlus::UI::Bin::;
2537 3492
2538sub moveto { 3493sub moveto {
2539 my ($self, $x, $y) = @_; 3494 my ($self, $x, $y) = @_;
2540 3495
2541 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3496 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2569 glPopMatrix; 3524 glPopMatrix;
2570} 3525}
2571 3526
2572############################################################################# 3527#############################################################################
2573 3528
2574package CFClient::UI::Flopper; 3529package CFPlus::UI::Flopper;
2575 3530
2576our @ISA = CFClient::UI::Button::; 3531our @ISA = CFPlus::UI::Button::;
2577 3532
2578sub new { 3533sub new {
2579 my $class = shift; 3534 my $class = shift;
2580 3535
2581 my $self = $class->SUPER::new ( 3536 my $self = $class->SUPER::new (
… …
2593 $self->{other}->toggle_visibility; 3548 $self->{other}->toggle_visibility;
2594} 3549}
2595 3550
2596############################################################################# 3551#############################################################################
2597 3552
2598package CFClient::UI::Tooltip; 3553package CFPlus::UI::Tooltip;
2599 3554
2600our @ISA = CFClient::UI::Bin::; 3555our @ISA = CFPlus::UI::Bin::;
2601 3556
2602use CFClient::OpenGL; 3557use CFPlus::OpenGL;
2603 3558
2604sub new { 3559sub new {
2605 my $class = shift; 3560 my $class = shift;
2606 3561
2607 $class->SUPER::new ( 3562 $class->SUPER::new (
… …
2611} 3566}
2612 3567
2613sub set_tooltip_from { 3568sub set_tooltip_from {
2614 my ($self, $widget) = @_; 3569 my ($self, $widget) = @_;
2615 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
2616 $self->add (new CFClient::UI::Label 3587 $self->add (new CFPlus::UI::Label
2617 markup => $widget->{tooltip}, 3588 markup => $tip,
2618 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3589 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619 fontsize => 0.8, 3590 fontsize => 0.8,
2620 fg => [0, 0, 0, 1], 3591 style => 1, # FLAG_INVERSE
2621 ellipsise => 0, 3592 ellipsise => 0,
2622 font => ($widget->{tooltip_font} || $::FONT_PROP), 3593 font => ($widget->{tooltip_font} || $::FONT_PROP),
2623 ); 3594 );
2624} 3595}
2625 3596
… …
2629 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3600 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2630 3601
2631 ($w + 4, $h + 4) 3602 ($w + 4, $h + 4)
2632} 3603}
2633 3604
2634sub size_allocate { 3605sub invoke_size_allocate {
2635 my ($self, $w, $h, $changed) = @_; 3606 my ($self, $w, $h) = @_;
2636 3607
2637 return unless $changed;
2638
2639 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 3608 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2640} 3609}
2641 3610
2642sub visibility_change { 3611sub invoke_visibility_change {
2643 my ($self, $visible) = @_; 3612 my ($self, $visible) = @_;
2644 3613
2645 return unless $visible; 3614 return unless $visible;
2646 3615
2647 $self->{root}->on_post_alloc ("move_$self" => sub { 3616 $self->{root}->on_post_alloc ("move_$self" => sub {
2648 my $widget = $self->{owner} 3617 my $widget = $self->{owner}
2649 or return; 3618 or return;
2650 3619
3620 if ($widget->{visible}) {
2651 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3621 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2652 3622
2653 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3623 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2654 if $x + $self->{w} > $::WIDTH; 3624 if $x + $self->{w} > $self->{root}{w};
2655 3625
2656 $self->move_abs ($x, $y); 3626 $self->move_abs ($x, $y);
3627 } else {
3628 $self->hide;
3629 }
2657 }); 3630 });
2658} 3631}
2659 3632
2660sub _draw { 3633sub _draw {
2661 my ($self) = @_; 3634 my ($self) = @_;
2662 3635
2663 glTranslate 0.375, 0.375;
2664
2665 my ($w, $h) = @$self{qw(w h)}; 3636 my ($w, $h) = @$self{qw(w h)};
2666 3637
2667 glColor 1, 0.8, 0.4; 3638 glColor 1, 0.8, 0.4;
2668 glBegin GL_QUADS; 3639 glRect 0, 0, $w, $h;
2669 glVertex 0 , 0;
2670 glVertex 0 , $h;
2671 glVertex $w, $h;
2672 glVertex $w, 0;
2673 glEnd;
2674 3640
2675 glColor 0, 0, 0; 3641 glColor 0, 0, 0;
2676 glBegin GL_LINE_LOOP; 3642 glRect_lineloop .5, .5, $w + .5, $h + .5;
2677 glVertex 0 , 0;
2678 glVertex 0 , $h;
2679 glVertex $w, $h;
2680 glVertex $w, 0;
2681 glEnd;
2682 3643
2683 glTranslate 2 - 0.375, 2 - 0.375; 3644 glTranslate 2, 2;
2684 3645
2685 $self->SUPER::_draw; 3646 $self->SUPER::_draw;
2686} 3647}
2687 3648
2688############################################################################# 3649#############################################################################
2689 3650
2690package CFClient::UI::Face; 3651package CFPlus::UI::Face;
2691 3652
2692our @ISA = CFClient::UI::Base::; 3653our @ISA = CFPlus::UI::DrawBG::;
2693 3654
2694use CFClient::OpenGL; 3655use CFPlus::OpenGL;
2695 3656
2696sub new { 3657sub new {
2697 my $class = shift; 3658 my $class = shift;
2698 3659
2699 my $self = $class->SUPER::new ( 3660 my $self = $class->SUPER::new (
3661 size_w => 32,
3662 size_h => 8,
2700 aspect => 1, 3663 aspect => 1,
2701 can_events => 0, 3664 can_events => 0,
2702 @_, 3665 @_,
2703 ); 3666 );
2704 3667
2705 if ($self->{anim} && $self->{animspeed}) { 3668 if ($self->{anim} && $self->{animspeed}) {
2706 Scalar::Util::weaken (my $widget = $self); 3669 CFPlus::weaken (my $widget = $self);
2707 3670
3671 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3672 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
2708 $self->{timer} = Event->timer ( 3673 $self->{timer} = Event->timer (
2709 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2710 hard => 1, 3674 parked => 1,
2711 interval => $self->{animspeed},
2712 cb => sub { 3675 cb => sub {
3676 return unless $::CONN;
3677
3678 my $w = $widget
3679 or return;
3680
2713 ++$widget->{frame}; 3681 ++$w->{frame};
3682 $w->update_face;
3683
3684 # somehow, $widget can go away
2714 $widget->update; 3685 $w->update;
3686 $w->update_timer;
2715 }, 3687 },
2716 ); 3688 );
3689
3690 $self->update_face;
3691 $self->update_timer;
2717 } 3692 }
2718 3693
2719 $self 3694 $self
2720} 3695}
2721 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
2722sub size_request { 3733sub size_request {
2723 (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)
2724} 3751}
2725 3752
2726sub update { 3753sub update {
2727 my ($self) = @_; 3754 my ($self) = @_;
2728 3755
2729 return unless $self->{visible}; 3756 return unless $self->{visible};
2730 3757
2731 $self->SUPER::update; 3758 $self->SUPER::update;
2732} 3759}
2733 3760
3761sub invoke_visibility_change {
3762 my ($self) = @_;
3763
3764 $self->update_timer;
3765
3766 0
3767}
3768
2734sub _draw { 3769sub _draw {
2735 my ($self) = @_; 3770 my ($self) = @_;
2736 3771
2737 return unless $::CONN; 3772 $self->SUPER::_draw;
2738 3773
2739 my $face; 3774 if (my $tex = $self->{tex}) {
2740
2741 if ($self->{frame}) {
2742 my $anim = $::CONN->{anim}[$self->{anim}];
2743
2744 $face = $anim->[ $self->{frame} % @$anim ]
2745 if $anim && @$anim;
2746 }
2747
2748 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2749
2750 if ($tex) {
2751 glEnable GL_TEXTURE_2D; 3775 glEnable GL_TEXTURE_2D;
2752 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3776 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2753 glColor 1, 1, 1, 1; 3777 glColor 0, 0, 0, 1;
2754 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3778 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2755 glDisable GL_TEXTURE_2D; 3779 glDisable GL_TEXTURE_2D;
2756 } 3780 }
2757} 3781}
2758 3782
2759sub DESTROY { 3783sub destroy {
2760 my ($self) = @_; 3784 my ($self) = @_;
2761 3785
2762 $self->{timer}->cancel 3786 (delete $self->{timer})->cancel
2763 if $self->{timer}; 3787 if $self->{timer};
2764 3788
2765 $self->SUPER::DESTROY; 3789 $self->SUPER::destroy;
2766} 3790}
2767 3791
2768############################################################################# 3792#############################################################################
2769 3793
2770package CFClient::UI::Inventory; 3794package CFPlus::UI::Buttonbar;
2771 3795
2772our @ISA = CFClient::UI::ScrolledWindow::; 3796our @ISA = CFPlus::UI::HBox::;
2773 3797
2774sub new { 3798# TODO: should actually wrap buttons and other goodies.
2775 my $class = shift;
2776
2777 my $self = $class->SUPER::new (
2778 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2779 @_,
2780 );
2781
2782 $self
2783}
2784
2785sub set_items {
2786 my ($self, $items) = @_;
2787
2788 $self->{scrolled}->clear;
2789 return unless $items;
2790
2791 my @items = sort {
2792 ($a->{type} <=> $b->{type})
2793 or ($a->{name} cmp $b->{name})
2794 } @$items;
2795
2796 $self->{real_items} = \@items;
2797
2798 my $row = 0;
2799 for my $item (@items) {
2800 CFClient::Item::update_widgets $item;
2801
2802 $self->{scrolled}->add (0, $row, $item->{face_widget});
2803 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2804 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2805
2806 $row++;
2807 }
2808}
2809 3799
2810############################################################################# 3800#############################################################################
2811 3801
2812package CFClient::UI::Menu; 3802package CFPlus::UI::Menu;
2813 3803
2814our @ISA = CFClient::UI::FancyFrame::; 3804our @ISA = CFPlus::UI::Toplevel::;
2815 3805
2816use CFClient::OpenGL; 3806use CFPlus::OpenGL;
2817 3807
2818sub new { 3808sub new {
2819 my $class = shift; 3809 my $class = shift;
2820 3810
2821 my $self = $class->SUPER::new ( 3811 my $self = $class->SUPER::new (
2822 items => [], 3812 items => [],
2823 z => 100, 3813 z => 100,
2824 @_, 3814 @_,
2825 ); 3815 );
2826 3816
2827 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3817 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2828 3818
2829 for my $item (@{ $self->{items} }) { 3819 for my $item (@{ $self->{items} }) {
2830 my ($widget, $cb) = @$item; 3820 my ($widget, $cb, $tooltip) = @$item;
2831 3821
2832 # handle various types of items, only text for now 3822 # handle various types of items, only text for now
2833 if (!ref $widget) { 3823 if (!ref $widget) {
3824 if ($widget =~ /\t/) {
3825 my ($left, $right) = split /\t/, $widget, 2;
3826
2834 $widget = new CFClient::UI::Label 3827 $widget = new CFPlus::UI::HBox
2835 can_hover => 1, 3828 can_hover => 1,
2836 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,
2837 text => $widget; 3841 markup => $widget,
3842 tooltip => $tooltip;
3843 }
2838 } 3844 }
2839 3845
2840 $self->{item}{$widget} = $item; 3846 $self->{item}{$widget} = $item;
2841 3847
2842 $self->{vbox}->add ($widget); 3848 $self->{vbox}->add ($widget);
… …
2847 3853
2848# 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)
2849sub popup { 3855sub popup {
2850 my ($self, $ev) = @_; 3856 my ($self, $ev) = @_;
2851 3857
2852 $self->_emit ("popdown"); 3858 $self->emit ("popdown");
2853 3859
2854 # maybe save $GRAB? must be careful about events... 3860 # maybe save $GRAB? must be careful about events...
2855 $GRAB = $self; 3861 $GRAB = $self;
2856 $self->{button} = $ev->{button}; 3862 $self->{button} = $ev->{button};
2857 3863
2858 $self->show; 3864 $self->show;
2859 $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);
2860} 3866}
2861 3867
2862sub mouse_motion { 3868sub invoke_mouse_motion {
2863 my ($self, $ev, $x, $y) = @_; 3869 my ($self, $ev, $x, $y) = @_;
2864 3870
2865 # TODO: should use vbox->find_widget or so 3871 # TODO: should use vbox->find_widget or so
2866 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3872 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2867 $self->{hover} = $self->{item}{$HOVER}; 3873 $self->{hover} = $self->{item}{$HOVER};
2868}
2869 3874
3875 0
3876}
3877
2870sub button_up { 3878sub invoke_button_up {
2871 my ($self, $ev, $x, $y) = @_; 3879 my ($self, $ev, $x, $y) = @_;
2872 3880
2873 if ($ev->{button} == $self->{button}) { 3881 if ($ev->{button} == $self->{button}) {
2874 undef $GRAB; 3882 undef $GRAB;
2875 $self->hide; 3883 $self->hide;
2876 3884
2877 $self->_emit ("popdown"); 3885 $self->emit ("popdown");
2878 $self->{hover}[1]->() if $self->{hover}; 3886 $self->{hover}[1]->() if $self->{hover};
3887 } else {
3888 return 0
3889 }
3890
2879 } 3891 1
2880} 3892}
2881 3893
2882############################################################################# 3894#############################################################################
2883 3895
2884package CFClient::UI::Statusbox; 3896package CFPlus::UI::Multiplexer;
2885 3897
2886our @ISA = CFClient::UI::VBox::; 3898our @ISA = CFPlus::UI::Container::;
2887 3899
2888sub new { 3900sub new {
2889 my $class = shift; 3901 my $class = shift;
2890 3902
2891 $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 (
2892 fontsize => 0.8, 4151 fontsize => 0.8,
2893 @_, 4152 @_,
2894 ) 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
2895} 4160}
2896 4161
2897sub reorder { 4162sub reorder {
2898 my ($self) = @_; 4163 my ($self) = @_;
2899 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} };
2900 4170
2901 while (my ($k, $v) = each %{ $self->{item} }) { 4171 while (my ($k, $v) = each %{ $self->{item} }) {
2902 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4172 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2903 } 4173 }
2904 4174
… …
2907 my @items = sort { 4177 my @items = sort {
2908 $a->{pri} <=> $b->{pri} 4178 $a->{pri} <=> $b->{pri}
2909 or $b->{id} <=> $a->{id} 4179 or $b->{id} <=> $a->{id}
2910 } values %{ $self->{item} }; 4180 } values %{ $self->{item} };
2911 4181
4182 $self->{timer}->interval (1);
4183
2912 my $count = 10 + 1; 4184 my $count = 10 + 1;
2913 for my $item (@items) { 4185 for my $item (@items) {
2914 last unless --$count; 4186 last unless --$count;
2915 4187
2916 push @widgets, $item->{label} ||= do { 4188 my $label = $item->{label} ||= do {
2917 # TODO: doesn't handle markup well (read as: at all) 4189 # TODO: doesn't handle markup well (read as: at all)
2918 my $short = $item->{count} > 1 4190 my $short = $item->{count} > 1
2919 ? "<b>$item->{count} ×</b> $item->{text}" 4191 ? "<b>$item->{count} ×</b> $item->{text}"
2920 : $item->{text}; 4192 : $item->{text};
2921 4193
2922 for ($short) { 4194 for ($short) {
2923 s/^\s+//; 4195 s/^\s+//;
2924 s/\s+/ /g; 4196 s/\s+/ /g;
2925 } 4197 }
2926 4198
2927 new CFClient::UI::Label 4199 new CFPlus::UI::Label
2928 markup => $short, 4200 markup => $short,
2929 tooltip => $item->{tooltip}, 4201 tooltip => $item->{tooltip},
2930 tooltip_font => $::FONT_PROP, 4202 tooltip_font => $::FONT_PROP,
2931 tooltip_width => 0.67, 4203 tooltip_width => 0.67,
2932 fontsize => $item->{fontsize} || $self->{fontsize}, 4204 fontsize => $item->{fontsize} || $self->{fontsize},
2933 max_w => $::WIDTH * 0.44, 4205 max_w => $::WIDTH * 0.44,
2934 fg => $item->{fg}, 4206 fg => [@{ $item->{fg} }],
2935 can_events => 1, 4207 can_events => 1,
2936 can_hover => 1 4208 can_hover => 1
2937 }; 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;
2938 } 4222 }
2939 4223
2940 $self->clear; 4224 $self->clear;
2941 $self->SUPER::add (reverse @widgets); 4225 $self->SUPER::add (reverse @widgets);
2942} 4226}
… …
2947 $text =~ s/^\s+//; 4231 $text =~ s/^\s+//;
2948 $text =~ s/\s+$//; 4232 $text =~ s/\s+$//;
2949 4233
2950 return unless $text; 4234 return unless $text;
2951 4235
2952 my $timeout = time + ((delete $arg{timeout}) || 60); 4236 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2953 4237
2954 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 4238 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2955 4239
2956 if (my $item = $self->{item}{$group}) { 4240 if (my $item = $self->{item}{$group}) {
2957 if ($item->{text} eq $text) { 4241 if ($item->{text} eq $text) {
2958 $item->{count}++; 4242 $item->{count}++;
2959 } else { 4243 } else {
2960 $item->{count} = 1; 4244 $item->{count} = 1;
2961 $item->{text} = $item->{tooltip} = $text; 4245 $item->{text} = $item->{tooltip} = $text;
2962 } 4246 }
2963 $item->{id} = ++$self->{id}; 4247 $item->{id} += 0.2;#d#
2964 $item->{timeout} = $timeout; 4248 $item->{timeout} = $timeout;
2965 delete $item->{label}; 4249 delete $item->{label};
2966 } else { 4250 } else {
2967 $self->{item}{$group} = { 4251 $self->{item}{$group} = {
2968 id => ++$self->{id}, 4252 id => ++$self->{id},
… …
2974 count => 1, 4258 count => 1,
2975 %arg, 4259 %arg,
2976 }; 4260 };
2977 } 4261 }
2978 4262
4263 $ROOT->on_refresh (reorder => sub {
2979 $self->reorder; 4264 $self->reorder;
4265 });
2980} 4266}
2981 4267
2982sub reconfigure { 4268sub reconfigure {
2983 my ($self) = @_; 4269 my ($self) = @_;
2984 4270
… …
2987 4273
2988 $self->reorder; 4274 $self->reorder;
2989 $self->SUPER::reconfigure; 4275 $self->SUPER::reconfigure;
2990} 4276}
2991 4277
4278sub destroy {
4279 my ($self) = @_;
4280
4281 $self->{timer}->cancel;
4282
4283 $self->SUPER::destroy;
4284}
4285
2992############################################################################# 4286#############################################################################
2993 4287
2994package CFClient::UI::Root; 4288package CFPlus::UI::Root;
2995 4289
2996our @ISA = CFClient::UI::Container::; 4290our @ISA = CFPlus::UI::Container::;
2997 4291
4292use List::Util qw(min max);
4293
2998use CFClient::OpenGL; 4294use CFPlus::OpenGL;
2999 4295
3000sub new { 4296sub new {
3001 my $class = shift; 4297 my $class = shift;
3002 4298
3003 my $self = $class->SUPER::new ( 4299 my $self = $class->SUPER::new (
3004 visible => 1, 4300 visible => 1,
3005 @_, 4301 @_,
3006 ); 4302 );
3007 4303
3008 Scalar::Util::weaken ($self->{root} = $self); 4304 CFPlus::weaken ($self->{root} = $self);
3009 4305
3010 $self 4306 $self
3011}
3012
3013sub configure {
3014 my ($self, $x, $y, $w, $h) = @_;
3015
3016 $self->{w} = $w;
3017 $self->{h} = $h;
3018}
3019
3020sub reconfigure {
3021 my ($self) = @_;
3022
3023 $self->SUPER::reconfigure;
3024
3025 $self->size_allocate ($self->{w}, $self->{h}, 1)
3026 if $self->{w};
3027} 4307}
3028 4308
3029sub size_request { 4309sub size_request {
3030 my ($self) = @_; 4310 my ($self) = @_;
3031 4311
… …
3044 $coord = $max - $size if $coord > $max - $size; 4324 $coord = $max - $size if $coord > $max - $size;
3045 4325
3046 int $coord + 0.5 4326 int $coord + 0.5
3047} 4327}
3048 4328
3049sub size_allocate { 4329sub invoke_size_allocate {
3050 my ($self, $w, $h, $changed) = @_; 4330 my ($self, $w, $h) = @_;
3051 4331
3052 for my $child ($self->children) { 4332 for my $child ($self->children) {
3053 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)};
3054 4334
3055 $X = $child->{force_x} if exists $child->{force_x}; 4335 $X = $child->{force_x} if exists $child->{force_x};
… …
3058 $X = _to_pixel $X, $W, $self->{w}; 4338 $X = _to_pixel $X, $W, $self->{w};
3059 $Y = _to_pixel $Y, $H, $self->{h}; 4339 $Y = _to_pixel $Y, $H, $self->{h};
3060 4340
3061 $child->configure ($X, $Y, $W, $H); 4341 $child->configure ($X, $Y, $W, $H);
3062 } 4342 }
4343
4344 1
3063} 4345}
3064 4346
3065sub coord2local { 4347sub coord2local {
3066 my ($self, $x, $y) = @_; 4348 my ($self, $x, $y) = @_;
3067 4349
… …
3075} 4357}
3076 4358
3077sub update { 4359sub update {
3078 my ($self) = @_; 4360 my ($self) = @_;
3079 4361
3080 $::WANT_REFRESH++; 4362 $::WANT_REFRESH->start;
3081} 4363}
3082 4364
3083sub add { 4365sub add {
3084 my ($self, @children) = @_; 4366 my ($self, @children) = @_;
3085 4367
… …
3122 while ($self->{refresh_hook}) { 4404 while ($self->{refresh_hook}) {
3123 $_->() 4405 $_->()
3124 for values %{delete $self->{refresh_hook}}; 4406 for values %{delete $self->{refresh_hook}};
3125 } 4407 }
3126 4408
3127 if ($self->{realloc}) { 4409 while ($self->{realloc}) {
4410 my %queue;
3128 my @queue; 4411 my @queue;
4412 my $widget;
3129 4413
4414 outer:
3130 while () { 4415 while () {
3131 if ($self->{realloc}) { 4416 if (my $realloc = delete $self->{realloc}) {
3132 #TODO use array-of-depth approach 4417 for $widget (values %$realloc) {
4418 $widget->{visible} or next; # do not resize invisible widgets
3133 4419
3134 @queue = sort { $a->{visible} <=> $b->{visible} } 4420 $queue{$widget+0}++ and next; # duplicates are common
3135 @queue, values %{delete $self->{realloc}}; 4421
4422 push @{ $queue[$widget->{visible}] }, $widget;
4423 }
3136 } 4424 }
3137 4425
4426 while () {
4427 @queue or last outer;
4428
3138 my $widget = pop @queue || last; 4429 $widget = pop @{ $queue[-1] || [] }
4430 and last;
4431
4432 pop @queue;
4433 }
3139 4434
3140 $widget->{visible} or last; # do not resize invisible widgets 4435 delete $queue{$widget+0};
3141 4436
3142 my ($w, $h) = $widget->size_request; 4437 my ($w, $h) = $widget->size_request;
3143 4438
3144 my $min_size = $widget->{is_toplevel} ? 16 : 0; 4439 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
4440 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3145 4441
3146 $w = List::Util::max $widget->{min_w} || $widget->{is_toplevel} * 16, $w; 4442 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3147 $h = List::Util::max $widget->{min_h} || $widget->{is_toplevel} * 16, $h; 4443 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3148 4444
3149 $w = $widget->{force_w} if exists $widget->{force_w}; 4445 $w = $widget->{force_w} if exists $widget->{force_w};
3150 $h = $widget->{force_h} if exists $widget->{force_h}; 4446 $h = $widget->{force_h} if exists $widget->{force_h};
3151 4447
4448 if ($widget->{req_w} != $w || $widget->{req_h} != $h
4449 || delete $widget->{force_realloc}) {
3152 $widget->{req_w} = $w; 4450 $widget->{req_w} = $w;
3153 $widget->{req_h} = $h; 4451 $widget->{req_h} = $h;
3154 4452
3155 $self->{size_alloc}{$widget} = [$widget, undef, undef]; 4453 $self->{size_alloc}{$widget+0} = $widget;
3156 4454
3157 push @queue, $widget->{parent} 4455 if (my $parent = $widget->{parent}) {
3158 if ($self->{w} != $w || $self->{h} != $h) && $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};
3159 } 4465 }
3160 }
3161 4466
3162 while (my $size_alloc = delete $self->{size_alloc}) { 4467 while (my $size_alloc = delete $self->{size_alloc}) {
3163 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 4468 my @queue = sort { $a->{visible} <=> $b->{visible} }
3164 values %$size_alloc; 4469 values %$size_alloc;
3165 4470
3166 while () { 4471 while () {
3167 my ($widget, $w, $h) = @{ pop @queue or last }; 4472 my $widget = pop @queue || last;
3168 4473
3169 $w = $widget->{w} || $widget->{req_w} unless defined $w; 4474 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3170 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3171 4475
3172 $w = 0 if $w < 0; 4476 $w = max $widget->{min_w}, $w;
3173 $h = 0 if $h < 0; 4477 $h = max $widget->{min_h}, $h;
3174 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
3175 $w = int $w + 0.5; 4485 $w = int $w + 0.5;
3176 $h = int $h + 0.5; 4486 $h = int $h + 0.5;
3177 4487
3178 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};
3179 4491
3180 $widget->{w} = $w; 4492 $widget->{w} = $w;
3181 $widget->{h} = $h; 4493 $widget->{h} = $h;
3182 4494
3183 $widget->emit (size_allocate => $w, $h, $changed); 4495 $widget->emit (size_allocate => $w, $h);
4496 }
4497 }
3184 } 4498 }
3185 } 4499 }
3186 4500
3187 while ($self->{post_alloc_hook}) { 4501 while ($self->{post_alloc_hook}) {
3188 $_->() 4502 $_->()
… …
3197 glLoadIdentity; 4511 glLoadIdentity;
3198 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4512 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3199 glMatrixMode GL_MODELVIEW; 4513 glMatrixMode GL_MODELVIEW;
3200 glLoadIdentity; 4514 glLoadIdentity;
3201 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
3202 $self->_draw; 4522 $self->_draw;
4523 }
3203} 4524}
3204 4525
3205############################################################################# 4526#############################################################################
3206 4527
3207package CFClient::UI; 4528package CFPlus::UI;
3208 4529
3209$ROOT = new CFClient::UI::Root; 4530$ROOT = new CFPlus::UI::Root;
3210$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4531$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3211 4532
32121 45331
3213 4534

Diff Legend

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