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.220 by root, Mon May 22 03:28:55 2006 UTC vs.
Revision 1.388 by root, Fri Jul 20 18:30:03 2007 UTC

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

Diff Legend

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