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.234 by root, Thu May 25 16:24:44 2006 UTC vs.
Revision 1.397 by root, Sat Jul 21 14:01:35 2007 UTC

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

Diff Legend

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