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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.238 by root, Thu May 25 21:48:22 2006 UTC vs.
Revision 1.402 by root, Sat Jul 21 20:49:44 2007 UTC

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

Diff Legend

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