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

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

Diff Legend

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