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

Diff Legend

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