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

Diff Legend

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