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

Diff Legend

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