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

Diff Legend

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