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.385 by root, Fri Jul 20 16:32:17 2007 UTC

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

Diff Legend

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