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

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

Diff Legend

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