mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00
Code Issues Releases Activity

Add new tool-bar items to xwidget-webkit

Browse Source 
* etc/images/README: Update copyright information for new images.
* etc/images/connect-to-url.pbm:
* etc/images/connect-to-url.xpm: Import new images from GNOME.
* lisp/xwidget.el (xwidget-webkit-tool-bar-map): New keymap variable.
(xwidget-webkit-mode): Set tool-bar-map to the appropriate map.
This commit is contained in:
Po Lu 2021-11-05 19:32:20 +08:00 committed by Lars Ingebrigtsen
parent d97718c87c
commit cd7158edd3
4 changed files with 311 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/images/README
View File

@ -68,6 +68,7 @@ Emacs images and their source in the GNOME icons stock/ directory:
bookmark_add.xpm actions/bookmark_add
cancel.xpm slightly modified generic/stock_stop
connect.xpm net/stock_connect
connect-to-url.xpm net/stock_connect-to-url
contact.xpm net/stock_contact
data-save.xpm data/stock_data-save
delete.xpm generic/stock_delete

BIN
etc/images/connect-to-url.pbm Normal file
View File

Binary file not shown.

281
etc/images/connect-to-url.xpm Normal file
View File

@ -0,0 +1,281 @@
/* XPM */
static char *connect_to_url[] = {
/* columns rows colors chars-per-pixel */
"24 24 251 2 ",
" c black",
". c #010101",
"X c #000103",
"o c #010204",
"O c #010305",
"+ c #020407",
"@ c #020609",
"# c #03070C",
"$ c #04080D",
"% c #0F0F0D",
"& c #030A10",
"* c #050B10",
"= c #060C11",
"- c #070D13",
"; c #070D14",
": c #060C15",
"> c #070E14",
", c #0B1824",
"< c #0A1B2B",
"1 c #0A1C2E",
"2 c #141A20",
"3 c #161E25",
"4 c #181E23",
"5 c #0D2032",
"6 c #142534",
"7 c #1F2830",
"8 c #1D2933",
"9 c #102438",
"0 c #272622",
"q c #21292F",
"w c #272F36",
"e c #282F33",
"r c #222F3A",
"t c #2E3337",
"y c #2D373E",
"u c #32383C",
"i c #33383C",
"p c #343A3E",
"a c #43423C",
"s c #112941",
"d c #102A44",
"f c #132D47",
"g c #192F46",
"h c #17314B",
"j c #15314F",
"k c #163351",
"l c #163554",
"z c #173554",
"x c #1F3A53",
"c c #1D3955",
"v c #1A3958",
"b c #1C3B5B",
"n c #1F3C58",
"m c #1D3C5C",
"M c #1E3E5D",
"N c #1F3F5F",
"B c #303B44",
"V c #313C44",
"C c #313D47",
"Z c #213C56",
"A c #233E57",
"S c #1F405F",
"D c #374148",
"F c #2D4050",
"G c #25405B",
"H c #25425E",
"J c #214262",
"K c #244565",
"L c #264665",
"P c #254666",
"I c #2A4967",
"U c #284969",
"Y c #2A4C6C",
"T c #2C4F6F",
"R c #33526E",
"E c #385269",
"W c #2D5070",
"Q c #2E5172",
"! c #335473",
"~ c #3F5B75",
"^ c #3D5F7D",
"/ c #41494F",
"( c #646056",
") c #6C685E",
"_ c #505F6C",
"` c #48657C",
"' c #556A7A",
"] c #5B6C78",
"[ c #5F6F7B",
"{ c #5D6F7D",
"} c #706C62",
"| c #726D63",
" . c #78756B",
".. c #7D786E",
"X. c #60727F",
"o. c #807D74",
"O. c #8A857B",
"+. c #8B877E",
"@. c #4E6A83",
"#. c #4A6A86",
"$. c #4A7090",
"%. c #587790",
"&. c #5F7E95",
"*. c #587B98",
"=. c #6F7980",
"-. c #697F8F",
";. c #66839B",
":. c #6A879F",
">. c #708391",
",. c #728A9A",
"<. c #748898",
"1. c #758A99",
"2. c #7B8F9F",
"3. c #708DA4",
"4. c #7990A1",
"5. c #7292AB",
"6. c #7691A8",
"7. c #7693AB",
"8. c #7B98AE",
"9. c #7E98AD",
"0. c #7E9DB3",
"q. c #7F9EB4",
"w. c #8C8981",
"e. c #989389",
"r. c #A6A29B",
"t. c #8093A1",
"y. c #8598A3",
"u. c #8498A7",
"i. c #809AAD",
"p. c #8F9FAA",
"a. c #899FAE",
"s. c #819FB5",
"d. c #86A2B8",
"f. c #87A5BB",
"g. c #88A3B8",
"h. c #89A5BA",
"j. c #8FABBF",
"k. c #97A7B1",
"l. c #90AABE",
"z. c #91ABBF",
"x. c #98ACB9",
"c. c #AAA7A0",
"v. c #B1ADA4",
"b. c #B3B1AA",
"n. c #B7B3AA",
"m. c #A3B1BC",
"M. c #A5B1BC",
"N. c #A9B6BF",
"B. c #BEBBB5",
"V. c #C4C2BD",
"C. c #94AEC1",
"Z. c #96AEC1",
"A. c #94AFC2",
"S. c #95AFC2",
"D. c #96B0C3",
"F. c #98B0C3",
"G. c #9FB5C3",
"H. c #99B3C6",
"J. c #98B3C7",
"K. c #9AB3C6",
"L. c #9BB4C7",
"P. c #9FB8CA",
"I. c #9FB8CB",
"U. c #A2B8C9",
"Y. c #A3B9C9",
"T. c #A0B9CB",
"R. c #A3BACB",
"E. c #A0B9CC",
"W. c #A2BACC",
"Q. c #A4BDCE",
"!. c #A6BECF",
"~. c #B8BEC2",
"^. c #B8C3CA",
"/. c #BCC5CB",
"(. c #BDC8CE",
"). c #A8C0D1",
"_. c #AAC0D0",
"`. c #ABC1D1",
"'. c #ACC2D3",
"]. c #AAC5D7",
"[. c #B4C8D6",
"{. c #BDCBD5",
"}. c #B4C9D8",
"|. c #B6CAD8",
" X c #B8CBD9",
".X c #BBCDDB",
"XX c #B7D0E0",
"oX c #BDD3E2",
"OX c #BCD5E5",
"+X c #CECAC3",
"@X c #C5D2C8",
"#X c #C0D2DE",
"$X c #C4D3DF",
"%X c #CCD7DE",
"&X c #D2D8DC",
"*X c #E1DFDB",
"=X c #E2E1DD",
"-X c #C2D3E0",
";X c #C2D4E1",
":X c #C5D5E1",
">X c #C6D6E1",
",X c #C4D6E2",
"<X c #C5D6E3",
"1X c #C6D7E3",
"2X c #C3D7E4",
"3X c #C1D7E6",
"4X c #C7D8E3",
"5X c #C5D8E5",
"6X c #C7D9E5",
"7X c #CBD9E4",
"8X c #CBDAE5",
"9X c #CDDAE4",
"0X c #CCDBE5",
"qX c #CFDBE5",
"wX c #CBDCE7",
"eX c #C0D9E8",
"rX c #C2DBEA",
"tX c #C4DAE8",
"yX c #D0DEE7",
"uX c #D1DFE8",
"iX c #D0DFE9",
"pX c #D0E0EA",
"aX c #D1E1EB",
"sX c #D3E1EA",
"dX c #D4E1E9",
"fX c #D4E1EA",
"gX c #D5E2EA",
"hX c #D4E2EB",
"jX c #D6E2EB",
"kX c #D3E2EC",
"lX c #D8E3EA",
"zX c #DFE6EB",
"xX c #D9E4EC",
"cX c #D9E5ED",
"vX c #DAE5ED",
"bX c #DAE6ED",
"nX c #DCE7EE",
"mX c #DBE8EF",
"MX c #DDE8EF",
"NX c #DFE8EF",
"BX c #EAE8E3",
"VX c #EBEAE6",
"CX c #ECEBE8",
"ZX c #E9EEEA",
"AX c #F0EFEC",
"SX c #F2F0ED",
"DX c #E1ECF3",
"FX c #E4EDF3",
"GX c #E8EFF4",
"HX c #F0F3F1",
"JX c None",
/* pixels */
"JXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJX",
"JXJXJXJXJXJXJXJXu D p t i V w JXJXJXJXJXJXJXJXJX",
"JXJXJXJXJXJXC X./.&XDXGX%X{.m._ r JXJXJXJXJXJXJX",
"JXJXJXJXJXi /.DXnXnXFXuX7X$X$XjXM.w JXJXJXJXJXJX",
"JXJXJXJX/ ^.qXbX1XkX5X5X-X;XsXqXjXN.B JXJXJXJXJX",
"JXJXJXe (.bXMXDXaXtXtX3XoXbXjXsXyX7Xx.q JXJXJXJX",
"JXJX7 k.jXbXbX5X3XeXrXOXXX1XsXyXwX$X|.4.3 JXJXJX",
"JXJXX.:XuXjX'.]._.y. G.sXW.|..X$X[.H.' JXJXJX",
"JXJXu.$XqXT.H.>. e.o. sXwX}.R.R.`.H.1.- JXJX",
"JX4 a.9.C.h.] a n.V.BXo. p.!.T.l.4.- JXJX",
"JX2 F.d.5.7. =XAXc.BXo. @X@XZX !.C.F.@.> JXJX",
" o.=XAXc.BXo. t.U.z.3.Y $ JXJX",
"BXBXBXBXVXBXBXAXVXO.CXo. P.C.!.I.J.C.;.L * JXJX",
"o.o.o.o.o. . .B.b...*X . $.*.T.J.A.h.Y c @ JXJX",
" .w.r.| +X . 1.C.3.L h JXJX",
"JXJX6 Q ^ 1.% w.r.| +X . @X@XHX h.:.M , JXJX",
"JXJXO x T #.] 0 +.} v.) -.s.H 9 O JXJXJX",
"JXJXJX+ n ! i.X.% % e.( Q Y %.0.&.f O JXJXJX",
"JXJXJXJX& A s.8.E A % % A K J R ` g @ JXJXJXJX",
"JXJXJXJXJX@ C ~ m M J N M b v l < O JXJXJXJXJX",
"JXJXJXJXJXJX : 5 d k z k d 1 & JXJXJXJXJXJX",
"JXJXJXJXJXJXJXJX JXJXJXJXJXJXJXJX",
"JXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJX",
"JXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJXJX"
};

