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.41 by root, Sun Apr 9 21:50:21 2006 UTC vs.
Revision 1.68 by root, Tue Apr 11 17:02:36 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::Widget;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10use Crossfire::Client; 10use CFClient;
11 11
12our $FOCUS; # the widget with current focus 12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
13 16
14# class methods for events 17# class methods for events
15sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 18sub feed_sdl_key_down_event {
16sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 19 $FOCUS->key_down ($_[0]) if $FOCUS;
20}
21
22sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS;
24}
25
17sub feed_sdl_button_down_event { } 26sub feed_sdl_button_down_event {
27 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29
30 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y);
32
33 $GRAB = $widget;
34 $GRAB->update if $GRAB;
35 }
36
37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40}
41
18sub feed_sdl_button_up_event { } 42sub feed_sdl_button_up_event {
43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51
52 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab;
55 $GRAB->update if $GRAB;
56 }
57}
58
59sub feed_sdl_motion_event {
60 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64
65 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget;
67
68 $hover->update if $hover;
69 $HOVER->update if $HOVER;
70 }
71
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73}
19 74
20sub new { 75sub new {
21 my $class = shift; 76 my $class = shift;
22 77
23 bless { @_ }, $class 78 bless {
79 x => 0,
80 y => 0,
81 z => 0,
82 @_
83 }, $class
24} 84}
25 85
26sub move { 86sub move {
27 my ($self, $x, $y, $z) = @_; 87 my ($self, $x, $y, $z) = @_;
28 $self->{x} = $x; 88 $self->{x} = $x;
… …
44 104
45 $self->{w} = $w; 105 $self->{w} = $w;
46 $self->{h} = $h; 106 $self->{h} = $h;
47} 107}
48 108
109# translate global koordinates to local coordinate system
110sub translate {
111 my ($self, $x, $y) = @_;
112
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
114}
115
49sub focus_in { 116sub focus_in {
50 my ($widget) = @_; 117 my ($self) = @_;
51 $FOCUS = $widget; 118
119 return if $FOCUS == $self;
120
121 my $focus = $FOCUS; $FOCUS = $self;
122 $focus->update if $focus;
123 $FOCUS->update;
52} 124}
53 125
54sub focus_out { 126sub focus_out {
55 my ($widget) = @_; 127 my ($self) = @_;
56}
57 128
129 return unless $FOCUS == $self;
130
131 my $focus = $FOCUS; undef $FOCUS;
132 $focus->update if $focus; #?
133}
134
135sub mouse_motion { }
136sub button_up { }
58sub key_down { 137sub key_down { }
59 my ($widget, $sdlev) = @_;
60}
61
62sub key_up { 138sub key_up { }
63 my ($widget, $sdlev) = @_;
64}
65 139
66sub button_down { 140sub button_down {
67 my ($widget, $sdlev) = @_; 141 my ($self, $ev, $x, $y) = @_;
68}
69 142
70sub button_up { 143 $self->focus_in;
71 my ($widget, $sdlev) = @_;
72} 144}
73 145
74sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 146sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
75sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 147sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
76sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 148sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
77sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 149sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
78sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 150sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
79 151
80sub draw { 152sub draw {
81 my ($self) = @_; 153 my ($self) = @_;
154
155 return unless $self->{h} && $self->{w};
82 156
83 glPushMatrix; 157 glPushMatrix;
84 glTranslate $self->{x}, $self->{y}, 0; 158 glTranslate $self->{x}, $self->{y}, 0;
85 $self->_draw; 159 $self->_draw;
160 if ($self == $HOVER) {
161 glColor 1, 1, 1, 0.4;
162 glEnable GL_BLEND;
163 glBegin GL_QUADS;
164 glVertex 0 , 0;
165 glVertex $self->{w}, 0;
166 glVertex $self->{w}, $self->{h};
167 glVertex 0 , $self->{h};
168 glEnd;
169 glDisable GL_BLEND;
170 }
86 glPopMatrix; 171 glPopMatrix;
87} 172}
88 173
89sub _draw { 174sub _draw {
90 my ($self) = @_; 175 my ($self) = @_;
… …
139 #$self->deactivate; 224 #$self->deactivate;
140} 225}
141 226
142############################################################################# 227#############################################################################
143 228
144package Crossfire::Client::Widget::Container; 229package CFClient::Widget::DrawBG;
145 230
146our @ISA = Crossfire::Client::Widget::; 231our @ISA = CFClient::Widget::;
232
233use strict;
234use SDL::OpenGL;
147 235
148sub new { 236sub new {
237 my $class = shift;
238
239 # range [value, low, high, page]
240
241 $class->SUPER::new (
242 bg => [0, 0, 0, 0.4],
243 active_bg => [1, 1, 1],
244 @_
245 )
246}
247
248sub _draw {
249 my ($self) = @_;
250
251 my ($w, $h) = @$self{qw(w h)};
252
253 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
254 glBegin GL_QUADS;
255 glVertex 0 , 0;
256 glVertex 0 , $h;
257 glVertex $w, $h;
258 glVertex $w, 0;
259 glEnd;
260}
261
262#############################################################################
263
264package CFClient::Widget::Empty;
265
266our @ISA = CFClient::Widget::;
267
268sub size_request {
269 (0, 0)
270}
271
272sub draw { }
273
274#############################################################################
275
276package CFClient::Widget::Container;
277
278our @ISA = CFClient::Widget::;
279
280sub new {
149 my ($class, @widgets) = @_; 281 my ($class, %arg) = @_;
150 282
283 my $children = delete $arg{children} || [];
284
151 my $self = $class->SUPER::new (children => []); 285 my $self = $class->SUPER::new (children => [], %arg);
152 $self->add ($_) for @widgets; 286 $self->add ($_) for @$children;
153 287
154 $self 288 $self
155} 289}
156 290
157sub add { 291sub add {
158 my ($self, $chld, $expand) = @_; 292 my ($self, $chld, $expand) = @_;
159 293
160 $chld->{expand} = $expand; 294 $chld->{expand} = $expand;
161 $chld->set_parent ($self); 295 $chld->set_parent ($self);
162 296
163 @{$self->{children}} = 297 $self->{children} = [
164 sort { $a->{z} <=> $b->{z} } 298 sort { $a->{z} <=> $b->{z} }
165 @{$self->{children}}, $chld; 299 @{$self->{children}}, $chld
300 ];
166 301
167 $self->size_allocate ($self->{w}, $self->{h}); 302 $self->size_allocate ($self->{w}, $self->{h})
303 if $self->{w}; #TODO: check for "realised state"
168} 304}
169 305
170sub remove { 306sub remove {
171 my ($self, $widget) = @_; 307 my ($self, $widget) = @_;
172 308
… …
176} 312}
177 313
178sub find_widget { 314sub find_widget {
179 my ($self, $x, $y) = @_; 315 my ($self, $x, $y) = @_;
180 316
317 $x -= $self->{x};
318 $y -= $self->{y};
319
181 my $res; 320 my $res;
182 321
183 for (@{ $self->{children} }) { 322 for (reverse @{ $self->{children} }) {
184 $res = $_->find_widget ($x, $y) 323 $res = $_->find_widget ($x, $y)
185 and return $res; 324 and return $res;
186 } 325 }
187 326
327 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
328}
329
330sub _draw {
331 my ($self) = @_;
332
333 $_->draw for @{$self->{children}};
334}
335
336#############################################################################
337
338package CFClient::Widget::Bin;
339
340our @ISA = CFClient::Widget::Container::;
341
342sub new {
343 my ($class, %arg) = @_;
344
345 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::;
346
347 $class->SUPER::new (children => [$child], %arg)
348}
349
350sub add {
351 my ($self, $widget) = @_;
352
353 $self->{children} = [];
188 () 354
355 $self->SUPER::add ($widget);
189} 356}
357
358sub remove {
359 my ($self, $widget) = @_;
360
361 $self->SUPER::remove ($widget);
362
363 $self->{children} = [new CFClient::Widget::Empty]
364 unless @{$self->{children}};
365}
366
367sub child { $_[0]->{children}[0] }
190 368
191sub size_request { 369sub size_request {
192 my ($self) = @_;
193
194 my ($hs, $ws) = (0, 0);
195 for (@{$self->{children} || []}) {
196 my ($w, $h) = $_->size_request;
197 $hs += $h;
198 if ($ws < $w) { $ws = $w }
199 }
200
201 return ($ws, $hs);
202}
203
204sub _draw {
205 my ($self) = @_;
206
207 $_->draw for @{$self->{children}};
208}
209
210#############################################################################
211
212package Crossfire::Client::Widget::Bin;
213
214our @ISA = Crossfire::Client::Widget::Container::;
215
216sub child { $_[0]->{children}[0] }
217
218sub size_request {
219 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 370 $_[0]{children}[0]->size_request
220} 371}
221 372
222sub size_allocate { 373sub size_allocate {
223 my ($self, $w, $h) = @_; 374 my ($self, $w, $h) = @_;
375
376 return unless $self->{w} != $w || $self->{h} != $h;
377
224 $self->SUPER::size_allocate ($w, $h); 378 $self->SUPER::size_allocate ($w, $h);
225 $self->{children}[0]->size_allocate ($w, $h) 379 $self->{children}[0]->size_allocate ($w, $h);
226 if $self->{children}[0]
227} 380}
228 381
229############################################################################# 382#############################################################################
230 383
231package Crossfire::Client::Widget::Toplevel; 384package CFClient::Widget::Window;
232 385
233our @ISA = Crossfire::Client::Widget::Container::; 386our @ISA = CFClient::Widget::Bin::;
387
388use SDL::OpenGL;
389
390sub new {
391 my ($class, %arg) = @_;
392
393 my $self = $class->SUPER::new (%arg);
394}
234 395
235sub update { 396sub update {
236 my ($self) = @_; 397 my ($self) = @_;
237 398
238 ::refresh (); 399 # we want to do this delayed...
239}
240
241#############################################################################
242
243package Crossfire::Client::Widget::Window;
244
245our @ISA = Crossfire::Client::Widget::Bin::;
246
247use SDL::OpenGL;
248
249sub add {
250 my ($self, $chld) = @_;
251 warn "ADD $chld\n";
252 $self->SUPER::add ($chld);
253 $chld->set_parent ($self);
254}
255
256sub remove {
257 my ($self) = @_;
258 # TODO FIXME: removing a child from a window will crash, see render_chld
259 # $self->update;
260}
261
262sub update {
263 my ($self) = @_;
264 $self->render_chld; 400 $self->render_chld;
401 $self->SUPER::update;
265} 402}
266 403
267sub render_chld { 404sub render_chld {
268 my ($self) = @_; 405 my ($self) = @_;
269 my $chld = $self->get;
270 my ($w, $h) = $self->size_request;
271 406
272 require Carp;
273 Carp::cluck "RENDERCHI $w $h";
274 warn "RENDERCHI $w $h\n";
275 $self->{texture} = 407 $self->{texture} =
276 Crossfire::Client::Texture->new_from_opengl ( 408 CFClient::Texture->new_from_opengl (
277 $w, $h, sub { $chld->draw } 409 $self->{w}, $self->{h}, sub { $self->child->draw }
278 ); 410 );
279 $self->{texture}->upload;
280}
281
282sub size_request {
283 my ($self) = @_;
284 ($self->w, $self->h)
285} 411}
286 412
287sub size_allocate { 413sub size_allocate {
288 my ($self, $w, $h) = @_; 414 my ($self, $w, $h) = @_;
289 415
416 return unless $self->{w} != $w || $self->{h} != $h;
417
290 $self->w ($w); 418 $self->{w} = $w;
291 $self->h ($h); 419 $self->{h} = $h;
420
292 $self->get->size_allocate ($w, $h); 421 $self->child->size_allocate ($w, $h);
293 422
294 $self->update; #TODO: Move this to the size_request event propably? 423 $self->render_chld;
295} 424}
296 425
297sub _draw { 426sub _draw {
298 my ($self) = @_; 427 my ($self) = @_;
299 428
… …
303 or return; 432 or return;
304 433
305 glEnable GL_BLEND; 434 glEnable GL_BLEND;
306 glEnable GL_TEXTURE_2D; 435 glEnable GL_TEXTURE_2D;
307 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 436 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
308 glBindTexture GL_TEXTURE_2D, $tex->{name};
309 437
310 glBegin GL_QUADS; 438 $tex->draw_quad (0, 0, $w, $h);
311 glTexCoord 0, 0; glVertex 0, 0;
312 glTexCoord 0, 1; glVertex 0, $h;
313 glTexCoord 1, 1; glVertex $w, $h;
314 glTexCoord 1, 0; glVertex $w, 0;
315 glEnd;
316 439
317 glDisable GL_BLEND; 440 glDisable GL_BLEND;
318 glDisable GL_TEXTURE_2D; 441 glDisable GL_TEXTURE_2D;
319} 442}
320 443
321############################################################################# 444#############################################################################
322 445
323package Crossfire::Client::Widget::Frame; 446package CFClient::Widget::Frame;
324 447
325our @ISA = Crossfire::Client::Widget::Bin::; 448our @ISA = CFClient::Widget::Bin::;
326 449
327use SDL::OpenGL; 450use SDL::OpenGL;
328 451
329sub size_request { 452sub size_request {
330 my ($self) = @_; 453 my ($self) = @_;
… …
336 map { $_ + 4 } $chld->size_request; 459 map { $_ + 4 } $chld->size_request;
337} 460}
338 461
339sub size_allocate { 462sub size_allocate {
340 my ($self, $w, $h) = @_; 463 my ($self, $w, $h) = @_;
464
465 return unless $self->{w} != $w || $self->{h} != $h;
341 466
342 $self->SUPER::size_allocate ($w, $h); 467 $self->{w} = $w;
468 $self->{h} = $h;
343 469
344 $self->child->size_allocate ($w - 4, $h - 4); 470 $self->child->size_allocate ($w - 4, $h - 4);
345 $self->child->move (2, 2); 471 $self->child->move (2, 2);
346} 472}
347 473
… …
352 478
353 my ($w, $h) = $chld->size_request; 479 my ($w, $h) = $chld->size_request;
354 480
355 glBegin GL_QUADS; 481 glBegin GL_QUADS;
356 glColor 0, 0, 0; 482 glColor 0, 0, 0;
357 glTexCoord 0, 0; glVertex 0 , 0; 483 glVertex 0 , 0;
358 glTexCoord 0, 1; glVertex 0 , $h + 4; 484 glVertex 0 , $h + 4;
359 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 485 glVertex $w + 4 , $h + 4;
360 glTexCoord 1, 0; glVertex $w + 4 , 0; 486 glVertex $w + 4 , 0;
361 glEnd; 487 glEnd;
362 488
363 $chld->draw; 489 $chld->draw;
364} 490}
365 491
366############################################################################# 492#############################################################################
367 493
368package Crossfire::Client::Widget::FancyFrame; 494package CFClient::Widget::FancyFrame;
369 495
370our @ISA = Crossfire::Client::Widget::Bin::; 496our @ISA = CFClient::Widget::Bin::;
371 497
372use SDL::OpenGL; 498use SDL::OpenGL;
373 499
374my @tex = 500my @tex =
375 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 501 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
376 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 502 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
377 503
378sub size_request { 504sub size_request {
379 my ($self) = @_; 505 my ($self) = @_;
380 506
… …
389} 515}
390 516
391sub size_allocate { 517sub size_allocate {
392 my ($self, $w, $h) = @_; 518 my ($self, $w, $h) = @_;
393 519
520 return unless $self->{w} != $w || $self->{h} != $h;
521
394 $self->SUPER::size_allocate ($w, $h); 522 $self->SUPER::size_allocate ($w, $h);
395 523
396 $h -= $tex[1]->{height}; 524 $h -= $tex[1]->{height};
397 $h -= $tex[4]->{height}; 525 $h -= $tex[4]->{height};
398 $w -= $tex[2]->{width}; 526 $w -= $tex[2]->{width};
399 $w -= $tex[3]->{width}; 527 $w -= $tex[3]->{width};
400 528
401 $h = $h < 0 ? 0 : $h; 529 $h = $h < 0 ? 0 : $h;
402 $w = $w < 0 ? 0 : $w; 530 $w = $w < 0 ? 0 : $w;
403 warn "CHILD:$w $h\n"; 531
532 my $child = $self->child;
533
404 $self->child->size_allocate ($w, $h); 534 $child->size_allocate ($w, $h);
405 $self->child->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); 535 $child->move ($tex[3]->{width}, $tex[1]->{height});
406} 536}
407 537
408sub _draw { 538sub _draw {
409 my ($self) = @_; 539 my ($self) = @_;
410 540
411 my ($w, $h) = ($self->w, $self->h); 541 my ($w, $h) = ($self->{w}, $self->{h});
412 my ($cw, $ch) = ($self->child->w, $self->child->h); 542 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
413 543
414 glEnable GL_BLEND; 544 glEnable GL_BLEND;
415 glEnable GL_TEXTURE_2D; 545 glEnable GL_TEXTURE_2D;
416 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
418 548
419 my $top = $tex[1]; 549 my $top = $tex[1];
420 glBindTexture GL_TEXTURE_2D, $top->{name}; 550 $top->draw_quad (0, 0, $w, $top->{height});
421
422 glBegin GL_QUADS;
423 glTexCoord 0, 0; glVertex 0 , 0;
424 glTexCoord 0, 1; glVertex 0 , $top->{height};
425 glTexCoord 1, 1; glVertex $w , $top->{height};
426 glTexCoord 1, 0; glVertex $w , 0;
427 glEnd;
428 551
429 my $left = $tex[3]; 552 my $left = $tex[3];
430 glBindTexture GL_TEXTURE_2D, $left->{name}; 553 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
431
432 glBegin GL_QUADS;
433 glTexCoord 0, 0; glVertex 0 , $top->{height};
434 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
435 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
436 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
437 glEnd;
438 554
439 my $right = $tex[2]; 555 my $right = $tex[2];
440 glBindTexture GL_TEXTURE_2D, $right->{name}; 556 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
441
442 glBegin GL_QUADS;
443 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
444 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
445 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
446 glTexCoord 1, 0; glVertex $w , $top->{height};
447 glEnd;
448 557
449 my $bottom = $tex[4]; 558 my $bottom = $tex[4];
450 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 559 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
451
452 glBegin GL_QUADS;
453 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
454 glTexCoord 0, 1; glVertex 0 , $h;
455 glTexCoord 1, 1; glVertex $w , $h;
456 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
457 glEnd;
458 560
459 my $bg = $tex[0]; 561 my $bg = $tex[0];
460 glBindTexture GL_TEXTURE_2D, $bg->{name}; 562 glBindTexture GL_TEXTURE_2D, $bg->{name};
461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 563 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
462 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 564 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
463 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 565 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
464 566
465 my $rep_x = $cw / $bg->{width}; 567 my $rep_x = $cw / $bg->{width};
466 my $rep_y = $ch / $bg->{height}; 568 my $rep_y = $ch / $bg->{height};
467 569
468 glBegin GL_QUADS; 570 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
469 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
470 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
471 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
472 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
473 glEnd;
474 571
475 glDisable GL_BLEND; 572 glDisable GL_BLEND;
476 glDisable GL_TEXTURE_2D; 573 glDisable GL_TEXTURE_2D;
477 574
478 $self->child->draw; 575 $self->child->draw;
479 576
480} 577}
481 578
482############################################################################# 579#############################################################################
483 580
484package Crossfire::Client::Widget::Table; 581package CFClient::Widget::Table;
485 582
486our @ISA = Crossfire::Client::Widget::Bin::; 583our @ISA = CFClient::Widget::Bin::;
487 584
488use SDL::OpenGL; 585use SDL::OpenGL;
489 586
490sub add { 587sub add {
491 my ($self, $x, $y, $chld) = @_; 588 my ($self, $x, $y, $chld) = @_;
… …
566 } 663 }
567} 664}
568 665
569############################################################################# 666#############################################################################
570 667
571package Crossfire::Client::Widget::VBox; 668package CFClient::Widget::VBox;
572 669
573our @ISA = Crossfire::Client::Widget::Container::; 670our @ISA = CFClient::Widget::Container::;
574 671
575use SDL::OpenGL; 672use SDL::OpenGL;
673
674sub size_request {
675 my ($self) = @_;
676
677 my @alloc = map [$_->size_request], @{$self->{children}};
678
679 (
680 (List::Util::max map $_->[0], @alloc),
681 (List::Util::sum map $_->[1], @alloc),
682 )
683}
576 684
577sub size_allocate { 685sub size_allocate {
578 my ($self, $w, $h) = @_; 686 my ($self, $w, $h) = @_;
579 687
688 return unless $self->{w} != $w || $self->{h} != $h;
689
580 $self->w ($w); 690 $self->{w} = $w;
581 $self->h ($h); 691 $self->{h} = $h;
582 692
583 my $exp; 693 return unless $self->{h};
584 my @oth; 694
585 # find expand widget 695 my $children = $self->{children};
586 for (@{$self->{children}}) { 696
587 if ($_->{expand}) { 697 my @h = map +($_->size_request)[1], @$children;
588 $exp = $_; 698
589 last; 699 my $req_h = List::Util::sum @h;
700
701 if ($req_h > $h) {
702 # ah well, not enough space
703 $_ = $h[$_] * $h / $req_h for @h;
704 } else {
705 my @exp = grep $_->{expand}, @$children;
706 @exp = @$children unless @exp;
707
708 my %exp = map +($_ => 1), @exp;
709
710 for (0 .. $#$children) {
711 my $child = $children->[$_];
712
713 my $alloc_h = $h[$_];
714 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
715 $h[$_] = $alloc_h;
590 } 716 }
591 push @oth, $_;
592 }
593
594 my ($ow, $oh);
595
596 # get sizes of other widgets
597 for (@oth) {
598 my ($w, $h) = $_->size_request;
599 $oh += $h;
600 if ($ow < $w) { $ow = $w }
601 } 717 }
602 718
603 my $y = 0; 719 my $y = 0;
604 for (@{$self->{children}}) { 720 for (0 .. $#$children) {
721 my $child = $children->[$_];
722 my $h = $h[$_];
605 $_->move (0, $y); 723 $child->move (0, $y);
606
607 if ($_ == $exp) {
608 $_->size_allocate ($w, $h - $oh);
609 $y += $h - $oh;
610 } else {
611 my ($cw, $h) = $_->size_request;
612 $_->size_allocate ($w, $h); 724 $child->size_allocate ($w, $h);
725
613 $y += $h; 726 $y += $h;
614 }
615 } 727 }
616} 728}
617 729
618sub _draw {
619 my ($self) = @_;
620
621 my ($x, $y);
622 for (@{$self->{children} || []}) {
623 $_->draw;
624 $y += $_->h;
625 }
626}
627
628############################################################################# 730#############################################################################
629 731
630package Crossfire::Client::Widget::Label; 732package CFClient::Widget::Label;
631 733
632our @ISA = Crossfire::Client::Widget::; 734our @ISA = CFClient::Widget::;
633 735
634use SDL::OpenGL; 736use SDL::OpenGL;
635 737
636sub new { 738sub new {
637 my ($class, $x, $y, $z, $height, $text) = @_; 739 my ($class, %arg) = @_;
638 740
639 # TODO: color, and make height, xyz etc. optional 741 my $self = $class->SUPER::new (
640 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 742 fg => [1, 1, 1],
743 height => $::FONTSIZE,
744 text => "",
745 layout => new CFClient::Layout,
746 %arg
747 );
641 748
642 $self->set_text ($text); 749 $self->set_text ($self->{text});
643 750
644 $self 751 $self
752}
753
754sub escape_text {
755 local $_ = $_[1];
756
757 s/&/&amp;/g;
758 s/>/&gt;/g;
759 s/</&lt;/g;
760
761 $_[1]
645} 762}
646 763
647sub set_text { 764sub set_text {
648 my ($self, $text) = @_; 765 my ($self, $text) = @_;
649 766
650 $self->{text} = $text; 767 $self->{text} = $text;
651 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 768 $self->{layout}->set_markup ($text);
652 769
770 delete $self->{texture};
653 $self->update; 771 $self->update;
654} 772}
655 773
656sub get_text { 774sub get_text {
657 my ($self, $text) = @_; 775 my ($self, $text) = @_;
… …
660} 778}
661 779
662sub size_request { 780sub size_request {
663 my ($self) = @_; 781 my ($self) = @_;
664 782
665 ( 783 $self->{layout}->set_width;
784 $self->{layout}->set_height ($self->{height});
785 $self->{layout}->size
786# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
787# (
666 $self->{texture}{width}, 788# $self->{texture}{width},
667 $self->{texture}{height}, 789# $self->{texture}{height},
668 ) 790# )
791# } else {
792# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
793#
794# ($w, $h)
795# }
796}
797
798sub size_allocate {
799 my ($self, $w, $h) = @_;
800
801 return unless $self->{w} != $w || $self->{h} != $h;
802
803 $self->SUPER::size_allocate ($w, $h);
804 delete $self->{texture};
805}
806
807sub update {
808 my ($self) = @_;
809
810 delete $self->{texture};
811 $self->SUPER::update;
669} 812}
670 813
671sub _draw { 814sub _draw {
672 my ($self) = @_; 815 my ($self) = @_;
673 816
674 my $tex = $self->{texture}; 817 my $tex = $self->{texture} ||= do {
818 $self->{layout}->set_width ($self->{w});
819 new_from_layout CFClient::Texture $self->{layout};
820 };
675 821
676 glEnable GL_BLEND; 822 glEnable GL_BLEND;
677 glEnable GL_TEXTURE_2D; 823 glEnable GL_TEXTURE_2D;
678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 824 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
679 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
680 glBindTexture GL_TEXTURE_2D, $tex->{name};
681 826
682 glColor 1, 0, 0, 1; # TODO color 827 glColor @{$self->{fg}};
683 828
684 glBegin GL_QUADS; 829 $tex->draw_quad (0, 0);
685 glTexCoord 0, 0; glVertex 0 , 0;
686 glTexCoord 0, 1; glVertex 0 , $tex->{height};
687 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
688 glTexCoord 1, 0; glVertex $tex->{width}, 0;
689 glEnd;
690 830
691 glDisable GL_BLEND; 831 glDisable GL_BLEND;
692 glDisable GL_TEXTURE_2D; 832 glDisable GL_TEXTURE_2D;
693} 833}
694 834
695############################################################################# 835#############################################################################
696 836
697package Crossfire::Client::Widget::TextEntry; 837package CFClient::Widget::Entry;
698 838
699our @ISA = Crossfire::Client::Widget::Label::; 839our @ISA = CFClient::Widget::Label::;
700 840
701use SDL; 841use SDL;
702use SDL::OpenGL; 842use SDL::OpenGL;
703 843
844sub new {
845 my $class = shift;
846
847 $class->SUPER::new (
848 fg => [1, 1, 1],
849 bg => [0, 0, 0, 0.4],
850 active_bg => [1, 1, 1],
851 active_fg => [0, 0, 0],
852 @_
853 )
854}
855
856sub _set_text {
857 my ($self, $text) = @_;
858
859 $self->{last_activity} = $::NOW;
860
861 $self->{text} = $text;
862 $self->{layout}->set_width ($self->{w});
863 $self->{layout}->set_markup ($self->escape_text ($text));
864
865 $text = substr $text, 0, $self->{cursor};
866 utf8::encode $text;
867
868 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
869}
870
871sub size_request {
872 my ($self) = @_;
873
874 my ($w, $h) = $self->SUPER::size_request;
875
876 ($w + 1, $h) # add 1 for cursor
877}
878
879sub size_allocate {
880 my ($self, $w, $h) = @_;
881
882 return unless $self->{w} != $w || $self->{h} != $h;
883
884 $self->SUPER::size_allocate ($w, $h);
885
886 $self->_set_text ($self->{text});
887}
888
889sub set_text {
890 my ($self, $text) = @_;
891
892 $self->{cursor} = length $text;
893 $self->_set_text ($text);
894 $self->update;
895}
896
704sub key_down { 897sub key_down {
705 my ($self, $ev) = @_; 898 my ($self, $ev) = @_;
706 899
707 my $mod = $ev->key_mod; 900 my $mod = $ev->key_mod;
708 my $sym = $ev->key_sym; 901 my $sym = $ev->key_sym;
709 902
710 $ev->set_unicode (1);
711 my $uni = $ev->key_unicode; 903 my $uni = $ev->key_unicode;
712 904
713 my $text = $self->get_text; 905 my $text = $self->get_text;
714 906
715 if ($sym == SDLK_BACKSPACE) { 907 if ($sym == SDLK_BACKSPACE) {
716 substr $text, -1, 1, ''; 908 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
717 909 } elsif ($sym == SDLK_DELETE) {
910 substr $text, $self->{cursor}, 1, "";
911 } elsif ($sym == SDLK_LEFT) {
912 --$self->{cursor} if $self->{cursor};
913 } elsif ($sym == SDLK_RIGHT) {
914 ++$self->{cursor} if $self->{cursor} < length $self->{text};
718 } elsif ($uni) { 915 } elsif ($uni) {
719 $text .= chr $uni; 916 substr $text, $self->{cursor}++, 0, chr $uni;
720 } 917 }
918
721 $self->set_text ($text); 919 $self->_set_text ($text);
920 $self->update;
722} 921}
723 922
724############################################################################# 923sub focus_in {
924 my ($self) = @_;
725 925
926 $self->{last_activity} = $::NOW;
927
928 $self->SUPER::focus_in;
929}
930
931sub button_down {
932 my ($self, $ev, $x, $y) = @_;
933
934 $self->SUPER::button_down ($ev, $x, $y);
935
936 my $idx = $self->{layout}->xy_to_index ($x, $y);
937
938 # byte-index to char-index
939 my $text = $self->{layout};
940 utf8::encode $text;
941 $self->{cursor} = length substr $text, 0, $idx;
942
943 $self->_set_text ($self->{text});
944 $self->update;
945}
946
947sub mouse_motion {
948 my ($self, $ev, $x, $y) = @_;
949# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
950}
951
952sub _draw {
953 my ($self) = @_;
954
955 local $self->{fg} = $self->{fg};
956
957 if ($FOCUS == $self) {
958 glColor @{$self->{active_bg}};
959 $self->{fg} = $self->{active_fg};
960 } else {
961 glColor @{$self->{bg}};
962 }
963
964 glBegin GL_QUADS;
965 glVertex 0 , 0;
966 glVertex 0 , $self->{h};
967 glVertex $self->{w}, $self->{h};
968 glVertex $self->{w}, 0;
969 glEnd;
970
971 $self->SUPER::_draw;
972
973 #TODO: force update every cursor change :(
974 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
975 glColor @{$self->{fg}};
976 glBegin GL_LINES;
977 glVertex $self->{cur_x}, $self->{cur_y};
978 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
979 glEnd;
980 }
981}
982
983#############################################################################
984
985package CFClient::Widget::Slider;
986
987use strict;
988
989use SDL::OpenGL;
990use SDL::OpenGL::Constants;
991
992our @ISA = CFClient::Widget::DrawBG::;
993
994sub size_request {
995 my ($self) = @_;
996
997 my $w =
998 my $h = 10;
999
1000 $self->{vertical} ? ($h, $w) : ($w, $h)
1001}
1002
1003sub new {
1004 my $class = shift;
1005
1006 # range [value, low, high, page]
1007
1008 $class->SUPER::new (
1009 fg => [1, 1, 1],
1010 active_fg => [0, 0, 0],
1011 range => [0, 0, 100, 10],
1012 vertical => 0,
1013 @_
1014 )
1015}
1016
1017sub _draw {
1018 my ($self) = @_;
1019
1020 $self->SUPER::_draw ();
1021
1022 my ($w, $h) = @$self{qw(w h)};
1023
1024 if ($self->{vertical}) {
1025 # draw a vertical slider like a rotated horizontal slider
1026
1027 glTranslate 0, $self->{w};
1028 glRotate 90, 0, 0, 1;
1029
1030 ($w, $h) = ($h, $w);
1031 }
1032
1033 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1034 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1035
1036 glColor @$fg;
1037 glBegin GL_LINES;
1038 glVertex 0, 0; glVertex 0, $h;
1039 glVertex $w - 1, 0; glVertex $w - 1, $h;
1040 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1041 glEnd;
1042}
1043
1044#############################################################################
1045
726package Crossfire::Client::Widget::MapWidget; 1046package CFClient::Widget::MapWidget;
727 1047
728use strict; 1048use strict;
729 1049
730use List::Util qw(min max); 1050use List::Util qw(min max);
731 1051
732use SDL; 1052use SDL;
733use SDL::OpenGL; 1053use SDL::OpenGL;
734use SDL::OpenGL::Constants; 1054use SDL::OpenGL::Constants;
735 1055
736our @ISA = Crossfire::Client::Widget::; 1056our @ISA = CFClient::Widget::;
1057
1058sub new {
1059 my $class = shift;
1060
1061 $class->SUPER::new (
1062 z => -1,
1063 list => (glGenLists 1),
1064 @_
1065 )
1066}
737 1067
738sub key_down { 1068sub key_down {
739 print "MAPKEYDOWN\n"; 1069 print "MAPKEYDOWN\n";
740} 1070}
741 1071
742sub key_up { 1072sub key_up {
743} 1073}
744 1074
745sub size_request { 1075sub size_request {
746 1076 (
1077 1 + int $::WIDTH / 32,
1078 1 + int $::HEIGHT / 32,
1079 )
747} 1080}
748 1081
749sub size_allocate { 1082sub update {
1083 my ($self) = @_;
1084
1085 $self->{need_update} = 1;
750} 1086}
751 1087
752sub _draw { 1088sub _draw {
753 my ($self) = @_; 1089 my ($self) = @_;
754 1090
1091 if (delete $self->{need_update}) {
1092 glNewList $self->{list}, GL_COMPILE;
1093
755 my $mx = $::CONN->{mapx}; 1094 my $mx = $::CONN->{mapx};
756 my $my = $::CONN->{mapy}; 1095 my $my = $::CONN->{mapy};
757 1096
758 my $map = $::CONN->{map}; 1097 my $map = $::CONN->{map};
759 1098
760 my ($xofs, $yofs); 1099 my ($xofs, $yofs);
761 1100
762 my $sw = 1 + int $::WIDTH / 32; 1101 my $sw = 1 + int $::WIDTH / 32;
763 my $sh = 1 + int $::HEIGHT / 32; 1102 my $sh = 1 + int $::HEIGHT / 32;
764 1103
765 if ($::CONN->{mapw} > $sw) { 1104 if ($::CONN->{mapw} > $sw) {
766 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1105 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
767 } else { 1106 } else {
768 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1107 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
769 } 1108 }
770 1109
771 if ($::CONN->{maph} > $sh) { 1110 if ($::CONN->{maph} > $sh) {
772 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1111 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
773 } else { 1112 } else {
774 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1113 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
775 } 1114 }
776 1115
777 glEnable GL_TEXTURE_2D; 1116 glEnable GL_TEXTURE_2D;
778 glEnable GL_BLEND; 1117 glEnable GL_BLEND;
779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1118 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
780 1119
781 my $sw4 = ($sw + 3) & ~3; 1120 my $sw4 = ($sw + 3) & ~3;
782 my $lighting = "\x00" x ($sw4 * $sh); 1121 my $darkness = "\x00" x ($sw4 * $sh);
783 1122
784 for my $x (0 .. $sw - 1) { 1123 for my $x (0 .. $sw - 1) {
1124 my $row = $map->[$x + $xofs];
785 for my $y (0 .. $sh - 1) { 1125 for my $y (0 .. $sh - 1) {
786 1126
787 my $cell = $map->[$x + $xofs][$y + $yofs] 1127 my $cell = $row->[$y + $yofs]
788 or next; 1128 or next;
789 1129
790 my $darkness = $cell->[0] * (1 / 255); 1130 my $dark = $cell->[0];
791 if ($darkness < 0) { 1131 if ($dark < 0) {
792 $darkness = 0.15; 1132 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1133 } else {
1134 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
793 } 1135 }
794 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
795 1136
796 for my $num (grep $_, @$cell[1,2,3]) { 1137 for my $num (grep $_, @$cell[1,2,3]) {
797 my $tex = $::CONN->{face}[$num]{texture} || next; 1138 my $tex = $::CONN->{face}[$num]{texture} || next;
798 1139
799 glBindTexture GL_TEXTURE_2D, $tex->{name};
800
801 my $w = $tex->{width}; 1140 my $w = $tex->{width};
802 my $h = $tex->{height}; 1141 my $h = $tex->{height};
803 1142
804 my $px = ($x + 1) * 32 - $w; 1143 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
805 my $py = ($y + 1) * 32 - $h;
806
807 glBegin GL_QUADS;
808 glTexCoord 0, 0; glVertex $px , $py;
809 glTexCoord 0, 1; glVertex $px , $py + $h;
810 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
811 glTexCoord 1, 0; glVertex $px + $w, $py;
812 glEnd; 1144 }
813 } 1145 }
814 } 1146 }
815 }
816 1147
817# if (1) { # higher quality darkness 1148# if (1) { # higher quality darkness
818# $lighting =~ s/(.)/$1$1$1/gs; 1149# $lighting =~ s/(.)/$1$1$1/gs;
819# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 1150# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
820# 1151#
… …
822# 1153#
823# $lighting = $pb->get_pixels; 1154# $lighting = $pb->get_pixels;
824# $lighting =~ s/(.)../$1/gs; 1155# $lighting =~ s/(.)../$1/gs;
825# } 1156# }
826 1157
827 $lighting = new Crossfire::Client::Texture
828 width => $sw4,
829 height => $sh,
830 data => $lighting,
831 internalformat => GL_ALPHA4,
832 format => GL_ALPHA;
833
834 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1158 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
835 glColor 0, 0, 0, 0.75;
836 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1159 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
837 glBindTexture GL_TEXTURE_2D, $lighting->{name};
838 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
839 glBegin GL_QUADS;
840 glTexCoord 0, 0; glVertex 0 , 0;
841 glTexCoord 0, 1; glVertex 0 , $sh * 32;
842 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
843 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
844 glEnd;
845 1160
1161 $darkness = new CFClient::Texture
1162 width => $sw4,
1163 height => $sh,
1164 data => $darkness,
1165 internalformat => GL_ALPHA,
1166 format => GL_ALPHA;
1167
1168 glColor 0.45, 0.45, 0.45, 1;
1169 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1170
846 glDisable GL_TEXTURE_2D; 1171 glDisable GL_TEXTURE_2D;
847 glDisable GL_BLEND; 1172 glDisable GL_BLEND;
1173
1174 glEndList;
1175 }
1176
1177 glCallList $self->{list};
848} 1178}
849 1179
850my %DIR = ( 1180my %DIR = (
851 SDLK_KP8, [1, "north"], 1181 SDLK_KP8, [1, "north"],
852 SDLK_KP9, [2, "northeast"], 1182 SDLK_KP9, [2, "northeast"],
… …
898 } 1228 }
899} 1229}
900 1230
901############################################################################# 1231#############################################################################
902 1232
903package Crossfire::Client::Widget::Animator; 1233package CFClient::Widget::Animator;
904 1234
905use SDL::OpenGL; 1235use SDL::OpenGL;
906 1236
907our @ISA = Crossfire::Client::Widget::Bin::; 1237our @ISA = CFClient::Widget::Bin::;
908 1238
909sub moveto { 1239sub moveto {
910 my ($self, $x, $y) = @_; 1240 my ($self, $x, $y) = @_;
911 1241
912 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1242 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
913 $self->{speed} = 0.2; 1243 $self->{speed} = 0.001;
914 $self->{time} = 1; 1244 $self->{time} = 1;
915 1245
916 ::animation_start $self; 1246 ::animation_start $self;
917} 1247}
918 1248
… …
933 1263
934sub _draw { 1264sub _draw {
935 my ($self) = @_; 1265 my ($self) = @_;
936 1266
937 glPushMatrix; 1267 glPushMatrix;
938 glRotate $self->{time} * 10000, 0, 1, 0; 1268 glRotate $self->{time} * 1000, 0, 1, 0;
939 $self->{children}[0]->draw; 1269 $self->{children}[0]->draw;
940 glPopMatrix; 1270 glPopMatrix;
941} 1271}
942 1272
9431; 1273#############################################################################
944 1274
1275package CFClient::Widget::Toplevel;
1276
1277our @ISA = CFClient::Widget::Container::;
1278
1279sub size_request {
1280 ($::WIDTH, $::HEIGHT)
1281}
1282
1283sub size_allocate {
1284 my ($self, $w, $h) = @_;
1285
1286 $self->SUPER::size_allocate ($w, $h);
1287
1288 $_->size_allocate ($_->size_request)
1289 for @{$self->{children}};
1290}
1291
1292sub translate {
1293 my ($self, $x, $y) = @_;
1294
1295 ($x, $y)
1296}
1297
1298sub update {
1299 my ($self) = @_;
1300
1301 $self->size_allocate ($self->size_request);
1302 ::refresh ();
1303}
1304
1305sub add {
1306 my ($self, $widget) = @_;
1307
1308 $self->SUPER::add ($widget);
1309
1310 $widget->size_allocate ($widget->size_request);
1311}
1312
1313sub draw {
1314 my ($self) = @_;
1315
1316 $self->_draw;
1317}
1318
1319#############################################################################
1320
1321package CFClient::Widget;
1322
1323$TOPLEVEL = new CFClient::Widget::Toplevel;
1324
13251
1326

Diff Legend

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