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

Diff Legend

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