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

Diff Legend

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