sync with the 2.0 branch
jump to
@@ -49,37 +49,42 @@ - for noticing all of the little things
nls contributors: Mads Martin Joergensen <mmj@suse.de> - - Danish (da_DK) nls support + - Danish (da_DK) Jan Schaumann <jschauma@netmeister.org> - - German (de_DE) nls support + - German (de_DE) Adriano Varoli Piazza <adrianovaroli@redusers.com> - - Spanish nls support (submitted as es_AR, ES and MX) + - Spanish (submitted as es_AR, ES and MX) Duret Bertrand <bertrand.duret@libertysurf.fr> - - updated French (fr_FR) nls and added French man pages + - updated French (fr_FR) Bodnar Istvan <piggy@dub.hu> - - Hungarian (hu_HU) support + - Hungarian (hu_HU) Luca Marrazzo <marra.luca@libero.it> - - Italian (it_IT) nls support + - Italian (it_IT) SATO Satoru <ssato@adachi.ne.jp> - - Japanese (ja_JP) nls support and man pages + - Japanese (ja_JP) Hyun Suk Noh <tzesti@users.sourceforge.net> - - Korean (ko_KR) nls support + - Korean (ko_KR) Wilbert Berendsen <wbsoft@xs4all.nl> - - man pages and Dutch (nl_NL) nls support + - Dutch (nl_NL) Řyvind Stegard <oyvind.stegard@bluezone.no> - - Norwegian (no_NO) nls support - Wojciech Krygier <wkrygie@kis.p.lodz.pl> - - Polish (pl_PL) nls support + - Norwegian (no_NO) + Wojciech Krygier <wkrygie@kis.p.lodz.pl> + - Polish (pl_PL) Ciprian Popovici <ciprian@zuavra.net> - - Romanian (ro_RO) nls support + - Romanian (ro_RO) + Michail A. Rusinov <one@da.ru> + Dmitriy N. Rusinov <rusinov@udm.net> + - Russian (ru_RU) + Marian Andre <andre@intrak.sk> + - Slovakian (sk_SK) Ales Kosir <ales.kosir@telemach.net> - - Slovenian man pages and (sl_SI) nls support + - Slovenian (sl_SI) Volodymyr M. Lisivka <lvm@mystery.lviv.net> - - Ukrainian (uk_UA) nls support + - Ukrainian (uk_UA) Wang Tiejun <wtj@dept3.buaa.edu.cn> - - Chinese (zh_CN) nls support + - Chinese (zh_CN) Moto Chen <han_yi_chen@yahoo.com.tw> - - Taiwan Chinese (zh_TW) support + - Taiwan Chinese (zh_TW) Past Contributors: Jeffrey Sean Connell <ankh@canuck.gen.nz>
@@ -292,6 +292,7 @@ nls/nl_NL/Makefile
nls/pt_BR/Makefile nls/ro_RO/Makefile nls/ru_RU/Makefile +nls/sk_SK/Makefile nls/sl_SI/Makefile nls/sv_SE/Makefile nls/tr_TR/Makefile
@@ -22,7 +22,7 @@ \fB\-c\fR, \fB\-center\fR \fIimage\fR
\fIimage\fR is centered on the desktop. .TP \fB\-e\fR, \fB\-exec\fR \fIprogram\fR \fIoptions\fR \fIfallback\-\fIarg\fR \fIimage\fR -This option tells \fBbsetbg\fR to run a seperate command by executing \fIprogram\fR with +This option tells \fBbsetbg\fR to run a separate command by executing \fIprogram\fR with \fIoptions\fR, where \fIoptions\fR are arguments to \fIprogram\fR. If a \fIfallback\-arg\fR is supplied (\fB\-full\fR, \fB\-tile\fR, or \fB\-center\fR@@ -43,6 +43,14 @@ \fB\-g\fR, \fB\-generate\fR \fIlist\fR
Output a list of default configuration values, suitable for redirecting into \fI~/.bsetbgrc\fR. Any arguments that are supplied will be considered applications to search for in the system path, overriding \fBbsetbg\fR's internal defaults. +.TP +\fB\-app\fR \fIimageApp\fR +Use this flag to specify which image application to use. This +application may be one of the pre-defined list or any application +capable of displaying an image on the root window. This flag may be +used in conjunction with passing application specific parameters to +the application, in which +case they should be enclosed in double quotes. .TP \fB\-v\fR, \fB\-version\fR Output version number.@@ -118,7 +126,11 @@ -center foo.png
An example in which bsetbg creates a configuration file using xv and qiv: - bsetbg -g xv qiv > ~/.bsetbgrc + bsetbg -g xv qiv > ~/.bsetbgrc + +An example of the use of the \fB-app\fR argument: + + bsetbg -app qiv "-o rgb:d6/c5/a2 -x" -c foo.png .SH AUTHOR The author of
@@ -4,7 +4,8 @@ $ #MustSpecify
# %s: error: must specify one of: -solid, -mod, -gradient\n $ #Usage # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ - -display <string> display connection\n\ + (c) 2001-2002 Sean 'Shaleh' Perry\n\n\ + -display <string> use display connection\n\ -mod <x> <y> modula pattern\n\ -foreground, -fg <color> modula foreground color\n\ -background, -bg <color> modula background color\n\n\
@@ -2,7 +2,8 @@ # nls/Makefile.am for Blackbox - an X11 Window Manager
NLSTEST = @NLS@ SUBDIRS = C da_DK de_DE es_AR es_ES et_EE fr_FR hu_HU it_IT ja_JP ko_KR nl_NL \ - no_NO pl_PL pt_BR ro_RO ru_RU sl_SI sv_SE tr_TR uk_UA zh_CN zh_TW + no_NO pl_PL pt_BR ro_RO ru_RU sk_SK sl_SI sv_SE tr_TR uk_UA \ + zh_CN zh_TW MAINTAINERCLEANFILES = Makefile.in blackbox-nls.hh DISTCLEANFILES = blackbox-nls.hh
@@ -4,6 +4,7 @@ $ #MustSpecify
# %s: fejl: specificér en af fřlgende: -solid, -mod, -gradient\n $ #Usage # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ + (c) 2001-2002 Sean 'Shaleh' Perry\n\n\ -display <string> skćrmtilslutning\n\ -mod <x> <y> modula mřnster\n\ -foreground, -fg <color> modula foregrundsfarve\n\
@@ -4,6 +4,7 @@ $ #MustSpecify
# %s: error: must specify one of: -solid, -mod, -gradient\n $ #Usage # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ + (c) 2001-2002 Sean 'Shaleh' Perry\n\n\ -display <string> Display Verbindung\n\ -mod <x> <y> Modula Muster\n\ -foreground, -fg <color> Modula Vordergrund Farbe\n\
@@ -4,6 +4,7 @@ $ #MustSpecify
# %s: error: debe especificarse uno entre: -solid, -mod, -gradient\n $ #Usage # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ + (c) 2001-2002 Sean 'Shaleh' Perry\n\n\ -display <string> conexión al display\n\ -mod <x> <y> diseńo de modula\n\ -foreground, -fg <color> color de primer plano de modula\n\
@@ -4,6 +4,7 @@ $ #MustSpecify
# %s: error: debe especificarse uno entre: -solid, -mod, -gradient\n $ #Usage # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ + (c) 2001-2002 Sean 'Shaleh' Perry\n\n\ -display <string> conexión de despliegue\n\ -mod <x> <y> diseńo de modula\n\ -foreground, -fg <color> color de primer plano de modula\n\
@@ -4,6 +4,7 @@ $ #MustSpecify
# %s: viga: pead määratlema ühe järgnevaist: -solid, -mod, -gradient\n $ #Usage # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ + (c) 2001-2002 Sean 'Shaleh' Perry\n\n\ -display <string> displei ühendus\n\ -mod <x> <y> moodula tapeet\n\ -foreground, -fg <color> esiplaani värvi moodula\n\
@@ -4,6 +4,7 @@ $ #MustSpecify
# %s: Erreur: il faut préciser : -solid, -mod, -gradient\n $ #Usage # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ + (c) 2001-2002 Sean 'Shaleh' Perry\n\n\ -display <chaîne> connexion ŕ l'affichage\n\ -mod <x> <y> motif\n\ -foreground, -fg <couleur> couleur d'avant plan\n\
@@ -4,6 +4,7 @@ $ #MustSpecify
# %s: hiba: kötelező megadni egy kapcsolót: -solid, -mod, -gradient\n $ #Usage # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ + (c) 2001-2002 Sean 'Shaleh' Perry\n\n\ -display <string> használandó kijelző\n\ -mod <x> <y> modula minta\n\ -foreground, -fg <color> modula előtér színe\n\
@@ -4,6 +4,7 @@ $ #MustSpecify
# %s: errore: deve essere specificato uno dei seguenti: -solid, -mod, -gradient\n $ #Usage # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ + (c) 2001-2002 Sean 'Shaleh' Perry\n\n\ -display <string> connessione display\n\ -mod <x> <y> modello di modula\n\ -foreground, -fg <color> colore di primo piano di modula\n\
@@ -4,6 +4,7 @@ $ #MustSpecify
# %s: Ľ¨ĽéĄź: źĄ¤ÎĂ植¤é°ě¤Ä¤ňÁŞÂň¤ˇ¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó: -solid, -mod, -gradient\n $ #Usage # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ + (c) 2001-2002 Sean 'Shaleh' Perry\n\n\ -display <string> ĽÇĽŁĽšĽ×ĽěĽ¤¤ňťŘÄę\n\ -mod <x> <y> ÁȤߚç¤ď¤ťĽŃĽżĄźĽó\n\ -foreground, -fg <color> ÁȤߚç¤ď¤ťÁ°ˇĘż§\n\
@@ -4,6 +4,7 @@ $ #MustSpecify
# %s: error: must specify one of: -solid, -mod, -gradient\n $ #Usage # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ + (c) 2001-2002 Sean 'Shaleh' Perry\n\n\ -display <string> display connection\n\ -mod <x> <y> modula pattern\n\ -foreground, -fg <color> modula foreground color\n\
@@ -4,6 +4,7 @@ $ #MustSpecify
# %s: fout: een van -solid, -mod, -gradient moet aangegeven worden\n $ #Usage # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ + (c) 2001-2002 Sean 'Shaleh' Perry\n\n\ -display <displaynaam> display verbinding\n\ -mod <x> <y> modula patroon\n\ -foreground, -fg <kleur> modula voorgrondkleur\n\
@@ -4,6 +4,7 @@ $ #MustSpecify
# %s: feil: én av fřlgende opsjoner mĺ spesifiseres: -solid, -mod, -gradient\n $ #Usage # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ + (c) 2001-2002 Sean 'Shaleh' Perry\n\n\ -display <string> skjermtilkobling3\n\ -mod <x> <y> modula mřnster\n\ -foreground, -fg <color> modula forgrunnsfarge\n\
@@ -16,7 +16,7 @@ # BImageControl::BImageControl: błąd alokacji mapy kolorów\n
$ #ColorAllocFail # BImageControl::BImageControl: alokacja koloru %d/%d/%d nieudana\n $ #PixmapRelease -# BImageControl::BImageControl: pixmap cache - zwalniam %d pixmap\n +# BImageControl::BImageControl: pixmap cache - zwalniam %d pixmap(y)\n $ #PixmapCacheLarge # BImageControl::renderImage: duża pamięć cache, wymuszam czyszczenie\n $ #ColorParseError
@@ -4,6 +4,7 @@ $ #MustSpecify
# %s: błąd: należy użyć jednej z opcji: -solid, -mod, -gradient\n $ #Usage # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ + (c) 2001-2002 Sean 'Shaleh' Perry\n\n\ -display <string> połącz z podanym panelem graficznym\n\ -mod <x> <y> współczynniki siatki typu modula\n\ -foreground, -fg <color> kolor siatki\n\
@@ -3,14 +3,14 @@
$ #XError # %s: X erro: %s(%d) opcodes %d/%d\n recurso 0x%lx\n $ #SignalCaught -# %s: recebeido sinal %d\n +# %s: sinal recebido %d\n $ #ShuttingDown -# desligando\n +# finalizando\n $ #Aborting -# abortando... gerando arquivo core\n +# abortando... descarregando memória\n $ #XConnectFail # BaseDisplay::BaseDisplay: conecçăo ao servidor X falhou.\n $ #CloseOnExecFail -# BaseDisplay::BaseDisplay: impossivel marcar a conexăo ao display como close-on-exec\n +# BaseDisplay::BaseDisplay: impossível exibir sinal de conexăo como fechar-em-execuçăo\n $ #BadWindowRemove -# BaseDisplay::eventLoop(): removendo má janela da trilha de eventos\n +# BaseDisplay::eventLoop(): removendo janela inválida da lista de eventos\n
@@ -9,16 +9,16 @@ # BImage::renderXImage: visual năo suportado\n
$ #ErrorCreatingPixmap # BImage::renderPixmap: erro criando pixmap\n $ #InvalidColormapSize -# BImageControl::BImageControl: mapa de cores de tamanho invalido %d (%d/%d/%d) - reduzindo\n +# BImageControl::BImageControl: tamanho invalido de mapa de cores %d (%d/%d/%d) - reduzindo\n $ #ErrorAllocatingColormap -# BImageControl::BImageControl: erro localizando mapa de cores\n +# BImageControl::BImageControl: erro determinando mapa de cores\n $ #ColorAllocFail -# BImageControl::BImageControl: falha localizando cor %d/%d/%d\n +# BImageControl::BImageControl: falha em alocar cor %d/%d/%d\n $ #PixmapRelease -# BImageControl::~BImageControl: reserva de pixmap cheia - liberando %d pixmaps\n +# BImageControl::~BImageControl: cache de pixmap - liberando pixmaps %d\n $ #PixmapCacheLarge -# BImageControl::renderImage: reserva cheia, forçando limpeza\n +# BImageControl::renderImage: cache está grande, forçando desalocaçăo\n $ #ColorParseError -# BImageControl::getColor: color parse error: '%s'\n +# BImageControl::getColor: erro ao analizar cor: '%s'\n $ #ColorAllocError -# BImageControl::getColor: erro localizando cor: '%s'\n +# BImageControl::getColor: erro ao alocar cor: '%s'\n
@@ -1,7 +1,7 @@
$set 6 #Screen $ #AnotherWMRunning -# BScreen::BScreen: um erro occorreu enquanto chamando o servidor X.\n \ +# BScreen::BScreen: um erro occorreu enquanto consultava o servidor X.\n \ existe outro window menager rodando no display. %s.\n $ #ManagingScreen # BScreen::BScreen: managing screen %d using visual 0x%lx, depth %d\n@@ -18,31 +18,33 @@ # Reiniciar
$ #Exit # Sair $ #EXECError -# BScreen::parseMenuFile: [exec] erro, năo há indicaçăo definida no menu e/ou comando definido\n +# BScreen::parseMenuFile: [exec] erro, sem rótulo de menu e/ou comando definido\n $ #EXITError -# BScreen::parseMenuFile: [exit] erro, năo há indicaçăo definida no menu\n +# BScreen::parseMenuFile: [exit] erro, sem rótulo de menu definido\n $ #STYLEError -# BScreen::parseMenuFile: [style] erro, năo há indicaçăo de menu e/ou nome de arquivo difinido\n +# BScreen::parseMenuFile: [style] erro, sem rótulo de menu e/ou nome do arquivo \ +definido\n $ #CONFIGError -# BScreen::parseMenuFile: [config] erro, năo há indicaçăo definida no menu\n +# BScreen::parseMenuFile: [config] erro, sem rótulo de menu definido\n $ #INCLUDEError # BScreen::parseMenuFile: [include] erro, nome de arquivo năo definido\n $ #INCLUDEErrorReg # BScreen::parseMenuFile: [include] error, '%s' năo é um arquivo regular\n $ #SUBMENUError -# BScreen::parseMenuFile: [submenu] erro, năo há indicaçăo definida no menu\n +# BScreen::parseMenuFile: [submenu] erro, sem rótulo de menu definido\n $ #RESTARTError -# BScreen::parseMenuFile: [restart] erro, năo há indicaçăo definida no menu\n +# BScreen::parseMenuFile: [restart] erro, sem rótulo de menu definido\n $ #RECONFIGError -# BScreen::parseMenuFile: [reconfig] erro, năo há indicaçăo definida no menu\n +# BScreen::parseMenuFile: [reconfig] erro, sem rótulo de menu definido\n $ #STYLESDIRError -# BScreen::parseMenuFile: [stylesdir/stylesmenu] erro, năo há diretorio difinido\n +# BScreen::parseMenuFile: [stylesdir/stylesmenu] erro, sem diretorio difinido\n $ #STYLESDIRErrorNotDir -# BScreen::parseMenuFile: [stylesdir/stylesmenu] erro, '%s' năo é um diretorio\n +# BScreen::parseMenuFile: [stylesdir/stylesmenu] erro, '%s' năo é um \ +diretorio\n $ #STYLESDIRErrorNoExist # BScreen::parseMenuFile: [stylesdir/stylesmenu] erro, '%s' năo existe\n $ #WORKSPACESError -# BScreen::parseMenuFile: [workspaces] erro, năo há indicaçăo definida no menu\n +# BScreen::parseMenuFile: [workspaces] erro, sem rótulo de menu definido\n $ #PositionLength # 0: 0000 x 0: 0000 $ #PositionFormat
@@ -3,6 +3,6 @@
$ #SlitTitle # Slit $ #SlitDirection -# Direçăo +# Direçăo do Slit $ #SlitPlacement -# Posicionamento +# Posicionamento do Slit
@@ -15,8 +15,8 @@ # p
$ #NoStrftimeTimeFormatA # a $ #ToolbarTitle -# Toolbar +# Barra de Ferramenta $ #EditWkspcName -# Renomear Area de Trabalho +# Editar o nome da area de trabalho corrente $ #ToolbarPlacement -# Posicionamento +# Posicionamento da Barra de Ferramentas
@@ -6,7 +6,7 @@ # BlackboxWindow::BlackboxWindow: criando 0x%lx\n
$ #XGetWindowAttributesFail # BlackboxWindow::BlackboxWindow: XGetWindowAttributres falhou\n $ #CannotFindScreen -# BlackboxWindow::BlackboxWindow: impossivel encontrar tela para janela 0x%lx\n +# BlackboxWindow::BlackboxWindow: impossivel encontrar tela para janela principal 0x%lx\n $ #Unnamed # Sem Nome $ #MapRequest@@ -14,4 +14,4 @@ # BlackboxWindow::mapRequestEvent() para 0x%lx\n
$ #UnmapNotify # BlackboxWindow::unmapNotifyEvent() para 0x%lx\n $ #ReparentNotify -# BlackboxWindow::reparentNotifyEvent: reparent 0x%lx to 0x%lx\n +# BlackboxWindow::reparentNotifyEvent: reparent 0x%lx para 0x%lx\n
@@ -1,6 +1,6 @@
$set 13 #blackbox $ #NoManagableScreens -# Blackbox::Blackbox: năo foram encontradas telas administraveis, abortando..\n +# Blackbox::Blackbox: năo encontradas telas gerenciaveis, abortando..\n $ #MapRequest # Blackbox::process_event: MapRequest para 0x%lx\n
@@ -1,16 +1,16 @@
$set 16 #bsetroot $ #MustSpecify -# %s: erro: necessario especificar um dos seguintes argumentos: -solid, -mod, -gradient\n +# %s: erro: necessario especificar uma das opçőes: -solid, -mod, -gradient\n $ #Usage # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ - -display <string> conexăo com display\n\ - -mod <x> <y> modula pattern\n\ - -foreground, -fg <color> modula foreground color\n\ - -background, -bg <color> modula background color\n\n\ + (c) 2001-2002 Sean 'Shaleh' Perry\n\n\ + -display <string> conexăo com video\n\ + -mod <x> <y> modula padrăo\n\ + -foreground, -fg <color> modula cor do primeiro plano\n\ + -background, -bg <color> modula cor do segundo plano\n\ -gradient <texture> textura gradiente\n\ -from <color> cor de inicio do gradiente\n\ - -to <color> com do fim do gradiente\n\n\ - -solid <color> cor solida\n\n\ - -help mostra essa ajuda e sai\n - + -to <color> com do fim do gradiente\n\ + -solid <color> cor solida\n\ + -help mostra este texto de ajuda e sai\n
@@ -13,7 +13,7 @@ $ #DirectionVert
# Vertical $ #AlwaysOnTop -# Sempre Visivel +# Sempre vísivel $ #PlacementTitle # Posicionamento@@ -24,12 +24,15 @@ # No Centro a Esquerda
$ #PlacementBottomLeft # Em Baixo a Esquerda $ #PlacementTopCenter -# No Alto e no Centro +# No Alto ao Centro $ #PlacementBottomCenter -# Em Baixo e no Centro +# Em Baixo ao Centro $ #PlacementTopRight # No Alto a Direita $ #PlacementCenterRight # No Meio a Direita $ #PlacementBottomRight # Em Baixo a Direita + +$ #AutoHide +# Auto-ocultar
@@ -15,12 +15,12 @@ 1997 - 2000, 2002 Brad Hughes\n\n\
-display <string>\t\tusar conexăo com o display.\n\ -rc <string>\t\t\tusar arquivo alternativo de recursos.\n\ -menu <string>\t\tusar arquivo alternativo de menu.\n\ - -version\t\t\tmostrar versao e sair.\n\ - -help\t\t\t\tmostrar esta ajuda e sair.\n\n + -version\t\t\texibe a versao e sair.\n\ + -help\t\t\t\texibe este texto de ajuda e sair.\n\n $ #CompileOptions # Opçőes em tempo de compilaçăo:\n\ - Informaçőes extras para problemas:\t\t\t%s\n\ + Depuraçăo:\t\t\t%s\n\ Forma:\t\t\t%s\n\ Xft:\t\t\t\t%s\n\ Xinerama:\t\t\t%s\n\ - 8bpp Simulaçăo ordenada de cores em imagens:\t%s\n\n + Simulaçăo Ordenada de Cores em 8bpp:\t%s\n\n
@@ -5,6 +5,7 @@ # %s: eroare: trebuie specificata cel putin una dintre optiunile:\n\
-solid, -mod, -gradient\n $ #Usage # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ + (c) 2001-2002 Sean 'Shaleh' Perry\n\n\ -display <sir> conexiunea la ecran\n\ -mod <x> <y> model\n\ -foreground, -fg <color> culoare plan apropiat pentru model\n\
@@ -5,11 +5,11 @@ # %s: ĎŰÉÂËÁ X ÓĹŇ×ĹŇÁ: %s(%d) ÚÎÁŢĹÎÉŃ %d/%d\n ŇĹÓŐŇÓ 0x%lx\n
$ #SignalCaught # %s: ĐĎĚŐŢĹÎ ÓÉÇÎÁĚ %d \n $ #ShuttingDown -# ĎÔËĚŔŢĹÎÉĹ\n +# shutting down\n $ #Aborting # ďÔÍĹÎÁ... ÓĎÚÄÁĹÔÓŃ ÄÁÍĐ core\n $ #XConnectFail -# BaseDisplay::BaseDisplay: ÓĎĹÄÉÎĹÎÉĹ Ó X ÓĹŇ×ĹŇĎÍ ĐŇĎ×ÁĚĹÎĎ.\n +# BaseDisplay::BaseDisplay: ĎŰÉÂËÁ ÓĎĹÄÉÎĹÎÉŃ Ó X ÓĹŇ×ĹŇĎÍ.\n $ #CloseOnExecFail # BaseDisplay::BaseDisplay: ÎĹÔ ×ĎÚÍĎÖÎĎÓÔÉ ĐĎÍĹÔÉÔŘ ÁËÔÉ×ÎŮĘ ÄÉÓĐĚĹĘ ËÁË "ÚÁËŇŮÔŮĘ-ÎÁ-ÉÓĐĎĚÎĹÎÉĹ"\n $ #BadWindowRemove
@@ -1,4 +1,4 @@
$set 4 #Icon $ #Icons -# ó×ĹŇÎŐÔŮĹ\nĎËÎÁ +# ó×ĹŇÎŐÔŮĹ ĎËÎÁ
@@ -9,7 +9,7 @@ # BImage::renderXImage: ÎĹĐĎÄÄĹŇÖÉ×ÁĹÍŮĘ ÔÉĐ ×ÉÚŐÁĚÉÚÁĂÉÉ\n
$ #ErrorCreatingPixmap # BImage::renderPixmap: ĎŰÉÂËÁ ÓĎÚÄÁÎÉŃ pixmap\n $ #InvalidColormapSize -# BImageControl::BImageControl: ÎĹ×ĹŇÎŮĘ ŇÁÚÍĹŇ ÔÁÂĚÉĂŮ Ă×ĹÔĎ× %d (%d/%d/%d) - ŐÄÁĚŃĹÔÓŃ\n +# BImageControl::BImageControl: ÎĹ×ĹŇÎŮĘ ŇÁÚÍĹŇ ÔÁÂĚÉĂŮ Ă×ĹÔĎ× %d (%d/%d/%d) - ŐÍĹÎŘŰÁĹÔÓŃ\n $ #ErrorAllocatingColormap # BImageControl::BImageControl: ĎŰÉÂËÁ ŇÁÚÍĹÝĹÎÉŃ ÔÁÂĚÉĂŮ Ă×ĹÔĎ×\n $ #ColorAllocFail@@ -17,7 +17,7 @@ # BImageControl::BImageControl: ÎĹ×ĎÚÍĎÖÎĎ ŇÁÚÍĹÓÔÉÔŘ Ă×ĹÔ %d/%d/%d × ĐÁÍŃÔÉ\n
$ #PixmapRelease # BImageControl::~BImageControl: ËÜŰ ÔĎŢĹŢÎŮČ ÉÚĎÂŇÁÖĹÎÉĘ - ĎÓ×ĎÂĎÖÄÁĹÔÓŃ %d ÂĚĎËĎ×\n $ #PixmapCacheLarge -# BImageControl::renderImage: ĐĹŇĹĐĎĚÎĹÎÉĹ ËÜŰÁ, ĐŇĎÉÚ×ĎÄÉÔÓŃ ÂŮÓÔŇÁŃ ĎŢÉÓÔËÁ\n +# BImageControl::renderImage: ĐĹŇĹĐĎĚÎĹÎÉĹ ËÜŰÁ, ĐŇĎÉÚ×ĎÄÉÔÓŃ ĎŢÉÓÔËÁ\n $ #ColorParseError # BImageControl::getColor: ĎŰÉÂËÁ ŇÁÚÂĎŇÁ ÓÔŇĎËÉ, ĎĐÉÓŮ×ÁŔÝĹĘ Ă×ĹÔ: '%s'\n $ #ColorAllocError
@@ -8,17 +8,17 @@ # BScreen::BScreen: ĎÂÓĚŐÖÉ×ÁĹÔÓŃ ÜËŇÁÎ %d, ÉÓĐĎĚŘÚŐĹÍŮĘ ÔÉĐ ×ÉÚŐÁĚÉÚÁĂÉÉ 0x%lx, ÇĚŐÂÉÎÁ Ă×ĹÔÁ %d\n
$ #FontLoadFail # BScreen::LoadStyle(): ÎĹÔ ×ĎÚÍĎÖÎĎÓÔÉ ÚÁÇŇŐÚÉÔŘ ŰŇÉĆÔ '%s'\n $ #DefaultFontLoadFail -# BScreen::LoadStyle(): ÎĹÔ ×ĎÚÍĎÖÎĎÓÔÉ ÚÁÇŇŐÚÉÔŘ ĐŇĹÄĎĐŇĹÄĹĚĹÎÎŮĘ ŰŇÉĆÔ.\n +# BScreen::LoadStyle(): ÎĹÔ ×ĎÚÍĎÖÎĎÓÔÉ ÚÁÇŇŐÚÉÔŘ ŰŇÉĆÔ ĐĎ ŐÍĎĚŢÁÎÉŔ.\n $ #EmptyMenuFile # %s: ĐŐÓÔĎĘ ĆÁĘĚ ÍĹÎŔ\n $ #xterm -# Xterm +# XTerm $ #Restart # đĹŇĹÚÁĐŐÓË $ #Exit # ÷ŮČĎÄ $ #EXECError -# BScreen::parseMenuFile: ĎŰÉÂËÁ [exec], ÎĹ ĎĐŇĹÄĹĚĹÎĎ ÎÁÚ×ÁÎÉĹ ĐŐÎËÔÁ ÍĹÎŔ É/ÉĚÉ ÎÁÚ×ÁÎÉĹ ËĎÍÍÁÎÄŮ\n +# BScreen::parseMenuFile: ĎŰÉÂËÁ [exec], ÎĹ ĎĐŇĹÄĹĚĹÎĎ ÎÁÚ×ÁÎÉĹ ĐŐÎËÔÁ ÍĹÎŔ É/ÉĚÉ ËĎÍÍÁÎÄÁ\n $ #EXITError # BScreen::parseMenuFile: ĎŰÉÂËÁ [exit], ÎĹ ĎĐŇĹÄĹĚĹÎĎ ÎÁÚ×ÁÎÉĹ ĐŐÎËÔÁ ÍĹÎŔ\n $ #STYLEError
@@ -3,6 +3,6 @@
$ #SlitTitle # äĎËĹŇ $ #SlitDirection -# ďŇÉĹÎÔÁĂÉŃ ÄĎËĹŇÁ +# îÁĐŇÁ×ĚĹÎÉĹ ÄĎËĹŇÁ $ #SlitPlacement -# íĹÓÔĎĐĎĚĎÖĹÎÉŃ ÄĎËĹŇÁ +# íĹÓÔĎĐĎĚĎÖĹÎÉĹ ÄĎËĹŇÁ
@@ -17,6 +17,6 @@ # ÄĐ
$ #ToolbarTitle # ôŐĚÂÁŇ $ #EditWkspcName -# ňĹÄÁËÔÉŇĎ×ÁÔŘ ÉÍŃ ÔĹËŐÝĹÇĎ ŇÁÂĎŢĹÇĎ ÓÔĎĚÁ +# đĹŇĹÉÍĹÎĎ×ÁÔŘ ÔĹËŐÝÉĘ ŇÁÂĎŢÉĘ ÓÔĎĚ $ #ToolbarPlacement # íĹÓÔĎĐĎĚĎÖĹÎÉĹ ÔŐĚÂÁŇÁ
@@ -4,14 +4,14 @@
$ #Creating # BlackboxWindow::BlackboxWindow: ÓĎÚÄÁĹÔÓŃ 0x%lx\n $ #XGetWindowAttributesFail -# BlackboxWindow::BlackboxWindow: ĐŇĎ×ÁĚĹÎ ĐŇĎĂĹÓÓ XGetWindowAttributres\n +# BlackboxWindow::BlackboxWindow: ĎŰÉÂËÁ ĐŇĎĂĹÓÓÁ XGetWindowAttributres\n $ #CannotFindScreen -# BlackboxWindow::BlackboxWindow: ÎĹÔ ×ĎÚÍĎÖÎĎÓÔÉ ÎÁĘÔÉ ÜËŇÁÎ ÄĚŃ ËĎŇÎĹ×ĎÇĎ ĎËÎÁ 0x%lx\n +# BlackboxWindow::BlackboxWindow: ÎĹ ÎÁĘÄĹÎ ÜËŇÁÎ ÄĚŃ ËĎŇÎĹ×ĎÇĎ ĎËÎÁ 0x%lx\n $ #Unnamed -# âĹÚŮÍŃÎÎĎĹ +# âĹÚ ÉÍĹÎÉ $ #MapRequest # BlackboxWindow::mapRequestEvent() ÄĚŃ 0x%lx\n $ #UnmapNotify # BlackboxWindow::unmapNotifyEvent() ÄĚŃ 0x%lx\n $ #ReparentNotify -# BlackboxWindow::reparentNotifyEvent: reparent 0x%lx to 0x%lx\n +# BlackboxWindow::reparentNotifyEvent: ÓÍĹÎÁ ŇĎÄÉÔĹĚŃ ÄĚŃ 0x%lx ÎÁ 0x%lx\n
@@ -3,4 +3,4 @@
$ #NoManagableScreens # Blackbox::Blackbox: ÎĹ ÎÁĘÄĹÎĎ ÜËŇÁÎĎ× ÄĚŃ ĎÂÓĚŐÖÉ×ÁÎÉŃ, ĎÔÍĹÎÁ...\n $ #MapRequest -# Blackbox::process_event: MapRequest for 0x%lx\n +# Blackbox::process_event: MapRequest ÄĚŃ 0x%lx\n
@@ -4,10 +4,11 @@ $ #MustSpecify
# %s: ĎŰÉÂËÁ: ÎĹĎÂČĎÄÉÍĎ ÚÁÄÁÔŘ ĎÄÉÎ ÉÚ ÓĚĹÄŐŔÝÉČ ËĚŔŢĹĘ: -solid, -mod, -gradient\n $ #Usage # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ - -display <string> ÓĎĹÄÉÎĹÎÉĹ Ó ÄÉÓĐĚĹĹÍ\n\ - -mod <x> <y> ÍÁËĹÔ ËĚĹÔËÉ\n\ - -foreground, -fg <color> Ă×ĹÔ ĐĹŇĹÄÎĹÇĎ ĐĚÁÎÁ ËĚĹÔËÉ\n\ - -background, -bg <color> Ă×ĹÔ ĆĎÎÁ ËĚĹÔËÉ\n\n\ + (c) 2001-2002 Sean 'Shaleh' Perry\n\n\ + -display <string> ÉÓĐĎĚŘÚĎ×ÁÔŘ ÚÁÄÁÎÎŮĘ ÄÉÓĐĚĹĘ\n\ + -mod <x> <y> ÍÁËĹÔ ÓĹÔËÉ\n\ + -foreground, -fg <color> Ă×ĹÔ ÓĹÔËÉ\n\ + -background, -bg <color> Ă×ĹÔ ĆĎÎÁ\n\n\ -gradient <texture> ÇŇÁÄÉĹÎÔ\n\ -from <color> ÎÁŢÁĚŘÎŮĘ Ă×ĹÔ ÇŇÁÄÉĹÎÔÁ\n\ -to <color> ËĎÎĹŢÎŮĘ Ă×ĹÔ ÇŇÁÄÉĹÎÔÁ\n\n\
@@ -24,12 +24,15 @@ # óĚĹ×Á ĐĎ ĂĹÎÔŇŐ
$ #PlacementBottomLeft # óĚĹ×Á ×ÎÉÚŐ $ #PlacementTopCenter -# ó×ĹŇČŐ ĐĎ ĂĹÎÔŇŐ +# ÷×ĹŇČŐ ĐĎ ĂĹÎÔŇŐ $ #PlacementBottomCenter -# óÎÉÚŐ ĐĎ ĂĹÎÔŇŐ +# ÷ÎÉÚŐ ĐĎ ĂĹÎÔŇŐ $ #PlacementTopRight -# óĐŇÁ×Á Ó×ĹŇČŐ +# óĐŇÁ×Á ××ĹŇČŐ $ #PlacementCenterRight # óĐŇÁ×Á ĐĎ ĂĹÎÔŇŐ $ #PlacementBottomRight # óĐŇÁ×Á ×ÎÉÚŐ + +$ #AutoHide +# óËŇŮ×ÁÔŘ Á×ÔĎÍÁÔÉŢĹÓËÉ
@@ -0,0 +1,16 @@
+$set 1 #BaseDisplay + +$ #XError +# %s: X chyba: %s(%d) operačné kódy %d/%d\n zdroj 0x%lx\n +$ #SignalCaught +# %s: prijatý signál %d\n +$ #ShuttingDown +# ukončuje sa\n +$ #Aborting +# prerušuje sa... výpis obsahu pamäte (dumping core)\n +$ #XConnectFail +# BaseDisplay::BaseDisplay: zlyhalo pripojenie k X serveru\n +$ #CloseOnExecFail +# BaseDisplay::BaseDisplay: nie je možné označiť pripojenie k obrazovke ako close-on-exec\n +$ #BadWindowRemove +# BaseDisplay::eventLoop(): odstraňuje sa chybné okno z fronty udalostí\n
@@ -0,0 +1,24 @@
+$set 5 #Image + +$ #ErrorCreatingSolidPixmap +# BImage::render_solid: chyba pri vytváraní pixmapy\n +$ #ErrorCreatingXImage +# BImage::renderXImage: chyba pri vytváraní XImage\n +$ #UnsupVisual +# BImage::renderXImage: nepodporované zobrazenie\n +$ #ErrorCreatingPixmap +# BImage::renderPixmap: chyba pri vytváraní pixmapy\n +$ #InvalidColormapSize +# BImageControl::BImageControl: chybná veľkost colormapy %d (%d/%d/%d) - redukuje sa\n +$ #ErrorAllocatingColormap +# BImageControl::BImageControl: chyba pri alokovaní colormapy\n +$ #ColorAllocFail +# BImageControl::BImageControl: chyba pri alokovaní farby %d/%d/%d\n +$ #PixmapRelease +# BImageControl::~BImageControl: vyrovnávacia pamäť pre pixmapy - uvoľňuje sa %d pixmáp\n +$ #PixmapCacheLarge +# BImageControl::renderImage: vyrovnávacia pamäť je príliš veľká, vynútené vyprázdnenie\n +$ #ColorParseError +# BImageControl::getColor: chyba pri analýze farby: '%s'\n +$ #ColorAllocError +# BImageControl::getColor: chyba pri alokovaní farby: '%s'\n
@@ -0,0 +1,35 @@
+# Makefile.am for Blackbox - an X11 Window Manager + +NLSTEST = @NLS@ +THE_LANG = sk_SK +THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG) +CLEANFILES = blackbox.cat +MAINTAINERCLEANFILES = Makefile.in Translation.m +DISTCLEANFILES = Translation.m +MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m + +all-local: blackbox.cat +install-data-local: blackbox.cat + @if test x$(NLSTEST) = "x-DNLS"; then \ + echo "Installing catalog in $(THE_NLS_PATH)"; \ + $(mkinstalldirs) $(THE_NLS_PATH); \ + $(INSTALL_DATA) blackbox.cat $(THE_NLS_PATH); \ + fi +uninstall-local: + @if test x$(NLSTEST) = "x-DNLS"; then \ + rm -f $(THE_NLS_PATH)/blackbox.cat; \ + rmdir $(THE_NLS_PATH); \ + fi + +Translation.m: $(MFILES) + @if test x$(NLSTEST) = "x-DNLS"; then \ + awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ + fi + +blackbox.cat: Translation.m + @if test x$(NLSTEST) = "x-DNLS"; then \ + $(gencat_cmd) blackbox.cat Translation.m; \ + fi + +distclean-local: + rm -f *\~ .\#*
@@ -0,0 +1,52 @@
+$set 6 #Screen + +$ #AnotherWMRunning +# BScreen::BScreen: pri dopytovaní X servera nastala chyba.\n \ +na displeji je práve spustený ďalší správca okien %s.\n +$ #ManagingScreen +# BScreen::BScreen: riadiaca obrazovka %d používa zobrazenie 0x%lx, hĺbka %d\n +$ #FontLoadFail +# BScreen::LoadStyle(): nie je možné nahrať font '%s'\n +$ #DefaultFontLoadFail +# BScreen::LoadStyle(): nie je možné nahrať predvolený font.\n +$ #EmptyMenuFile +# %s: prázdny menu súbor\n +$ #xterm +# xterm +$ #Restart +# Reštart +$ #Exit +# Koniec +$ #EXECError +# BScreen::parseMenuFile: [exec] chyba, nedefinovaný titulok menu a/alebo príkaz\n +$ #EXITError +# BScreen::parseMenuFile: [exit] chyba, nedefinovaný titulok menu\n +$ #STYLEError +# BScreen::parseMenuFile: [style] chyba, nedefinovaný titulok menu a/alebo názov súboru\n +$ #CONFIGError +# BScreen::parseMenuFile: [config] chyba, nedefinovaný titulok menu\n +$ #INCLUDEError +# BScreen::parseMenuFile: [include] chyba, nedefinovaný názov súboru\n +$ #INCLUDEErrorReg +# BScreen::parseMenuFile: [include] chyba, '%s' nie je obyčajný súbor\n +$ #SUBMENUError +# BScreen::parseMenuFile: [submenu] chyba, nedefinovaný titulok menu\n +$ #RESTARTError +# BScreen::parseMenuFile: [restart] chyba, nedefinovaný titulok menu\n +$ #RECONFIGError +# BScreen::parseMenuFile: [reconfig] chyba, nedefinovaný titulok menu\n +$ #STYLESDIRError +# BScreen::parseMenuFile: [stylesdir/stylesmenu] chyba, nedefinovaný adresár\n +$ #STYLESDIRErrorNotDir +# BScreen::parseMenuFile: [stylesdir/stylesmenu] chyba, '%s' nie je adresár\n +$ #STYLESDIRErrorNoExist +# BScreen::parseMenuFile: [stylesdir/stylesmenu] chyba, '%s' neexistuje\n +$ #WORKSPACESError +# BScreen::parseMenuFile: [workspaces] chyba, nedefinovaný titulok menu\n +$ #PositionLength +# 0: 0000 x 0: 0000 +$ #PositionFormat +# X: %4d x Y: %4d +$ #GeometryFormat +# W: %4d x H: %4d +
@@ -0,0 +1,8 @@
+$set 7 #Slit + +$ #SlitTitle +# Slit +$ #SlitDirection +# Smer Slitu +$ #SlitPlacement +# Umiestnenie Slitu
@@ -0,0 +1,22 @@
+$set 8 #Toolbar + +$ #NoStrftimeLength +# 00:00000 +$ #NoStrftimeDateFormat +# %02d/%02d/%02d +$ #NoStrftimeDateFormatEu +# %02d.%02d.%02d +$ #NoStrftimeTimeFormat24 +# %02d:%02d +$ #NoStrftimeTimeFormat12 +# %02d:%02d %sm +$ #NoStrftimeTimeFormatP +# p +$ #NoStrftimeTimeFormatA +# a +$ #ToolbarTitle +# Panel nástrojov +$ #EditWkspcName +# Zmeniť názov aktuálnej pracovnej plochy +$ #ToolbarPlacement +# Umiestnenie panela nástrojov
@@ -0,0 +1,17 @@
+$set 9 #Window + + +$ #Creating +# BlackboxWindow::BlackboxWindow: vytvára sa 0x%lx\n +$ #XGetWindowAttributesFail +# BlackboxWindow::BlackboxWindow: zlyhanie XGetWindowAttributres\n +$ #CannotFindScreen +# BlackboxWindow::BlackboxWindow: nie je možné nájsť obrazovku pre základné okno 0x%lx\n +$ #Unnamed +# Nepomenované +$ #MapRequest +# BlackboxWindow::mapRequestEvent() pre 0x%lx\n +$ #UnmapNotify +# BlackboxWindow::unmapNotifyEvent() pre 0x%lx\n +$ #ReparentNotify +# BlackboxWindow::reparentNotifyEvent: zmena potomka 0x%lx na rodiča 0x%lx\n
@@ -0,0 +1,4 @@
+$set 11 #Workspace + +$ #DefaultNameFormat +# Pracovná plocha %d
@@ -0,0 +1,6 @@
+$set 13 #blackbox + +$ #NoManagableScreens +# Blackbox::Blackbox: nenašli sa spravovateľné obrazovky, ruší sa\n +$ #MapRequest +# Blackbox::process_event: MapRequest pre 0x%lx\n
@@ -0,0 +1,17 @@
+$set 16 #bsetroot + +$ #MustSpecify +# %s: chyba: musíte špecifikovať jeden z parametrov: -solid, -mod, -gradient\n +$ #Usage +# %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ + (c) 2001-2002 Sean 'Shaleh' Perry\n\n\ + -display <string> pripojenie k obrazovke\n\ + -mod <x> <y> modul vzorky\n\ + -foreground, -fg <color> modul farby popredia\n\ + -background, -bg <color> modul farby pozadia\n\n\ + -gradient <texture> textúra farebného prechodu\n\ + -from <color> počiatočná farba vo farebnom prechode\n\ + -to <color> konečná farba vo farebnom prechode\n\n\ + -solid <color> jednoliata farba\n\n\ + -help vypíše túto nápovedu a skončí\n +
@@ -0,0 +1,38 @@
+$set 15 #Common + +$ #Yes +# Áno +$ #No +# Nie + +$ #DirectionTitle +# Smer +$ #DirectionHoriz +# Horizontálny +$ #DirectionVert +# Vertikálny + +$ #AlwaysOnTop +# Stále na vrchu + +$ #PlacementTitle +# Umiestnenie +$ #PlacementTopLeft +# Vľavo hore +$ #PlacementCenterLeft +# Uprostred vľavo +$ #PlacementBottomLeft +# Vľavo dole +$ #PlacementTopCenter +# Hore uprostred +$ #PlacementBottomCenter +# Dole uprostred +$ #PlacementTopRight +# Vpravo hore +$ #PlacementCenterRight +# Uprostred vpravo +$ #PlacementBottomRight +# Vpravo dole + +$ #AutoHide +# Automaticky skryť
@@ -0,0 +1,20 @@
+$set 14 #main + +$ #RCRequiresArg +# chyba: '-rc' vyžaduje argument\n +$ #DISPLAYRequiresArg +# chyba: '-display' vyžaduje argument\n +$ #WarnDisplaySet +# varovanie: nie je možné nastaviť premennú prostredia 'DISPLAY'\n +$ #Usage +# Blackbox %s : (c) 2001 - 2002 Sean 'Shaleh' Perry\n\ + \t\t\t 1997 - 2000, 2002 Brad Hughes\n\n\ + -display <string>\t\tpoužije sa pripojenie k zadanému displeju.\n\ + -rc <string>\t\t\tpoužije sa alternatívny konfiguračný súbor.\n\ + -version\t\t\tzobrazí verziu a skončí.\n\ + -help\t\t\t\tzobrazí túto nápovedu a skončí.\n\n +$ #CompileOptions +# Nastavenia v čase kompilácie:\n\ + Ladenie\t\t\t%s\n\ + Shape:\t\t\t%s\n\ + 8bpp Ordered Dithering:\t%s\n\n
@@ -4,6 +4,7 @@ $ #MustSpecify
# %s: napaka: določiti je treba eno: -solid, -mod, -gradient\n $ #Usage # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ + (c) 2001-2002 Sean 'Shaleh' Perry\n\n\ -display <string> prikaži povezavo\n\ -mod <x> <y> vzorec\n\ -foreground, -fg <color> barva ospredja\n\
@@ -4,6 +4,7 @@ $ #MustSpecify
# %s: fel: mĺste specifiera en av: -solid, -mod, -gradient\n $ #Usage # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ + (c) 2001-2002 Sean 'Shaleh' Perry\n\n\ -display <string> skärmanslutning\n\ -mod <x> <y> modulamönster\n\ -foreground, -fg <color> förgrundsfärg för modulamönster\n\
@@ -4,6 +4,7 @@ $ #MustSpecify
# %s : hata : -solid, -mod yada -gradient'den birisini belirlemek zorundasýn\n $ #Usage # %s 2.0 : Tel'if hakký (c) 1997-2000 Brad Hughes\n\n\ + (c) 2001-2002 Sean 'Shaleh' Perry\n\n\ -display <metin> ekran belirlemesi\n\ -mod <x> <y> bölüţüm iţlemi\n\ -foreground, -fg <renk> bölüţüm önalaný\n\
@@ -4,6 +4,7 @@ $ #MustSpecify
# %s: ĐĎÍÉĚËÁ: ÎĹĎÂČŚÄÎĎ ÚÁÄÁÔÉ ĎÄÉÎ Ú ÎÁÓÔŐĐÎÉČ ËĚŔŢŚ×: -solid, -mod, -gradient\n $ #Usage # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ + (c) 2001-2002 Sean 'Shaleh' Perry\n\n\ -display <string> ĎÂÓĚŐÇĎ×Ő×ÁÔÉ ×ËÁÚÁÎÉĘ ÄÉÓĐĚĹĘ\n\ -mod <x> <y> ÍÁËĹÔ ËĚŚÔËÉ\n\ -foreground, -fg <color> ËĎĚŚŇ ĐĹŇĹÄÎŘĎÇĎ ĐĚÁÎŐ ËĚŚÔËÉ\n\
@@ -4,6 +4,7 @@ $ #MustSpecify
# %s: ´íÎó: ąŘĐë´ÓÖĐÖ¸ś¨Ňť¸ö: -solid, -mod, -gradient\n $ #Usage # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ + (c) 2001-2002 Sean 'Shaleh' Perry\n\n\ -display <string> ĎÔĘžÁŹ˝Ó\n\ -mod <x> <y> ÄŁĘ˝\n\ -foreground, -fg <color> Ç°ž°ÉŤ\n\
@@ -4,6 +4,7 @@ $ #MustSpecify
# %s: error: must specify one of: -solid, -mod, -gradient\n $ #Usage # %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ + (c) 2001-2002 Sean 'Shaleh' Perry\n\n\ -display <string> display connection\n\ -mod <x> <y> modula pattern\n\ -foreground, -fg <color> modula foreground color\n\
@@ -411,7 +411,7 @@
BGCCache* BaseDisplay::gcCache(void) const { if (! gccache) - gccache = new BGCCache(this); + gccache = new BGCCache(this, screenInfoList.size()); return gccache; }
@@ -78,9 +78,10 @@ XChangeGC(display->getXDisplay(), gc, GCFont, &gcv);
} -BGCCache::BGCCache(const BaseDisplay * const _display) +BGCCache::BGCCache(const BaseDisplay * const _display, + unsigned int screen_count) : display(_display), context_count(128u), - cache_size(16u), cache_buckets(8u), + cache_size(16u), cache_buckets(8u * screen_count), cache_total_size(cache_size * cache_buckets) { contexts = new BGCCacheContext*[context_count];@@ -117,10 +118,8 @@ c->gc = XCreateGC(display->getXDisplay(), hd, 0, 0);
c->used = false; c->screen = scr; } - if (! c->used && c->screen == scr) { - c->used = true; + if (! c->used && c->screen == scr) return c; - } } fprintf(stderr, "BGCCache: context fault!\n");@@ -141,15 +140,18 @@ const unsigned long pixel = _color.pixel();
const unsigned int screen = _color.screen(); const int key = _color.red() ^ _color.green() ^ _color.blue(); int k = (key % cache_size) * cache_buckets; - int i = 0; // loop variable + unsigned int i = 0; // loop variable BGCCacheItem *c = cache[ k ], *prev = 0; - // this will either loop 8 times then return/abort or it will stop matching + /* + this will either loop cache_buckets times then return/abort or + it will stop matching + */ while (c->ctx && (c->ctx->pixel != pixel || c->ctx->function != _function || c->ctx->subwindow != _subwindow || c->ctx->screen != screen || c->ctx->linewidth != _linewidth)) { - if (i < 7) { + if (i < (cache_buckets - 1)) { prev = c; c = cache[ ++k ]; ++i;@@ -164,14 +166,13 @@ c->hits = 1;
return c; } // cache fault! - fprintf(stderr, "BGCCache: cache fault\n"); + fprintf(stderr, "BGCCache: cache fault, count: %d, screen: %d, item screen: %d\n", c->count, screen, c->ctx->screen); abort(); } - const unsigned long fontid = _font ? _font->fid : 0; if (c->ctx) { // reuse existing context - if (fontid && fontid != c->ctx->fontid) + if (_font && _font->fid && _font->fid != c->ctx->fontid) c->ctx->set(_font); c->count++; c->hits++;
@@ -83,7 +83,7 @@ };
class BGCCache { public: - explicit BGCCache(const BaseDisplay * const _display); + BGCCache(const BaseDisplay * const _display, unsigned int screen_count); ~BGCCache(void); // cleans up the cache
@@ -2971,10 +2971,10 @@ frame.changing.setHeight(cr->height +
frame.margin.top + frame.margin.bottom); /* - if a position change ha been specified, then that position will be used - instead of determining a position based on the window's gravity. + if a position change has been specified, then that position will be + used instead of determining a position based on the window's gravity. */ - if (cr->value_mask & (CWX | CWY)) { + if (! (cr->value_mask & (CWX | CWY))) { Corner corner; switch (client.win_gravity) { case NorthEastGravity:@@ -4119,11 +4119,17 @@ base_width = (client.base_width) ? client.base_width : client.min_width,
base_height = (client.base_height) ? client.base_height : client.min_height; - // constrain - if (dw < client.min_width) dw = client.min_width; - if (dh < client.min_height) dh = client.min_height; - if (dw > client.max_width) dw = client.max_width; - if (dh > client.max_height) dh = client.max_height; + // constrain, but only if the min/max are being used. if they aren't, then + // this resize is going to be from a ConfigureRequest because the window + // isn't allowed to be resized by the user. And in that case, we don't want + // to limit what the app can do + if (client.max_width > client.min_width || + client.max_height > client.min_height) { + if (dw < client.min_width) dw = client.min_width; + if (dh < client.min_height) dh = client.min_height; + if (dw > client.max_width) dw = client.max_width; + if (dh > client.max_height) dh = client.max_height; + } assert(dw >= base_width && dh >= base_height);
@@ -106,6 +106,7 @@ -tile <file> tile an image on the desktop
-full <file> stretch an image to fill the desktop -exec <args> <file> specify an external command to execute + -app <app> specify the image application to use -post <string> arguments to be passed to the post-command -debug prints commands without executing them EOF
@@ -1,4 +1,4 @@
-// -*- mode++; indent-tabs-mode: nil; c-basic-offset: 2; -*- +// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- // bsetroot.cc for Blackbox - an X11 Window manager // Copyright (c) 2001 - 2002 Sean 'Shaleh' Perry <shaleh at debian.org> // Copyright (c) 1997 - 2000, 2002 Brad Hughes <bhughes at trolltech.com>@@ -352,7 +352,7 @@ i18n(bsetrootSet, bsetrootUsage,
"%s 2.0\n\n" "Copyright (c) 1997-2000, 2002 Bradley T Hughes\n" "Copyright (c) 2001-2002 Sean 'Shaleh' Perry\n\n" - " -display <string> display connection\n" + " -display <string> use display connection\n" " -mod <x> <y> modula pattern\n" " -foreground, -fg <color> modula foreground color\n" " -background, -bg <color> modula background color\n\n"