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

Diff Legend

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