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

Diff Legend

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