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.39 by root, Sun Apr 9 21:39:08 2006 UTC vs.
Revision 1.66 by root, Tue Apr 11 14:36:02 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 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus;
121 $FOCUS->update;
49} 122}
50 123
51sub focus_out { 124sub focus_out {
52 my ($widget) = @_; 125 my ($self) = @_;
53}
54 126
55sub key_down { 127 return unless $FOCUS == $self;
56 my ($widget, $sdlev) = @_;
57}
58 128
59sub key_up { 129 my $focus = $FOCUS; undef $FOCUS;
60 my ($widget, $sdlev) = @_; 130 $focus->update if $focus; #?
61} 131}
62 132
133sub mouse_motion { }
134sub button_up { }
63sub button_down { 135sub button_down { }
64 my ($widget, $sdlev) = @_; 136sub key_down { }
65} 137sub key_up { }
66 138
67sub button_up {
68 my ($widget, $sdlev) = @_;
69}
70
71sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
72sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
73sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
74sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
75sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
76 144
77sub draw { 145sub draw {
78 my ($self) = @_; 146 my ($self) = @_;
79 147
80 glPushMatrix; 148 glPushMatrix;
81 glTranslate $self->{x}, $self->{y}, 0; 149 glTranslate $self->{x}, $self->{y}, 0;
82 $self->_draw; 150 $self->_draw;
151 if ($self == $HOVER) {
152 glColor 1, 1, 1, 0.4;
153 glEnable GL_BLEND;
154 glBegin GL_QUADS;
155 glVertex 0 , 0;
156 glVertex $self->{w}, 0;
157 glVertex $self->{w}, $self->{h};
158 glVertex 0 , $self->{h};
159 glEnd;
160 glDisable GL_BLEND;
161 }
83 glPopMatrix; 162 glPopMatrix;
84} 163}
85 164
86sub _draw { 165sub _draw {
87 my ($self) = @_; 166 my ($self) = @_;
… …
136 #$self->deactivate; 215 #$self->deactivate;
137} 216}
138 217
139############################################################################# 218#############################################################################
140 219
220package CFClient::Widget::Empty;
221
222our @ISA = CFClient::Widget::;
223
224sub size_request {
225 (0, 0)
226}
227
228sub draw {
229}
230
231#############################################################################
232
141package Crossfire::Client::Widget::Container; 233package CFClient::Widget::Container;
142 234
143our @ISA = Crossfire::Client::Widget::; 235our @ISA = CFClient::Widget::;
144 236
145sub new { 237sub new {
146 my ($class, @widgets) = @_; 238 my ($class, %arg) = @_;
147 239
240 my $children = delete $arg{children} || [];
241
148 my $self = $class->SUPER::new (children => []); 242 my $self = $class->SUPER::new (children => [], %arg);
149 $self->add ($_) for @widgets; 243 $self->add ($_) for @$children;
150 244
151 $self 245 $self
152} 246}
153 247
154sub add { 248sub add {
155 my ($self, $chld, $expand) = @_; 249 my ($self, $chld, $expand) = @_;
156 250
157 $chld->{expand} = $expand; 251 $chld->{expand} = $expand;
158 $chld->set_parent ($self); 252 $chld->set_parent ($self);
159 253
160 @{$self->{children}} = 254 $self->{children} = [
161 sort { $a->{z} <=> $b->{z} } 255 sort { $a->{z} <=> $b->{z} }
162 @{$self->{children}}, $chld; 256 @{$self->{children}}, $chld
257 ];
163 258
164 $self->size_allocate ($self->{w}, $self->{h}); 259 $self->size_allocate ($self->{w}, $self->{h})
260 if $self->{w}; #TODO: check for "realised state"
165} 261}
166 262
167sub remove { 263sub remove {
168 my ($self, $widget) = @_; 264 my ($self, $widget) = @_;
169 265
… …
173} 269}
174 270
175sub find_widget { 271sub find_widget {
176 my ($self, $x, $y) = @_; 272 my ($self, $x, $y) = @_;
177 273
274 $x -= $self->{x};
275 $y -= $self->{y};
276
178 my $res; 277 my $res;
179 278
180 for (@{ $self->{children} }) { 279 for (reverse @{ $self->{children} }) {
181 $res = $_->find_widget ($x, $y) 280 $res = $_->find_widget ($x, $y)
182 and return $res; 281 and return $res;
183 } 282 }
184 283
185 () 284 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
186}
187
188sub size_request {
189 my ($self) = @_;
190
191 my ($hs, $ws) = (0, 0);
192 for (@{$self->{children} || []}) {
193 my ($w, $h) = $_->size_request;
194 $hs += $h;
195 if ($ws < $w) { $ws = $w }
196 }
197
198 return ($ws, $hs);
199} 285}
200 286
201sub _draw { 287sub _draw {
202 my ($self) = @_; 288 my ($self) = @_;
203 289
204 $_->draw for @{$self->{children}}; 290 $_->draw for @{$self->{children}};
205} 291}
206 292
207############################################################################# 293#############################################################################
208 294
209package Crossfire::Client::Widget::Bin; 295package CFClient::Widget::Bin;
210 296
211our @ISA = Crossfire::Client::Widget::Container::; 297our @ISA = CFClient::Widget::Container::;
298
299sub new {
300 my ($class, %arg) = @_;
301
302 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::;
303
304 $class->SUPER::new (children => [$child], %arg)
305}
306
307sub add {
308 my ($self, $widget) = @_;
309
310 $self->{children} = [];
311
312 $self->SUPER::add ($widget);
313}
314
315sub remove {
316 my ($self, $widget) = @_;
317
318 $self->SUPER::remove ($widget);
319
320 $self->{children} = [new CFClient::Widget::Empty]
321 unless @{$self->{children}};
322}
212 323
213sub child { $_[0]->{children}[0] } 324sub child { $_[0]->{children}[0] }
214 325
215sub size_request { 326sub size_request {
216 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 327 $_[0]{children}[0]->size_request if $_[0]{children}[0];
217} 328}
218 329
219sub size_allocate { 330sub size_allocate {
220 my ($self, $w, $h) = @_; 331 my ($self, $w, $h) = @_;
332
221 $self->SUPER::size_allocate ($w, $h); 333 $self->SUPER::size_allocate ($w, $h);
222 $self->{children}[0]->size_allocate ($w, $h) 334 $self->{children}[0]->size_allocate ($w, $h)
223 if $self->{children}[0] 335 if $self->{children}[0]
224} 336}
225 337
226############################################################################# 338#############################################################################
227 339
228package Crossfire::Client::Widget::Toplevel; 340package CFClient::Widget::Window;
229 341
230our @ISA = Crossfire::Client::Widget::Container::; 342our @ISA = CFClient::Widget::Bin::;
343
344use SDL::OpenGL;
345
346sub new {
347 my ($class, %arg) = @_;
348
349 my $self = $class->SUPER::new (%arg);
350}
231 351
232sub update { 352sub update {
233 my ($self) = @_; 353 my ($self) = @_;
234 354
235 ::refresh (); 355 # we want to do this delayed...
236}
237
238#############################################################################
239
240package Crossfire::Client::Widget::Window;
241
242our @ISA = Crossfire::Client::Widget::Bin::;
243
244use SDL::OpenGL;
245
246sub add {
247 my ($self, $chld) = @_;
248 warn "ADD $chld\n";
249 $self->SUPER::add ($chld);
250 $chld->set_parent ($self);
251}
252
253sub remove {
254 my ($self) = @_;
255 # TODO FIXME: removing a child from a window will crash, see render_chld
256 # $self->update;
257}
258
259sub update {
260 my ($self) = @_;
261 $self->render_chld; 356 $self->render_chld;
357 $self->SUPER::update;
262} 358}
263 359
264sub render_chld { 360sub render_chld {
265 my ($self) = @_; 361 my ($self) = @_;
266 my $chld = $self->get;
267 my ($w, $h) = $self->size_request;
268 362
269 require Carp;
270 Carp::cluck "RENDERCHI $w $h";
271 warn "RENDERCHI $w $h\n";
272 $self->{texture} = 363 $self->{texture} =
273 Crossfire::Client::Texture->new_from_opengl ( 364 CFClient::Texture->new_from_opengl (
274 $w, $h, sub { $chld->draw } 365 $self->{w}, $self->{h}, sub { $self->child->draw }
275 ); 366 );
276 $self->{texture}->upload;
277}
278
279sub size_request {
280 my ($self) = @_;
281 ($self->w, $self->h)
282} 367}
283 368
284sub size_allocate { 369sub size_allocate {
285 my ($self, $w, $h) = @_; 370 my ($self, $w, $h) = @_;
286 371
287 $self->w ($w); 372 $self->{w} = $w;
288 $self->h ($h); 373 $self->{h} = $h;
374
289 $self->get->size_allocate ($w, $h); 375 $self->child->size_allocate ($w, $h);
290 376
291 $self->update; #TODO: Move this to the size_request event propably? 377 $self->render_chld;
292} 378}
293 379
294sub _draw { 380sub _draw {
295 my ($self) = @_; 381 my ($self) = @_;
296 382
… …
300 or return; 386 or return;
301 387
302 glEnable GL_BLEND; 388 glEnable GL_BLEND;
303 glEnable GL_TEXTURE_2D; 389 glEnable GL_TEXTURE_2D;
304 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 390 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
305 glBindTexture GL_TEXTURE_2D, $tex->{name};
306 391
307 glBegin GL_QUADS; 392 $tex->draw_quad (0, 0, $w, $h);
308 glTexCoord 0, 0; glVertex 0, 0;
309 glTexCoord 0, 1; glVertex 0, $h;
310 glTexCoord 1, 1; glVertex $w, $h;
311 glTexCoord 1, 0; glVertex $w, 0;
312 glEnd;
313 393
314 glDisable GL_BLEND; 394 glDisable GL_BLEND;
315 glDisable GL_TEXTURE_2D; 395 glDisable GL_TEXTURE_2D;
316} 396}
317 397
318############################################################################# 398#############################################################################
319 399
320package Crossfire::Client::Widget::Frame; 400package CFClient::Widget::Frame;
321 401
322our @ISA = Crossfire::Client::Widget::Bin::; 402our @ISA = CFClient::Widget::Bin::;
323 403
324use SDL::OpenGL; 404use SDL::OpenGL;
325 405
326sub size_request { 406sub size_request {
327 my ($self) = @_; 407 my ($self) = @_;
… …
333 map { $_ + 4 } $chld->size_request; 413 map { $_ + 4 } $chld->size_request;
334} 414}
335 415
336sub size_allocate { 416sub size_allocate {
337 my ($self, $w, $h) = @_; 417 my ($self, $w, $h) = @_;
338 418
339 $self->w ($w); 419 $self->{w} = $w;
340 $self->h ($h); 420 $self->{h} = $h;
341 421
342 $self->child->size_allocate ($w - 4, $h - 4); 422 $self->child->size_allocate ($w - 4, $h - 4);
343 $self->child->move (2, 2); 423 $self->child->move (2, 2);
344} 424}
345 425
… …
350 430
351 my ($w, $h) = $chld->size_request; 431 my ($w, $h) = $chld->size_request;
352 432
353 glBegin GL_QUADS; 433 glBegin GL_QUADS;
354 glColor 0, 0, 0; 434 glColor 0, 0, 0;
355 glTexCoord 0, 0; glVertex 0 , 0; 435 glVertex 0 , 0;
356 glTexCoord 0, 1; glVertex 0 , $h + 4; 436 glVertex 0 , $h + 4;
357 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 437 glVertex $w + 4 , $h + 4;
358 glTexCoord 1, 0; glVertex $w + 4 , 0; 438 glVertex $w + 4 , 0;
359 glEnd; 439 glEnd;
360 440
361 $chld->draw; 441 $chld->draw;
362} 442}
363 443
364############################################################################# 444#############################################################################
365 445
366package Crossfire::Client::Widget::FancyFrame; 446package CFClient::Widget::FancyFrame;
367 447
368our @ISA = Crossfire::Client::Widget::Frame::; 448our @ISA = CFClient::Widget::Bin::;
369 449
370use SDL::OpenGL; 450use SDL::OpenGL;
371 451
372sub new { 452my @tex =
373 my ($self, $theme) = @_;
374 $self = $self->SUPER::new;
375
376 $self->{txts} = [
377 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 453 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
378 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/ 454 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
379 ];
380 $self
381}
382 455
383sub size_request { 456sub size_request {
384 my ($self) = @_; 457 my ($self) = @_;
385 458
386 my ($w, $h) = $self->SUPER::size_request; 459 my ($w, $h) = $self->SUPER::size_request;
387 460
388 $h += $self->{txts}->[1]->{height}; 461 $h += $tex[1]->{height};
389 $h += $self->{txts}->[4]->{height}; 462 $h += $tex[4]->{height};
390 $w += $self->{txts}->[2]->{width}; 463 $w += $tex[2]->{width};
391 $w += $self->{txts}->[3]->{width}; 464 $w += $tex[3]->{width};
392 465
393 ($w, $h) 466 ($w, $h)
394} 467}
395 468
396sub size_allocate { 469sub size_allocate {
397 my ($self, $w, $h) = @_; 470 my ($self, $w, $h) = @_;
398 471
399 $self->w ($w); 472 $self->SUPER::size_allocate ($w, $h);
400 $self->h ($h); 473
401 $h -= $self->{txts}->[1]->{height}; 474 $h -= $tex[1]->{height};
402 $h -= $self->{txts}->[4]->{height}; 475 $h -= $tex[4]->{height};
403 $w -= $self->{txts}->[2]->{width}; 476 $w -= $tex[2]->{width};
404 $w -= $self->{txts}->[3]->{width}; 477 $w -= $tex[3]->{width};
405 478
406 $h = $h < 0 ? 0 : $h; 479 $h = $h < 0 ? 0 : $h;
407 $w = $w < 0 ? 0 : $w; 480 $w = $w < 0 ? 0 : $w;
408 warn "CHILD:$w $h\n"; 481
482 my $child = $self->child;
483
409 $self->child->size_allocate ($w, $h); 484 $child->size_allocate ($w, $h);
410 $self->child->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); 485 $child->move ($tex[3]->{width}, $tex[1]->{height});
411} 486}
412 487
413sub _draw { 488sub _draw {
414 my ($self) = @_; 489 my ($self) = @_;
415 490
416 my ($w, $h) = ($self->w, $self->h); 491 my ($w, $h) = ($self->{w}, $self->{h});
417 my ($cw, $ch) = ($self->child->w, $self->child->h); 492 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
418 493
419 glEnable GL_BLEND; 494 glEnable GL_BLEND;
420 glEnable GL_TEXTURE_2D; 495 glEnable GL_TEXTURE_2D;
421 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 496 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
422 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 497 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
423 498
424 my $top = $self->{txts}->[1]; 499 my $top = $tex[1];
425 glBindTexture GL_TEXTURE_2D, $top->{name}; 500 $top->draw_quad (0, 0, $w, $top->{height});
426 501
427 glBegin GL_QUADS;
428 glTexCoord 0, 0; glVertex 0 , 0;
429 glTexCoord 0, 1; glVertex 0 , $top->{height};
430 glTexCoord 1, 1; glVertex $w , $top->{height};
431 glTexCoord 1, 0; glVertex $w , 0;
432 glEnd;
433
434 my $left = $self->{txts}->[3]; 502 my $left = $tex[3];
435 glBindTexture GL_TEXTURE_2D, $left->{name}; 503 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
436 504
437 glBegin GL_QUADS;
438 glTexCoord 0, 0; glVertex 0 , $top->{height};
439 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
440 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
441 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
442 glEnd;
443
444 my $right = $self->{txts}->[2]; 505 my $right = $tex[2];
445 glBindTexture GL_TEXTURE_2D, $right->{name}; 506 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
446 507
447 glBegin GL_QUADS;
448 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
449 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
450 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
451 glTexCoord 1, 0; glVertex $w , $top->{height};
452 glEnd;
453
454 my $bottom = $self->{txts}->[4]; 508 my $bottom = $tex[4];
455 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 509 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
456 510
457 glBegin GL_QUADS; 511 my $bg = $tex[0];
458 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
459 glTexCoord 0, 1; glVertex 0 , $h;
460 glTexCoord 1, 1; glVertex $w , $h;
461 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
462 glEnd;
463
464 my $bg = $self->{txts}->[0];
465 glBindTexture GL_TEXTURE_2D, $bg->{name}; 512 glBindTexture GL_TEXTURE_2D, $bg->{name};
466 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
467 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 514 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 515 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
469 516
470 my $rep_x = $cw / $bg->{width}; 517 my $rep_x = $cw / $bg->{width};
471 my $rep_y = $ch / $bg->{height}; 518 my $rep_y = $ch / $bg->{height};
472 519
473 glBegin GL_QUADS; 520 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
474 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
475 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
476 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
477 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
478 glEnd;
479 521
480 glDisable GL_BLEND; 522 glDisable GL_BLEND;
481 glDisable GL_TEXTURE_2D; 523 glDisable GL_TEXTURE_2D;
482 524
483 $self->child->draw; 525 $self->child->draw;
484 526
485} 527}
486 528
487############################################################################# 529#############################################################################
488 530
489package Crossfire::Client::Widget::Table; 531package CFClient::Widget::Table;
490 532
491our @ISA = Crossfire::Client::Widget::Bin::; 533our @ISA = CFClient::Widget::Bin::;
492 534
493use SDL::OpenGL; 535use SDL::OpenGL;
494 536
495sub add { 537sub add {
496 my ($self, $x, $y, $chld) = @_; 538 my ($self, $x, $y, $chld) = @_;
… …
571 } 613 }
572} 614}
573 615
574############################################################################# 616#############################################################################
575 617
576package Crossfire::Client::Widget::VBox; 618package CFClient::Widget::VBox;
577 619
578our @ISA = Crossfire::Client::Widget::Container::; 620our @ISA = CFClient::Widget::Container::;
579 621
580use SDL::OpenGL; 622use SDL::OpenGL;
623
624sub size_request {
625 my ($self) = @_;
626
627 my @alloc = map [$_->size_request], @{$self->{children}};
628
629 (
630 (List::Util::max map $_->[0], @alloc),
631 (List::Util::sum map $_->[1], @alloc),
632 )
633}
581 634
582sub size_allocate { 635sub size_allocate {
583 my ($self, $w, $h) = @_; 636 my ($self, $w, $h) = @_;
584 637
585 $self->w ($w); 638 $self->w ($w);
… …
618 $y += $h; 671 $y += $h;
619 } 672 }
620 } 673 }
621} 674}
622 675
623sub _draw {
624 my ($self) = @_;
625
626 my ($x, $y);
627 for (@{$self->{children} || []}) {
628 $_->draw;
629 $y += $_->h;
630 }
631}
632
633############################################################################# 676#############################################################################
634 677
635package Crossfire::Client::Widget::Label; 678package CFClient::Widget::Label;
636 679
637our @ISA = Crossfire::Client::Widget::; 680our @ISA = CFClient::Widget::;
638 681
639use SDL::OpenGL; 682use SDL::OpenGL;
640 683
641sub new { 684sub new {
642 my ($class, $x, $y, $z, $height, $text) = @_; 685 my ($class, %arg) = @_;
643 686
644 # TODO: color, and make height, xyz etc. optional 687 # TODO: color, and make height, xyz etc. optional
645 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 688 my $self = $class->SUPER::new (
689 color => [1, 1, 1],
690 height => $::FONTSIZE,
691 text => "",
692 layout => new CFClient::Layout,
693 %arg
694 );
646 695
647 $self->set_text ($text); 696 $self->set_text ($self->{text});
648 697
649 $self 698 $self
650} 699}
651 700
652sub set_text { 701sub set_text {
653 my ($self, $text) = @_; 702 my ($self, $text) = @_;
654 703
655 $self->{text} = $text; 704 $self->{text} = $text;
656 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 705 $self->{layout}->set_markup ($text);
657 706
658 $self->update; 707 delete $self->{texture};
659} 708}
660 709
661sub get_text { 710sub get_text {
662 my ($self, $text) = @_; 711 my ($self, $text) = @_;
663 712
… …
665} 714}
666 715
667sub size_request { 716sub size_request {
668 my ($self) = @_; 717 my ($self) = @_;
669 718
670 ( 719 $self->{layout}->set_width;
720 $self->{layout}->set_height ($self->{height});
721 $self->{layout}->size
722# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
723# (
671 $self->{texture}{width}, 724# $self->{texture}{width},
672 $self->{texture}{height}, 725# $self->{texture}{height},
673 ) 726# )
727# } else {
728# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
729#
730# ($w, $h)
731# }
732}
733
734sub size_allocate {
735 my ($self, $w, $h) = @_;
736
737 $self->SUPER::size_allocate ($w, $h);
738 delete $self->{texture};
674} 739}
675 740
676sub _draw { 741sub _draw {
677 my ($self) = @_; 742 my ($self) = @_;
678 743
679 my $tex = $self->{texture}; 744 my $tex = $self->{texture} ||= do {
745 $self->{layout}->set_width ($self->{w});
746 new_from_layout CFClient::Texture $self->{layout};
747 };
680 748
681 glEnable GL_BLEND; 749 glEnable GL_BLEND;
682 glEnable GL_TEXTURE_2D; 750 glEnable GL_TEXTURE_2D;
683 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 751 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
684 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 752 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
685 glBindTexture GL_TEXTURE_2D, $tex->{name};
686 753
687 glColor 1, 0, 0, 1; # TODO color 754 glColor @{$self->{color}};
688 755
689 glBegin GL_QUADS; 756 $tex->draw_quad (0, 0);
690 glTexCoord 0, 0; glVertex 0 , 0;
691 glTexCoord 0, 1; glVertex 0 , $tex->{height};
692 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
693 glTexCoord 1, 0; glVertex $tex->{width}, 0;
694 glEnd;
695 757
696 glDisable GL_BLEND; 758 glDisable GL_BLEND;
697 glDisable GL_TEXTURE_2D; 759 glDisable GL_TEXTURE_2D;
698} 760}
699 761
700############################################################################# 762#############################################################################
701 763
702package Crossfire::Client::Widget::TextEntry; 764package CFClient::Widget::Entry;
703 765
704our @ISA = Crossfire::Client::Widget::Label::; 766our @ISA = CFClient::Widget::Label::;
705 767
706use SDL; 768use SDL;
707use SDL::OpenGL; 769use SDL::OpenGL;
708 770
709sub key_down { 771sub key_down {
710 my ($self, $ev) = @_; 772 my ($self, $ev) = @_;
711 773
712 my $mod = $ev->key_mod; 774 my $mod = $ev->key_mod;
713 my $sym = $ev->key_sym; 775 my $sym = $ev->key_sym;
714 776
715 $ev->set_unicode (1);
716 my $uni = $ev->key_unicode; 777 my $uni = $ev->key_unicode;
717 778
718 my $text = $self->get_text; 779 my $text = $self->get_text;
719 780
720 if ($sym == SDLK_BACKSPACE) { 781 if ($sym == SDLK_BACKSPACE) {
721 substr $text, -1, 1, ''; 782 substr $text, -1, 1, '';
722
723 } elsif ($uni) { 783 } elsif ($uni) {
724 $text .= chr $uni; 784 $text .= chr $uni;
725 } 785 }
786
726 $self->set_text ($text); 787 $self->set_text ($text);
727} 788}
728 789
729############################################################################# 790sub button_down {
791 my ($self, $ev) = @_;
730 792
793 $self->focus_in;
794}
795
796sub mouse_motion {
797 my ($self, $ev, $x, $y) = @_;
798 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
799}
800
801sub _draw {
802 my ($self) = @_;
803
804 if ($FOCUS == $self) {
805 glColor 1, 1, 1;
806 } else {
807 glColor 0.7, 0.7, 0.7;
808 }
809
810 glBegin GL_QUADS;
811 glVertex 0 , 0;
812 glVertex 0 , $self->{h} - 1;
813 glVertex $self->{w} - 1, $self->{h} - 1;
814 glVertex $self->{w} - 1, 0;
815 glEnd;
816
817 $self->SUPER::_draw;
818}
819
820#############################################################################
821
731package Crossfire::Client::Widget::MapWidget; 822package CFClient::Widget::MapWidget;
732 823
733use strict; 824use strict;
734 825
735use List::Util qw(min max); 826use List::Util qw(min max);
736 827
737use SDL; 828use SDL;
738use SDL::OpenGL; 829use SDL::OpenGL;
739use SDL::OpenGL::Constants; 830use SDL::OpenGL::Constants;
740 831
741our @ISA = Crossfire::Client::Widget::; 832our @ISA = CFClient::Widget::;
833
834sub new {
835 my $class = shift;
836
837 $class->SUPER::new (
838 z => -1,
839 list => (glGenLists 1),
840 @_
841 )
842}
742 843
743sub key_down { 844sub key_down {
744 print "MAPKEYDOWN\n"; 845 print "MAPKEYDOWN\n";
745} 846}
746 847
747sub key_up { 848sub key_up {
748} 849}
749 850
750sub size_request { 851sub size_request {
751 852 (
853 1 + int $::WIDTH / 32,
854 1 + int $::HEIGHT / 32,
855 )
752} 856}
753 857
754sub size_allocate { 858sub update {
859 my ($self) = @_;
860
861 $self->{need_update} = 1;
755} 862}
756 863
757sub _draw { 864sub _draw {
758 my ($self) = @_; 865 my ($self) = @_;
759 866
867 if (delete $self->{need_update}) {
868 glNewList $self->{list}, GL_COMPILE;
869
760 my $mx = $::CONN->{mapx}; 870 my $mx = $::CONN->{mapx};
761 my $my = $::CONN->{mapy}; 871 my $my = $::CONN->{mapy};
762 872
763 my $map = $::CONN->{map}; 873 my $map = $::CONN->{map};
764 874
765 my ($xofs, $yofs); 875 my ($xofs, $yofs);
766 876
767 my $sw = 1 + int $::WIDTH / 32; 877 my $sw = 1 + int $::WIDTH / 32;
768 my $sh = 1 + int $::HEIGHT / 32; 878 my $sh = 1 + int $::HEIGHT / 32;
769 879
770 if ($::CONN->{mapw} > $sw) { 880 if ($::CONN->{mapw} > $sw) {
771 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 881 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
772 } else { 882 } else {
773 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 883 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
774 } 884 }
775 885
776 if ($::CONN->{maph} > $sh) { 886 if ($::CONN->{maph} > $sh) {
777 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 887 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
778 } else { 888 } else {
779 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 889 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
780 } 890 }
781 891
782 glEnable GL_TEXTURE_2D; 892 glEnable GL_TEXTURE_2D;
783 glEnable GL_BLEND; 893 glEnable GL_BLEND;
784 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 894 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
785 895
786 my $sw4 = ($sw + 3) & ~3; 896 my $sw4 = ($sw + 3) & ~3;
787 my $lighting = "\x00" x ($sw4 * $sh); 897 my $darkness = "\x00" x ($sw4 * $sh);
788 898
789 for my $x (0 .. $sw - 1) { 899 for my $x (0 .. $sw - 1) {
900 my $row = $map->[$x + $xofs];
790 for my $y (0 .. $sh - 1) { 901 for my $y (0 .. $sh - 1) {
791 902
792 my $cell = $map->[$x + $xofs][$y + $yofs] 903 my $cell = $row->[$y + $yofs]
793 or next; 904 or next;
794 905
795 my $darkness = $cell->[0] * (1 / 255); 906 my $dark = $cell->[0];
796 if ($darkness < 0) { 907 if ($dark < 0) {
797 $darkness = 0.15; 908 substr $darkness, $y * $sw4 + $x, 1, chr 224;
909 } else {
910 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
798 } 911 }
799 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
800 912
801 for my $num (grep $_, @$cell[1,2,3]) { 913 for my $num (grep $_, @$cell[1,2,3]) {
802 my $tex = $::CONN->{face}[$num]{texture} || next; 914 my $tex = $::CONN->{face}[$num]{texture} || next;
803 915
804 glBindTexture GL_TEXTURE_2D, $tex->{name};
805
806 my $w = $tex->{width}; 916 my $w = $tex->{width};
807 my $h = $tex->{height}; 917 my $h = $tex->{height};
808 918
809 my $px = ($x + 1) * 32 - $w; 919 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
810 my $py = ($y + 1) * 32 - $h;
811
812 glBegin GL_QUADS;
813 glTexCoord 0, 0; glVertex $px , $py;
814 glTexCoord 0, 1; glVertex $px , $py + $h;
815 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
816 glTexCoord 1, 0; glVertex $px + $w, $py;
817 glEnd; 920 }
818 } 921 }
819 } 922 }
820 }
821 923
822# if (1) { # higher quality darkness 924# if (1) { # higher quality darkness
823# $lighting =~ s/(.)/$1$1$1/gs; 925# $lighting =~ s/(.)/$1$1$1/gs;
824# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 926# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
825# 927#
… …
827# 929#
828# $lighting = $pb->get_pixels; 930# $lighting = $pb->get_pixels;
829# $lighting =~ s/(.)../$1/gs; 931# $lighting =~ s/(.)../$1/gs;
830# } 932# }
831 933
832 $lighting = new Crossfire::Client::Texture
833 width => $sw4,
834 height => $sh,
835 data => $lighting,
836 internalformat => GL_ALPHA4,
837 format => GL_ALPHA;
838
839 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 934 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
840 glColor 0, 0, 0, 0.75;
841 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 935 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
842 glBindTexture GL_TEXTURE_2D, $lighting->{name};
843 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
844 glBegin GL_QUADS;
845 glTexCoord 0, 0; glVertex 0 , 0;
846 glTexCoord 0, 1; glVertex 0 , $sh * 32;
847 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
848 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
849 glEnd;
850 936
937 $darkness = new CFClient::Texture
938 width => $sw4,
939 height => $sh,
940 data => $darkness,
941 internalformat => GL_ALPHA,
942 format => GL_ALPHA;
943
944 glColor 0.45, 0.45, 0.45, 1;
945 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
946
851 glDisable GL_TEXTURE_2D; 947 glDisable GL_TEXTURE_2D;
852 glDisable GL_BLEND; 948 glDisable GL_BLEND;
949
950 glEndList;
951 }
952
953 glCallList $self->{list};
853} 954}
854 955
855my %DIR = ( 956my %DIR = (
856 SDLK_KP8, [1, "north"], 957 SDLK_KP8, [1, "north"],
857 SDLK_KP9, [2, "northeast"], 958 SDLK_KP9, [2, "northeast"],
… …
903 } 1004 }
904} 1005}
905 1006
906############################################################################# 1007#############################################################################
907 1008
908package Crossfire::Client::Widget::Animator; 1009package CFClient::Widget::Animator;
909 1010
910use SDL::OpenGL; 1011use SDL::OpenGL;
911 1012
912our @ISA = Crossfire::Client::Widget::Bin::; 1013our @ISA = CFClient::Widget::Bin::;
913 1014
914sub moveto { 1015sub moveto {
915 my ($self, $x, $y) = @_; 1016 my ($self, $x, $y) = @_;
916 1017
917 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1018 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
918 $self->{speed} = 0.2; 1019 $self->{speed} = 0.001;
919 $self->{time} = 1; 1020 $self->{time} = 1;
920 1021
921 ::animation_start $self; 1022 ::animation_start $self;
922} 1023}
923 1024
… …
938 1039
939sub _draw { 1040sub _draw {
940 my ($self) = @_; 1041 my ($self) = @_;
941 1042
942 glPushMatrix; 1043 glPushMatrix;
943 glRotate $self->{time} * 10000, 0, 1, 0; 1044 glRotate $self->{time} * 1000, 0, 1, 0;
944 $self->{children}[0]->draw; 1045 $self->{children}[0]->draw;
945 glPopMatrix; 1046 glPopMatrix;
946} 1047}
947 1048
9481; 1049#############################################################################
949 1050
1051package CFClient::Widget::Toplevel;
1052
1053our @ISA = CFClient::Widget::Container::;
1054
1055sub size_request {
1056 ($::WIDTH, $::HEIGHT)
1057}
1058
1059sub size_allocate {
1060 my ($self, $w, $h) = @_;
1061
1062 $self->SUPER::size_allocate ($w, $h);
1063
1064 $_->size_allocate ($_->size_request)
1065 for @{$self->{children}};
1066}
1067
1068sub translate {
1069 my ($self, $x, $y) = @_;
1070
1071 ($x, $y)
1072}
1073
1074sub update {
1075 my ($self) = @_;
1076
1077 $self->size_allocate ($self->size_request);
1078 ::refresh ();
1079}
1080
1081sub add {
1082 my ($self, $widget) = @_;
1083
1084 $self->SUPER::add ($widget);
1085
1086 $widget->size_allocate ($widget->size_request);
1087}
1088
1089sub draw {
1090 my ($self) = @_;
1091
1092 $self->_draw;
1093}
1094
1095#############################################################################
1096
1097package CFClient::Widget;
1098
1099$TOPLEVEL = new CFClient::Widget::Toplevel;
1100
11011
1102

Diff Legend

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