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

Diff Legend

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