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.40 by root, Sun Apr 9 21:41:11 2006 UTC vs.
Revision 1.104 by elmex, Fri Apr 14 14:02:52 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6use List::Util ();
7
8use CFClient;
9
10our ($FOCUS, $HOVER, $GRAB); # various widgets
11
12our $TOPLEVEL;
13our $BUTTON_STATE;
14
15# class methods for events
16sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS;
18}
19
20sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS;
22}
23
24sub feed_sdl_button_down_event {
25 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27
28 if (!$BUTTON_STATE) {
29 my $widget = $TOPLEVEL->find_widget ($x, $y);
30
31 $GRAB = $widget;
32 $GRAB->update if $GRAB;
33 }
34
35 $BUTTON_STATE |= 1 << ($ev->button - 1);
36
37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
38}
39
40sub feed_sdl_button_up_event {
41 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
45
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
47
48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
49
50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab;
53 $GRAB->update if $GRAB;
54 }
55}
56
57sub feed_sdl_motion_event {
58 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
62
63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget;
65
66 $hover->update if $hover;
67 $HOVER->update if $HOVER;
68 }
69
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
71}
72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
6 78
7use SDL::OpenGL; 79use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9
10our $FOCUS; # the widget with current focus
11
12# class methods for events
13sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
14sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
15sub feed_sdl_button_down_event { }
16sub feed_sdl_button_up_event { }
17 80
18sub new { 81sub new {
19 my $class = shift; 82 my $class = shift;
20 83
21 bless { @_ }, $class 84 my $self = bless {
85 x => 0,
86 y => 0,
87 z => 0,
88 w => -1,
89 h => -1,
90 @_
91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
22} 100}
23 101
24sub move { 102sub move {
25 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
26 $self->{x} = $x; 104 $self->{x} = $x;
… …
35sub size_request { 113sub size_request {
36 require Carp; 114 require Carp;
37 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
38} 116}
39 117
40sub size_allocate { 118sub _size_allocate {
41 my ($self, $w, $h) = @_; 119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = $x;
122 $self->{y} = $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
42 125
43 $self->{w} = $w; 126 $self->{w} = $w;
44 $self->{h} = $h; 127 $self->{h} = $h;
128
129 1
130}
131
132sub size_allocate {
133 my ($self, $x, $y, $w, $h) = @_;
134
135 $self->_size_allocate ($x, $y, $w, $h);
136}
137
138# translate global coordinates to local coordinate system
139sub translate {
140 my ($self, $x, $y) = @_;
141
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
45} 143}
46 144
47sub focus_in { 145sub focus_in {
48 my ($widget) = @_; 146 my ($self) = @_;
49 $FOCUS = $widget; 147
148 return if $FOCUS == $self;
149 return unless $self->{can_focus};
150
151 my $focus = $FOCUS; $FOCUS = $self;
152 $focus->update if $focus;
153 $FOCUS->update;
50} 154}
51 155
52sub focus_out { 156sub focus_out {
53 my ($widget) = @_; 157 my ($self) = @_;
54}
55 158
159 return unless $FOCUS == $self;
160
161 my $focus = $FOCUS; undef $FOCUS;
162 $focus->update if $focus; #?
163}
164
165sub mouse_motion { }
166sub button_up { }
56sub key_down { 167sub key_down { }
57 my ($widget, $sdlev) = @_;
58}
59
60sub key_up { 168sub key_up { }
61 my ($widget, $sdlev) = @_;
62}
63 169
64sub button_down { 170sub button_down {
65 my ($widget, $sdlev) = @_; 171 my ($self, $ev, $x, $y) = @_;
66}
67 172
68sub button_up { 173 $self->focus_in;
69 my ($widget, $sdlev) = @_;
70} 174}
71 175
72sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 176sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
73sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 177sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
74sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 178sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
75sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 179sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
76sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 180sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
77 181
78sub draw { 182sub draw {
79 my ($self) = @_; 183 my ($self) = @_;
184
185 return unless $self->{h} && $self->{w};
80 186
81 glPushMatrix; 187 glPushMatrix;
82 glTranslate $self->{x}, $self->{y}, 0; 188 glTranslate $self->{x}, $self->{y}, 0;
83 $self->_draw; 189 $self->_draw;
84 glPopMatrix; 190 glPopMatrix;
191
192 if ($self == $HOVER && $self->{can_hover}) {
193 my ($x, $y) = @$self{qw(x y)};
194
195 glColor 0, 0, 1, 0.2;
196 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
198 glBegin GL_QUADS;
199 glVertex $x , $y;
200 glVertex $x + $self->{w}, $y;
201 glVertex $x + $self->{w}, $y + $self->{h};
202 glVertex $x , $y + $self->{h};
203 glEnd;
204 glDisable GL_BLEND;
205 }
85} 206}
86 207
87sub _draw { 208sub _draw {
88 my ($self) = @_; 209 my ($self) = @_;
89 210
90 warn "no draw defined for $self\n"; 211 warn "no draw defined for $self\n";
91}
92
93sub bbox {
94 my ($self) = @_;
95 my ($w, $h) = $self->size_request;
96 (
97 $self->{x},
98 $self->{y},
99 $self->{x} = $w,
100 $self->{y} = $h
101 )
102} 212}
103 213
104sub find_widget { 214sub find_widget {
105 my ($self, $x, $y) = @_; 215 my ($self, $x, $y) = @_;
106 216
… …
109 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 219 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
110 220
111 () 221 ()
112} 222}
113 223
114sub del_parent { $_[0]->{parent} = undef }
115
116sub set_parent { 224sub set_parent {
117 my ($self, $par) = @_; 225 my ($self, $par) = @_;
118 226
119 $self->{parent} = $par; 227 $self->{parent} = $par;
120 Scalar::Util::weaken $self->{parent}; 228 Scalar::Util::weaken $self->{parent};
… …
129 237
130 $self->{parent}->update 238 $self->{parent}->update
131 if $self->{parent}; 239 if $self->{parent};
132} 240}
133 241
242sub connect {
243 my ($self, $signal, $cb) = @_;
244
245 push @{ $self->{cb}{$signal} }, $cb;
246}
247
248sub emit {
249 my ($self, $signal, @args) = @_;
250
251 $_->($self, @args)
252 for @{$self->{cb}{$signal} || []};
253}
254
134sub DESTROY { 255sub DESTROY {
135 my ($self) = @_; 256 my ($self) = @_;
136 257
137 #$self->deactivate; 258 #$self->deactivate;
138} 259}
139 260
140############################################################################# 261#############################################################################
141 262
142package Crossfire::Client::Widget::Container; 263package CFClient::UI::DrawBG;
143 264
144our @ISA = Crossfire::Client::Widget::; 265our @ISA = CFClient::UI::Base::;
266
267use strict;
268use SDL::OpenGL;
145 269
146sub new { 270sub new {
271 my $class = shift;
272
273 # range [value, low, high, page]
274
275 $class->SUPER::new (
276 bg => [0, 0, 0, 0.2],
277 active_bg => [1, 1, 1, 0.5],
278 @_
279 )
280}
281
282sub _draw {
283 my ($self) = @_;
284
285 my ($w, $h) = @$self{qw(w h)};
286
287 glEnable GL_BLEND;
288 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
289 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
290
291 glBegin GL_QUADS;
292 glVertex 0 , 0;
293 glVertex 0 , $h;
294 glVertex $w, $h;
295 glVertex $w, 0;
296 glEnd;
297
298 glDisable GL_BLEND;
299}
300
301#############################################################################
302
303package CFClient::UI::Empty;
304
305our @ISA = CFClient::UI::Base::;
306
307sub size_request {
308 (0, 0)
309}
310
311sub draw { }
312
313#############################################################################
314
315package CFClient::UI::Container;
316
317our @ISA = CFClient::UI::Base::;
318
319sub new {
147 my ($class, @widgets) = @_; 320 my ($class, %arg) = @_;
148 321
322 my $children = delete $arg{children} || [];
323
149 my $self = $class->SUPER::new (children => []); 324 my $self = $class->SUPER::new (children => [], %arg);
150 $self->add ($_) for @widgets; 325 $self->add ($_) for @$children;
151 326
152 $self 327 $self
153} 328}
154 329
155sub add { 330sub add {
156 my ($self, $chld, $expand) = @_; 331 my ($self, $chld) = @_;
157 332
158 $chld->{expand} = $expand;
159 $chld->set_parent ($self); 333 $chld->set_parent ($self);
160 334
161 @{$self->{children}} = 335 $self->{children} = [
162 sort { $a->{z} <=> $b->{z} } 336 sort { $a->{z} <=> $b->{z} }
163 @{$self->{children}}, $chld; 337 @{$self->{children}}, $chld
338 ];
164 339
165 $self->size_allocate ($self->{w}, $self->{h}); 340 $self->{w} = $self->{h} = -1;
341 $self->update;
166} 342}
167 343
168sub remove { 344sub remove {
169 my ($self, $widget) = @_; 345 my ($self, $widget) = @_;
170 346
171 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
172 348
173 $self->size_allocate ($self->{w}, $self->{h}); 349 $self->size_allocate (0, 0, $self->{w}, $self->{h});
174} 350}
175 351
176sub find_widget { 352sub find_widget {
177 my ($self, $x, $y) = @_; 353 my ($self, $x, $y) = @_;
178 354
355 $x -= $self->{x};
356 $y -= $self->{y};
357
179 my $res; 358 my $res;
180 359
181 for (@{ $self->{children} }) { 360 for (reverse @{ $self->{children} }) {
182 $res = $_->find_widget ($x, $y) 361 $res = $_->find_widget ($x, $y)
183 and return $res; 362 and return $res;
184 } 363 }
185 364
365 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
366}
367
368sub _draw {
369 my ($self) = @_;
370
371 $_->draw for @{$self->{children}};
372}
373
374#############################################################################
375
376package CFClient::UI::Bin;
377
378our @ISA = CFClient::UI::Container::;
379
380sub new {
381 my ($class, %arg) = @_;
382
383 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
384
385 $class->SUPER::new (children => [$child], %arg)
386}
387
388sub add {
389 my ($self, $widget) = @_;
390
391 $self->{children} = [];
186 () 392
393 $self->SUPER::add ($widget);
187} 394}
395
396sub remove {
397 my ($self, $widget) = @_;
398
399 $self->SUPER::remove ($widget);
400
401 $self->{children} = [new CFClient::UI::Empty]
402 unless @{$self->{children}};
403}
404
405sub child { $_[0]->{children}[0] }
188 406
189sub size_request { 407sub size_request {
190 my ($self) = @_;
191
192 my ($hs, $ws) = (0, 0);
193 for (@{$self->{children} || []}) {
194 my ($w, $h) = $_->size_request;
195 $hs += $h;
196 if ($ws < $w) { $ws = $w }
197 }
198
199 return ($ws, $hs);
200}
201
202sub _draw {
203 my ($self) = @_;
204
205 $_->draw for @{$self->{children}};
206}
207
208#############################################################################
209
210package Crossfire::Client::Widget::Bin;
211
212our @ISA = Crossfire::Client::Widget::Container::;
213
214sub child { $_[0]->{children}[0] }
215
216sub size_request {
217 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 408 $_[0]{children}[0]->size_request
218} 409}
219 410
220sub size_allocate { 411sub size_allocate {
221 my ($self, $w, $h) = @_; 412 my ($self, $x, $y, $w, $h) = @_;
222 $self->SUPER::size_allocate ($w, $h); 413
414 $self->_size_allocate ($x, $y, $w, $h) or return;
415
223 $self->{children}[0]->size_allocate ($w, $h) 416 $self->{children}[0]->size_allocate (0, 0, $w, $h);
224 if $self->{children}[0]
225} 417}
226 418
227############################################################################# 419#############################################################################
228 420
229package Crossfire::Client::Widget::Toplevel; 421package CFClient::UI::Window;
230 422
231our @ISA = Crossfire::Client::Widget::Container::; 423our @ISA = CFClient::UI::Bin::;
424
425use SDL::OpenGL;
426
427sub new {
428 my ($class, %arg) = @_;
429
430 my $self = $class->SUPER::new (%arg);
431}
232 432
233sub update { 433sub update {
234 my ($self) = @_; 434 my ($self) = @_;
235 435
236 ::refresh (); 436 # we want to do this delayed...
237}
238
239#############################################################################
240
241package Crossfire::Client::Widget::Window;
242
243our @ISA = Crossfire::Client::Widget::Bin::;
244
245use SDL::OpenGL;
246
247sub add {
248 my ($self, $chld) = @_;
249 warn "ADD $chld\n";
250 $self->SUPER::add ($chld);
251 $chld->set_parent ($self);
252}
253
254sub remove {
255 my ($self) = @_;
256 # TODO FIXME: removing a child from a window will crash, see render_chld
257 # $self->update;
258}
259
260sub update {
261 my ($self) = @_;
262 $self->render_chld; 437 $self->render_chld;
438 $self->SUPER::update;
263} 439}
264 440
265sub render_chld { 441sub render_chld {
266 my ($self) = @_; 442 my ($self) = @_;
267 my $chld = $self->get;
268 my ($w, $h) = $self->size_request;
269 443
270 require Carp;
271 Carp::cluck "RENDERCHI $w $h";
272 warn "RENDERCHI $w $h\n";
273 $self->{texture} = 444 $self->{texture} =
274 Crossfire::Client::Texture->new_from_opengl ( 445 CFClient::Texture->new_from_opengl (
275 $w, $h, sub { $chld->draw } 446 $self->{w}, $self->{h}, sub { $self->child->draw }
276 ); 447 );
277 $self->{texture}->upload;
278}
279
280sub size_request {
281 my ($self) = @_;
282 ($self->w, $self->h)
283} 448}
284 449
285sub size_allocate { 450sub size_allocate {
286 my ($self, $w, $h) = @_; 451 my ($self, $x, $y, $w, $h) = @_;
287 452
288 $self->w ($w); 453 $self->_size_allocate ($x, $y, $w, $h) or return;
289 $self->h ($h); 454
290 $self->get->size_allocate ($w, $h); 455 $self->child->size_allocate (0, 0, $w, $h);
291 456
292 $self->update; #TODO: Move this to the size_request event propably? 457 $self->render_chld;
293} 458}
294 459
295sub _draw { 460sub _draw {
296 my ($self) = @_; 461 my ($self) = @_;
297 462
… …
299 464
300 my $tex = $self->{texture} 465 my $tex = $self->{texture}
301 or return; 466 or return;
302 467
303 glEnable GL_BLEND; 468 glEnable GL_BLEND;
469 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
304 glEnable GL_TEXTURE_2D; 470 glEnable GL_TEXTURE_2D;
305 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
306 glBindTexture GL_TEXTURE_2D, $tex->{name};
307 472
308 glBegin GL_QUADS; 473 $tex->draw_quad (0, 0, $w, $h);
309 glTexCoord 0, 0; glVertex 0, 0;
310 glTexCoord 0, 1; glVertex 0, $h;
311 glTexCoord 1, 1; glVertex $w, $h;
312 glTexCoord 1, 0; glVertex $w, 0;
313 glEnd;
314 474
315 glDisable GL_BLEND; 475 glDisable GL_BLEND;
316 glDisable GL_TEXTURE_2D; 476 glDisable GL_TEXTURE_2D;
317} 477}
318 478
319############################################################################# 479#############################################################################
320 480
321package Crossfire::Client::Widget::Frame; 481package CFClient::UI::Frame;
322 482
323our @ISA = Crossfire::Client::Widget::Bin::; 483our @ISA = CFClient::UI::Bin::;
324 484
325use SDL::OpenGL; 485use SDL::OpenGL;
326 486
327sub size_request { 487sub size_request {
328 my ($self) = @_; 488 my ($self) = @_;
… …
333 493
334 map { $_ + 4 } $chld->size_request; 494 map { $_ + 4 } $chld->size_request;
335} 495}
336 496
337sub size_allocate { 497sub size_allocate {
338 my ($self, $w, $h) = @_; 498 my ($self, $x, $y, $w, $h) = @_;
499
500 $self->_size_allocate ($x, $y, $w, $h) or return;
339 501
340 $self->w ($w);
341 $self->h ($h);
342
343 $self->child->size_allocate ($w - 4, $h - 4); 502 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
344 $self->child->move (2, 2);
345} 503}
346 504
347sub _draw { 505sub _draw {
348 my ($self) = @_; 506 my ($self) = @_;
349 507
… …
351 509
352 my ($w, $h) = $chld->size_request; 510 my ($w, $h) = $chld->size_request;
353 511
354 glBegin GL_QUADS; 512 glBegin GL_QUADS;
355 glColor 0, 0, 0; 513 glColor 0, 0, 0;
356 glTexCoord 0, 0; glVertex 0 , 0; 514 glVertex 0 , 0;
357 glTexCoord 0, 1; glVertex 0 , $h + 4; 515 glVertex 0 , $h + 4;
358 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 516 glVertex $w + 4 , $h + 4;
359 glTexCoord 1, 0; glVertex $w + 4 , 0; 517 glVertex $w + 4 , 0;
360 glEnd; 518 glEnd;
361 519
362 $chld->draw; 520 $chld->draw;
363} 521}
364 522
365############################################################################# 523#############################################################################
366 524
367package Crossfire::Client::Widget::FancyFrame; 525package CFClient::UI::FancyFrame;
368 526
369our @ISA = Crossfire::Client::Widget::Frame::; 527our @ISA = CFClient::UI::Bin::;
370 528
371use SDL::OpenGL; 529use SDL::OpenGL;
372 530
531my @tex =
532 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
533 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
534
373sub new { 535sub new {
536 my $class = shift;
537
538 # TODO: user_x, user_y, overwrite moveto?
539
540 $class->SUPER::new (
541 bg => [1, 1, 1, 1],
542 border_bg => [1, 1, 1, 1],
543 border => $::FONTSIZE * 0.8,
544 @_
545 )
546}
547
548sub size_request {
374 my ($self, $theme) = @_; 549 my ($self) = @_;
550
551 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
552
553 my ($w, $h) = $self->SUPER::size_request;
554
555 (
556 $w + $self->{border} * 2,
557 $h + $self->{border} * 2,
558 )
559}
560
561sub size_allocate {
562 my ($self, $x, $y, $w, $h) = @_;
563
564 $self->_size_allocate ($x, $y, $w, $h) or return;
565
566 $h -= List::Util::max 0, $self->{border} * 2;
567 $w -= List::Util::max 0, $self->{border} * 2;
568
569 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
570}
571
572sub button_down {
573 my ($self, $ev, $x, $y) = @_;
574
575 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
576 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
577
578 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
579 my ($bw, $bh) = ($self->{w}, $self->{h});
580
581 $self->{motion} = sub {
582 my ($ev, $x, $y) = @_;
583
584 ($x, $y) = ($ev->motion_x, $ev->motion_y);
585
586 $self->{user_w} = $bw + $x - $ox;
587 $self->{user_h} = $bh + $y - $oy;
588 $self->update;
589 };
590
591 } elsif ($x >= 0 && $x < $self->{w}
592 && $y >= 0 && $y < $self->{border}) {
593
594 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
595 my ($bx, $by) = ($self->{x}, $self->{y});
596
597 $self->{motion} = sub {
598 my ($ev, $x, $y) = @_;
599
600 ($x, $y) = ($ev->motion_x, $ev->motion_y);
601
602 $self->move ($bx + $x - $ox, $by + $y - $oy);
603 $self->update;
604 };
605 }
606}
607
608sub button_up {
609 my ($self, $ev, $x, $y) = @_;
610
611 delete $self->{motion};
612}
613
614sub mouse_motion {
615 my ($self, $ev, $x, $y) = @_;
616
617 $self->{motion}->($ev, $x, $y) if $self->{motion};
618}
619
620sub _draw {
621 my ($self) = @_;
622
623 my ($w, $h ) = ($self->{w}, $self->{h});
624 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
625
626 glEnable GL_BLEND;
627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
628 glEnable GL_TEXTURE_2D;
629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
630
631 glColor @{ $self->{border_bg} };
632 $tex[1]->draw_quad (0, 0, $w, $self->{border});
633 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
634 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
635 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
636
637 my $bg = $tex[0];
638
639 # TODO: repeat texture not scale
640 my $rep_x = $cw / $bg->{w};
641 my $rep_y = $ch / $bg->{h};
642
643 glColor @{ $self->{bg} };
644
645 $bg->{s} = $rep_x;
646 $bg->{t} = $rep_y;
647 $bg->{wrap_mode} = 1;
648 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
649
650 glDisable GL_TEXTURE_2D;
651 glDisable GL_BLEND;
652
653 $self->child->draw;
654}
655
656#############################################################################
657
658package CFClient::UI::Table;
659
660our @ISA = CFClient::UI::Base::;
661
662use List::Util qw(max sum);
663
664use SDL::OpenGL;
665
666sub new {
667 my $class = shift;
668
669 $class->SUPER::new (
670 col_expand => [],
671 @_
672 )
673}
674
675sub add {
676 my ($self, $x, $y, $chld) = @_;
677
678 $self->{children}[$y][$x] = $chld;
679 $chld->set_parent ($self);
680
681 $self->{w} = $self->{h} = -1;
682 $self->update;
683}
684
685sub get_wh {
686 my ($self) = @_;
687
688 my (@w, @h);
689
690 for my $y (0 .. $#{$self->{children}}) {
691 my $row = $self->{children}[$y]
692 or next;
693
694 for my $x (0 .. $#$row) {
695 my $widget = $row->[$x]
696 or next;
697 my ($w, $h) = $widget->size_request;
698
699 $w[$x] = max $w[$x], $w;
700 $h[$y] = max $h[$y], $h;
701 }
702 }
703
704 (\@w, \@h)
705}
706
707sub size_request {
708 my ($self) = @_;
709
710 my ($ws, $hs) = $self->get_wh;
711
712 (
713 (sum @$ws),
714 (sum @$hs),
715 )
716}
717
718sub size_allocate {
719 my ($self, $x, $y, $w, $h) = @_;
720
721 $self->_size_allocate ($x, $y, $w, $h) or return;
722
723 my ($ws, $hs) = $self->get_wh;
724
725 my $req_w = sum @$ws;
726 my $req_h = sum @$hs;
727
728 # TODO: nicer code && do row_expand
729 my @col_expand = @{$self->{col_expand}};
730 @col_expand = (1) x @$ws unless @col_expand;
731 my $col_expand = (sum @col_expand) || 1;
732
733 # linearly scale sizes
734 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
735 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
736
737 my $y;
738
739 for my $r (0 .. $#{$self->{children}}) {
740 my $row = $self->{children}[$r]
741 or next;
742
743 my $x = 0;
744 my $row_h = $hs->[$r];
745
746 for my $c (0 .. $#$row) {
747 my $col_w = $ws->[$c];
748
749 if (my $widget = $row->[$c]) {
750 $widget->size_allocate ($x, $y, $col_w, $row_h);
751 }
752
753 $x += $col_w;
754 }
755
756 $y += $row_h;
757 }
758
759}
760
761sub find_widget {
762 my ($self, $x, $y) = @_;
763
764 $x -= $self->{x};
765 $y -= $self->{y};
766
767 my $res;
768
769 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
770 $res = $_->find_widget ($x, $y)
771 and return $res;
772 }
773
774 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
775}
776
777sub _draw {
778 my ($self) = @_;
779
780 for (grep $_, @{$self->{children}}) {
781 $_->draw for grep $_, @$_;
782 }
783}
784
785#############################################################################
786
787package CFClient::UI::HBox;
788
789# TODO: wrap into common Box base class
790
791our @ISA = CFClient::UI::Container::;
792
793sub size_request {
794 my ($self) = @_;
795
796 my @alloc = map [$_->size_request], @{$self->{children}};
797
798 (
799 (List::Util::sum map $_->[0], @alloc),
800 (List::Util::max map $_->[1], @alloc),
801 )
802}
803
804sub size_allocate {
805 my ($self, $x, $y, $w, $h) = @_;
806
807 $self->_size_allocate ($x, $y, $w, $h);
808
809 ($h, $w) = ($w, $h);
810
811 my $children = $self->{children};
812
813 my @h = map +($_->size_request)[0], @$children;
814
815 my $req_h = List::Util::sum @h;
816
817 if ($req_h > $h) {
818 # ah well, not enough space
819 $_ *= $h / $req_h for @h;
820 } else {
821 my $exp = List::Util::sum map $_->{expand}, @$children;
822 $exp ||= 1;
823
824 for (0 .. $#$children) {
825 my $child = $children->[$_];
826
827 my $alloc_h = $h[$_];
828 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
829 $h[$_] = $alloc_h;
830 }
831 }
832
833 my $y = 0;
834 for (0 .. $#$children) {
835 my $child = $children->[$_];
836 my $h = $h[$_];
837 $child->size_allocate ($y, 0, $h, $w);
838
839 $y += $h;
840 }
841}
842
843#############################################################################
844
845package CFClient::UI::VBox;
846
847# TODO: wrap into common Box base class
848
849our @ISA = CFClient::UI::Container::;
850
851sub size_request {
852 my ($self) = @_;
853
854 my @alloc = map [$_->size_request], @{$self->{children}};
855
856 (
857 (List::Util::max map $_->[0], @alloc),
858 (List::Util::sum map $_->[1], @alloc),
859 )
860}
861
862sub size_allocate {
863 my ($self, $x, $y, $w, $h) = @_;
864
865 $self->_size_allocate ($x, $y, $w, $h);
866
867 my $children = $self->{children};
868
869 my @h = map +($_->size_request)[1], @$children;
870
871 my $req_h = List::Util::sum @h;
872
873 if ($req_h > $h) {
874 # ah well, not enough space
875 $_ *= $h / $req_h for @h;
876 } else {
877 my $exp = List::Util::sum map $_->{expand}, @$children;
878 $exp ||= 1;
879
880 for (0 .. $#$children) {
881 my $child = $children->[$_];
882
883 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
884 }
885 }
886
887 my $y = 0;
888 for (0 .. $#$children) {
889 my $child = $children->[$_];
890 my $h = $h[$_];
891 $child->size_allocate (0, $y, $w, $h);
892
893 $y += $h;
894 }
895}
896
897#############################################################################
898
899package CFClient::UI::Label;
900
901our @ISA = CFClient::UI::Base::;
902
903use SDL::OpenGL;
904
905sub new {
906 my ($class, %arg) = @_;
907
375 $self = $self->SUPER::new; 908 my $self = $class->SUPER::new (
376 909 fg => [1, 1, 1],
377 $self->{txts} = [ 910 height => $::FONTSIZE,
378 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 911 text => "",
379 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png) 912 align => -1,
913 padding => 2,
914 layout => new CFClient::Layout,
915 %arg
380 ]; 916 );
917
918 $self->set_text ($self->{text});
919
381 $self 920 $self
382} 921}
383 922
923sub escape_text {
924 local $_ = $_[1];
925
926 s/&/&amp;/g;
927 s/>/&gt;/g;
928 s/</&lt;/g;
929
930 $_[1]
931}
932
933sub set_text {
934 my ($self, $text) = @_;
935
936 $self->{text} = $text;
937 $self->{layout}->set_markup ($text);
938
939 delete $self->{texture};
940# $self->{w} = $self->{h} = -1;
941 $self->update;
942}
943
944sub get_text {
945 my ($self, $text) = @_;
946
947 $self->{text}
948}
949
384sub size_request { 950sub size_request {
385 my ($self) = @_; 951 my ($self) = @_;
386 952
953 $self->{layout}->set_width;
954 $self->{layout}->set_height ($self->{height});
955 my ($w, $h) = $self->{layout}->size;
956
957 (
958 $w + $self->{padding} * 2,
959 $h + $self->{padding} * 2,
960 )
961}
962
963sub size_allocate {
964 my ($self, $x, $y, $w, $h) = @_;
965
966 $self->_size_allocate ($x, $y, $w, $h) or return;
967
968 delete $self->{texture};
969}
970
971sub update {
972 my ($self) = @_;
973
974 delete $self->{texture};
975 $self->SUPER::update;
976}
977
978sub _draw {
979 my ($self) = @_;
980
981 my $tex = $self->{texture} ||= do {
982 $self->{layout}->set_width ($self->{w});
983 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
984 new_from_layout CFClient::Texture $self->{layout}
985 };
986
987 glEnable GL_BLEND;
988 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
989 glEnable GL_TEXTURE_2D;
990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
991
992 glColor @{$self->{fg}};
993
994 my $x =
995 $self->{align} < 0 ? $self->{padding}
996 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
997 : ($self->{w} - $tex->{w}) * 0.5;
998
999 glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
1000 $tex->draw_quad (0, 0);
1001
1002 glDisable GL_TEXTURE_2D;
1003 glDisable GL_BLEND;
1004}
1005
1006#############################################################################
1007
1008package CFClient::UI::Entry;
1009
1010our @ISA = CFClient::UI::Label::;
1011
1012use SDL;
1013use SDL::OpenGL;
1014
1015sub new {
1016 my $class = shift;
1017
1018 $class->SUPER::new (
1019 fg => [1, 1, 1],
1020 bg => [0, 0, 0, 0.2],
1021 active_bg => [1, 1, 1, 0.5],
1022 active_fg => [0, 0, 0],
1023 can_hover => 1,
1024 can_focus => 1,
1025 @_
1026 )
1027}
1028
1029sub _set_text {
1030 my ($self, $text) = @_;
1031
1032 my $old_text = $self->{text};
1033
1034 $self->{last_activity} = $::NOW;
1035
1036 $self->{text} = $text;
1037 $self->{layout}->set_width ($self->{w});
1038 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1039
1040 $text =~ s/./*/g if $self->{hidden};
1041
1042 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1043
1044 $text = substr $text, 0, $self->{cursor};
1045 utf8::encode $text;
1046
1047 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1048
1049 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1050 if $old_text ne $self->{text};
1051}
1052
1053sub size_request {
1054 my ($self) = @_;
1055
387 my ($w, $h) = $self->SUPER::size_request; 1056 my ($w, $h) = $self->SUPER::size_request;
388 1057
389 $h += $self->{txts}->[1]->{height}; 1058 ($w + 1, $h) # add 1 for cursor
390 $h += $self->{txts}->[4]->{height};
391 $w += $self->{txts}->[2]->{width};
392 $w += $self->{txts}->[3]->{width};
393
394 ($w, $h)
395} 1059}
396 1060
397sub size_allocate { 1061sub size_allocate {
398 my ($self, $w, $h) = @_; 1062 my ($self, $x, $y, $w, $h) = @_;
399 1063
400 $self->SUPER::size_allocate ($w, $h); 1064 $self->SUPER::size_allocate ($x, $y, $w, $h);
401 1065
402 $h -= $self->{txts}->[1]->{height}; 1066 $self->_set_text ($self->{text});
403 $h -= $self->{txts}->[4]->{height}; 1067}
404 $w -= $self->{txts}->[2]->{width};
405 $w -= $self->{txts}->[3]->{width};
406 1068
407 $h = $h < 0 ? 0 : $h; 1069sub set_text {
408 $w = $w < 0 ? 0 : $w; 1070 my ($self, $text) = @_;
409 warn "CHILD:$w $h\n"; 1071
410 $self->child->size_allocate ($w, $h); 1072 $self->{cursor} = length $text;
411 $self->child->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); 1073 $self->_set_text ($text);
1074 $self->update;
1075}
1076
1077sub key_down {
1078 my ($self, $ev) = @_;
1079
1080 my $mod = $ev->key_mod;
1081 my $sym = $ev->key_sym;
1082
1083 my $uni = $ev->key_unicode;
1084
1085 my $text = $self->get_text;
1086
1087 if ($sym == SDLK_BACKSPACE) {
1088 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1089 } elsif ($sym == SDLK_DELETE) {
1090 substr $text, $self->{cursor}, 1, "";
1091 } elsif ($sym == SDLK_LEFT) {
1092 --$self->{cursor} if $self->{cursor};
1093 } elsif ($sym == SDLK_RIGHT) {
1094 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1095 } elsif ($sym == SDLK_HOME) {
1096 $self->{cursor} = 0;
1097 } elsif ($sym == SDLK_END) {
1098 $self->{cursor} = length $text;
1099 } elsif ($sym == SDLK_ESCAPE) {
1100 $self->emit ('escape');
1101 } elsif ($uni) {
1102 substr $text, $self->{cursor}++, 0, chr $uni;
1103 }
1104
1105 $self->_set_text ($text);
1106 $self->update;
1107}
1108
1109sub focus_in {
1110 my ($self) = @_;
1111
1112 $self->{last_activity} = $::NOW;
1113
1114 $self->SUPER::focus_in;
1115}
1116
1117sub button_down {
1118 my ($self, $ev, $x, $y) = @_;
1119
1120 $self->SUPER::button_down ($ev, $x, $y);
1121
1122 my $idx = $self->{layout}->xy_to_index ($x, $y);
1123
1124 # byte-index to char-index
1125 my $text = $self->{text};
1126 utf8::encode $text;
1127 $self->{cursor} = length substr $text, 0, $idx;
1128
1129 $self->_set_text ($self->{text});
1130 $self->update;
1131}
1132
1133sub mouse_motion {
1134 my ($self, $ev, $x, $y) = @_;
1135# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
412} 1136}
413 1137
414sub _draw { 1138sub _draw {
415 my ($self) = @_; 1139 my ($self) = @_;
416 1140
417 my ($w, $h) = ($self->w, $self->h); 1141 local $self->{fg} = $self->{fg};
418 my ($cw, $ch) = ($self->child->w, $self->child->h); 1142
1143 if ($FOCUS == $self) {
1144 glColor @{$self->{active_bg}};
1145 $self->{fg} = $self->{active_fg};
1146 } else {
1147 glColor @{$self->{bg}};
1148 }
1149
1150 glEnable GL_BLEND;
1151 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1152 glBegin GL_QUADS;
1153 glVertex 0 , 0;
1154 glVertex 0 , $self->{h};
1155 glVertex $self->{w}, $self->{h};
1156 glVertex $self->{w}, 0;
1157 glEnd;
1158 glDisable GL_BLEND;
1159
1160 $self->SUPER::_draw;
1161
1162 #TODO: force update every cursor change :(
1163 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1164 glColor @{$self->{fg}};
1165 glBegin GL_LINES;
1166 glVertex $self->{cur_x}, $self->{cur_y};
1167 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1168 glEnd;
1169 }
1170}
1171
1172package CFClient::UI::LineEntry;
1173
1174our @ISA = CFClient::UI::Entry::;
1175
1176use SDL;
1177use SDL::OpenGL;
1178
1179sub key_down {
1180 my ($self, $ev) = @_;
1181
1182 my $sym = $ev->key_sym;
1183
1184 if ($sym == SDLK_RETURN) {
1185 $self->emit (activate => $self->get_text);
1186 $self->update;
1187
1188 } else {
1189 $self->SUPER::key_down ($ev);
1190 }
1191
1192}
1193
1194#############################################################################
1195
1196package CFClient::UI::Button;
1197
1198our @ISA = CFClient::UI::Label::;
1199
1200use SDL;
1201use SDL::OpenGL;
1202
1203my @tex =
1204 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1205 qw(b1_button_active.png);
1206
1207sub new {
1208 my $class = shift;
1209
1210 $class->SUPER::new (
1211 padding => 4,
1212 fg => [1, 1, 1],
1213 bg => [1, 1, 1, 0.2],
1214 active_fg => [1, 1, 0],
1215 can_hover => 1,
1216 @_
1217 )
1218}
1219
1220sub button_up {
1221 my ($self, $ev, $x, $y) = @_;
1222
1223 if ($x >= 0 && $x < $self->{w}
1224 && $y >= 0 && $y < $self->{h}) {
1225 $self->emit ("activate");
1226 }
1227}
1228
1229sub _draw {
1230 my ($self) = @_;
1231
1232 local $self->{fg} = $self->{fg};
1233 my $tex = $tex[0];
419 1234
420 glEnable GL_BLEND; 1235 glEnable GL_BLEND;
421 glEnable GL_TEXTURE_2D; 1236 glEnable GL_TEXTURE_2D;
422 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1237 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1238
1239 if ($GRAB == $self) {
1240 $self->{fg} = $self->{active_fg};
1241 }
1242
1243 glBindTexture GL_TEXTURE_2D, $tex->{name};
423 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
424 1245
425 my $top = $self->{txts}->[1]; 1246 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
426 glBindTexture GL_TEXTURE_2D, $top->{name};
427 1247
428 glBegin GL_QUADS; 1248 glDisable GL_TEXTURE_2D;
429 glTexCoord 0, 0; glVertex 0 , 0;
430 glTexCoord 0, 1; glVertex 0 , $top->{height};
431 glTexCoord 1, 1; glVertex $w , $top->{height};
432 glTexCoord 1, 0; glVertex $w , 0;
433 glEnd;
434
435 my $left = $self->{txts}->[3];
436 glBindTexture GL_TEXTURE_2D, $left->{name};
437
438 glBegin GL_QUADS;
439 glTexCoord 0, 0; glVertex 0 , $top->{height};
440 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
441 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
442 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
443 glEnd;
444
445 my $right = $self->{txts}->[2];
446 glBindTexture GL_TEXTURE_2D, $right->{name};
447
448 glBegin GL_QUADS;
449 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
450 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
451 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
452 glTexCoord 1, 0; glVertex $w , $top->{height};
453 glEnd;
454
455 my $bottom = $self->{txts}->[4];
456 glBindTexture GL_TEXTURE_2D, $bottom->{name};
457
458 glBegin GL_QUADS;
459 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
460 glTexCoord 0, 1; glVertex 0 , $h;
461 glTexCoord 1, 1; glVertex $w , $h;
462 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
463 glEnd;
464
465 my $bg = $self->{txts}->[0];
466 glBindTexture GL_TEXTURE_2D, $bg->{name};
467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
469 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
470
471 my $rep_x = $cw / $bg->{width};
472 my $rep_y = $ch / $bg->{height};
473
474 glBegin GL_QUADS;
475 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
476 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
477 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
478 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
479 glEnd;
480
481 glDisable GL_BLEND; 1249 glDisable GL_BLEND;
482 glDisable GL_TEXTURE_2D;
483 1250
484 $self->child->draw; 1251 $self->SUPER::_draw;
485
486} 1252}
487 1253
488############################################################################# 1254#############################################################################
489 1255
490package Crossfire::Client::Widget::Table; 1256package CFClient::UI::CheckBox;
491 1257
492our @ISA = Crossfire::Client::Widget::Bin::; 1258our @ISA = CFClient::UI::DrawBG::;
493 1259
1260my @tex =
1261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1262 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1263
1264use SDL;
494use SDL::OpenGL; 1265use SDL::OpenGL;
495 1266
496sub add { 1267sub new {
497 my ($self, $x, $y, $chld) = @_; 1268 my $class = shift;
498 my $old_chld = $self->{children}[$y][$x];
499 1269
500 $self->{children}[$y][$x] = $chld; 1270 $class->SUPER::new (
501 $chld->set_parent ($self); 1271 padding => 2,
502 $self->update; 1272 fg => [1, 1, 1],
503} 1273 active_fg => [1, 1, 0],
504 1274 state => 0,
505sub max_row_height { 1275 can_hover => 1,
506 my ($self, $row) = @_;
507
508 my $hs = 0;
509 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
510 my $c = $self->{children}->[$row]->[$xi];
511 if ($c) {
512 my ($w, $h) = $c->size_request;
513 if ($hs < $h) { $hs = $h }
514 } 1276 @_
515 } 1277 )
516 return $hs;
517}
518
519sub max_col_width {
520 my ($self, $col) = @_;
521
522 my $ws = 0;
523 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
524 my $c = ($self->{children}->[$yi] || [])->[$col];
525 if ($c) {
526 my ($w, $h) = $c->size_request;
527 if ($ws < $w) { $ws = $w }
528 }
529 }
530 return $ws;
531} 1278}
532 1279
533sub size_request { 1280sub size_request {
534 my ($self) = @_; 1281 my ($self) = @_;
535 1282
536 my ($hs, $ws) = (0, 0); 1283 ($self->{padding} * 2 + 6) x 2
1284}
537 1285
538 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 1286sub size_allocate {
539 $hs += $self->max_row_height ($yi); 1287 my ($self, $x, $y, $w, $h) = @_;
540 }
541 1288
542 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 1289 $self->_size_allocate ($x, $y, $w, $h);
543 my $wm = 0; 1290}
544 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
545 $wm += $self->max_col_width ($xi)
546 }
547 if ($ws < $wm) { $ws = $wm }
548 }
549 1291
550 return ($ws, $hs); 1292sub button_down {
1293 my ($self, $ev, $x, $y) = @_;
1294
1295 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1296 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1297 $self->{state} = !$self->{state};
1298 $self->emit (changed => $self->{state});
1299 }
551} 1300}
552 1301
553sub _draw { 1302sub _draw {
554 my ($self) = @_; 1303 my ($self) = @_;
555 1304
556 my $y = 0; 1305 $self->SUPER::_draw;
557 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
558 my $x = 0;
559 1306
560 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 1307 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
561 1308
562 my $c = $self->{children}->[$yi]->[$xi]; 1309 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
563 if ($c) {
564 $c->move ($x, $y, 0); #TODO: Move to size_request
565 $c->draw if $c;
566 }
567 1310
568 $x += $self->max_col_width ($xi); 1311 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
569 }
570
571 $y += $self->max_row_height ($yi);
572 }
573}
574
575#############################################################################
576
577package Crossfire::Client::Widget::VBox;
578
579our @ISA = Crossfire::Client::Widget::Container::;
580
581use SDL::OpenGL;
582
583sub size_allocate {
584 my ($self, $w, $h) = @_;
585
586 $self->w ($w);
587 $self->h ($h);
588
589 my $exp;
590 my @oth;
591 # find expand widget
592 for (@{$self->{children}}) {
593 if ($_->{expand}) {
594 $exp = $_;
595 last;
596 }
597 push @oth, $_;
598 }
599
600 my ($ow, $oh);
601
602 # get sizes of other widgets
603 for (@oth) {
604 my ($w, $h) = $_->size_request;
605 $oh += $h;
606 if ($ow < $w) { $ow = $w }
607 }
608
609 my $y = 0;
610 for (@{$self->{children}}) {
611 $_->move (0, $y);
612
613 if ($_ == $exp) {
614 $_->size_allocate ($w, $h - $oh);
615 $y += $h - $oh;
616 } else {
617 my ($cw, $h) = $_->size_request;
618 $_->size_allocate ($w, $h);
619 $y += $h;
620 }
621 }
622}
623
624sub _draw {
625 my ($self) = @_;
626
627 my ($x, $y);
628 for (@{$self->{children} || []}) {
629 $_->draw;
630 $y += $_->h;
631 }
632}
633
634#############################################################################
635
636package Crossfire::Client::Widget::Label;
637
638our @ISA = Crossfire::Client::Widget::;
639
640use SDL::OpenGL;
641
642sub new {
643 my ($class, $x, $y, $z, $height, $text) = @_;
644
645 # TODO: color, and make height, xyz etc. optional
646 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
647
648 $self->set_text ($text);
649
650 $self
651}
652
653sub set_text {
654 my ($self, $text) = @_;
655
656 $self->{text} = $text;
657 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
658
659 $self->update;
660}
661
662sub get_text {
663 my ($self, $text) = @_;
664
665 $self->{text}
666}
667
668sub size_request {
669 my ($self) = @_;
670
671 (
672 $self->{texture}{width},
673 $self->{texture}{height},
674 )
675}
676
677sub _draw {
678 my ($self) = @_;
679
680 my $tex = $self->{texture};
681 1312
682 glEnable GL_BLEND; 1313 glEnable GL_BLEND;
683 glEnable GL_TEXTURE_2D; 1314 glEnable GL_TEXTURE_2D;
684 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1315 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1316
1317 my $tex = $self->{state} ? $tex[1] : $tex[0];
1318
1319 $tex->draw_quad (0, 0, $s, $s);
1320
1321 glDisable GL_TEXTURE_2D;
1322 glDisable GL_BLEND;
1323}
1324
1325#############################################################################
1326
1327package CFClient::UI::Slider;
1328
1329use strict;
1330
1331use SDL::OpenGL;
1332
1333our @ISA = CFClient::UI::DrawBG::;
1334
1335my @tex =
1336 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1337 qw(s1_slider.png s1_slider_bg.png);
1338
1339sub new {
1340 my $class = shift;
1341
1342 # range [value, low, high, page]
1343
1344 # TODO: 0-width page
1345 # TODO: req_w/h are wrong with vertical
1346 # TODO: calculations are off
1347 my $self = $class->SUPER::new (
1348 fg => [1, 1, 1],
1349 active_fg => [0, 0, 0],
1350 range => [0, 0, 100, 10],
1351 req_w => 40,
1352 req_h => 13,
1353 vertical => 0,
1354 can_hover => 1,
1355 inner_pad => 5,
1356 @_
1357 );
1358
1359 $self
1360}
1361
1362sub size_request {
1363 my ($self) = @_;
1364
1365 my $w = $self->{req_w};
1366 my $h = $self->{req_h};
1367
1368 $self->{vertical} ? ($h, $w) : ($w, $h)
1369}
1370
1371sub button_down {
1372 my ($self, $ev, $x, $y) = @_;
1373
1374 $self->SUPER::button_down ($ev, $x, $y);
1375 $self->mouse_motion ($ev, $x, $y);
1376}
1377
1378sub mouse_motion {
1379 my ($self, $ev, $x, $y) = @_;
1380
1381 if ($GRAB == $self) {
1382 my ($value, $lo, $hi, $page) = @{$self->{range}};
1383
1384 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1385
1386 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1387 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1388
1389 $x -= $inner_pad_px; # substract the padding
1390 $x = $x * ($hi - $lo) / $inner_w + $lo;
1391 $x = $lo if $x < $lo;
1392 $x = $hi - $page if $x > $hi - $page;
1393 $self->{range}[0] = $x;
1394
1395 $self->emit (changed => $x);
1396 $self->update;
1397 }
1398}
1399
1400# the inner_* stuff is for generating a padding for the slider handle,
1401# so that the handle doesn't leave the texture. This calculation isn't 100%
1402# correct propably, but it does the job for now
1403sub _calc_inner_pad_px {
1404 my ($self, $w) = @_;
1405 ($w / 100) * $self->{inner_pad} # % to pixels
1406}
1407
1408sub _draw {
1409 my ($self) = @_;
1410
1411 $self->SUPER::_draw ();
1412
1413 my ($w, $h) = @$self{qw(w h)};
1414
1415 if ($self->{vertical}) {
1416 # draw a vertical slider like a rotated horizontal slider
1417
1418 glRotate 90, 0, 0, 1;
1419 glTranslate 0, -$self->{w}, 0;
1420
1421 ($w, $h) = ($h, $w);
1422 }
1423
1424 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1425 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1426
1427 my ($value, $lo, $hi, $page) = @{$self->{range}};
1428
1429 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1430 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1431
1432 $page = int $page * $inner_w / ($hi - $lo);
1433 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1434
1435 $w -= $page;
1436 $page &= ~1;
1437 glTranslate $page * 0.5, 0, 0;
1438 $page ||= 2;
1439
1440 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1441 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1442
1443 glEnable GL_BLEND;
1444 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1445 glEnable GL_TEXTURE_2D;
685 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
686 glBindTexture GL_TEXTURE_2D, $tex->{name};
687 1447
688 glColor 1, 0, 0, 1; # TODO color 1448 # draw background
1449 $tex[1]->draw_quad (0, 0, $w, $h);
689 1450
690 glBegin GL_QUADS; 1451 # draw handle
691 glTexCoord 0, 0; glVertex 0 , 0; 1452 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
692 glTexCoord 0, 1; glVertex 0 , $tex->{height};
693 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
694 glTexCoord 1, 0; glVertex $tex->{width}, 0;
695 glEnd;
696 1453
697 glDisable GL_BLEND; 1454 glDisable GL_BLEND;
698 glDisable GL_TEXTURE_2D; 1455 glDisable GL_TEXTURE_2D;
699} 1456}
700 1457
701############################################################################# 1458#############################################################################
702 1459
703package Crossfire::Client::Widget::TextEntry; 1460package CFClient::UI::TextView;
704 1461
705our @ISA = Crossfire::Client::Widget::Label::; 1462our @ISA = CFClient::UI::HBox::;
1463
1464use SDL::OpenGL;
1465
1466sub new {
1467 my $class = shift;
1468
1469 my $self = $class->SUPER::new (
1470 par => [],
1471 @_,
1472 children => [
1473 (new CFClient::UI::Empty expand => 1),
1474 (new CFClient::UI::Slider vertical => 1),
1475 ],
1476 );
1477
1478 $self
1479}
1480
1481sub add_paragraph {
1482 my ($self, $color, $text) = @_;
1483
1484 push @{$self->{par}}, [$color, $text];
1485 my $count = scalar @{$self->{par}};
1486 $self->{children}[1]{range} = [$count - 1, 0, $count, 1];
1487 $self->{children}[1]->update;
1488}
1489
1490sub _draw {
1491 my ($self) = @_;
1492
1493 my $par = $self->{par};
1494
1495 my $bottom = (scalar @$par) - 1;
1496
1497 my $w = $self->{children}[0]{w};
1498 my $y = $self->{h};
1499
1500 glEnable GL_BLEND;
1501 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1502 glEnable GL_TEXTURE_2D;
1503 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1504
1505 # TODO: everything!
1506 while ($y > 0 && $bottom >= 0) {
1507 my $par = $par->[$bottom--];
1508
1509 my $layout = new CFClient::Layout;
1510
1511 $layout->set_height ($::FONTSIZE);
1512 $layout->set_width ($w);
1513 $layout->set_text ($par->[1]);
1514 my $tex = new_from_layout CFClient::Texture $layout;
1515 $y -= $tex->{h};
1516
1517 glColor @{ $par->[0] };
1518 $tex->draw_quad (0, $y);
1519 }
1520
1521 glDisable GL_TEXTURE_2D;
1522 glDisable GL_BLEND;
1523}
1524
1525#############################################################################
1526
1527package CFClient::UI::MapWidget;
1528
1529use strict;
1530
1531use List::Util qw(min max);
706 1532
707use SDL; 1533use SDL;
708use SDL::OpenGL; 1534use SDL::OpenGL;
709 1535
710sub key_down { 1536our @ISA = CFClient::UI::Base::;
711 my ($self, $ev) = @_;
712 1537
713 my $mod = $ev->key_mod; 1538sub new {
714 my $sym = $ev->key_sym; 1539 my $class = shift;
715 1540
716 $ev->set_unicode (1); 1541 $class->SUPER::new (
717 my $uni = $ev->key_unicode; 1542 z => -1,
718 1543 can_focus => 1,
719 my $text = $self->get_text; 1544 list => (glGenLists 1),
720 1545 @_
721 if ($sym == SDLK_BACKSPACE) {
722 substr $text, -1, 1, '';
723
724 } elsif ($uni) {
725 $text .= chr $uni;
726 } 1546 )
727 $self->set_text ($text);
728} 1547}
729
730#############################################################################
731
732package Crossfire::Client::Widget::MapWidget;
733
734use strict;
735
736use List::Util qw(min max);
737
738use SDL;
739use SDL::OpenGL;
740use SDL::OpenGL::Constants;
741
742our @ISA = Crossfire::Client::Widget::;
743 1548
744sub key_down { 1549sub key_down {
745 print "MAPKEYDOWN\n"; 1550 print "MAPKEYDOWN\n";
746} 1551}
747 1552
748sub key_up { 1553sub key_up {
749} 1554}
750 1555
751sub size_request { 1556sub size_request {
752 1557 (
1558 1 + 32 * int $::WIDTH / 32,
1559 1 + 32 * int $::HEIGHT / 32,
1560 )
753} 1561}
754 1562
755sub size_allocate { 1563sub update {
756} 1564 my ($self) = @_;
757 1565
1566 $self->{need_update} = 1;
1567 $self->SUPER::update;
1568}
1569
758sub _draw { 1570sub draw {
759 my ($self) = @_; 1571 my ($self) = @_;
760 1572
761 my $mx = $::CONN->{mapx}; 1573 $self->{need_update}++;#d#
762 my $my = $::CONN->{mapy}; 1574 if (delete $self->{need_update}) {
1575 glNewList $self->{list}, GL_COMPILE;
763 1576
764 my $map = $::CONN->{map};
765
766 my ($xofs, $yofs);
767
768 my $sw = 1 + int $::WIDTH / 32; 1577 my $sw = int $::WIDTH / 32;
769 my $sh = 1 + int $::HEIGHT / 32; 1578 my $sh = int $::HEIGHT / 32;
770 1579
771 if ($::CONN->{mapw} > $sw) { 1580 if ($::MAP) {
772 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1581 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
773 } else {
774 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
775 }
776 1582
777 if ($::CONN->{maph} > $sh) { 1583 if ($::CFG->{fow_enable}) {
778 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1584 if ($::CFG->{fow_smooth}) { # smooth fog of war
779 } else { 1585 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
780 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1586 glConvolutionFilter2D
781 } 1587 GL_CONVOLUTION_2D,
782 1588 GL_ALPHA,
783 glEnable GL_TEXTURE_2D; 1589 3, 3,
784 glEnable GL_BLEND; 1590 GL_ALPHA, GL_FLOAT,
785 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1591 pack "f*",
786 1592 0.1, 0.1, 0.1,
787 my $sw4 = ($sw + 3) & ~3; 1593 0.1, 0.2, 0.1,
788 my $lighting = "\x00" x ($sw4 * $sh); 1594 0.1, 0.1, 0.1,
789 1595 ;
790 for my $x (0 .. $sw - 1) { 1596 glEnable GL_CONVOLUTION_2D;
791 for my $y (0 .. $sh - 1) {
792
793 my $cell = $map->[$x + $xofs][$y + $yofs]
794 or next;
795
796 my $darkness = $cell->[0] * (1 / 255);
797 if ($darkness < 0) {
798 $darkness = 0.15;
799 } 1597 }
800 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
801 1598
802 for my $num (grep $_, @$cell[1,2,3]) { 1599 my $tex = new CFClient::Texture
803 my $tex = $::CONN->{face}[$num]{texture} || next; 1600 w => $w,
1601 h => $h,
1602 data => $data,
1603 internalformat => GL_ALPHA,
1604 format => GL_ALPHA;
804 1605
805 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1606 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
806 1607
807 my $w = $tex->{width}; 1608 glEnable GL_BLEND;
808 my $h = $tex->{height}; 1609 glEnable GL_TEXTURE_2D;
1610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
809 1611
810 my $px = ($x + 1) * 32 - $w; 1612 glColor +($::CFG->{fow_intensity}) x 3, 1;
811 my $py = ($y + 1) * 32 - $h; 1613 $tex->draw_quad (0, 0, $w * 32, $h * 32);
812 1614
813 glBegin GL_QUADS; 1615 glDisable GL_TEXTURE_2D;
814 glTexCoord 0, 0; glVertex $px , $py; 1616 glDisable GL_BLEND;
815 glTexCoord 0, 1; glVertex $px , $py + $h;
816 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
817 glTexCoord 1, 0; glVertex $px + $w, $py;
818 glEnd;
819 } 1617 }
820 } 1618 }
821 }
822 1619
823# if (1) { # higher quality darkness 1620 glEndList;
824# $lighting =~ s/(.)/$1$1$1/gs;
825# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
826#
827# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
828#
829# $lighting = $pb->get_pixels;
830# $lighting =~ s/(.)../$1/gs;
831# } 1621 }
832 1622
833 $lighting = new Crossfire::Client::Texture 1623 glCallList $self->{list};
834 width => $sw4,
835 height => $sh,
836 data => $lighting,
837 internalformat => GL_ALPHA4,
838 format => GL_ALPHA;
839 1624
840 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1625 if ($FOCUS != $self) {
841 glColor 0, 0, 0, 0.75; 1626 glColor 64/255, 64/255, 64/255;
842 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1627 glLogicOp GL_AND;
843 glBindTexture GL_TEXTURE_2D, $lighting->{name}; 1628 glEnable GL_COLOR_LOGIC_OP;
844 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
845 glBegin GL_QUADS; 1629 glBegin GL_QUADS;
846 glTexCoord 0, 0; glVertex 0 , 0; 1630 glVertex 0, 0;
847 glTexCoord 0, 1; glVertex 0 , $sh * 32; 1631 glVertex 0, $::HEIGHT;
848 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32; 1632 glVertex $::WIDTH, $::HEIGHT;
849 glTexCoord 1, 0; glVertex $sw4 * 32, 0; 1633 glVertex $::WIDTH, 0;
850 glEnd; 1634 glEnd;
851 1635 glDisable GL_COLOR_LOGIC_OP;
852 glDisable GL_TEXTURE_2D; 1636 }
853 glDisable GL_BLEND;
854} 1637}
855 1638
856my %DIR = ( 1639my %DIR = (
857 SDLK_KP8, [1, "north"], 1640 SDLK_KP8, [1, "north"],
858 SDLK_KP9, [2, "northeast"], 1641 SDLK_KP9, [2, "northeast"],
… …
874 1657
875 my $mod = $ev->key_mod; 1658 my $mod = $ev->key_mod;
876 my $sym = $ev->key_sym; 1659 my $sym = $ev->key_sym;
877 1660
878 if ($sym == SDLK_KP5) { 1661 if ($sym == SDLK_KP5) {
879 $::CONN->send ("command stay fire"); 1662 $::CONN->user_send ("command stay fire");
1663 } elsif ($sym == SDLK_a) {
1664 $::CONN->user_send ("command apply");
1665 } elsif ($sym == SDLK_QUOTE) {
1666 $self->emit ('activate_console');
1667 } elsif ($sym == SDLK_SLASH) {
1668 $self->emit ('activate_console' => '/');
880 } elsif (exists $DIR{$sym}) { 1669 } elsif (exists $DIR{$sym}) {
881 if ($mod & KMOD_SHIFT) { 1670 if ($mod & KMOD_SHIFT) {
882 $self->{shft}++; 1671 $self->{shft}++;
883 $::CONN->send ("command fire $DIR{$sym}[0]"); 1672 $::CONN->user_send ("command fire $DIR{$sym}[0]");
884 } elsif ($mod & KMOD_CTRL) { 1673 } elsif ($mod & KMOD_CTRL) {
885 $self->{ctrl}++; 1674 $self->{ctrl}++;
886 $::CONN->send ("command run $DIR{$sym}[0]"); 1675 $::CONN->user_send ("command run $DIR{$sym}[0]");
887 } else { 1676 } else {
888 $::CONN->send ("command $DIR{$sym}[1]"); 1677 $::CONN->user_send ("command $DIR{$sym}[1]");
889 } 1678 }
890 } 1679 }
891} 1680}
892 1681
893sub key_up { 1682sub key_up {
… …
895 1684
896 my $mod = $ev->key_mod; 1685 my $mod = $ev->key_mod;
897 my $sym = $ev->key_sym; 1686 my $sym = $ev->key_sym;
898 1687
899 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1688 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
900 $::CONN->send ("command fire_stop"); 1689 $::CONN->user_send ("command fire_stop");
901 } 1690 }
902 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1691 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
903 $::CONN->send ("command run_stop"); 1692 $::CONN->user_send ("command run_stop");
904 } 1693 }
905} 1694}
906 1695
907############################################################################# 1696#############################################################################
908 1697
909package Crossfire::Client::Widget::Animator; 1698package CFClient::UI::Animator;
910 1699
911use SDL::OpenGL; 1700use SDL::OpenGL;
912 1701
913our @ISA = Crossfire::Client::Widget::Bin::; 1702our @ISA = CFClient::UI::Bin::;
914 1703
915sub moveto { 1704sub moveto {
916 my ($self, $x, $y) = @_; 1705 my ($self, $x, $y) = @_;
917 1706
918 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1707 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
919 $self->{speed} = 0.2; 1708 $self->{speed} = 0.001;
920 $self->{time} = 1; 1709 $self->{time} = 1;
921 1710
922 ::animation_start $self; 1711 ::animation_start $self;
923} 1712}
924 1713
… …
939 1728
940sub _draw { 1729sub _draw {
941 my ($self) = @_; 1730 my ($self) = @_;
942 1731
943 glPushMatrix; 1732 glPushMatrix;
944 glRotate $self->{time} * 10000, 0, 1, 0; 1733 glRotate $self->{time} * 1000, 0, 1, 0;
945 $self->{children}[0]->draw; 1734 $self->{children}[0]->draw;
946 glPopMatrix; 1735 glPopMatrix;
947} 1736}
948 1737
9491; 1738#############################################################################
950 1739
1740package CFClient::UI::Flopper;
1741
1742our @ISA = CFClient::UI::Button::;
1743
1744sub new {
1745 my $class = shift;
1746
1747 my $self = $class->SUPER::new (
1748 state => 0,
1749 connect_activate => \&toggle_flopper,
1750 @_
1751 );
1752
1753 if ($self->{state}) {
1754 $self->{state} = 0;
1755 $self->toggle_flopper;
1756 }
1757
1758 $self
1759}
1760
1761sub toggle_flopper {
1762 my ($self) = @_;
1763
1764 # TODO: use animation
1765 if ($self->{state} = !$self->{state}) {
1766 $CFClient::UI::TOPLEVEL->add ($self->{other});
1767 $self->{other}->move (
1768 ($::WIDTH - $self->{other}{w}) * 0.5,
1769 ($::HEIGHT - $self->{other}{h}) * 0.5,
1770 );
1771 } else {
1772 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1773 }
1774}
1775
1776#############################################################################
1777
1778package CFClient::UI::Toplevel;
1779
1780our @ISA = CFClient::UI::Container::;
1781
1782sub size_request {
1783 ($::WIDTH, $::HEIGHT)
1784}
1785
1786sub size_allocate {
1787 my ($self, $x, $y, $w, $h) = @_;
1788
1789 $self->_size_allocate ($x, $y, $w, $h);
1790
1791 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1792 for @{$self->{children}};
1793}
1794
1795sub translate {
1796 my ($self, $x, $y) = @_;
1797
1798 ($x, $y)
1799}
1800
1801sub update {
1802 my ($self) = @_;
1803
1804 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1805 ::refresh ();
1806}
1807
1808sub add {
1809 my ($self, $widget) = @_;
1810
1811 $self->SUPER::add ($widget);
1812
1813 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1814}
1815
1816sub draw {
1817 my ($self) = @_;
1818
1819 $self->_draw;
1820}
1821
1822#############################################################################
1823
1824package CFClient::UI;
1825
1826$TOPLEVEL = new CFClient::UI::Toplevel;
1827
18281
1829

Diff Legend

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