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

Diff Legend

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