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

Diff Legend

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