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.238 by root, Thu May 25 21:48:22 2006 UTC vs.
Revision 1.400 by root, Sat Jul 21 16:15:03 2007 UTC

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

Diff Legend

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