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.374 by root, Mon Jul 16 12:36:48 2007 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
10use CFClient::Texture; 11use CFPlus::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
14our $LAYOUT; 15our $LAYOUT;
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
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
825our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
826 950
827sub new { 951sub new {
828 my $class = shift; 952 my $class = shift;
829 953
830 $class->SUPER::new ( 954 $class->SUPER::new (
… …
835} 959}
836 960
837sub size_request { 961sub size_request {
838 my ($self) = @_; 962 my ($self) = @_;
839 963
840 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 964 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 965
842 $w = 10 if $self->{scroll_x}; 966 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y}; 967 $h = 10 if $self->{scroll_y};
844 968
845 ($w, $h) 969 ($w, $h)
846} 970}
847 971
848sub size_allocate { 972sub invoke_size_allocate {
849 my ($self, $w, $h, $changed) = @_; 973 my ($self, $w, $h) = @_;
850 974
975 my $child = $self->child;
976
851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 977 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 978 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853 979
854 $self->child->configure (0, 0, $w, $h); 980 $self->child->configure (0, 0, $w, $h);
855 $self->update; 981 $self->update;
982
983 1
856} 984}
857 985
858sub set_offset { 986sub set_offset {
859 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
860 988
… …
886 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
887 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
888 ) { 1016 ) {
889 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
890 } else { 1018 } else {
891 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
892 } 1020 }
893} 1021}
894 1022
895sub _render { 1023sub _render {
896 my ($self) = @_; 1024 my ($self) = @_;
897 1025
1026 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1028
898 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
899 1030
900 $self->SUPER::_render; 1031 $self->SUPER::_render;
901} 1032}
902 1033
903############################################################################# 1034#############################################################################
904 1035
905package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
906 1037
907our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
908 1039
909sub new { 1040sub new {
910 my $class = shift; 1041 my ($class, %arg) = @_;
1042
1043 my $child = delete $arg{child};
911 1044
912 my $self; 1045 my $self;
913 1046
914 my $slider = new CFClient::UI::Slider 1047 my $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
915 vertical => 1, 1057 vertical => 1,
916 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
917 on_changed => sub { 1059 on_changed => sub {
918 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
919 }, 1062 },
920 ; 1063 ;
921 1064
922 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
923 vp => (new CFClient::UI::ViewPort expand => 1), 1066 scroll_x => 0,
1067 scroll_y => 1,
1068 can_events => 1,
924 slider => $slider, 1069 hslider => $hslider,
925 @_, 1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
1073 %arg,
926 ); 1074 );
927 1075
928 $self->{vp}->add ($self->{scrolled}); 1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
929 $self->add ($self->{vp}); 1082 $self->SUPER::add (0, 0, $self->{vp});
930 $self->add ($self->{slider}); 1083
1084 $self->add ($child) if $child;
931 1085
932 $self 1086 $self
933} 1087}
934 1088
1089#TODO# update range on size_allocate depending on child
1090
1091sub add {
1092 my ($self, $widget) = @_;
1093
1094 $self->{vp}->add ($self->{child} = $widget);
1095}
1096
1097sub invoke_mouse_wheel {
1098 my ($self, $ev) = @_;
1099
1100 return 0 unless $ev->{dy}; # only vertical movements for now
1101
1102 $self->{vslider}->emit (mouse_wheel => $ev);
1103
1104 1
1105}
1106
1107sub update_slider {
1108 my ($self) = @_;
1109
1110 my $child = ($self->{vp} or return)->child;
1111
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114
1115 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide;
1119 }
1120
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) {
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1127 : $self->{vslider}->hide;
1128 }
1129}
1130
935sub update { 1131sub update {
936 my ($self) = @_; 1132 my ($self) = @_;
937 1133
938 $self->SUPER::update; 1134 $self->SUPER::update;
939 1135 $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} 1136}
944 1137
945sub size_allocate { 1138sub invoke_size_allocate {
946 my ($self, $w, $h, $changed) = @_; 1139 my ($self, $w, $h) = @_;
947 1140
1141 $self->update_slider;
948 $self->SUPER::size_allocate ($w, $h, $changed); 1142 $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} 1143}
953
954#TODO# update range on size_allocate depending on child
955# update viewport offset on scroll
956 1144
957############################################################################# 1145#############################################################################
958 1146
959package CFClient::UI::Frame; 1147package CFPlus::UI::Frame;
960 1148
961our @ISA = CFClient::UI::Bin::; 1149our @ISA = CFPlus::UI::Bin::;
962 1150
963use CFClient::OpenGL; 1151use CFPlus::OpenGL;
964 1152
965sub new { 1153sub new {
966 my $class = shift; 1154 my $class = shift;
967 1155
968 $class->SUPER::new ( 1156 $class->SUPER::new (
… …
976 1164
977 if ($self->{bg}) { 1165 if ($self->{bg}) {
978 my ($w, $h) = @$self{qw(w h)}; 1166 my ($w, $h) = @$self{qw(w h)};
979 1167
980 glEnable GL_BLEND; 1168 glEnable GL_BLEND;
981 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1169 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
982 glColor @{ $self->{bg} }; 1170 glColor_premultiply @{ $self->{bg} };
983 1171
984 glBegin GL_QUADS; 1172 glBegin GL_QUADS;
985 glVertex 0 , 0; 1173 glVertex 0 , 0;
986 glVertex 0 , $h; 1174 glVertex 0 , $h;
987 glVertex $w, $h; 1175 glVertex $w, $h;
… …
994 $self->SUPER::_draw; 1182 $self->SUPER::_draw;
995} 1183}
996 1184
997############################################################################# 1185#############################################################################
998 1186
999package CFClient::UI::FancyFrame; 1187package CFPlus::UI::FancyFrame;
1000 1188
1001our @ISA = CFClient::UI::Bin::; 1189our @ISA = CFPlus::UI::Bin::;
1002 1190
1003use CFClient::OpenGL; 1191use CFPlus::OpenGL;
1192
1193sub new {
1194 my ($class, %arg) = @_;
1195
1196 if ((exists $arg{label}) && !ref $arg{label}) {
1197 $arg{label} = new CFPlus::UI::Label
1198 align => 1,
1199 valign => 0,
1200 text => $arg{label},
1201 fontsize => ($arg{border} || 0.8) * 0.75;
1202 }
1203
1204 my $self = $class->SUPER::new (
1205 # label => "",
1206 fg => [0.6, 0.3, 0.1],
1207 border => 0.8,
1208 style => 'single',
1209 %arg,
1210 );
1211
1212 $self
1213}
1214
1215sub add {
1216 my ($self, @widgets) = @_;
1217
1218 $self->SUPER::add (@widgets);
1219 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1220}
1221
1222sub border {
1223 int $_[0]{border} * $::FONTSIZE
1224}
1225
1226sub size_request {
1227 my ($self) = @_;
1228
1229 ($self->{label_w}, undef) = $self->{label}->size_request
1230 if $self->{label};
1231
1232 my ($w, $h) = $self->SUPER::size_request;
1233
1234 (
1235 $w + $self->border * 2,
1236 $h + $self->border * 2,
1237 )
1238}
1239
1240sub invoke_size_allocate {
1241 my ($self, $w, $h) = @_;
1242
1243 my $border = $self->border;
1244
1245 $w -= List::Util::max 0, $border * 2;
1246 $h -= List::Util::max 0, $border * 2;
1247
1248 if (my $label = $self->{label}) {
1249 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1250 $label->{h} = List::Util::min $h, $border;
1251 $label->invoke_size_allocate ($label->{w}, $label->{h});
1252 }
1253
1254 $self->child->configure ($border, $border, $w, $h);
1255
1256 1
1257}
1258
1259sub _draw {
1260 my ($self) = @_;
1261
1262 my $child = $self->{children}[0];
1263
1264 my $border = $self->border;
1265 my ($w, $h) = ($self->{w}, $self->{h});
1266
1267 $child->draw;
1268
1269 glColor @{$self->{fg}};
1270 glBegin GL_LINE_STRIP;
1271 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1272 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1273 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1274 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1275 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1276 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1277 glEnd;
1278
1279 if ($self->{label}) {
1280 glTranslate $border * 2, 0;
1281 $self->{label}->_draw;
1282 }
1283}
1284
1285#############################################################################
1286
1287package CFPlus::UI::Toplevel;
1288
1289our @ISA = CFPlus::UI::Bin::;
1290
1291use CFPlus::OpenGL;
1004 1292
1005my $bg = 1293my $bg =
1006 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png", 1294 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1007 mipmap => 1, wrap => 1; 1295 mipmap => 1, wrap => 1;
1008 1296
1009my @border = 1297my @border =
1010 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1298 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); 1299 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1012 1300
1013sub new { 1301sub new {
1014 my $class = shift; 1302 my ($class, %arg) = @_;
1015 1303
1016 my $self = $class->SUPER::new ( 1304 my $self = $class->SUPER::new (
1017 bg => [1, 1, 1, 1], 1305 bg => [1, 1, 1, 1],
1018 border_bg => [1, 1, 1, 1], 1306 border_bg => [1, 1, 1, 1],
1019 border => 0.6, 1307 border => 0.6,
1020 is_toplevel => 1,
1021 can_events => 1, 1308 can_events => 1,
1022 @_ 1309 min_w => 64,
1310 min_h => 32,
1311 %arg,
1023 ); 1312 );
1024 1313
1025 $self->{title} &&= new CFClient::UI::Label 1314 $self->{title_widget} = new CFPlus::UI::Label
1026 align => 0, 1315 align => 0,
1027 valign => 1, 1316 valign => 1,
1028 text => $self->{title}, 1317 text => $self->{title},
1029 fontsize => $self->{border}; 1318 fontsize => $self->{border},
1319 if exists $self->{title};
1320
1321 if ($self->{has_close_button}) {
1322 $self->{close_button} =
1323 new CFPlus::UI::ImageButton
1324 path => 'x1_close.png',
1325 on_activate => sub { $self->emit ("delete") };
1326
1327 $self->CFPlus::UI::Container::add ($self->{close_button});
1328 }
1030 1329
1031 $self 1330 $self
1331}
1332
1333sub add {
1334 my ($self, @widgets) = @_;
1335
1336 $self->SUPER::add (@widgets);
1337 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1338 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1032} 1339}
1033 1340
1034sub border { 1341sub border {
1035 int $_[0]{border} * $::FONTSIZE 1342 int $_[0]{border} * $::FONTSIZE
1036} 1343}
1037 1344
1038sub size_request { 1345sub size_request {
1039 my ($self) = @_; 1346 my ($self) = @_;
1347
1348 $self->{title_widget}->size_request
1349 if $self->{title_widget};
1350
1351 $self->{close_button}->size_request
1352 if $self->{close_button};
1040 1353
1041 my ($w, $h) = $self->SUPER::size_request; 1354 my ($w, $h) = $self->SUPER::size_request;
1042 1355
1043 ( 1356 (
1044 $w + $self->border * 2, 1357 $w + $self->border * 2,
1045 $h + $self->border * 2, 1358 $h + $self->border * 2,
1046 ) 1359 )
1047} 1360}
1048 1361
1049sub size_allocate { 1362sub invoke_size_allocate {
1050 my ($self, $w, $h, $changed) = @_; 1363 my ($self, $w, $h) = @_;
1051 1364
1052 return unless $changed; 1365 if ($self->{title_widget}) {
1366 $self->{title_widget}{w} = $w;
1367 $self->{title_widget}{h} = $h;
1368 $self->{title_widget}->invoke_size_allocate ($w, $h);
1369 }
1053 1370
1371 my $border = $self->border;
1372
1054 $h -= List::Util::max 0, $self->border * 2; 1373 $h -= List::Util::max 0, $border * 2;
1055 $w -= List::Util::max 0, $self->border * 2; 1374 $w -= List::Util::max 0, $border * 2;
1056 1375
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); 1376 $self->child->configure ($border, $border, $w, $h);
1061}
1062 1377
1378 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1379 if $self->{close_button};
1380
1381 1
1382}
1383
1384sub invoke_delete {
1385 my ($self) = @_;
1386
1387 $self->hide;
1388
1389 1
1390}
1391
1063sub button_down { 1392sub invoke_button_down {
1064 my ($self, $ev, $x, $y) = @_; 1393 my ($self, $ev, $x, $y) = @_;
1065 1394
1066 my ($w, $h) = @$self{qw(w h)}; 1395 my ($w, $h) = @$self{qw(w h)};
1067 my $border = $self->border; 1396 my $border = $self->border;
1068 1397
… …
1081 my ($ev, $x, $y) = @_; 1410 my ($ev, $x, $y) = @_;
1082 1411
1083 my $dx = $ev->{x} - $ox; 1412 my $dx = $ev->{x} - $ox;
1084 my $dy = $ev->{y} - $oy; 1413 my $dy = $ev->{y} - $oy;
1085 1414
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1415 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1416 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1090 $self->move ($self->{user_x}, $self->{user_y}); 1417
1418 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1091 $self->realloc; 1419 $self->realloc;
1092 }; 1420 };
1093 1421
1094 } elsif ($lr ^ $td) { 1422 } elsif ($lr ^ $td) {
1095 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1423 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1098 $self->{motion} = sub { 1426 $self->{motion} = sub {
1099 my ($ev, $x, $y) = @_; 1427 my ($ev, $x, $y) = @_;
1100 1428
1101 ($x, $y) = ($ev->{x}, $ev->{y}); 1429 ($x, $y) = ($ev->{x}, $ev->{y});
1102 1430
1103 $self->{user_x} = $bx + $x - $ox; 1431 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1104 $self->{user_y} = $by + $y - $oy; 1432 # HACK: the next line is required to enforce placement
1105 1433 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1106 $self->move ($self->{user_x}, $self->{user_y});
1107 $self->realloc;
1108 }; 1434 };
1435 } else {
1436 return 0;
1437 }
1438
1109 } 1439 1
1110} 1440}
1111 1441
1112sub button_up { 1442sub invoke_button_up {
1113 my ($self, $ev, $x, $y) = @_; 1443 my ($self, $ev, $x, $y) = @_;
1114 1444
1115 delete $self->{motion}; 1445 ! ! delete $self->{motion}
1116} 1446}
1117 1447
1118sub mouse_motion { 1448sub invoke_mouse_motion {
1119 my ($self, $ev, $x, $y) = @_; 1449 my ($self, $ev, $x, $y) = @_;
1120 1450
1121 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1451 $self->{motion}->($ev, $x, $y) if $self->{motion};
1452
1453 ! ! $self->{motion}
1454}
1455
1456sub invoke_visibility_change {
1457 my ($self, $visible) = @_;
1458
1459 delete $self->{motion} unless $visible;
1460
1461 0
1122} 1462}
1123 1463
1124sub _draw { 1464sub _draw {
1125 my ($self) = @_; 1465 my ($self) = @_;
1126 1466
1467 my $child = $self->{children}[0];
1468
1127 my ($w, $h ) = ($self->{w}, $self->{h}); 1469 my ($w, $h ) = ($self->{w}, $self->{h});
1128 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1470 my ($cw, $ch) = ($child->{w}, $child->{h});
1129 1471
1130 glEnable GL_TEXTURE_2D; 1472 glEnable GL_TEXTURE_2D;
1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1473 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1132 1474
1133 my $border = $self->border; 1475 my $border = $self->border;
… …
1148 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1490 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1149 } 1491 }
1150 1492
1151 glDisable GL_TEXTURE_2D; 1493 glDisable GL_TEXTURE_2D;
1152 1494
1153 $self->{title}->draw if $self->{title};
1154
1155 $self->child->draw; 1495 $child->draw;
1496
1497 if ($self->{title_widget}) {
1498 glTranslate 0, $border - $self->{h};
1499 $self->{title_widget}->_draw;
1500
1501 glTranslate 0, - ($border - $self->{h});
1502 }
1503
1504 $self->{close_button}->draw
1505 if $self->{close_button};
1156} 1506}
1157 1507
1158############################################################################# 1508#############################################################################
1159 1509
1160package CFClient::UI::Table; 1510package CFPlus::UI::Table;
1161 1511
1162our @ISA = CFClient::UI::Base::; 1512our @ISA = CFPlus::UI::Base::;
1163 1513
1164use List::Util qw(max sum); 1514use List::Util qw(max sum);
1165 1515
1166use CFClient::OpenGL; 1516use CFPlus::OpenGL;
1167 1517
1168sub new { 1518sub new {
1169 my $class = shift; 1519 my $class = shift;
1170 1520
1171 $class->SUPER::new ( 1521 $class->SUPER::new (
1522 children => [],
1172 col_expand => [], 1523 col_expand => [],
1524 row_expand => [],
1173 @_, 1525 @_,
1174 ) 1526 )
1175} 1527}
1176 1528
1177sub children { 1529sub children {
1178 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1530 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1179} 1531}
1180 1532
1533# TODO: store row/col info in child widget and use standard add/del
1181sub add { 1534sub add {
1182 my ($self, $x, $y, $child) = @_; 1535 my ($self) = shift;
1183 1536
1537 while (@_) {
1538 my ($x, $y, $child) = splice @_, 0, 3, ();
1184 $child->set_parent ($self); 1539 $child->set_parent ($self);
1185 $self->{children}[$y][$x] = $child; 1540 $self->{children}[$y][$x] = $child;
1541 }
1186 1542
1543 $self->{force_realloc} = 1;
1544 $self->{force_size_alloc} = 1;
1187 $self->realloc; 1545 $self->realloc;
1546}
1547
1548sub remove {
1549 my ($self, $child) = @_;
1550
1551 for (@{ $self->{children} }) {
1552 for (@{ $_ || [] }) {
1553 $_ = undef if $_ == $child;
1554 }
1555 }
1188} 1556}
1189 1557
1190# TODO: move to container class maybe? send children a signal on removal? 1558# TODO: move to container class maybe? send children a signal on removal?
1191sub clear { 1559sub clear {
1192 my ($self) = @_; 1560 my ($self) = @_;
… …
1233 (sum @$ws), 1601 (sum @$ws),
1234 (sum @$hs), 1602 (sum @$hs),
1235 ) 1603 )
1236} 1604}
1237 1605
1238sub size_allocate { 1606sub invoke_size_allocate {
1239 my ($self, $w, $h, $changed) = @_; 1607 my ($self, $w, $h) = @_;
1240 1608
1241 my ($ws, $hs) = $self->get_wh; 1609 my ($ws, $hs) = $self->get_wh;
1242 1610
1243 my $req_w = (sum @$ws) || 1; 1611 my $req_w = (sum @$ws) || 1;
1244 my $req_h = (sum @$hs) || 1; 1612 my $req_h = (sum @$hs) || 1;
1245 1613
1246 # TODO: nicer code && do row_expand 1614 # TODO: nicer code
1247 my @col_expand = @{$self->{col_expand}}; 1615 my @col_expand = @{$self->{col_expand}};
1248 @col_expand = (1) x @$ws unless @col_expand; 1616 @col_expand = (1) x @$ws unless @col_expand;
1249 my $col_expand = (sum @col_expand) || 1; 1617 my $col_expand = (sum @col_expand) || 1;
1250 1618
1251 # linearly scale sizes
1252 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1619 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1253 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1254 1620
1255 CFClient::UI::harmonize $ws; 1621 CFPlus::UI::harmonize $ws;
1622
1623 my @row_expand = @{$self->{row_expand}};
1624 @row_expand = (1) x @$ws unless @row_expand;
1625 my $row_expand = (sum @row_expand) || 1;
1626
1627 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1628
1256 CFClient::UI::harmonize $hs; 1629 CFPlus::UI::harmonize $hs;
1257 1630
1258 my $y; 1631 my $y;
1259 1632
1260 for my $r (0 .. $#{$self->{children}}) { 1633 for my $r (0 .. $#{$self->{children}}) {
1261 my $row = $self->{children}[$r] 1634 my $row = $self->{children}[$r]
… …
1275 } 1648 }
1276 1649
1277 $y += $row_h; 1650 $y += $row_h;
1278 } 1651 }
1279 1652
1653 1
1280} 1654}
1281 1655
1282sub find_widget { 1656sub find_widget {
1283 my ($self, $x, $y) = @_; 1657 my ($self, $x, $y) = @_;
1284 1658
… …
1303 } 1677 }
1304} 1678}
1305 1679
1306############################################################################# 1680#############################################################################
1307 1681
1308package CFClient::UI::Box; 1682package CFPlus::UI::Fixed;
1309 1683
1684use List::Util qw(min max);
1685
1310our @ISA = CFClient::UI::Container::; 1686our @ISA = CFPlus::UI::Container::;
1687
1688sub add {
1689 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1690
1691 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1692 $self->SUPER::add ($child);
1693}
1694
1695sub _scale($$$) {
1696 my ($mode, $val, $max) = @_;
1697
1698 $mode eq "abs" ? $val
1699 : $mode eq "rel" ? $val * $max
1700 : 0
1701}
1702
1703sub size_request {
1704 my ($self) = @_;
1705
1706 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1707
1708 # determine overall size by querying abs widgets
1709 for my $child ($self->visible_children) {
1710 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1711
1712 if ($pos eq "abs") {
1713 $w = _scale $size, $w, $child->{req_w};
1714 $h = _scale $size, $h, $child->{req_h};
1715
1716 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1717 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1718 }
1719 }
1720
1721 my $W = $x2 - $x1;
1722 my $H = $y2 - $y1;
1723
1724 # now layout remaining widgets
1725 for my $child ($self->visible_children) {
1726 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1727
1728 if ($pos ne "abs") {
1729 $x = _scale $pos, $x, $W;
1730 $y = _scale $pos, $x, $H;
1731 $w = _scale $size, $w, $child->{req_w};
1732 $h = _scale $size, $h, $child->{req_h};
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1736 }
1737 }
1738
1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1741
1742 ($W, $H)
1743}
1744
1745sub invoke_size_allocate {
1746 my ($self, $W, $H) = @_;
1747
1748 for my $child ($self->visible_children) {
1749 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1750
1751 $x = _scale $pos, $x, $W;
1752 $y = _scale $pos, $x, $H;
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755
1756 $child->configure ($x, $y, $w, $h);
1757 }
1758
1759 1
1760}
1761
1762#############################################################################
1763
1764package CFPlus::UI::Box;
1765
1766our @ISA = CFPlus::UI::Container::;
1311 1767
1312sub size_request { 1768sub size_request {
1313 my ($self) = @_; 1769 my ($self) = @_;
1314 1770
1315 $self->{vertical} 1771 $self->{vertical}
… …
1321 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1777 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1322 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1778 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1323 ) 1779 )
1324} 1780}
1325 1781
1326sub size_allocate { 1782sub invoke_size_allocate {
1327 my ($self, $w, $h, $changed) = @_; 1783 my ($self, $w, $h) = @_;
1328 1784
1329 my $space = $self->{vertical} ? $h : $w; 1785 my $space = $self->{vertical} ? $h : $w;
1330 my $children = $self->{children}; 1786 my @children = $self->visible_children;
1331 1787
1332 my @req; 1788 my @req;
1333 1789
1334 if ($self->{homogeneous}) { 1790 if ($self->{homogeneous}) {
1335 @req = ($space / (@$children || 1)) x @$children; 1791 @req = ($space / (@children || 1)) x @children;
1336 } else { 1792 } else {
1337 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1793 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1338 my $req = List::Util::sum @req; 1794 my $req = List::Util::sum @req;
1339 1795
1340 if ($req > $space) { 1796 if ($req > $space) {
1341 # ah well, not enough space 1797 # ah well, not enough space
1342 $_ *= $space / $req for @req; 1798 $_ *= $space / $req for @req;
1343 } else { 1799 } else {
1344 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1800 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1345 1801
1346 $space = ($space - $req) / $expand; # remaining space to give away 1802 $space = ($space - $req) / $expand; # remaining space to give away
1347 1803
1348 $req[$_] += $space * $children->[$_]{expand} 1804 $req[$_] += $space * $children[$_]{expand}
1349 for 0 .. $#$children; 1805 for 0 .. $#children;
1350 } 1806 }
1351 } 1807 }
1352 1808
1353 CFClient::UI::harmonize \@req; 1809 CFPlus::UI::harmonize \@req;
1354 1810
1355 my $pos = 0; 1811 my $pos = 0;
1356 for (0 .. $#$children) { 1812 for (0 .. $#children) {
1357 my $alloc = $req[$_]; 1813 my $alloc = $req[$_];
1358 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1814 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1359 1815
1360 $pos += $alloc; 1816 $pos += $alloc;
1361 } 1817 }
1362 1818
1363 1 1819 1
1364} 1820}
1365 1821
1366############################################################################# 1822#############################################################################
1367 1823
1368package CFClient::UI::HBox; 1824package CFPlus::UI::HBox;
1369 1825
1370our @ISA = CFClient::UI::Box::; 1826our @ISA = CFPlus::UI::Box::;
1371 1827
1372sub new { 1828sub new {
1373 my $class = shift; 1829 my $class = shift;
1374 1830
1375 $class->SUPER::new ( 1831 $class->SUPER::new (
… …
1378 ) 1834 )
1379} 1835}
1380 1836
1381############################################################################# 1837#############################################################################
1382 1838
1383package CFClient::UI::VBox; 1839package CFPlus::UI::VBox;
1384 1840
1385our @ISA = CFClient::UI::Box::; 1841our @ISA = CFPlus::UI::Box::;
1386 1842
1387sub new { 1843sub new {
1388 my $class = shift; 1844 my $class = shift;
1389 1845
1390 $class->SUPER::new ( 1846 $class->SUPER::new (
… …
1393 ) 1849 )
1394} 1850}
1395 1851
1396############################################################################# 1852#############################################################################
1397 1853
1398package CFClient::UI::Label; 1854package CFPlus::UI::Label;
1399 1855
1400our @ISA = CFClient::UI::DrawBG::; 1856our @ISA = CFPlus::UI::DrawBG::;
1401 1857
1402use CFClient::OpenGL; 1858use CFPlus::OpenGL;
1403 1859
1404sub new { 1860sub new {
1405 my ($class, %arg) = @_; 1861 my ($class, %arg) = @_;
1406 1862
1407 my $self = $class->SUPER::new ( 1863 my $self = $class->SUPER::new (
… …
1410 #active_bg => none 1866 #active_bg => none
1411 #font => default_font 1867 #font => default_font
1412 #text => initial text 1868 #text => initial text
1413 #markup => initial narkup 1869 #markup => initial narkup
1414 #max_w => maximum pixel width 1870 #max_w => maximum pixel width
1871 #style => 0, # render flags
1415 ellipsise => 3, # end 1872 ellipsise => 3, # end
1416 layout => (new CFClient::Layout), 1873 layout => (new CFPlus::Layout),
1417 fontsize => 1, 1874 fontsize => 1,
1418 align => -1, 1875 align => -1,
1419 valign => -1, 1876 valign => -1,
1420 padding => 2, 1877 padding_x => 2,
1878 padding_y => 2,
1421 can_events => 0, 1879 can_events => 0,
1422 %arg 1880 %arg
1423 ); 1881 );
1424 1882
1425 if (exists $self->{template}) { 1883 if (exists $self->{template}) {
1426 my $layout = new CFClient::Layout; 1884 my $layout = new CFPlus::Layout;
1427 $layout->set_text (delete $self->{template}); 1885 $layout->set_text (delete $self->{template});
1428 $self->{template} = $layout; 1886 $self->{template} = $layout;
1429 } 1887 }
1430 1888
1431 if (exists $self->{markup}) { 1889 if (exists $self->{markup}) {
… …
1435 } 1893 }
1436 1894
1437 $self 1895 $self
1438} 1896}
1439 1897
1440sub escape($) {
1441 local $_ = $_[0];
1442
1443 s/&/&amp;/g;
1444 s/>/&gt;/g;
1445 s/</&lt;/g;
1446
1447 $_
1448}
1449
1450sub update { 1898sub update {
1451 my ($self) = @_; 1899 my ($self) = @_;
1452 1900
1453 delete $self->{texture}; 1901 delete $self->{texture};
1454 $self->SUPER::update; 1902 $self->SUPER::update;
1455} 1903}
1456 1904
1905sub realloc {
1906 my ($self) = @_;
1907
1908 delete $self->{ox};
1909 $self->SUPER::realloc;
1910}
1911
1457sub set_text { 1912sub set_text {
1458 my ($self, $text) = @_; 1913 my ($self, $text) = @_;
1459 1914
1460 return if $self->{text} eq "T$text"; 1915 return if $self->{text} eq "T$text";
1461 $self->{text} = "T$text"; 1916 $self->{text} = "T$text";
1462 1917
1463 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1464 $self->{layout}->set_text ($text); 1918 $self->{layout}->set_text ($text);
1465 1919
1920 delete $self->{size_req};
1466 $self->realloc; 1921 $self->realloc;
1467 $self->update; 1922 $self->update;
1468} 1923}
1469 1924
1470sub set_markup { 1925sub set_markup {
… …
1473 return if $self->{text} eq "M$markup"; 1928 return if $self->{text} eq "M$markup";
1474 $self->{text} = "M$markup"; 1929 $self->{text} = "M$markup";
1475 1930
1476 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1931 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1477 1932
1478 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1479 $self->{layout}->set_markup ($markup); 1933 $self->{layout}->set_markup ($markup);
1480 1934
1935 delete $self->{size_req};
1481 $self->realloc; 1936 $self->realloc;
1482 $self->update; 1937 $self->update;
1483} 1938}
1484 1939
1485sub size_request { 1940sub size_request {
1486 my ($self) = @_; 1941 my ($self) = @_;
1487 1942
1943 $self->{size_req} ||= do {
1488 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1944 $self->{layout}->set_font ($self->{font}) if $self->{font};
1489 $self->{layout}->set_width ($self->{max_w} || -1); 1945 $self->{layout}->set_width ($self->{max_w} || -1);
1490 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1946 $self->{layout}->set_ellipsise ($self->{ellipsise});
1491 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1947 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1492 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1948 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1493 1949
1494 my ($w, $h) = $self->{layout}->size; 1950 my ($w, $h) = $self->{layout}->size;
1495 1951
1496 if (exists $self->{template}) { 1952 if (exists $self->{template}) {
1497 $self->{template}->set_font ($self->{font}) if $self->{font}; 1953 $self->{template}->set_font ($self->{font}) if $self->{font};
1954 $self->{template}->set_width ($self->{max_w} || -1);
1498 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1955 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1499 1956
1500 my ($w2, $h2) = $self->{template}->size; 1957 my ($w2, $h2) = $self->{template}->size;
1501 1958
1502 $w = List::Util::max $w, $w2; 1959 $w = List::Util::max $w, $w2;
1503 $h = List::Util::max $h, $h2; 1960 $h = List::Util::max $h, $h2;
1961 }
1962
1963 [$w, $h]
1504 } 1964 };
1505 1965
1506 ( 1966 @{ $self->{size_req} }
1507 $w + $self->{padding} * 2,
1508 $h + $self->{padding} * 2,
1509 )
1510} 1967}
1511 1968
1969sub baseline_shift {
1970 $_[0]{layout}->descent
1971}
1972
1512sub size_allocate { 1973sub invoke_size_allocate {
1513 my ($self, $w, $h, $changed) = @_; 1974 my ($self, $w, $h) = @_;
1975
1976 delete $self->{ox};
1514 1977
1515 delete $self->{texture} 1978 delete $self->{texture}
1516 if $changed; 1979 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1980
1981 1
1517} 1982}
1518 1983
1519sub set_fontsize { 1984sub set_fontsize {
1520 my ($self, $fontsize) = @_; 1985 my ($self, $fontsize) = @_;
1521 1986
1522 $self->{fontsize} = $fontsize; 1987 $self->{fontsize} = $fontsize;
1988 delete $self->{size_req};
1523 delete $self->{texture}; 1989 delete $self->{texture};
1524 1990
1525 $self->realloc; 1991 $self->realloc;
1526} 1992}
1527 1993
1994sub reconfigure {
1995 my ($self) = @_;
1996
1997 delete $self->{size_req};
1998 delete $self->{texture};
1999
2000 $self->SUPER::reconfigure;
2001}
2002
1528sub _draw { 2003sub _draw {
1529 my ($self) = @_; 2004 my ($self) = @_;
1530 2005
1531 $self->SUPER::_draw; # draw background, if applicable 2006 $self->SUPER::_draw; # draw background, if applicable
1532 2007
1533 my $tex = $self->{texture} ||= do { 2008 my $size = $self->{texture} ||= do {
1534 $self->{layout}->set_foreground (@{$self->{fg}}); 2009 $self->{layout}->set_foreground (@{$self->{fg}});
1535 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2010 $self->{layout}->set_font ($self->{font}) if $self->{font};
1536 $self->{layout}->set_width ($self->{w}); 2011 $self->{layout}->set_width ($self->{w});
1537 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2012 $self->{layout}->set_ellipsise ($self->{ellipsise});
1538 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2013 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1539 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2014 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1540 2015
1541 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2016 [$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 }; 2017 };
1553 2018
1554 glEnable GL_TEXTURE_2D; 2019 unless (exists $self->{ox}) {
1555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2020 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
2021 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
2022 : ($self->{w} - $size->[0]) * 0.5);
1556 2023
1557 if ($tex->{format} == GL_ALPHA) { 2024 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1558 glColor @{$self->{fg}}; 2025 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1559 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 2026 : ($self->{h} - $size->[1]) * 0.5);
1560 } else {
1561 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1562 } 2027 };
1563 2028
1564 glDisable GL_TEXTURE_2D; 2029 my $w = List::Util::min $self->{w} + 4, $size->[0];
2030 my $h = List::Util::min $self->{h} + 2, $size->[1];
2031
2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1565} 2033}
1566 2034
1567############################################################################# 2035#############################################################################
1568 2036
1569package CFClient::UI::EntryBase; 2037package CFPlus::UI::EntryBase;
1570 2038
1571our @ISA = CFClient::UI::Label::; 2039our @ISA = CFPlus::UI::Label::;
1572 2040
1573use CFClient::OpenGL; 2041use CFPlus::OpenGL;
1574 2042
1575sub new { 2043sub new {
1576 my $class = shift; 2044 my $class = shift;
1577 2045
1578 $class->SUPER::new ( 2046 $class->SUPER::new (
… …
1582 active_fg => [0, 0, 0], 2050 active_fg => [0, 0, 0],
1583 can_hover => 1, 2051 can_hover => 1,
1584 can_focus => 1, 2052 can_focus => 1,
1585 valign => 0, 2053 valign => 0,
1586 can_events => 1, 2054 can_events => 1,
2055 ellipsise => 0,
1587 #text => ... 2056 #text => ...
2057 #hidden => "*",
1588 @_ 2058 @_
1589 ) 2059 )
1590} 2060}
1591 2061
1592sub _set_text { 2062sub _set_text {
… …
1594 2064
1595 delete $self->{cur_h}; 2065 delete $self->{cur_h};
1596 2066
1597 return if $self->{text} eq $text; 2067 return if $self->{text} eq $text;
1598 2068
1599 delete $self->{texture};
1600
1601 $self->{last_activity} = $::NOW; 2069 $self->{last_activity} = $::NOW;
1602 $self->{text} = $text; 2070 $self->{text} = $text;
1603 2071
1604 $text =~ s/./*/g if $self->{hidden}; 2072 $text =~ s/./*/g if $self->{hidden};
1605 $self->{layout}->set_text ("$text "); 2073 $self->{layout}->set_text ("$text ");
2074 delete $self->{size_req};
1606 2075
1607 $self->_emit (changed => $self->{text}); 2076 $self->emit (changed => $self->{text});
2077
2078 $self->realloc;
2079 $self->update;
1608} 2080}
1609 2081
1610sub set_text { 2082sub set_text {
1611 my ($self, $text) = @_; 2083 my ($self, $text) = @_;
1612 2084
1613 $self->{cursor} = length $text; 2085 $self->{cursor} = length $text;
1614 $self->_set_text ($text); 2086 $self->_set_text ($text);
1615
1616 $self->realloc;
1617} 2087}
1618 2088
1619sub get_text { 2089sub get_text {
1620 $_[0]{text} 2090 $_[0]{text}
1621} 2091}
… …
1626 my ($w, $h) = $self->SUPER::size_request; 2096 my ($w, $h) = $self->SUPER::size_request;
1627 2097
1628 ($w + 1, $h) # add 1 for cursor 2098 ($w + 1, $h) # add 1 for cursor
1629} 2099}
1630 2100
1631sub key_down { 2101sub invoke_key_down {
1632 my ($self, $ev) = @_; 2102 my ($self, $ev) = @_;
1633 2103
1634 my $mod = $ev->{mod}; 2104 my $mod = $ev->{mod};
1635 my $sym = $ev->{sym}; 2105 my $sym = $ev->{sym};
1636 my $uni = $ev->{unicode}; 2106 my $uni = $ev->{unicode};
1637 2107
1638 my $text = $self->get_text; 2108 my $text = $self->get_text;
2109
2110 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1639 2111
1640 if ($uni == 8) { 2112 if ($uni == 8) {
1641 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2113 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1642 } elsif ($uni == 127) { 2114 } elsif ($uni == 127) {
1643 substr $text, $self->{cursor}, 1, ""; 2115 substr $text, $self->{cursor}, 1, "";
1644 } elsif ($sym == CFClient::SDLK_LEFT) { 2116 } elsif ($sym == CFPlus::SDLK_LEFT) {
1645 --$self->{cursor} if $self->{cursor}; 2117 --$self->{cursor} if $self->{cursor};
1646 } elsif ($sym == CFClient::SDLK_RIGHT) { 2118 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1647 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2119 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1648 } elsif ($sym == CFClient::SDLK_HOME) { 2120 } elsif ($sym == CFPlus::SDLK_HOME) {
2121 # what a hack
2122 $self->{cursor} =
2123 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2124 ? length $1
2125 : 0;
2126 } elsif ($sym == CFPlus::SDLK_END) {
2127 # uh, again
2128 $self->{cursor} =
2129 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2130 ? $self->{cursor} + length $1
2131 : length $self->{text};
2132 } elsif ($uni == 21) { # ctrl-u
2133 $text = "";
1649 $self->{cursor} = 0; 2134 $self->{cursor} = 0;
1650 } elsif ($sym == CFClient::SDLK_END) {
1651 $self->{cursor} = length $text;
1652 } elsif ($uni == 27) { 2135 } elsif ($uni == 27) {
1653 $self->_emit ('escape'); 2136 $self->emit ('escape');
1654 } elsif ($uni) { 2137 } elsif ($uni == 0x0d) {
2138 substr $text, $self->{cursor}++, 0, "\012";
2139 } elsif ($uni >= 0x20) {
1655 substr $text, $self->{cursor}++, 0, chr $uni; 2140 substr $text, $self->{cursor}++, 0, chr $uni;
2141 } else {
2142 return 0;
1656 } 2143 }
1657 2144
1658 $self->_set_text ($text); 2145 $self->_set_text ($text);
1659 2146
1660 $self->realloc; 2147 $self->realloc;
1661} 2148 $self->update;
1662 2149
2150 1
2151}
2152
1663sub focus_in { 2153sub invoke_focus_in {
1664 my ($self) = @_; 2154 my ($self) = @_;
1665 2155
1666 $self->{last_activity} = $::NOW; 2156 $self->{last_activity} = $::NOW;
1667 2157
1668 $self->SUPER::focus_in; 2158 $self->SUPER::invoke_focus_in
1669} 2159}
1670 2160
1671sub button_down { 2161sub invoke_button_down {
1672 my ($self, $ev, $x, $y) = @_; 2162 my ($self, $ev, $x, $y) = @_;
1673 2163
1674 $self->SUPER::button_down ($ev, $x, $y); 2164 $self->SUPER::invoke_button_down ($ev, $x, $y);
1675 2165
1676 my $idx = $self->{layout}->xy_to_index ($x, $y); 2166 my $idx = $self->{layout}->xy_to_index ($x, $y);
1677 2167
1678 # byte-index to char-index 2168 # byte-index to char-index
1679 my $text = $self->{text}; 2169 my $text = $self->{text};
1680 utf8::encode $text; 2170 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1681 $self->{cursor} = length substr $text, 0, $idx; 2171 $self->{cursor} = length $text;
1682 2172
1683 $self->_set_text ($self->{text}); 2173 $self->_set_text ($self->{text});
1684 $self->update; 2174 $self->update;
2175
2176 1
1685} 2177}
1686 2178
1687sub mouse_motion { 2179sub invoke_mouse_motion {
1688 my ($self, $ev, $x, $y) = @_; 2180 my ($self, $ev, $x, $y) = @_;
1689# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2181# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2182
2183 1
1690} 2184}
1691 2185
1692sub _draw { 2186sub _draw {
1693 my ($self) = @_; 2187 my ($self) = @_;
1694 2188
1695 local $self->{fg} = $self->{fg}; 2189 local $self->{fg} = $self->{fg};
1696 2190
1697 if ($FOCUS == $self) { 2191 if ($FOCUS == $self) {
1698 glColor @{$self->{active_bg}}; 2192 glColor_premultiply @{$self->{active_bg}};
1699 $self->{fg} = $self->{active_fg}; 2193 $self->{fg} = $self->{active_fg};
1700 } else { 2194 } else {
1701 glColor @{$self->{bg}}; 2195 glColor_premultiply @{$self->{bg}};
1702 } 2196 }
1703 2197
1704 glEnable GL_BLEND; 2198 glEnable GL_BLEND;
1705 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2199 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1706 glBegin GL_QUADS; 2200 glBegin GL_QUADS;
1707 glVertex 0 , 0; 2201 glVertex 0 , 0;
1708 glVertex 0 , $self->{h}; 2202 glVertex 0 , $self->{h};
1709 glVertex $self->{w}, $self->{h}; 2203 glVertex $self->{w}, $self->{h};
1710 glVertex $self->{w}, 0; 2204 glVertex $self->{w}, 0;
… …
1721 utf8::encode $text; 2215 utf8::encode $text;
1722 2216
1723 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2217 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1724 } 2218 }
1725 2219
1726 glColor @{$self->{fg}};
1727 glBegin GL_LINES; 2220 glBegin GL_LINES;
1728 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2221 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}; 2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1730 glEnd; 2223 glEnd;
1731 } 2224 }
1732} 2225}
1733 2226
2227#############################################################################
2228
1734package CFClient::UI::Entry; 2229package CFPlus::UI::Entry;
1735 2230
1736our @ISA = CFClient::UI::EntryBase::; 2231our @ISA = CFPlus::UI::EntryBase::;
1737 2232
1738use CFClient::OpenGL; 2233use CFPlus::OpenGL;
1739 2234
1740sub key_down { 2235sub invoke_key_down {
1741 my ($self, $ev) = @_; 2236 my ($self, $ev) = @_;
1742 2237
1743 my $sym = $ev->{sym}; 2238 my $sym = $ev->{sym};
1744 2239
1745 if ($sym == 13) { 2240 if ($ev->{uni} == 0x0d || $sym == 13) {
1746 unshift @{$self->{history}}, 2241 unshift @{$self->{history}},
1747 my $txt = $self->get_text; 2242 my $txt = $self->get_text;
2243
1748 $self->{history_pointer} = -1; 2244 $self->{history_pointer} = -1;
1749 $self->{history_saveback} = ''; 2245 $self->{history_saveback} = '';
1750 $self->_emit (activate => $txt); 2246 $self->emit (activate => $txt);
1751 $self->update; 2247 $self->update;
1752 2248
1753 } elsif ($sym == CFClient::SDLK_UP) { 2249 } elsif ($sym == CFPlus::SDLK_UP) {
1754 if ($self->{history_pointer} < 0) { 2250 if ($self->{history_pointer} < 0) {
1755 $self->{history_saveback} = $self->get_text; 2251 $self->{history_saveback} = $self->get_text;
1756 } 2252 }
1757 if (@{$self->{history} || []} > 0) { 2253 if (@{$self->{history} || []} > 0) {
1758 $self->{history_pointer}++; 2254 $self->{history_pointer}++;
… …
1760 $self->{history_pointer} = @{$self->{history} || []} - 1; 2256 $self->{history_pointer} = @{$self->{history} || []} - 1;
1761 } 2257 }
1762 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2258 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1763 } 2259 }
1764 2260
1765 } elsif ($sym == CFClient::SDLK_DOWN) { 2261 } elsif ($sym == CFPlus::SDLK_DOWN) {
1766 $self->{history_pointer}--; 2262 $self->{history_pointer}--;
1767 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2263 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1768 2264
1769 if ($self->{history_pointer} >= 0) { 2265 if ($self->{history_pointer} >= 0) {
1770 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2266 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1771 } else { 2267 } else {
1772 $self->set_text ($self->{history_saveback}); 2268 $self->set_text ($self->{history_saveback});
1773 } 2269 }
1774 2270
1775 } else { 2271 } else {
1776 $self->SUPER::key_down ($ev); 2272 return $self->SUPER::invoke_key_down ($ev)
2273 }
2274
1777 } 2275 1
1778
1779} 2276}
1780 2277
1781############################################################################# 2278#############################################################################
1782 2279
2280package CFPlus::UI::TextEdit;
2281
2282our @ISA = CFPlus::UI::EntryBase::;
2283
2284use CFPlus::OpenGL;
2285
2286sub move_cursor_ver {
2287 my ($self, $dy) = @_;
2288
2289 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2290
2291 $y += $dy;
2292
2293 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2294 $self->{cursor} = $index;
2295 delete $self->{cur_h};
2296 $self->update;
2297 return;
2298 }
2299}
2300
2301sub invoke_key_down {
2302 my ($self, $ev) = @_;
2303
2304 my $sym = $ev->{sym};
2305
2306 if ($sym == CFPlus::SDLK_UP) {
2307 $self->move_cursor_ver (-1);
2308 } elsif ($sym == CFPlus::SDLK_DOWN) {
2309 $self->move_cursor_ver (+1);
2310 } else {
2311 return $self->SUPER::invoke_key_down ($ev)
2312 }
2313
2314 1
2315}
2316
2317#############################################################################
2318
1783package CFClient::UI::Button; 2319package CFPlus::UI::Button;
1784 2320
1785our @ISA = CFClient::UI::Label::; 2321our @ISA = CFPlus::UI::Label::;
1786 2322
1787use CFClient::OpenGL; 2323use CFPlus::OpenGL;
1788 2324
1789my @tex = 2325my @tex =
1790 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2326 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1791 qw(b1_button_active.png); 2327 qw(b1_button_active.png);
1792 2328
1793sub new { 2329sub new {
1794 my $class = shift; 2330 my $class = shift;
1795 2331
1796 $class->SUPER::new ( 2332 $class->SUPER::new (
1797 padding => 4, 2333 padding_x => 4,
2334 padding_y => 4,
1798 fg => [1, 1, 1], 2335 fg => [1, 1, 1],
1799 active_fg => [0, 0, 1], 2336 active_fg => [0, 0, 1],
1800 can_hover => 1, 2337 can_hover => 1,
1801 align => 0, 2338 align => 0,
1802 valign => 0, 2339 valign => 0,
1803 can_events => 1, 2340 can_events => 1,
1804 @_ 2341 @_
1805 ) 2342 )
1806} 2343}
1807 2344
1808sub activate { }
1809
1810sub button_up { 2345sub invoke_button_up {
1811 my ($self, $ev, $x, $y) = @_; 2346 my ($self, $ev, $x, $y) = @_;
1812 2347
1813 $self->emit ("activate") 2348 $self->emit ("activate")
1814 if $x >= 0 && $x < $self->{w} 2349 if $x >= 0 && $x < $self->{w}
1815 && $y >= 0 && $y < $self->{h}; 2350 && $y >= 0 && $y < $self->{h};
2351
2352 1
1816} 2353}
1817 2354
1818sub _draw { 2355sub _draw {
1819 my ($self) = @_; 2356 my ($self) = @_;
1820 2357
1821 local $self->{fg} = $self->{fg}; 2358 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1822
1823 if ($GRAB == $self) {
1824 $self->{fg} = $self->{active_fg};
1825 }
1826 2359
1827 glEnable GL_TEXTURE_2D; 2360 glEnable GL_TEXTURE_2D;
1828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2361 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829 glColor 0, 0, 0, 1; 2362 glColor 0, 0, 0, 1;
1830 2363
… …
1835 $self->SUPER::_draw; 2368 $self->SUPER::_draw;
1836} 2369}
1837 2370
1838############################################################################# 2371#############################################################################
1839 2372
1840package CFClient::UI::CheckBox; 2373package CFPlus::UI::CheckBox;
1841 2374
1842our @ISA = CFClient::UI::DrawBG::; 2375our @ISA = CFPlus::UI::DrawBG::;
1843 2376
1844my @tex = 2377my @tex =
1845 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1846 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2379 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1847 2380
1848use CFClient::OpenGL; 2381use CFPlus::OpenGL;
1849 2382
1850sub new { 2383sub new {
1851 my $class = shift; 2384 my $class = shift;
1852 2385
1853 $class->SUPER::new ( 2386 $class->SUPER::new (
1854 padding => 2, 2387 padding_x => 2,
2388 padding_y => 2,
1855 fg => [1, 1, 1], 2389 fg => [1, 1, 1],
1856 active_fg => [1, 1, 0], 2390 active_fg => [1, 1, 0],
1857 bg => [0, 0, 0, 0.2], 2391 bg => [0, 0, 0, 0.2],
1858 active_bg => [1, 1, 1, 0.5], 2392 active_bg => [1, 1, 1, 0.5],
1859 state => 0, 2393 state => 0,
… …
1863} 2397}
1864 2398
1865sub size_request { 2399sub size_request {
1866 my ($self) = @_; 2400 my ($self) = @_;
1867 2401
1868 ($self->{padding} * 2 + 6) x 2 2402 (6) x 2
1869} 2403}
1870 2404
2405sub toggle {
2406 my ($self) = @_;
2407
2408 $self->{state} = !$self->{state};
2409 $self->emit (changed => $self->{state});
2410 $self->update;
2411}
2412
1871sub button_down { 2413sub invoke_button_down {
1872 my ($self, $ev, $x, $y) = @_; 2414 my ($self, $ev, $x, $y) = @_;
1873 2415
1874 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2416 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1875 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2417 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1876 $self->{state} = !$self->{state}; 2418 $self->toggle;
1877 $self->_emit (changed => $self->{state}); 2419 } else {
2420 return 0
2421 }
2422
1878 } 2423 1
1879} 2424}
1880 2425
1881sub _draw { 2426sub _draw {
1882 my ($self) = @_; 2427 my ($self) = @_;
1883 2428
1884 $self->SUPER::_draw; 2429 $self->SUPER::_draw;
1885 2430
1886 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2431 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1887 2432
1888 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2433 my ($w, $h) = @$self{qw(w h)};
2434
2435 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1889 2436
1890 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2437 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1891 2438
1892 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2439 my $tex = $self->{state} ? $tex[1] : $tex[0];
1893 2440
… …
1896 glDisable GL_TEXTURE_2D; 2443 glDisable GL_TEXTURE_2D;
1897} 2444}
1898 2445
1899############################################################################# 2446#############################################################################
1900 2447
1901package CFClient::UI::Image; 2448package CFPlus::UI::Image;
1902 2449
1903our @ISA = CFClient::UI::Base::; 2450our @ISA = CFPlus::UI::Base::;
1904 2451
1905use CFClient::OpenGL; 2452use CFPlus::OpenGL;
1906use Carp qw/confess/;
1907 2453
1908our %loaded_images; 2454our %texture_cache;
1909 2455
1910sub new { 2456sub new {
1911 my $class = shift; 2457 my $class = shift;
1912 2458
1913 my $self = $class->SUPER::new (can_events => 0, @_); 2459 my $self = $class->SUPER::new (
2460 can_events => 0,
2461 @_,
2462 );
1914 2463
1915 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2464 $self->{path} || $self->{tex}
2465 or Carp::croak "'path' or 'tex' attributes required";
1916 2466
1917 $loaded_images{$self->{image}} ||= 2467 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1918 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2468 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1919 2469
1920 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2470 CFPlus::weaken $texture_cache{$self->{path}};
1921 2471
1922 Scalar::Util::weaken $loaded_images{$self->{image}}; 2472 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1923
1924 $self->{aspect} = $tex->{w} / $tex->{h};
1925 2473
1926 $self 2474 $self
1927} 2475}
1928 2476
2477sub STORABLE_freeze {
2478 my ($self, $cloning) = @_;
2479
2480 $self->{path}
2481 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2482
2483 $self->{path}
2484}
2485
2486sub STORABLE_attach {
2487 my ($self, $cloning, $path) = @_;
2488
2489 $self->new (path => $path)
2490}
2491
1929sub size_request { 2492sub size_request {
1930 my ($self) = @_; 2493 my ($self) = @_;
1931 2494
1932 ($self->{tex}->{w}, $self->{tex}->{h}) 2495 ($self->{tex}{w}, $self->{tex}{h})
1933} 2496}
1934 2497
1935sub _draw { 2498sub _draw {
1936 my ($self) = @_; 2499 my ($self) = @_;
1937 2500
… …
1947 } 2510 }
1948 2511
1949 glEnable GL_TEXTURE_2D; 2512 glEnable GL_TEXTURE_2D;
1950 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1951 2514
1952 $tex->draw_quad_alpha (0, 0, $w, $h); 2515 $tex->draw_quad (0, 0, $w, $h);
1953 2516
1954 glDisable GL_TEXTURE_2D; 2517 glDisable GL_TEXTURE_2D;
1955} 2518}
1956 2519
1957############################################################################# 2520#############################################################################
1958 2521
2522package CFPlus::UI::ImageButton;
2523
2524our @ISA = CFPlus::UI::Image::;
2525
2526use CFPlus::OpenGL;
2527
2528my %textures;
2529
2530sub new {
2531 my $class = shift;
2532
2533 my $self = $class->SUPER::new (
2534 padding_x => 4,
2535 padding_y => 4,
2536 fg => [1, 1, 1],
2537 active_fg => [0, 0, 1],
2538 can_hover => 1,
2539 align => 0,
2540 valign => 0,
2541 can_events => 1,
2542 @_
2543 );
2544}
2545
2546sub invoke_button_up {
2547 my ($self, $ev, $x, $y) = @_;
2548
2549 $self->emit ("activate")
2550 if $x >= 0 && $x < $self->{w}
2551 && $y >= 0 && $y < $self->{h};
2552
2553 1
2554}
2555
2556#############################################################################
2557
1959package CFClient::UI::VGauge; 2558package CFPlus::UI::VGauge;
1960 2559
1961our @ISA = CFClient::UI::Base::; 2560our @ISA = CFPlus::UI::Base::;
1962 2561
1963use List::Util qw(min max); 2562use List::Util qw(min max);
1964 2563
1965use CFClient::OpenGL; 2564use CFPlus::OpenGL;
1966 2565
1967my %tex = ( 2566my %tex = (
1968 food => [ 2567 food => [
1969 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2568 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1970 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2569 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1971 ], 2570 ],
1972 grace => [ 2571 grace => [
1973 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2572 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/ 2573 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1975 ], 2574 ],
1976 hp => [ 2575 hp => [
1977 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2576 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1978 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2577 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1979 ], 2578 ],
1980 mana => [ 2579 mana => [
1981 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2580 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/ 2581 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1983 ], 2582 ],
1984); 2583);
1985 2584
1986# eg. VGauge->new (gauge => 'food'), default gauge: food 2585# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2046 my $ycut1 = max 0, min 1, $ycut; 2645 my $ycut1 = max 0, min 1, $ycut;
2047 my $ycut2 = max 0, min 1, $ycut - 1; 2646 my $ycut2 = max 0, min 1, $ycut - 1;
2048 2647
2049 my $h1 = $self->{h} * (1 - $ycut1); 2648 my $h1 = $self->{h} * (1 - $ycut1);
2050 my $h2 = $self->{h} * (1 - $ycut2); 2649 my $h2 = $self->{h} * (1 - $ycut2);
2650 my $h3 = $self->{h};
2651
2652 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2051 2653
2052 glEnable GL_BLEND; 2654 glEnable GL_BLEND;
2053 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2655 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2656 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2054 glEnable GL_TEXTURE_2D; 2657 glEnable GL_TEXTURE_2D;
2055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2056 2659
2057 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2660 glBindTexture GL_TEXTURE_2D, $t1->{name};
2058 glBegin GL_QUADS; 2661 glBegin GL_QUADS;
… …
2073 2676
2074 if ($t3) { 2677 if ($t3) {
2075 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2678 glBindTexture GL_TEXTURE_2D, $t3->{name};
2076 glBegin GL_QUADS; 2679 glBegin GL_QUADS;
2077 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2680 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2078 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2681 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2079 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2682 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2080 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2683 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2081 glEnd; 2684 glEnd;
2082 } 2685 }
2083 2686
2084 glDisable GL_BLEND; 2687 glDisable GL_BLEND;
2085 glDisable GL_TEXTURE_2D; 2688 glDisable GL_TEXTURE_2D;
2086} 2689}
2087 2690
2088############################################################################# 2691#############################################################################
2089 2692
2090package CFClient::UI::Gauge; 2693package CFPlus::UI::Gauge;
2091 2694
2092our @ISA = CFClient::UI::VBox::; 2695our @ISA = CFPlus::UI::VBox::;
2093 2696
2094sub new { 2697sub new {
2095 my ($class, %arg) = @_; 2698 my ($class, %arg) = @_;
2096 2699
2097 my $self = $class->SUPER::new ( 2700 my $self = $class->SUPER::new (
… …
2099 can_hover => 1, 2702 can_hover => 1,
2100 can_events => 1, 2703 can_events => 1,
2101 %arg, 2704 %arg,
2102 ); 2705 );
2103 2706
2104 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2707 $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); 2708 $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"); 2709 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2107 2710
2108 $self 2711 $self
2109} 2712}
2110 2713
2111sub set_fontsize { 2714sub set_fontsize {
… …
2132 $self->{value}->set_text ($val); 2735 $self->{value}->set_text ($val);
2133} 2736}
2134 2737
2135############################################################################# 2738#############################################################################
2136 2739
2137package CFClient::UI::Slider; 2740package CFPlus::UI::Slider;
2138 2741
2139use strict; 2742use strict;
2140 2743
2141use CFClient::OpenGL; 2744use CFPlus::OpenGL;
2142 2745
2143our @ISA = CFClient::UI::DrawBG::; 2746our @ISA = CFPlus::UI::DrawBG::;
2144 2747
2145my @tex = 2748my @tex =
2146 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2749 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2147 qw(s1_slider.png s1_slider_bg.png); 2750 qw(s1_slider.png s1_slider_bg.png);
2148 2751
2149sub new { 2752sub new {
2150 my $class = shift; 2753 my $class = shift;
2151 2754
… …
2158 fg => [1, 1, 1], 2761 fg => [1, 1, 1],
2159 active_fg => [0, 0, 0], 2762 active_fg => [0, 0, 0],
2160 bg => [0, 0, 0, 0.2], 2763 bg => [0, 0, 0, 0.2],
2161 active_bg => [1, 1, 1, 0.5], 2764 active_bg => [1, 1, 1, 0.5],
2162 range => [0, 0, 100, 10, 0], 2765 range => [0, 0, 100, 10, 0],
2163 req_w => $::WIDTH / 80, 2766 min_w => $::WIDTH / 80,
2164 req_h => $::WIDTH / 80, 2767 min_h => $::WIDTH / 80,
2165 vertical => 0, 2768 vertical => 0,
2166 can_hover => 1, 2769 can_hover => 1,
2167 inner_pad => 0.02, 2770 inner_pad => 0.02,
2168 @_ 2771 @_
2169 ); 2772 );
… …
2172 $self->update; 2775 $self->update;
2173 2776
2174 $self 2777 $self
2175} 2778}
2176 2779
2177sub changed { }
2178
2179sub set_range { 2780sub set_range {
2180 my ($self, $range) = @_; 2781 my ($self, $range) = @_;
2181 2782
2182 ($range, $self->{range}) = ($self->{range}, $range); 2783 ($range, $self->{range}) = ($self->{range}, $range);
2183 2784
2184 $self->update
2185 if "@$range" ne "@{$self->{range}}"; 2785 if ("@$range" ne "@{$self->{range}}") {
2786 $self->update;
2787 $self->set_value ($self->{range}[0]);
2788 }
2186} 2789}
2187 2790
2188sub set_value { 2791sub set_value {
2189 my ($self, $value) = @_; 2792 my ($self, $value) = @_;
2190 2793
… …
2201 if $unit; 2804 if $unit;
2202 2805
2203 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2806 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2204 2807
2205 if ($value != $old_value) { 2808 if ($value != $old_value) {
2206 $self->_emit (changed => $value); 2809 $self->emit (changed => $value);
2207 $self->update; 2810 $self->update;
2208 } 2811 }
2209} 2812}
2210 2813
2211sub size_request { 2814sub size_request {
2212 my ($self) = @_; 2815 my ($self) = @_;
2213 2816
2214 my $w = $self->{req_w}; 2817 ($self->{req_w}, $self->{req_h})
2215 my $h = $self->{req_h};
2216
2217 $self->{vertical} ? ($h, $w) : ($w, $h)
2218} 2818}
2219 2819
2220sub button_down { 2820sub invoke_button_down {
2221 my ($self, $ev, $x, $y) = @_; 2821 my ($self, $ev, $x, $y) = @_;
2222 2822
2223 $self->SUPER::button_down ($ev, $x, $y); 2823 $self->SUPER::invoke_button_down ($ev, $x, $y);
2224 2824
2225 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2825 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2226 2826
2227 $self->mouse_motion ($ev, $x, $y); 2827 $self->invoke_mouse_motion ($ev, $x, $y)
2228} 2828}
2229 2829
2230sub mouse_motion { 2830sub invoke_mouse_motion {
2231 my ($self, $ev, $x, $y) = @_; 2831 my ($self, $ev, $x, $y) = @_;
2232 2832
2233 if ($GRAB == $self) { 2833 if ($GRAB == $self) {
2234 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2834 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2235 2835
2236 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2836 my (undef, $lo, $hi, $page) = @{$self->{range}};
2237 2837
2238 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2838 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2239 2839
2240 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2840 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2841 } else {
2842 return 0;
2843 }
2844
2241 } 2845 1
2846}
2847
2848sub invoke_mouse_wheel {
2849 my ($self, $ev) = @_;
2850
2851 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2852
2853 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2854
2855 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2856
2857 ! ! $delta
2242} 2858}
2243 2859
2244sub update { 2860sub update {
2245 my ($self) = @_; 2861 my ($self) = @_;
2246 2862
2247 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2863 delete $self->{knob_w};
2864 $self->SUPER::update;
2865}
2866
2867sub _draw {
2868 my ($self) = @_;
2869
2870 unless ($self->{knob_w}) {
2248 $self->set_value ($self->{range}[0]); 2871 $self->set_value ($self->{range}[0]);
2249 2872
2250 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2873 my ($value, $lo, $hi, $page) = @{$self->{range}};
2251 my $range = ($hi - $page - $lo) || 1e-100; 2874 my $range = ($hi - $page - $lo) || 1e-100;
2252 2875
… …
2258 $value = ($value - $lo) / $range; 2881 $value = ($value - $lo) / $range;
2259 $value = $value * $self->{scale} + $self->{offset}; 2882 $value = $value * $self->{scale} + $self->{offset};
2260 2883
2261 $self->{knob_x} = $value - $knob_w * 0.5; 2884 $self->{knob_x} = $value - $knob_w * 0.5;
2262 $self->{knob_w} = $knob_w; 2885 $self->{knob_w} = $knob_w;
2263 }); 2886 }
2264
2265 $self->SUPER::update;
2266}
2267
2268sub _draw {
2269 my ($self) = @_;
2270 2887
2271 $self->SUPER::_draw (); 2888 $self->SUPER::_draw ();
2272 2889
2273 glScale $self->{w}, $self->{h}; 2890 glScale $self->{w}, $self->{h};
2274 2891
… …
2294 glDisable GL_TEXTURE_2D; 2911 glDisable GL_TEXTURE_2D;
2295} 2912}
2296 2913
2297############################################################################# 2914#############################################################################
2298 2915
2299package CFClient::UI::ValSlider; 2916package CFPlus::UI::ValSlider;
2300 2917
2301our @ISA = CFClient::UI::HBox::; 2918our @ISA = CFPlus::UI::HBox::;
2302 2919
2303sub new { 2920sub new {
2304 my ($class, %arg) = @_; 2921 my ($class, %arg) = @_;
2305 2922
2306 my $range = delete $arg{range}; 2923 my $range = delete $arg{range};
2307 2924
2308 my $self = $class->SUPER::new ( 2925 my $self = $class->SUPER::new (
2309 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2926 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2310 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2927 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2311 to_value => sub { shift }, 2928 to_value => sub { shift },
2312 from_value => sub { shift }, 2929 from_value => sub { shift },
2313 %arg, 2930 %arg,
2314 ); 2931 );
2315 2932
… …
2335sub set_range { shift->{slider}->set_range (@_) } 2952sub set_range { shift->{slider}->set_range (@_) }
2336sub set_value { shift->{slider}->set_value (@_) } 2953sub set_value { shift->{slider}->set_value (@_) }
2337 2954
2338############################################################################# 2955#############################################################################
2339 2956
2340package CFClient::UI::TextView; 2957package CFPlus::UI::TextScroller;
2341 2958
2342our @ISA = CFClient::UI::HBox::; 2959our @ISA = CFPlus::UI::HBox::;
2343 2960
2344use CFClient::OpenGL; 2961use CFPlus::OpenGL;
2345 2962
2346sub new { 2963sub new {
2347 my $class = shift; 2964 my $class = shift;
2348 2965
2349 my $self = $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2350 fontsize => 1, 2967 fontsize => 1,
2351 can_events => 0, 2968 can_events => 1,
2969 indent => 0,
2352 #font => default_font 2970 #font => default_font
2353 @_, 2971 @_,
2354 2972
2355 layout => (new CFClient::Layout 1), 2973 layout => (new CFPlus::Layout),
2356 par => [], 2974 par => [],
2975 max_par => 0,
2357 height => 0, 2976 height => 0,
2358 children => [ 2977 children => [
2359 (new CFClient::UI::Empty expand => 1), 2978 (new CFPlus::UI::Empty expand => 1),
2360 (new CFClient::UI::Slider vertical => 1), 2979 (new CFPlus::UI::Slider vertical => 1),
2361 ], 2980 ],
2362 ); 2981 );
2363 2982
2364 $self->{children}[1]->connect (changed => sub { $self->update }); 2983 $self->{children}[1]->connect (changed => sub { $self->update });
2365 2984
… …
2371 2990
2372 $self->{fontsize} = $fontsize; 2991 $self->{fontsize} = $fontsize;
2373 $self->reflow; 2992 $self->reflow;
2374} 2993}
2375 2994
2995sub size_request {
2996 my ($self) = @_;
2997
2998 my ($empty, $slider) = @{ $self->{children} };
2999
3000 local $self->{children} = [$empty, $slider];
3001 $self->SUPER::size_request
3002}
3003
2376sub size_allocate { 3004sub invoke_size_allocate {
2377 my ($self, $w, $h, $changed) = @_; 3005 my ($self, $w, $h) = @_;
2378 3006
2379 $self->SUPER::size_allocate ($w, $h, $changed); 3007 my ($empty, $slider, @other) = @{ $self->{children} };
2380 3008 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2381 return unless $changed;
2382 3009
2383 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3010 $self->{layout}->set_font ($self->{font}) if $self->{font};
2384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3011 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2385 $self->{layout}->set_width ($self->{children}[0]{w}); 3012 $self->{layout}->set_width ($empty->{w});
3013 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2386 3014
2387 $self->reflow; 3015 $self->reflow;
2388}
2389 3016
2390sub text_size { 3017 local $self->{children} = [$empty, $slider];
3018 $self->SUPER::invoke_size_allocate ($w, $h)
3019}
3020
3021sub invoke_mouse_wheel {
2391 my ($self, $text, $indent) = @_; 3022 my ($self, $ev) = @_;
3023
3024 return 0 unless $ev->{dy}; # only vertical movements
3025
3026 $self->{children}[1]->emit (mouse_wheel => $ev);
3027
3028 1
3029}
3030
3031sub get_layout {
3032 my ($self, $para) = @_;
2392 3033
2393 my $layout = $self->{layout}; 3034 my $layout = $self->{layout};
2394 3035
3036 $layout->set_font ($self->{font}) if $self->{font};
3037 $layout->set_foreground (@{$para->{fg}});
2395 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3038 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2396 $layout->set_width ($self->{children}[0]{w} - $indent); 3039 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3040 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2397 $layout->set_markup ($text); 3041 $layout->set_markup ($para->{markup});
3042
3043 $layout->set_shapes (
3044 map
3045 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3046 @{$para->{widget}}
2398 3047 );
3048
2399 $layout->size 3049 $layout
2400} 3050}
2401 3051
2402sub reflow { 3052sub reflow {
2403 my ($self) = @_; 3053 my ($self) = @_;
2404 3054
… …
2411 3061
2412 # todo: base offset on lines or so, not on pixels 3062 # todo: base offset on lines or so, not on pixels
2413 $self->{children}[1]->set_value ($offset); 3063 $self->{children}[1]->set_value ($offset);
2414} 3064}
2415 3065
3066sub current_paragraph {
3067 my ($self) = @_;
3068
3069 $self->{top_paragraph} - 1
3070}
3071
3072sub scroll_to {
3073 my ($self, $para) = @_;
3074
3075 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3076
3077 $self->{scroll_to} = $para;
3078 $self->update;
3079}
3080
2416sub clear { 3081sub clear {
2417 my ($self) = @_; 3082 my ($self) = @_;
3083
3084 my (undef, undef, @other) = @{ $self->{children} };
3085 $self->remove ($_) for @other;
2418 3086
2419 $self->{par} = []; 3087 $self->{par} = [];
2420 $self->{height} = 0; 3088 $self->{height} = 0;
2421 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3089 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2422} 3090}
2423 3091
2424sub add_paragraph { 3092sub add_paragraph {
2425 my ($self, $color, $text, $indent) = @_; 3093 my $self = shift;
2426 3094
2427 for my $line (split /\n/, $text) { 3095 for my $para (@_) {
2428 my ($w, $h) = $self->text_size ($line); 3096 $para = {
3097 fg => [1, 1, 1, 1],
3098 indent => 0,
3099 markup => "",
3100 widget => [],
3101 ref $para ? %$para : (markup => $para),
3102 w => 1e10,
3103 wrapped => 1,
3104 };
3105
3106 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3107 push @{$self->{par}}, $para;
3108 }
3109
3110 if (my $max = $self->{max_par}) {
3111 shift @{$self->{par}} while @{$self->{par}} > $max;
3112 }
3113
3114 $self->{need_reflow}++;
3115 $self->update;
3116}
3117
3118sub scroll_to_bottom {
3119 my ($self) = @_;
3120
3121 $self->{scroll_to} = $#{$self->{par}};
3122 $self->update;
3123}
3124
3125sub force_uptodate {
3126 my ($self) = @_;
3127
3128 if (delete $self->{need_reflow}) {
3129 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3130
3131 my $height = 0;
3132
3133 for my $para (@{$self->{par}}) {
3134 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3135 my $layout = $self->get_layout ($para);
3136 my ($w, $h) = $layout->size;
3137
3138 $para->{w} = $w + $para->{indent};
3139 $para->{h} = $h;
3140 $para->{wrapped} = $layout->has_wrapped;
3141 }
3142
3143 $para->{y} = $height;
3144 $height += $para->{h};
3145 }
3146
2429 $self->{height} += $h; 3147 $self->{height} = $height;
2430 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3148 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2431 }
2432 3149
2433 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3150 delete $self->{texture};
3151 }
3152
3153 if (my $paridx = delete $self->{scroll_to}) {
3154 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3155 }
2434} 3156}
2435 3157
2436sub update { 3158sub update {
2437 my ($self) = @_; 3159 my ($self) = @_;
2438 3160
… …
2440 3162
2441 return unless $self->{h} > 0; 3163 return unless $self->{h} > 0;
2442 3164
2443 delete $self->{texture}; 3165 delete $self->{texture};
2444 3166
2445 $ROOT->on_post_alloc ($self, sub { 3167 $ROOT->on_post_alloc ($self => sub {
3168 $self->force_uptodate;
3169
2446 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3170 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2447 3171
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 { 3172 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2475 glClearColor 0.5, 0.5, 0.5, 0; 3173 glClearColor 0, 0, 0, 0;
2476 glClear GL_COLOR_BUFFER_BIT; 3174 glClear GL_COLOR_BUFFER_BIT;
2477 3175
3176 package CFPlus::UI::Base;
3177 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3178 (0, 0, $self->{w}, $self->{h});
3179
3180 my $top = int $self->{children}[1]{range}[0];
3181
3182 my $paridx = 0;
3183 my $top_paragraph;
2478 my $top = int $self->{children}[1]{range}[0]; 3184 my $top = int $self->{children}[1]{range}[0];
2479 3185
2480 my $y0 = $top; 3186 my $y0 = $top;
2481 my $y1 = $top + $H; 3187 my $y1 = $top + $H;
2482 3188
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}}) { 3189 for my $para (@{$self->{par}}) {
2494 my $h = $par->[1]; 3190 my $h = $para->{h};
3191 my $y = $para->{y};
2495 3192
2496 if ($y0 < $y + $h && $y < $y1) { 3193 if ($y0 < $y + $h && $y < $y1) {
2497 $layout->set_foreground (@{ $par->[2] }); 3194 my $layout = $self->get_layout ($para);
2498 $layout->set_width ($W - $par->[3]);
2499 $layout->set_markup ($par->[4]);
2500 3195
2501 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3196 $layout->render ($para->{indent}, $y - $y0);
2502 3197
2503 glRasterPos $par->[3], $y - $y0; 3198 if (my @w = @{ $para->{widget} }) {
2504 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3199 my @s = $layout->get_shapes;
3200
3201 for (@w) {
3202 my ($dx, $dy) = splice @s, 0, 2, ();
3203
3204 $_->{x} = $dx + $para->{indent};
3205 $_->{y} = $dy + $y - $y0;
3206
3207 $_->draw;
3208 }
3209 }
2505 } 3210 }
2506 3211
2507 $y += $h; 3212 $paridx++;
3213 $top_paragraph ||= $paridx if $y >= $top;
2508 } 3214 }
2509 3215
2510 glDisable GL_BLEND; 3216 $self->{top_paragraph} = $top_paragraph;
2511 }; 3217 };
2512 }); 3218 });
2513} 3219}
2514 3220
3221sub reconfigure {
3222 my ($self) = @_;
3223
3224 $self->SUPER::reconfigure;
3225
3226 $_->{w} = 1e10 for @{ $self->{par} };
3227 $self->reflow;
3228}
3229
2515sub _draw { 3230sub _draw {
2516 my ($self) = @_; 3231 my ($self) = @_;
2517 3232
2518 glEnable GL_TEXTURE_2D; 3233 glEnable GL_TEXTURE_2D;
2519 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3234 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2520 glColor 1, 1, 1, 1; 3235 glColor 0, 0, 0, 1;
2521 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3236 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2522 glDisable GL_TEXTURE_2D; 3237 glDisable GL_TEXTURE_2D;
2523 3238
2524 $self->{children}[1]->draw; 3239 $self->{children}[1]->draw;
2525
2526} 3240}
2527 3241
2528############################################################################# 3242#############################################################################
2529 3243
2530package CFClient::UI::Animator; 3244package CFPlus::UI::Animator;
2531 3245
2532use CFClient::OpenGL; 3246use CFPlus::OpenGL;
2533 3247
2534our @ISA = CFClient::UI::Bin::; 3248our @ISA = CFPlus::UI::Bin::;
2535 3249
2536sub moveto { 3250sub moveto {
2537 my ($self, $x, $y) = @_; 3251 my ($self, $x, $y) = @_;
2538 3252
2539 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3253 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2567 glPopMatrix; 3281 glPopMatrix;
2568} 3282}
2569 3283
2570############################################################################# 3284#############################################################################
2571 3285
2572package CFClient::UI::Flopper; 3286package CFPlus::UI::Flopper;
2573 3287
2574our @ISA = CFClient::UI::Button::; 3288our @ISA = CFPlus::UI::Button::;
2575 3289
2576sub new { 3290sub new {
2577 my $class = shift; 3291 my $class = shift;
2578 3292
2579 my $self = $class->SUPER::new ( 3293 my $self = $class->SUPER::new (
… …
2591 $self->{other}->toggle_visibility; 3305 $self->{other}->toggle_visibility;
2592} 3306}
2593 3307
2594############################################################################# 3308#############################################################################
2595 3309
2596package CFClient::UI::Tooltip; 3310package CFPlus::UI::Tooltip;
2597 3311
2598our @ISA = CFClient::UI::Bin::; 3312our @ISA = CFPlus::UI::Bin::;
2599 3313
2600use CFClient::OpenGL; 3314use CFPlus::OpenGL;
2601 3315
2602sub new { 3316sub new {
2603 my $class = shift; 3317 my $class = shift;
2604 3318
2605 $class->SUPER::new ( 3319 $class->SUPER::new (
… …
2609} 3323}
2610 3324
2611sub set_tooltip_from { 3325sub set_tooltip_from {
2612 my ($self, $widget) = @_; 3326 my ($self, $widget) = @_;
2613 3327
3328 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3329 if $widget->{tooltip} =~ /^#(.*)$/;
3330
3331 my $tooltip = $widget->{tooltip};
3332
3333 if ($ENV{CFPLUS_DEBUG} & 2) {
3334 $tooltip .= "\n\n" . (ref $widget) . "\n"
3335 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3336 . "req $widget->{req_w} $widget->{req_h}\n"
3337 . "visible $widget->{visible}";
3338 }
3339
3340 $tooltip =~ s/^\n+//;
3341 $tooltip =~ s/\n+$//;
3342
2614 $self->add (new CFClient::UI::Label 3343 $self->add (new CFPlus::UI::Label
2615 markup => $widget->{tooltip}, 3344 markup => $tooltip,
2616 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3345 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2617 fontsize => 0.8, 3346 fontsize => 0.8,
2618 fg => [0, 0, 0, 1], 3347 style => 1, # FLAG_INVERSE
2619 ellipsise => 0, 3348 ellipsise => 0,
2620 font => ($widget->{tooltip_font} || $::FONT_PROP), 3349 font => ($widget->{tooltip_font} || $::FONT_PROP),
2621 ); 3350 );
2622} 3351}
2623 3352
… …
2627 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3356 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2628 3357
2629 ($w + 4, $h + 4) 3358 ($w + 4, $h + 4)
2630} 3359}
2631 3360
2632sub size_allocate { 3361sub invoke_size_allocate {
2633 my ($self, $w, $h, $changed) = @_; 3362 my ($self, $w, $h) = @_;
2634 3363
2635 return unless $changed;
2636
2637 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 3364 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2638} 3365}
2639 3366
2640sub visibility_change { 3367sub invoke_visibility_change {
2641 my ($self, $visible) = @_; 3368 my ($self, $visible) = @_;
2642 3369
2643 return unless $visible; 3370 return unless $visible;
2644 3371
2645 $self->{root}->on_post_alloc ("move_$self" => sub { 3372 $self->{root}->on_post_alloc ("move_$self" => sub {
2646 my $widget = $self->{owner} 3373 my $widget = $self->{owner}
2647 or return; 3374 or return;
2648 3375
3376 if ($widget->{visible}) {
2649 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3377 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2650 3378
2651 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3379 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2652 if $x + $self->{w} > $::WIDTH; 3380 if $x + $self->{w} > $self->{root}{w};
2653 3381
2654 $self->move ($x, $y); 3382 $self->move_abs ($x, $y);
3383 } else {
3384 $self->hide;
3385 }
2655 }); 3386 });
2656} 3387}
2657 3388
2658sub _draw { 3389sub _draw {
2659 my ($self) = @_; 3390 my ($self) = @_;
… …
2683 $self->SUPER::_draw; 3414 $self->SUPER::_draw;
2684} 3415}
2685 3416
2686############################################################################# 3417#############################################################################
2687 3418
2688package CFClient::UI::Face; 3419package CFPlus::UI::Face;
2689 3420
2690our @ISA = CFClient::UI::Base::; 3421our @ISA = CFPlus::UI::DrawBG::;
2691 3422
2692use CFClient::OpenGL; 3423use CFPlus::OpenGL;
2693 3424
2694sub new { 3425sub new {
2695 my $class = shift; 3426 my $class = shift;
2696 3427
2697 my $self = $class->SUPER::new ( 3428 my $self = $class->SUPER::new (
3429 size_w => 32,
3430 size_h => 8,
2698 aspect => 1, 3431 aspect => 1,
2699 can_events => 0, 3432 can_events => 0,
2700 @_, 3433 @_,
2701 ); 3434 );
2702 3435
2703 if ($self->{anim} && $self->{animspeed}) { 3436 if ($self->{anim} && $self->{animspeed}) {
2704 Scalar::Util::weaken (my $widget = $self); 3437 CFPlus::weaken (my $widget = $self);
2705 3438
2706 $self->{timer} = Event->timer ( 3439 $self->{timer} = Event->timer (
2707 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3440 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2708 hard => 1, 3441 hard => 1,
2709 interval => $self->{animspeed}, 3442 interval => $self->{animspeed},
2710 cb => sub { 3443 cb => sub {
3444 return unless $::CONN;
3445
2711 ++$widget->{frame}; 3446 ++$widget->{frame};
3447 $self->update_face;
2712 $widget->update; 3448 $self->update;
2713 }, 3449 },
2714 ); 3450 );
3451
3452 $self->update_face;
2715 } 3453 }
2716 3454
2717 $self 3455 $self
2718} 3456}
2719 3457
3458sub update_face {
3459 my ($self) = @_;
3460
3461 return unless $::CONN;
3462
3463 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3464 if ($anim && @$anim) {
3465 delete $self->{wait_face};
3466 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3467 }
3468 }
3469}
3470
2720sub size_request { 3471sub size_request {
2721 (32, 8) 3472 my ($self) = @_;
3473
3474 if ($::CONN) {
3475 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3476 if (my $tex = $::CONN->{texture}[$faceid]) {
3477 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3478 } else {
3479 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3480 $self->realloc;
3481 });
3482 }
3483 }
3484 }
3485
3486 ($self->{size_w} || 8, $self->{size_h} || 8)
2722} 3487}
2723 3488
2724sub update { 3489sub update {
2725 my ($self) = @_; 3490 my ($self) = @_;
2726 3491
… …
2732sub _draw { 3497sub _draw {
2733 my ($self) = @_; 3498 my ($self) = @_;
2734 3499
2735 return unless $::CONN; 3500 return unless $::CONN;
2736 3501
2737 my $face; 3502 $self->SUPER::_draw;
2738 3503
2739 if ($self->{frame}) {
2740 my $anim = $::CONN->{anim}[$self->{anim}]; 3504 my $faceid = $::CONN->{faceid}[$self->{face}]
2741 3505 or return;
2742 $face = $anim->[ $self->{frame} % @$anim ]
2743 if $anim && @$anim;
2744 }
2745 3506
2746 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3507 my $tex = $::CONN->{texture}[$faceid];
2747 3508
2748 if ($tex) { 3509 if ($tex) {
2749 glEnable GL_TEXTURE_2D; 3510 glEnable GL_TEXTURE_2D;
2750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2751 glColor 1, 1, 1, 1; 3512 glColor 0, 0, 0, 1;
2752 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3513 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2753 glDisable GL_TEXTURE_2D; 3514 glDisable GL_TEXTURE_2D;
2754 } 3515 }
2755} 3516}
2756 3517
2757sub DESTROY { 3518sub destroy {
2758 my ($self) = @_; 3519 my ($self) = @_;
2759 3520
2760 $self->{timer}->cancel 3521 $self->{timer}->cancel
2761 if $self->{timer}; 3522 if $self->{timer};
2762 3523
2763 $self->SUPER::DESTROY; 3524 $self->SUPER::destroy;
2764} 3525}
2765 3526
2766############################################################################# 3527#############################################################################
2767 3528
2768package CFClient::UI::Inventory; 3529package CFPlus::UI::Buttonbar;
2769 3530
2770our @ISA = CFClient::UI::ScrolledWindow::; 3531our @ISA = CFPlus::UI::HBox::;
2771 3532
2772sub new { 3533# 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 3534
2808############################################################################# 3535#############################################################################
2809 3536
2810package CFClient::UI::Menu; 3537package CFPlus::UI::Menu;
2811 3538
2812our @ISA = CFClient::UI::FancyFrame::; 3539our @ISA = CFPlus::UI::Toplevel::;
2813 3540
2814use CFClient::OpenGL; 3541use CFPlus::OpenGL;
2815 3542
2816sub new { 3543sub new {
2817 my $class = shift; 3544 my $class = shift;
2818 3545
2819 my $self = $class->SUPER::new ( 3546 my $self = $class->SUPER::new (
2820 items => [], 3547 items => [],
2821 z => 100, 3548 z => 100,
2822 @_, 3549 @_,
2823 ); 3550 );
2824 3551
2825 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3552 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2826 3553
2827 for my $item (@{ $self->{items} }) { 3554 for my $item (@{ $self->{items} }) {
2828 my ($widget, $cb) = @$item; 3555 my ($widget, $cb, $tooltip) = @$item;
2829 3556
2830 # handle various types of items, only text for now 3557 # handle various types of items, only text for now
2831 if (!ref $widget) { 3558 if (!ref $widget) {
3559 if ($widget =~ /\t/) {
3560 my ($left, $right) = split /\t/, $widget, 2;
3561
2832 $widget = new CFClient::UI::Label 3562 $widget = new CFPlus::UI::HBox
2833 can_hover => 1, 3563 can_hover => 1,
2834 can_events => 1, 3564 can_events => 1,
3565 tooltip => $tooltip,
3566 children => [
3567 (new CFPlus::UI::Label markup => $left, expand => 1),
3568 (new CFPlus::UI::Label markup => $right, align => +1),
3569 ],
3570 ;
3571
3572 } else {
3573 $widget = new CFPlus::UI::Label
3574 can_hover => 1,
3575 can_events => 1,
2835 text => $widget; 3576 markup => $widget,
3577 tooltip => $tooltip;
3578 }
2836 } 3579 }
2837 3580
2838 $self->{item}{$widget} = $item; 3581 $self->{item}{$widget} = $item;
2839 3582
2840 $self->{vbox}->add ($widget); 3583 $self->{vbox}->add ($widget);
… …
2845 3588
2846# popup given the event (must be a mouse button down event currently) 3589# popup given the event (must be a mouse button down event currently)
2847sub popup { 3590sub popup {
2848 my ($self, $ev) = @_; 3591 my ($self, $ev) = @_;
2849 3592
2850 $self->_emit ("popdown"); 3593 $self->emit ("popdown");
2851 3594
2852 # maybe save $GRAB? must be careful about events... 3595 # maybe save $GRAB? must be careful about events...
2853 $GRAB = $self; 3596 $GRAB = $self;
2854 $self->{button} = $ev->{button}; 3597 $self->{button} = $ev->{button};
2855 3598
2856 $self->show; 3599 $self->show;
2857 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3600 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2858} 3601}
2859 3602
2860sub mouse_motion { 3603sub invoke_mouse_motion {
2861 my ($self, $ev, $x, $y) = @_; 3604 my ($self, $ev, $x, $y) = @_;
2862 3605
2863 # TODO: should use vbox->find_widget or so 3606 # TODO: should use vbox->find_widget or so
2864 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3607 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2865 $self->{hover} = $self->{item}{$HOVER}; 3608 $self->{hover} = $self->{item}{$HOVER};
2866}
2867 3609
3610 0
3611}
3612
2868sub button_up { 3613sub invoke_button_up {
2869 my ($self, $ev, $x, $y) = @_; 3614 my ($self, $ev, $x, $y) = @_;
2870 3615
2871 if ($ev->{button} == $self->{button}) { 3616 if ($ev->{button} == $self->{button}) {
2872 undef $GRAB; 3617 undef $GRAB;
2873 $self->hide; 3618 $self->hide;
2874 3619
2875 $self->_emit ("popdown"); 3620 $self->emit ("popdown");
2876 $self->{hover}[1]->() if $self->{hover}; 3621 $self->{hover}[1]->() if $self->{hover};
3622 } else {
3623 return 0
3624 }
3625
2877 } 3626 1
2878} 3627}
2879 3628
2880############################################################################# 3629#############################################################################
2881 3630
2882package CFClient::UI::Statusbox; 3631package CFPlus::UI::Multiplexer;
2883 3632
2884our @ISA = CFClient::UI::VBox::; 3633our @ISA = CFPlus::UI::Container::;
2885 3634
2886sub new { 3635sub new {
2887 my $class = shift; 3636 my $class = shift;
2888 3637
2889 $class->SUPER::new ( 3638 my $self = $class->SUPER::new (
3639 @_,
3640 );
3641
3642 $self->{current} = $self->{children}[0]
3643 if @{ $self->{children} };
3644
3645 $self
3646}
3647
3648sub add {
3649 my ($self, @widgets) = @_;
3650
3651 $self->SUPER::add (@widgets);
3652
3653 $self->{current} = $self->{children}[0]
3654 if @{ $self->{children} };
3655}
3656
3657sub get_current_page {
3658 my ($self) = @_;
3659
3660 $self->{current}
3661}
3662
3663sub set_current_page {
3664 my ($self, $page_or_widget) = @_;
3665
3666 my $widget = ref $page_or_widget
3667 ? $page_or_widget
3668 : $self->{children}[$page_or_widget];
3669
3670 $self->{current} = $widget;
3671 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3672
3673 $self->emit (page_changed => $self->{current});
3674
3675 $self->realloc;
3676}
3677
3678sub visible_children {
3679 $_[0]{current}
3680}
3681
3682sub size_request {
3683 my ($self) = @_;
3684
3685 $self->{current}->size_request
3686}
3687
3688sub invoke_size_allocate {
3689 my ($self, $w, $h) = @_;
3690
3691 $self->{current}->configure (0, 0, $w, $h);
3692
3693 1
3694}
3695
3696sub _draw {
3697 my ($self) = @_;
3698
3699 $self->{current}->draw;
3700}
3701
3702#############################################################################
3703
3704package CFPlus::UI::Notebook;
3705
3706our @ISA = CFPlus::UI::VBox::;
3707
3708sub new {
3709 my $class = shift;
3710
3711 my $self = $class->SUPER::new (
3712 buttonbar => (new CFPlus::UI::Buttonbar),
3713 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3714 # filter => # will be put between multiplexer and $self
3715 @_,
3716 );
3717
3718 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3719 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3720
3721 $self
3722}
3723
3724sub add {
3725 my ($self, $title, $widget, $tooltip) = @_;
3726
3727 CFPlus::weaken $self;
3728
3729 $self->{buttonbar}->add (new CFPlus::UI::Button
3730 markup => $title,
3731 tooltip => $tooltip,
3732 on_activate => sub { $self->set_current_page ($widget) },
3733 );
3734
3735 $self->{multiplexer}->add ($widget);
3736}
3737
3738sub get_current_page {
3739 my ($self) = @_;
3740
3741 $self->{multiplexer}->get_current_page
3742}
3743
3744sub set_current_page {
3745 my ($self, $page) = @_;
3746
3747 $self->{multiplexer}->set_current_page ($page);
3748 $self->emit (page_changed => $self->{multiplexer}{current});
3749}
3750
3751#############################################################################
3752
3753package CFPlus::UI::Selector;
3754
3755use utf8;
3756
3757our @ISA = CFPlus::UI::Button::;
3758
3759sub new {
3760 my $class = shift;
3761
3762 my $self = $class->SUPER::new (
3763 options => [], # [value, title, longdesc], ...
3764 value => undef,
3765 @_,
3766 );
3767
3768 $self->_set_value ($self->{value});
3769
3770 $self
3771}
3772
3773sub invoke_button_down {
3774 my ($self, $ev) = @_;
3775
3776 my @menu_items;
3777
3778 for (@{ $self->{options} }) {
3779 my ($value, $title, $tooltip) = @$_;
3780
3781 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3782 }
3783
3784 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3785}
3786
3787sub _set_value {
3788 my ($self, $value) = @_;
3789
3790 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3791 or return;
3792
3793 $self->{value} = $item->[0];
3794 $self->set_markup ("$item->[1] ⇓");
3795 $self->set_tooltip ($item->[2]);
3796}
3797
3798sub set_value {
3799 my ($self, $value) = @_;
3800
3801 return unless $self->{value} ne $value;
3802
3803 $self->_set_value ($value);
3804 $self->emit (changed => $value);
3805}
3806
3807#############################################################################
3808
3809package CFPlus::UI::Statusbox;
3810
3811our @ISA = CFPlus::UI::VBox::;
3812
3813sub new {
3814 my $class = shift;
3815
3816 my $self = $class->SUPER::new (
2890 fontsize => 0.8, 3817 fontsize => 0.8,
2891 @_, 3818 @_,
2892 ) 3819 );
3820
3821 CFPlus::weaken (my $this = $self);
3822
3823 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3824
3825 $self
2893} 3826}
2894 3827
2895sub reorder { 3828sub reorder {
2896 my ($self) = @_; 3829 my ($self) = @_;
2897 my $NOW = time; 3830 my $NOW = Time::HiRes::time;
3831
3832 # freeze display when hovering over any label
3833 return if $CFPlus::UI::TOOLTIP->{owner}
3834 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3835 values %{ $self->{item} };
2898 3836
2899 while (my ($k, $v) = each %{ $self->{item} }) { 3837 while (my ($k, $v) = each %{ $self->{item} }) {
2900 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3838 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2901 } 3839 }
2902 3840
… …
2905 my @items = sort { 3843 my @items = sort {
2906 $a->{pri} <=> $b->{pri} 3844 $a->{pri} <=> $b->{pri}
2907 or $b->{id} <=> $a->{id} 3845 or $b->{id} <=> $a->{id}
2908 } values %{ $self->{item} }; 3846 } values %{ $self->{item} };
2909 3847
3848 $self->{timer}->interval (1);
3849
2910 my $count = 10 + 1; 3850 my $count = 10 + 1;
2911 for my $item (@items) { 3851 for my $item (@items) {
2912 last unless --$count; 3852 last unless --$count;
2913 3853
2914 push @widgets, $item->{label} ||= do { 3854 my $label = $item->{label} ||= do {
2915 # TODO: doesn't handle markup well (read as: at all) 3855 # TODO: doesn't handle markup well (read as: at all)
2916 my $short = $item->{count} > 1 3856 my $short = $item->{count} > 1
2917 ? "<b>$item->{count} ×</b> $item->{text}" 3857 ? "<b>$item->{count} ×</b> $item->{text}"
2918 : $item->{text}; 3858 : $item->{text};
2919 3859
2920 for ($short) { 3860 for ($short) {
2921 s/^\s+//; 3861 s/^\s+//;
2922 s/\s+/ /g; 3862 s/\s+/ /g;
2923 } 3863 }
2924 3864
2925 new CFClient::UI::Label 3865 new CFPlus::UI::Label
2926 markup => $short, 3866 markup => $short,
2927 tooltip => $item->{tooltip}, 3867 tooltip => $item->{tooltip},
2928 tooltip_font => $::FONT_PROP, 3868 tooltip_font => $::FONT_PROP,
2929 tooltip_width => 0.67, 3869 tooltip_width => 0.67,
2930 fontsize => $item->{fontsize} || $self->{fontsize}, 3870 fontsize => $item->{fontsize} || $self->{fontsize},
2931 max_w => $::WIDTH * 0.44, 3871 max_w => $::WIDTH * 0.44,
2932 fg => $item->{fg}, 3872 fg => [@{ $item->{fg} }],
2933 can_events => 1, 3873 can_events => 1,
2934 can_hover => 1 3874 can_hover => 1
2935 }; 3875 };
3876
3877 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3878 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3879 $label->update;
3880 $label->set_max_size (undef, $label->{req_h} * $diff)
3881 if $diff < 1;
3882 $self->{timer}->interval (1/30);
3883 } else {
3884 $label->{fg}[3] = $item->{fg}[3] || 1;
3885 }
3886
3887 push @widgets, $label;
2936 } 3888 }
2937 3889
2938 $self->clear; 3890 $self->clear;
2939 $self->SUPER::add (reverse @widgets); 3891 $self->SUPER::add (reverse @widgets);
2940} 3892}
… …
2945 $text =~ s/^\s+//; 3897 $text =~ s/^\s+//;
2946 $text =~ s/\s+$//; 3898 $text =~ s/\s+$//;
2947 3899
2948 return unless $text; 3900 return unless $text;
2949 3901
2950 my $timeout = time + ((delete $arg{timeout}) || 60); 3902 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2951 3903
2952 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3904 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2953 3905
2954 if (my $item = $self->{item}{$group}) { 3906 if (my $item = $self->{item}{$group}) {
2955 if ($item->{text} eq $text) { 3907 if ($item->{text} eq $text) {
2956 $item->{count}++; 3908 $item->{count}++;
2957 } else { 3909 } else {
2958 $item->{count} = 1; 3910 $item->{count} = 1;
2959 $item->{text} = $item->{tooltip} = $text; 3911 $item->{text} = $item->{tooltip} = $text;
2960 } 3912 }
2961 $item->{id} = ++$self->{id}; 3913 $item->{id} += 0.2;#d#
2962 $item->{timeout} = $timeout; 3914 $item->{timeout} = $timeout;
2963 delete $item->{label}; 3915 delete $item->{label};
2964 } else { 3916 } else {
2965 $self->{item}{$group} = { 3917 $self->{item}{$group} = {
2966 id => ++$self->{id}, 3918 id => ++$self->{id},
… …
2972 count => 1, 3924 count => 1,
2973 %arg, 3925 %arg,
2974 }; 3926 };
2975 } 3927 }
2976 3928
3929 $ROOT->on_refresh (reorder => sub {
2977 $self->reorder; 3930 $self->reorder;
3931 });
2978} 3932}
2979 3933
2980sub reconfigure { 3934sub reconfigure {
2981 my ($self) = @_; 3935 my ($self) = @_;
2982 3936
… …
2985 3939
2986 $self->reorder; 3940 $self->reorder;
2987 $self->SUPER::reconfigure; 3941 $self->SUPER::reconfigure;
2988} 3942}
2989 3943
3944sub destroy {
3945 my ($self) = @_;
3946
3947 $self->{timer}->cancel;
3948
3949 $self->SUPER::destroy;
3950}
3951
2990############################################################################# 3952#############################################################################
2991 3953
2992package CFClient::UI::Root; 3954package CFPlus::UI::Root;
2993 3955
2994our @ISA = CFClient::UI::Container::; 3956our @ISA = CFPlus::UI::Container::;
2995 3957
3958use List::Util qw(min max);
3959
2996use CFClient::OpenGL; 3960use CFPlus::OpenGL;
2997 3961
2998sub new { 3962sub new {
2999 my $class = shift; 3963 my $class = shift;
3000 3964
3001 my $self = $class->SUPER::new ( 3965 my $self = $class->SUPER::new (
3002 visible => 1, 3966 visible => 1,
3003 @_, 3967 @_,
3004 ); 3968 );
3005 3969
3006 Scalar::Util::weaken ($self->{root} = $self); 3970 CFPlus::weaken ($self->{root} = $self);
3007 3971
3008 $self 3972 $self
3009} 3973}
3010 3974
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 { 3975sub size_request {
3028 my ($self) = @_; 3976 my ($self) = @_;
3029 3977
3030 ($self->{w}, $self->{h}) 3978 ($self->{w}, $self->{h})
3031} 3979}
3032 3980
3981sub _to_pixel {
3982 my ($coord, $size, $max) = @_;
3983
3984 $coord =
3985 $coord eq "center" ? ($max - $size) * 0.5
3986 : $coord eq "max" ? $max
3987 : $coord;
3988
3989 $coord = 0 if $coord < 0;
3990 $coord = $max - $size if $coord > $max - $size;
3991
3992 int $coord + 0.5
3993}
3994
3033sub size_allocate { 3995sub invoke_size_allocate {
3034 my ($self, $w, $h, $changed) = @_; 3996 my ($self, $w, $h) = @_;
3035 3997
3036 for my $child ($self->children) { 3998 for my $child ($self->children) {
3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3999 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038 4000
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 4001 $X = $child->{force_x} if exists $child->{force_x};
3040 if exists $child->{req_x}; 4002 $Y = $child->{force_y} if exists $child->{force_y};
3041 4003
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 4004 $X = _to_pixel $X, $W, $self->{w};
3043 if exists $child->{req_y}; 4005 $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 4006
3050 $child->configure ($X, $Y, $W, $H); 4007 $child->configure ($X, $Y, $W, $H);
3051 } 4008 }
4009
4010 1
3052} 4011}
3053 4012
3054sub coord2local { 4013sub coord2local {
3055 my ($self, $x, $y) = @_; 4014 my ($self, $x, $y) = @_;
3056 4015
… …
3070} 4029}
3071 4030
3072sub add { 4031sub add {
3073 my ($self, @children) = @_; 4032 my ($self, @children) = @_;
3074 4033
3075 for my $child (@children) {
3076 $child->{is_toplevel} = 1; 4034 $_->{is_toplevel} = 1
3077 4035 for @children;
3078 # integerise window positions
3079 $child->{x} = int $child->{x};
3080 $child->{y} = int $child->{y};
3081 }
3082 4036
3083 $self->SUPER::add (@children); 4037 $self->SUPER::add (@children);
3084} 4038}
3085 4039
3086sub remove { 4040sub remove {
3087 my ($self, @children) = @_; 4041 my ($self, @children) = @_;
3088 4042
3089 $self->SUPER::remove (@children); 4043 $self->SUPER::remove (@children);
4044
4045 delete $self->{is_toplevel}
4046 for @children;
3090 4047
3091 while (@children) { 4048 while (@children) {
3092 my $w = pop @children; 4049 my $w = pop @children;
3093 push @children, $w->children; 4050 push @children, $w->children;
3094 $w->set_invisible; 4051 $w->set_invisible;
… …
3114 $_->() 4071 $_->()
3115 for values %{delete $self->{refresh_hook}}; 4072 for values %{delete $self->{refresh_hook}};
3116 } 4073 }
3117 4074
3118 if ($self->{realloc}) { 4075 if ($self->{realloc}) {
4076 my %queue;
3119 my @queue; 4077 my @queue;
4078 my $widget;
3120 4079
4080 outer:
3121 while () { 4081 while () {
3122 if ($self->{realloc}) { 4082 if (my $realloc = delete $self->{realloc}) {
3123 #TODO use array-of-depth approach 4083 for $widget (values %$realloc) {
4084 $widget->{visible} or next; # do not resize invisible widgets
3124 4085
3125 @queue = sort { $a->{visible} <=> $b->{visible} } 4086 $queue{$widget+0}++ and next; # duplicates are common
3126 @queue, values %{delete $self->{realloc}}; 4087
4088 push @{ $queue[$widget->{visible}] }, $widget;
4089 }
3127 } 4090 }
3128 4091
4092 while () {
4093 @queue or last outer;
4094
4095 $widget = pop @{ $queue[-1] || [] }
4096 and last;
4097
4098 pop @queue;
4099 }
4100
4101 delete $queue{$widget+0};
4102
4103 my ($w, $h) = $widget->size_request;
4104
4105 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
4106 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4107
4108 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4109 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4110
4111 $w = $widget->{force_w} if exists $widget->{force_w};
4112 $h = $widget->{force_h} if exists $widget->{force_h};
4113
4114 if ($widget->{req_w} != $w || $widget->{req_h} != $h
4115 || delete $widget->{force_realloc}) {
4116 $widget->{req_w} = $w;
4117 $widget->{req_h} = $h;
4118
4119 $self->{size_alloc}{$widget+0} = $widget;
4120
4121 if (my $parent = $widget->{parent}) {
4122 $self->{realloc}{$parent+0} = $parent
4123 unless $queue{$parent+0};
4124
4125 $parent->{force_size_alloc} = 1;
4126 $self->{size_alloc}{$parent+0} = $parent;
4127 }
4128 }
4129
4130 delete $self->{realloc}{$widget+0};
4131 }
4132 }
4133
4134 while (my $size_alloc = delete $self->{size_alloc}) {
4135 my @queue = sort { $b->{visible} <=> $a->{visible} }
4136 values %$size_alloc;
4137
4138 while () {
3129 my $widget = pop @queue || last; 4139 my $widget = pop @queue || last;
3130 4140
3131 $widget->{visible} or last; # do not resize invisible widgets 4141 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 4142
3156 $w = 0 if $w < 0; 4143 $w = 0 if $w < 0;
3157 $h = 0 if $h < 0; 4144 $h = 0 if $h < 0;
3158 4145
3159 my $changed = $widget->{w} != $w || $widget->{h} != $h; 4146 $w = max $widget->{min_w}, $w;
4147 $h = max $widget->{min_h}, $h;
3160 4148
4149# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4150# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4151
4152 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4153 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4154
4155 $w = int $w + 0.5;
4156 $h = int $h + 0.5;
4157
4158 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4159 $widget->{old_w} = $widget->{w};
4160 $widget->{old_h} = $widget->{h};
4161
3161 $widget->{w} = $w; 4162 $widget->{w} = $w;
3162 $widget->{h} = $h; 4163 $widget->{h} = $h;
3163 4164
3164 $widget->emit (size_allocate => $w, $h, $changed); 4165 $widget->emit (size_allocate => $w, $h);
4166 }
3165 } 4167 }
3166 } 4168 }
3167 4169
3168 while ($self->{post_alloc_hook}) { 4170 while ($self->{post_alloc_hook}) {
3169 $_->() 4171 $_->()
3170 for values %{delete $self->{post_alloc_hook}}; 4172 for values %{delete $self->{post_alloc_hook}};
3171 } 4173 }
4174
3172 4175
3173 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4176 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3174 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4177 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3175 glClear GL_COLOR_BUFFER_BIT; 4178 glClear GL_COLOR_BUFFER_BIT;
3176 4179
… …
3178 glLoadIdentity; 4181 glLoadIdentity;
3179 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4182 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3180 glMatrixMode GL_MODELVIEW; 4183 glMatrixMode GL_MODELVIEW;
3181 glLoadIdentity; 4184 glLoadIdentity;
3182 4185
4186 {
4187 package CFPlus::UI::Base;
4188
4189 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4190 (0, 0, $self->{w}, $self->{h});
4191
3183 $self->_draw; 4192 $self->_draw;
4193 }
3184} 4194}
3185 4195
3186############################################################################# 4196#############################################################################
3187 4197
3188package CFClient::UI; 4198package CFPlus::UI;
3189 4199
3190$ROOT = new CFClient::UI::Root; 4200$ROOT = new CFPlus::UI::Root;
3191$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4201$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3192 4202
31931 42031
3194 4204

Diff Legend

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