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

Diff Legend

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