29
lisp/xwidget.el
View File

@ -192,6 +192,34 @@ in `split-window-right' with a new xwidget webkit session."
:selected xwidget-webkit-edit-mode
:help "Send self inserting characters to the WebKit widget"]))
(defvar xwidget-webkit-tool-bar-map
(let ((map (make-sparse-keymap)))
(prog1 map
(tool-bar-local-item-from-menu 'xwidget-webkit-back
"left-arrow"
map
xwidget-webkit-mode-map)
(tool-bar-local-item-from-menu 'xwidget-webkit-forward
"right-arrow"
map
xwidget-webkit-mode-map)
(tool-bar-local-item-from-menu 'xwidget-webkit-reload
"refresh"
map
xwidget-webkit-mode-map)
(tool-bar-local-item-from-menu 'xwidget-webkit-zoom-in
"zoom-in"
map
xwidget-webkit-mode-map)
(tool-bar-local-item-from-menu 'xwidget-webkit-zoom-out
"zoom-out"
map
xwidget-webkit-mode-map)
(tool-bar-local-item-from-menu 'xwidget-webkit-browse-url
"connect-to-url"
map
xwidget-webkit-mode-map))))
(defun xwidget-webkit-zoom-in ()
"Increase webkit view zoom factor."
(interactive nil xwidget-webkit-mode)
@ -337,6 +365,7 @@ If non-nil, plugins are enabled. Otherwise, disabled."
(define-derived-mode xwidget-webkit-mode special-mode "xwidget-webkit"
"Xwidget webkit view mode."
(setq buffer-read-only t)
(setq-local tool-bar-map xwidget-webkit-tool-bar-map)
(setq-local bookmark-make-record-function
#'xwidget-webkit-bookmark-make-record)
;; Keep track of [vh]scroll when switching buffers