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

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

Diff Legend

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