ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.255 by root, Mon May 29 02:01:56 2006 UTC vs.
Revision 1.371 by root, Sun Jul 15 22:07:48 2007 UTC

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

Diff Legend

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